From ab3bdf393c8e0aa0fee453e468322b9ea3c95efd Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 07:40:13 -0700
Subject: [PATCH 001/720] expand colour variables from trello card, WIP

---
 .../sass/cd/_cd-variables.scss                | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss b/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
index bdaaf547a..f0abd6c19 100644
--- a/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
+++ b/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
@@ -33,6 +33,19 @@
   --cd-rgb-reliefweb-dark-red: 235, 20, 5;
   --cd-rgb-reliefweb-dark-grey: 46, 52, 54;
   --cd-rgb-reliefweb-light-grey: 230, 236, 239;
+  --cd-reliefweb-green: #88bb09;
+  --cd-reliefweb-orange: #eb8705;
+
+  --cd-reliefweb-red--text: #da190b;
+  --cd-reliefweb-orange--text: #f49e2c;
+
+  --disable: rgba(230, 236, 239, 0.5);
+
+  /* On white background */
+  --cd-reliefweb-green--background: rgba(136, 187, 9, 0.2);
+  --cd-reliefweb-red--background: rgba(246, 92, 81, 0.2);
+  --cd-reliefweb-orange--background: rgba(235, 135, 5, 0.2);
+
 
   /* OCHA blue is one colour ramp darker than brand blue */
   --cd-ocha-blue: var(--cd-reliefweb-dark-blue);
@@ -54,6 +67,12 @@
   --cd-blue-grey--dark: #d3dde5;
   --cd-blue-grey--light: #ebf0f4;
 
+
+
+
+
+
+
   // Colours used with rgba().
   // https://stackoverflow.com/questions/40010597/how-do-i-apply-opacity-to-a-css-color-variable
   --cd-rgb-ocha-blue: 2, 108, 182;

From bfa6438f1a05af5c471c9e0d1a2828d8dc512151 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 07:42:36 -0700
Subject: [PATCH 002/720] search and replace 0988bb hex with
 --cd-reliefweb-blue

---
 .../components/rw-announcement/rw-announcement.css            | 2 +-
 .../common_design_subtheme/components/rw-blog/rw-blog.css     | 2 +-
 .../components/rw-book-menu/rw-book-menu.css                  | 2 +-
 .../components/rw-document/rw-document.css                    | 2 +-
 .../common_design_subtheme/components/rw-icons/rw-icons.json  | 2 +-
 .../components/rw-opportunities/rw-opportunities.css          | 2 +-
 .../common_design_subtheme/components/rw-search/rw-search.css | 2 +-
 .../common_design_subtheme/components/rw-toc/rw-toc.css       | 4 ++--
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-announcement/rw-announcement.css b/html/themes/custom/common_design_subtheme/components/rw-announcement/rw-announcement.css
index 54f6acb02..6fe5a6660 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-announcement/rw-announcement.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-announcement/rw-announcement.css
@@ -14,7 +14,7 @@
 .rw-homepage-announcement a:hover,
 .rw-homepage-announcement a:active,
 .rw-homepage-announcement a:focus {
-  outline: 4px solid #0988bb;
+  outline: 4px solid var(--cd-reliefweb-blue);
 }
 .rw-homepage-announcement img {
   display: block;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-blog/rw-blog.css b/html/themes/custom/common_design_subtheme/components/rw-blog/rw-blog.css
index 058069a0d..9af0647dc 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-blog/rw-blog.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-blog/rw-blog.css
@@ -17,7 +17,7 @@
 /* Latest blog posts */
 .rw-river--latest-blog-posts h2 {
   padding-left: 8px;
-  border-left: 8px solid #0988bb;
+  border-left: 8px solid var(--cd-reliefweb-blue);
 }
 .rw-river--latest-blog-posts .rw-river-article--blog-post {
   --cd-flow-space: 12px;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-book-menu/rw-book-menu.css b/html/themes/custom/common_design_subtheme/components/rw-book-menu/rw-book-menu.css
index 30298f6b4..59f0f53af 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-book-menu/rw-book-menu.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-book-menu/rw-book-menu.css
@@ -41,5 +41,5 @@
  */
 .rw-book-menu .rw-book-menu__title {
   padding-left: 8px;
-  border-left: 8px solid #0988bb;
+  border-left: 8px solid var(--cd-reliefweb-blue);
 }
diff --git a/html/themes/custom/common_design_subtheme/components/rw-document/rw-document.css b/html/themes/custom/common_design_subtheme/components/rw-document/rw-document.css
index ebeb9aa13..84f802189 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-document/rw-document.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-document/rw-document.css
@@ -42,7 +42,7 @@
 }
 /* .rw-document .rw-article__content section > h3 { */
 /*  padding: 0 0 0 8px; */
-/*  border-left: 8px solid #0988bb; */
+/*  border-left: 8px solid var(--cd-reliefweb-blue); */
 /* } */
 
 .rw-document > footer {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.json b/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.json
index ede8d4a11..41021ecec 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.json
+++ b/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.json
@@ -8,7 +8,7 @@
     "light-grey": "--cd-reliefweb-light-grey",
     "grey": "#b6c8d0",
     "white": "white",
-    "blue": "#0988bb",
+    "blue": "--cd-reliefweb-blue",
     "green": "#88bb09",
     "orange": "#eb8705",
     "red": "#f65c51"
diff --git a/html/themes/custom/common_design_subtheme/components/rw-opportunities/rw-opportunities.css b/html/themes/custom/common_design_subtheme/components/rw-opportunities/rw-opportunities.css
index 83321d08f..d4aaa1e67 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-opportunities/rw-opportunities.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-opportunities/rw-opportunities.css
@@ -72,5 +72,5 @@
 .rw-how-to-apply__title,
 .rw-fee-information__title {
   padding-left: 8px;
-  border-left: 8px solid #0988bb;
+  border-left: 8px solid var(--cd-reliefweb-blue);
 }
diff --git a/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css b/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css
index cdb2a2b88..204063e46 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css
@@ -141,7 +141,7 @@
 .rw-search-results .rw-river__title {
   margin-bottom: 16px;
   padding-left: 8px;
-  border-left: 8px solid #0988bb;
+  border-left: 8px solid var(--cd-reliefweb-blue);
 }
 .rw-search-results .rw-river__title + p {
   margin: 0 0 8px 0;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css b/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
index 0e43f00ab..290652baf 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
@@ -27,7 +27,7 @@
 }
 .rw-toc ul ul li a[data-active] {
   padding-left: 10px;
-  border-left: 6px solid #0988bb;
+  border-left: 6px solid var(--cd-reliefweb-blue);
   font-weight: bold;
 }
 
@@ -208,7 +208,7 @@
   .js .rw-toc ~ .form-item > fieldset[data-active] > legend {
     margin-left: -16px;
     padding-left: 8px;
-    border-left: 8px solid #0988bb;
+    border-left: 8px solid var(--cd-reliefweb-blue);
   }
 }
 

From 059724800d8c9d69d237970015bef96aba301c9e Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 08:34:59 -0700
Subject: [PATCH 003/720] search and replace f6551d hex with --cd-reliefweb-red

---
 .../components/rw-disasters/rw-disasters.css                  | 4 ++--
 .../components/rw-entity-meta/rw-entity-meta.css              | 2 +-
 .../common_design_subtheme/components/rw-form/rw-form.css     | 2 +-
 .../common_design_subtheme/components/rw-icons/rw-icons.json  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-disasters/rw-disasters.css b/html/themes/custom/common_design_subtheme/components/rw-disasters/rw-disasters.css
index 6ce753033..a073384c7 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-disasters/rw-disasters.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-disasters/rw-disasters.css
@@ -274,8 +274,8 @@
 }
 .taxonomy-term--disaster--full[data-disaster-status="current"] .rw-article__header:before,
 .taxonomy-term--disaster--full[data-disaster-status="ongoing"] .rw-article__header:before {
-  border-color: #f65c51;
-  background-color: #f65c51;
+  border-color: var(--cd-reliefweb-red);
+  background-color: var(--cd-reliefweb-red);
 }
 
 /* Reset styles for Disaster Affected Countries Section */
diff --git a/html/themes/custom/common_design_subtheme/components/rw-entity-meta/rw-entity-meta.css b/html/themes/custom/common_design_subtheme/components/rw-entity-meta/rw-entity-meta.css
index 6af205544..a8896eb37 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-entity-meta/rw-entity-meta.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-entity-meta/rw-entity-meta.css
@@ -169,7 +169,7 @@
 }
 .rw-entity-meta dd.rw-entity-meta__tag-value--status--ongoing:before {
   content: "";
-  background: #f65c51;
+  background: var(--cd-reliefweb-red);
 }
 
 .taxonomy-term--disaster--full dl.rw-entity-meta dd.rw-entity-meta__tag-value--status--past:before {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 713c186b6..6f6ed9128 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -254,7 +254,7 @@ form input.error,
 form textarea.error,
 form select.error,
 form fieldset.error > .fieldset-content {
-  outline: 2px solid #f65c51;
+  outline: 2px solid var(--cd-reliefweb-red);
   outline-offset: -2px;
 }
 form fieldset.error .form-radio.error,
diff --git a/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.json b/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.json
index 41021ecec..992f3d193 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.json
+++ b/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.json
@@ -11,7 +11,7 @@
     "blue": "--cd-reliefweb-blue",
     "green": "#88bb09",
     "orange": "#eb8705",
-    "red": "#f65c51"
+    "red": "var(--cd-reliefweb-red)"
   },
   "icons": {
     "common": {

From fa177abef67d6e6eb6f0022706716909c12935e6 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 08:38:02 -0700
Subject: [PATCH 004/720] search and replace 055372 hex with
 --cd-reliefweb-dark-blue

---
 .../components/rw-admin-menu/rw-admin-menu.css            | 2 +-
 .../components/rw-article/rw-article.css                  | 2 +-
 .../components/rw-disaster-map/rw-disaster-map.css        | 2 +-
 .../components/rw-entity-text/rw-entity-text.css          | 8 ++++----
 .../common_design_subtheme/components/rw-form/rw-form.css | 2 +-
 .../components/rw-key-figures/rw-key-figures.css          | 4 ++--
 .../components/rw-moderation/rw-moderation.css            | 2 +-
 .../components/rw-opportunities/rw-opportunities.css      | 2 +-
 .../components/rw-report/rw-report.css                    | 2 +-
 .../components/rw-revisions/rw-revisions.css              | 4 ++--
 .../components/rw-search/rw-search.css                    | 2 +-
 11 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-admin-menu/rw-admin-menu.css b/html/themes/custom/common_design_subtheme/components/rw-admin-menu/rw-admin-menu.css
index 7f044591b..960fdb256 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-admin-menu/rw-admin-menu.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-admin-menu/rw-admin-menu.css
@@ -180,7 +180,7 @@
 /*  margin-left: -6px; */
 /*  border-left: 6px solid transparent; */
 /*  border-right: 6px solid transparent; */
-/*  border-bottom: 6px solid #055372; */
+/*  border-bottom: 6px solid var(--cd-reliefweb-dark-blue); */
 /* } */
 /* .js .cd-header .admin-menu-toggler:after { */
 /*  content: ""; */
diff --git a/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css b/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css
index 19566aff4..0e876eeb2 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css
@@ -34,7 +34,7 @@
 .rw-river-article .rw-river-article__title {
   display: inline;
   margin: 0;
-  color: #055372;
+  color: var(--cd-reliefweb-dark-blue);
   font-size: 17px;
   font-weight: bold;
   line-height: 28px;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-disaster-map/rw-disaster-map.css b/html/themes/custom/common_design_subtheme/components/rw-disaster-map/rw-disaster-map.css
index 217599300..35c66e931 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-disaster-map/rw-disaster-map.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-disaster-map/rw-disaster-map.css
@@ -354,7 +354,7 @@
   padding: 0 0 0 20px;
   border: none;
   border-radius: 50%;
-  background: #055372;
+  background: var(--cd-reliefweb-dark-blue);
 }
 .js .rw-disaster-map .rw-disaster-map__close:hover,
 .js .rw-disaster-map .rw-disaster-map__close:active,
diff --git a/html/themes/custom/common_design_subtheme/components/rw-entity-text/rw-entity-text.css b/html/themes/custom/common_design_subtheme/components/rw-entity-text/rw-entity-text.css
index 751e92030..32ec7d65e 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-entity-text/rw-entity-text.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-entity-text/rw-entity-text.css
@@ -30,11 +30,11 @@
   order: 3;
   margin: 24px auto 0 auto;
   padding: 8px 12px;
-  color: #055372;
-  border: 1px solid #055372;
+  color: var(--cd-reliefweb-dark-blue);
+  border: 1px solid var(--cd-reliefweb-dark-blue);
   background: white;
   font-size: 16px;
-  fill: #055372;
+  fill: var(--cd-reliefweb-dark-blue);
 }
 .js .rw-entity-text--collapsible button svg {
   fill: currentColor;
@@ -43,7 +43,7 @@
 .js .rw-entity-text--collapsible button:active,
 .js .rw-entity-text--collapsible button:focus {
   color: white;
-  background: #055372;
+  background: var(--cd-reliefweb-dark-blue);
 }
 /* Overrides the default behavior when data-cd-hidden is set as the description
  * is always displayed, only the number of paragraphs changes. */
diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 6f6ed9128..72d840c51 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -21,7 +21,7 @@ form button {
   padding: 14px;
   color: white;
   border: none;
-  background: #055372;
+  background: var(--cd-reliefweb-dark-blue);
   font-size: 15px;
   font-weight: bold;
 }
diff --git a/html/themes/custom/common_design_subtheme/components/rw-key-figures/rw-key-figures.css b/html/themes/custom/common_design_subtheme/components/rw-key-figures/rw-key-figures.css
index 5d30d3e68..ff8e665f1 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-key-figures/rw-key-figures.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-key-figures/rw-key-figures.css
@@ -32,7 +32,7 @@
 }
 .rw-key-figures figure data {
   display: block;
-  color: #055372;
+  color: var(--cd-reliefweb-dark-blue);
   font-size: 22px;
   font-weight: bold;
 }
@@ -81,7 +81,7 @@
   padding: 1px 6px;
   color: white;
   border-radius: 5px;
-  background: #055372;
+  background: var(--cd-reliefweb-dark-blue);
   font-style: normal;
 }
 .rw-key-figures figure cite a {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
index 04f29a3e2..40578ee19 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
@@ -83,7 +83,7 @@
   margin-inline-start: 0.5rem;
   padding: 4px 8px;
   text-transform: lowercase;
-  border: 2px solid #055372;
+  border: 2px solid var(--cd-reliefweb-dark-blue);
   border-radius: 8px;
   line-height: 20px;
 }
diff --git a/html/themes/custom/common_design_subtheme/components/rw-opportunities/rw-opportunities.css b/html/themes/custom/common_design_subtheme/components/rw-opportunities/rw-opportunities.css
index d4aaa1e67..da3ccc7ad 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-opportunities/rw-opportunities.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-opportunities/rw-opportunities.css
@@ -34,7 +34,7 @@
 .rw-homepage-opportunties li a:active,
 .rw-homepage-opportunties li a:focus {
   text-decoration: none;
-  outline: 1px solid #055372;
+  outline: 1px solid var(--cd-reliefweb-dark-blue);
 }
 /* Number of open ads. */
 .rw-homepage-opportunties li data {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-report/rw-report.css b/html/themes/custom/common_design_subtheme/components/rw-report/rw-report.css
index 230d1a7a7..74a25ccb6 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-report/rw-report.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-report/rw-report.css
@@ -80,7 +80,7 @@
 .node--report--full #interactive figure a:hover img,
 .node--report--full #interactive figure a:active img,
 .node--report--full #interactive figure a:focus img {
-  border-color: #055372;
+  border-color: var(--cd-reliefweb-dark-blue);
 }
 .node--report--full #interactive footer {
   padding-top: 4px;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css b/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css
index 95d75d178..49aaf37ea 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css
@@ -84,7 +84,7 @@
   padding: 4px 6px;
   cursor: pointer;
   text-transform: uppercase;
-  color: #055372;
+  color: var(--cd-reliefweb-dark-blue);
   border: 1px solid #e6ecef;
   font-size: 11px;
   font-weight: bold;
@@ -170,7 +170,7 @@
   margin: 0;
   padding: 8px;
   text-transform: uppercase;
-  color: #055372;
+  color: var(--cd-reliefweb-dark-blue);
   border: 1px solid #e6ecef;
   background: #e6ecef;
   font-size: 12px;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css b/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css
index 204063e46..aa474baef 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css
@@ -66,7 +66,7 @@
   border-width: 8px 8px 8px 0;
   border-style: solid;
   border-color: transparent;
-  border-right-color: #055372;
+  border-right-color: var(--cd-reliefweb-dark-blue);
 }
 .rw-river-search .rw-river-search__form button:hover:before,
 .rw-river-search .rw-river-search__form button:focus:before,

From 16c031ce83a060f2a1c9061bca6ae97cbec06d75 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 08:39:35 -0700
Subject: [PATCH 005/720] search and replace eb1405 hex with
 --cd-reliefweb-dark-red

---
 .../components/cd-block-title/cd-block-title.css            | 2 +-
 .../components/rw-disaster-map/rw-disaster-map.css          | 2 +-
 .../common_design_subtheme/components/rw-form/rw-form.css   | 2 +-
 .../components/rw-guidelines/rw-guidelines.css              | 2 +-
 .../components/rw-key-figures/rw-key-figures.css            | 2 +-
 .../components/rw-page-title/rw-page-title.css              | 6 +++---
 .../common_design_subtheme/components/rw-pager/rw-pager.css | 2 +-
 .../components/rw-related-content/rw-related-content.css    | 2 +-
 .../components/rw-river/rw-river-views.css                  | 2 +-
 .../components/rw-search/rw-search.css                      | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/cd-block-title/cd-block-title.css b/html/themes/custom/common_design_subtheme/components/cd-block-title/cd-block-title.css
index 72fd5a4db..df548da23 100644
--- a/html/themes/custom/common_design_subtheme/components/cd-block-title/cd-block-title.css
+++ b/html/themes/custom/common_design_subtheme/components/cd-block-title/cd-block-title.css
@@ -8,7 +8,7 @@
 .path-frontpage .cd-block-title,
 .rw-page-title.cd-block-title {
   padding-bottom: 0.5rem;
-  border-bottom: 1px solid #eb1405;
+  border-bottom: 1px solid var(--cd-reliefweb-dark-red);
   font-size: 24px;
 }
 
diff --git a/html/themes/custom/common_design_subtheme/components/rw-disaster-map/rw-disaster-map.css b/html/themes/custom/common_design_subtheme/components/rw-disaster-map/rw-disaster-map.css
index 35c66e931..c5c7d7e31 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-disaster-map/rw-disaster-map.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-disaster-map/rw-disaster-map.css
@@ -359,7 +359,7 @@
 .js .rw-disaster-map .rw-disaster-map__close:hover,
 .js .rw-disaster-map .rw-disaster-map__close:active,
 .js .rw-disaster-map .rw-disaster-map__close:focus {
-  background: #eb1405;
+  background: var(--cd-reliefweb-dark-red);
 }
 .js .rw-disaster-map .rw-disaster-map__close:before {
   position: absolute;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 72d840c51..107cc7181 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -29,7 +29,7 @@ form button:hover,
 form button:focus,
 form button:active {
   text-decoration: underline;
-  background: #eb1405;
+  background: var(--cd-reliefweb-dark-red);
 }
 form input[type="text"],
 form input[type="search"],
diff --git a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
index 1b4c646ff..0b5204b7a 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
@@ -60,7 +60,7 @@ form[data-with-guidelines] .rw-guideline > button[value="close"]:after {
   background: var(--rw-icons--common--close--18--dark-grey);
 }
 form[data-with-guidelines] .rw-guideline > button[value="close"]:hover {
-  border-color: #eb1405;
+  border-color: var(--cd-reliefweb-dark-red);
 }
 form[data-with-guidelines] .rw-guideline > button[value="close"]:hover:after {
   background: var(--rw-icons--common--close--18--dark-red);
diff --git a/html/themes/custom/common_design_subtheme/components/rw-key-figures/rw-key-figures.css b/html/themes/custom/common_design_subtheme/components/rw-key-figures/rw-key-figures.css
index ff8e665f1..c66b66cf7 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-key-figures/rw-key-figures.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-key-figures/rw-key-figures.css
@@ -74,7 +74,7 @@
   content: "";
   vertical-align: middle;
   border-radius: 6px;
-  background: #eb1405;
+  background: var(--cd-reliefweb-dark-red);
 }
 .rw-key-figures figure cite {
   float: right;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-page-title/rw-page-title.css b/html/themes/custom/common_design_subtheme/components/rw-page-title/rw-page-title.css
index 46f2205f4..7515930c6 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-page-title/rw-page-title.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-page-title/rw-page-title.css
@@ -2,7 +2,7 @@
 .rw-page-title {
   margin: 0;
   padding-bottom: 12px;
-  border-bottom: 1px solid #eb1405;
+  border-bottom: 1px solid var(--cd-reliefweb-dark-red);
 }
 
 /* @todo move that to the rw-article component? Or change class name? */
@@ -13,7 +13,7 @@
   position: relative;
   padding-bottom: 12px;
   padding-left: 64px;
-  border-bottom: 1px solid #eb1405;
+  border-bottom: 1px solid var(--cd-reliefweb-dark-red);
 }
 .rw-article__header--with-icon .rw-page-title {
   padding-bottom: 0;
@@ -21,7 +21,7 @@
 }
 .rw-article__header--with-meta {
   padding-bottom: 12px;
-  border-bottom: 1px solid #eb1405;
+  border-bottom: 1px solid var(--cd-reliefweb-dark-red);
 }
 .rw-article__header--with-meta .rw-page-title {
   padding-bottom: 8px;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-pager/rw-pager.css b/html/themes/custom/common_design_subtheme/components/rw-pager/rw-pager.css
index c89240f05..849ec66a8 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-pager/rw-pager.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-pager/rw-pager.css
@@ -21,7 +21,7 @@
 }
 .pager .is-active a {
   text-decoration: underline;
-  color: #eb1405;
+  color: var(--cd-reliefweb-dark-red);
 }
 .pager ul {
   display: inline-block;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-related-content/rw-related-content.css b/html/themes/custom/common_design_subtheme/components/rw-related-content/rw-related-content.css
index ab3fdabee..43c17d9f1 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-related-content/rw-related-content.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-related-content/rw-related-content.css
@@ -10,7 +10,7 @@
 }
 .rw-river--related h2 {
   padding-bottom: 12px;
-  border-bottom: 1px solid #eb1405;
+  border-bottom: 1px solid var(--cd-reliefweb-dark-red);
   /* margin: 0 0 8px 0; */
   font-size: 24px;
 }
diff --git a/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-views.css b/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-views.css
index d4ad57ded..f188f9198 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-views.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-views.css
@@ -31,7 +31,7 @@
   border-color: #e6ecef;
 }
 .rw-river-page .rw-river-views .rw-river-views__list__item--selected a {
-  border-color: #eb1405;
+  border-color: var(--cd-reliefweb-dark-red);
   font-size: 22px;
   font-weight: bold;
 }
diff --git a/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css b/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css
index aa474baef..24c1ab6ce 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css
@@ -71,7 +71,7 @@
 .rw-river-search .rw-river-search__form button:hover:before,
 .rw-river-search .rw-river-search__form button:focus:before,
 .rw-river-search .rw-river-search__form button:active:before {
-  border-right-color: #eb1405;
+  border-right-color: var(--cd-reliefweb-dark-red);
 }
 
 /* Show an icon for the search button on small screens. */

From a49098b9698f60e15875926e8246c808b1d69133 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 08:43:29 -0700
Subject: [PATCH 006/720] add variable for mid-grey

---
 .../custom/common_design_subtheme/sass/cd/_cd-variables.scss   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss b/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
index f0abd6c19..58a07ebda 100644
--- a/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
+++ b/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
@@ -26,6 +26,8 @@
   --cd-reliefweb-dark-blue: #055372;
   --cd-reliefweb-dark-red: #eb1405;
   --cd-reliefweb-dark-grey: #2e3436;
+  /* #2e3436 with 0.85 opacity on white. */
+  --cd-reliefweb-mid-grey: #4d5254;
   --cd-reliefweb-light-grey: #e6ecef;
   --cd-rgb-reliefweb-blue: 9, 136, 187;
   --cd-rgb-reliefweb-red: 246, 92, 81;
@@ -47,6 +49,7 @@
   --cd-reliefweb-orange--background: rgba(235, 135, 5, 0.2);
 
 
+
   /* OCHA blue is one colour ramp darker than brand blue */
   --cd-ocha-blue: var(--cd-reliefweb-dark-blue);
   /* Dark blue is two colour ramps darker than brand blue */

From f0661f370bea63fc9001e4c4a4b957cadc2dac64 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 08:44:23 -0700
Subject: [PATCH 007/720] search and replace 4d5254 hex with
 --cd-reliefweb-mid-grey

---
 .../components/rw-advanced-search/rw-advanced-search.css      | 2 +-
 .../components/rw-article/rw-article.css                      | 2 +-
 .../components/rw-country-slug/rw-country-slug.css            | 2 +-
 .../components/rw-country/rw-country-list.css                 | 2 +-
 .../components/rw-entity-meta/rw-entity-meta.css              | 4 ++--
 .../components/rw-guidelines/rw-guidelines.css                | 2 +-
 .../components/rw-key-figures/rw-key-figures.css              | 2 +-
 .../components/rw-local-tasks/rw-local-tasks.css              | 2 +-
 .../components/rw-moderation/rw-moderation.css                | 2 +-
 .../common_design_subtheme/components/rw-pager/rw-pager.css   | 2 +-
 .../components/rw-revisions/rw-revisions.css                  | 2 +-
 .../rw-river-letter-navigation/rw-river-letter-navigation.css | 2 +-
 .../components/rw-river/rw-river-views.css                    | 2 +-
 .../components/rw-site-slogan/rw-site-slogan.css              | 2 +-
 .../common_design_subtheme/components/rw-toc/rw-toc.css       | 4 ++--
 15 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-advanced-search/rw-advanced-search.css b/html/themes/custom/common_design_subtheme/components/rw-advanced-search/rw-advanced-search.css
index ec902d9aa..b0369c602 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-advanced-search/rw-advanced-search.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-advanced-search/rw-advanced-search.css
@@ -89,7 +89,7 @@
   display: inline-block;
   margin: 0 0 8px 0;
   padding: 4px 8px;
-  color: #2e3436;
+  color: var(--cd-reliefweb-dark-grey);
   border: 1px solid var(--cd-reliefweb-light-grey);
   background: white;
   font-size: 13px;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css b/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css
index 0e876eeb2..21fa6ae45 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css
@@ -48,7 +48,7 @@
   align-items: center;
   padding-top: 16px;
   /* #2e3436 with 0.85 opacity on white. */
-  color: #4d5254;
+  color: var(--cd-reliefweb-mid-grey);
 }
 /* Article with a thumbnail preview (typically Map and Infographic). */
 .rw-river-article .rw-river-article__content img {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-country-slug/rw-country-slug.css b/html/themes/custom/common_design_subtheme/components/rw-country-slug/rw-country-slug.css
index 6793c315d..2356d1792 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-country-slug/rw-country-slug.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-country-slug/rw-country-slug.css
@@ -12,7 +12,7 @@
   vertical-align: top;
   white-space: nowrap;
   text-overflow: ellipsis;
-  color: #2e3436;
+  color: var(--cd-reliefweb-dark-grey);
   background: #e6ecef;
   font-size: 18px;
   font-weight: bold;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-country/rw-country-list.css b/html/themes/custom/common_design_subtheme/components/rw-country/rw-country-list.css
index 39a339047..872b96f87 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-country/rw-country-list.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-country/rw-country-list.css
@@ -31,7 +31,7 @@
 .rw-river-page--countries > ul .rw-river-country-list__group__title {
   margin: 8px 0 24px 0;
   padding: 0 0 16px 0;
-  border-bottom: 1px solid #2e3436;
+  border-bottom: 1px solid var(--cd-reliefweb-dark-grey);
   font-size: 24px;
   font-weight: bold;
 }
diff --git a/html/themes/custom/common_design_subtheme/components/rw-entity-meta/rw-entity-meta.css b/html/themes/custom/common_design_subtheme/components/rw-entity-meta/rw-entity-meta.css
index a8896eb37..ea50b13e2 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-entity-meta/rw-entity-meta.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-entity-meta/rw-entity-meta.css
@@ -108,7 +108,7 @@
     content: "";
     vertical-align: middle;
     border-radius: 4px;
-    background: #2e3436;
+    background: var(--cd-reliefweb-dark-grey);
   }
   .rw-entity-meta--core dd:last-of-type:after {
     content: none;
@@ -132,7 +132,7 @@
 }
 .rw-river dl.rw-entity-meta.rw-article-meta {
   /* #2e3436 with 0.85 opacity on white. */
-  color: #4d5254;
+  color: var(--cd-reliefweb-mid-grey);
 }
 
 @media screen and (min-width: 480px) {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
index 0b5204b7a..9c1253224 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
@@ -45,7 +45,7 @@ form[data-with-guidelines] .rw-guideline > button[value="close"] {
   width: 28px;
   height: 28px;
   padding: 0 0 0 22px;
-  border: 2px solid #2e3436;
+  border: 2px solid var(--cd-reliefweb-dark-grey);
   border-radius: 50%;
   background: white;
 }
diff --git a/html/themes/custom/common_design_subtheme/components/rw-key-figures/rw-key-figures.css b/html/themes/custom/common_design_subtheme/components/rw-key-figures/rw-key-figures.css
index c66b66cf7..ff44e2868 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-key-figures/rw-key-figures.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-key-figures/rw-key-figures.css
@@ -50,7 +50,7 @@
   padding: 10px 0;
   opacity: 0.5;
   fill: none;
-  stroke: #2e3436;
+  stroke: var(--cd-reliefweb-dark-grey);
   stroke-width: 2px;
 }
 .rw-key-figures figure footer {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-local-tasks/rw-local-tasks.css b/html/themes/custom/common_design_subtheme/components/rw-local-tasks/rw-local-tasks.css
index df5897d0f..bdbdbb147 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-local-tasks/rw-local-tasks.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-local-tasks/rw-local-tasks.css
@@ -27,7 +27,7 @@
   margin-left: 14px;
   content: "";
   vertical-align: middle;
-  background: #2e3436;
+  background: var(--cd-reliefweb-dark-grey);
 }
 .block-local-tasks-block li:last-child:after,
 .tabs li:last-child:after {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
index 40578ee19..12c48afee 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
@@ -173,7 +173,7 @@
 }
 .path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) .rw-moderation-table__cell__info .rw-moderation-table__cell__info__country a,
 .path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) .rw-moderation-table__cell__details .rw-moderation-table__cell__info__source a {
-  color: #2e3436;
+  color: var(--cd-reliefweb-dark-grey);
   font-weight: bold;
 }
 .path-moderation .rw-moderation-list .rw-moderation-table__cell__bury {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-pager/rw-pager.css b/html/themes/custom/common_design_subtheme/components/rw-pager/rw-pager.css
index 849ec66a8..db5c55639 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-pager/rw-pager.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-pager/rw-pager.css
@@ -40,7 +40,7 @@
   height: 10px;
   margin-bottom: 1px;
   content: "";
-  background: #2e3436;
+  background: var(--cd-reliefweb-dark-grey);
 }
 .pager li:last-child:after {
   content: none;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css b/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css
index 49aaf37ea..8a9ea7950 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css
@@ -122,7 +122,7 @@
   border: 1px solid #e6ecef;
   width: 12px;
   height: 12px;
-  color: #2e3436;
+  color: var(--cd-reliefweb-dark-grey);
   line-height: 11px;
   margin-right: 4px;
   vertical-align: middle;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-river-letter-navigation/rw-river-letter-navigation.css b/html/themes/custom/common_design_subtheme/components/rw-river-letter-navigation/rw-river-letter-navigation.css
index 9ec91611e..42c5959f2 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-river-letter-navigation/rw-river-letter-navigation.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-river-letter-navigation/rw-river-letter-navigation.css
@@ -57,7 +57,7 @@
     font-size: 16px;
   }
   .rw-river-letter-navigation__btn[aria-expanded] .cd-icon--arrow-down {
-    fill: #2e3436;
+    fill: var(--cd-reliefweb-dark-grey);
   }
   [dir="ltr"] .rw-river-letter-navigation__btn[aria-expanded] .cd-icon--arrow-down {
     margin-left: 0.5rem;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-views.css b/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-views.css
index f188f9198..65a0a70f9 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-views.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-views.css
@@ -20,7 +20,7 @@
   display: inline-block;
   padding-bottom: 3px;
   text-decoration: none;
-  color: #2e3436;
+  color: var(--cd-reliefweb-dark-grey);
   border-bottom: 3px solid transparent;
   font-size: 18px;
 }
diff --git a/html/themes/custom/common_design_subtheme/components/rw-site-slogan/rw-site-slogan.css b/html/themes/custom/common_design_subtheme/components/rw-site-slogan/rw-site-slogan.css
index ba574ad24..59ac501d5 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-site-slogan/rw-site-slogan.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-site-slogan/rw-site-slogan.css
@@ -10,7 +10,7 @@
   color: white; /* TEMPORARY - COVID-19 */
   /* #e6ecef with 0.4 opacity on white. */
   background: #f5f7f9;
-  background: #2e3436; /* TEMPORARY - COVID-19 */
+  background: var(--cd-reliefweb-dark-grey); /* TEMPORARY - COVID-19 */
   font-size: 16px;
 }
 .cd-header #site-slogan a {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css b/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
index 290652baf..db6a51e85 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
@@ -129,14 +129,14 @@
     height: 40px;
     margin: 24px auto;
     padding: 0 8px;
-    color: #2e3436;
+    color: var(--cd-reliefweb-dark-grey);
     border: 1px solid #e6ecef;
     background: white;
     font-size: 16px;
     font-weight: normal;
   }
   .rw-toc__btn[aria-expanded] .cd-icon--arrow-down {
-    fill: #2e3436;
+    fill: var(--cd-reliefweb-dark-grey);
   }
   [dir="ltr"] .rw-toc__btn[aria-expanded] .cd-icon--arrow-down {
     margin-left: 0.5rem;

From b41ba6837f1bac91b43354a2bec539baecf9ba9e Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 09:00:03 -0700
Subject: [PATCH 008/720] search and replace e6ecef hex with
 --cd-reliefweb-light-grey

---
 .../rw-article/rw-appeals-response-plans.css  |  2 +-
 .../components/rw-article/rw-article.css      |  8 ++++----
 .../rw-article/rw-maps-inforgraphics.css      |  6 +++---
 .../rw-bookmark-link/rw-bookmark-link.css     |  2 +-
 .../rw-country-slug/rw-country-slug.css       |  2 +-
 .../components/rw-country/rw-country-list.css |  2 +-
 .../rw-disaster-map/rw-disaster-map.css       |  8 ++++----
 .../components/rw-document/rw-document.css    |  2 +-
 .../components/rw-form/rw-form--widget.css    | 12 +++++------
 .../components/rw-form/rw-form.css            | 20 +++++++++----------
 .../rw-guidelines/rw-guidelines.css           |  6 +++---
 .../components/rw-homepage/rw-homepage.css    |  4 ++--
 .../rw-key-content/rw-key-content.css         |  2 +-
 .../rw-key-figures/rw-key-figures.css         |  2 +-
 .../rw-moderation/rw-moderation.css           |  2 +-
 .../components/rw-most-read/rw-most-read.css  |  2 +-
 .../rw-opportunities/rw-opportunities.css     |  2 +-
 .../components/rw-pager/rw-pager.css          |  2 +-
 .../rw-related-content/rw-related-content.css |  2 +-
 .../components/rw-report/rw-report.css        |  8 ++++----
 .../components/rw-revisions/rw-revisions.css  | 18 ++++++++---------
 .../rw-river-letter-navigation.css            |  8 ++++----
 .../components/rw-river/rw-river-results.css  |  2 +-
 .../components/rw-river/rw-river-views.css    |  2 +-
 .../components/rw-search/rw-search.css        |  6 +++---
 .../rw-social-media-links.css                 |  4 ++--
 .../components/rw-toc/rw-toc.css              | 16 +++++++--------
 .../rw-useful-links/rw-useful-links.css       |  2 +-
 .../components/rw-user/rw-user-bookmarks.css  |  8 ++++----
 .../components/rw-user/rw-user.css            |  2 +-
 30 files changed, 82 insertions(+), 82 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-article/rw-appeals-response-plans.css b/html/themes/custom/common_design_subtheme/components/rw-article/rw-appeals-response-plans.css
index 6313eca58..a04ac4e96 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-article/rw-appeals-response-plans.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-article/rw-appeals-response-plans.css
@@ -33,7 +33,7 @@
   width: 140px;
   height: 170px;
   content: "";
-  border: 8px solid #e6ecef;
+  border: 8px solid var(--cd-reliefweb-light-grey);
   background: linear-gradient(rgba(230, 236, 239, 0) 50%, rgba(230, 236, 239, 0.8));
 }
 
diff --git a/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css b/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css
index 21fa6ae45..c5e9b5178 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css
@@ -12,7 +12,7 @@
   display: flex;
   flex-direction: column;
   padding: 0 0 24px 0;
-  border-bottom: 1px solid #e6ecef;
+  border-bottom: 1px solid var(--cd-reliefweb-light-grey);
 }
 .rw-river-article:last-child {
   padding-bottom: 0;
@@ -55,7 +55,7 @@
   float: left;
   max-height: 118px;
   margin: 2px 20px 0 0;
-  border: 1px solid #e6ecef;
+  border: 1px solid var(--cd-reliefweb-light-grey);
 }
 .rw-river-article .rw-river-article__content img + p {
   margin-top: 0;
@@ -99,7 +99,7 @@
     margin-right: 8px;
     margin-left: 8px;
     padding: 16px;
-    border: 1px solid #e6ecef;
+    border: 1px solid var(--cd-reliefweb-light-grey);
   }
   /* Remove top margin from cd-flow for second item in two column layout */
   .rw-river--river-columns--two .rw-river-article:nth-child(2) {
@@ -129,6 +129,6 @@
   /* Add bottom border to second last item in two column layout */
   .rw-river--river-columns--two.rw-river--river-columns--desktop .rw-river-article:nth-last-child(2) {
     padding-bottom: 24px;
-    border-bottom: 1px solid #e6ecef;
+    border-bottom: 1px solid var(--cd-reliefweb-light-grey);
   }
 }
diff --git a/html/themes/custom/common_design_subtheme/components/rw-article/rw-maps-inforgraphics.css b/html/themes/custom/common_design_subtheme/components/rw-article/rw-maps-inforgraphics.css
index c845bd0fa..3a9c9dc66 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-article/rw-maps-inforgraphics.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-article/rw-maps-inforgraphics.css
@@ -34,7 +34,7 @@
     width: 190px;
     height: 140px;
     content: "";
-    border: 8px solid #e6ecef;
+    border: 8px solid var(--cd-reliefweb-light-grey);
     background: linear-gradient(rgba(230, 236, 239, 0) 50%, rgba(230, 236, 239, 0.8));
   }
 
@@ -65,7 +65,7 @@
     .rw-river--maps-infographics article header {
       flex: 1 0 auto;
       padding: 16px 16px 0 16px;
-      border: 1px solid #e6ecef;
+      border: 1px solid var(--cd-reliefweb-light-grey);
       border-width: 0 1px;
     }
     .rw-river--maps-infographics article .rw-river-article__content {
@@ -93,7 +93,7 @@
     .rw-river--maps-infographics article footer {
       margin: 0;
       padding: 16px 16px 8px 16px;
-      border: 1px solid #e6ecef;
+      border: 1px solid var(--cd-reliefweb-light-grey);
       border-width: 0 1px 1px 1px;
     }
   }
diff --git a/html/themes/custom/common_design_subtheme/components/rw-bookmark-link/rw-bookmark-link.css b/html/themes/custom/common_design_subtheme/components/rw-bookmark-link/rw-bookmark-link.css
index 737802bd0..5c95e0aa0 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-bookmark-link/rw-bookmark-link.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-bookmark-link/rw-bookmark-link.css
@@ -12,7 +12,7 @@
   padding: 10px;
   vertical-align: middle;
   text-decoration: none;
-  background: #e6ecef;
+  background: var(--cd-reliefweb-light-grey);
   font-size: 15px;
 }
 .rw-bookmark-link:hover,
diff --git a/html/themes/custom/common_design_subtheme/components/rw-country-slug/rw-country-slug.css b/html/themes/custom/common_design_subtheme/components/rw-country-slug/rw-country-slug.css
index 2356d1792..b3af55c70 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-country-slug/rw-country-slug.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-country-slug/rw-country-slug.css
@@ -13,7 +13,7 @@
   white-space: nowrap;
   text-overflow: ellipsis;
   color: var(--cd-reliefweb-dark-grey);
-  background: #e6ecef;
+  background: var(--cd-reliefweb-light-grey);
   font-size: 18px;
   font-weight: bold;
   line-height: 30px;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-country/rw-country-list.css b/html/themes/custom/common_design_subtheme/components/rw-country/rw-country-list.css
index 872b96f87..ae77cc55f 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-country/rw-country-list.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-country/rw-country-list.css
@@ -26,7 +26,7 @@
   bottom: 12px;
   left: 0;
   content: "";
-  border: 4px solid #e6ecef;
+  border: 4px solid var(--cd-reliefweb-light-grey);
 }
 .rw-river-page--countries > ul .rw-river-country-list__group__title {
   margin: 8px 0 24px 0;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-disaster-map/rw-disaster-map.css b/html/themes/custom/common_design_subtheme/components/rw-disaster-map/rw-disaster-map.css
index c5c7d7e31..6893ef032 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-disaster-map/rw-disaster-map.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-disaster-map/rw-disaster-map.css
@@ -22,7 +22,7 @@
 .js .rw-disaster-map[data-map-enabled] .rw-disaster-map__title {
   margin-bottom: 0;
   padding: 4px 8px 4px 8px;
-  background: #e6ecef;
+  background: var(--cd-reliefweb-light-grey);
   font-size: 18px;
 }
 .js .rw-disaster-map[data-map-enabled] .rw-disaster-map__header {
@@ -34,7 +34,7 @@
   margin-top: 0;
   /* This is for the map ratio: height is 40% of the width. */
   padding-top: 40%;
-  border: 1px solid #e6ecef;
+  border: 1px solid var(--cd-reliefweb-light-grey);
 }
 .js .rw-disaster-map[data-map-enabled] .rw-disaster-map__map {
   position: relative;
@@ -59,7 +59,7 @@
 .js .rw-disaster-map[data-map-enabled] .rw-disaster-map__legend {
   /* The padding top is compensate the top: -1px of the figure. */
   padding: 7px 6px 6px 6px;
-  border-top: 1px solid #e6ecef;
+  border-top: 1px solid var(--cd-reliefweb-light-grey);
   font-size: 14px;
 }
 .js .rw-disaster-map[data-map-enabled] .rw-disaster-map__legend__item {
@@ -108,7 +108,7 @@
   max-height: 258px;
   margin: 8px;
   padding: 12px;
-  border: 1px solid #e6ecef;
+  border: 1px solid var(--cd-reliefweb-light-grey);
   background: white;
 }
 .js .rw-disaster-map[data-map-enabled] .rw-disaster-map__article[data-active="right"] {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-document/rw-document.css b/html/themes/custom/common_design_subtheme/components/rw-document/rw-document.css
index 84f802189..d6930f91b 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-document/rw-document.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-document/rw-document.css
@@ -51,7 +51,7 @@
   padding: 24px 0 0 0;
   border-width: 1px 0 0 0;
   border-style: solid;
-  border-color: #e6ecef;
+  border-color: var(--cd-reliefweb-light-grey);
 }
 
 /* Entity details in the sidebar/footer */
diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
index 077a22a0f..1f87c376c 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
@@ -10,7 +10,7 @@
 /*   * file element. *! */
 /*  position: relative; */
 /*  padding: 8px; */
-/*  border: 1px solid #e6ecef; */
+/*  border: 1px solid var(--cd-reliefweb-light-grey); */
 /* } */
 /* form table.file-list thead { */
 /*  display: none; */
@@ -43,7 +43,7 @@
 /*  display: table-cell; */
 /*  width: 50%; */
 /*  padding: 8px 16px; */
-/*  border-left: 1px solid #e6ecef; */
+/*  border-left: 1px solid var(--cd-reliefweb-light-grey); */
 /* } */
 /* form table.file-list .file-widget .fieldset-wrapper > div.file-details a[download] { */
 /*  display: block; */
@@ -68,7 +68,7 @@
 /*  width: 102px; */
 /*  height: 102px; */
 /*  text-align: center; */
-/*  border: 1px solid #e6ecef; */
+/*  border: 1px solid var(--cd-reliefweb-light-grey); */
 /* } */
 /* form table.file-list .file-widget .fieldset-wrapper .preview-image a img { */
 /*  max-width: 100%; */
@@ -87,21 +87,21 @@
 /* } */
 /* form table.file-list .image-widget { */
 /*   border: none; */
-/*   border-left: 1px solid #e6ecef; */
+/*   border-left: 1px solid var(--cd-reliefweb-light-grey); */
 /* } */
 
 /* Media widget */
 form .js-media-library-widget .fieldset-wrapper {
   position: relative;
   padding: 8px;
-  border: 1px solid #e6ecef;
+  border: 1px solid var(--cd-reliefweb-light-grey);
 }
 form .image-widget {
   display: flex;
   flex-direction: column;
   flex-wrap: wrap;
   align-items: flex-start;
-  /* border: 1px solid #e6ecef; */
+  /* border: 1px solid var(--cd-reliefweb-light-grey); */
   padding: 0 16px 16px;
 }
 
diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 107cc7181..3e6e35490 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -40,7 +40,7 @@ form input[type="url"] {
   height: 46px;
   margin: 0;
   padding: 12px;
-  border: 2px solid #e6ecef;
+  border: 2px solid var(--cd-reliefweb-light-grey);
   background: white;
 }
 input[type="text"],
@@ -61,7 +61,7 @@ form textarea {
   margin: 0;
   padding: 12px;
   resize: vertical;
-  border: 2px solid #e6ecef;
+  border: 2px solid var(--cd-reliefweb-light-grey);
   background: white;
   /* Better readibility similar to paragraphs. */
   line-height: 1.5;
@@ -100,7 +100,7 @@ form fieldset legend {
 form > div.form-item,
 form > fieldset,
 form > section {
-  border-top: 1px solid #e6ecef;
+  border-top: 1px solid var(--cd-reliefweb-light-grey);
   padding: 32px 0;
 } */
 form > div > fieldset > legend,
@@ -210,7 +210,7 @@ form .description a:hover,
 form .description a:active,
 form .description a:focus {
   text-decoration: underline;
-  background: #e6ecef;
+  background: var(--cd-reliefweb-light-grey);
 }
 form .description + div {
   margin-top: 8px;
@@ -236,7 +236,7 @@ form .form-disabled [data-irrelevant] > div {
 form input[disabled],
 form textarea[disabled],
 form select[disabled] {
-  background: #e6ecef;
+  background: var(--cd-reliefweb-light-grey);
   background: rgba(230, 236, 239, 0.5);
 }
 form input[disabled] + label {
@@ -244,7 +244,7 @@ form input[disabled] + label {
 }
 form .notice {
   padding: 32px;
-  background: #e6ecef;
+  background: var(--cd-reliefweb-light-grey);
 }
 form .notice :first-child {
   margin-top: 0;
@@ -276,8 +276,8 @@ form #actions {
   /* min-width: 100%; */
   padding: 0 12px 12px;
   text-align: center;
-  border: 1px solid #e6ecef;
-  background: #e6ecef;
+  border: 1px solid var(--cd-reliefweb-light-grey);
+  background: var(--cd-reliefweb-light-grey);
   background: rgba(230, 236, 239, 0.4);
 }
 form #actions .cd-button {
@@ -411,7 +411,7 @@ form #edit-organization .form-type-radio {
 form #edit-organization #edit-field-source-allowed .form-item:last-child {
   margin-top: 8px;
   padding-top: 8px;
-  border-top: 2px dotted #e6ecef;
+  border-top: 2px dotted var(--cd-reliefweb-light-grey);
 }
 
 /* Embargo Date .field--name-field-embargo-date */
@@ -439,7 +439,7 @@ form #edit-organization #edit-field-source-allowed .form-item:last-child {
   margin-top: 0;
 }
 .filter-wrapper {
-  border: 1px solid #e6ecef;
+  border: 1px solid var(--cd-reliefweb-light-grey);
 }
 .filter-wrapper .filter-help {
   font-size: 14px;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
index 9c1253224..e5fda8196 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
@@ -6,10 +6,10 @@ form[data-with-guidelines] button[data-guideline] {
   margin: -3px 0 0 8px;
   padding: 0 0 0 12px;
   vertical-align: middle;
-  border: 4px solid #e6ecef;
+  border: 4px solid var(--cd-reliefweb-light-grey);
   border-radius: 50%;
   background: var(--rw-icons--common--help--12--dark-blue);
-  background-color: #e6ecef;
+  background-color: var(--cd-reliefweb-light-grey);
 }
 form[data-with-guidelines] button[data-guideline]:hover {
   background: var(--rw-icons--common--help--12--dark-red);
@@ -82,5 +82,5 @@ form[data-with-guidelines] .rw-guideline > div > .rw-guideline__content {
   padding-top: 0;
 }
 form[data-with-guidelines] .rw-guideline > div > .rw-guideline__content img {
-  border: 4px solid #e6ecef;
+  border: 4px solid var(--cd-reliefweb-light-grey);
 }
diff --git a/html/themes/custom/common_design_subtheme/components/rw-homepage/rw-homepage.css b/html/themes/custom/common_design_subtheme/components/rw-homepage/rw-homepage.css
index 747d3af69..395e2af7c 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-homepage/rw-homepage.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-homepage/rw-homepage.css
@@ -6,13 +6,13 @@
  */
 .rw-river--disasters {
   --cd-flow-space: 1rem;
-  /* border-top: 1px solid #e6ecef; */
+  /* border-top: 1px solid var(--cd-reliefweb-light-grey); */
 }
 .rw-river--disasters .rw-river-article--disaster {
   position: relative;
   /* margin: 16px 0 0 0; */
   padding: 0 0 16px;
-  /* border-top: 1px solid #e6ecef; */
+  /* border-top: 1px solid var(--cd-reliefweb-light-grey); */
 }
 .rw-river--disasters .rw-river-article--disaster:first-child {
   margin: 0;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-key-content/rw-key-content.css b/html/themes/custom/common_design_subtheme/components/rw-key-content/rw-key-content.css
index 4b5d1c9f0..adc3e515b 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-key-content/rw-key-content.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-key-content/rw-key-content.css
@@ -25,7 +25,7 @@
   width: 140px;
   height: 170px;
   content: "";
-  border: 8px solid #e6ecef;
+  border: 8px solid var(--cd-reliefweb-light-grey);
   background: linear-gradient(rgba(230, 236, 239, 0) 50%, rgba(230, 236, 239, 0.8));
 }
 .rw-river--key-content article .rw-river-article__content p {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-key-figures/rw-key-figures.css b/html/themes/custom/common_design_subtheme/components/rw-key-figures/rw-key-figures.css
index ff44e2868..70d740e39 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-key-figures/rw-key-figures.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-key-figures/rw-key-figures.css
@@ -17,7 +17,7 @@
   width: 100%;
   margin: 0 0 20px 0;
   padding: 16px;
-  border: 1px solid #e6ecef;
+  border: 1px solid var(--cd-reliefweb-light-grey);
 }
 .rw-key-figures figure figcaption {
   margin: 0 0 20px 0;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
index 12c48afee..70813e64d 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
@@ -68,7 +68,7 @@
   /*height: 100%;*/
 }
 .path-moderation #edit-omnibox div[data-autocomplete] > input {
-  border-right: 2px solid #e6ecef;
+  border-right: 2px solid var(--cd-reliefweb-light-grey);
 }
 .path-moderation [data-selection] > span span + span {
   font-weight: bold;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-most-read/rw-most-read.css b/html/themes/custom/common_design_subtheme/components/rw-most-read/rw-most-read.css
index e655f5cbe..409c86450 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-most-read/rw-most-read.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-most-read/rw-most-read.css
@@ -20,7 +20,7 @@
 }
 .path-frontpage .rw-river--most-read article + article {
   padding-top: 24px;
-  border-top: 1px solid #e6ecef;
+  border-top: 1px solid var(--cd-reliefweb-light-grey);
 }
 .path-frontpage .rw-river--most-read .view-more {
   margin-top: 8px;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-opportunities/rw-opportunities.css b/html/themes/custom/common_design_subtheme/components/rw-opportunities/rw-opportunities.css
index da3ccc7ad..09daa75d6 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-opportunities/rw-opportunities.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-opportunities/rw-opportunities.css
@@ -13,7 +13,7 @@
 }
 .rw-homepage-opportunties li {
   margin: 0;
-  background: #e6ecef;
+  background: var(--cd-reliefweb-light-grey);
 }
 .rw-homepage-opportunties li + li {
   margin-top: 16px;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-pager/rw-pager.css b/html/themes/custom/common_design_subtheme/components/rw-pager/rw-pager.css
index db5c55639..95bdeff38 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-pager/rw-pager.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-pager/rw-pager.css
@@ -5,7 +5,7 @@
   margin-top: 32px;
   padding-top: 32px;
   text-align: center;
-  border-top: 1px solid #e6ecef;
+  border-top: 1px solid var(--cd-reliefweb-light-grey);
 }
 .pager:after {
   display: table;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-related-content/rw-related-content.css b/html/themes/custom/common_design_subtheme/components/rw-related-content/rw-related-content.css
index 43c17d9f1..3427170d2 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-related-content/rw-related-content.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-related-content/rw-related-content.css
@@ -6,7 +6,7 @@
 .rw-river--related {
   margin: 0;
   padding: 32px 0 24px;
-  border-top: 1px solid #e6ecef;
+  border-top: 1px solid var(--cd-reliefweb-light-grey);
 }
 .rw-river--related h2 {
   padding-bottom: 12px;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-report/rw-report.css b/html/themes/custom/common_design_subtheme/components/rw-report/rw-report.css
index 74a25ccb6..7ee1e2034 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-report/rw-report.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-report/rw-report.css
@@ -32,7 +32,7 @@
   margin: 0;
   padding: 16px 0;
   text-align: center;
-  border: 1px solid #e6ecef;
+  border: 1px solid var(--cd-reliefweb-light-grey);
 }
 .node--report--full #attachments li + li {
   margin-top: 24px;
@@ -40,7 +40,7 @@
 .node--report--full #attachments img {
   width: 100%;
   margin: -16px 0 8px 0;
-  border-bottom: 1px solid #e6ecef;
+  border-bottom: 1px solid var(--cd-reliefweb-light-grey);
 }
 .node--report--full #attachments strong {
   display: block;
@@ -71,11 +71,11 @@
 }
 .node--report--full #interactive figure figcaption {
   padding: 4px;
-  background: #e6ecef;
+  background: var(--cd-reliefweb-light-grey);
 }
 .node--report--full #interactive figure img {
   width: 100%;
-  border: 1px solid #e6ecef;
+  border: 1px solid var(--cd-reliefweb-light-grey);
 }
 .node--report--full #interactive figure a:hover img,
 .node--report--full #interactive figure a:active img,
diff --git a/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css b/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css
index 8a9ea7950..a7a57fceb 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css
@@ -5,14 +5,14 @@
 .rw-revisions-history__title {
   margin: 0;
   padding: 8px;
-  background: #e6ecef;
+  background: var(--cd-reliefweb-light-grey);
   font-size: 16px;
 }
 .rw-revisions-history__placeholder {
   padding: 8px;
   border-width: 0 1px 1px 1px;
   border-style: solid;
-  border-color: #e6ecef;
+  border-color: var(--cd-reliefweb-light-grey);
   font-size: 15px;
   font-style: italic;
 }
@@ -20,7 +20,7 @@
   padding: 8px;
   border-width: 0 1px 1px 1px;
   border-style: solid;
-  border-color: #e6ecef;
+  border-color: var(--cd-reliefweb-light-grey);
   font-size: 15px;
 }
 .rw-revisions-history-entry__title {
@@ -62,7 +62,7 @@
 .rw-revisions-history-entry__content__value dl {
   margin: 0 0 0 8px;
   padding: 4px 0 0 12px;
-  border-left: 1px solid #e6ecef;
+  border-left: 1px solid var(--cd-reliefweb-light-grey);
 }
 .rw-revisions-history-entry__content__value dd {
   margin: 4px 0 0 16px;
@@ -85,7 +85,7 @@
   cursor: pointer;
   text-transform: uppercase;
   color: var(--cd-reliefweb-dark-blue);
-  border: 1px solid #e6ecef;
+  border: 1px solid var(--cd-reliefweb-light-grey);
   font-size: 11px;
   font-weight: bold;
   line-height: 1;
@@ -119,7 +119,7 @@
 .rw-revisions-history-entry__content__value .rw-revisions-checked::before {
   content: "\2713 ";
   display: inline-block;
-  border: 1px solid #e6ecef;
+  border: 1px solid var(--cd-reliefweb-light-grey);
   width: 12px;
   height: 12px;
   color: var(--cd-reliefweb-dark-grey);
@@ -171,8 +171,8 @@
   padding: 8px;
   text-transform: uppercase;
   color: var(--cd-reliefweb-dark-blue);
-  border: 1px solid #e6ecef;
-  background: #e6ecef;
+  border: 1px solid var(--cd-reliefweb-light-grey);
+  background: var(--cd-reliefweb-light-grey);
   font-size: 12px;
   font-weight: bold;
   line-height: 1;
@@ -181,7 +181,7 @@
 .rw-revisions-history__btn:focus,
 .rw-revisions-history__btn:active {
   text-decoration: underline;
-  background: #e6ecef;
+  background: var(--cd-reliefweb-light-grey);
 }
 .rw-revisions-history__btn:before,
 .rw-revisions-history__btn:after {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-river-letter-navigation/rw-river-letter-navigation.css b/html/themes/custom/common_design_subtheme/components/rw-river-letter-navigation/rw-river-letter-navigation.css
index 42c5959f2..6121f46d0 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-river-letter-navigation/rw-river-letter-navigation.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-river-letter-navigation/rw-river-letter-navigation.css
@@ -38,7 +38,7 @@
 .rw-river-letter-navigation li a:active,
 .rw-river-letter-navigation li a:hover {
   text-decoration: none;
-  background: #e6ecef;
+  background: var(--cd-reliefweb-light-grey);
   font-weight: bold;
 }
 /* .js .rw-river-letter-navigation__btn { */
@@ -52,7 +52,7 @@
     height: 40px;
     margin: 0 auto;
     padding: 0 8px;
-    border: 1px solid #e6ecef;
+    border: 1px solid var(--cd-reliefweb-light-grey);
     background: white;
     font-size: 16px;
   }
@@ -85,8 +85,8 @@
     right: 12px;
     left: 12px;
     background: white;
-    -webkit-box-shadow: 0 0 6px 2px #e6ecef;
-    box-shadow: 0 0 6px 2px #e6ecef;
+    -webkit-box-shadow: 0 0 6px 2px var(--cd-reliefweb-light-grey);
+    box-shadow: 0 0 6px 2px var(--cd-reliefweb-light-grey);
   }
   /* .js .rw-river-letter-navigation[data-hidden="true"] { */
   /*  display: none; */
diff --git a/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-results.css b/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-results.css
index 2a5def852..58e12ea71 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-results.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-results.css
@@ -17,7 +17,7 @@
   .rw-river-results {
     padding: 24px 0;
     text-align: left;
-    border-bottom: 1px solid #e6ecef;
+    border-bottom: 1px solid var(--cd-reliefweb-light-grey);
   }
 }
 
diff --git a/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-views.css b/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-views.css
index 65a0a70f9..461fe9328 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-views.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-views.css
@@ -28,7 +28,7 @@
 .rw-river-page .rw-river-views a:focus,
 .rw-river-page .rw-river-views a:active {
   text-decoration: none;
-  border-color: #e6ecef;
+  border-color: var(--cd-reliefweb-light-grey);
 }
 .rw-river-page .rw-river-views .rw-river-views__list__item--selected a {
   border-color: var(--cd-reliefweb-dark-red);
diff --git a/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css b/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css
index 24c1ab6ce..d2cd0172c 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css
@@ -110,7 +110,7 @@
 .rw-search-results .rw-river__articles {
   margin-top: 8px;
   padding-top: 24px;
-  border-top: 1px solid #e6ecef;
+  border-top: 1px solid var(--cd-reliefweb-light-grey);
 }
 
 .rw-search-results__totals {
@@ -131,7 +131,7 @@
   display: block;
   padding: 12px 24px;
   border-radius: 6px;
-  background: #e6ecef;
+  background: var(--cd-reliefweb-light-grey);
   font-size: 17px;
   font-weight: bold;
 }
@@ -149,7 +149,7 @@
 .rw-search-results .rw-river {
   margin-top: 32px;
   padding-bottom: 32px;
-  border-bottom: 1px solid #e6ecef;
+  border-bottom: 1px solid var(--cd-reliefweb-light-grey);
 }
 .rw-search-results .rw-river + .rw-river {
   margin-top: 56px;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-social-media-links/rw-social-media-links.css b/html/themes/custom/common_design_subtheme/components/rw-social-media-links/rw-social-media-links.css
index fc4334982..74e5a3fdd 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-social-media-links/rw-social-media-links.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-social-media-links/rw-social-media-links.css
@@ -17,7 +17,7 @@
 
 .rw-entity-social-media-links--tiles li {
   width: 100%;
-  border: 1px solid #e6ecef;
+  border: 1px solid var(--cd-reliefweb-light-grey);
 }
 
 @media screen and (min-width: 768px) {
@@ -108,6 +108,6 @@
   margin: 24px 0 0 0;
   padding: 24px 0;
   text-align: center;
-  border-top: 1px solid #e6ecef;
+  border-top: 1px solid var(--cd-reliefweb-light-grey);
   line-height: 1;
 }
diff --git a/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css b/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
index db6a51e85..002e6fc2a 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
@@ -1,7 +1,7 @@
 /* Table of contents */
 .rw-toc {
   padding: 32px 0 0 0;
-  border-bottom: 1px solid #e6ecef;
+  border-bottom: 1px solid var(--cd-reliefweb-light-grey);
   font-size: 15px;
 }
 .rw-toc ul,
@@ -58,7 +58,7 @@
   position: relative;
   width: 100%;
   padding: 32px 0;
-  border-bottom: 1px solid #e6ecef;
+  border-bottom: 1px solid var(--cd-reliefweb-light-grey);
 }
 .rw-sectioned-content > section:first-child,
 .rw-sectioned-content > form > fieldset:first-child,
@@ -106,7 +106,7 @@
     width: 80%;
     min-width: auto;
     padding-left: 32px;
-    border-left: 1px solid #e6ecef;
+    border-left: 1px solid var(--cd-reliefweb-light-grey);
   }
   .page-form #main-content > section.default > form.rw-sectioned-content {
     padding: 0;
@@ -130,7 +130,7 @@
     margin: 24px auto;
     padding: 0 8px;
     color: var(--cd-reliefweb-dark-grey);
-    border: 1px solid #e6ecef;
+    border: 1px solid var(--cd-reliefweb-light-grey);
     background: white;
     font-size: 16px;
     font-weight: normal;
@@ -171,10 +171,10 @@
      * the table of contents horizontally. */
     margin: -24px 0 0 -150px;
     padding: 16px 16px 0 16px;
-    border: 1px solid #e6ecef;
+    border: 1px solid var(--cd-reliefweb-light-grey);
     background: white;
-    -webkit-box-shadow: 0 0 6px 2px #e6ecef;
-    box-shadow: 0 0 6px 2px #e6ecef;
+    -webkit-box-shadow: 0 0 6px 2px var(--cd-reliefweb-light-grey);
+    box-shadow: 0 0 6px 2px var(--cd-reliefweb-light-grey);
   }
   /* .js .rw-toc[data-hidden="false"] { */
   /*  display: block; */
@@ -184,7 +184,7 @@
   .js .rw-toc + fieldset,
   .js .rw-toc + .form-wrapper,
   .js .rw-toc + .form-item {
-    border-top: 1px solid #e6ecef;
+    border-top: 1px solid var(--cd-reliefweb-light-grey);
   }
   .js .rw-toc ~ section,
   .js .rw-toc ~ article,
diff --git a/html/themes/custom/common_design_subtheme/components/rw-useful-links/rw-useful-links.css b/html/themes/custom/common_design_subtheme/components/rw-useful-links/rw-useful-links.css
index fc681c162..bc76a3ae0 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-useful-links/rw-useful-links.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-useful-links/rw-useful-links.css
@@ -27,7 +27,7 @@
 .rw-entity-text--resources ul li {
   margin: 0;
   padding: 12px 0;
-  border-bottom: 1px solid #e6ecef;
+  border-bottom: 1px solid var(--cd-reliefweb-light-grey);
   line-height: 24px;
 }
 .rw-entity-useful-links > ul li:first-child,
diff --git a/html/themes/custom/common_design_subtheme/components/rw-user/rw-user-bookmarks.css b/html/themes/custom/common_design_subtheme/components/rw-user/rw-user-bookmarks.css
index 58795a0a9..b41de932b 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-user/rw-user-bookmarks.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-user/rw-user-bookmarks.css
@@ -6,19 +6,19 @@
   position: relative;
   margin: 0 0 20px 0;
   padding: 0 0 0 56px;
-  border: 1px solid #e6ecef;
+  border: 1px solid var(--cd-reliefweb-light-grey);
 }
 .rw-bookmarks article:last-child {
-  border-bottom: 1px solid #e6ecef;
+  border-bottom: 1px solid var(--cd-reliefweb-light-grey);
 }
 .rw-bookmarks article header,
 .rw-bookmarks article footer {
   padding: 16px;
-  border-left: 1px solid #e6ecef;
+  border-left: 1px solid var(--cd-reliefweb-light-grey);
 }
 .rw-bookmarks article .rw-river-article__content {
   padding: 0 16px;
-  border-left: 1px solid #e6ecef;
+  border-left: 1px solid var(--cd-reliefweb-light-grey);
 }
 .rw-bookmarks article:before {
   position: absolute;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-user/rw-user.css b/html/themes/custom/common_design_subtheme/components/rw-user/rw-user.css
index e655b88b5..38507e363 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-user/rw-user.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-user/rw-user.css
@@ -76,7 +76,7 @@
   position: relative;
   width: 100%;
   padding: 16px 0 32px;
-  border-bottom: 1px solid #e6ecef;
+  border-bottom: 1px solid var(--cd-reliefweb-light-grey);
 }
 
 /* Community topics actions */

From fc20d1989c2dd7436d2d72a215cf9497272c2582 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 09:00:51 -0700
Subject: [PATCH 009/720] sass variable for light grey, store other vars as
 comments for now to keep

---
 .../sass/cd/_cd-variables.scss                 | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss b/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
index 58a07ebda..44202c1ff 100644
--- a/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
+++ b/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
@@ -29,6 +29,13 @@
   /* #2e3436 with 0.85 opacity on white. */
   --cd-reliefweb-mid-grey: #4d5254;
   --cd-reliefweb-light-grey: #e6ecef;
+
+  // Slogan
+  /* #2e3436 with 0.7 opacity on white. */
+  //color: #6d7172;
+  /* #e6ecef with 0.4 opacity on white. */
+  //background: #f5f7f9;
+
   --cd-rgb-reliefweb-blue: 9, 136, 187;
   --cd-rgb-reliefweb-red: 246, 92, 81;
   --cd-rgb-reliefweb-dark-blue: 4, 82, 112;
@@ -37,10 +44,8 @@
   --cd-rgb-reliefweb-light-grey: 230, 236, 239;
   --cd-reliefweb-green: #88bb09;
   --cd-reliefweb-orange: #eb8705;
-
   --cd-reliefweb-red--text: #da190b;
   --cd-reliefweb-orange--text: #f49e2c;
-
   --disable: rgba(230, 236, 239, 0.5);
 
   /* On white background */
@@ -48,8 +53,6 @@
   --cd-reliefweb-red--background: rgba(246, 92, 81, 0.2);
   --cd-reliefweb-orange--background: rgba(235, 135, 5, 0.2);
 
-
-
   /* OCHA blue is one colour ramp darker than brand blue */
   --cd-ocha-blue: var(--cd-reliefweb-dark-blue);
   /* Dark blue is two colour ramps darker than brand blue */
@@ -70,12 +73,6 @@
   --cd-blue-grey--dark: #d3dde5;
   --cd-blue-grey--light: #ebf0f4;
 
-
-
-
-
-
-
   // Colours used with rgba().
   // https://stackoverflow.com/questions/40010597/how-do-i-apply-opacity-to-a-css-color-variable
   --cd-rgb-ocha-blue: 2, 108, 182;
@@ -257,3 +254,4 @@ $implementation-primary: $cd-ocha-blue;
 $implementation-primary-dark: $cd-blue--dark;
 $implementation-secondary: $cd-blue--bright;
 $implementation-highlight: $cd-highlight-red;
+$cd-reliefweb-light-grey: var(--cd-reliefweb-light-grey);

From ef3eeae5181406df45395e6d4e59d1bbda7539ae Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 09:04:42 -0700
Subject: [PATCH 010/720] linting

---
 .../components/rw-moderation/rw-moderation.css            | 2 +-
 .../components/rw-pager/rw-pager.css                      | 3 ++-
 .../components/rw-revisions/rw-revisions.css              | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
index 70813e64d..9fcfb9373 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
@@ -65,7 +65,7 @@
 }
 .path-moderation #edit-omnibox .fieldset-wrapper select {
   width: auto;
-  /*height: 100%;*/
+  /* height: 100%; */
 }
 .path-moderation #edit-omnibox div[data-autocomplete] > input {
   border-right: 2px solid var(--cd-reliefweb-light-grey);
diff --git a/html/themes/custom/common_design_subtheme/components/rw-pager/rw-pager.css b/html/themes/custom/common_design_subtheme/components/rw-pager/rw-pager.css
index 95bdeff38..74a345ead 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-pager/rw-pager.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-pager/rw-pager.css
@@ -56,11 +56,12 @@
 }
 /* So the pager nav element expands the entire width of the cd-layout-content area. */
 @media screen and (min-width: 768px) {
-.rw-river-page--with-advanced-search .pager {
+  .rw-river-page--with-advanced-search .pager {
     width: calc(100% + 340px);
     margin-left: -340px;
   }
 }
+
 @media screen and (min-width: 1024px) {
   .rw-river-page--with-advanced-search .pager {
     width: calc(100% + 360px);
diff --git a/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css b/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css
index a7a57fceb..7a565f05b 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css
@@ -117,15 +117,15 @@
   color: red;
 }
 .rw-revisions-history-entry__content__value .rw-revisions-checked::before {
-  content: "\2713 ";
   display: inline-block;
-  border: 1px solid var(--cd-reliefweb-light-grey);
   width: 12px;
   height: 12px;
-  color: var(--cd-reliefweb-dark-grey);
-  line-height: 11px;
   margin-right: 4px;
+  content: "\2713 ";
   vertical-align: middle;
+  color: var(--cd-reliefweb-dark-grey);
+  border: 1px solid var(--cd-reliefweb-light-grey);
+  line-height: 11px;
 }
 .rw-revisions-history-entry__content__value .rw-revisions-added {
   color: green;

From a30efa76ede092059ef81bfdcc4170c4177d922a Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 09:05:09 -0700
Subject: [PATCH 011/720] replace hex with sass variable, compile css

---
 html/themes/custom/common_design_subtheme/css/styles.css  | 2 +-
 .../common_design_subtheme/sass/base/_typography.scss     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/css/styles.css b/html/themes/custom/common_design_subtheme/css/styles.css
index fcb972b0b..9dbe3fa8e 100644
--- a/html/themes/custom/common_design_subtheme/css/styles.css
+++ b/html/themes/custom/common_design_subtheme/css/styles.css
@@ -1 +1 @@
-@import"https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400%3B500%3B700&display=swap";@import"https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,300%3B0,400%3B0,500%3B0,700%3B0,900%3B1,400%3B1,700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400%3B700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@400%3B700&display=swap";:root{--cd-reliefweb-blue: #0988bb;--cd-reliefweb-red: #f65c51;--cd-reliefweb-dark-blue: #055372;--cd-reliefweb-dark-red: #eb1405;--cd-reliefweb-dark-grey: #2e3436;--cd-reliefweb-light-grey: #e6ecef;--cd-rgb-reliefweb-blue: 9, 136, 187;--cd-rgb-reliefweb-red: 246, 92, 81;--cd-rgb-reliefweb-dark-blue: 4, 82, 112;--cd-rgb-reliefweb-dark-red: 235, 20, 5;--cd-rgb-reliefweb-dark-grey: 46, 52, 54;--cd-rgb-reliefweb-light-grey: 230, 236, 239;--cd-ocha-blue: var(--cd-reliefweb-dark-blue);--cd-blue--dark: #04415a;--cd-blue--bright: var(--cd-reliefweb-blue);--cd-blue--light: #d4e5f7;--cd-highlight-red: var(--cd-reliefweb-red);--cd-contrast-red: var(--cd-reliefweb-dark-red);--cd-white: #fff;--cd-grey--light: #f2f2f2;--cd-grey--mid: #595959;--cd-grey--dark: #4a4a4a;--cd-default-text-color: var(--cd-grey--dark);--cd-black: #000;--cd-blue-grey: var(--cd-reliefweb-light-grey);--cd-blue-grey--dark: #d3dde5;--cd-blue-grey--light: #ebf0f4;--cd-rgb-ocha-blue: 2, 108, 182;--cd-rgb-grey--mid: 89, 89, 89;--cd-rgb-grey--dark: 74, 74, 74;--cd-rgb-highlight-red: 229, 106, 84;--cd-rgb-blue-grey--dark: 211, 221, 229;--cd-max-content-width: 820px;--cd-max-body-width: 1400px;--cd-max-width: 1220px;--cd-container-padding: 0.75rem;--cd-container-padding-tablet: 1.5rem;--cd-container-padding-xlarge: 2.5rem;--cd-flow-space: 1rem;--cd-bumper-space: 1rem;--cd-footer-row-number: 5;--cd-red: #cd3a1f;--cd-red--light: #f8d8d3;--cd-orange: #db7b18;--cd-orange--light: #fae6d1;--cd-yellow: #d5de26;--cd-yellow--light: #f7f8d3;--cd-green: #7fb92f;--cd-green--light: #e8f5d6;--cd-font-size--tiny: 0.75rem;--cd-font-size--small: 0.875rem;--cd-font-size--base: 1.125rem;--cd-font-size--medium: 1.375rem;--cd-font-size--large: 1.625rem;--cd-font-size--2xbase: 1.875rem;--cd-font-size--2xmedium: 2.375rem;--cd-font-size--2xlarge: 2.875rem;--cd-font: helvetica, arial, sans-serif;--cd-font--system: system-ui;--cd-font--noto: "Noto Sans", sans-serif;--cd-font--noto-kufi: "Noto Kufi Arabic", sans-serif;--cd-font--roboto: "Roboto", helvetica, arial, sans-serif;--cd-font--roboto-condensed: "Roboto Condensed", helvetica, arial, sans-serif;--cd-font--roboto-slab: "Roboto Slab", helvetica, arial, sans-serif}@supports(display: grid){@media(min-width: 768px){.cd-layout-container{grid-template-rows:151px auto 1fr auto}}}@media(min-width: 768px){.cd-layout-container .cd-layout-content-wrapper{display:flex;flex-wrap:wrap}}@media(min-width: 768px){.cd-layout-content{flex-basis:0;flex-grow:999}}.cd-global-header__dropdown{background:var(--cd-ocha-blue)}.cd-global-header button[aria-expanded=true]::before{border-color:transparent transparent var(--cd-ocha-blue)}@media(max-width: 767px){.cd-global-header button[aria-expanded] span[class*=__btn-label]{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}.cd-header button:focus{outline:3px solid var(--cd-blue--bright)}.cd-global-header{background:var(--cd-ocha-blue);background-image:linear-gradient(-180deg, var(--cd-ocha-blue) 67%, var(--cd-blue--dark) 97%)}@supports(display: grid){.cd-site-header__inner{grid-template-columns:52px 1fr}@media(min-width: 768px){.cd-site-header__inner{grid-template-columns:186px 1fr}}}.cd-language-switcher__btn:focus{outline:3px solid var(--cd-blue--bright)}.cd-user-menu__dropdown li a:focus{outline:3px solid var(--cd-blue--bright)}.cd-site-logo{width:52px}.cd-site-logo:focus{outline:3px solid var(--cd-blue--bright)}@media(max-width: 767px){.cd-site-logo{background:url("../img/logos/rw-logo-mobile.svg") center no-repeat;background:linear-gradient(transparent, transparent),url("../img/logos/rw-logo-mobile.svg") center no-repeat}}@media(min-width: 768px){.cd-site-logo{width:140px}}.menu--main button[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-highlight-red)}.cd-nav__btn[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-highlight-red)}.cd-nav__btn[aria-expanded=true]::before{background:var(--cd-highlight-red)}@media(max-width: 1023px){.cd-site-header__nav-holder .cd-nav>ul>li>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>button.is-active::before{background:var(--cd-highlight-red)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>button.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>button.is-active::before{background:rgba(var(--cd-highlight-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-highlight-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-highlight-red)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-highlight-red), 0.6)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-highlight-red)}}@media(min-width: 1024px){.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail button::before{background:var(--cd-highlight-red)}.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a:focus::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button:focus::before{background:var(--cd-highlight-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul a.is-active,.cd-site-header__nav-holder .cd-nav>.menu>li>ul button.is-active{border-left:3px solid var(--cd-highlight-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul>li.menu-item--active-trail .is-active{border-left:3px solid var(--cd-highlight-red)}}.cd-ocha-dropdown__link a:focus{outline:3px solid var(--cd-blue--bright)}.cd-search__btn{color:var(--cd-ocha-blue)}.cd-search__btn svg{fill:var(--cd-ocha-blue)}.cd-search__btn:hover,.cd-search__btn:focus{color:var(--cd-blue--dark)}.cd-search__btn:hover svg,.cd-search__btn:focus svg{fill:var(--cd-blue--dark)}.cd-search__btn:focus{color:var(--cd-highlight-red)}.cd-search__btn:focus svg{fill:var(--cd-highlight-red)}.cd-search__btn[aria-expanded=true]{color:var(--cd-highlight-red)}.cd-search__btn[aria-expanded=true] svg{fill:var(--cd-highlight-red)}.cd-search__submit:focus{background-color:var(--cd-highlight-red)}.cd-user-menu--no-language-switcher li:last-child a,.cd-user-menu--no-language-switcher li:last-child button{padding-right:0}.cd-user-menu--no-language-switcher li:last-child a::after,.cd-user-menu--no-language-switcher li:last-child button::after{content:none}.cd-user-menu__item:focus,.cd-global-header .menu>li a:focus,.cd-global-header .menu>li button:focus{outline:3px solid var(--cd-blue--bright)}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button{padding-right:0}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a::after,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button::after{content:none}@media(max-width: 767px){.cd-global-header__user-menu a svg+span{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}[dir=ltr] .admin-menu__btn svg+span{margin-left:10px}[dir=rtl] .admin-menu__btn svg+span{margin-right:10px}.admin-menu__btn .cd-icon:not(.cd-icon--arrow-down){display:inline-block;width:14px;height:14px;vertical-align:middle;fill:var(--cd-white)}.cd-footer{background:var(--cd-ocha-blue)}.cd-footer a:focus{outline:3px solid var(--cd-blue--bright)}.cd-footer-copyright{display:block;margin-top:0;text-align:right;color:#fff;font-size:12px;font-weight:lighter}.cd-footer-copyright p{margin:0}.cd-footer-copyright a{display:inline-block;overflow:hidden;width:140px;height:60px;margin:0 0 -4px 0;padding:0 0 0 140px;background:url(../img/logos/rw-logo-sprite.png) 0 -60px no-repeat;background:rgba(0,0,0,0) url(../img/logos/rw-logo-sprite.svg) 0 -60px no-repeat}.cd-footer-copyright a:hover,.cd-footer-copyright a:active,.cd-footer-copyright a:focus{opacity:.8}@media all and (max-width: 1023px){.cd-footer-copyright{width:100%;text-align:center}}.cd-soft-footer{background:rgba(var(--cd-rgb-ocha-blue), 0.9)}.cd-soft-footer a:focus{outline:3px solid var(--cd-blue--bright)}a{color:var(--cd-blue--dark)}a:hover,a:focus{color:var(--cd-ocha-blue)}h1,h2{margin:0 0 24px 0;letter-spacing:.5px;font-size:24px;font-weight:bold;line-height:1.3}@media screen and (min-width: 480px){h1,h2{font-size:var(--cd-font-size--2xbase)}}h3{margin:0 0 16px 0;letter-spacing:.5px;font-size:20px;font-weight:bold;line-height:1.3}h4{margin:0 0 16px 0;letter-spacing:.5px;font-size:18px;font-weight:bold;line-height:1.3}h5{margin:0 0 16px 0;letter-spacing:.5px;font-size:17px;font-weight:bold;font-style:italic}h6{margin:0 0 16px 0;letter-spacing:.5px;font-size:16px;font-weight:bold}.rw-article__content *+h3,.rw-article__content *+h4,.rw-article__content *+h5,.rw-article__content *+h6{margin-top:16px}@media all and (max-width: 479px){#main h2{font-size:24px}}p{margin:1rem 0;line-height:1.6}p:first-child{margin-top:0}p:last-child{margin-bottom:0}input[type=search]{-moz-appearance:none;-webkit-appearance:none;appearance:none}input::-webkit-search-decoration{-webkit-appearance:none}input:-ms-input-placeholder{opacity:.7;color:inherit;font-style:italic}input::-moz-placeholder{opacity:.7;color:inherit;font-style:italic}input::placeholder{opacity:.7;color:inherit;font-style:italic}select{max-width:100%}select:not([multitple]){-moz-appearance:menulist-button;-webkit-appearance:menulist-button}fieldset{min-inline-size:auto}table{width:100%;border-collapse:collapse}table caption{margin:12px 0;font-weight:bold}table th,table td{padding:8px;border:1px solid #e6ecef}table th{border-left-color:#fff;background:#e6ecef}table thead th{border-left-color:#fff}th.field-label>h4.label{margin:0}table thead th:first-child{border-left-color:#e6ecef}table tbody th{border-top-color:#fff}table tbody th:first-child{border-top-color:#e6ecef}
+@import"https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400%3B500%3B700&display=swap";@import"https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,300%3B0,400%3B0,500%3B0,700%3B0,900%3B1,400%3B1,700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400%3B700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@400%3B700&display=swap";:root{--cd-reliefweb-blue: #0988bb;--cd-reliefweb-red: #f65c51;--cd-reliefweb-dark-blue: #055372;--cd-reliefweb-dark-red: #eb1405;--cd-reliefweb-dark-grey: #2e3436;--cd-reliefweb-mid-grey: #4d5254;--cd-reliefweb-light-grey: #e6ecef;--cd-rgb-reliefweb-blue: 9, 136, 187;--cd-rgb-reliefweb-red: 246, 92, 81;--cd-rgb-reliefweb-dark-blue: 4, 82, 112;--cd-rgb-reliefweb-dark-red: 235, 20, 5;--cd-rgb-reliefweb-dark-grey: 46, 52, 54;--cd-rgb-reliefweb-light-grey: 230, 236, 239;--cd-reliefweb-green: #88bb09;--cd-reliefweb-orange: #eb8705;--cd-reliefweb-red--text: #da190b;--cd-reliefweb-orange--text: #f49e2c;--disable: rgba(230, 236, 239, 0.5);--cd-reliefweb-green--background: rgba(136, 187, 9, 0.2);--cd-reliefweb-red--background: rgba(246, 92, 81, 0.2);--cd-reliefweb-orange--background: rgba(235, 135, 5, 0.2);--cd-ocha-blue: var(--cd-reliefweb-dark-blue);--cd-blue--dark: #04415a;--cd-blue--bright: var(--cd-reliefweb-blue);--cd-blue--light: #d4e5f7;--cd-highlight-red: var(--cd-reliefweb-red);--cd-contrast-red: var(--cd-reliefweb-dark-red);--cd-white: #fff;--cd-grey--light: #f2f2f2;--cd-grey--mid: #595959;--cd-grey--dark: #4a4a4a;--cd-default-text-color: var(--cd-grey--dark);--cd-black: #000;--cd-blue-grey: var(--cd-reliefweb-light-grey);--cd-blue-grey--dark: #d3dde5;--cd-blue-grey--light: #ebf0f4;--cd-rgb-ocha-blue: 2, 108, 182;--cd-rgb-grey--mid: 89, 89, 89;--cd-rgb-grey--dark: 74, 74, 74;--cd-rgb-highlight-red: 229, 106, 84;--cd-rgb-blue-grey--dark: 211, 221, 229;--cd-max-content-width: 820px;--cd-max-body-width: 1400px;--cd-max-width: 1220px;--cd-container-padding: 0.75rem;--cd-container-padding-tablet: 1.5rem;--cd-container-padding-xlarge: 2.5rem;--cd-flow-space: 1rem;--cd-bumper-space: 1rem;--cd-footer-row-number: 5;--cd-red: #cd3a1f;--cd-red--light: #f8d8d3;--cd-orange: #db7b18;--cd-orange--light: #fae6d1;--cd-yellow: #d5de26;--cd-yellow--light: #f7f8d3;--cd-green: #7fb92f;--cd-green--light: #e8f5d6;--cd-font-size--tiny: 0.75rem;--cd-font-size--small: 0.875rem;--cd-font-size--base: 1.125rem;--cd-font-size--medium: 1.375rem;--cd-font-size--large: 1.625rem;--cd-font-size--2xbase: 1.875rem;--cd-font-size--2xmedium: 2.375rem;--cd-font-size--2xlarge: 2.875rem;--cd-font: helvetica, arial, sans-serif;--cd-font--system: system-ui;--cd-font--noto: "Noto Sans", sans-serif;--cd-font--noto-kufi: "Noto Kufi Arabic", sans-serif;--cd-font--roboto: "Roboto", helvetica, arial, sans-serif;--cd-font--roboto-condensed: "Roboto Condensed", helvetica, arial, sans-serif;--cd-font--roboto-slab: "Roboto Slab", helvetica, arial, sans-serif}@supports(display: grid){@media(min-width: 768px){.cd-layout-container{grid-template-rows:151px auto 1fr auto}}}@media(min-width: 768px){.cd-layout-container .cd-layout-content-wrapper{display:flex;flex-wrap:wrap}}@media(min-width: 768px){.cd-layout-content{flex-basis:0;flex-grow:999}}.cd-global-header__dropdown{background:var(--cd-ocha-blue)}.cd-global-header button[aria-expanded=true]::before{border-color:transparent transparent var(--cd-ocha-blue)}@media(max-width: 767px){.cd-global-header button[aria-expanded] span[class*=__btn-label]{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}.cd-header button:focus{outline:3px solid var(--cd-blue--bright)}.cd-global-header{background:var(--cd-ocha-blue);background-image:linear-gradient(-180deg, var(--cd-ocha-blue) 67%, var(--cd-blue--dark) 97%)}@supports(display: grid){.cd-site-header__inner{grid-template-columns:52px 1fr}@media(min-width: 768px){.cd-site-header__inner{grid-template-columns:186px 1fr}}}.cd-language-switcher__btn:focus{outline:3px solid var(--cd-blue--bright)}.cd-user-menu__dropdown li a:focus{outline:3px solid var(--cd-blue--bright)}.cd-site-logo{width:52px}.cd-site-logo:focus{outline:3px solid var(--cd-blue--bright)}@media(max-width: 767px){.cd-site-logo{background:url("../img/logos/rw-logo-mobile.svg") center no-repeat;background:linear-gradient(transparent, transparent),url("../img/logos/rw-logo-mobile.svg") center no-repeat}}@media(min-width: 768px){.cd-site-logo{width:140px}}.menu--main button[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-highlight-red)}.cd-nav__btn[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-highlight-red)}.cd-nav__btn[aria-expanded=true]::before{background:var(--cd-highlight-red)}@media(max-width: 1023px){.cd-site-header__nav-holder .cd-nav>ul>li>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>button.is-active::before{background:var(--cd-highlight-red)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>button.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>button.is-active::before{background:rgba(var(--cd-highlight-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-highlight-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-highlight-red)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-highlight-red), 0.6)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-highlight-red)}}@media(min-width: 1024px){.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail button::before{background:var(--cd-highlight-red)}.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a:focus::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button:focus::before{background:var(--cd-highlight-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul a.is-active,.cd-site-header__nav-holder .cd-nav>.menu>li>ul button.is-active{border-left:3px solid var(--cd-highlight-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul>li.menu-item--active-trail .is-active{border-left:3px solid var(--cd-highlight-red)}}.cd-ocha-dropdown__link a:focus{outline:3px solid var(--cd-blue--bright)}.cd-search__btn{color:var(--cd-ocha-blue)}.cd-search__btn svg{fill:var(--cd-ocha-blue)}.cd-search__btn:hover,.cd-search__btn:focus{color:var(--cd-blue--dark)}.cd-search__btn:hover svg,.cd-search__btn:focus svg{fill:var(--cd-blue--dark)}.cd-search__btn:focus{color:var(--cd-highlight-red)}.cd-search__btn:focus svg{fill:var(--cd-highlight-red)}.cd-search__btn[aria-expanded=true]{color:var(--cd-highlight-red)}.cd-search__btn[aria-expanded=true] svg{fill:var(--cd-highlight-red)}.cd-search__submit:focus{background-color:var(--cd-highlight-red)}.cd-user-menu--no-language-switcher li:last-child a,.cd-user-menu--no-language-switcher li:last-child button{padding-right:0}.cd-user-menu--no-language-switcher li:last-child a::after,.cd-user-menu--no-language-switcher li:last-child button::after{content:none}.cd-user-menu__item:focus,.cd-global-header .menu>li a:focus,.cd-global-header .menu>li button:focus{outline:3px solid var(--cd-blue--bright)}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button{padding-right:0}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a::after,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button::after{content:none}@media(max-width: 767px){.cd-global-header__user-menu a svg+span{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}[dir=ltr] .admin-menu__btn svg+span{margin-left:10px}[dir=rtl] .admin-menu__btn svg+span{margin-right:10px}.admin-menu__btn .cd-icon:not(.cd-icon--arrow-down){display:inline-block;width:14px;height:14px;vertical-align:middle;fill:var(--cd-white)}.cd-footer{background:var(--cd-ocha-blue)}.cd-footer a:focus{outline:3px solid var(--cd-blue--bright)}.cd-footer-copyright{display:block;margin-top:0;text-align:right;color:#fff;font-size:12px;font-weight:lighter}.cd-footer-copyright p{margin:0}.cd-footer-copyright a{display:inline-block;overflow:hidden;width:140px;height:60px;margin:0 0 -4px 0;padding:0 0 0 140px;background:url(../img/logos/rw-logo-sprite.png) 0 -60px no-repeat;background:rgba(0,0,0,0) url(../img/logos/rw-logo-sprite.svg) 0 -60px no-repeat}.cd-footer-copyright a:hover,.cd-footer-copyright a:active,.cd-footer-copyright a:focus{opacity:.8}@media all and (max-width: 1023px){.cd-footer-copyright{width:100%;text-align:center}}.cd-soft-footer{background:rgba(var(--cd-rgb-ocha-blue), 0.9)}.cd-soft-footer a:focus{outline:3px solid var(--cd-blue--bright)}a{color:var(--cd-blue--dark)}a:hover,a:focus{color:var(--cd-ocha-blue)}h1,h2{margin:0 0 24px 0;letter-spacing:.5px;font-size:24px;font-weight:bold;line-height:1.3}@media screen and (min-width: 480px){h1,h2{font-size:var(--cd-font-size--2xbase)}}h3{margin:0 0 16px 0;letter-spacing:.5px;font-size:20px;font-weight:bold;line-height:1.3}h4{margin:0 0 16px 0;letter-spacing:.5px;font-size:18px;font-weight:bold;line-height:1.3}h5{margin:0 0 16px 0;letter-spacing:.5px;font-size:17px;font-weight:bold;font-style:italic}h6{margin:0 0 16px 0;letter-spacing:.5px;font-size:16px;font-weight:bold}.rw-article__content *+h3,.rw-article__content *+h4,.rw-article__content *+h5,.rw-article__content *+h6{margin-top:16px}@media all and (max-width: 479px){#main h2{font-size:24px}}p{margin:1rem 0;line-height:1.6}p:first-child{margin-top:0}p:last-child{margin-bottom:0}input[type=search]{-moz-appearance:none;-webkit-appearance:none;appearance:none}input::-webkit-search-decoration{-webkit-appearance:none}input:-ms-input-placeholder{opacity:.7;color:inherit;font-style:italic}input::-moz-placeholder{opacity:.7;color:inherit;font-style:italic}input::placeholder{opacity:.7;color:inherit;font-style:italic}select{max-width:100%}select:not([multitple]){-moz-appearance:menulist-button;-webkit-appearance:menulist-button}fieldset{min-inline-size:auto}table{width:100%;border-collapse:collapse}table caption{margin:12px 0;font-weight:bold}table th,table td{padding:8px;border:1px solid var(--cd-reliefweb-light-grey)}table th{border-left-color:#fff;background:var(--cd-reliefweb-light-grey)}table thead th{border-left-color:#fff}th.field-label>h4.label{margin:0}table thead th:first-child{border-left-color:var(--cd-reliefweb-light-grey)}table tbody th{border-top-color:#fff}table tbody th:first-child{border-top-color:var(--cd-reliefweb-light-grey)}
diff --git a/html/themes/custom/common_design_subtheme/sass/base/_typography.scss b/html/themes/custom/common_design_subtheme/sass/base/_typography.scss
index 6af176834..1768e569f 100644
--- a/html/themes/custom/common_design_subtheme/sass/base/_typography.scss
+++ b/html/themes/custom/common_design_subtheme/sass/base/_typography.scss
@@ -154,11 +154,11 @@ table caption {
 table th,
 table td {
   padding: 8px;
-  border: 1px solid #e6ecef;
+  border: 1px solid $cd-reliefweb-light-grey;
 }
 table th {
   border-left-color: white;
-  background: #e6ecef;
+  background: $cd-reliefweb-light-grey;
 }
 table thead th {
   border-left-color: white;
@@ -167,11 +167,11 @@ th.field-label > h4.label {
   margin: 0;
 }
 table thead th:first-child {
-  border-left-color: #e6ecef;
+  border-left-color: $cd-reliefweb-light-grey;
 }
 table tbody th {
   border-top-color: white;
 }
 table tbody th:first-child {
-  border-top-color: #e6ecef;
+  border-top-color: $cd-reliefweb-light-grey;
 }

From 4353f80c43afe482b50fb766f1c5b79e8c26de48 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 09:10:25 -0700
Subject: [PATCH 012/720] moderation status colour to keep

---
 .../sass/cd/_cd-variables.scss                | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss b/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
index 44202c1ff..36f02e590 100644
--- a/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
+++ b/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
@@ -48,6 +48,29 @@
   --cd-reliefweb-orange--text: #f49e2c;
   --disable: rgba(230, 236, 239, 0.5);
 
+
+  // Moderation
+  //  border-color: #d9d9d9;
+  //  background-color: rgba(217, 217, 217, 0.2);
+  //  border-color: #f49e2c;
+  //  background-color: rgba(244, 158, 44, 0.2);
+  //  border-color: #076d96;
+  //  background-color: rgba(7, 109, 150, 0.2);
+  //  border-color: #88bb09;
+  //  background-color: rgba(136, 187, 9, 0.2);
+  //  border-color: #da190b;
+  //  background-color: rgba(218, 25, 11, 0.2);
+  //  border-color: #9509bb;
+  //  background-color: rgba(149, 9, 187, 0.2);
+  //  border-color: #4b4b4b;
+  //  background-color: rgba(75, 75, 75, 0.2);
+  //  border-color: #8f5507;
+  //  background-color: rgba(143, 85, 7, 0.2);
+  //  border-color: #f5cb2f;
+  //  background: rgba(245, 203, 47, 0.2);
+  //  border-color: #56c9f7;
+  //  background-color: rgba(86, 201, 247, 0.2);
+
   /* On white background */
   --cd-reliefweb-green--background: rgba(136, 187, 9, 0.2);
   --cd-reliefweb-red--background: rgba(246, 92, 81, 0.2);

From 2c46e0af15f5ce4b8eb6b76489f544ef11bc16f9 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 09:11:40 -0700
Subject: [PATCH 013/720] search and replace 88bb09 hex with
 --cd-reliefweb-green

---
 .../common_design_subtheme/components/rw-icons/rw-icons.json  | 2 +-
 .../components/rw-moderation-status/rw-moderation-status.css  | 4 ++--
 .../rw-user-posting-rights/rw-user-posting-rights.css         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.json b/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.json
index 992f3d193..1e604dfe3 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.json
+++ b/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.json
@@ -9,7 +9,7 @@
     "grey": "#b6c8d0",
     "white": "white",
     "blue": "--cd-reliefweb-blue",
-    "green": "#88bb09",
+    "green": "var(--cd-reliefweb-green)",
     "orange": "#eb8705",
     "red": "var(--cd-reliefweb-red)"
   },
diff --git a/html/themes/custom/common_design_subtheme/components/rw-moderation-status/rw-moderation-status.css b/html/themes/custom/common_design_subtheme/components/rw-moderation-status/rw-moderation-status.css
index ec03a4e5e..7bd942436 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-moderation-status/rw-moderation-status.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-moderation-status/rw-moderation-status.css
@@ -17,7 +17,7 @@
 [data-moderation-status="past"],
 [data-moderation-status="active"],
 [data-moderation-status="normal"] {
-  border-color: #88bb09;
+  border-color: var(--cd-reliefweb-green);
   background-color: rgba(136, 187, 9, 0.2);
 }
 [data-moderation-status="refused"],
@@ -33,7 +33,7 @@
   border-color: #9509bb;
   background-color: rgba(149, 9, 187, 0.2);
 }
-[data-moderation-status="draft_archive"], {
+[data-moderation-status="draft_archive"] {
   border-color: #4b4b4b;
   background-color: rgba(75, 75, 75, 0.2);
 }
diff --git a/html/themes/custom/common_design_subtheme/components/rw-user-posting-rights/rw-user-posting-rights.css b/html/themes/custom/common_design_subtheme/components/rw-user-posting-rights/rw-user-posting-rights.css
index b8caa29f0..9873cf8bd 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-user-posting-rights/rw-user-posting-rights.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-user-posting-rights/rw-user-posting-rights.css
@@ -26,6 +26,6 @@
   background: rgba(7, 109, 150, 0.2);
 }
 .rw-user-posting-right[data-user-posting-right="trusted"] {
-  border-color: #88bb09;
+  border-color: var(--cd-reliefweb-green);
   background: rgba(136, 187, 9, 0.2);
 }

From 0059c7fa59998b198ec74541e514b822cf849aa0 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 09:13:28 -0700
Subject: [PATCH 014/720] search and replace eb8705 hex with
 --cd-reliefweb-orange

---
 .../components/rw-disasters/rw-disasters.css                  | 4 ++--
 .../components/rw-entity-meta/rw-entity-meta.css              | 2 +-
 .../common_design_subtheme/components/rw-icons/rw-icons.json  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-disasters/rw-disasters.css b/html/themes/custom/common_design_subtheme/components/rw-disasters/rw-disasters.css
index a073384c7..1d1e90f91 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-disasters/rw-disasters.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-disasters/rw-disasters.css
@@ -269,8 +269,8 @@
   background-color: #b6c8d0;
 }
 .taxonomy-term--disaster--full[data-disaster-status="alert"] .rw-article__header:before {
-  border-color: #eb8705;
-  background-color: #eb8705;
+  border-color: var(--cd-reliefweb-orange);
+  background-color: var(--cd-reliefweb-orange);
 }
 .taxonomy-term--disaster--full[data-disaster-status="current"] .rw-article__header:before,
 .taxonomy-term--disaster--full[data-disaster-status="ongoing"] .rw-article__header:before {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-entity-meta/rw-entity-meta.css b/html/themes/custom/common_design_subtheme/components/rw-entity-meta/rw-entity-meta.css
index ea50b13e2..6fc6ff953 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-entity-meta/rw-entity-meta.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-entity-meta/rw-entity-meta.css
@@ -165,7 +165,7 @@
 }
 .rw-entity-meta dd.rw-entity-meta__tag-value--status--alert:before {
   content: "";
-  background: #eb8705;
+  background: var(--cd-reliefweb-orange);
 }
 .rw-entity-meta dd.rw-entity-meta__tag-value--status--ongoing:before {
   content: "";
diff --git a/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.json b/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.json
index 1e604dfe3..ee6e3c740 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.json
+++ b/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.json
@@ -10,7 +10,7 @@
     "white": "white",
     "blue": "--cd-reliefweb-blue",
     "green": "var(--cd-reliefweb-green)",
-    "orange": "#eb8705",
+    "orange": "var(--cd-reliefweb-orange)",
     "red": "var(--cd-reliefweb-red)"
   },
   "icons": {

From 87096647ca18ec2ab695b785b8a6a6b827ad8330 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 09:30:16 -0700
Subject: [PATCH 015/720] reset ocha brand variables and add rw modifications
 to implemantation variables block, regen css

---
 .../common_design_subtheme/css/styles.css     |  2 +-
 .../sass/cd/_cd-variables.scss                | 23 ++++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/css/styles.css b/html/themes/custom/common_design_subtheme/css/styles.css
index 9dbe3fa8e..bec015f6c 100644
--- a/html/themes/custom/common_design_subtheme/css/styles.css
+++ b/html/themes/custom/common_design_subtheme/css/styles.css
@@ -1 +1 @@
-@import"https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400%3B500%3B700&display=swap";@import"https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,300%3B0,400%3B0,500%3B0,700%3B0,900%3B1,400%3B1,700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400%3B700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@400%3B700&display=swap";:root{--cd-reliefweb-blue: #0988bb;--cd-reliefweb-red: #f65c51;--cd-reliefweb-dark-blue: #055372;--cd-reliefweb-dark-red: #eb1405;--cd-reliefweb-dark-grey: #2e3436;--cd-reliefweb-mid-grey: #4d5254;--cd-reliefweb-light-grey: #e6ecef;--cd-rgb-reliefweb-blue: 9, 136, 187;--cd-rgb-reliefweb-red: 246, 92, 81;--cd-rgb-reliefweb-dark-blue: 4, 82, 112;--cd-rgb-reliefweb-dark-red: 235, 20, 5;--cd-rgb-reliefweb-dark-grey: 46, 52, 54;--cd-rgb-reliefweb-light-grey: 230, 236, 239;--cd-reliefweb-green: #88bb09;--cd-reliefweb-orange: #eb8705;--cd-reliefweb-red--text: #da190b;--cd-reliefweb-orange--text: #f49e2c;--disable: rgba(230, 236, 239, 0.5);--cd-reliefweb-green--background: rgba(136, 187, 9, 0.2);--cd-reliefweb-red--background: rgba(246, 92, 81, 0.2);--cd-reliefweb-orange--background: rgba(235, 135, 5, 0.2);--cd-ocha-blue: var(--cd-reliefweb-dark-blue);--cd-blue--dark: #04415a;--cd-blue--bright: var(--cd-reliefweb-blue);--cd-blue--light: #d4e5f7;--cd-highlight-red: var(--cd-reliefweb-red);--cd-contrast-red: var(--cd-reliefweb-dark-red);--cd-white: #fff;--cd-grey--light: #f2f2f2;--cd-grey--mid: #595959;--cd-grey--dark: #4a4a4a;--cd-default-text-color: var(--cd-grey--dark);--cd-black: #000;--cd-blue-grey: var(--cd-reliefweb-light-grey);--cd-blue-grey--dark: #d3dde5;--cd-blue-grey--light: #ebf0f4;--cd-rgb-ocha-blue: 2, 108, 182;--cd-rgb-grey--mid: 89, 89, 89;--cd-rgb-grey--dark: 74, 74, 74;--cd-rgb-highlight-red: 229, 106, 84;--cd-rgb-blue-grey--dark: 211, 221, 229;--cd-max-content-width: 820px;--cd-max-body-width: 1400px;--cd-max-width: 1220px;--cd-container-padding: 0.75rem;--cd-container-padding-tablet: 1.5rem;--cd-container-padding-xlarge: 2.5rem;--cd-flow-space: 1rem;--cd-bumper-space: 1rem;--cd-footer-row-number: 5;--cd-red: #cd3a1f;--cd-red--light: #f8d8d3;--cd-orange: #db7b18;--cd-orange--light: #fae6d1;--cd-yellow: #d5de26;--cd-yellow--light: #f7f8d3;--cd-green: #7fb92f;--cd-green--light: #e8f5d6;--cd-font-size--tiny: 0.75rem;--cd-font-size--small: 0.875rem;--cd-font-size--base: 1.125rem;--cd-font-size--medium: 1.375rem;--cd-font-size--large: 1.625rem;--cd-font-size--2xbase: 1.875rem;--cd-font-size--2xmedium: 2.375rem;--cd-font-size--2xlarge: 2.875rem;--cd-font: helvetica, arial, sans-serif;--cd-font--system: system-ui;--cd-font--noto: "Noto Sans", sans-serif;--cd-font--noto-kufi: "Noto Kufi Arabic", sans-serif;--cd-font--roboto: "Roboto", helvetica, arial, sans-serif;--cd-font--roboto-condensed: "Roboto Condensed", helvetica, arial, sans-serif;--cd-font--roboto-slab: "Roboto Slab", helvetica, arial, sans-serif}@supports(display: grid){@media(min-width: 768px){.cd-layout-container{grid-template-rows:151px auto 1fr auto}}}@media(min-width: 768px){.cd-layout-container .cd-layout-content-wrapper{display:flex;flex-wrap:wrap}}@media(min-width: 768px){.cd-layout-content{flex-basis:0;flex-grow:999}}.cd-global-header__dropdown{background:var(--cd-ocha-blue)}.cd-global-header button[aria-expanded=true]::before{border-color:transparent transparent var(--cd-ocha-blue)}@media(max-width: 767px){.cd-global-header button[aria-expanded] span[class*=__btn-label]{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}.cd-header button:focus{outline:3px solid var(--cd-blue--bright)}.cd-global-header{background:var(--cd-ocha-blue);background-image:linear-gradient(-180deg, var(--cd-ocha-blue) 67%, var(--cd-blue--dark) 97%)}@supports(display: grid){.cd-site-header__inner{grid-template-columns:52px 1fr}@media(min-width: 768px){.cd-site-header__inner{grid-template-columns:186px 1fr}}}.cd-language-switcher__btn:focus{outline:3px solid var(--cd-blue--bright)}.cd-user-menu__dropdown li a:focus{outline:3px solid var(--cd-blue--bright)}.cd-site-logo{width:52px}.cd-site-logo:focus{outline:3px solid var(--cd-blue--bright)}@media(max-width: 767px){.cd-site-logo{background:url("../img/logos/rw-logo-mobile.svg") center no-repeat;background:linear-gradient(transparent, transparent),url("../img/logos/rw-logo-mobile.svg") center no-repeat}}@media(min-width: 768px){.cd-site-logo{width:140px}}.menu--main button[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-highlight-red)}.cd-nav__btn[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-highlight-red)}.cd-nav__btn[aria-expanded=true]::before{background:var(--cd-highlight-red)}@media(max-width: 1023px){.cd-site-header__nav-holder .cd-nav>ul>li>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>button.is-active::before{background:var(--cd-highlight-red)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>button.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>button.is-active::before{background:rgba(var(--cd-highlight-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-highlight-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-highlight-red)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-highlight-red), 0.6)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-highlight-red)}}@media(min-width: 1024px){.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail button::before{background:var(--cd-highlight-red)}.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a:focus::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button:focus::before{background:var(--cd-highlight-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul a.is-active,.cd-site-header__nav-holder .cd-nav>.menu>li>ul button.is-active{border-left:3px solid var(--cd-highlight-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul>li.menu-item--active-trail .is-active{border-left:3px solid var(--cd-highlight-red)}}.cd-ocha-dropdown__link a:focus{outline:3px solid var(--cd-blue--bright)}.cd-search__btn{color:var(--cd-ocha-blue)}.cd-search__btn svg{fill:var(--cd-ocha-blue)}.cd-search__btn:hover,.cd-search__btn:focus{color:var(--cd-blue--dark)}.cd-search__btn:hover svg,.cd-search__btn:focus svg{fill:var(--cd-blue--dark)}.cd-search__btn:focus{color:var(--cd-highlight-red)}.cd-search__btn:focus svg{fill:var(--cd-highlight-red)}.cd-search__btn[aria-expanded=true]{color:var(--cd-highlight-red)}.cd-search__btn[aria-expanded=true] svg{fill:var(--cd-highlight-red)}.cd-search__submit:focus{background-color:var(--cd-highlight-red)}.cd-user-menu--no-language-switcher li:last-child a,.cd-user-menu--no-language-switcher li:last-child button{padding-right:0}.cd-user-menu--no-language-switcher li:last-child a::after,.cd-user-menu--no-language-switcher li:last-child button::after{content:none}.cd-user-menu__item:focus,.cd-global-header .menu>li a:focus,.cd-global-header .menu>li button:focus{outline:3px solid var(--cd-blue--bright)}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button{padding-right:0}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a::after,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button::after{content:none}@media(max-width: 767px){.cd-global-header__user-menu a svg+span{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}[dir=ltr] .admin-menu__btn svg+span{margin-left:10px}[dir=rtl] .admin-menu__btn svg+span{margin-right:10px}.admin-menu__btn .cd-icon:not(.cd-icon--arrow-down){display:inline-block;width:14px;height:14px;vertical-align:middle;fill:var(--cd-white)}.cd-footer{background:var(--cd-ocha-blue)}.cd-footer a:focus{outline:3px solid var(--cd-blue--bright)}.cd-footer-copyright{display:block;margin-top:0;text-align:right;color:#fff;font-size:12px;font-weight:lighter}.cd-footer-copyright p{margin:0}.cd-footer-copyright a{display:inline-block;overflow:hidden;width:140px;height:60px;margin:0 0 -4px 0;padding:0 0 0 140px;background:url(../img/logos/rw-logo-sprite.png) 0 -60px no-repeat;background:rgba(0,0,0,0) url(../img/logos/rw-logo-sprite.svg) 0 -60px no-repeat}.cd-footer-copyright a:hover,.cd-footer-copyright a:active,.cd-footer-copyright a:focus{opacity:.8}@media all and (max-width: 1023px){.cd-footer-copyright{width:100%;text-align:center}}.cd-soft-footer{background:rgba(var(--cd-rgb-ocha-blue), 0.9)}.cd-soft-footer a:focus{outline:3px solid var(--cd-blue--bright)}a{color:var(--cd-blue--dark)}a:hover,a:focus{color:var(--cd-ocha-blue)}h1,h2{margin:0 0 24px 0;letter-spacing:.5px;font-size:24px;font-weight:bold;line-height:1.3}@media screen and (min-width: 480px){h1,h2{font-size:var(--cd-font-size--2xbase)}}h3{margin:0 0 16px 0;letter-spacing:.5px;font-size:20px;font-weight:bold;line-height:1.3}h4{margin:0 0 16px 0;letter-spacing:.5px;font-size:18px;font-weight:bold;line-height:1.3}h5{margin:0 0 16px 0;letter-spacing:.5px;font-size:17px;font-weight:bold;font-style:italic}h6{margin:0 0 16px 0;letter-spacing:.5px;font-size:16px;font-weight:bold}.rw-article__content *+h3,.rw-article__content *+h4,.rw-article__content *+h5,.rw-article__content *+h6{margin-top:16px}@media all and (max-width: 479px){#main h2{font-size:24px}}p{margin:1rem 0;line-height:1.6}p:first-child{margin-top:0}p:last-child{margin-bottom:0}input[type=search]{-moz-appearance:none;-webkit-appearance:none;appearance:none}input::-webkit-search-decoration{-webkit-appearance:none}input:-ms-input-placeholder{opacity:.7;color:inherit;font-style:italic}input::-moz-placeholder{opacity:.7;color:inherit;font-style:italic}input::placeholder{opacity:.7;color:inherit;font-style:italic}select{max-width:100%}select:not([multitple]){-moz-appearance:menulist-button;-webkit-appearance:menulist-button}fieldset{min-inline-size:auto}table{width:100%;border-collapse:collapse}table caption{margin:12px 0;font-weight:bold}table th,table td{padding:8px;border:1px solid var(--cd-reliefweb-light-grey)}table th{border-left-color:#fff;background:var(--cd-reliefweb-light-grey)}table thead th{border-left-color:#fff}th.field-label>h4.label{margin:0}table thead th:first-child{border-left-color:var(--cd-reliefweb-light-grey)}table tbody th{border-top-color:#fff}table tbody th:first-child{border-top-color:var(--cd-reliefweb-light-grey)}
+@import"https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400%3B500%3B700&display=swap";@import"https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,300%3B0,400%3B0,500%3B0,700%3B0,900%3B1,400%3B1,700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400%3B700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@400%3B700&display=swap";:root{--cd-reliefweb-blue: #0988bb;--cd-reliefweb-red: #f65c51;--cd-reliefweb-dark-blue: #055372;--cd-reliefweb-dark-red: #eb1405;--cd-reliefweb-dark-grey: #2e3436;--cd-reliefweb-mid-grey: #4d5254;--cd-reliefweb-light-grey: #e6ecef;--cd-rgb-reliefweb-blue: 9, 136, 187;--cd-rgb-reliefweb-red: 246, 92, 81;--cd-rgb-reliefweb-dark-blue: 4, 82, 112;--cd-rgb-reliefweb-dark-red: 235, 20, 5;--cd-rgb-reliefweb-dark-grey: 46, 52, 54;--cd-rgb-reliefweb-light-grey: 230, 236, 239;--cd-reliefweb-green: #88bb09;--cd-reliefweb-orange: #eb8705;--cd-reliefweb-red--text: #da190b;--cd-reliefweb-orange--text: #f49e2c;--disable: rgba(230, 236, 239, 0.5);--cd-reliefweb-green--background: rgba(136, 187, 9, 0.2);--cd-reliefweb-red--background: rgba(246, 92, 81, 0.2);--cd-reliefweb-orange--background: rgba(235, 135, 5, 0.2);--cd-ocha-blue: #1f69b3;--cd-blue--dark: #144372;--cd-blue--bright: #82b5e9;--cd-blue--light: #d4e5f7;--cd-highlight-red: #e56a54;--cd-contrast-red: #e00000;--cd-white: #fff;--cd-grey--light: #f2f2f2;--cd-grey--mid: #595959;--cd-grey--dark: #4a4a4a;--cd-default-text-color: var(--cd-grey--dark);--cd-black: #000;--cd-blue-grey: #e6ecf1;--cd-blue-grey--dark: #d3dde5;--cd-blue-grey--light: #ebf0f4;--cd-rgb-ocha-blue: 2, 108, 182;--cd-rgb-grey--mid: 89, 89, 89;--cd-rgb-grey--dark: 74, 74, 74;--cd-rgb-highlight-red: 229, 106, 84;--cd-rgb-blue-grey--dark: 211, 221, 229;--cd-max-content-width: 820px;--cd-max-body-width: 1400px;--cd-max-width: 1220px;--cd-container-padding: 0.75rem;--cd-container-padding-tablet: 1.5rem;--cd-container-padding-xlarge: 2.5rem;--cd-flow-space: 1rem;--cd-bumper-space: 1rem;--cd-footer-row-number: 5;--cd-red: #cd3a1f;--cd-red--light: #f8d8d3;--cd-orange: #db7b18;--cd-orange--light: #fae6d1;--cd-yellow: #d5de26;--cd-yellow--light: #f7f8d3;--cd-green: #7fb92f;--cd-green--light: #e8f5d6;--cd-font-size--tiny: 0.75rem;--cd-font-size--small: 0.875rem;--cd-font-size--base: 1.125rem;--cd-font-size--medium: 1.375rem;--cd-font-size--large: 1.625rem;--cd-font-size--2xbase: 1.875rem;--cd-font-size--2xmedium: 2.375rem;--cd-font-size--2xlarge: 2.875rem;--cd-font: helvetica, arial, sans-serif;--cd-font--system: system-ui;--cd-font--noto: "Noto Sans", sans-serif;--cd-font--noto-kufi: "Noto Kufi Arabic", sans-serif;--cd-font--roboto: "Roboto", helvetica, arial, sans-serif;--cd-font--roboto-condensed: "Roboto Condensed", helvetica, arial, sans-serif;--cd-font--roboto-slab: "Roboto Slab", helvetica, arial, sans-serif}@supports(display: grid){@media(min-width: 768px){.cd-layout-container{grid-template-rows:151px auto 1fr auto}}}@media(min-width: 768px){.cd-layout-container .cd-layout-content-wrapper{display:flex;flex-wrap:wrap}}@media(min-width: 768px){.cd-layout-content{flex-basis:0;flex-grow:999}}.cd-global-header__dropdown{background:var(--cd-reliefweb-dark-blue)}.cd-global-header button[aria-expanded=true]::before{border-color:transparent transparent var(--cd-reliefweb-dark-blue)}@media(max-width: 767px){.cd-global-header button[aria-expanded] span[class*=__btn-label]{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}.cd-header button:focus{outline:3px solid var(--cd-blue--bright)}.cd-global-header{background:var(--cd-reliefweb-dark-blue);background-image:linear-gradient(-180deg, var(--cd-reliefweb-dark-blue) 67%, #04415a 97%)}@supports(display: grid){.cd-site-header__inner{grid-template-columns:52px 1fr}@media(min-width: 768px){.cd-site-header__inner{grid-template-columns:186px 1fr}}}.cd-language-switcher__btn:focus{outline:3px solid var(--cd-blue--bright)}.cd-user-menu__dropdown li a:focus{outline:3px solid var(--cd-blue--bright)}.cd-site-logo{width:52px}.cd-site-logo:focus{outline:3px solid var(--cd-blue--bright)}@media(max-width: 767px){.cd-site-logo{background:url("../img/logos/rw-logo-mobile.svg") center no-repeat;background:linear-gradient(transparent, transparent),url("../img/logos/rw-logo-mobile.svg") center no-repeat}}@media(min-width: 768px){.cd-site-logo{width:140px}}.menu--main button[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-red)}.cd-nav__btn[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-red)}.cd-nav__btn[aria-expanded=true]::before{background:var(--cd-reliefweb-red)}@media(max-width: 1023px){.cd-site-header__nav-holder .cd-nav>ul>li>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>button.is-active::before{background:var(--cd-reliefweb-red)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>button.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>button.is-active::before{background:rgba(var(--cd-reliefweb-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-red)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-red), 0.6)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-red)}}@media(min-width: 1024px){.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail button::before{background:var(--cd-reliefweb-red)}.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a:focus::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button:focus::before{background:var(--cd-reliefweb-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul a.is-active,.cd-site-header__nav-holder .cd-nav>.menu>li>ul button.is-active{border-left:3px solid var(--cd-reliefweb-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul>li.menu-item--active-trail .is-active{border-left:3px solid var(--cd-reliefweb-red)}}.cd-ocha-dropdown__link a:focus{outline:3px solid var(--cd-blue--bright)}.cd-search__btn{color:var(--cd-reliefweb-dark-blue)}.cd-search__btn svg{fill:var(--cd-reliefweb-dark-blue)}.cd-search__btn:hover,.cd-search__btn:focus{color:#04415a}.cd-search__btn:hover svg,.cd-search__btn:focus svg{fill:#04415a}.cd-search__btn:focus{color:var(--cd-reliefweb-red)}.cd-search__btn:focus svg{fill:var(--cd-reliefweb-red)}.cd-search__btn[aria-expanded=true]{color:var(--cd-reliefweb-red)}.cd-search__btn[aria-expanded=true] svg{fill:var(--cd-reliefweb-red)}.cd-search__submit:focus{background-color:var(--cd-reliefweb-red)}.cd-user-menu--no-language-switcher li:last-child a,.cd-user-menu--no-language-switcher li:last-child button{padding-right:0}.cd-user-menu--no-language-switcher li:last-child a::after,.cd-user-menu--no-language-switcher li:last-child button::after{content:none}.cd-user-menu__item:focus,.cd-global-header .menu>li a:focus,.cd-global-header .menu>li button:focus{outline:3px solid var(--cd-blue--bright)}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button{padding-right:0}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a::after,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button::after{content:none}@media(max-width: 767px){.cd-global-header__user-menu a svg+span{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}[dir=ltr] .admin-menu__btn svg+span{margin-left:10px}[dir=rtl] .admin-menu__btn svg+span{margin-right:10px}.admin-menu__btn .cd-icon:not(.cd-icon--arrow-down){display:inline-block;width:14px;height:14px;vertical-align:middle;fill:var(--cd-white)}.cd-footer{background:var(--cd-reliefweb-dark-blue)}.cd-footer a:focus{outline:3px solid var(--cd-blue--bright)}.cd-footer-copyright{display:block;margin-top:0;text-align:right;color:#fff;font-size:12px;font-weight:lighter}.cd-footer-copyright p{margin:0}.cd-footer-copyright a{display:inline-block;overflow:hidden;width:140px;height:60px;margin:0 0 -4px 0;padding:0 0 0 140px;background:url(../img/logos/rw-logo-sprite.png) 0 -60px no-repeat;background:rgba(0,0,0,0) url(../img/logos/rw-logo-sprite.svg) 0 -60px no-repeat}.cd-footer-copyright a:hover,.cd-footer-copyright a:active,.cd-footer-copyright a:focus{opacity:.8}@media all and (max-width: 1023px){.cd-footer-copyright{width:100%;text-align:center}}.cd-soft-footer{background:rgba(var(--cd-rgb-ocha-blue), 0.9)}.cd-soft-footer a:focus{outline:3px solid var(--cd-blue--bright)}a{color:var(--cd-blue--dark)}a:hover,a:focus{color:var(--cd-ocha-blue)}h1,h2{margin:0 0 24px 0;letter-spacing:.5px;font-size:24px;font-weight:bold;line-height:1.3}@media screen and (min-width: 480px){h1,h2{font-size:var(--cd-font-size--2xbase)}}h3{margin:0 0 16px 0;letter-spacing:.5px;font-size:20px;font-weight:bold;line-height:1.3}h4{margin:0 0 16px 0;letter-spacing:.5px;font-size:18px;font-weight:bold;line-height:1.3}h5{margin:0 0 16px 0;letter-spacing:.5px;font-size:17px;font-weight:bold;font-style:italic}h6{margin:0 0 16px 0;letter-spacing:.5px;font-size:16px;font-weight:bold}.rw-article__content *+h3,.rw-article__content *+h4,.rw-article__content *+h5,.rw-article__content *+h6{margin-top:16px}@media all and (max-width: 479px){#main h2{font-size:24px}}p{margin:1rem 0;line-height:1.6}p:first-child{margin-top:0}p:last-child{margin-bottom:0}input[type=search]{-moz-appearance:none;-webkit-appearance:none;appearance:none}input::-webkit-search-decoration{-webkit-appearance:none}input:-ms-input-placeholder{opacity:.7;color:inherit;font-style:italic}input::-moz-placeholder{opacity:.7;color:inherit;font-style:italic}input::placeholder{opacity:.7;color:inherit;font-style:italic}select{max-width:100%}select:not([multitple]){-moz-appearance:menulist-button;-webkit-appearance:menulist-button}fieldset{min-inline-size:auto}table{width:100%;border-collapse:collapse}table caption{margin:12px 0;font-weight:bold}table th,table td{padding:8px;border:1px solid var(--cd-reliefweb-light-grey)}table th{border-left-color:#fff;background:var(--cd-reliefweb-light-grey)}table thead th{border-left-color:#fff}th.field-label>h4.label{margin:0}table thead th:first-child{border-left-color:var(--cd-reliefweb-light-grey)}table tbody th{border-top-color:#fff}table tbody th:first-child{border-top-color:var(--cd-reliefweb-light-grey)}
diff --git a/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss b/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
index 36f02e590..cd4011b25 100644
--- a/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
+++ b/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
@@ -48,7 +48,6 @@
   --cd-reliefweb-orange--text: #f49e2c;
   --disable: rgba(230, 236, 239, 0.5);
 
-
   // Moderation
   //  border-color: #d9d9d9;
   //  background-color: rgba(217, 217, 217, 0.2);
@@ -77,22 +76,22 @@
   --cd-reliefweb-orange--background: rgba(235, 135, 5, 0.2);
 
   /* OCHA blue is one colour ramp darker than brand blue */
-  --cd-ocha-blue: var(--cd-reliefweb-dark-blue);
+  --cd-ocha-blue: #1f69b3;
   /* Dark blue is two colour ramps darker than brand blue */
-  --cd-blue--dark: #04415a;
+  --cd-blue--dark: #144372;
   /* Bright blue is one colour ramp lighter than brand blue */
-  --cd-blue--bright: var(--cd-reliefweb-blue);
+  --cd-blue--bright: #82b5e9;
   --cd-blue--light: #d4e5f7;
-  --cd-highlight-red: var(--cd-reliefweb-red);
+  --cd-highlight-red: #e56a54;
   // This shade of red has been selected based on WCAG AAA requirements for contrast.
-  --cd-contrast-red: var(--cd-reliefweb-dark-red);
+  --cd-contrast-red: #e00000;
   --cd-white: #fff;
   --cd-grey--light: #f2f2f2;
   --cd-grey--mid: #595959;
   --cd-grey--dark: #4a4a4a;
   --cd-default-text-color: var(--cd-grey--dark);
   --cd-black: #000;
-  --cd-blue-grey: var(--cd-reliefweb-light-grey);
+  --cd-blue-grey: #e6ecf1;
   --cd-blue-grey--dark: #d3dde5;
   --cd-blue-grey--light: #ebf0f4;
 
@@ -273,8 +272,10 @@ $zindex: (
 // Implementation colours
 //——————————————————————————————————————————————————————————————————————————————
 
-$implementation-primary: $cd-ocha-blue;
-$implementation-primary-dark: $cd-blue--dark;
-$implementation-secondary: $cd-blue--bright;
-$implementation-highlight: $cd-highlight-red;
+$implementation-primary: var(--cd-reliefweb-dark-blue);
+$implementation-primary-dark: #04415a;
+$implementation-secondary: var(--cd-reliefweb-blue);
+$implementation-highlight: var(--cd-reliefweb-red);
+$cd-contrast-red: var(--cd-reliefweb-dark-red);
+$cd-blue-grey: var(--cd-reliefweb-light-grey);
 $cd-reliefweb-light-grey: var(--cd-reliefweb-light-grey);

From 984ae7c7b131edfb9dc7377cdfd331196247905a Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 09:39:55 -0700
Subject: [PATCH 016/720] rename variables to denote brand colour and add shade
 as modifier, regen css

---
 .../common_design_subtheme/css/styles.css     |  2 +-
 .../sass/cd/_cd-variables.scss                | 26 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/css/styles.css b/html/themes/custom/common_design_subtheme/css/styles.css
index bec015f6c..c1fadb43f 100644
--- a/html/themes/custom/common_design_subtheme/css/styles.css
+++ b/html/themes/custom/common_design_subtheme/css/styles.css
@@ -1 +1 @@
-@import"https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400%3B500%3B700&display=swap";@import"https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,300%3B0,400%3B0,500%3B0,700%3B0,900%3B1,400%3B1,700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400%3B700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@400%3B700&display=swap";:root{--cd-reliefweb-blue: #0988bb;--cd-reliefweb-red: #f65c51;--cd-reliefweb-dark-blue: #055372;--cd-reliefweb-dark-red: #eb1405;--cd-reliefweb-dark-grey: #2e3436;--cd-reliefweb-mid-grey: #4d5254;--cd-reliefweb-light-grey: #e6ecef;--cd-rgb-reliefweb-blue: 9, 136, 187;--cd-rgb-reliefweb-red: 246, 92, 81;--cd-rgb-reliefweb-dark-blue: 4, 82, 112;--cd-rgb-reliefweb-dark-red: 235, 20, 5;--cd-rgb-reliefweb-dark-grey: 46, 52, 54;--cd-rgb-reliefweb-light-grey: 230, 236, 239;--cd-reliefweb-green: #88bb09;--cd-reliefweb-orange: #eb8705;--cd-reliefweb-red--text: #da190b;--cd-reliefweb-orange--text: #f49e2c;--disable: rgba(230, 236, 239, 0.5);--cd-reliefweb-green--background: rgba(136, 187, 9, 0.2);--cd-reliefweb-red--background: rgba(246, 92, 81, 0.2);--cd-reliefweb-orange--background: rgba(235, 135, 5, 0.2);--cd-ocha-blue: #1f69b3;--cd-blue--dark: #144372;--cd-blue--bright: #82b5e9;--cd-blue--light: #d4e5f7;--cd-highlight-red: #e56a54;--cd-contrast-red: #e00000;--cd-white: #fff;--cd-grey--light: #f2f2f2;--cd-grey--mid: #595959;--cd-grey--dark: #4a4a4a;--cd-default-text-color: var(--cd-grey--dark);--cd-black: #000;--cd-blue-grey: #e6ecf1;--cd-blue-grey--dark: #d3dde5;--cd-blue-grey--light: #ebf0f4;--cd-rgb-ocha-blue: 2, 108, 182;--cd-rgb-grey--mid: 89, 89, 89;--cd-rgb-grey--dark: 74, 74, 74;--cd-rgb-highlight-red: 229, 106, 84;--cd-rgb-blue-grey--dark: 211, 221, 229;--cd-max-content-width: 820px;--cd-max-body-width: 1400px;--cd-max-width: 1220px;--cd-container-padding: 0.75rem;--cd-container-padding-tablet: 1.5rem;--cd-container-padding-xlarge: 2.5rem;--cd-flow-space: 1rem;--cd-bumper-space: 1rem;--cd-footer-row-number: 5;--cd-red: #cd3a1f;--cd-red--light: #f8d8d3;--cd-orange: #db7b18;--cd-orange--light: #fae6d1;--cd-yellow: #d5de26;--cd-yellow--light: #f7f8d3;--cd-green: #7fb92f;--cd-green--light: #e8f5d6;--cd-font-size--tiny: 0.75rem;--cd-font-size--small: 0.875rem;--cd-font-size--base: 1.125rem;--cd-font-size--medium: 1.375rem;--cd-font-size--large: 1.625rem;--cd-font-size--2xbase: 1.875rem;--cd-font-size--2xmedium: 2.375rem;--cd-font-size--2xlarge: 2.875rem;--cd-font: helvetica, arial, sans-serif;--cd-font--system: system-ui;--cd-font--noto: "Noto Sans", sans-serif;--cd-font--noto-kufi: "Noto Kufi Arabic", sans-serif;--cd-font--roboto: "Roboto", helvetica, arial, sans-serif;--cd-font--roboto-condensed: "Roboto Condensed", helvetica, arial, sans-serif;--cd-font--roboto-slab: "Roboto Slab", helvetica, arial, sans-serif}@supports(display: grid){@media(min-width: 768px){.cd-layout-container{grid-template-rows:151px auto 1fr auto}}}@media(min-width: 768px){.cd-layout-container .cd-layout-content-wrapper{display:flex;flex-wrap:wrap}}@media(min-width: 768px){.cd-layout-content{flex-basis:0;flex-grow:999}}.cd-global-header__dropdown{background:var(--cd-reliefweb-dark-blue)}.cd-global-header button[aria-expanded=true]::before{border-color:transparent transparent var(--cd-reliefweb-dark-blue)}@media(max-width: 767px){.cd-global-header button[aria-expanded] span[class*=__btn-label]{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}.cd-header button:focus{outline:3px solid var(--cd-blue--bright)}.cd-global-header{background:var(--cd-reliefweb-dark-blue);background-image:linear-gradient(-180deg, var(--cd-reliefweb-dark-blue) 67%, #04415a 97%)}@supports(display: grid){.cd-site-header__inner{grid-template-columns:52px 1fr}@media(min-width: 768px){.cd-site-header__inner{grid-template-columns:186px 1fr}}}.cd-language-switcher__btn:focus{outline:3px solid var(--cd-blue--bright)}.cd-user-menu__dropdown li a:focus{outline:3px solid var(--cd-blue--bright)}.cd-site-logo{width:52px}.cd-site-logo:focus{outline:3px solid var(--cd-blue--bright)}@media(max-width: 767px){.cd-site-logo{background:url("../img/logos/rw-logo-mobile.svg") center no-repeat;background:linear-gradient(transparent, transparent),url("../img/logos/rw-logo-mobile.svg") center no-repeat}}@media(min-width: 768px){.cd-site-logo{width:140px}}.menu--main button[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-red)}.cd-nav__btn[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-red)}.cd-nav__btn[aria-expanded=true]::before{background:var(--cd-reliefweb-red)}@media(max-width: 1023px){.cd-site-header__nav-holder .cd-nav>ul>li>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>button.is-active::before{background:var(--cd-reliefweb-red)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>button.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>button.is-active::before{background:rgba(var(--cd-reliefweb-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-red)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-red), 0.6)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-red)}}@media(min-width: 1024px){.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail button::before{background:var(--cd-reliefweb-red)}.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a:focus::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button:focus::before{background:var(--cd-reliefweb-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul a.is-active,.cd-site-header__nav-holder .cd-nav>.menu>li>ul button.is-active{border-left:3px solid var(--cd-reliefweb-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul>li.menu-item--active-trail .is-active{border-left:3px solid var(--cd-reliefweb-red)}}.cd-ocha-dropdown__link a:focus{outline:3px solid var(--cd-blue--bright)}.cd-search__btn{color:var(--cd-reliefweb-dark-blue)}.cd-search__btn svg{fill:var(--cd-reliefweb-dark-blue)}.cd-search__btn:hover,.cd-search__btn:focus{color:#04415a}.cd-search__btn:hover svg,.cd-search__btn:focus svg{fill:#04415a}.cd-search__btn:focus{color:var(--cd-reliefweb-red)}.cd-search__btn:focus svg{fill:var(--cd-reliefweb-red)}.cd-search__btn[aria-expanded=true]{color:var(--cd-reliefweb-red)}.cd-search__btn[aria-expanded=true] svg{fill:var(--cd-reliefweb-red)}.cd-search__submit:focus{background-color:var(--cd-reliefweb-red)}.cd-user-menu--no-language-switcher li:last-child a,.cd-user-menu--no-language-switcher li:last-child button{padding-right:0}.cd-user-menu--no-language-switcher li:last-child a::after,.cd-user-menu--no-language-switcher li:last-child button::after{content:none}.cd-user-menu__item:focus,.cd-global-header .menu>li a:focus,.cd-global-header .menu>li button:focus{outline:3px solid var(--cd-blue--bright)}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button{padding-right:0}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a::after,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button::after{content:none}@media(max-width: 767px){.cd-global-header__user-menu a svg+span{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}[dir=ltr] .admin-menu__btn svg+span{margin-left:10px}[dir=rtl] .admin-menu__btn svg+span{margin-right:10px}.admin-menu__btn .cd-icon:not(.cd-icon--arrow-down){display:inline-block;width:14px;height:14px;vertical-align:middle;fill:var(--cd-white)}.cd-footer{background:var(--cd-reliefweb-dark-blue)}.cd-footer a:focus{outline:3px solid var(--cd-blue--bright)}.cd-footer-copyright{display:block;margin-top:0;text-align:right;color:#fff;font-size:12px;font-weight:lighter}.cd-footer-copyright p{margin:0}.cd-footer-copyright a{display:inline-block;overflow:hidden;width:140px;height:60px;margin:0 0 -4px 0;padding:0 0 0 140px;background:url(../img/logos/rw-logo-sprite.png) 0 -60px no-repeat;background:rgba(0,0,0,0) url(../img/logos/rw-logo-sprite.svg) 0 -60px no-repeat}.cd-footer-copyright a:hover,.cd-footer-copyright a:active,.cd-footer-copyright a:focus{opacity:.8}@media all and (max-width: 1023px){.cd-footer-copyright{width:100%;text-align:center}}.cd-soft-footer{background:rgba(var(--cd-rgb-ocha-blue), 0.9)}.cd-soft-footer a:focus{outline:3px solid var(--cd-blue--bright)}a{color:var(--cd-blue--dark)}a:hover,a:focus{color:var(--cd-ocha-blue)}h1,h2{margin:0 0 24px 0;letter-spacing:.5px;font-size:24px;font-weight:bold;line-height:1.3}@media screen and (min-width: 480px){h1,h2{font-size:var(--cd-font-size--2xbase)}}h3{margin:0 0 16px 0;letter-spacing:.5px;font-size:20px;font-weight:bold;line-height:1.3}h4{margin:0 0 16px 0;letter-spacing:.5px;font-size:18px;font-weight:bold;line-height:1.3}h5{margin:0 0 16px 0;letter-spacing:.5px;font-size:17px;font-weight:bold;font-style:italic}h6{margin:0 0 16px 0;letter-spacing:.5px;font-size:16px;font-weight:bold}.rw-article__content *+h3,.rw-article__content *+h4,.rw-article__content *+h5,.rw-article__content *+h6{margin-top:16px}@media all and (max-width: 479px){#main h2{font-size:24px}}p{margin:1rem 0;line-height:1.6}p:first-child{margin-top:0}p:last-child{margin-bottom:0}input[type=search]{-moz-appearance:none;-webkit-appearance:none;appearance:none}input::-webkit-search-decoration{-webkit-appearance:none}input:-ms-input-placeholder{opacity:.7;color:inherit;font-style:italic}input::-moz-placeholder{opacity:.7;color:inherit;font-style:italic}input::placeholder{opacity:.7;color:inherit;font-style:italic}select{max-width:100%}select:not([multitple]){-moz-appearance:menulist-button;-webkit-appearance:menulist-button}fieldset{min-inline-size:auto}table{width:100%;border-collapse:collapse}table caption{margin:12px 0;font-weight:bold}table th,table td{padding:8px;border:1px solid var(--cd-reliefweb-light-grey)}table th{border-left-color:#fff;background:var(--cd-reliefweb-light-grey)}table thead th{border-left-color:#fff}th.field-label>h4.label{margin:0}table thead th:first-child{border-left-color:var(--cd-reliefweb-light-grey)}table tbody th{border-top-color:#fff}table tbody th:first-child{border-top-color:var(--cd-reliefweb-light-grey)}
+@import"https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400%3B500%3B700&display=swap";@import"https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,300%3B0,400%3B0,500%3B0,700%3B0,900%3B1,400%3B1,700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400%3B700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@400%3B700&display=swap";:root{--cd-reliefweb-brand-blue: #0988bb;--cd-reliefweb-brand-red: #f65c51;--cd-reliefweb-brand-blue--dark: #055372;--cd-reliefweb-brand-red--dark: #eb1405;--cd-reliefweb-brand-grey--dark: #2e3436;--cd-reliefweb-brand-grey--mid: #4d5254;--cd-reliefweb-brand-grey--light: #e6ecef;--cd-rgb-reliefweb-blue: 9, 136, 187;--cd-rgb-reliefweb-red: 246, 92, 81;--cd-rgb-reliefweb-dark-blue: 4, 82, 112;--cd-rgb-reliefweb-dark-red: 235, 20, 5;--cd-rgb-reliefweb-dark-grey: 46, 52, 54;--cd-rgb-reliefweb-light-grey: 230, 236, 239;--cd-reliefweb-green: #88bb09;--cd-reliefweb-orange: #eb8705;--cd-reliefweb-red--text: #da190b;--cd-reliefweb-orange--text: #f49e2c;--disable: rgba(230, 236, 239, 0.5);--cd-reliefweb-green--background: rgba(136, 187, 9, 0.2);--cd-reliefweb-red--background: rgba(246, 92, 81, 0.2);--cd-reliefweb-orange--background: rgba(235, 135, 5, 0.2);--cd-ocha-blue: #1f69b3;--cd-blue--dark: #144372;--cd-blue--bright: #82b5e9;--cd-blue--light: #d4e5f7;--cd-highlight-red: #e56a54;--cd-contrast-red: #e00000;--cd-white: #fff;--cd-grey--light: #f2f2f2;--cd-grey--mid: #595959;--cd-grey--dark: #4a4a4a;--cd-default-text-color: var(--cd-grey--dark);--cd-black: #000;--cd-blue-grey: #e6ecf1;--cd-blue-grey--dark: #d3dde5;--cd-blue-grey--light: #ebf0f4;--cd-rgb-ocha-blue: 2, 108, 182;--cd-rgb-grey--mid: 89, 89, 89;--cd-rgb-grey--dark: 74, 74, 74;--cd-rgb-highlight-red: 229, 106, 84;--cd-rgb-blue-grey--dark: 211, 221, 229;--cd-max-content-width: 820px;--cd-max-body-width: 1400px;--cd-max-width: 1220px;--cd-container-padding: 0.75rem;--cd-container-padding-tablet: 1.5rem;--cd-container-padding-xlarge: 2.5rem;--cd-flow-space: 1rem;--cd-bumper-space: 1rem;--cd-footer-row-number: 5;--cd-red: #cd3a1f;--cd-red--light: #f8d8d3;--cd-orange: #db7b18;--cd-orange--light: #fae6d1;--cd-yellow: #d5de26;--cd-yellow--light: #f7f8d3;--cd-green: #7fb92f;--cd-green--light: #e8f5d6;--cd-font-size--tiny: 0.75rem;--cd-font-size--small: 0.875rem;--cd-font-size--base: 1.125rem;--cd-font-size--medium: 1.375rem;--cd-font-size--large: 1.625rem;--cd-font-size--2xbase: 1.875rem;--cd-font-size--2xmedium: 2.375rem;--cd-font-size--2xlarge: 2.875rem;--cd-font: helvetica, arial, sans-serif;--cd-font--system: system-ui;--cd-font--noto: "Noto Sans", sans-serif;--cd-font--noto-kufi: "Noto Kufi Arabic", sans-serif;--cd-font--roboto: "Roboto", helvetica, arial, sans-serif;--cd-font--roboto-condensed: "Roboto Condensed", helvetica, arial, sans-serif;--cd-font--roboto-slab: "Roboto Slab", helvetica, arial, sans-serif}@supports(display: grid){@media(min-width: 768px){.cd-layout-container{grid-template-rows:151px auto 1fr auto}}}@media(min-width: 768px){.cd-layout-container .cd-layout-content-wrapper{display:flex;flex-wrap:wrap}}@media(min-width: 768px){.cd-layout-content{flex-basis:0;flex-grow:999}}.cd-global-header__dropdown{background:var(--cd-reliefweb-brand-blue--dark)}.cd-global-header button[aria-expanded=true]::before{border-color:transparent transparent var(--cd-reliefweb-brand-blue--dark)}@media(max-width: 767px){.cd-global-header button[aria-expanded] span[class*=__btn-label]{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}.cd-header button:focus{outline:3px solid var(--cd-blue--bright)}.cd-global-header{background:var(--cd-reliefweb-brand-blue--dark);background-image:linear-gradient(-180deg, var(--cd-reliefweb-brand-blue--dark) 67%, #04415a 97%)}@supports(display: grid){.cd-site-header__inner{grid-template-columns:52px 1fr}@media(min-width: 768px){.cd-site-header__inner{grid-template-columns:186px 1fr}}}.cd-language-switcher__btn:focus{outline:3px solid var(--cd-blue--bright)}.cd-user-menu__dropdown li a:focus{outline:3px solid var(--cd-blue--bright)}.cd-site-logo{width:52px}.cd-site-logo:focus{outline:3px solid var(--cd-blue--bright)}@media(max-width: 767px){.cd-site-logo{background:url("../img/logos/rw-logo-mobile.svg") center no-repeat;background:linear-gradient(transparent, transparent),url("../img/logos/rw-logo-mobile.svg") center no-repeat}}@media(min-width: 768px){.cd-site-logo{width:140px}}.menu--main button[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red)}.cd-nav__btn[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red)}.cd-nav__btn[aria-expanded=true]::before{background:var(--cd-reliefweb-brand-red)}@media(max-width: 1023px){.cd-site-header__nav-holder .cd-nav>ul>li>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>button.is-active::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>button.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>button.is-active::before{background:rgba(var(--cd-reliefweb-brand-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-brand-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-brand-red), 0.6)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red)}}@media(min-width: 1024px){.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail button::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a:focus::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button:focus::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul a.is-active,.cd-site-header__nav-holder .cd-nav>.menu>li>ul button.is-active{border-left:3px solid var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul>li.menu-item--active-trail .is-active{border-left:3px solid var(--cd-reliefweb-brand-red)}}.cd-ocha-dropdown__link a:focus{outline:3px solid var(--cd-blue--bright)}.cd-search__btn{color:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn svg{fill:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn:hover,.cd-search__btn:focus{color:#04415a}.cd-search__btn:hover svg,.cd-search__btn:focus svg{fill:#04415a}.cd-search__btn:focus{color:var(--cd-reliefweb-brand-red)}.cd-search__btn:focus svg{fill:var(--cd-reliefweb-brand-red)}.cd-search__btn[aria-expanded=true]{color:var(--cd-reliefweb-brand-red)}.cd-search__btn[aria-expanded=true] svg{fill:var(--cd-reliefweb-brand-red)}.cd-search__submit:focus{background-color:var(--cd-reliefweb-brand-red)}.cd-user-menu--no-language-switcher li:last-child a,.cd-user-menu--no-language-switcher li:last-child button{padding-right:0}.cd-user-menu--no-language-switcher li:last-child a::after,.cd-user-menu--no-language-switcher li:last-child button::after{content:none}.cd-user-menu__item:focus,.cd-global-header .menu>li a:focus,.cd-global-header .menu>li button:focus{outline:3px solid var(--cd-blue--bright)}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button{padding-right:0}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a::after,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button::after{content:none}@media(max-width: 767px){.cd-global-header__user-menu a svg+span{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}[dir=ltr] .admin-menu__btn svg+span{margin-left:10px}[dir=rtl] .admin-menu__btn svg+span{margin-right:10px}.admin-menu__btn .cd-icon:not(.cd-icon--arrow-down){display:inline-block;width:14px;height:14px;vertical-align:middle;fill:var(--cd-white)}.cd-footer{background:var(--cd-reliefweb-brand-blue--dark)}.cd-footer a:focus{outline:3px solid var(--cd-blue--bright)}.cd-footer-copyright{display:block;margin-top:0;text-align:right;color:#fff;font-size:12px;font-weight:lighter}.cd-footer-copyright p{margin:0}.cd-footer-copyright a{display:inline-block;overflow:hidden;width:140px;height:60px;margin:0 0 -4px 0;padding:0 0 0 140px;background:url(../img/logos/rw-logo-sprite.png) 0 -60px no-repeat;background:rgba(0,0,0,0) url(../img/logos/rw-logo-sprite.svg) 0 -60px no-repeat}.cd-footer-copyright a:hover,.cd-footer-copyright a:active,.cd-footer-copyright a:focus{opacity:.8}@media all and (max-width: 1023px){.cd-footer-copyright{width:100%;text-align:center}}.cd-soft-footer{background:rgba(var(--cd-rgb-ocha-blue), 0.9)}.cd-soft-footer a:focus{outline:3px solid var(--cd-blue--bright)}a{color:var(--cd-blue--dark)}a:hover,a:focus{color:var(--cd-ocha-blue)}h1,h2{margin:0 0 24px 0;letter-spacing:.5px;font-size:24px;font-weight:bold;line-height:1.3}@media screen and (min-width: 480px){h1,h2{font-size:var(--cd-font-size--2xbase)}}h3{margin:0 0 16px 0;letter-spacing:.5px;font-size:20px;font-weight:bold;line-height:1.3}h4{margin:0 0 16px 0;letter-spacing:.5px;font-size:18px;font-weight:bold;line-height:1.3}h5{margin:0 0 16px 0;letter-spacing:.5px;font-size:17px;font-weight:bold;font-style:italic}h6{margin:0 0 16px 0;letter-spacing:.5px;font-size:16px;font-weight:bold}.rw-article__content *+h3,.rw-article__content *+h4,.rw-article__content *+h5,.rw-article__content *+h6{margin-top:16px}@media all and (max-width: 479px){#main h2{font-size:24px}}p{margin:1rem 0;line-height:1.6}p:first-child{margin-top:0}p:last-child{margin-bottom:0}input[type=search]{-moz-appearance:none;-webkit-appearance:none;appearance:none}input::-webkit-search-decoration{-webkit-appearance:none}input:-ms-input-placeholder{opacity:.7;color:inherit;font-style:italic}input::-moz-placeholder{opacity:.7;color:inherit;font-style:italic}input::placeholder{opacity:.7;color:inherit;font-style:italic}select{max-width:100%}select:not([multitple]){-moz-appearance:menulist-button;-webkit-appearance:menulist-button}fieldset{min-inline-size:auto}table{width:100%;border-collapse:collapse}table caption{margin:12px 0;font-weight:bold}table th,table td{padding:8px;border:1px solid var(--cd-reliefweb-brand-grey--light)}table th{border-left-color:#fff;background:var(--cd-reliefweb-brand-grey--light)}table thead th{border-left-color:#fff}th.field-label>h4.label{margin:0}table thead th:first-child{border-left-color:var(--cd-reliefweb-brand-grey--light)}table tbody th{border-top-color:#fff}table tbody th:first-child{border-top-color:var(--cd-reliefweb-brand-grey--light)}
diff --git a/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss b/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
index cd4011b25..78f35295b 100644
--- a/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
+++ b/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
@@ -21,14 +21,14 @@
 //——————————————————————————————————————————————————————————————————————————————
 :root {
   /* Color palette */
-  --cd-reliefweb-blue: #0988bb;
-  --cd-reliefweb-red: #f65c51;
-  --cd-reliefweb-dark-blue: #055372;
-  --cd-reliefweb-dark-red: #eb1405;
-  --cd-reliefweb-dark-grey: #2e3436;
+  --cd-reliefweb-brand-blue: #0988bb;
+  --cd-reliefweb-brand-red: #f65c51;
+  --cd-reliefweb-brand-blue--dark: #055372;
+  --cd-reliefweb-brand-red--dark: #eb1405;
+  --cd-reliefweb-brand-grey--dark: #2e3436;
   /* #2e3436 with 0.85 opacity on white. */
-  --cd-reliefweb-mid-grey: #4d5254;
-  --cd-reliefweb-light-grey: #e6ecef;
+  --cd-reliefweb-brand-grey--mid: #4d5254;
+  --cd-reliefweb-brand-grey--light: #e6ecef;
 
   // Slogan
   /* #2e3436 with 0.7 opacity on white. */
@@ -272,10 +272,10 @@ $zindex: (
 // Implementation colours
 //——————————————————————————————————————————————————————————————————————————————
 
-$implementation-primary: var(--cd-reliefweb-dark-blue);
+$implementation-primary: var(--cd-reliefweb-brand-blue--dark);
 $implementation-primary-dark: #04415a;
-$implementation-secondary: var(--cd-reliefweb-blue);
-$implementation-highlight: var(--cd-reliefweb-red);
-$cd-contrast-red: var(--cd-reliefweb-dark-red);
-$cd-blue-grey: var(--cd-reliefweb-light-grey);
-$cd-reliefweb-light-grey: var(--cd-reliefweb-light-grey);
+$implementation-secondary: var(--cd-reliefweb-brand-blue);
+$implementation-highlight: var(--cd-reliefweb-brand-red);
+$cd-contrast-red: var(--cd-reliefweb-brand-red--dark);
+$cd-blue-grey: var(--cd-reliefweb-brand-grey--light);
+$cd-reliefweb-light-grey: var(--cd-reliefweb-brand-grey--light);

From 3f57774871c04171f6a0c7d5c7b489f430f34ee2 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 09:41:14 -0700
Subject: [PATCH 017/720] rename variables to denote brand colours

---
 .../cd-block-title/cd-block-title.css         |  2 +-
 .../rw-admin-menu/rw-admin-menu.css           |  2 +-
 .../rw-advanced-search/rw-advanced-search.css | 40 +++++++++----------
 .../rw-announcement/rw-announcement.css       |  2 +-
 .../components/rw-article/rw-article.css      | 12 +++---
 .../rw-autocomplete/rw-autocomplete.css       |  4 +-
 .../components/rw-blog/rw-blog.css            |  2 +-
 .../components/rw-book-menu/rw-book-menu.css  |  2 +-
 .../rw-bookmark-link/rw-bookmark-link.css     |  2 +-
 .../rw-country-slug/rw-country-slug.css       |  4 +-
 .../components/rw-country/rw-country-list.css |  4 +-
 .../rw-datepicker/rw-datepicker.css           | 20 +++++-----
 .../rw-disaster-map/rw-disaster-map.css       | 12 +++---
 .../components/rw-disasters/rw-disasters.css  |  4 +-
 .../components/rw-document/rw-document.css    |  4 +-
 .../rw-entity-meta/rw-entity-meta.css         |  6 +--
 .../rw-entity-text/rw-entity-text.css         |  8 ++--
 .../components/rw-form/rw-form--widget.css    | 12 +++---
 .../components/rw-form/rw-form.css            | 26 ++++++------
 .../rw-guidelines/rw-guidelines.css           | 10 ++---
 .../components/rw-homepage/rw-homepage.css    |  4 +-
 .../components/rw-icons/rw-icons.json         | 12 +++---
 .../rw-key-content/rw-key-content.css         |  2 +-
 .../rw-key-figures/rw-key-figures.css         | 10 ++---
 .../rw-local-tasks/rw-local-tasks.css         |  2 +-
 .../rw-moderation/rw-moderation.css           |  6 +--
 .../components/rw-most-read/rw-most-read.css  |  2 +-
 .../rw-opportunities/rw-opportunities.css     |  6 +--
 .../rw-page-title/rw-page-title.css           |  6 +--
 .../components/rw-pager/rw-pager.css          |  4 +-
 .../components/rw-preview/rw-preview.css      |  4 +-
 .../rw-related-content/rw-related-content.css |  4 +-
 .../components/rw-report/rw-report.css        | 10 ++---
 .../components/rw-revisions/rw-revisions.css  | 24 +++++------
 .../rw-river-letter-navigation.css            | 10 ++---
 .../components/rw-river/rw-river-views.css    |  6 +--
 .../components/rw-search/rw-search.css        | 12 +++---
 .../components/rw-selection/rw-selection.css  |  8 ++--
 .../rw-site-slogan/rw-site-slogan.css         |  2 +-
 .../rw-social-media-links.css                 |  4 +-
 .../components/rw-toc/rw-toc.css              | 24 +++++------
 .../rw-useful-links/rw-useful-links.css       |  2 +-
 .../components/rw-user/rw-user-bookmarks.css  |  8 ++--
 .../components/rw-user/rw-user.css            |  2 +-
 44 files changed, 176 insertions(+), 176 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/cd-block-title/cd-block-title.css b/html/themes/custom/common_design_subtheme/components/cd-block-title/cd-block-title.css
index df548da23..ce0f10230 100644
--- a/html/themes/custom/common_design_subtheme/components/cd-block-title/cd-block-title.css
+++ b/html/themes/custom/common_design_subtheme/components/cd-block-title/cd-block-title.css
@@ -8,7 +8,7 @@
 .path-frontpage .cd-block-title,
 .rw-page-title.cd-block-title {
   padding-bottom: 0.5rem;
-  border-bottom: 1px solid var(--cd-reliefweb-dark-red);
+  border-bottom: 1px solid var(--cd-reliefweb-brand-red--dark);
   font-size: 24px;
 }
 
diff --git a/html/themes/custom/common_design_subtheme/components/rw-admin-menu/rw-admin-menu.css b/html/themes/custom/common_design_subtheme/components/rw-admin-menu/rw-admin-menu.css
index 960fdb256..066f81350 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-admin-menu/rw-admin-menu.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-admin-menu/rw-admin-menu.css
@@ -180,7 +180,7 @@
 /*  margin-left: -6px; */
 /*  border-left: 6px solid transparent; */
 /*  border-right: 6px solid transparent; */
-/*  border-bottom: 6px solid var(--cd-reliefweb-dark-blue); */
+/*  border-bottom: 6px solid var(--cd-reliefweb-brand-blue--dark); */
 /* } */
 /* .js .cd-header .admin-menu-toggler:after { */
 /*  content: ""; */
diff --git a/html/themes/custom/common_design_subtheme/components/rw-advanced-search/rw-advanced-search.css b/html/themes/custom/common_design_subtheme/components/rw-advanced-search/rw-advanced-search.css
index b0369c602..3a8e50d45 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-advanced-search/rw-advanced-search.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-advanced-search/rw-advanced-search.css
@@ -9,8 +9,8 @@
   margin: 24px 0 8px 0;
   /* The padding left is for the space for the :before. */
   padding: 12px 12px 12px 13px;
-  border: 1px solid var(--cd-reliefweb-light-grey);
-  /* var(--cd-reliefweb-light-grey) with 0.2 opacity on white. */
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
+  /* var(--cd-reliefweb-brand-grey--light) with 0.2 opacity on white. */
   background: #fafbfb;
 }
 .rw-advanced-search:before {
@@ -20,7 +20,7 @@
   left: -1px;
   width: 2px;
   content: "";
-  background: var(--cd-reliefweb-blue);
+  background: var(--cd-reliefweb-brand-blue);
 }
 .rw-advanced-search__title {
   margin: 0;
@@ -45,16 +45,16 @@
   width: 12px;
   height: 12px;
   text-indent: 12px;
-  border: 4px solid var(--cd-reliefweb-light-grey);
+  border: 4px solid var(--cd-reliefweb-brand-grey--light);
   border-radius: 50%;
   background: var(--rw-icons--common--help--12--dark-blue);
-  background-color: var(--cd-reliefweb-light-grey);
+  background-color: var(--cd-reliefweb-brand-grey--light);
 }
 .rw-advanced-search__help:active,
 .rw-advanced-search__help:hover,
 .rw-advanced-search__help:focus {
   background: var(--rw-icons--common--help--12--dark-red);
-  background-color: var(--cd-reliefweb-light-grey);
+  background-color: var(--cd-reliefweb-brand-grey--light);
 }
 
 /**
@@ -63,7 +63,7 @@
 .rw-advanced-search__selection {
   margin: 12px 0;
   padding: 12px 0 4px 0;
-  border: 1px solid var(--cd-reliefweb-light-grey);
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
   border-width: 1px 0 1px 0;
 }
 .rw-advanced-search__selection[data-selection="0"] {
@@ -89,8 +89,8 @@
   display: inline-block;
   margin: 0 0 8px 0;
   padding: 4px 8px;
-  color: var(--cd-reliefweb-dark-grey);
-  border: 1px solid var(--cd-reliefweb-light-grey);
+  color: var(--cd-reliefweb-brand-grey--dark);
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
   background: white;
   font-size: 13px;
   font-weight: normal;
@@ -107,7 +107,7 @@
   left: -1px;
   width: 2px;
   content: "";
-  background: var(--cd-reliefweb-dark-red);
+  background: var(--cd-reliefweb-brand-red--dark);
 }
 .rw-advanced-search__selection [data-operator] button[aria-expanded] {
   position: relative;
@@ -142,7 +142,7 @@
   padding: 4px;
   list-style: none;
   text-align: left;
-  border: 1px solid var(--cd-reliefweb-light-grey);
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
   background: white;
   -webkit-box-shadow: 0 3px 5px 0 rgba(0, 0, 0, 0.2);
   box-shadow: 0 3px 5px 0 rgba(0, 0, 0, 0.2);
@@ -162,7 +162,7 @@
   margin: 0;
 }
 .rw-advanced-search__selection [data-operator] ul li[aria-selected] {
-  background: var(--cd-reliefweb-light-grey);
+  background: var(--cd-reliefweb-brand-grey--light);
 }
 .rw-advanced-search__selection [data-operator] ul li[aria-disabled] {
   display: none;
@@ -226,7 +226,7 @@
   line-height: 36px;
 }
 .rw-advanced-search__actions button[data-clear] {
-  color: var(--cd-reliefweb-dark-blue);
+  color: var(--cd-reliefweb-brand-blue--dark);
   border: none;
   background: transparent;
   font-size: 16px;
@@ -235,12 +235,12 @@
 .rw-advanced-search__actions button[data-clear]:hover,
 .rw-advanced-search__actions button[data-clear]:active,
 .rw-advanced-search__actions button[data-clear]:focus {
-  color: var(--cd-reliefweb-dark-red);
+  color: var(--cd-reliefweb-brand-red--dark);
 }
 .rw-advanced-search__actions button[data-apply="true"] {
   position: relative;
   padding-left: 40px;
-  background: var(--cd-reliefweb-dark-red);
+  background: var(--cd-reliefweb-brand-red--dark);
 }
 .rw-advanced-search__actions button[data-apply="true"]:before {
   position: absolute;
@@ -260,7 +260,7 @@
   min-height: 32px;
   margin: 0;
   padding: 0;
-  color: var(--cd-reliefweb-dark-blue);
+  color: var(--cd-reliefweb-brand-blue--dark);
   border: none;
   background: transparent;
   line-height: 20px;
@@ -367,16 +367,16 @@
 .rw-advanced-search__filter-selector > div > button[data-cancel] {
   float: left;
   width: 48%;
-  color: var(--cd-reliefweb-dark-blue);
-  border: 1px solid var(--cd-reliefweb-dark-blue);
+  color: var(--cd-reliefweb-brand-blue--dark);
+  border: 1px solid var(--cd-reliefweb-brand-blue--dark);
   background: transparent;
   font-weight: normal;
 }
 .rw-advanced-search__filter-selector > div > button[data-cancel]:hover,
 .rw-advanced-search__filter-selector > div > button[data-cancel]:active,
 .rw-advanced-search__filter-selector > div > button[data-cancel]:focus {
-  color: var(--cd-reliefweb-dark-red);
-  border-color: var(--cd-reliefweb-dark-red);
+  color: var(--cd-reliefweb-brand-red--dark);
+  border-color: var(--cd-reliefweb-brand-red--dark);
   background: transparent;
 }
 .rw-advanced-search__filter-selector > div > button[data-add] {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-announcement/rw-announcement.css b/html/themes/custom/common_design_subtheme/components/rw-announcement/rw-announcement.css
index 6fe5a6660..777e9072d 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-announcement/rw-announcement.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-announcement/rw-announcement.css
@@ -14,7 +14,7 @@
 .rw-homepage-announcement a:hover,
 .rw-homepage-announcement a:active,
 .rw-homepage-announcement a:focus {
-  outline: 4px solid var(--cd-reliefweb-blue);
+  outline: 4px solid var(--cd-reliefweb-brand-blue);
 }
 .rw-homepage-announcement img {
   display: block;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css b/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css
index c5e9b5178..1ea599915 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css
@@ -12,7 +12,7 @@
   display: flex;
   flex-direction: column;
   padding: 0 0 24px 0;
-  border-bottom: 1px solid var(--cd-reliefweb-light-grey);
+  border-bottom: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
 .rw-river-article:last-child {
   padding-bottom: 0;
@@ -34,7 +34,7 @@
 .rw-river-article .rw-river-article__title {
   display: inline;
   margin: 0;
-  color: var(--cd-reliefweb-dark-blue);
+  color: var(--cd-reliefweb-brand-blue--dark);
   font-size: 17px;
   font-weight: bold;
   line-height: 28px;
@@ -48,14 +48,14 @@
   align-items: center;
   padding-top: 16px;
   /* #2e3436 with 0.85 opacity on white. */
-  color: var(--cd-reliefweb-mid-grey);
+  color: var(--cd-reliefweb-brand-grey--mid);
 }
 /* Article with a thumbnail preview (typically Map and Infographic). */
 .rw-river-article .rw-river-article__content img {
   float: left;
   max-height: 118px;
   margin: 2px 20px 0 0;
-  border: 1px solid var(--cd-reliefweb-light-grey);
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
 .rw-river-article .rw-river-article__content img + p {
   margin-top: 0;
@@ -99,7 +99,7 @@
     margin-right: 8px;
     margin-left: 8px;
     padding: 16px;
-    border: 1px solid var(--cd-reliefweb-light-grey);
+    border: 1px solid var(--cd-reliefweb-brand-grey--light);
   }
   /* Remove top margin from cd-flow for second item in two column layout */
   .rw-river--river-columns--two .rw-river-article:nth-child(2) {
@@ -129,6 +129,6 @@
   /* Add bottom border to second last item in two column layout */
   .rw-river--river-columns--two.rw-river--river-columns--desktop .rw-river-article:nth-last-child(2) {
     padding-bottom: 24px;
-    border-bottom: 1px solid var(--cd-reliefweb-light-grey);
+    border-bottom: 1px solid var(--cd-reliefweb-brand-grey--light);
   }
 }
diff --git a/html/themes/custom/common_design_subtheme/components/rw-autocomplete/rw-autocomplete.css b/html/themes/custom/common_design_subtheme/components/rw-autocomplete/rw-autocomplete.css
index 3b9122049..ef7163e8a 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-autocomplete/rw-autocomplete.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-autocomplete/rw-autocomplete.css
@@ -76,7 +76,7 @@
   margin: 0;
   padding: 4px;
   list-style: none;
-  border: 1px solid var(--cd-reliefweb-dark-grey);
+  border: 1px solid var(--cd-reliefweb-brand-grey--dark);
   background: white;
   box-shadow: 0 1px 4px 1px rgba(var(--cd-rgb-reliefweb-dark-grey), 0.3);
 }
@@ -93,7 +93,7 @@
 }
 /* Currently selected suggestion. */
 .rw-autocomplete-suggestion[aria-selected] {
-  background: var(--cd-reliefweb-light-grey);
+  background: var(--cd-reliefweb-brand-grey--light);
 }
 /* Highlight the parts of the suggestions that match the query. */
 .rw-autocomplete-suggestion span {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-blog/rw-blog.css b/html/themes/custom/common_design_subtheme/components/rw-blog/rw-blog.css
index 9af0647dc..ca61bdeb9 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-blog/rw-blog.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-blog/rw-blog.css
@@ -17,7 +17,7 @@
 /* Latest blog posts */
 .rw-river--latest-blog-posts h2 {
   padding-left: 8px;
-  border-left: 8px solid var(--cd-reliefweb-blue);
+  border-left: 8px solid var(--cd-reliefweb-brand-blue);
 }
 .rw-river--latest-blog-posts .rw-river-article--blog-post {
   --cd-flow-space: 12px;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-book-menu/rw-book-menu.css b/html/themes/custom/common_design_subtheme/components/rw-book-menu/rw-book-menu.css
index 59f0f53af..46ee76b81 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-book-menu/rw-book-menu.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-book-menu/rw-book-menu.css
@@ -41,5 +41,5 @@
  */
 .rw-book-menu .rw-book-menu__title {
   padding-left: 8px;
-  border-left: 8px solid var(--cd-reliefweb-blue);
+  border-left: 8px solid var(--cd-reliefweb-brand-blue);
 }
diff --git a/html/themes/custom/common_design_subtheme/components/rw-bookmark-link/rw-bookmark-link.css b/html/themes/custom/common_design_subtheme/components/rw-bookmark-link/rw-bookmark-link.css
index 5c95e0aa0..23bddf38d 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-bookmark-link/rw-bookmark-link.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-bookmark-link/rw-bookmark-link.css
@@ -12,7 +12,7 @@
   padding: 10px;
   vertical-align: middle;
   text-decoration: none;
-  background: var(--cd-reliefweb-light-grey);
+  background: var(--cd-reliefweb-brand-grey--light);
   font-size: 15px;
 }
 .rw-bookmark-link:hover,
diff --git a/html/themes/custom/common_design_subtheme/components/rw-country-slug/rw-country-slug.css b/html/themes/custom/common_design_subtheme/components/rw-country-slug/rw-country-slug.css
index b3af55c70..9fac6d092 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-country-slug/rw-country-slug.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-country-slug/rw-country-slug.css
@@ -12,8 +12,8 @@
   vertical-align: top;
   white-space: nowrap;
   text-overflow: ellipsis;
-  color: var(--cd-reliefweb-dark-grey);
-  background: var(--cd-reliefweb-light-grey);
+  color: var(--cd-reliefweb-brand-grey--dark);
+  background: var(--cd-reliefweb-brand-grey--light);
   font-size: 18px;
   font-weight: bold;
   line-height: 30px;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-country/rw-country-list.css b/html/themes/custom/common_design_subtheme/components/rw-country/rw-country-list.css
index ae77cc55f..137ccf601 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-country/rw-country-list.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-country/rw-country-list.css
@@ -26,12 +26,12 @@
   bottom: 12px;
   left: 0;
   content: "";
-  border: 4px solid var(--cd-reliefweb-light-grey);
+  border: 4px solid var(--cd-reliefweb-brand-grey--light);
 }
 .rw-river-page--countries > ul .rw-river-country-list__group__title {
   margin: 8px 0 24px 0;
   padding: 0 0 16px 0;
-  border-bottom: 1px solid var(--cd-reliefweb-dark-grey);
+  border-bottom: 1px solid var(--cd-reliefweb-brand-grey--dark);
   font-size: 24px;
   font-weight: bold;
 }
diff --git a/html/themes/custom/common_design_subtheme/components/rw-datepicker/rw-datepicker.css b/html/themes/custom/common_design_subtheme/components/rw-datepicker/rw-datepicker.css
index b6cb83a76..6d22f6736 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-datepicker/rw-datepicker.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-datepicker/rw-datepicker.css
@@ -41,7 +41,7 @@
   display: inline-block;
   width: 272px;
   padding: 8px;
-  border: 1px solid var(--cd-reliefweb-dark-grey);
+  border: 1px solid var(--cd-reliefweb-brand-grey--dark);
   background: white;
   box-shadow: 0 1px 4px 1px rgba(var(--cd-rgb-reliefweb-dark-grey), 0.3);
 }
@@ -53,7 +53,7 @@
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
-  color: var(--cd-reliefweb-dark-blue);
+  color: var(--cd-reliefweb-brand-blue--dark);
   border: none;
   background: none;
   /* @todo review if we can use a CD variable. */
@@ -66,14 +66,14 @@
 .rw-datepicker-calendar button:hover,
 .rw-datepicker-calendar button:focus,
 .rw-datepicker-calendar button:active {
-  color: var(--cd-reliefweb-dark-blue);
-  background: var(--cd-reliefweb-light-grey);
+  color: var(--cd-reliefweb-brand-blue--dark);
+  background: var(--cd-reliefweb-brand-grey--light);
 }
 .rw-datepicker-title {
   margin-bottom: 8px;
   padding-bottom: 8px;
   text-align: center;
-  border-bottom: 1px solid var(--cd-reliefweb-light-grey);
+  border-bottom: 1px solid var(--cd-reliefweb-brand-grey--light);
   line-height: 24px;
 }
 /* Previous/next year/month buttons. */
@@ -142,17 +142,17 @@
 .rw-datepicker-days button[disabled]:focus,
 .rw-datepicker-days button[disabled]:active {
   cursor: default;
-  color: var(--cd-reliefweb-light-grey);
+  color: var(--cd-reliefweb-brand-grey--light);
   background: none;
 }
 /* Highlight the current day. */
 .rw-datepicker-days button.rw-datepicker-today {
-  color: var(--cd-reliefweb-dark-red);
+  color: var(--cd-reliefweb-brand-red--dark);
 }
 /* Highlight the currently selected day(s). */
 .rw-datepicker-days button.rw-datepicker-selected-day {
   color: white;
-  background: var(--cd-reliefweb-dark-blue);
+  background: var(--cd-reliefweb-brand-blue--dark);
 }
 
 /**
@@ -193,13 +193,13 @@
   grid-template-areas: "widget1 widget2" "select select";
   grid-template-rows: repeat(2, min-content);
   grid-template-columns: repeat(2, min-content);
-  border: 1px solid var(--cd-reliefweb-dark-grey);
+  border: 1px solid var(--cd-reliefweb-brand-grey--dark);
   background: white;
   box-shadow: 0 1px 4px 1px rgba(var(--cd-rgb-reliefweb-dark-grey), 0.3);
 }
 .rw-datepicker-dual-widget .rw-datepicker-container:nth-child(1) {
   grid-area: widget1;
-  border-right: 1px solid var(--cd-reliefweb-dark-grey);
+  border-right: 1px solid var(--cd-reliefweb-brand-grey--dark);
 }
 .rw-datepicker-dual-widget .rw-datepicker-container:nth-child(2) {
   grid-area: widget2;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-disaster-map/rw-disaster-map.css b/html/themes/custom/common_design_subtheme/components/rw-disaster-map/rw-disaster-map.css
index 6893ef032..44332c976 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-disaster-map/rw-disaster-map.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-disaster-map/rw-disaster-map.css
@@ -22,7 +22,7 @@
 .js .rw-disaster-map[data-map-enabled] .rw-disaster-map__title {
   margin-bottom: 0;
   padding: 4px 8px 4px 8px;
-  background: var(--cd-reliefweb-light-grey);
+  background: var(--cd-reliefweb-brand-grey--light);
   font-size: 18px;
 }
 .js .rw-disaster-map[data-map-enabled] .rw-disaster-map__header {
@@ -34,7 +34,7 @@
   margin-top: 0;
   /* This is for the map ratio: height is 40% of the width. */
   padding-top: 40%;
-  border: 1px solid var(--cd-reliefweb-light-grey);
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
 .js .rw-disaster-map[data-map-enabled] .rw-disaster-map__map {
   position: relative;
@@ -59,7 +59,7 @@
 .js .rw-disaster-map[data-map-enabled] .rw-disaster-map__legend {
   /* The padding top is compensate the top: -1px of the figure. */
   padding: 7px 6px 6px 6px;
-  border-top: 1px solid var(--cd-reliefweb-light-grey);
+  border-top: 1px solid var(--cd-reliefweb-brand-grey--light);
   font-size: 14px;
 }
 .js .rw-disaster-map[data-map-enabled] .rw-disaster-map__legend__item {
@@ -108,7 +108,7 @@
   max-height: 258px;
   margin: 8px;
   padding: 12px;
-  border: 1px solid var(--cd-reliefweb-light-grey);
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
   background: white;
 }
 .js .rw-disaster-map[data-map-enabled] .rw-disaster-map__article[data-active="right"] {
@@ -354,12 +354,12 @@
   padding: 0 0 0 20px;
   border: none;
   border-radius: 50%;
-  background: var(--cd-reliefweb-dark-blue);
+  background: var(--cd-reliefweb-brand-blue--dark);
 }
 .js .rw-disaster-map .rw-disaster-map__close:hover,
 .js .rw-disaster-map .rw-disaster-map__close:active,
 .js .rw-disaster-map .rw-disaster-map__close:focus {
-  background: var(--cd-reliefweb-dark-red);
+  background: var(--cd-reliefweb-brand-red--dark);
 }
 .js .rw-disaster-map .rw-disaster-map__close:before {
   position: absolute;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-disasters/rw-disasters.css b/html/themes/custom/common_design_subtheme/components/rw-disasters/rw-disasters.css
index 1d1e90f91..e1389ea48 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-disasters/rw-disasters.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-disasters/rw-disasters.css
@@ -274,8 +274,8 @@
 }
 .taxonomy-term--disaster--full[data-disaster-status="current"] .rw-article__header:before,
 .taxonomy-term--disaster--full[data-disaster-status="ongoing"] .rw-article__header:before {
-  border-color: var(--cd-reliefweb-red);
-  background-color: var(--cd-reliefweb-red);
+  border-color: var(--cd-reliefweb-brand-red);
+  background-color: var(--cd-reliefweb-brand-red);
 }
 
 /* Reset styles for Disaster Affected Countries Section */
diff --git a/html/themes/custom/common_design_subtheme/components/rw-document/rw-document.css b/html/themes/custom/common_design_subtheme/components/rw-document/rw-document.css
index d6930f91b..ae64567f5 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-document/rw-document.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-document/rw-document.css
@@ -42,7 +42,7 @@
 }
 /* .rw-document .rw-article__content section > h3 { */
 /*  padding: 0 0 0 8px; */
-/*  border-left: 8px solid var(--cd-reliefweb-blue); */
+/*  border-left: 8px solid var(--cd-reliefweb-brand-blue); */
 /* } */
 
 .rw-document > footer {
@@ -51,7 +51,7 @@
   padding: 24px 0 0 0;
   border-width: 1px 0 0 0;
   border-style: solid;
-  border-color: var(--cd-reliefweb-light-grey);
+  border-color: var(--cd-reliefweb-brand-grey--light);
 }
 
 /* Entity details in the sidebar/footer */
diff --git a/html/themes/custom/common_design_subtheme/components/rw-entity-meta/rw-entity-meta.css b/html/themes/custom/common_design_subtheme/components/rw-entity-meta/rw-entity-meta.css
index 6fc6ff953..8a28b9e4a 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-entity-meta/rw-entity-meta.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-entity-meta/rw-entity-meta.css
@@ -108,7 +108,7 @@
     content: "";
     vertical-align: middle;
     border-radius: 4px;
-    background: var(--cd-reliefweb-dark-grey);
+    background: var(--cd-reliefweb-brand-grey--dark);
   }
   .rw-entity-meta--core dd:last-of-type:after {
     content: none;
@@ -132,7 +132,7 @@
 }
 .rw-river dl.rw-entity-meta.rw-article-meta {
   /* #2e3436 with 0.85 opacity on white. */
-  color: var(--cd-reliefweb-mid-grey);
+  color: var(--cd-reliefweb-brand-grey--mid);
 }
 
 @media screen and (min-width: 480px) {
@@ -169,7 +169,7 @@
 }
 .rw-entity-meta dd.rw-entity-meta__tag-value--status--ongoing:before {
   content: "";
-  background: var(--cd-reliefweb-red);
+  background: var(--cd-reliefweb-brand-red);
 }
 
 .taxonomy-term--disaster--full dl.rw-entity-meta dd.rw-entity-meta__tag-value--status--past:before {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-entity-text/rw-entity-text.css b/html/themes/custom/common_design_subtheme/components/rw-entity-text/rw-entity-text.css
index 32ec7d65e..cc54fa3b2 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-entity-text/rw-entity-text.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-entity-text/rw-entity-text.css
@@ -30,11 +30,11 @@
   order: 3;
   margin: 24px auto 0 auto;
   padding: 8px 12px;
-  color: var(--cd-reliefweb-dark-blue);
-  border: 1px solid var(--cd-reliefweb-dark-blue);
+  color: var(--cd-reliefweb-brand-blue--dark);
+  border: 1px solid var(--cd-reliefweb-brand-blue--dark);
   background: white;
   font-size: 16px;
-  fill: var(--cd-reliefweb-dark-blue);
+  fill: var(--cd-reliefweb-brand-blue--dark);
 }
 .js .rw-entity-text--collapsible button svg {
   fill: currentColor;
@@ -43,7 +43,7 @@
 .js .rw-entity-text--collapsible button:active,
 .js .rw-entity-text--collapsible button:focus {
   color: white;
-  background: var(--cd-reliefweb-dark-blue);
+  background: var(--cd-reliefweb-brand-blue--dark);
 }
 /* Overrides the default behavior when data-cd-hidden is set as the description
  * is always displayed, only the number of paragraphs changes. */
diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
index 1f87c376c..443e273e3 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
@@ -10,7 +10,7 @@
 /*   * file element. *! */
 /*  position: relative; */
 /*  padding: 8px; */
-/*  border: 1px solid var(--cd-reliefweb-light-grey); */
+/*  border: 1px solid var(--cd-reliefweb-brand-grey--light); */
 /* } */
 /* form table.file-list thead { */
 /*  display: none; */
@@ -43,7 +43,7 @@
 /*  display: table-cell; */
 /*  width: 50%; */
 /*  padding: 8px 16px; */
-/*  border-left: 1px solid var(--cd-reliefweb-light-grey); */
+/*  border-left: 1px solid var(--cd-reliefweb-brand-grey--light); */
 /* } */
 /* form table.file-list .file-widget .fieldset-wrapper > div.file-details a[download] { */
 /*  display: block; */
@@ -68,7 +68,7 @@
 /*  width: 102px; */
 /*  height: 102px; */
 /*  text-align: center; */
-/*  border: 1px solid var(--cd-reliefweb-light-grey); */
+/*  border: 1px solid var(--cd-reliefweb-brand-grey--light); */
 /* } */
 /* form table.file-list .file-widget .fieldset-wrapper .preview-image a img { */
 /*  max-width: 100%; */
@@ -87,21 +87,21 @@
 /* } */
 /* form table.file-list .image-widget { */
 /*   border: none; */
-/*   border-left: 1px solid var(--cd-reliefweb-light-grey); */
+/*   border-left: 1px solid var(--cd-reliefweb-brand-grey--light); */
 /* } */
 
 /* Media widget */
 form .js-media-library-widget .fieldset-wrapper {
   position: relative;
   padding: 8px;
-  border: 1px solid var(--cd-reliefweb-light-grey);
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
 form .image-widget {
   display: flex;
   flex-direction: column;
   flex-wrap: wrap;
   align-items: flex-start;
-  /* border: 1px solid var(--cd-reliefweb-light-grey); */
+  /* border: 1px solid var(--cd-reliefweb-brand-grey--light); */
   padding: 0 16px 16px;
 }
 
diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 3e6e35490..58ea27b4c 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -21,7 +21,7 @@ form button {
   padding: 14px;
   color: white;
   border: none;
-  background: var(--cd-reliefweb-dark-blue);
+  background: var(--cd-reliefweb-brand-blue--dark);
   font-size: 15px;
   font-weight: bold;
 }
@@ -29,7 +29,7 @@ form button:hover,
 form button:focus,
 form button:active {
   text-decoration: underline;
-  background: var(--cd-reliefweb-dark-red);
+  background: var(--cd-reliefweb-brand-red--dark);
 }
 form input[type="text"],
 form input[type="search"],
@@ -40,7 +40,7 @@ form input[type="url"] {
   height: 46px;
   margin: 0;
   padding: 12px;
-  border: 2px solid var(--cd-reliefweb-light-grey);
+  border: 2px solid var(--cd-reliefweb-brand-grey--light);
   background: white;
 }
 input[type="text"],
@@ -61,7 +61,7 @@ form textarea {
   margin: 0;
   padding: 12px;
   resize: vertical;
-  border: 2px solid var(--cd-reliefweb-light-grey);
+  border: 2px solid var(--cd-reliefweb-brand-grey--light);
   background: white;
   /* Better readibility similar to paragraphs. */
   line-height: 1.5;
@@ -100,7 +100,7 @@ form fieldset legend {
 form > div.form-item,
 form > fieldset,
 form > section {
-  border-top: 1px solid var(--cd-reliefweb-light-grey);
+  border-top: 1px solid var(--cd-reliefweb-brand-grey--light);
   padding: 32px 0;
 } */
 form > div > fieldset > legend,
@@ -210,7 +210,7 @@ form .description a:hover,
 form .description a:active,
 form .description a:focus {
   text-decoration: underline;
-  background: var(--cd-reliefweb-light-grey);
+  background: var(--cd-reliefweb-brand-grey--light);
 }
 form .description + div {
   margin-top: 8px;
@@ -236,7 +236,7 @@ form .form-disabled [data-irrelevant] > div {
 form input[disabled],
 form textarea[disabled],
 form select[disabled] {
-  background: var(--cd-reliefweb-light-grey);
+  background: var(--cd-reliefweb-brand-grey--light);
   background: rgba(230, 236, 239, 0.5);
 }
 form input[disabled] + label {
@@ -244,7 +244,7 @@ form input[disabled] + label {
 }
 form .notice {
   padding: 32px;
-  background: var(--cd-reliefweb-light-grey);
+  background: var(--cd-reliefweb-brand-grey--light);
 }
 form .notice :first-child {
   margin-top: 0;
@@ -254,7 +254,7 @@ form input.error,
 form textarea.error,
 form select.error,
 form fieldset.error > .fieldset-content {
-  outline: 2px solid var(--cd-reliefweb-red);
+  outline: 2px solid var(--cd-reliefweb-brand-red);
   outline-offset: -2px;
 }
 form fieldset.error .form-radio.error,
@@ -276,8 +276,8 @@ form #actions {
   /* min-width: 100%; */
   padding: 0 12px 12px;
   text-align: center;
-  border: 1px solid var(--cd-reliefweb-light-grey);
-  background: var(--cd-reliefweb-light-grey);
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
+  background: var(--cd-reliefweb-brand-grey--light);
   background: rgba(230, 236, 239, 0.4);
 }
 form #actions .cd-button {
@@ -411,7 +411,7 @@ form #edit-organization .form-type-radio {
 form #edit-organization #edit-field-source-allowed .form-item:last-child {
   margin-top: 8px;
   padding-top: 8px;
-  border-top: 2px dotted var(--cd-reliefweb-light-grey);
+  border-top: 2px dotted var(--cd-reliefweb-brand-grey--light);
 }
 
 /* Embargo Date .field--name-field-embargo-date */
@@ -439,7 +439,7 @@ form #edit-organization #edit-field-source-allowed .form-item:last-child {
   margin-top: 0;
 }
 .filter-wrapper {
-  border: 1px solid var(--cd-reliefweb-light-grey);
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
 .filter-wrapper .filter-help {
   font-size: 14px;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
index e5fda8196..12efbb13e 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
@@ -6,10 +6,10 @@ form[data-with-guidelines] button[data-guideline] {
   margin: -3px 0 0 8px;
   padding: 0 0 0 12px;
   vertical-align: middle;
-  border: 4px solid var(--cd-reliefweb-light-grey);
+  border: 4px solid var(--cd-reliefweb-brand-grey--light);
   border-radius: 50%;
   background: var(--rw-icons--common--help--12--dark-blue);
-  background-color: var(--cd-reliefweb-light-grey);
+  background-color: var(--cd-reliefweb-brand-grey--light);
 }
 form[data-with-guidelines] button[data-guideline]:hover {
   background: var(--rw-icons--common--help--12--dark-red);
@@ -45,7 +45,7 @@ form[data-with-guidelines] .rw-guideline > button[value="close"] {
   width: 28px;
   height: 28px;
   padding: 0 0 0 22px;
-  border: 2px solid var(--cd-reliefweb-dark-grey);
+  border: 2px solid var(--cd-reliefweb-brand-grey--dark);
   border-radius: 50%;
   background: white;
 }
@@ -60,7 +60,7 @@ form[data-with-guidelines] .rw-guideline > button[value="close"]:after {
   background: var(--rw-icons--common--close--18--dark-grey);
 }
 form[data-with-guidelines] .rw-guideline > button[value="close"]:hover {
-  border-color: var(--cd-reliefweb-dark-red);
+  border-color: var(--cd-reliefweb-brand-red--dark);
 }
 form[data-with-guidelines] .rw-guideline > button[value="close"]:hover:after {
   background: var(--rw-icons--common--close--18--dark-red);
@@ -82,5 +82,5 @@ form[data-with-guidelines] .rw-guideline > div > .rw-guideline__content {
   padding-top: 0;
 }
 form[data-with-guidelines] .rw-guideline > div > .rw-guideline__content img {
-  border: 4px solid var(--cd-reliefweb-light-grey);
+  border: 4px solid var(--cd-reliefweb-brand-grey--light);
 }
diff --git a/html/themes/custom/common_design_subtheme/components/rw-homepage/rw-homepage.css b/html/themes/custom/common_design_subtheme/components/rw-homepage/rw-homepage.css
index 395e2af7c..c1e503da4 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-homepage/rw-homepage.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-homepage/rw-homepage.css
@@ -6,13 +6,13 @@
  */
 .rw-river--disasters {
   --cd-flow-space: 1rem;
-  /* border-top: 1px solid var(--cd-reliefweb-light-grey); */
+  /* border-top: 1px solid var(--cd-reliefweb-brand-grey--light); */
 }
 .rw-river--disasters .rw-river-article--disaster {
   position: relative;
   /* margin: 16px 0 0 0; */
   padding: 0 0 16px;
-  /* border-top: 1px solid var(--cd-reliefweb-light-grey); */
+  /* border-top: 1px solid var(--cd-reliefweb-brand-grey--light); */
 }
 .rw-river--disasters .rw-river-article--disaster:first-child {
   margin: 0;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.json b/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.json
index ee6e3c740..1e364fa01 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.json
+++ b/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.json
@@ -2,16 +2,16 @@
   "style": "../../css/styles.css",
   "path": "/themes/custom/common_design_subtheme/components/rw-icons",
   "colors": {
-    "dark-blue": "--cd-reliefweb-dark-blue",
-    "dark-red": "--cd-reliefweb-dark-red",
-    "dark-grey": "--cd-reliefweb-dark-grey",
-    "light-grey": "--cd-reliefweb-light-grey",
+    "dark-blue": "--cd-reliefweb-brand-blue--dark",
+    "dark-red": "--cd-reliefweb-brand-red--dark",
+    "dark-grey": "--cd-reliefweb-brand-grey--dark",
+    "light-grey": "--cd-reliefweb-brand-grey--light",
     "grey": "#b6c8d0",
     "white": "white",
-    "blue": "--cd-reliefweb-blue",
+    "blue": "--cd-reliefweb-brand-blue",
     "green": "var(--cd-reliefweb-green)",
     "orange": "var(--cd-reliefweb-orange)",
-    "red": "var(--cd-reliefweb-red)"
+    "red": "var(--cd-reliefweb-brand-red)"
   },
   "icons": {
     "common": {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-key-content/rw-key-content.css b/html/themes/custom/common_design_subtheme/components/rw-key-content/rw-key-content.css
index adc3e515b..0431c2d4d 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-key-content/rw-key-content.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-key-content/rw-key-content.css
@@ -25,7 +25,7 @@
   width: 140px;
   height: 170px;
   content: "";
-  border: 8px solid var(--cd-reliefweb-light-grey);
+  border: 8px solid var(--cd-reliefweb-brand-grey--light);
   background: linear-gradient(rgba(230, 236, 239, 0) 50%, rgba(230, 236, 239, 0.8));
 }
 .rw-river--key-content article .rw-river-article__content p {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-key-figures/rw-key-figures.css b/html/themes/custom/common_design_subtheme/components/rw-key-figures/rw-key-figures.css
index 70d740e39..b0cb0d7e4 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-key-figures/rw-key-figures.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-key-figures/rw-key-figures.css
@@ -17,7 +17,7 @@
   width: 100%;
   margin: 0 0 20px 0;
   padding: 16px;
-  border: 1px solid var(--cd-reliefweb-light-grey);
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
 .rw-key-figures figure figcaption {
   margin: 0 0 20px 0;
@@ -32,7 +32,7 @@
 }
 .rw-key-figures figure data {
   display: block;
-  color: var(--cd-reliefweb-dark-blue);
+  color: var(--cd-reliefweb-brand-blue--dark);
   font-size: 22px;
   font-weight: bold;
 }
@@ -50,7 +50,7 @@
   padding: 10px 0;
   opacity: 0.5;
   fill: none;
-  stroke: var(--cd-reliefweb-dark-grey);
+  stroke: var(--cd-reliefweb-brand-grey--dark);
   stroke-width: 2px;
 }
 .rw-key-figures figure footer {
@@ -74,14 +74,14 @@
   content: "";
   vertical-align: middle;
   border-radius: 6px;
-  background: var(--cd-reliefweb-dark-red);
+  background: var(--cd-reliefweb-brand-red--dark);
 }
 .rw-key-figures figure cite {
   float: right;
   padding: 1px 6px;
   color: white;
   border-radius: 5px;
-  background: var(--cd-reliefweb-dark-blue);
+  background: var(--cd-reliefweb-brand-blue--dark);
   font-style: normal;
 }
 .rw-key-figures figure cite a {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-local-tasks/rw-local-tasks.css b/html/themes/custom/common_design_subtheme/components/rw-local-tasks/rw-local-tasks.css
index bdbdbb147..132105495 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-local-tasks/rw-local-tasks.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-local-tasks/rw-local-tasks.css
@@ -27,7 +27,7 @@
   margin-left: 14px;
   content: "";
   vertical-align: middle;
-  background: var(--cd-reliefweb-dark-grey);
+  background: var(--cd-reliefweb-brand-grey--dark);
 }
 .block-local-tasks-block li:last-child:after,
 .tabs li:last-child:after {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
index 9fcfb9373..4b7491a1f 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
@@ -68,7 +68,7 @@
   /* height: 100%; */
 }
 .path-moderation #edit-omnibox div[data-autocomplete] > input {
-  border-right: 2px solid var(--cd-reliefweb-light-grey);
+  border-right: 2px solid var(--cd-reliefweb-brand-grey--light);
 }
 .path-moderation [data-selection] > span span + span {
   font-weight: bold;
@@ -83,7 +83,7 @@
   margin-inline-start: 0.5rem;
   padding: 4px 8px;
   text-transform: lowercase;
-  border: 2px solid var(--cd-reliefweb-dark-blue);
+  border: 2px solid var(--cd-reliefweb-brand-blue--dark);
   border-radius: 8px;
   line-height: 20px;
 }
@@ -173,7 +173,7 @@
 }
 .path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) .rw-moderation-table__cell__info .rw-moderation-table__cell__info__country a,
 .path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) .rw-moderation-table__cell__details .rw-moderation-table__cell__info__source a {
-  color: var(--cd-reliefweb-dark-grey);
+  color: var(--cd-reliefweb-brand-grey--dark);
   font-weight: bold;
 }
 .path-moderation .rw-moderation-list .rw-moderation-table__cell__bury {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-most-read/rw-most-read.css b/html/themes/custom/common_design_subtheme/components/rw-most-read/rw-most-read.css
index 409c86450..9fa938294 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-most-read/rw-most-read.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-most-read/rw-most-read.css
@@ -20,7 +20,7 @@
 }
 .path-frontpage .rw-river--most-read article + article {
   padding-top: 24px;
-  border-top: 1px solid var(--cd-reliefweb-light-grey);
+  border-top: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
 .path-frontpage .rw-river--most-read .view-more {
   margin-top: 8px;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-opportunities/rw-opportunities.css b/html/themes/custom/common_design_subtheme/components/rw-opportunities/rw-opportunities.css
index 09daa75d6..a65509e0d 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-opportunities/rw-opportunities.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-opportunities/rw-opportunities.css
@@ -13,7 +13,7 @@
 }
 .rw-homepage-opportunties li {
   margin: 0;
-  background: var(--cd-reliefweb-light-grey);
+  background: var(--cd-reliefweb-brand-grey--light);
 }
 .rw-homepage-opportunties li + li {
   margin-top: 16px;
@@ -34,7 +34,7 @@
 .rw-homepage-opportunties li a:active,
 .rw-homepage-opportunties li a:focus {
   text-decoration: none;
-  outline: 1px solid var(--cd-reliefweb-dark-blue);
+  outline: 1px solid var(--cd-reliefweb-brand-blue--dark);
 }
 /* Number of open ads. */
 .rw-homepage-opportunties li data {
@@ -72,5 +72,5 @@
 .rw-how-to-apply__title,
 .rw-fee-information__title {
   padding-left: 8px;
-  border-left: 8px solid var(--cd-reliefweb-blue);
+  border-left: 8px solid var(--cd-reliefweb-brand-blue);
 }
diff --git a/html/themes/custom/common_design_subtheme/components/rw-page-title/rw-page-title.css b/html/themes/custom/common_design_subtheme/components/rw-page-title/rw-page-title.css
index 7515930c6..f79e687e8 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-page-title/rw-page-title.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-page-title/rw-page-title.css
@@ -2,7 +2,7 @@
 .rw-page-title {
   margin: 0;
   padding-bottom: 12px;
-  border-bottom: 1px solid var(--cd-reliefweb-dark-red);
+  border-bottom: 1px solid var(--cd-reliefweb-brand-red--dark);
 }
 
 /* @todo move that to the rw-article component? Or change class name? */
@@ -13,7 +13,7 @@
   position: relative;
   padding-bottom: 12px;
   padding-left: 64px;
-  border-bottom: 1px solid var(--cd-reliefweb-dark-red);
+  border-bottom: 1px solid var(--cd-reliefweb-brand-red--dark);
 }
 .rw-article__header--with-icon .rw-page-title {
   padding-bottom: 0;
@@ -21,7 +21,7 @@
 }
 .rw-article__header--with-meta {
   padding-bottom: 12px;
-  border-bottom: 1px solid var(--cd-reliefweb-dark-red);
+  border-bottom: 1px solid var(--cd-reliefweb-brand-red--dark);
 }
 .rw-article__header--with-meta .rw-page-title {
   padding-bottom: 8px;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-pager/rw-pager.css b/html/themes/custom/common_design_subtheme/components/rw-pager/rw-pager.css
index 74a345ead..6b1e5302f 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-pager/rw-pager.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-pager/rw-pager.css
@@ -21,7 +21,7 @@
 }
 .pager .is-active a {
   text-decoration: underline;
-  color: var(--cd-reliefweb-dark-red);
+  color: var(--cd-reliefweb-brand-red--dark);
 }
 .pager ul {
   display: inline-block;
@@ -40,7 +40,7 @@
   height: 10px;
   margin-bottom: 1px;
   content: "";
-  background: var(--cd-reliefweb-dark-grey);
+  background: var(--cd-reliefweb-brand-grey--dark);
 }
 .pager li:last-child:after {
   content: none;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-preview/rw-preview.css b/html/themes/custom/common_design_subtheme/components/rw-preview/rw-preview.css
index 46083522e..02eaa5a60 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-preview/rw-preview.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-preview/rw-preview.css
@@ -8,7 +8,7 @@
   height: 40px;
   text-align: center;
   color: var(--cd-white);
-  background: var(--cd-reliefweb-dark-red);
+  background: var(--cd-reliefweb-brand-red--dark);
 }
 .node-preview-container header h3,
 .term-preview-container header h3 {
@@ -34,7 +34,7 @@
 }
 .node-preview-form-select .node-preview-backlink:hover,
 .term-preview-form-select .term-preview-backlink:hover {
-  background: var(--cd-reliefweb-blue);
+  background: var(--cd-reliefweb-brand-blue);
 }
 /* Hide View mode select element */
 .node-preview-form-select .form-item-view-mode,
diff --git a/html/themes/custom/common_design_subtheme/components/rw-related-content/rw-related-content.css b/html/themes/custom/common_design_subtheme/components/rw-related-content/rw-related-content.css
index 3427170d2..c714ac978 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-related-content/rw-related-content.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-related-content/rw-related-content.css
@@ -6,11 +6,11 @@
 .rw-river--related {
   margin: 0;
   padding: 32px 0 24px;
-  border-top: 1px solid var(--cd-reliefweb-light-grey);
+  border-top: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
 .rw-river--related h2 {
   padding-bottom: 12px;
-  border-bottom: 1px solid var(--cd-reliefweb-dark-red);
+  border-bottom: 1px solid var(--cd-reliefweb-brand-red--dark);
   /* margin: 0 0 8px 0; */
   font-size: 24px;
 }
diff --git a/html/themes/custom/common_design_subtheme/components/rw-report/rw-report.css b/html/themes/custom/common_design_subtheme/components/rw-report/rw-report.css
index 7ee1e2034..61b9eeba8 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-report/rw-report.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-report/rw-report.css
@@ -32,7 +32,7 @@
   margin: 0;
   padding: 16px 0;
   text-align: center;
-  border: 1px solid var(--cd-reliefweb-light-grey);
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
 .node--report--full #attachments li + li {
   margin-top: 24px;
@@ -40,7 +40,7 @@
 .node--report--full #attachments img {
   width: 100%;
   margin: -16px 0 8px 0;
-  border-bottom: 1px solid var(--cd-reliefweb-light-grey);
+  border-bottom: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
 .node--report--full #attachments strong {
   display: block;
@@ -71,16 +71,16 @@
 }
 .node--report--full #interactive figure figcaption {
   padding: 4px;
-  background: var(--cd-reliefweb-light-grey);
+  background: var(--cd-reliefweb-brand-grey--light);
 }
 .node--report--full #interactive figure img {
   width: 100%;
-  border: 1px solid var(--cd-reliefweb-light-grey);
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
 .node--report--full #interactive figure a:hover img,
 .node--report--full #interactive figure a:active img,
 .node--report--full #interactive figure a:focus img {
-  border-color: var(--cd-reliefweb-dark-blue);
+  border-color: var(--cd-reliefweb-brand-blue--dark);
 }
 .node--report--full #interactive footer {
   padding-top: 4px;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css b/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css
index 7a565f05b..2f03e9cde 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css
@@ -5,14 +5,14 @@
 .rw-revisions-history__title {
   margin: 0;
   padding: 8px;
-  background: var(--cd-reliefweb-light-grey);
+  background: var(--cd-reliefweb-brand-grey--light);
   font-size: 16px;
 }
 .rw-revisions-history__placeholder {
   padding: 8px;
   border-width: 0 1px 1px 1px;
   border-style: solid;
-  border-color: var(--cd-reliefweb-light-grey);
+  border-color: var(--cd-reliefweb-brand-grey--light);
   font-size: 15px;
   font-style: italic;
 }
@@ -20,7 +20,7 @@
   padding: 8px;
   border-width: 0 1px 1px 1px;
   border-style: solid;
-  border-color: var(--cd-reliefweb-light-grey);
+  border-color: var(--cd-reliefweb-brand-grey--light);
   font-size: 15px;
 }
 .rw-revisions-history-entry__title {
@@ -62,7 +62,7 @@
 .rw-revisions-history-entry__content__value dl {
   margin: 0 0 0 8px;
   padding: 4px 0 0 12px;
-  border-left: 1px solid var(--cd-reliefweb-light-grey);
+  border-left: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
 .rw-revisions-history-entry__content__value dd {
   margin: 4px 0 0 16px;
@@ -84,8 +84,8 @@
   padding: 4px 6px;
   cursor: pointer;
   text-transform: uppercase;
-  color: var(--cd-reliefweb-dark-blue);
-  border: 1px solid var(--cd-reliefweb-light-grey);
+  color: var(--cd-reliefweb-brand-blue--dark);
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
   font-size: 11px;
   font-weight: bold;
   line-height: 1;
@@ -123,8 +123,8 @@
   margin-right: 4px;
   content: "\2713 ";
   vertical-align: middle;
-  color: var(--cd-reliefweb-dark-grey);
-  border: 1px solid var(--cd-reliefweb-light-grey);
+  color: var(--cd-reliefweb-brand-grey--dark);
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
   line-height: 11px;
 }
 .rw-revisions-history-entry__content__value .rw-revisions-added {
@@ -170,9 +170,9 @@
   margin: 0;
   padding: 8px;
   text-transform: uppercase;
-  color: var(--cd-reliefweb-dark-blue);
-  border: 1px solid var(--cd-reliefweb-light-grey);
-  background: var(--cd-reliefweb-light-grey);
+  color: var(--cd-reliefweb-brand-blue--dark);
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
+  background: var(--cd-reliefweb-brand-grey--light);
   font-size: 12px;
   font-weight: bold;
   line-height: 1;
@@ -181,7 +181,7 @@
 .rw-revisions-history__btn:focus,
 .rw-revisions-history__btn:active {
   text-decoration: underline;
-  background: var(--cd-reliefweb-light-grey);
+  background: var(--cd-reliefweb-brand-grey--light);
 }
 .rw-revisions-history__btn:before,
 .rw-revisions-history__btn:after {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-river-letter-navigation/rw-river-letter-navigation.css b/html/themes/custom/common_design_subtheme/components/rw-river-letter-navigation/rw-river-letter-navigation.css
index 6121f46d0..30461e5c5 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-river-letter-navigation/rw-river-letter-navigation.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-river-letter-navigation/rw-river-letter-navigation.css
@@ -38,7 +38,7 @@
 .rw-river-letter-navigation li a:active,
 .rw-river-letter-navigation li a:hover {
   text-decoration: none;
-  background: var(--cd-reliefweb-light-grey);
+  background: var(--cd-reliefweb-brand-grey--light);
   font-weight: bold;
 }
 /* .js .rw-river-letter-navigation__btn { */
@@ -52,12 +52,12 @@
     height: 40px;
     margin: 0 auto;
     padding: 0 8px;
-    border: 1px solid var(--cd-reliefweb-light-grey);
+    border: 1px solid var(--cd-reliefweb-brand-grey--light);
     background: white;
     font-size: 16px;
   }
   .rw-river-letter-navigation__btn[aria-expanded] .cd-icon--arrow-down {
-    fill: var(--cd-reliefweb-dark-grey);
+    fill: var(--cd-reliefweb-brand-grey--dark);
   }
   [dir="ltr"] .rw-river-letter-navigation__btn[aria-expanded] .cd-icon--arrow-down {
     margin-left: 0.5rem;
@@ -85,8 +85,8 @@
     right: 12px;
     left: 12px;
     background: white;
-    -webkit-box-shadow: 0 0 6px 2px var(--cd-reliefweb-light-grey);
-    box-shadow: 0 0 6px 2px var(--cd-reliefweb-light-grey);
+    -webkit-box-shadow: 0 0 6px 2px var(--cd-reliefweb-brand-grey--light);
+    box-shadow: 0 0 6px 2px var(--cd-reliefweb-brand-grey--light);
   }
   /* .js .rw-river-letter-navigation[data-hidden="true"] { */
   /*  display: none; */
diff --git a/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-views.css b/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-views.css
index 461fe9328..fb1dae7a7 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-views.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-views.css
@@ -20,7 +20,7 @@
   display: inline-block;
   padding-bottom: 3px;
   text-decoration: none;
-  color: var(--cd-reliefweb-dark-grey);
+  color: var(--cd-reliefweb-brand-grey--dark);
   border-bottom: 3px solid transparent;
   font-size: 18px;
 }
@@ -28,10 +28,10 @@
 .rw-river-page .rw-river-views a:focus,
 .rw-river-page .rw-river-views a:active {
   text-decoration: none;
-  border-color: var(--cd-reliefweb-light-grey);
+  border-color: var(--cd-reliefweb-brand-grey--light);
 }
 .rw-river-page .rw-river-views .rw-river-views__list__item--selected a {
-  border-color: var(--cd-reliefweb-dark-red);
+  border-color: var(--cd-reliefweb-brand-red--dark);
   font-size: 22px;
   font-weight: bold;
 }
diff --git a/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css b/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css
index d2cd0172c..2ad5cee27 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css
@@ -66,12 +66,12 @@
   border-width: 8px 8px 8px 0;
   border-style: solid;
   border-color: transparent;
-  border-right-color: var(--cd-reliefweb-dark-blue);
+  border-right-color: var(--cd-reliefweb-brand-blue--dark);
 }
 .rw-river-search .rw-river-search__form button:hover:before,
 .rw-river-search .rw-river-search__form button:focus:before,
 .rw-river-search .rw-river-search__form button:active:before {
-  border-right-color: var(--cd-reliefweb-dark-red);
+  border-right-color: var(--cd-reliefweb-brand-red--dark);
 }
 
 /* Show an icon for the search button on small screens. */
@@ -110,7 +110,7 @@
 .rw-search-results .rw-river__articles {
   margin-top: 8px;
   padding-top: 24px;
-  border-top: 1px solid var(--cd-reliefweb-light-grey);
+  border-top: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
 
 .rw-search-results__totals {
@@ -131,7 +131,7 @@
   display: block;
   padding: 12px 24px;
   border-radius: 6px;
-  background: var(--cd-reliefweb-light-grey);
+  background: var(--cd-reliefweb-brand-grey--light);
   font-size: 17px;
   font-weight: bold;
 }
@@ -141,7 +141,7 @@
 .rw-search-results .rw-river__title {
   margin-bottom: 16px;
   padding-left: 8px;
-  border-left: 8px solid var(--cd-reliefweb-blue);
+  border-left: 8px solid var(--cd-reliefweb-brand-blue);
 }
 .rw-search-results .rw-river__title + p {
   margin: 0 0 8px 0;
@@ -149,7 +149,7 @@
 .rw-search-results .rw-river {
   margin-top: 32px;
   padding-bottom: 32px;
-  border-bottom: 1px solid var(--cd-reliefweb-light-grey);
+  border-bottom: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
 .rw-search-results .rw-river + .rw-river {
   margin-top: 56px;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-selection/rw-selection.css b/html/themes/custom/common_design_subtheme/components/rw-selection/rw-selection.css
index 6dc149b18..08d05e429 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-selection/rw-selection.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-selection/rw-selection.css
@@ -29,7 +29,7 @@
   margin: 4px;
   /* The padding right is for the remove button. */
   padding: 3px 36px 3px 8px;
-  background: var(--cd-reliefweb-light-grey);
+  background: var(--cd-reliefweb-brand-grey--light);
   font-size: 15px;
   /* Better readability. */
   line-height: 24px;
@@ -47,14 +47,14 @@
   margin: 0;
   /* This, combined with the overflow hides the text visually. */
   padding: 0 0 0 30px;
-  color: var(--cd-reliefweb-dark-blue);
+  color: var(--cd-reliefweb-brand-blue--dark);
   border: none;
-  background: var(--cd-reliefweb-light-grey);
+  background: var(--cd-reliefweb-brand-grey--light);
 }
 .rw-selection [data-value] button:hover,
 .rw-selection [data-value] button:focus,
 .rw-selection [data-value] button:active {
-  background: var(--cd-reliefweb-dark-blue);
+  background: var(--cd-reliefweb-brand-blue--dark);
 }
 .rw-selection [data-value] button:before {
   position: absolute;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-site-slogan/rw-site-slogan.css b/html/themes/custom/common_design_subtheme/components/rw-site-slogan/rw-site-slogan.css
index 59ac501d5..d282baaee 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-site-slogan/rw-site-slogan.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-site-slogan/rw-site-slogan.css
@@ -10,7 +10,7 @@
   color: white; /* TEMPORARY - COVID-19 */
   /* #e6ecef with 0.4 opacity on white. */
   background: #f5f7f9;
-  background: var(--cd-reliefweb-dark-grey); /* TEMPORARY - COVID-19 */
+  background: var(--cd-reliefweb-brand-grey--dark); /* TEMPORARY - COVID-19 */
   font-size: 16px;
 }
 .cd-header #site-slogan a {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-social-media-links/rw-social-media-links.css b/html/themes/custom/common_design_subtheme/components/rw-social-media-links/rw-social-media-links.css
index 74e5a3fdd..cba1587fd 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-social-media-links/rw-social-media-links.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-social-media-links/rw-social-media-links.css
@@ -17,7 +17,7 @@
 
 .rw-entity-social-media-links--tiles li {
   width: 100%;
-  border: 1px solid var(--cd-reliefweb-light-grey);
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
 
 @media screen and (min-width: 768px) {
@@ -108,6 +108,6 @@
   margin: 24px 0 0 0;
   padding: 24px 0;
   text-align: center;
-  border-top: 1px solid var(--cd-reliefweb-light-grey);
+  border-top: 1px solid var(--cd-reliefweb-brand-grey--light);
   line-height: 1;
 }
diff --git a/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css b/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
index 002e6fc2a..d68a7f66e 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
@@ -1,7 +1,7 @@
 /* Table of contents */
 .rw-toc {
   padding: 32px 0 0 0;
-  border-bottom: 1px solid var(--cd-reliefweb-light-grey);
+  border-bottom: 1px solid var(--cd-reliefweb-brand-grey--light);
   font-size: 15px;
 }
 .rw-toc ul,
@@ -27,7 +27,7 @@
 }
 .rw-toc ul ul li a[data-active] {
   padding-left: 10px;
-  border-left: 6px solid var(--cd-reliefweb-blue);
+  border-left: 6px solid var(--cd-reliefweb-brand-blue);
   font-weight: bold;
 }
 
@@ -58,7 +58,7 @@
   position: relative;
   width: 100%;
   padding: 32px 0;
-  border-bottom: 1px solid var(--cd-reliefweb-light-grey);
+  border-bottom: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
 .rw-sectioned-content > section:first-child,
 .rw-sectioned-content > form > fieldset:first-child,
@@ -106,7 +106,7 @@
     width: 80%;
     min-width: auto;
     padding-left: 32px;
-    border-left: 1px solid var(--cd-reliefweb-light-grey);
+    border-left: 1px solid var(--cd-reliefweb-brand-grey--light);
   }
   .page-form #main-content > section.default > form.rw-sectioned-content {
     padding: 0;
@@ -129,14 +129,14 @@
     height: 40px;
     margin: 24px auto;
     padding: 0 8px;
-    color: var(--cd-reliefweb-dark-grey);
-    border: 1px solid var(--cd-reliefweb-light-grey);
+    color: var(--cd-reliefweb-brand-grey--dark);
+    border: 1px solid var(--cd-reliefweb-brand-grey--light);
     background: white;
     font-size: 16px;
     font-weight: normal;
   }
   .rw-toc__btn[aria-expanded] .cd-icon--arrow-down {
-    fill: var(--cd-reliefweb-dark-grey);
+    fill: var(--cd-reliefweb-brand-grey--dark);
   }
   [dir="ltr"] .rw-toc__btn[aria-expanded] .cd-icon--arrow-down {
     margin-left: 0.5rem;
@@ -171,10 +171,10 @@
      * the table of contents horizontally. */
     margin: -24px 0 0 -150px;
     padding: 16px 16px 0 16px;
-    border: 1px solid var(--cd-reliefweb-light-grey);
+    border: 1px solid var(--cd-reliefweb-brand-grey--light);
     background: white;
-    -webkit-box-shadow: 0 0 6px 2px var(--cd-reliefweb-light-grey);
-    box-shadow: 0 0 6px 2px var(--cd-reliefweb-light-grey);
+    -webkit-box-shadow: 0 0 6px 2px var(--cd-reliefweb-brand-grey--light);
+    box-shadow: 0 0 6px 2px var(--cd-reliefweb-brand-grey--light);
   }
   /* .js .rw-toc[data-hidden="false"] { */
   /*  display: block; */
@@ -184,7 +184,7 @@
   .js .rw-toc + fieldset,
   .js .rw-toc + .form-wrapper,
   .js .rw-toc + .form-item {
-    border-top: 1px solid var(--cd-reliefweb-light-grey);
+    border-top: 1px solid var(--cd-reliefweb-brand-grey--light);
   }
   .js .rw-toc ~ section,
   .js .rw-toc ~ article,
@@ -208,7 +208,7 @@
   .js .rw-toc ~ .form-item > fieldset[data-active] > legend {
     margin-left: -16px;
     padding-left: 8px;
-    border-left: 8px solid var(--cd-reliefweb-blue);
+    border-left: 8px solid var(--cd-reliefweb-brand-blue);
   }
 }
 
diff --git a/html/themes/custom/common_design_subtheme/components/rw-useful-links/rw-useful-links.css b/html/themes/custom/common_design_subtheme/components/rw-useful-links/rw-useful-links.css
index bc76a3ae0..da48fd56f 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-useful-links/rw-useful-links.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-useful-links/rw-useful-links.css
@@ -27,7 +27,7 @@
 .rw-entity-text--resources ul li {
   margin: 0;
   padding: 12px 0;
-  border-bottom: 1px solid var(--cd-reliefweb-light-grey);
+  border-bottom: 1px solid var(--cd-reliefweb-brand-grey--light);
   line-height: 24px;
 }
 .rw-entity-useful-links > ul li:first-child,
diff --git a/html/themes/custom/common_design_subtheme/components/rw-user/rw-user-bookmarks.css b/html/themes/custom/common_design_subtheme/components/rw-user/rw-user-bookmarks.css
index b41de932b..f5564d2bd 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-user/rw-user-bookmarks.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-user/rw-user-bookmarks.css
@@ -6,19 +6,19 @@
   position: relative;
   margin: 0 0 20px 0;
   padding: 0 0 0 56px;
-  border: 1px solid var(--cd-reliefweb-light-grey);
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
 .rw-bookmarks article:last-child {
-  border-bottom: 1px solid var(--cd-reliefweb-light-grey);
+  border-bottom: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
 .rw-bookmarks article header,
 .rw-bookmarks article footer {
   padding: 16px;
-  border-left: 1px solid var(--cd-reliefweb-light-grey);
+  border-left: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
 .rw-bookmarks article .rw-river-article__content {
   padding: 0 16px;
-  border-left: 1px solid var(--cd-reliefweb-light-grey);
+  border-left: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
 .rw-bookmarks article:before {
   position: absolute;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-user/rw-user.css b/html/themes/custom/common_design_subtheme/components/rw-user/rw-user.css
index 38507e363..da49d936f 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-user/rw-user.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-user/rw-user.css
@@ -76,7 +76,7 @@
   position: relative;
   width: 100%;
   padding: 16px 0 32px;
-  border-bottom: 1px solid var(--cd-reliefweb-light-grey);
+  border-bottom: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
 
 /* Community topics actions */

From ebb54fc307a175313459d882108118225c56896c Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 11:20:00 -0700
Subject: [PATCH 018/720] replace cd-blue-dark sass var with implementation
 brand equivalent

---
 html/themes/custom/common_design_subtheme/css/styles.css      | 2 +-
 .../custom/common_design_subtheme/sass/base/_typography.scss  | 4 ++--
 .../common_design_subtheme/sass/cd/cd-footer/_cd-footer.scss  | 2 +-
 .../sass/cd/cd-footer/_cd-soft-footer.scss                    | 2 +-
 .../common_design_subtheme/sass/cd/cd-header/_cd-header.scss  | 2 +-
 .../sass/cd/cd-header/_cd-language-switcher.scss              | 4 ++--
 .../common_design_subtheme/sass/cd/cd-header/_cd-logo.scss    | 2 +-
 .../common_design_subtheme/sass/cd/cd-header/_cd-ocha.scss    | 2 +-
 .../sass/cd/cd-header/_cd-search--inline.scss                 | 2 +-
 .../sass/cd/cd-header/_cd-user-menu.scss                      | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/css/styles.css b/html/themes/custom/common_design_subtheme/css/styles.css
index c1fadb43f..3beef04c5 100644
--- a/html/themes/custom/common_design_subtheme/css/styles.css
+++ b/html/themes/custom/common_design_subtheme/css/styles.css
@@ -1 +1 @@
-@import"https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400%3B500%3B700&display=swap";@import"https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,300%3B0,400%3B0,500%3B0,700%3B0,900%3B1,400%3B1,700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400%3B700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@400%3B700&display=swap";:root{--cd-reliefweb-brand-blue: #0988bb;--cd-reliefweb-brand-red: #f65c51;--cd-reliefweb-brand-blue--dark: #055372;--cd-reliefweb-brand-red--dark: #eb1405;--cd-reliefweb-brand-grey--dark: #2e3436;--cd-reliefweb-brand-grey--mid: #4d5254;--cd-reliefweb-brand-grey--light: #e6ecef;--cd-rgb-reliefweb-blue: 9, 136, 187;--cd-rgb-reliefweb-red: 246, 92, 81;--cd-rgb-reliefweb-dark-blue: 4, 82, 112;--cd-rgb-reliefweb-dark-red: 235, 20, 5;--cd-rgb-reliefweb-dark-grey: 46, 52, 54;--cd-rgb-reliefweb-light-grey: 230, 236, 239;--cd-reliefweb-green: #88bb09;--cd-reliefweb-orange: #eb8705;--cd-reliefweb-red--text: #da190b;--cd-reliefweb-orange--text: #f49e2c;--disable: rgba(230, 236, 239, 0.5);--cd-reliefweb-green--background: rgba(136, 187, 9, 0.2);--cd-reliefweb-red--background: rgba(246, 92, 81, 0.2);--cd-reliefweb-orange--background: rgba(235, 135, 5, 0.2);--cd-ocha-blue: #1f69b3;--cd-blue--dark: #144372;--cd-blue--bright: #82b5e9;--cd-blue--light: #d4e5f7;--cd-highlight-red: #e56a54;--cd-contrast-red: #e00000;--cd-white: #fff;--cd-grey--light: #f2f2f2;--cd-grey--mid: #595959;--cd-grey--dark: #4a4a4a;--cd-default-text-color: var(--cd-grey--dark);--cd-black: #000;--cd-blue-grey: #e6ecf1;--cd-blue-grey--dark: #d3dde5;--cd-blue-grey--light: #ebf0f4;--cd-rgb-ocha-blue: 2, 108, 182;--cd-rgb-grey--mid: 89, 89, 89;--cd-rgb-grey--dark: 74, 74, 74;--cd-rgb-highlight-red: 229, 106, 84;--cd-rgb-blue-grey--dark: 211, 221, 229;--cd-max-content-width: 820px;--cd-max-body-width: 1400px;--cd-max-width: 1220px;--cd-container-padding: 0.75rem;--cd-container-padding-tablet: 1.5rem;--cd-container-padding-xlarge: 2.5rem;--cd-flow-space: 1rem;--cd-bumper-space: 1rem;--cd-footer-row-number: 5;--cd-red: #cd3a1f;--cd-red--light: #f8d8d3;--cd-orange: #db7b18;--cd-orange--light: #fae6d1;--cd-yellow: #d5de26;--cd-yellow--light: #f7f8d3;--cd-green: #7fb92f;--cd-green--light: #e8f5d6;--cd-font-size--tiny: 0.75rem;--cd-font-size--small: 0.875rem;--cd-font-size--base: 1.125rem;--cd-font-size--medium: 1.375rem;--cd-font-size--large: 1.625rem;--cd-font-size--2xbase: 1.875rem;--cd-font-size--2xmedium: 2.375rem;--cd-font-size--2xlarge: 2.875rem;--cd-font: helvetica, arial, sans-serif;--cd-font--system: system-ui;--cd-font--noto: "Noto Sans", sans-serif;--cd-font--noto-kufi: "Noto Kufi Arabic", sans-serif;--cd-font--roboto: "Roboto", helvetica, arial, sans-serif;--cd-font--roboto-condensed: "Roboto Condensed", helvetica, arial, sans-serif;--cd-font--roboto-slab: "Roboto Slab", helvetica, arial, sans-serif}@supports(display: grid){@media(min-width: 768px){.cd-layout-container{grid-template-rows:151px auto 1fr auto}}}@media(min-width: 768px){.cd-layout-container .cd-layout-content-wrapper{display:flex;flex-wrap:wrap}}@media(min-width: 768px){.cd-layout-content{flex-basis:0;flex-grow:999}}.cd-global-header__dropdown{background:var(--cd-reliefweb-brand-blue--dark)}.cd-global-header button[aria-expanded=true]::before{border-color:transparent transparent var(--cd-reliefweb-brand-blue--dark)}@media(max-width: 767px){.cd-global-header button[aria-expanded] span[class*=__btn-label]{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}.cd-header button:focus{outline:3px solid var(--cd-blue--bright)}.cd-global-header{background:var(--cd-reliefweb-brand-blue--dark);background-image:linear-gradient(-180deg, var(--cd-reliefweb-brand-blue--dark) 67%, #04415a 97%)}@supports(display: grid){.cd-site-header__inner{grid-template-columns:52px 1fr}@media(min-width: 768px){.cd-site-header__inner{grid-template-columns:186px 1fr}}}.cd-language-switcher__btn:focus{outline:3px solid var(--cd-blue--bright)}.cd-user-menu__dropdown li a:focus{outline:3px solid var(--cd-blue--bright)}.cd-site-logo{width:52px}.cd-site-logo:focus{outline:3px solid var(--cd-blue--bright)}@media(max-width: 767px){.cd-site-logo{background:url("../img/logos/rw-logo-mobile.svg") center no-repeat;background:linear-gradient(transparent, transparent),url("../img/logos/rw-logo-mobile.svg") center no-repeat}}@media(min-width: 768px){.cd-site-logo{width:140px}}.menu--main button[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red)}.cd-nav__btn[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red)}.cd-nav__btn[aria-expanded=true]::before{background:var(--cd-reliefweb-brand-red)}@media(max-width: 1023px){.cd-site-header__nav-holder .cd-nav>ul>li>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>button.is-active::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>button.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>button.is-active::before{background:rgba(var(--cd-reliefweb-brand-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-brand-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-brand-red), 0.6)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red)}}@media(min-width: 1024px){.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail button::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a:focus::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button:focus::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul a.is-active,.cd-site-header__nav-holder .cd-nav>.menu>li>ul button.is-active{border-left:3px solid var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul>li.menu-item--active-trail .is-active{border-left:3px solid var(--cd-reliefweb-brand-red)}}.cd-ocha-dropdown__link a:focus{outline:3px solid var(--cd-blue--bright)}.cd-search__btn{color:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn svg{fill:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn:hover,.cd-search__btn:focus{color:#04415a}.cd-search__btn:hover svg,.cd-search__btn:focus svg{fill:#04415a}.cd-search__btn:focus{color:var(--cd-reliefweb-brand-red)}.cd-search__btn:focus svg{fill:var(--cd-reliefweb-brand-red)}.cd-search__btn[aria-expanded=true]{color:var(--cd-reliefweb-brand-red)}.cd-search__btn[aria-expanded=true] svg{fill:var(--cd-reliefweb-brand-red)}.cd-search__submit:focus{background-color:var(--cd-reliefweb-brand-red)}.cd-user-menu--no-language-switcher li:last-child a,.cd-user-menu--no-language-switcher li:last-child button{padding-right:0}.cd-user-menu--no-language-switcher li:last-child a::after,.cd-user-menu--no-language-switcher li:last-child button::after{content:none}.cd-user-menu__item:focus,.cd-global-header .menu>li a:focus,.cd-global-header .menu>li button:focus{outline:3px solid var(--cd-blue--bright)}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button{padding-right:0}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a::after,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button::after{content:none}@media(max-width: 767px){.cd-global-header__user-menu a svg+span{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}[dir=ltr] .admin-menu__btn svg+span{margin-left:10px}[dir=rtl] .admin-menu__btn svg+span{margin-right:10px}.admin-menu__btn .cd-icon:not(.cd-icon--arrow-down){display:inline-block;width:14px;height:14px;vertical-align:middle;fill:var(--cd-white)}.cd-footer{background:var(--cd-reliefweb-brand-blue--dark)}.cd-footer a:focus{outline:3px solid var(--cd-blue--bright)}.cd-footer-copyright{display:block;margin-top:0;text-align:right;color:#fff;font-size:12px;font-weight:lighter}.cd-footer-copyright p{margin:0}.cd-footer-copyright a{display:inline-block;overflow:hidden;width:140px;height:60px;margin:0 0 -4px 0;padding:0 0 0 140px;background:url(../img/logos/rw-logo-sprite.png) 0 -60px no-repeat;background:rgba(0,0,0,0) url(../img/logos/rw-logo-sprite.svg) 0 -60px no-repeat}.cd-footer-copyright a:hover,.cd-footer-copyright a:active,.cd-footer-copyright a:focus{opacity:.8}@media all and (max-width: 1023px){.cd-footer-copyright{width:100%;text-align:center}}.cd-soft-footer{background:rgba(var(--cd-rgb-ocha-blue), 0.9)}.cd-soft-footer a:focus{outline:3px solid var(--cd-blue--bright)}a{color:var(--cd-blue--dark)}a:hover,a:focus{color:var(--cd-ocha-blue)}h1,h2{margin:0 0 24px 0;letter-spacing:.5px;font-size:24px;font-weight:bold;line-height:1.3}@media screen and (min-width: 480px){h1,h2{font-size:var(--cd-font-size--2xbase)}}h3{margin:0 0 16px 0;letter-spacing:.5px;font-size:20px;font-weight:bold;line-height:1.3}h4{margin:0 0 16px 0;letter-spacing:.5px;font-size:18px;font-weight:bold;line-height:1.3}h5{margin:0 0 16px 0;letter-spacing:.5px;font-size:17px;font-weight:bold;font-style:italic}h6{margin:0 0 16px 0;letter-spacing:.5px;font-size:16px;font-weight:bold}.rw-article__content *+h3,.rw-article__content *+h4,.rw-article__content *+h5,.rw-article__content *+h6{margin-top:16px}@media all and (max-width: 479px){#main h2{font-size:24px}}p{margin:1rem 0;line-height:1.6}p:first-child{margin-top:0}p:last-child{margin-bottom:0}input[type=search]{-moz-appearance:none;-webkit-appearance:none;appearance:none}input::-webkit-search-decoration{-webkit-appearance:none}input:-ms-input-placeholder{opacity:.7;color:inherit;font-style:italic}input::-moz-placeholder{opacity:.7;color:inherit;font-style:italic}input::placeholder{opacity:.7;color:inherit;font-style:italic}select{max-width:100%}select:not([multitple]){-moz-appearance:menulist-button;-webkit-appearance:menulist-button}fieldset{min-inline-size:auto}table{width:100%;border-collapse:collapse}table caption{margin:12px 0;font-weight:bold}table th,table td{padding:8px;border:1px solid var(--cd-reliefweb-brand-grey--light)}table th{border-left-color:#fff;background:var(--cd-reliefweb-brand-grey--light)}table thead th{border-left-color:#fff}th.field-label>h4.label{margin:0}table thead th:first-child{border-left-color:var(--cd-reliefweb-brand-grey--light)}table tbody th{border-top-color:#fff}table tbody th:first-child{border-top-color:var(--cd-reliefweb-brand-grey--light)}
+@import"https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400%3B500%3B700&display=swap";@import"https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,300%3B0,400%3B0,500%3B0,700%3B0,900%3B1,400%3B1,700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400%3B700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@400%3B700&display=swap";:root{--cd-reliefweb-brand-blue: #0988bb;--cd-reliefweb-brand-red: #f65c51;--cd-reliefweb-brand-blue--dark: #055372;--cd-reliefweb-brand-red--dark: #eb1405;--cd-reliefweb-brand-grey--dark: #2e3436;--cd-reliefweb-brand-grey--mid: #4d5254;--cd-reliefweb-brand-grey--light: #e6ecef;--cd-rgb-reliefweb-blue: 9, 136, 187;--cd-rgb-reliefweb-red: 246, 92, 81;--cd-rgb-reliefweb-dark-blue: 4, 82, 112;--cd-rgb-reliefweb-dark-red: 235, 20, 5;--cd-rgb-reliefweb-dark-grey: 46, 52, 54;--cd-rgb-reliefweb-light-grey: 230, 236, 239;--cd-reliefweb-green: #88bb09;--cd-reliefweb-orange: #eb8705;--cd-reliefweb-red--text: #da190b;--cd-reliefweb-orange--text: #f49e2c;--disable: rgba(230, 236, 239, 0.5);--cd-reliefweb-green--background: rgba(136, 187, 9, 0.2);--cd-reliefweb-red--background: rgba(246, 92, 81, 0.2);--cd-reliefweb-orange--background: rgba(235, 135, 5, 0.2);--cd-ocha-blue: #1f69b3;--cd-blue--dark: #144372;--cd-blue--bright: #82b5e9;--cd-blue--light: #d4e5f7;--cd-highlight-red: #e56a54;--cd-contrast-red: #e00000;--cd-white: #fff;--cd-grey--light: #f2f2f2;--cd-grey--mid: #595959;--cd-grey--dark: #4a4a4a;--cd-default-text-color: var(--cd-grey--dark);--cd-black: #000;--cd-blue-grey: #e6ecf1;--cd-blue-grey--dark: #d3dde5;--cd-blue-grey--light: #ebf0f4;--cd-rgb-ocha-blue: 2, 108, 182;--cd-rgb-grey--mid: 89, 89, 89;--cd-rgb-grey--dark: 74, 74, 74;--cd-rgb-highlight-red: 229, 106, 84;--cd-rgb-blue-grey--dark: 211, 221, 229;--cd-max-content-width: 820px;--cd-max-body-width: 1400px;--cd-max-width: 1220px;--cd-container-padding: 0.75rem;--cd-container-padding-tablet: 1.5rem;--cd-container-padding-xlarge: 2.5rem;--cd-flow-space: 1rem;--cd-bumper-space: 1rem;--cd-footer-row-number: 5;--cd-red: #cd3a1f;--cd-red--light: #f8d8d3;--cd-orange: #db7b18;--cd-orange--light: #fae6d1;--cd-yellow: #d5de26;--cd-yellow--light: #f7f8d3;--cd-green: #7fb92f;--cd-green--light: #e8f5d6;--cd-font-size--tiny: 0.75rem;--cd-font-size--small: 0.875rem;--cd-font-size--base: 1.125rem;--cd-font-size--medium: 1.375rem;--cd-font-size--large: 1.625rem;--cd-font-size--2xbase: 1.875rem;--cd-font-size--2xmedium: 2.375rem;--cd-font-size--2xlarge: 2.875rem;--cd-font: helvetica, arial, sans-serif;--cd-font--system: system-ui;--cd-font--noto: "Noto Sans", sans-serif;--cd-font--noto-kufi: "Noto Kufi Arabic", sans-serif;--cd-font--roboto: "Roboto", helvetica, arial, sans-serif;--cd-font--roboto-condensed: "Roboto Condensed", helvetica, arial, sans-serif;--cd-font--roboto-slab: "Roboto Slab", helvetica, arial, sans-serif}@supports(display: grid){@media(min-width: 768px){.cd-layout-container{grid-template-rows:151px auto 1fr auto}}}@media(min-width: 768px){.cd-layout-container .cd-layout-content-wrapper{display:flex;flex-wrap:wrap}}@media(min-width: 768px){.cd-layout-content{flex-basis:0;flex-grow:999}}.cd-global-header__dropdown{background:var(--cd-reliefweb-brand-blue--dark)}.cd-global-header button[aria-expanded=true]::before{border-color:transparent transparent var(--cd-reliefweb-brand-blue--dark)}@media(max-width: 767px){.cd-global-header button[aria-expanded] span[class*=__btn-label]{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}.cd-header button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header{background:var(--cd-reliefweb-brand-blue--dark);background-image:linear-gradient(-180deg, var(--cd-reliefweb-brand-blue--dark) 67%, #04415a 97%)}@supports(display: grid){.cd-site-header__inner{grid-template-columns:52px 1fr}@media(min-width: 768px){.cd-site-header__inner{grid-template-columns:186px 1fr}}}.cd-language-switcher__btn:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-user-menu__dropdown li a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-site-logo{width:52px}.cd-site-logo:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}@media(max-width: 767px){.cd-site-logo{background:url("../img/logos/rw-logo-mobile.svg") center no-repeat;background:linear-gradient(transparent, transparent),url("../img/logos/rw-logo-mobile.svg") center no-repeat}}@media(min-width: 768px){.cd-site-logo{width:140px}}.menu--main button[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red)}.cd-nav__btn[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red)}.cd-nav__btn[aria-expanded=true]::before{background:var(--cd-reliefweb-brand-red)}@media(max-width: 1023px){.cd-site-header__nav-holder .cd-nav>ul>li>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>button.is-active::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>button.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>button.is-active::before{background:rgba(var(--cd-reliefweb-brand-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-brand-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-brand-red), 0.6)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red)}}@media(min-width: 1024px){.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail button::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a:focus::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button:focus::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul a.is-active,.cd-site-header__nav-holder .cd-nav>.menu>li>ul button.is-active{border-left:3px solid var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul>li.menu-item--active-trail .is-active{border-left:3px solid var(--cd-reliefweb-brand-red)}}.cd-ocha-dropdown__link a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-search__btn{color:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn svg{fill:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn:hover,.cd-search__btn:focus{color:#04415a}.cd-search__btn:hover svg,.cd-search__btn:focus svg{fill:#04415a}.cd-search__btn:focus{color:var(--cd-reliefweb-brand-red)}.cd-search__btn:focus svg{fill:var(--cd-reliefweb-brand-red)}.cd-search__btn[aria-expanded=true]{color:var(--cd-reliefweb-brand-red)}.cd-search__btn[aria-expanded=true] svg{fill:var(--cd-reliefweb-brand-red)}.cd-search__submit:focus{background-color:var(--cd-reliefweb-brand-red)}.cd-user-menu--no-language-switcher li:last-child a,.cd-user-menu--no-language-switcher li:last-child button{padding-right:0}.cd-user-menu--no-language-switcher li:last-child a::after,.cd-user-menu--no-language-switcher li:last-child button::after{content:none}.cd-user-menu__item:focus,.cd-global-header .menu>li a:focus,.cd-global-header .menu>li button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button{padding-right:0}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a::after,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button::after{content:none}@media(max-width: 767px){.cd-global-header__user-menu a svg+span{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}[dir=ltr] .admin-menu__btn svg+span{margin-left:10px}[dir=rtl] .admin-menu__btn svg+span{margin-right:10px}.admin-menu__btn .cd-icon:not(.cd-icon--arrow-down){display:inline-block;width:14px;height:14px;vertical-align:middle;fill:var(--cd-white)}.cd-footer{background:var(--cd-reliefweb-brand-blue--dark)}.cd-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-footer-copyright{display:block;margin-top:0;text-align:right;color:#fff;font-size:12px;font-weight:lighter}.cd-footer-copyright p{margin:0}.cd-footer-copyright a{display:inline-block;overflow:hidden;width:140px;height:60px;margin:0 0 -4px 0;padding:0 0 0 140px;background:url(../img/logos/rw-logo-sprite.png) 0 -60px no-repeat;background:rgba(0,0,0,0) url(../img/logos/rw-logo-sprite.svg) 0 -60px no-repeat}.cd-footer-copyright a:hover,.cd-footer-copyright a:active,.cd-footer-copyright a:focus{opacity:.8}@media all and (max-width: 1023px){.cd-footer-copyright{width:100%;text-align:center}}.cd-soft-footer{background:rgba(var(--cd-rgb-ocha-blue), 0.9)}.cd-soft-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}a{color:var(--cd-reliefweb-brand-blue--dark)}a:hover,a:focus{color:var(--cd-reliefweb-brand-blue--dark)}h1,h2{margin:0 0 24px 0;letter-spacing:.5px;font-size:24px;font-weight:bold;line-height:1.3}@media screen and (min-width: 480px){h1,h2{font-size:var(--cd-font-size--2xbase)}}h3{margin:0 0 16px 0;letter-spacing:.5px;font-size:20px;font-weight:bold;line-height:1.3}h4{margin:0 0 16px 0;letter-spacing:.5px;font-size:18px;font-weight:bold;line-height:1.3}h5{margin:0 0 16px 0;letter-spacing:.5px;font-size:17px;font-weight:bold;font-style:italic}h6{margin:0 0 16px 0;letter-spacing:.5px;font-size:16px;font-weight:bold}.rw-article__content *+h3,.rw-article__content *+h4,.rw-article__content *+h5,.rw-article__content *+h6{margin-top:16px}@media all and (max-width: 479px){#main h2{font-size:24px}}p{margin:1rem 0;line-height:1.6}p:first-child{margin-top:0}p:last-child{margin-bottom:0}input[type=search]{-moz-appearance:none;-webkit-appearance:none;appearance:none}input::-webkit-search-decoration{-webkit-appearance:none}input:-ms-input-placeholder{opacity:.7;color:inherit;font-style:italic}input::-moz-placeholder{opacity:.7;color:inherit;font-style:italic}input::placeholder{opacity:.7;color:inherit;font-style:italic}select{max-width:100%}select:not([multitple]){-moz-appearance:menulist-button;-webkit-appearance:menulist-button}fieldset{min-inline-size:auto}table{width:100%;border-collapse:collapse}table caption{margin:12px 0;font-weight:bold}table th,table td{padding:8px;border:1px solid var(--cd-reliefweb-brand-grey--light)}table th{border-left-color:#fff;background:var(--cd-reliefweb-brand-grey--light)}table thead th{border-left-color:#fff}th.field-label>h4.label{margin:0}table thead th:first-child{border-left-color:var(--cd-reliefweb-brand-grey--light)}table tbody th{border-top-color:#fff}table tbody th:first-child{border-top-color:var(--cd-reliefweb-brand-grey--light)}
diff --git a/html/themes/custom/common_design_subtheme/sass/base/_typography.scss b/html/themes/custom/common_design_subtheme/sass/base/_typography.scss
index 1768e569f..19080f155 100644
--- a/html/themes/custom/common_design_subtheme/sass/base/_typography.scss
+++ b/html/themes/custom/common_design_subtheme/sass/base/_typography.scss
@@ -8,11 +8,11 @@
 //}
 
 a {
-  color: $cd-blue--dark;
+  color: $implementation-primary;
 
   &:hover,
   &:focus {
-    color: $cd-ocha-blue;
+    color: $implementation-primary;
   }
 }
 
diff --git a/html/themes/custom/common_design_subtheme/sass/cd/cd-footer/_cd-footer.scss b/html/themes/custom/common_design_subtheme/sass/cd/cd-footer/_cd-footer.scss
index 48fcdf984..750fb8bbe 100644
--- a/html/themes/custom/common_design_subtheme/sass/cd/cd-footer/_cd-footer.scss
+++ b/html/themes/custom/common_design_subtheme/sass/cd/cd-footer/_cd-footer.scss
@@ -7,7 +7,7 @@
 
   a {
     &:focus {
-      outline: 3px solid $cd-blue--bright;
+      outline: 3px solid $implementation-secondary;
     }
   }
 }
diff --git a/html/themes/custom/common_design_subtheme/sass/cd/cd-footer/_cd-soft-footer.scss b/html/themes/custom/common_design_subtheme/sass/cd/cd-footer/_cd-soft-footer.scss
index 2c249a1a7..b7d6068a7 100644
--- a/html/themes/custom/common_design_subtheme/sass/cd/cd-footer/_cd-soft-footer.scss
+++ b/html/themes/custom/common_design_subtheme/sass/cd/cd-footer/_cd-soft-footer.scss
@@ -9,7 +9,7 @@
 
   a {
     &:focus {
-      outline: 3px solid $cd-blue--bright;
+      outline: 3px solid $implementation-secondary;
     }
   }
 }
diff --git a/html/themes/custom/common_design_subtheme/sass/cd/cd-header/_cd-header.scss b/html/themes/custom/common_design_subtheme/sass/cd/cd-header/_cd-header.scss
index b7aa21f25..a4107ffd3 100644
--- a/html/themes/custom/common_design_subtheme/sass/cd/cd-header/_cd-header.scss
+++ b/html/themes/custom/common_design_subtheme/sass/cd/cd-header/_cd-header.scss
@@ -2,7 +2,7 @@
 // Common Design: Header
 //——————————————————————————————————————————————————————————————————————————————
 .cd-header button:focus {
-  outline: 3px solid $cd-blue--bright;
+  outline: 3px solid $implementation-secondary;
 }
 
 .cd-global-header {
diff --git a/html/themes/custom/common_design_subtheme/sass/cd/cd-header/_cd-language-switcher.scss b/html/themes/custom/common_design_subtheme/sass/cd/cd-header/_cd-language-switcher.scss
index 4e7b8a4eb..205eb6fcd 100644
--- a/html/themes/custom/common_design_subtheme/sass/cd/cd-header/_cd-language-switcher.scss
+++ b/html/themes/custom/common_design_subtheme/sass/cd/cd-header/_cd-language-switcher.scss
@@ -4,12 +4,12 @@
 
 .cd-language-switcher__btn {
   &:focus {
-    outline: 3px solid $cd-blue--bright;
+    outline: 3px solid $implementation-secondary;
   }
 }
 
 .cd-user-menu__dropdown {
   li a:focus {
-    outline: 3px solid $cd-blue--bright;
+    outline: 3px solid $implementation-secondary;
   }
 }
diff --git a/html/themes/custom/common_design_subtheme/sass/cd/cd-header/_cd-logo.scss b/html/themes/custom/common_design_subtheme/sass/cd/cd-header/_cd-logo.scss
index 87a883826..d29e3445c 100644
--- a/html/themes/custom/common_design_subtheme/sass/cd/cd-header/_cd-logo.scss
+++ b/html/themes/custom/common_design_subtheme/sass/cd/cd-header/_cd-logo.scss
@@ -8,7 +8,7 @@
   width: 52px;
 
   &:focus {
-    outline: 3px solid $cd-blue--bright;
+    outline: 3px solid $implementation-secondary;
   }
 
   // Logo for mobile.
diff --git a/html/themes/custom/common_design_subtheme/sass/cd/cd-header/_cd-ocha.scss b/html/themes/custom/common_design_subtheme/sass/cd/cd-header/_cd-ocha.scss
index a731f698e..70b5f480a 100644
--- a/html/themes/custom/common_design_subtheme/sass/cd/cd-header/_cd-ocha.scss
+++ b/html/themes/custom/common_design_subtheme/sass/cd/cd-header/_cd-ocha.scss
@@ -4,7 +4,7 @@
 .cd-ocha-dropdown__link {
   a {
     &:focus {
-      outline: 3px solid $cd-blue--bright;
+      outline: 3px solid $implementation-secondary;
     }
   }
 }
diff --git a/html/themes/custom/common_design_subtheme/sass/cd/cd-header/_cd-search--inline.scss b/html/themes/custom/common_design_subtheme/sass/cd/cd-header/_cd-search--inline.scss
index 1dda2f474..69e18f88a 100644
--- a/html/themes/custom/common_design_subtheme/sass/cd/cd-header/_cd-search--inline.scss
+++ b/html/themes/custom/common_design_subtheme/sass/cd/cd-header/_cd-search--inline.scss
@@ -48,7 +48,7 @@
 @include desktop {
   .cd-search--inline__input {
     &:focus {
-      border-bottom: 3px solid $cd-blue--bright;
+      border-bottom: 3px solid $implementation-secondary;
     }
   }
 
diff --git a/html/themes/custom/common_design_subtheme/sass/cd/cd-header/_cd-user-menu.scss b/html/themes/custom/common_design_subtheme/sass/cd/cd-header/_cd-user-menu.scss
index f2f318585..d5b86dca6 100644
--- a/html/themes/custom/common_design_subtheme/sass/cd/cd-header/_cd-user-menu.scss
+++ b/html/themes/custom/common_design_subtheme/sass/cd/cd-header/_cd-user-menu.scss
@@ -19,7 +19,7 @@
 
 .cd-user-menu__item {
   &:focus {
-    outline: 3px solid $cd-blue--bright;
+    outline: 3px solid $implementation-secondary;
   }
 }
 

From bb69910da64add76fbfea478470eefe75720086c Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 12:11:45 -0700
Subject: [PATCH 019/720] rename colour variables, with some exceptions, and
 regen css

---
 .../common_design_subtheme/css/styles.css     |  2 +-
 .../sass/cd/_cd-variables.scss                | 64 ++++++++++---------
 2 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/css/styles.css b/html/themes/custom/common_design_subtheme/css/styles.css
index 3beef04c5..62a5a601b 100644
--- a/html/themes/custom/common_design_subtheme/css/styles.css
+++ b/html/themes/custom/common_design_subtheme/css/styles.css
@@ -1 +1 @@
-@import"https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400%3B500%3B700&display=swap";@import"https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,300%3B0,400%3B0,500%3B0,700%3B0,900%3B1,400%3B1,700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400%3B700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@400%3B700&display=swap";:root{--cd-reliefweb-brand-blue: #0988bb;--cd-reliefweb-brand-red: #f65c51;--cd-reliefweb-brand-blue--dark: #055372;--cd-reliefweb-brand-red--dark: #eb1405;--cd-reliefweb-brand-grey--dark: #2e3436;--cd-reliefweb-brand-grey--mid: #4d5254;--cd-reliefweb-brand-grey--light: #e6ecef;--cd-rgb-reliefweb-blue: 9, 136, 187;--cd-rgb-reliefweb-red: 246, 92, 81;--cd-rgb-reliefweb-dark-blue: 4, 82, 112;--cd-rgb-reliefweb-dark-red: 235, 20, 5;--cd-rgb-reliefweb-dark-grey: 46, 52, 54;--cd-rgb-reliefweb-light-grey: 230, 236, 239;--cd-reliefweb-green: #88bb09;--cd-reliefweb-orange: #eb8705;--cd-reliefweb-red--text: #da190b;--cd-reliefweb-orange--text: #f49e2c;--disable: rgba(230, 236, 239, 0.5);--cd-reliefweb-green--background: rgba(136, 187, 9, 0.2);--cd-reliefweb-red--background: rgba(246, 92, 81, 0.2);--cd-reliefweb-orange--background: rgba(235, 135, 5, 0.2);--cd-ocha-blue: #1f69b3;--cd-blue--dark: #144372;--cd-blue--bright: #82b5e9;--cd-blue--light: #d4e5f7;--cd-highlight-red: #e56a54;--cd-contrast-red: #e00000;--cd-white: #fff;--cd-grey--light: #f2f2f2;--cd-grey--mid: #595959;--cd-grey--dark: #4a4a4a;--cd-default-text-color: var(--cd-grey--dark);--cd-black: #000;--cd-blue-grey: #e6ecf1;--cd-blue-grey--dark: #d3dde5;--cd-blue-grey--light: #ebf0f4;--cd-rgb-ocha-blue: 2, 108, 182;--cd-rgb-grey--mid: 89, 89, 89;--cd-rgb-grey--dark: 74, 74, 74;--cd-rgb-highlight-red: 229, 106, 84;--cd-rgb-blue-grey--dark: 211, 221, 229;--cd-max-content-width: 820px;--cd-max-body-width: 1400px;--cd-max-width: 1220px;--cd-container-padding: 0.75rem;--cd-container-padding-tablet: 1.5rem;--cd-container-padding-xlarge: 2.5rem;--cd-flow-space: 1rem;--cd-bumper-space: 1rem;--cd-footer-row-number: 5;--cd-red: #cd3a1f;--cd-red--light: #f8d8d3;--cd-orange: #db7b18;--cd-orange--light: #fae6d1;--cd-yellow: #d5de26;--cd-yellow--light: #f7f8d3;--cd-green: #7fb92f;--cd-green--light: #e8f5d6;--cd-font-size--tiny: 0.75rem;--cd-font-size--small: 0.875rem;--cd-font-size--base: 1.125rem;--cd-font-size--medium: 1.375rem;--cd-font-size--large: 1.625rem;--cd-font-size--2xbase: 1.875rem;--cd-font-size--2xmedium: 2.375rem;--cd-font-size--2xlarge: 2.875rem;--cd-font: helvetica, arial, sans-serif;--cd-font--system: system-ui;--cd-font--noto: "Noto Sans", sans-serif;--cd-font--noto-kufi: "Noto Kufi Arabic", sans-serif;--cd-font--roboto: "Roboto", helvetica, arial, sans-serif;--cd-font--roboto-condensed: "Roboto Condensed", helvetica, arial, sans-serif;--cd-font--roboto-slab: "Roboto Slab", helvetica, arial, sans-serif}@supports(display: grid){@media(min-width: 768px){.cd-layout-container{grid-template-rows:151px auto 1fr auto}}}@media(min-width: 768px){.cd-layout-container .cd-layout-content-wrapper{display:flex;flex-wrap:wrap}}@media(min-width: 768px){.cd-layout-content{flex-basis:0;flex-grow:999}}.cd-global-header__dropdown{background:var(--cd-reliefweb-brand-blue--dark)}.cd-global-header button[aria-expanded=true]::before{border-color:transparent transparent var(--cd-reliefweb-brand-blue--dark)}@media(max-width: 767px){.cd-global-header button[aria-expanded] span[class*=__btn-label]{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}.cd-header button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header{background:var(--cd-reliefweb-brand-blue--dark);background-image:linear-gradient(-180deg, var(--cd-reliefweb-brand-blue--dark) 67%, #04415a 97%)}@supports(display: grid){.cd-site-header__inner{grid-template-columns:52px 1fr}@media(min-width: 768px){.cd-site-header__inner{grid-template-columns:186px 1fr}}}.cd-language-switcher__btn:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-user-menu__dropdown li a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-site-logo{width:52px}.cd-site-logo:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}@media(max-width: 767px){.cd-site-logo{background:url("../img/logos/rw-logo-mobile.svg") center no-repeat;background:linear-gradient(transparent, transparent),url("../img/logos/rw-logo-mobile.svg") center no-repeat}}@media(min-width: 768px){.cd-site-logo{width:140px}}.menu--main button[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red)}.cd-nav__btn[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red)}.cd-nav__btn[aria-expanded=true]::before{background:var(--cd-reliefweb-brand-red)}@media(max-width: 1023px){.cd-site-header__nav-holder .cd-nav>ul>li>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>button.is-active::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>button.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>button.is-active::before{background:rgba(var(--cd-reliefweb-brand-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-brand-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-brand-red), 0.6)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red)}}@media(min-width: 1024px){.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail button::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a:focus::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button:focus::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul a.is-active,.cd-site-header__nav-holder .cd-nav>.menu>li>ul button.is-active{border-left:3px solid var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul>li.menu-item--active-trail .is-active{border-left:3px solid var(--cd-reliefweb-brand-red)}}.cd-ocha-dropdown__link a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-search__btn{color:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn svg{fill:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn:hover,.cd-search__btn:focus{color:#04415a}.cd-search__btn:hover svg,.cd-search__btn:focus svg{fill:#04415a}.cd-search__btn:focus{color:var(--cd-reliefweb-brand-red)}.cd-search__btn:focus svg{fill:var(--cd-reliefweb-brand-red)}.cd-search__btn[aria-expanded=true]{color:var(--cd-reliefweb-brand-red)}.cd-search__btn[aria-expanded=true] svg{fill:var(--cd-reliefweb-brand-red)}.cd-search__submit:focus{background-color:var(--cd-reliefweb-brand-red)}.cd-user-menu--no-language-switcher li:last-child a,.cd-user-menu--no-language-switcher li:last-child button{padding-right:0}.cd-user-menu--no-language-switcher li:last-child a::after,.cd-user-menu--no-language-switcher li:last-child button::after{content:none}.cd-user-menu__item:focus,.cd-global-header .menu>li a:focus,.cd-global-header .menu>li button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button{padding-right:0}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a::after,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button::after{content:none}@media(max-width: 767px){.cd-global-header__user-menu a svg+span{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}[dir=ltr] .admin-menu__btn svg+span{margin-left:10px}[dir=rtl] .admin-menu__btn svg+span{margin-right:10px}.admin-menu__btn .cd-icon:not(.cd-icon--arrow-down){display:inline-block;width:14px;height:14px;vertical-align:middle;fill:var(--cd-white)}.cd-footer{background:var(--cd-reliefweb-brand-blue--dark)}.cd-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-footer-copyright{display:block;margin-top:0;text-align:right;color:#fff;font-size:12px;font-weight:lighter}.cd-footer-copyright p{margin:0}.cd-footer-copyright a{display:inline-block;overflow:hidden;width:140px;height:60px;margin:0 0 -4px 0;padding:0 0 0 140px;background:url(../img/logos/rw-logo-sprite.png) 0 -60px no-repeat;background:rgba(0,0,0,0) url(../img/logos/rw-logo-sprite.svg) 0 -60px no-repeat}.cd-footer-copyright a:hover,.cd-footer-copyright a:active,.cd-footer-copyright a:focus{opacity:.8}@media all and (max-width: 1023px){.cd-footer-copyright{width:100%;text-align:center}}.cd-soft-footer{background:rgba(var(--cd-rgb-ocha-blue), 0.9)}.cd-soft-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}a{color:var(--cd-reliefweb-brand-blue--dark)}a:hover,a:focus{color:var(--cd-reliefweb-brand-blue--dark)}h1,h2{margin:0 0 24px 0;letter-spacing:.5px;font-size:24px;font-weight:bold;line-height:1.3}@media screen and (min-width: 480px){h1,h2{font-size:var(--cd-font-size--2xbase)}}h3{margin:0 0 16px 0;letter-spacing:.5px;font-size:20px;font-weight:bold;line-height:1.3}h4{margin:0 0 16px 0;letter-spacing:.5px;font-size:18px;font-weight:bold;line-height:1.3}h5{margin:0 0 16px 0;letter-spacing:.5px;font-size:17px;font-weight:bold;font-style:italic}h6{margin:0 0 16px 0;letter-spacing:.5px;font-size:16px;font-weight:bold}.rw-article__content *+h3,.rw-article__content *+h4,.rw-article__content *+h5,.rw-article__content *+h6{margin-top:16px}@media all and (max-width: 479px){#main h2{font-size:24px}}p{margin:1rem 0;line-height:1.6}p:first-child{margin-top:0}p:last-child{margin-bottom:0}input[type=search]{-moz-appearance:none;-webkit-appearance:none;appearance:none}input::-webkit-search-decoration{-webkit-appearance:none}input:-ms-input-placeholder{opacity:.7;color:inherit;font-style:italic}input::-moz-placeholder{opacity:.7;color:inherit;font-style:italic}input::placeholder{opacity:.7;color:inherit;font-style:italic}select{max-width:100%}select:not([multitple]){-moz-appearance:menulist-button;-webkit-appearance:menulist-button}fieldset{min-inline-size:auto}table{width:100%;border-collapse:collapse}table caption{margin:12px 0;font-weight:bold}table th,table td{padding:8px;border:1px solid var(--cd-reliefweb-brand-grey--light)}table th{border-left-color:#fff;background:var(--cd-reliefweb-brand-grey--light)}table thead th{border-left-color:#fff}th.field-label>h4.label{margin:0}table thead th:first-child{border-left-color:var(--cd-reliefweb-brand-grey--light)}table tbody th{border-top-color:#fff}table tbody th:first-child{border-top-color:var(--cd-reliefweb-brand-grey--light)}
+@import"https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400%3B500%3B700&display=swap";@import"https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,300%3B0,400%3B0,500%3B0,700%3B0,900%3B1,400%3B1,700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400%3B700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@400%3B700&display=swap";:root{--cd-reliefweb-brand-blue: #0988bb;--cd-reliefweb-brand-red: #f65c51;--cd-reliefweb-brand-blue--dark: #055372;--cd-reliefweb-brand-red--dark: #eb1405;--cd-reliefweb-brand-grey--dark: #2e3436;--cd-reliefweb-brand-grey--mid: #4d5254;--cd-reliefweb-brand-grey--light: #e6ecef;--cd-rgb-reliefweb-blue: 9, 136, 187;--cd-rgb-reliefweb-red: 246, 92, 81;--cd-rgb-reliefweb-dark-blue: 4, 82, 112;--cd-rgb-reliefweb-dark-red: 235, 20, 5;--cd-rgb-reliefweb-dark-grey: 46, 52, 54;--cd-rgb-reliefweb-light-grey: 230, 236, 239;--cd-reliefweb-grey--light: #d9d9d9;--cd-reliefweb-grey--light--bg: rgba(217, 217, 217, 0.2);--cd-reliefweb-orange: #f49e2c;--cd-reliefweb-orange--bg: rgba(244, 158, 44, 0.2);--cd-reliefweb-blue: #076d96;--cd-reliefweb-blue--bg: rgba(7, 109, 150, 0.2);--cd-reliefweb-green: #88bb09;--cd-reliefweb-green--bg: rgba(136, 187, 9, 0.2);--cd-reliefweb-red: #da190b;--cd-reliefweb-red--bg: rgba(218, 25, 11, 0.2);--cd-reliefweb-purple: #9509bb;--cd-reliefweb-purple--bg: rgba(149, 9, 187, 0.2);--cd-reliefweb-grey: #4b4b4b;--cd-reliefweb-grey--bg: rgba(75, 75, 75, 0.2);--cd-reliefweb-brown: #8f5507;--cd-reliefweb-brown--bg: rgba(143, 85, 7, 0.2);--cd-reliefweb-yellow: #f5cb2f;--cd-reliefweb-yellow--bg: rgba(245, 203, 47, 0.2);--cd-reliefweb-cyan: #56c9f7;--cd-reliefweb-cyan--bg: rgba(86, 201, 247, 0.2);--cd-reliefweb-orange--alert: #eb8705;--cd-reliefweb-pink: rgba(246, 92, 81, 0.2);--disable: rgba(230, 236, 239, 0.5);--cd-ocha-blue: #1f69b3;--cd-blue--dark: #144372;--cd-blue--bright: #82b5e9;--cd-blue--light: #d4e5f7;--cd-highlight-red: #e56a54;--cd-contrast-red: #e00000;--cd-white: #fff;--cd-grey--light: #f2f2f2;--cd-grey--mid: #595959;--cd-grey--dark: #4a4a4a;--cd-default-text-color: var(--cd-grey--dark);--cd-black: #000;--cd-blue-grey: #e6ecf1;--cd-blue-grey--dark: #d3dde5;--cd-blue-grey--light: #ebf0f4;--cd-rgb-ocha-blue: 2, 108, 182;--cd-rgb-grey--mid: 89, 89, 89;--cd-rgb-grey--dark: 74, 74, 74;--cd-rgb-highlight-red: 229, 106, 84;--cd-rgb-blue-grey--dark: 211, 221, 229;--cd-max-content-width: 820px;--cd-max-body-width: 1400px;--cd-max-width: 1220px;--cd-container-padding: 0.75rem;--cd-container-padding-tablet: 1.5rem;--cd-container-padding-xlarge: 2.5rem;--cd-flow-space: 1rem;--cd-bumper-space: 1rem;--cd-footer-row-number: 5;--cd-red: #cd3a1f;--cd-red--light: #f8d8d3;--cd-orange: #db7b18;--cd-orange--light: #fae6d1;--cd-yellow: #d5de26;--cd-yellow--light: #f7f8d3;--cd-green: #7fb92f;--cd-green--light: #e8f5d6;--cd-font-size--tiny: 0.75rem;--cd-font-size--small: 0.875rem;--cd-font-size--base: 1.125rem;--cd-font-size--medium: 1.375rem;--cd-font-size--large: 1.625rem;--cd-font-size--2xbase: 1.875rem;--cd-font-size--2xmedium: 2.375rem;--cd-font-size--2xlarge: 2.875rem;--cd-font: helvetica, arial, sans-serif;--cd-font--system: system-ui;--cd-font--noto: "Noto Sans", sans-serif;--cd-font--noto-kufi: "Noto Kufi Arabic", sans-serif;--cd-font--roboto: "Roboto", helvetica, arial, sans-serif;--cd-font--roboto-condensed: "Roboto Condensed", helvetica, arial, sans-serif;--cd-font--roboto-slab: "Roboto Slab", helvetica, arial, sans-serif}@supports(display: grid){@media(min-width: 768px){.cd-layout-container{grid-template-rows:151px auto 1fr auto}}}@media(min-width: 768px){.cd-layout-container .cd-layout-content-wrapper{display:flex;flex-wrap:wrap}}@media(min-width: 768px){.cd-layout-content{flex-basis:0;flex-grow:999}}.cd-global-header__dropdown{background:var(--cd-reliefweb-brand-blue--dark)}.cd-global-header button[aria-expanded=true]::before{border-color:transparent transparent var(--cd-reliefweb-brand-blue--dark)}@media(max-width: 767px){.cd-global-header button[aria-expanded] span[class*=__btn-label]{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}.cd-header button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header{background:var(--cd-reliefweb-brand-blue--dark);background-image:linear-gradient(-180deg, var(--cd-reliefweb-brand-blue--dark) 67%, #04415a 97%)}@supports(display: grid){.cd-site-header__inner{grid-template-columns:52px 1fr}@media(min-width: 768px){.cd-site-header__inner{grid-template-columns:186px 1fr}}}.cd-language-switcher__btn:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-user-menu__dropdown li a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-site-logo{width:52px}.cd-site-logo:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}@media(max-width: 767px){.cd-site-logo{background:url("../img/logos/rw-logo-mobile.svg") center no-repeat;background:linear-gradient(transparent, transparent),url("../img/logos/rw-logo-mobile.svg") center no-repeat}}@media(min-width: 768px){.cd-site-logo{width:140px}}.menu--main button[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red)}.cd-nav__btn[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red)}.cd-nav__btn[aria-expanded=true]::before{background:var(--cd-reliefweb-brand-red)}@media(max-width: 1023px){.cd-site-header__nav-holder .cd-nav>ul>li>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>button.is-active::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>button.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>button.is-active::before{background:rgba(var(--cd-reliefweb-brand-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-brand-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-brand-red), 0.6)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red)}}@media(min-width: 1024px){.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail button::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a:focus::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button:focus::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul a.is-active,.cd-site-header__nav-holder .cd-nav>.menu>li>ul button.is-active{border-left:3px solid var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul>li.menu-item--active-trail .is-active{border-left:3px solid var(--cd-reliefweb-brand-red)}}.cd-ocha-dropdown__link a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-search__btn{color:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn svg{fill:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn:hover,.cd-search__btn:focus{color:#04415a}.cd-search__btn:hover svg,.cd-search__btn:focus svg{fill:#04415a}.cd-search__btn:focus{color:var(--cd-reliefweb-brand-red)}.cd-search__btn:focus svg{fill:var(--cd-reliefweb-brand-red)}.cd-search__btn[aria-expanded=true]{color:var(--cd-reliefweb-brand-red)}.cd-search__btn[aria-expanded=true] svg{fill:var(--cd-reliefweb-brand-red)}.cd-search__submit:focus{background-color:var(--cd-reliefweb-brand-red)}.cd-user-menu--no-language-switcher li:last-child a,.cd-user-menu--no-language-switcher li:last-child button{padding-right:0}.cd-user-menu--no-language-switcher li:last-child a::after,.cd-user-menu--no-language-switcher li:last-child button::after{content:none}.cd-user-menu__item:focus,.cd-global-header .menu>li a:focus,.cd-global-header .menu>li button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button{padding-right:0}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a::after,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button::after{content:none}@media(max-width: 767px){.cd-global-header__user-menu a svg+span{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}[dir=ltr] .admin-menu__btn svg+span{margin-left:10px}[dir=rtl] .admin-menu__btn svg+span{margin-right:10px}.admin-menu__btn .cd-icon:not(.cd-icon--arrow-down){display:inline-block;width:14px;height:14px;vertical-align:middle;fill:var(--cd-white)}.cd-footer{background:var(--cd-reliefweb-brand-blue--dark)}.cd-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-footer-copyright{display:block;margin-top:0;text-align:right;color:#fff;font-size:12px;font-weight:lighter}.cd-footer-copyright p{margin:0}.cd-footer-copyright a{display:inline-block;overflow:hidden;width:140px;height:60px;margin:0 0 -4px 0;padding:0 0 0 140px;background:url(../img/logos/rw-logo-sprite.png) 0 -60px no-repeat;background:rgba(0,0,0,0) url(../img/logos/rw-logo-sprite.svg) 0 -60px no-repeat}.cd-footer-copyright a:hover,.cd-footer-copyright a:active,.cd-footer-copyright a:focus{opacity:.8}@media all and (max-width: 1023px){.cd-footer-copyright{width:100%;text-align:center}}.cd-soft-footer{background:rgba(var(--cd-rgb-ocha-blue), 0.9)}.cd-soft-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}a{color:var(--cd-reliefweb-brand-blue--dark)}a:hover,a:focus{color:var(--cd-reliefweb-brand-blue--dark)}h1,h2{margin:0 0 24px 0;letter-spacing:.5px;font-size:24px;font-weight:bold;line-height:1.3}@media screen and (min-width: 480px){h1,h2{font-size:var(--cd-font-size--2xbase)}}h3{margin:0 0 16px 0;letter-spacing:.5px;font-size:20px;font-weight:bold;line-height:1.3}h4{margin:0 0 16px 0;letter-spacing:.5px;font-size:18px;font-weight:bold;line-height:1.3}h5{margin:0 0 16px 0;letter-spacing:.5px;font-size:17px;font-weight:bold;font-style:italic}h6{margin:0 0 16px 0;letter-spacing:.5px;font-size:16px;font-weight:bold}.rw-article__content *+h3,.rw-article__content *+h4,.rw-article__content *+h5,.rw-article__content *+h6{margin-top:16px}@media all and (max-width: 479px){#main h2{font-size:24px}}p{margin:1rem 0;line-height:1.6}p:first-child{margin-top:0}p:last-child{margin-bottom:0}input[type=search]{-moz-appearance:none;-webkit-appearance:none;appearance:none}input::-webkit-search-decoration{-webkit-appearance:none}input:-ms-input-placeholder{opacity:.7;color:inherit;font-style:italic}input::-moz-placeholder{opacity:.7;color:inherit;font-style:italic}input::placeholder{opacity:.7;color:inherit;font-style:italic}select{max-width:100%}select:not([multitple]){-moz-appearance:menulist-button;-webkit-appearance:menulist-button}fieldset{min-inline-size:auto}table{width:100%;border-collapse:collapse}table caption{margin:12px 0;font-weight:bold}table th,table td{padding:8px;border:1px solid var(--cd-reliefweb-brand-grey--light)}table th{border-left-color:#fff;background:var(--cd-reliefweb-brand-grey--light)}table thead th{border-left-color:#fff}th.field-label>h4.label{margin:0}table thead th:first-child{border-left-color:var(--cd-reliefweb-brand-grey--light)}table tbody th{border-top-color:#fff}table tbody th:first-child{border-top-color:var(--cd-reliefweb-brand-grey--light)}
diff --git a/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss b/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
index 78f35295b..ed0d3cdcf 100644
--- a/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
+++ b/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
@@ -42,38 +42,42 @@
   --cd-rgb-reliefweb-dark-red: 235, 20, 5;
   --cd-rgb-reliefweb-dark-grey: 46, 52, 54;
   --cd-rgb-reliefweb-light-grey: 230, 236, 239;
-  --cd-reliefweb-green: #88bb09;
-  --cd-reliefweb-orange: #eb8705;
-  --cd-reliefweb-red--text: #da190b;
-  --cd-reliefweb-orange--text: #f49e2c;
-  --disable: rgba(230, 236, 239, 0.5);
 
   // Moderation
-  //  border-color: #d9d9d9;
-  //  background-color: rgba(217, 217, 217, 0.2);
-  //  border-color: #f49e2c;
-  //  background-color: rgba(244, 158, 44, 0.2);
-  //  border-color: #076d96;
-  //  background-color: rgba(7, 109, 150, 0.2);
-  //  border-color: #88bb09;
-  //  background-color: rgba(136, 187, 9, 0.2);
-  //  border-color: #da190b;
-  //  background-color: rgba(218, 25, 11, 0.2);
-  //  border-color: #9509bb;
-  //  background-color: rgba(149, 9, 187, 0.2);
-  //  border-color: #4b4b4b;
-  //  background-color: rgba(75, 75, 75, 0.2);
-  //  border-color: #8f5507;
-  //  background-color: rgba(143, 85, 7, 0.2);
-  //  border-color: #f5cb2f;
-  //  background: rgba(245, 203, 47, 0.2);
-  //  border-color: #56c9f7;
-  //  background-color: rgba(86, 201, 247, 0.2);
-
-  /* On white background */
-  --cd-reliefweb-green--background: rgba(136, 187, 9, 0.2);
-  --cd-reliefweb-red--background: rgba(246, 92, 81, 0.2);
-  --cd-reliefweb-orange--background: rgba(235, 135, 5, 0.2);
+  --cd-reliefweb-grey--light: #d9d9d9;
+  --cd-reliefweb-grey--light--bg: rgba(217, 217, 217, 0.2);
+  // Orange
+  --cd-reliefweb-orange: #f49e2c;
+  --cd-reliefweb-orange--bg: rgba(244, 158, 44, 0.2);
+  // Blue
+  --cd-reliefweb-blue: #076d96;
+  --cd-reliefweb-blue--bg: rgba(7, 109, 150, 0.2);
+  // Green
+  --cd-reliefweb-green: #88bb09;
+  --cd-reliefweb-green--bg: rgba(136, 187, 9, 0.2);
+  // Red
+  --cd-reliefweb-red: #da190b;
+  --cd-reliefweb-red--bg: rgba(218, 25, 11, 0.2);
+  // Purple
+  --cd-reliefweb-purple: #9509bb;
+  --cd-reliefweb-purple--bg: rgba(149, 9, 187, 0.2);
+  // Grey
+  --cd-reliefweb-grey: #4b4b4b;
+  --cd-reliefweb-grey--bg: rgba(75, 75, 75, 0.2);
+  // Brown
+  --cd-reliefweb-brown: #8f5507;
+  --cd-reliefweb-brown--bg: rgba(143, 85, 7, 0.2);
+  // Yellow
+  --cd-reliefweb-yellow: #f5cb2f;
+  --cd-reliefweb-yellow--bg: rgba(245, 203, 47, 0.2);
+  // Cyan
+  --cd-reliefweb-cyan: #56c9f7;
+  --cd-reliefweb-cyan--bg: rgba(86, 201, 247, 0.2);
+
+  // Colour variations.
+  --cd-reliefweb-orange--alert: #eb8705;
+  --cd-reliefweb-pink: rgba(246, 92, 81, 0.2);
+  --disable: rgba(230, 236, 239, 0.5);
 
   /* OCHA blue is one colour ramp darker than brand blue */
   --cd-ocha-blue: #1f69b3;

From c3ba38243914a072d50f3b4af65eb674ebebd017 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 12:31:43 -0700
Subject: [PATCH 020/720] replace colours with variables, correct values for
 icon json

---
 .../components/rw-disasters/rw-disasters.css  |  4 +-
 .../rw-entity-meta/rw-entity-meta.css         |  2 +-
 .../components/rw-form/rw-form.css            |  4 +-
 .../components/rw-icons/rw-icons.json         |  6 +--
 .../rw-moderation-status.css                  | 38 +++++++++----------
 .../rw-user-posting-rights.css                | 18 ++++-----
 6 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-disasters/rw-disasters.css b/html/themes/custom/common_design_subtheme/components/rw-disasters/rw-disasters.css
index e1389ea48..6c2e47816 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-disasters/rw-disasters.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-disasters/rw-disasters.css
@@ -269,8 +269,8 @@
   background-color: #b6c8d0;
 }
 .taxonomy-term--disaster--full[data-disaster-status="alert"] .rw-article__header:before {
-  border-color: var(--cd-reliefweb-orange);
-  background-color: var(--cd-reliefweb-orange);
+  border-color: var(--cd-reliefweb-orange--alert);
+  background-color: var(--cd-reliefweb-orange--alert);
 }
 .taxonomy-term--disaster--full[data-disaster-status="current"] .rw-article__header:before,
 .taxonomy-term--disaster--full[data-disaster-status="ongoing"] .rw-article__header:before {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-entity-meta/rw-entity-meta.css b/html/themes/custom/common_design_subtheme/components/rw-entity-meta/rw-entity-meta.css
index 8a28b9e4a..29e624c1a 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-entity-meta/rw-entity-meta.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-entity-meta/rw-entity-meta.css
@@ -165,7 +165,7 @@
 }
 .rw-entity-meta dd.rw-entity-meta__tag-value--status--alert:before {
   content: "";
-  background: var(--cd-reliefweb-orange);
+  background: var(--cd-reliefweb-orange--alert);
 }
 .rw-entity-meta dd.rw-entity-meta__tag-value--status--ongoing:before {
   content: "";
diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 58ea27b4c..3f883d325 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -454,12 +454,12 @@ form #edit-organization #edit-field-source-allowed .form-item:last-child {
 form [data-lengthchecker-status] {
   margin-top: -2px;
   padding: 8px 8px;
-  background-color: rgba(246, 92, 81, 0.2);
+  background-color: var(--cd-reliefweb-pink);
   font-size: 15px;
   line-height: 1.2;
 }
 form [data-lengthchecker-status="ok"] {
-  background-color: rgba(136, 187, 9, 0.2);
+  background-color: var(--cd-reliefweb-green--bg);
 }
 
 /* New Organisation field for Jobs */
diff --git a/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.json b/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.json
index 1e364fa01..0a71e3e85 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.json
+++ b/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.json
@@ -9,9 +9,9 @@
     "grey": "#b6c8d0",
     "white": "white",
     "blue": "--cd-reliefweb-brand-blue",
-    "green": "var(--cd-reliefweb-green)",
-    "orange": "var(--cd-reliefweb-orange)",
-    "red": "var(--cd-reliefweb-brand-red)"
+    "green": "--cd-reliefweb-green",
+    "orange": "--cd-reliefweb-orange--alert",
+    "red": "--cd-reliefweb-brand-red"
   },
   "icons": {
     "common": {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-moderation-status/rw-moderation-status.css b/html/themes/custom/common_design_subtheme/components/rw-moderation-status/rw-moderation-status.css
index 7bd942436..56a1cc7fd 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-moderation-status/rw-moderation-status.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-moderation-status/rw-moderation-status.css
@@ -1,57 +1,57 @@
 [data-moderation-status="draft"] {
-  border-color: #d9d9d9;
-  background-color: rgba(217, 217, 217, 0.2);
+  border-color: var(--cd-reliefweb-grey--light);
+  background-color: var(--cd-reliefweb-orange--bg);
 }
 [data-moderation-status="on_hold"],
 [data-moderation-status="alert"],
 [data-moderation-status="inactive"] {
-  border-color: #f49e2c;
-  background-color: rgba(244, 158, 44, 0.2);
+  border-color: var(--cd-reliefweb-orange);
+  background-color: var(--cd-reliefweb-orange--bg);
 }
 [data-moderation-status="to_review"],
 [data-moderation-status="external"] {
-  border-color: #076d96;
-  background-color: rgba(7, 109, 150, 0.2);
+  border-color: var(--cd-reliefweb-blue);
+  background-color: var(--cd-reliefweb-blue--bg);
 }
 [data-moderation-status="published"],
 [data-moderation-status="past"],
 [data-moderation-status="active"],
 [data-moderation-status="normal"] {
   border-color: var(--cd-reliefweb-green);
-  background-color: rgba(136, 187, 9, 0.2);
+  background-color: var(--cd-reliefweb-green--bg);
 }
 [data-moderation-status="refused"],
 [data-moderation-status="blocked"],
 [data-moderation-status="current"],
 [data-moderation-status="ongoing"] {
-  border-color: #da190b;
-  background-color: rgba(218, 25, 11, 0.2);
+  border-color: var(--cd-reliefweb-red);
+  background-color: var(--cd-reliefweb-red--bg);
 }
 [data-moderation-status="expired"],
 [data-moderation-status="archive"],
 [data-moderation-status="alert_archive"] {
-  border-color: #9509bb;
-  background-color: rgba(149, 9, 187, 0.2);
+  border-color: var(--cd-reliefweb-purple);
+  background-color: var(--cd-reliefweb-purple--bg);
 }
 [data-moderation-status="draft_archive"] {
-  border-color: #4b4b4b;
-  background-color: rgba(75, 75, 75, 0.2);
+  border-color: var(--cd-reliefweb-grey);
+  background-color: var(--cd-reliefweb-grey--bg);
 }
 [data-moderation-status="duplicate"],
 [data-moderation-status="monitoring_archive"] {
-  border-color: #8f5507;
-  background-color: rgba(143, 85, 7, 0.2);
+  border-color: var(--cd-reliefweb-brown);
+  background-color: var(--cd-reliefweb-brown--bg);
 }
 [data-moderation-status="monitoring"],
 [data-moderation-status="reference"] {
-  border-color: #f5cb2f;
-  background: rgba(245, 203, 47, 0.2);
+  border-color: var(--cd-reliefweb-yellow);
+  background: var(--cd-reliefweb-yellow--bg);
 }
 [data-moderation-status="pending"],
 [data-moderation-status="embargoed"],
 [data-moderation-status="external_archive"] {
-  border-color: #56c9f7;
-  background-color: rgba(86, 201, 247, 0.2);
+  border-color: var(--cd-reliefweb-cyan);
+  background-color: var(--cd-reliefweb-cyan--bg);
 }
 
 .rw-moderation-status[data-moderation-status] {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-user-posting-rights/rw-user-posting-rights.css b/html/themes/custom/common_design_subtheme/components/rw-user-posting-rights/rw-user-posting-rights.css
index 9873cf8bd..cef8575e7 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-user-posting-rights/rw-user-posting-rights.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-user-posting-rights/rw-user-posting-rights.css
@@ -8,24 +8,24 @@
   padding: 2px 4px;
   vertical-align: middle;
   text-transform: uppercase;
-  border: 1px solid #d9d9d9;
-  background: rgba(217, 217, 217, 0.2);
+  border: 1px solid var(--cd-reliefweb-grey--light);
+  background: var(--cd-reliefweb-orange--bg);
   font-size: 10px;
   font-weight: bold;
 }
 .rw-user-posting-right[data-user-posting-right="blocked"] {
-  border-color: #da190b;
-  background: rgba(218, 25, 11, 0.2);
+  border-color: var(--cd-reliefweb-red);
+  background: var(--cd-reliefweb-red--bg);
 }
 .rw-user-posting-right[data-user-posting-right="unverified"] {
-  border-color: #f49e2c;
-  background: rgba(244, 158, 44, 0.2);
+  border-color: var(--cd-reliefweb-orange);
+  background: var(--cd-reliefweb-orange--bg);
 }
 .rw-user-posting-right[data-user-posting-right="allowed"] {
-  border-color: #076d96;
-  background: rgba(7, 109, 150, 0.2);
+  border-color: var(--cd-reliefweb-blue);
+  background: var(--cd-reliefweb-blue--bg);
 }
 .rw-user-posting-right[data-user-posting-right="trusted"] {
   border-color: var(--cd-reliefweb-green);
-  background: rgba(136, 187, 9, 0.2);
+  background: var(--cd-reliefweb-green--bg);
 }

From 60bb3e995123858701228798f042adf5a99115e9 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 12:41:31 -0700
Subject: [PATCH 021/720] more grey replacement

---
 .../rw-advanced-search/rw-advanced-search.css        | 12 ++++++------
 .../rw-article/rw-appeals-response-plans.css         |  2 +-
 .../components/rw-article/rw-maps-inforgraphics.css  |  6 +++---
 .../components/rw-pager/rw-pager.css                 |  2 +-
 .../components/rw-river/rw-river-results.css         |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-advanced-search/rw-advanced-search.css b/html/themes/custom/common_design_subtheme/components/rw-advanced-search/rw-advanced-search.css
index 3a8e50d45..8c3595779 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-advanced-search/rw-advanced-search.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-advanced-search/rw-advanced-search.css
@@ -214,7 +214,7 @@
   margin: 12px 0 0 0;
   padding: 12px 0 0 0;
   text-align: center;
-  border: 1px solid var(--cd-reliefweb-light-grey);
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
   border-width: 1px 0 0 0;
 }
 .rw-advanced-search[data-empty] .rw-advanced-search__actions {
@@ -278,10 +278,10 @@
   margin-right: 12px;
   content: "";
   vertical-align: top;
-  border: 4px solid  var(--cd-reliefweb-light-grey);
+  border: 4px solid  var(--cd-reliefweb-brand-grey--light);
   border-radius: 50%;
   background: var(--rw-icons--common--add--12--dark-blue);
-  background-color: var(--cd-reliefweb-light-grey);
+  background-color: var(--cd-reliefweb-brand-grey--light);
 }
 
 .rw-advanced-search button[data-toggler]:hover,
@@ -310,7 +310,7 @@
   left: 0;
   width: 284px;
   padding: 10px;
-  border: 1px solid var(--cd-reliefweb-light-grey);
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
   background: white;
   -webkit-box-shadow: 0 3px 5px 0 rgba(0, 0, 0, 0.2);
   box-shadow: 0 3px 5px 0 rgba(0, 0, 0, 0.2);
@@ -390,7 +390,7 @@
   box-sizing: border-box;
   height: 36px;
   padding: 8px;
-  border: 1px solid var(--cd-reliefweb-light-grey);
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
 
 /**
@@ -410,7 +410,7 @@
   position: relative;
   margin: 12px 0 0 0;
   padding: 12px 0 0 0;
-  border-top: 1px solid var(--cd-reliefweb-light-grey);
+  border-top: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
 .rw-advanced-search__advanced-mode-switch-container * {
   display: inline-block;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-article/rw-appeals-response-plans.css b/html/themes/custom/common_design_subtheme/components/rw-article/rw-appeals-response-plans.css
index a04ac4e96..9d4cc570c 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-article/rw-appeals-response-plans.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-article/rw-appeals-response-plans.css
@@ -33,7 +33,7 @@
   width: 140px;
   height: 170px;
   content: "";
-  border: 8px solid var(--cd-reliefweb-light-grey);
+  border: 8px solid var(--cd-reliefweb-brand-grey--light);
   background: linear-gradient(rgba(230, 236, 239, 0) 50%, rgba(230, 236, 239, 0.8));
 }
 
diff --git a/html/themes/custom/common_design_subtheme/components/rw-article/rw-maps-inforgraphics.css b/html/themes/custom/common_design_subtheme/components/rw-article/rw-maps-inforgraphics.css
index 3a9c9dc66..a0aaf68c5 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-article/rw-maps-inforgraphics.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-article/rw-maps-inforgraphics.css
@@ -34,7 +34,7 @@
     width: 190px;
     height: 140px;
     content: "";
-    border: 8px solid var(--cd-reliefweb-light-grey);
+    border: 8px solid var(--cd-reliefweb-brand-grey--light);
     background: linear-gradient(rgba(230, 236, 239, 0) 50%, rgba(230, 236, 239, 0.8));
   }
 
@@ -65,7 +65,7 @@
     .rw-river--maps-infographics article header {
       flex: 1 0 auto;
       padding: 16px 16px 0 16px;
-      border: 1px solid var(--cd-reliefweb-light-grey);
+      border: 1px solid var(--cd-reliefweb-brand-grey--light);
       border-width: 0 1px;
     }
     .rw-river--maps-infographics article .rw-river-article__content {
@@ -93,7 +93,7 @@
     .rw-river--maps-infographics article footer {
       margin: 0;
       padding: 16px 16px 8px 16px;
-      border: 1px solid var(--cd-reliefweb-light-grey);
+      border: 1px solid var(--cd-reliefweb-brand-grey--light);
       border-width: 0 1px 1px 1px;
     }
   }
diff --git a/html/themes/custom/common_design_subtheme/components/rw-pager/rw-pager.css b/html/themes/custom/common_design_subtheme/components/rw-pager/rw-pager.css
index 6b1e5302f..b6f7ee7cc 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-pager/rw-pager.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-pager/rw-pager.css
@@ -5,7 +5,7 @@
   margin-top: 32px;
   padding-top: 32px;
   text-align: center;
-  border-top: 1px solid var(--cd-reliefweb-light-grey);
+  border-top: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
 .pager:after {
   display: table;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-results.css b/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-results.css
index 58e12ea71..6557d885a 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-results.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-results.css
@@ -17,7 +17,7 @@
   .rw-river-results {
     padding: 24px 0;
     text-align: left;
-    border-bottom: 1px solid var(--cd-reliefweb-light-grey);
+    border-bottom: 1px solid var(--cd-reliefweb-brand-grey--light);
   }
 }
 

From a448a61a385e4e14ff2eb67770f963b3967e18be Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 12:56:51 -0700
Subject: [PATCH 022/720] rename rgb variables to match BEM-like hexidecimal
 variables and replace in components

---
 .../components/rw-autocomplete/rw-autocomplete.css   |  2 +-
 .../components/rw-datepicker/rw-datepicker.css       |  4 ++--
 .../components/rw-site-slogan/rw-site-slogan.css     |  5 +++--
 .../custom/common_design_subtheme/css/styles.css     |  2 +-
 .../sass/cd/_cd-variables.scss                       | 12 ++++++------
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-autocomplete/rw-autocomplete.css b/html/themes/custom/common_design_subtheme/components/rw-autocomplete/rw-autocomplete.css
index ef7163e8a..02862693e 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-autocomplete/rw-autocomplete.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-autocomplete/rw-autocomplete.css
@@ -78,7 +78,7 @@
   list-style: none;
   border: 1px solid var(--cd-reliefweb-brand-grey--dark);
   background: white;
-  box-shadow: 0 1px 4px 1px rgba(var(--cd-rgb-reliefweb-dark-grey), 0.3);
+  box-shadow: 0 1px 4px 1px rgba(var(--cd-rgb-reliefweb-brand-grey--dark), 0.3);
 }
 .rw-autocomplete-suggestion {
   margin: 0;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-datepicker/rw-datepicker.css b/html/themes/custom/common_design_subtheme/components/rw-datepicker/rw-datepicker.css
index 6d22f6736..6b5464e74 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-datepicker/rw-datepicker.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-datepicker/rw-datepicker.css
@@ -43,7 +43,7 @@
   padding: 8px;
   border: 1px solid var(--cd-reliefweb-brand-grey--dark);
   background: white;
-  box-shadow: 0 1px 4px 1px rgba(var(--cd-rgb-reliefweb-dark-grey), 0.3);
+  box-shadow: 0 1px 4px 1px rgba(var(--cd-rgb-reliefweb-brand-grey--dark), 0.3);
 }
 .rw-datepicker-calendar button {
   margin: 0;
@@ -195,7 +195,7 @@
   grid-template-columns: repeat(2, min-content);
   border: 1px solid var(--cd-reliefweb-brand-grey--dark);
   background: white;
-  box-shadow: 0 1px 4px 1px rgba(var(--cd-rgb-reliefweb-dark-grey), 0.3);
+  box-shadow: 0 1px 4px 1px rgba(var(--cd-rgb-reliefweb-brand-grey--dark), 0.3);
 }
 .rw-datepicker-dual-widget .rw-datepicker-container:nth-child(1) {
   grid-area: widget1;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-site-slogan/rw-site-slogan.css b/html/themes/custom/common_design_subtheme/components/rw-site-slogan/rw-site-slogan.css
index d282baaee..9e1ad6ff0 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-site-slogan/rw-site-slogan.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-site-slogan/rw-site-slogan.css
@@ -6,14 +6,15 @@
   margin: 0;
   padding: 0;
   /* #2e3436 with 0.7 opacity on white. */
-  color: #6d7172;
+  color: rgba(var(--cd-rgb-reliefweb-brand-grey--dark), 0.7);
   color: white; /* TEMPORARY - COVID-19 */
   /* #e6ecef with 0.4 opacity on white. */
-  background: #f5f7f9;
+  background: rgba(var(--cd-rgb-reliefweb-brand-grey--light), 0.4);
   background: var(--cd-reliefweb-brand-grey--dark); /* TEMPORARY - COVID-19 */
   font-size: 16px;
 }
 .cd-header #site-slogan a {
+  color: rgba(var(--cd-rgb-reliefweb-brand-grey--dark), 0.7);
   color: white; /* TEMPORARY - COVID-19 */
 }
 .cd-header #site-slogan .cd-container {
diff --git a/html/themes/custom/common_design_subtheme/css/styles.css b/html/themes/custom/common_design_subtheme/css/styles.css
index 62a5a601b..c8c0e0df1 100644
--- a/html/themes/custom/common_design_subtheme/css/styles.css
+++ b/html/themes/custom/common_design_subtheme/css/styles.css
@@ -1 +1 @@
-@import"https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400%3B500%3B700&display=swap";@import"https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,300%3B0,400%3B0,500%3B0,700%3B0,900%3B1,400%3B1,700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400%3B700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@400%3B700&display=swap";:root{--cd-reliefweb-brand-blue: #0988bb;--cd-reliefweb-brand-red: #f65c51;--cd-reliefweb-brand-blue--dark: #055372;--cd-reliefweb-brand-red--dark: #eb1405;--cd-reliefweb-brand-grey--dark: #2e3436;--cd-reliefweb-brand-grey--mid: #4d5254;--cd-reliefweb-brand-grey--light: #e6ecef;--cd-rgb-reliefweb-blue: 9, 136, 187;--cd-rgb-reliefweb-red: 246, 92, 81;--cd-rgb-reliefweb-dark-blue: 4, 82, 112;--cd-rgb-reliefweb-dark-red: 235, 20, 5;--cd-rgb-reliefweb-dark-grey: 46, 52, 54;--cd-rgb-reliefweb-light-grey: 230, 236, 239;--cd-reliefweb-grey--light: #d9d9d9;--cd-reliefweb-grey--light--bg: rgba(217, 217, 217, 0.2);--cd-reliefweb-orange: #f49e2c;--cd-reliefweb-orange--bg: rgba(244, 158, 44, 0.2);--cd-reliefweb-blue: #076d96;--cd-reliefweb-blue--bg: rgba(7, 109, 150, 0.2);--cd-reliefweb-green: #88bb09;--cd-reliefweb-green--bg: rgba(136, 187, 9, 0.2);--cd-reliefweb-red: #da190b;--cd-reliefweb-red--bg: rgba(218, 25, 11, 0.2);--cd-reliefweb-purple: #9509bb;--cd-reliefweb-purple--bg: rgba(149, 9, 187, 0.2);--cd-reliefweb-grey: #4b4b4b;--cd-reliefweb-grey--bg: rgba(75, 75, 75, 0.2);--cd-reliefweb-brown: #8f5507;--cd-reliefweb-brown--bg: rgba(143, 85, 7, 0.2);--cd-reliefweb-yellow: #f5cb2f;--cd-reliefweb-yellow--bg: rgba(245, 203, 47, 0.2);--cd-reliefweb-cyan: #56c9f7;--cd-reliefweb-cyan--bg: rgba(86, 201, 247, 0.2);--cd-reliefweb-orange--alert: #eb8705;--cd-reliefweb-pink: rgba(246, 92, 81, 0.2);--disable: rgba(230, 236, 239, 0.5);--cd-ocha-blue: #1f69b3;--cd-blue--dark: #144372;--cd-blue--bright: #82b5e9;--cd-blue--light: #d4e5f7;--cd-highlight-red: #e56a54;--cd-contrast-red: #e00000;--cd-white: #fff;--cd-grey--light: #f2f2f2;--cd-grey--mid: #595959;--cd-grey--dark: #4a4a4a;--cd-default-text-color: var(--cd-grey--dark);--cd-black: #000;--cd-blue-grey: #e6ecf1;--cd-blue-grey--dark: #d3dde5;--cd-blue-grey--light: #ebf0f4;--cd-rgb-ocha-blue: 2, 108, 182;--cd-rgb-grey--mid: 89, 89, 89;--cd-rgb-grey--dark: 74, 74, 74;--cd-rgb-highlight-red: 229, 106, 84;--cd-rgb-blue-grey--dark: 211, 221, 229;--cd-max-content-width: 820px;--cd-max-body-width: 1400px;--cd-max-width: 1220px;--cd-container-padding: 0.75rem;--cd-container-padding-tablet: 1.5rem;--cd-container-padding-xlarge: 2.5rem;--cd-flow-space: 1rem;--cd-bumper-space: 1rem;--cd-footer-row-number: 5;--cd-red: #cd3a1f;--cd-red--light: #f8d8d3;--cd-orange: #db7b18;--cd-orange--light: #fae6d1;--cd-yellow: #d5de26;--cd-yellow--light: #f7f8d3;--cd-green: #7fb92f;--cd-green--light: #e8f5d6;--cd-font-size--tiny: 0.75rem;--cd-font-size--small: 0.875rem;--cd-font-size--base: 1.125rem;--cd-font-size--medium: 1.375rem;--cd-font-size--large: 1.625rem;--cd-font-size--2xbase: 1.875rem;--cd-font-size--2xmedium: 2.375rem;--cd-font-size--2xlarge: 2.875rem;--cd-font: helvetica, arial, sans-serif;--cd-font--system: system-ui;--cd-font--noto: "Noto Sans", sans-serif;--cd-font--noto-kufi: "Noto Kufi Arabic", sans-serif;--cd-font--roboto: "Roboto", helvetica, arial, sans-serif;--cd-font--roboto-condensed: "Roboto Condensed", helvetica, arial, sans-serif;--cd-font--roboto-slab: "Roboto Slab", helvetica, arial, sans-serif}@supports(display: grid){@media(min-width: 768px){.cd-layout-container{grid-template-rows:151px auto 1fr auto}}}@media(min-width: 768px){.cd-layout-container .cd-layout-content-wrapper{display:flex;flex-wrap:wrap}}@media(min-width: 768px){.cd-layout-content{flex-basis:0;flex-grow:999}}.cd-global-header__dropdown{background:var(--cd-reliefweb-brand-blue--dark)}.cd-global-header button[aria-expanded=true]::before{border-color:transparent transparent var(--cd-reliefweb-brand-blue--dark)}@media(max-width: 767px){.cd-global-header button[aria-expanded] span[class*=__btn-label]{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}.cd-header button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header{background:var(--cd-reliefweb-brand-blue--dark);background-image:linear-gradient(-180deg, var(--cd-reliefweb-brand-blue--dark) 67%, #04415a 97%)}@supports(display: grid){.cd-site-header__inner{grid-template-columns:52px 1fr}@media(min-width: 768px){.cd-site-header__inner{grid-template-columns:186px 1fr}}}.cd-language-switcher__btn:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-user-menu__dropdown li a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-site-logo{width:52px}.cd-site-logo:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}@media(max-width: 767px){.cd-site-logo{background:url("../img/logos/rw-logo-mobile.svg") center no-repeat;background:linear-gradient(transparent, transparent),url("../img/logos/rw-logo-mobile.svg") center no-repeat}}@media(min-width: 768px){.cd-site-logo{width:140px}}.menu--main button[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red)}.cd-nav__btn[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red)}.cd-nav__btn[aria-expanded=true]::before{background:var(--cd-reliefweb-brand-red)}@media(max-width: 1023px){.cd-site-header__nav-holder .cd-nav>ul>li>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>button.is-active::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>button.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>button.is-active::before{background:rgba(var(--cd-reliefweb-brand-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-brand-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-brand-red), 0.6)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red)}}@media(min-width: 1024px){.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail button::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a:focus::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button:focus::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul a.is-active,.cd-site-header__nav-holder .cd-nav>.menu>li>ul button.is-active{border-left:3px solid var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul>li.menu-item--active-trail .is-active{border-left:3px solid var(--cd-reliefweb-brand-red)}}.cd-ocha-dropdown__link a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-search__btn{color:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn svg{fill:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn:hover,.cd-search__btn:focus{color:#04415a}.cd-search__btn:hover svg,.cd-search__btn:focus svg{fill:#04415a}.cd-search__btn:focus{color:var(--cd-reliefweb-brand-red)}.cd-search__btn:focus svg{fill:var(--cd-reliefweb-brand-red)}.cd-search__btn[aria-expanded=true]{color:var(--cd-reliefweb-brand-red)}.cd-search__btn[aria-expanded=true] svg{fill:var(--cd-reliefweb-brand-red)}.cd-search__submit:focus{background-color:var(--cd-reliefweb-brand-red)}.cd-user-menu--no-language-switcher li:last-child a,.cd-user-menu--no-language-switcher li:last-child button{padding-right:0}.cd-user-menu--no-language-switcher li:last-child a::after,.cd-user-menu--no-language-switcher li:last-child button::after{content:none}.cd-user-menu__item:focus,.cd-global-header .menu>li a:focus,.cd-global-header .menu>li button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button{padding-right:0}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a::after,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button::after{content:none}@media(max-width: 767px){.cd-global-header__user-menu a svg+span{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}[dir=ltr] .admin-menu__btn svg+span{margin-left:10px}[dir=rtl] .admin-menu__btn svg+span{margin-right:10px}.admin-menu__btn .cd-icon:not(.cd-icon--arrow-down){display:inline-block;width:14px;height:14px;vertical-align:middle;fill:var(--cd-white)}.cd-footer{background:var(--cd-reliefweb-brand-blue--dark)}.cd-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-footer-copyright{display:block;margin-top:0;text-align:right;color:#fff;font-size:12px;font-weight:lighter}.cd-footer-copyright p{margin:0}.cd-footer-copyright a{display:inline-block;overflow:hidden;width:140px;height:60px;margin:0 0 -4px 0;padding:0 0 0 140px;background:url(../img/logos/rw-logo-sprite.png) 0 -60px no-repeat;background:rgba(0,0,0,0) url(../img/logos/rw-logo-sprite.svg) 0 -60px no-repeat}.cd-footer-copyright a:hover,.cd-footer-copyright a:active,.cd-footer-copyright a:focus{opacity:.8}@media all and (max-width: 1023px){.cd-footer-copyright{width:100%;text-align:center}}.cd-soft-footer{background:rgba(var(--cd-rgb-ocha-blue), 0.9)}.cd-soft-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}a{color:var(--cd-reliefweb-brand-blue--dark)}a:hover,a:focus{color:var(--cd-reliefweb-brand-blue--dark)}h1,h2{margin:0 0 24px 0;letter-spacing:.5px;font-size:24px;font-weight:bold;line-height:1.3}@media screen and (min-width: 480px){h1,h2{font-size:var(--cd-font-size--2xbase)}}h3{margin:0 0 16px 0;letter-spacing:.5px;font-size:20px;font-weight:bold;line-height:1.3}h4{margin:0 0 16px 0;letter-spacing:.5px;font-size:18px;font-weight:bold;line-height:1.3}h5{margin:0 0 16px 0;letter-spacing:.5px;font-size:17px;font-weight:bold;font-style:italic}h6{margin:0 0 16px 0;letter-spacing:.5px;font-size:16px;font-weight:bold}.rw-article__content *+h3,.rw-article__content *+h4,.rw-article__content *+h5,.rw-article__content *+h6{margin-top:16px}@media all and (max-width: 479px){#main h2{font-size:24px}}p{margin:1rem 0;line-height:1.6}p:first-child{margin-top:0}p:last-child{margin-bottom:0}input[type=search]{-moz-appearance:none;-webkit-appearance:none;appearance:none}input::-webkit-search-decoration{-webkit-appearance:none}input:-ms-input-placeholder{opacity:.7;color:inherit;font-style:italic}input::-moz-placeholder{opacity:.7;color:inherit;font-style:italic}input::placeholder{opacity:.7;color:inherit;font-style:italic}select{max-width:100%}select:not([multitple]){-moz-appearance:menulist-button;-webkit-appearance:menulist-button}fieldset{min-inline-size:auto}table{width:100%;border-collapse:collapse}table caption{margin:12px 0;font-weight:bold}table th,table td{padding:8px;border:1px solid var(--cd-reliefweb-brand-grey--light)}table th{border-left-color:#fff;background:var(--cd-reliefweb-brand-grey--light)}table thead th{border-left-color:#fff}th.field-label>h4.label{margin:0}table thead th:first-child{border-left-color:var(--cd-reliefweb-brand-grey--light)}table tbody th{border-top-color:#fff}table tbody th:first-child{border-top-color:var(--cd-reliefweb-brand-grey--light)}
+@import"https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400%3B500%3B700&display=swap";@import"https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,300%3B0,400%3B0,500%3B0,700%3B0,900%3B1,400%3B1,700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400%3B700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@400%3B700&display=swap";:root{--cd-reliefweb-brand-blue: #0988bb;--cd-reliefweb-brand-red: #f65c51;--cd-reliefweb-brand-blue--dark: #055372;--cd-reliefweb-brand-red--dark: #eb1405;--cd-reliefweb-brand-grey--dark: #2e3436;--cd-reliefweb-brand-grey--mid: #4d5254;--cd-reliefweb-brand-grey--light: #e6ecef;--cd-rgb-reliefweb-brand-blue: 9, 136, 187;--cd-rgb-reliefweb-brand-red: 246, 92, 81;--cd-rgb-reliefweb-brand-blue--dark: 4, 82, 112;--cd-rgb-reliefweb-brand-red--dark: 235, 20, 5;--cd-rgb-reliefweb-brand-grey--dark: 46, 52, 54;--cd-rgb-reliefweb-brand-grey--light: 230, 236, 239;--cd-reliefweb-grey--light: #d9d9d9;--cd-reliefweb-grey--light--bg: rgba(217, 217, 217, 0.2);--cd-reliefweb-orange: #f49e2c;--cd-reliefweb-orange--bg: rgba(244, 158, 44, 0.2);--cd-reliefweb-blue: #076d96;--cd-reliefweb-blue--bg: rgba(7, 109, 150, 0.2);--cd-reliefweb-green: #88bb09;--cd-reliefweb-green--bg: rgba(136, 187, 9, 0.2);--cd-reliefweb-red: #da190b;--cd-reliefweb-red--bg: rgba(218, 25, 11, 0.2);--cd-reliefweb-purple: #9509bb;--cd-reliefweb-purple--bg: rgba(149, 9, 187, 0.2);--cd-reliefweb-grey: #4b4b4b;--cd-reliefweb-grey--bg: rgba(75, 75, 75, 0.2);--cd-reliefweb-brown: #8f5507;--cd-reliefweb-brown--bg: rgba(143, 85, 7, 0.2);--cd-reliefweb-yellow: #f5cb2f;--cd-reliefweb-yellow--bg: rgba(245, 203, 47, 0.2);--cd-reliefweb-cyan: #56c9f7;--cd-reliefweb-cyan--bg: rgba(86, 201, 247, 0.2);--cd-reliefweb-orange--alert: #eb8705;--cd-reliefweb-pink: rgba(246, 92, 81, 0.2);--disable: rgba(230, 236, 239, 0.5);--cd-ocha-blue: #1f69b3;--cd-blue--dark: #144372;--cd-blue--bright: #82b5e9;--cd-blue--light: #d4e5f7;--cd-highlight-red: #e56a54;--cd-contrast-red: #e00000;--cd-white: #fff;--cd-grey--light: #f2f2f2;--cd-grey--mid: #595959;--cd-grey--dark: #4a4a4a;--cd-default-text-color: var(--cd-grey--dark);--cd-black: #000;--cd-blue-grey: #e6ecf1;--cd-blue-grey--dark: #d3dde5;--cd-blue-grey--light: #ebf0f4;--cd-rgb-ocha-blue: 2, 108, 182;--cd-rgb-grey--mid: 89, 89, 89;--cd-rgb-grey--dark: 74, 74, 74;--cd-rgb-highlight-red: 229, 106, 84;--cd-rgb-blue-grey--dark: 211, 221, 229;--cd-max-content-width: 820px;--cd-max-body-width: 1400px;--cd-max-width: 1220px;--cd-container-padding: 0.75rem;--cd-container-padding-tablet: 1.5rem;--cd-container-padding-xlarge: 2.5rem;--cd-flow-space: 1rem;--cd-bumper-space: 1rem;--cd-footer-row-number: 5;--cd-red: #cd3a1f;--cd-red--light: #f8d8d3;--cd-orange: #db7b18;--cd-orange--light: #fae6d1;--cd-yellow: #d5de26;--cd-yellow--light: #f7f8d3;--cd-green: #7fb92f;--cd-green--light: #e8f5d6;--cd-font-size--tiny: 0.75rem;--cd-font-size--small: 0.875rem;--cd-font-size--base: 1.125rem;--cd-font-size--medium: 1.375rem;--cd-font-size--large: 1.625rem;--cd-font-size--2xbase: 1.875rem;--cd-font-size--2xmedium: 2.375rem;--cd-font-size--2xlarge: 2.875rem;--cd-font: helvetica, arial, sans-serif;--cd-font--system: system-ui;--cd-font--noto: "Noto Sans", sans-serif;--cd-font--noto-kufi: "Noto Kufi Arabic", sans-serif;--cd-font--roboto: "Roboto", helvetica, arial, sans-serif;--cd-font--roboto-condensed: "Roboto Condensed", helvetica, arial, sans-serif;--cd-font--roboto-slab: "Roboto Slab", helvetica, arial, sans-serif}@supports(display: grid){@media(min-width: 768px){.cd-layout-container{grid-template-rows:151px auto 1fr auto}}}@media(min-width: 768px){.cd-layout-container .cd-layout-content-wrapper{display:flex;flex-wrap:wrap}}@media(min-width: 768px){.cd-layout-content{flex-basis:0;flex-grow:999}}.cd-global-header__dropdown{background:var(--cd-reliefweb-brand-blue--dark)}.cd-global-header button[aria-expanded=true]::before{border-color:transparent transparent var(--cd-reliefweb-brand-blue--dark)}@media(max-width: 767px){.cd-global-header button[aria-expanded] span[class*=__btn-label]{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}.cd-header button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header{background:var(--cd-reliefweb-brand-blue--dark);background-image:linear-gradient(-180deg, var(--cd-reliefweb-brand-blue--dark) 67%, #04415a 97%)}@supports(display: grid){.cd-site-header__inner{grid-template-columns:52px 1fr}@media(min-width: 768px){.cd-site-header__inner{grid-template-columns:186px 1fr}}}.cd-language-switcher__btn:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-user-menu__dropdown li a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-site-logo{width:52px}.cd-site-logo:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}@media(max-width: 767px){.cd-site-logo{background:url("../img/logos/rw-logo-mobile.svg") center no-repeat;background:linear-gradient(transparent, transparent),url("../img/logos/rw-logo-mobile.svg") center no-repeat}}@media(min-width: 768px){.cd-site-logo{width:140px}}.menu--main button[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red)}.cd-nav__btn[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red)}.cd-nav__btn[aria-expanded=true]::before{background:var(--cd-reliefweb-brand-red)}@media(max-width: 1023px){.cd-site-header__nav-holder .cd-nav>ul>li>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>button.is-active::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>button.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>button.is-active::before{background:rgba(var(--cd-reliefweb-brand-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-brand-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-brand-red), 0.6)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red)}}@media(min-width: 1024px){.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail button::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a:focus::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button:focus::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul a.is-active,.cd-site-header__nav-holder .cd-nav>.menu>li>ul button.is-active{border-left:3px solid var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul>li.menu-item--active-trail .is-active{border-left:3px solid var(--cd-reliefweb-brand-red)}}.cd-ocha-dropdown__link a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-search__btn{color:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn svg{fill:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn:hover,.cd-search__btn:focus{color:#04415a}.cd-search__btn:hover svg,.cd-search__btn:focus svg{fill:#04415a}.cd-search__btn:focus{color:var(--cd-reliefweb-brand-red)}.cd-search__btn:focus svg{fill:var(--cd-reliefweb-brand-red)}.cd-search__btn[aria-expanded=true]{color:var(--cd-reliefweb-brand-red)}.cd-search__btn[aria-expanded=true] svg{fill:var(--cd-reliefweb-brand-red)}.cd-search__submit:focus{background-color:var(--cd-reliefweb-brand-red)}.cd-user-menu--no-language-switcher li:last-child a,.cd-user-menu--no-language-switcher li:last-child button{padding-right:0}.cd-user-menu--no-language-switcher li:last-child a::after,.cd-user-menu--no-language-switcher li:last-child button::after{content:none}.cd-user-menu__item:focus,.cd-global-header .menu>li a:focus,.cd-global-header .menu>li button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button{padding-right:0}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a::after,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button::after{content:none}@media(max-width: 767px){.cd-global-header__user-menu a svg+span{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}[dir=ltr] .admin-menu__btn svg+span{margin-left:10px}[dir=rtl] .admin-menu__btn svg+span{margin-right:10px}.admin-menu__btn .cd-icon:not(.cd-icon--arrow-down){display:inline-block;width:14px;height:14px;vertical-align:middle;fill:var(--cd-white)}.cd-footer{background:var(--cd-reliefweb-brand-blue--dark)}.cd-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-footer-copyright{display:block;margin-top:0;text-align:right;color:#fff;font-size:12px;font-weight:lighter}.cd-footer-copyright p{margin:0}.cd-footer-copyright a{display:inline-block;overflow:hidden;width:140px;height:60px;margin:0 0 -4px 0;padding:0 0 0 140px;background:url(../img/logos/rw-logo-sprite.png) 0 -60px no-repeat;background:rgba(0,0,0,0) url(../img/logos/rw-logo-sprite.svg) 0 -60px no-repeat}.cd-footer-copyright a:hover,.cd-footer-copyright a:active,.cd-footer-copyright a:focus{opacity:.8}@media all and (max-width: 1023px){.cd-footer-copyright{width:100%;text-align:center}}.cd-soft-footer{background:rgba(var(--cd-rgb-ocha-blue), 0.9)}.cd-soft-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}a{color:var(--cd-reliefweb-brand-blue--dark)}a:hover,a:focus{color:var(--cd-reliefweb-brand-blue--dark)}h1,h2{margin:0 0 24px 0;letter-spacing:.5px;font-size:24px;font-weight:bold;line-height:1.3}@media screen and (min-width: 480px){h1,h2{font-size:var(--cd-font-size--2xbase)}}h3{margin:0 0 16px 0;letter-spacing:.5px;font-size:20px;font-weight:bold;line-height:1.3}h4{margin:0 0 16px 0;letter-spacing:.5px;font-size:18px;font-weight:bold;line-height:1.3}h5{margin:0 0 16px 0;letter-spacing:.5px;font-size:17px;font-weight:bold;font-style:italic}h6{margin:0 0 16px 0;letter-spacing:.5px;font-size:16px;font-weight:bold}.rw-article__content *+h3,.rw-article__content *+h4,.rw-article__content *+h5,.rw-article__content *+h6{margin-top:16px}@media all and (max-width: 479px){#main h2{font-size:24px}}p{margin:1rem 0;line-height:1.6}p:first-child{margin-top:0}p:last-child{margin-bottom:0}input[type=search]{-moz-appearance:none;-webkit-appearance:none;appearance:none}input::-webkit-search-decoration{-webkit-appearance:none}input:-ms-input-placeholder{opacity:.7;color:inherit;font-style:italic}input::-moz-placeholder{opacity:.7;color:inherit;font-style:italic}input::placeholder{opacity:.7;color:inherit;font-style:italic}select{max-width:100%}select:not([multitple]){-moz-appearance:menulist-button;-webkit-appearance:menulist-button}fieldset{min-inline-size:auto}table{width:100%;border-collapse:collapse}table caption{margin:12px 0;font-weight:bold}table th,table td{padding:8px;border:1px solid var(--cd-reliefweb-brand-grey--light)}table th{border-left-color:#fff;background:var(--cd-reliefweb-brand-grey--light)}table thead th{border-left-color:#fff}th.field-label>h4.label{margin:0}table thead th:first-child{border-left-color:var(--cd-reliefweb-brand-grey--light)}table tbody th{border-top-color:#fff}table tbody th:first-child{border-top-color:var(--cd-reliefweb-brand-grey--light)}
diff --git a/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss b/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
index ed0d3cdcf..3f3118dab 100644
--- a/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
+++ b/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
@@ -36,12 +36,12 @@
   /* #e6ecef with 0.4 opacity on white. */
   //background: #f5f7f9;
 
-  --cd-rgb-reliefweb-blue: 9, 136, 187;
-  --cd-rgb-reliefweb-red: 246, 92, 81;
-  --cd-rgb-reliefweb-dark-blue: 4, 82, 112;
-  --cd-rgb-reliefweb-dark-red: 235, 20, 5;
-  --cd-rgb-reliefweb-dark-grey: 46, 52, 54;
-  --cd-rgb-reliefweb-light-grey: 230, 236, 239;
+  --cd-rgb-reliefweb-brand-blue: 9, 136, 187;
+  --cd-rgb-reliefweb-brand-red: 246, 92, 81;
+  --cd-rgb-reliefweb-brand-blue--dark: 4, 82, 112;
+  --cd-rgb-reliefweb-brand-red--dark: 235, 20, 5;
+  --cd-rgb-reliefweb-brand-grey--dark: 46, 52, 54;
+  --cd-rgb-reliefweb-brand-grey--light: 230, 236, 239;
 
   // Moderation
   --cd-reliefweb-grey--light: #d9d9d9;

From e87f8c7c725cb315d69db9ed97cee8e90f931ae9 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 13:01:29 -0700
Subject: [PATCH 023/720] variable for disabled shade of grey, replace in
 components, remove unneeded vars

---
 .../components/rw-form/rw-form.css                       | 2 +-
 .../components/rw-key-figures/rw-key-figures.css         | 2 +-
 html/themes/custom/common_design_subtheme/css/styles.css | 2 +-
 .../common_design_subtheme/sass/cd/_cd-variables.scss    | 9 ++-------
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 3f883d325..33683c62f 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -237,7 +237,7 @@ form input[disabled],
 form textarea[disabled],
 form select[disabled] {
   background: var(--cd-reliefweb-brand-grey--light);
-  background: rgba(230, 236, 239, 0.5);
+  background: var(--cd-reliefweb-grey--disable);
 }
 form input[disabled] + label {
   opacity: 0.6;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-key-figures/rw-key-figures.css b/html/themes/custom/common_design_subtheme/components/rw-key-figures/rw-key-figures.css
index b0cb0d7e4..5c7a3ffd2 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-key-figures/rw-key-figures.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-key-figures/rw-key-figures.css
@@ -64,7 +64,7 @@
   padding: 1px 6px;
   vertical-align: middle;
   border-radius: 5px;
-  background: rgba(230, 236, 239, 0.5);
+  background: var(--cd-reliefweb-grey--disable);
 }
 .rw-key-figures figure.recent time:before {
   display: inline-block;
diff --git a/html/themes/custom/common_design_subtheme/css/styles.css b/html/themes/custom/common_design_subtheme/css/styles.css
index c8c0e0df1..9d88edaeb 100644
--- a/html/themes/custom/common_design_subtheme/css/styles.css
+++ b/html/themes/custom/common_design_subtheme/css/styles.css
@@ -1 +1 @@
-@import"https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400%3B500%3B700&display=swap";@import"https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,300%3B0,400%3B0,500%3B0,700%3B0,900%3B1,400%3B1,700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400%3B700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@400%3B700&display=swap";:root{--cd-reliefweb-brand-blue: #0988bb;--cd-reliefweb-brand-red: #f65c51;--cd-reliefweb-brand-blue--dark: #055372;--cd-reliefweb-brand-red--dark: #eb1405;--cd-reliefweb-brand-grey--dark: #2e3436;--cd-reliefweb-brand-grey--mid: #4d5254;--cd-reliefweb-brand-grey--light: #e6ecef;--cd-rgb-reliefweb-brand-blue: 9, 136, 187;--cd-rgb-reliefweb-brand-red: 246, 92, 81;--cd-rgb-reliefweb-brand-blue--dark: 4, 82, 112;--cd-rgb-reliefweb-brand-red--dark: 235, 20, 5;--cd-rgb-reliefweb-brand-grey--dark: 46, 52, 54;--cd-rgb-reliefweb-brand-grey--light: 230, 236, 239;--cd-reliefweb-grey--light: #d9d9d9;--cd-reliefweb-grey--light--bg: rgba(217, 217, 217, 0.2);--cd-reliefweb-orange: #f49e2c;--cd-reliefweb-orange--bg: rgba(244, 158, 44, 0.2);--cd-reliefweb-blue: #076d96;--cd-reliefweb-blue--bg: rgba(7, 109, 150, 0.2);--cd-reliefweb-green: #88bb09;--cd-reliefweb-green--bg: rgba(136, 187, 9, 0.2);--cd-reliefweb-red: #da190b;--cd-reliefweb-red--bg: rgba(218, 25, 11, 0.2);--cd-reliefweb-purple: #9509bb;--cd-reliefweb-purple--bg: rgba(149, 9, 187, 0.2);--cd-reliefweb-grey: #4b4b4b;--cd-reliefweb-grey--bg: rgba(75, 75, 75, 0.2);--cd-reliefweb-brown: #8f5507;--cd-reliefweb-brown--bg: rgba(143, 85, 7, 0.2);--cd-reliefweb-yellow: #f5cb2f;--cd-reliefweb-yellow--bg: rgba(245, 203, 47, 0.2);--cd-reliefweb-cyan: #56c9f7;--cd-reliefweb-cyan--bg: rgba(86, 201, 247, 0.2);--cd-reliefweb-orange--alert: #eb8705;--cd-reliefweb-pink: rgba(246, 92, 81, 0.2);--disable: rgba(230, 236, 239, 0.5);--cd-ocha-blue: #1f69b3;--cd-blue--dark: #144372;--cd-blue--bright: #82b5e9;--cd-blue--light: #d4e5f7;--cd-highlight-red: #e56a54;--cd-contrast-red: #e00000;--cd-white: #fff;--cd-grey--light: #f2f2f2;--cd-grey--mid: #595959;--cd-grey--dark: #4a4a4a;--cd-default-text-color: var(--cd-grey--dark);--cd-black: #000;--cd-blue-grey: #e6ecf1;--cd-blue-grey--dark: #d3dde5;--cd-blue-grey--light: #ebf0f4;--cd-rgb-ocha-blue: 2, 108, 182;--cd-rgb-grey--mid: 89, 89, 89;--cd-rgb-grey--dark: 74, 74, 74;--cd-rgb-highlight-red: 229, 106, 84;--cd-rgb-blue-grey--dark: 211, 221, 229;--cd-max-content-width: 820px;--cd-max-body-width: 1400px;--cd-max-width: 1220px;--cd-container-padding: 0.75rem;--cd-container-padding-tablet: 1.5rem;--cd-container-padding-xlarge: 2.5rem;--cd-flow-space: 1rem;--cd-bumper-space: 1rem;--cd-footer-row-number: 5;--cd-red: #cd3a1f;--cd-red--light: #f8d8d3;--cd-orange: #db7b18;--cd-orange--light: #fae6d1;--cd-yellow: #d5de26;--cd-yellow--light: #f7f8d3;--cd-green: #7fb92f;--cd-green--light: #e8f5d6;--cd-font-size--tiny: 0.75rem;--cd-font-size--small: 0.875rem;--cd-font-size--base: 1.125rem;--cd-font-size--medium: 1.375rem;--cd-font-size--large: 1.625rem;--cd-font-size--2xbase: 1.875rem;--cd-font-size--2xmedium: 2.375rem;--cd-font-size--2xlarge: 2.875rem;--cd-font: helvetica, arial, sans-serif;--cd-font--system: system-ui;--cd-font--noto: "Noto Sans", sans-serif;--cd-font--noto-kufi: "Noto Kufi Arabic", sans-serif;--cd-font--roboto: "Roboto", helvetica, arial, sans-serif;--cd-font--roboto-condensed: "Roboto Condensed", helvetica, arial, sans-serif;--cd-font--roboto-slab: "Roboto Slab", helvetica, arial, sans-serif}@supports(display: grid){@media(min-width: 768px){.cd-layout-container{grid-template-rows:151px auto 1fr auto}}}@media(min-width: 768px){.cd-layout-container .cd-layout-content-wrapper{display:flex;flex-wrap:wrap}}@media(min-width: 768px){.cd-layout-content{flex-basis:0;flex-grow:999}}.cd-global-header__dropdown{background:var(--cd-reliefweb-brand-blue--dark)}.cd-global-header button[aria-expanded=true]::before{border-color:transparent transparent var(--cd-reliefweb-brand-blue--dark)}@media(max-width: 767px){.cd-global-header button[aria-expanded] span[class*=__btn-label]{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}.cd-header button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header{background:var(--cd-reliefweb-brand-blue--dark);background-image:linear-gradient(-180deg, var(--cd-reliefweb-brand-blue--dark) 67%, #04415a 97%)}@supports(display: grid){.cd-site-header__inner{grid-template-columns:52px 1fr}@media(min-width: 768px){.cd-site-header__inner{grid-template-columns:186px 1fr}}}.cd-language-switcher__btn:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-user-menu__dropdown li a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-site-logo{width:52px}.cd-site-logo:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}@media(max-width: 767px){.cd-site-logo{background:url("../img/logos/rw-logo-mobile.svg") center no-repeat;background:linear-gradient(transparent, transparent),url("../img/logos/rw-logo-mobile.svg") center no-repeat}}@media(min-width: 768px){.cd-site-logo{width:140px}}.menu--main button[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red)}.cd-nav__btn[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red)}.cd-nav__btn[aria-expanded=true]::before{background:var(--cd-reliefweb-brand-red)}@media(max-width: 1023px){.cd-site-header__nav-holder .cd-nav>ul>li>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>button.is-active::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>button.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>button.is-active::before{background:rgba(var(--cd-reliefweb-brand-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-brand-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-brand-red), 0.6)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red)}}@media(min-width: 1024px){.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail button::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a:focus::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button:focus::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul a.is-active,.cd-site-header__nav-holder .cd-nav>.menu>li>ul button.is-active{border-left:3px solid var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul>li.menu-item--active-trail .is-active{border-left:3px solid var(--cd-reliefweb-brand-red)}}.cd-ocha-dropdown__link a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-search__btn{color:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn svg{fill:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn:hover,.cd-search__btn:focus{color:#04415a}.cd-search__btn:hover svg,.cd-search__btn:focus svg{fill:#04415a}.cd-search__btn:focus{color:var(--cd-reliefweb-brand-red)}.cd-search__btn:focus svg{fill:var(--cd-reliefweb-brand-red)}.cd-search__btn[aria-expanded=true]{color:var(--cd-reliefweb-brand-red)}.cd-search__btn[aria-expanded=true] svg{fill:var(--cd-reliefweb-brand-red)}.cd-search__submit:focus{background-color:var(--cd-reliefweb-brand-red)}.cd-user-menu--no-language-switcher li:last-child a,.cd-user-menu--no-language-switcher li:last-child button{padding-right:0}.cd-user-menu--no-language-switcher li:last-child a::after,.cd-user-menu--no-language-switcher li:last-child button::after{content:none}.cd-user-menu__item:focus,.cd-global-header .menu>li a:focus,.cd-global-header .menu>li button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button{padding-right:0}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a::after,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button::after{content:none}@media(max-width: 767px){.cd-global-header__user-menu a svg+span{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}[dir=ltr] .admin-menu__btn svg+span{margin-left:10px}[dir=rtl] .admin-menu__btn svg+span{margin-right:10px}.admin-menu__btn .cd-icon:not(.cd-icon--arrow-down){display:inline-block;width:14px;height:14px;vertical-align:middle;fill:var(--cd-white)}.cd-footer{background:var(--cd-reliefweb-brand-blue--dark)}.cd-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-footer-copyright{display:block;margin-top:0;text-align:right;color:#fff;font-size:12px;font-weight:lighter}.cd-footer-copyright p{margin:0}.cd-footer-copyright a{display:inline-block;overflow:hidden;width:140px;height:60px;margin:0 0 -4px 0;padding:0 0 0 140px;background:url(../img/logos/rw-logo-sprite.png) 0 -60px no-repeat;background:rgba(0,0,0,0) url(../img/logos/rw-logo-sprite.svg) 0 -60px no-repeat}.cd-footer-copyright a:hover,.cd-footer-copyright a:active,.cd-footer-copyright a:focus{opacity:.8}@media all and (max-width: 1023px){.cd-footer-copyright{width:100%;text-align:center}}.cd-soft-footer{background:rgba(var(--cd-rgb-ocha-blue), 0.9)}.cd-soft-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}a{color:var(--cd-reliefweb-brand-blue--dark)}a:hover,a:focus{color:var(--cd-reliefweb-brand-blue--dark)}h1,h2{margin:0 0 24px 0;letter-spacing:.5px;font-size:24px;font-weight:bold;line-height:1.3}@media screen and (min-width: 480px){h1,h2{font-size:var(--cd-font-size--2xbase)}}h3{margin:0 0 16px 0;letter-spacing:.5px;font-size:20px;font-weight:bold;line-height:1.3}h4{margin:0 0 16px 0;letter-spacing:.5px;font-size:18px;font-weight:bold;line-height:1.3}h5{margin:0 0 16px 0;letter-spacing:.5px;font-size:17px;font-weight:bold;font-style:italic}h6{margin:0 0 16px 0;letter-spacing:.5px;font-size:16px;font-weight:bold}.rw-article__content *+h3,.rw-article__content *+h4,.rw-article__content *+h5,.rw-article__content *+h6{margin-top:16px}@media all and (max-width: 479px){#main h2{font-size:24px}}p{margin:1rem 0;line-height:1.6}p:first-child{margin-top:0}p:last-child{margin-bottom:0}input[type=search]{-moz-appearance:none;-webkit-appearance:none;appearance:none}input::-webkit-search-decoration{-webkit-appearance:none}input:-ms-input-placeholder{opacity:.7;color:inherit;font-style:italic}input::-moz-placeholder{opacity:.7;color:inherit;font-style:italic}input::placeholder{opacity:.7;color:inherit;font-style:italic}select{max-width:100%}select:not([multitple]){-moz-appearance:menulist-button;-webkit-appearance:menulist-button}fieldset{min-inline-size:auto}table{width:100%;border-collapse:collapse}table caption{margin:12px 0;font-weight:bold}table th,table td{padding:8px;border:1px solid var(--cd-reliefweb-brand-grey--light)}table th{border-left-color:#fff;background:var(--cd-reliefweb-brand-grey--light)}table thead th{border-left-color:#fff}th.field-label>h4.label{margin:0}table thead th:first-child{border-left-color:var(--cd-reliefweb-brand-grey--light)}table tbody th{border-top-color:#fff}table tbody th:first-child{border-top-color:var(--cd-reliefweb-brand-grey--light)}
+@import"https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400%3B500%3B700&display=swap";@import"https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,300%3B0,400%3B0,500%3B0,700%3B0,900%3B1,400%3B1,700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400%3B700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@400%3B700&display=swap";:root{--cd-reliefweb-brand-blue: #0988bb;--cd-reliefweb-brand-red: #f65c51;--cd-reliefweb-brand-blue--dark: #055372;--cd-reliefweb-brand-red--dark: #eb1405;--cd-reliefweb-brand-grey--dark: #2e3436;--cd-reliefweb-brand-grey--mid: #4d5254;--cd-reliefweb-brand-grey--light: #e6ecef;--cd-rgb-reliefweb-brand-blue: 9, 136, 187;--cd-rgb-reliefweb-brand-red: 246, 92, 81;--cd-rgb-reliefweb-brand-blue--dark: 4, 82, 112;--cd-rgb-reliefweb-brand-red--dark: 235, 20, 5;--cd-rgb-reliefweb-brand-grey--dark: 46, 52, 54;--cd-rgb-reliefweb-brand-grey--light: 230, 236, 239;--cd-reliefweb-grey--light: #d9d9d9;--cd-reliefweb-grey--light--bg: rgba(217, 217, 217, 0.2);--cd-reliefweb-orange: #f49e2c;--cd-reliefweb-orange--bg: rgba(244, 158, 44, 0.2);--cd-reliefweb-blue: #076d96;--cd-reliefweb-blue--bg: rgba(7, 109, 150, 0.2);--cd-reliefweb-green: #88bb09;--cd-reliefweb-green--bg: rgba(136, 187, 9, 0.2);--cd-reliefweb-red: #da190b;--cd-reliefweb-red--bg: rgba(218, 25, 11, 0.2);--cd-reliefweb-purple: #9509bb;--cd-reliefweb-purple--bg: rgba(149, 9, 187, 0.2);--cd-reliefweb-grey: #4b4b4b;--cd-reliefweb-grey--bg: rgba(75, 75, 75, 0.2);--cd-reliefweb-brown: #8f5507;--cd-reliefweb-brown--bg: rgba(143, 85, 7, 0.2);--cd-reliefweb-yellow: #f5cb2f;--cd-reliefweb-yellow--bg: rgba(245, 203, 47, 0.2);--cd-reliefweb-cyan: #56c9f7;--cd-reliefweb-cyan--bg: rgba(86, 201, 247, 0.2);--cd-reliefweb-orange--alert: #eb8705;--cd-reliefweb-pink: rgba(246, 92, 81, 0.2);--cd-reliefweb-grey--disable: rgba(230, 236, 239, 0.5);--cd-ocha-blue: #1f69b3;--cd-blue--dark: #144372;--cd-blue--bright: #82b5e9;--cd-blue--light: #d4e5f7;--cd-highlight-red: #e56a54;--cd-contrast-red: #e00000;--cd-white: #fff;--cd-grey--light: #f2f2f2;--cd-grey--mid: #595959;--cd-grey--dark: #4a4a4a;--cd-default-text-color: var(--cd-grey--dark);--cd-black: #000;--cd-blue-grey: #e6ecf1;--cd-blue-grey--dark: #d3dde5;--cd-blue-grey--light: #ebf0f4;--cd-rgb-ocha-blue: 2, 108, 182;--cd-rgb-grey--mid: 89, 89, 89;--cd-rgb-grey--dark: 74, 74, 74;--cd-rgb-highlight-red: 229, 106, 84;--cd-rgb-blue-grey--dark: 211, 221, 229;--cd-max-content-width: 820px;--cd-max-body-width: 1400px;--cd-max-width: 1220px;--cd-container-padding: 0.75rem;--cd-container-padding-tablet: 1.5rem;--cd-container-padding-xlarge: 2.5rem;--cd-flow-space: 1rem;--cd-bumper-space: 1rem;--cd-footer-row-number: 5;--cd-red: #cd3a1f;--cd-red--light: #f8d8d3;--cd-orange: #db7b18;--cd-orange--light: #fae6d1;--cd-yellow: #d5de26;--cd-yellow--light: #f7f8d3;--cd-green: #7fb92f;--cd-green--light: #e8f5d6;--cd-font-size--tiny: 0.75rem;--cd-font-size--small: 0.875rem;--cd-font-size--base: 1.125rem;--cd-font-size--medium: 1.375rem;--cd-font-size--large: 1.625rem;--cd-font-size--2xbase: 1.875rem;--cd-font-size--2xmedium: 2.375rem;--cd-font-size--2xlarge: 2.875rem;--cd-font: helvetica, arial, sans-serif;--cd-font--system: system-ui;--cd-font--noto: "Noto Sans", sans-serif;--cd-font--noto-kufi: "Noto Kufi Arabic", sans-serif;--cd-font--roboto: "Roboto", helvetica, arial, sans-serif;--cd-font--roboto-condensed: "Roboto Condensed", helvetica, arial, sans-serif;--cd-font--roboto-slab: "Roboto Slab", helvetica, arial, sans-serif}@supports(display: grid){@media(min-width: 768px){.cd-layout-container{grid-template-rows:151px auto 1fr auto}}}@media(min-width: 768px){.cd-layout-container .cd-layout-content-wrapper{display:flex;flex-wrap:wrap}}@media(min-width: 768px){.cd-layout-content{flex-basis:0;flex-grow:999}}.cd-global-header__dropdown{background:var(--cd-reliefweb-brand-blue--dark)}.cd-global-header button[aria-expanded=true]::before{border-color:transparent transparent var(--cd-reliefweb-brand-blue--dark)}@media(max-width: 767px){.cd-global-header button[aria-expanded] span[class*=__btn-label]{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}.cd-header button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header{background:var(--cd-reliefweb-brand-blue--dark);background-image:linear-gradient(-180deg, var(--cd-reliefweb-brand-blue--dark) 67%, #04415a 97%)}@supports(display: grid){.cd-site-header__inner{grid-template-columns:52px 1fr}@media(min-width: 768px){.cd-site-header__inner{grid-template-columns:186px 1fr}}}.cd-language-switcher__btn:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-user-menu__dropdown li a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-site-logo{width:52px}.cd-site-logo:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}@media(max-width: 767px){.cd-site-logo{background:url("../img/logos/rw-logo-mobile.svg") center no-repeat;background:linear-gradient(transparent, transparent),url("../img/logos/rw-logo-mobile.svg") center no-repeat}}@media(min-width: 768px){.cd-site-logo{width:140px}}.menu--main button[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red)}.cd-nav__btn[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red)}.cd-nav__btn[aria-expanded=true]::before{background:var(--cd-reliefweb-brand-red)}@media(max-width: 1023px){.cd-site-header__nav-holder .cd-nav>ul>li>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>button.is-active::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>button.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>button.is-active::before{background:rgba(var(--cd-reliefweb-brand-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-brand-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-brand-red), 0.6)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red)}}@media(min-width: 1024px){.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail button::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a:focus::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button:focus::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul a.is-active,.cd-site-header__nav-holder .cd-nav>.menu>li>ul button.is-active{border-left:3px solid var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul>li.menu-item--active-trail .is-active{border-left:3px solid var(--cd-reliefweb-brand-red)}}.cd-ocha-dropdown__link a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-search__btn{color:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn svg{fill:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn:hover,.cd-search__btn:focus{color:#04415a}.cd-search__btn:hover svg,.cd-search__btn:focus svg{fill:#04415a}.cd-search__btn:focus{color:var(--cd-reliefweb-brand-red)}.cd-search__btn:focus svg{fill:var(--cd-reliefweb-brand-red)}.cd-search__btn[aria-expanded=true]{color:var(--cd-reliefweb-brand-red)}.cd-search__btn[aria-expanded=true] svg{fill:var(--cd-reliefweb-brand-red)}.cd-search__submit:focus{background-color:var(--cd-reliefweb-brand-red)}.cd-user-menu--no-language-switcher li:last-child a,.cd-user-menu--no-language-switcher li:last-child button{padding-right:0}.cd-user-menu--no-language-switcher li:last-child a::after,.cd-user-menu--no-language-switcher li:last-child button::after{content:none}.cd-user-menu__item:focus,.cd-global-header .menu>li a:focus,.cd-global-header .menu>li button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button{padding-right:0}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a::after,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button::after{content:none}@media(max-width: 767px){.cd-global-header__user-menu a svg+span{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}[dir=ltr] .admin-menu__btn svg+span{margin-left:10px}[dir=rtl] .admin-menu__btn svg+span{margin-right:10px}.admin-menu__btn .cd-icon:not(.cd-icon--arrow-down){display:inline-block;width:14px;height:14px;vertical-align:middle;fill:var(--cd-white)}.cd-footer{background:var(--cd-reliefweb-brand-blue--dark)}.cd-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-footer-copyright{display:block;margin-top:0;text-align:right;color:#fff;font-size:12px;font-weight:lighter}.cd-footer-copyright p{margin:0}.cd-footer-copyright a{display:inline-block;overflow:hidden;width:140px;height:60px;margin:0 0 -4px 0;padding:0 0 0 140px;background:url(../img/logos/rw-logo-sprite.png) 0 -60px no-repeat;background:rgba(0,0,0,0) url(../img/logos/rw-logo-sprite.svg) 0 -60px no-repeat}.cd-footer-copyright a:hover,.cd-footer-copyright a:active,.cd-footer-copyright a:focus{opacity:.8}@media all and (max-width: 1023px){.cd-footer-copyright{width:100%;text-align:center}}.cd-soft-footer{background:rgba(var(--cd-rgb-ocha-blue), 0.9)}.cd-soft-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}a{color:var(--cd-reliefweb-brand-blue--dark)}a:hover,a:focus{color:var(--cd-reliefweb-brand-blue--dark)}h1,h2{margin:0 0 24px 0;letter-spacing:.5px;font-size:24px;font-weight:bold;line-height:1.3}@media screen and (min-width: 480px){h1,h2{font-size:var(--cd-font-size--2xbase)}}h3{margin:0 0 16px 0;letter-spacing:.5px;font-size:20px;font-weight:bold;line-height:1.3}h4{margin:0 0 16px 0;letter-spacing:.5px;font-size:18px;font-weight:bold;line-height:1.3}h5{margin:0 0 16px 0;letter-spacing:.5px;font-size:17px;font-weight:bold;font-style:italic}h6{margin:0 0 16px 0;letter-spacing:.5px;font-size:16px;font-weight:bold}.rw-article__content *+h3,.rw-article__content *+h4,.rw-article__content *+h5,.rw-article__content *+h6{margin-top:16px}@media all and (max-width: 479px){#main h2{font-size:24px}}p{margin:1rem 0;line-height:1.6}p:first-child{margin-top:0}p:last-child{margin-bottom:0}input[type=search]{-moz-appearance:none;-webkit-appearance:none;appearance:none}input::-webkit-search-decoration{-webkit-appearance:none}input:-ms-input-placeholder{opacity:.7;color:inherit;font-style:italic}input::-moz-placeholder{opacity:.7;color:inherit;font-style:italic}input::placeholder{opacity:.7;color:inherit;font-style:italic}select{max-width:100%}select:not([multitple]){-moz-appearance:menulist-button;-webkit-appearance:menulist-button}fieldset{min-inline-size:auto}table{width:100%;border-collapse:collapse}table caption{margin:12px 0;font-weight:bold}table th,table td{padding:8px;border:1px solid var(--cd-reliefweb-brand-grey--light)}table th{border-left-color:#fff;background:var(--cd-reliefweb-brand-grey--light)}table thead th{border-left-color:#fff}th.field-label>h4.label{margin:0}table thead th:first-child{border-left-color:var(--cd-reliefweb-brand-grey--light)}table tbody th{border-top-color:#fff}table tbody th:first-child{border-top-color:var(--cd-reliefweb-brand-grey--light)}
diff --git a/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss b/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
index 3f3118dab..95790dfc8 100644
--- a/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
+++ b/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
@@ -30,12 +30,7 @@
   --cd-reliefweb-brand-grey--mid: #4d5254;
   --cd-reliefweb-brand-grey--light: #e6ecef;
 
-  // Slogan
-  /* #2e3436 with 0.7 opacity on white. */
-  //color: #6d7172;
-  /* #e6ecef with 0.4 opacity on white. */
-  //background: #f5f7f9;
-
+  /* RGB variables to use with rgba() */
   --cd-rgb-reliefweb-brand-blue: 9, 136, 187;
   --cd-rgb-reliefweb-brand-red: 246, 92, 81;
   --cd-rgb-reliefweb-brand-blue--dark: 4, 82, 112;
@@ -77,7 +72,7 @@
   // Colour variations.
   --cd-reliefweb-orange--alert: #eb8705;
   --cd-reliefweb-pink: rgba(246, 92, 81, 0.2);
-  --disable: rgba(230, 236, 239, 0.5);
+  --cd-reliefweb-grey--disable: rgba(230, 236, 239, 0.5);
 
   /* OCHA blue is one colour ramp darker than brand blue */
   --cd-ocha-blue: #1f69b3;

From 1864f7a4fafa5287f2ea84298a2bcd48a49591f6 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 13:12:45 -0700
Subject: [PATCH 024/720] change highlight to brand dark red to match D7

---
 html/themes/custom/common_design_subtheme/css/styles.css        | 2 +-
 .../custom/common_design_subtheme/sass/cd/_cd-variables.scss    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/css/styles.css b/html/themes/custom/common_design_subtheme/css/styles.css
index 9d88edaeb..b520b0987 100644
--- a/html/themes/custom/common_design_subtheme/css/styles.css
+++ b/html/themes/custom/common_design_subtheme/css/styles.css
@@ -1 +1 @@
-@import"https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400%3B500%3B700&display=swap";@import"https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,300%3B0,400%3B0,500%3B0,700%3B0,900%3B1,400%3B1,700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400%3B700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@400%3B700&display=swap";:root{--cd-reliefweb-brand-blue: #0988bb;--cd-reliefweb-brand-red: #f65c51;--cd-reliefweb-brand-blue--dark: #055372;--cd-reliefweb-brand-red--dark: #eb1405;--cd-reliefweb-brand-grey--dark: #2e3436;--cd-reliefweb-brand-grey--mid: #4d5254;--cd-reliefweb-brand-grey--light: #e6ecef;--cd-rgb-reliefweb-brand-blue: 9, 136, 187;--cd-rgb-reliefweb-brand-red: 246, 92, 81;--cd-rgb-reliefweb-brand-blue--dark: 4, 82, 112;--cd-rgb-reliefweb-brand-red--dark: 235, 20, 5;--cd-rgb-reliefweb-brand-grey--dark: 46, 52, 54;--cd-rgb-reliefweb-brand-grey--light: 230, 236, 239;--cd-reliefweb-grey--light: #d9d9d9;--cd-reliefweb-grey--light--bg: rgba(217, 217, 217, 0.2);--cd-reliefweb-orange: #f49e2c;--cd-reliefweb-orange--bg: rgba(244, 158, 44, 0.2);--cd-reliefweb-blue: #076d96;--cd-reliefweb-blue--bg: rgba(7, 109, 150, 0.2);--cd-reliefweb-green: #88bb09;--cd-reliefweb-green--bg: rgba(136, 187, 9, 0.2);--cd-reliefweb-red: #da190b;--cd-reliefweb-red--bg: rgba(218, 25, 11, 0.2);--cd-reliefweb-purple: #9509bb;--cd-reliefweb-purple--bg: rgba(149, 9, 187, 0.2);--cd-reliefweb-grey: #4b4b4b;--cd-reliefweb-grey--bg: rgba(75, 75, 75, 0.2);--cd-reliefweb-brown: #8f5507;--cd-reliefweb-brown--bg: rgba(143, 85, 7, 0.2);--cd-reliefweb-yellow: #f5cb2f;--cd-reliefweb-yellow--bg: rgba(245, 203, 47, 0.2);--cd-reliefweb-cyan: #56c9f7;--cd-reliefweb-cyan--bg: rgba(86, 201, 247, 0.2);--cd-reliefweb-orange--alert: #eb8705;--cd-reliefweb-pink: rgba(246, 92, 81, 0.2);--cd-reliefweb-grey--disable: rgba(230, 236, 239, 0.5);--cd-ocha-blue: #1f69b3;--cd-blue--dark: #144372;--cd-blue--bright: #82b5e9;--cd-blue--light: #d4e5f7;--cd-highlight-red: #e56a54;--cd-contrast-red: #e00000;--cd-white: #fff;--cd-grey--light: #f2f2f2;--cd-grey--mid: #595959;--cd-grey--dark: #4a4a4a;--cd-default-text-color: var(--cd-grey--dark);--cd-black: #000;--cd-blue-grey: #e6ecf1;--cd-blue-grey--dark: #d3dde5;--cd-blue-grey--light: #ebf0f4;--cd-rgb-ocha-blue: 2, 108, 182;--cd-rgb-grey--mid: 89, 89, 89;--cd-rgb-grey--dark: 74, 74, 74;--cd-rgb-highlight-red: 229, 106, 84;--cd-rgb-blue-grey--dark: 211, 221, 229;--cd-max-content-width: 820px;--cd-max-body-width: 1400px;--cd-max-width: 1220px;--cd-container-padding: 0.75rem;--cd-container-padding-tablet: 1.5rem;--cd-container-padding-xlarge: 2.5rem;--cd-flow-space: 1rem;--cd-bumper-space: 1rem;--cd-footer-row-number: 5;--cd-red: #cd3a1f;--cd-red--light: #f8d8d3;--cd-orange: #db7b18;--cd-orange--light: #fae6d1;--cd-yellow: #d5de26;--cd-yellow--light: #f7f8d3;--cd-green: #7fb92f;--cd-green--light: #e8f5d6;--cd-font-size--tiny: 0.75rem;--cd-font-size--small: 0.875rem;--cd-font-size--base: 1.125rem;--cd-font-size--medium: 1.375rem;--cd-font-size--large: 1.625rem;--cd-font-size--2xbase: 1.875rem;--cd-font-size--2xmedium: 2.375rem;--cd-font-size--2xlarge: 2.875rem;--cd-font: helvetica, arial, sans-serif;--cd-font--system: system-ui;--cd-font--noto: "Noto Sans", sans-serif;--cd-font--noto-kufi: "Noto Kufi Arabic", sans-serif;--cd-font--roboto: "Roboto", helvetica, arial, sans-serif;--cd-font--roboto-condensed: "Roboto Condensed", helvetica, arial, sans-serif;--cd-font--roboto-slab: "Roboto Slab", helvetica, arial, sans-serif}@supports(display: grid){@media(min-width: 768px){.cd-layout-container{grid-template-rows:151px auto 1fr auto}}}@media(min-width: 768px){.cd-layout-container .cd-layout-content-wrapper{display:flex;flex-wrap:wrap}}@media(min-width: 768px){.cd-layout-content{flex-basis:0;flex-grow:999}}.cd-global-header__dropdown{background:var(--cd-reliefweb-brand-blue--dark)}.cd-global-header button[aria-expanded=true]::before{border-color:transparent transparent var(--cd-reliefweb-brand-blue--dark)}@media(max-width: 767px){.cd-global-header button[aria-expanded] span[class*=__btn-label]{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}.cd-header button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header{background:var(--cd-reliefweb-brand-blue--dark);background-image:linear-gradient(-180deg, var(--cd-reliefweb-brand-blue--dark) 67%, #04415a 97%)}@supports(display: grid){.cd-site-header__inner{grid-template-columns:52px 1fr}@media(min-width: 768px){.cd-site-header__inner{grid-template-columns:186px 1fr}}}.cd-language-switcher__btn:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-user-menu__dropdown li a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-site-logo{width:52px}.cd-site-logo:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}@media(max-width: 767px){.cd-site-logo{background:url("../img/logos/rw-logo-mobile.svg") center no-repeat;background:linear-gradient(transparent, transparent),url("../img/logos/rw-logo-mobile.svg") center no-repeat}}@media(min-width: 768px){.cd-site-logo{width:140px}}.menu--main button[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red)}.cd-nav__btn[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red)}.cd-nav__btn[aria-expanded=true]::before{background:var(--cd-reliefweb-brand-red)}@media(max-width: 1023px){.cd-site-header__nav-holder .cd-nav>ul>li>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>button.is-active::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>button.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>button.is-active::before{background:rgba(var(--cd-reliefweb-brand-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-brand-red), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-brand-red), 0.6)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red)}}@media(min-width: 1024px){.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail button::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a:focus::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button:focus::before{background:var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul a.is-active,.cd-site-header__nav-holder .cd-nav>.menu>li>ul button.is-active{border-left:3px solid var(--cd-reliefweb-brand-red)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul>li.menu-item--active-trail .is-active{border-left:3px solid var(--cd-reliefweb-brand-red)}}.cd-ocha-dropdown__link a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-search__btn{color:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn svg{fill:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn:hover,.cd-search__btn:focus{color:#04415a}.cd-search__btn:hover svg,.cd-search__btn:focus svg{fill:#04415a}.cd-search__btn:focus{color:var(--cd-reliefweb-brand-red)}.cd-search__btn:focus svg{fill:var(--cd-reliefweb-brand-red)}.cd-search__btn[aria-expanded=true]{color:var(--cd-reliefweb-brand-red)}.cd-search__btn[aria-expanded=true] svg{fill:var(--cd-reliefweb-brand-red)}.cd-search__submit:focus{background-color:var(--cd-reliefweb-brand-red)}.cd-user-menu--no-language-switcher li:last-child a,.cd-user-menu--no-language-switcher li:last-child button{padding-right:0}.cd-user-menu--no-language-switcher li:last-child a::after,.cd-user-menu--no-language-switcher li:last-child button::after{content:none}.cd-user-menu__item:focus,.cd-global-header .menu>li a:focus,.cd-global-header .menu>li button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button{padding-right:0}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a::after,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button::after{content:none}@media(max-width: 767px){.cd-global-header__user-menu a svg+span{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}[dir=ltr] .admin-menu__btn svg+span{margin-left:10px}[dir=rtl] .admin-menu__btn svg+span{margin-right:10px}.admin-menu__btn .cd-icon:not(.cd-icon--arrow-down){display:inline-block;width:14px;height:14px;vertical-align:middle;fill:var(--cd-white)}.cd-footer{background:var(--cd-reliefweb-brand-blue--dark)}.cd-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-footer-copyright{display:block;margin-top:0;text-align:right;color:#fff;font-size:12px;font-weight:lighter}.cd-footer-copyright p{margin:0}.cd-footer-copyright a{display:inline-block;overflow:hidden;width:140px;height:60px;margin:0 0 -4px 0;padding:0 0 0 140px;background:url(../img/logos/rw-logo-sprite.png) 0 -60px no-repeat;background:rgba(0,0,0,0) url(../img/logos/rw-logo-sprite.svg) 0 -60px no-repeat}.cd-footer-copyright a:hover,.cd-footer-copyright a:active,.cd-footer-copyright a:focus{opacity:.8}@media all and (max-width: 1023px){.cd-footer-copyright{width:100%;text-align:center}}.cd-soft-footer{background:rgba(var(--cd-rgb-ocha-blue), 0.9)}.cd-soft-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}a{color:var(--cd-reliefweb-brand-blue--dark)}a:hover,a:focus{color:var(--cd-reliefweb-brand-blue--dark)}h1,h2{margin:0 0 24px 0;letter-spacing:.5px;font-size:24px;font-weight:bold;line-height:1.3}@media screen and (min-width: 480px){h1,h2{font-size:var(--cd-font-size--2xbase)}}h3{margin:0 0 16px 0;letter-spacing:.5px;font-size:20px;font-weight:bold;line-height:1.3}h4{margin:0 0 16px 0;letter-spacing:.5px;font-size:18px;font-weight:bold;line-height:1.3}h5{margin:0 0 16px 0;letter-spacing:.5px;font-size:17px;font-weight:bold;font-style:italic}h6{margin:0 0 16px 0;letter-spacing:.5px;font-size:16px;font-weight:bold}.rw-article__content *+h3,.rw-article__content *+h4,.rw-article__content *+h5,.rw-article__content *+h6{margin-top:16px}@media all and (max-width: 479px){#main h2{font-size:24px}}p{margin:1rem 0;line-height:1.6}p:first-child{margin-top:0}p:last-child{margin-bottom:0}input[type=search]{-moz-appearance:none;-webkit-appearance:none;appearance:none}input::-webkit-search-decoration{-webkit-appearance:none}input:-ms-input-placeholder{opacity:.7;color:inherit;font-style:italic}input::-moz-placeholder{opacity:.7;color:inherit;font-style:italic}input::placeholder{opacity:.7;color:inherit;font-style:italic}select{max-width:100%}select:not([multitple]){-moz-appearance:menulist-button;-webkit-appearance:menulist-button}fieldset{min-inline-size:auto}table{width:100%;border-collapse:collapse}table caption{margin:12px 0;font-weight:bold}table th,table td{padding:8px;border:1px solid var(--cd-reliefweb-brand-grey--light)}table th{border-left-color:#fff;background:var(--cd-reliefweb-brand-grey--light)}table thead th{border-left-color:#fff}th.field-label>h4.label{margin:0}table thead th:first-child{border-left-color:var(--cd-reliefweb-brand-grey--light)}table tbody th{border-top-color:#fff}table tbody th:first-child{border-top-color:var(--cd-reliefweb-brand-grey--light)}
+@import"https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400%3B500%3B700&display=swap";@import"https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,300%3B0,400%3B0,500%3B0,700%3B0,900%3B1,400%3B1,700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400%3B700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@400%3B700&display=swap";:root{--cd-reliefweb-brand-blue: #0988bb;--cd-reliefweb-brand-red: #f65c51;--cd-reliefweb-brand-blue--dark: #055372;--cd-reliefweb-brand-red--dark: #eb1405;--cd-reliefweb-brand-grey--dark: #2e3436;--cd-reliefweb-brand-grey--mid: #4d5254;--cd-reliefweb-brand-grey--light: #e6ecef;--cd-rgb-reliefweb-brand-blue: 9, 136, 187;--cd-rgb-reliefweb-brand-red: 246, 92, 81;--cd-rgb-reliefweb-brand-blue--dark: 4, 82, 112;--cd-rgb-reliefweb-brand-red--dark: 235, 20, 5;--cd-rgb-reliefweb-brand-grey--dark: 46, 52, 54;--cd-rgb-reliefweb-brand-grey--light: 230, 236, 239;--cd-reliefweb-grey--light: #d9d9d9;--cd-reliefweb-grey--light--bg: rgba(217, 217, 217, 0.2);--cd-reliefweb-orange: #f49e2c;--cd-reliefweb-orange--bg: rgba(244, 158, 44, 0.2);--cd-reliefweb-blue: #076d96;--cd-reliefweb-blue--bg: rgba(7, 109, 150, 0.2);--cd-reliefweb-green: #88bb09;--cd-reliefweb-green--bg: rgba(136, 187, 9, 0.2);--cd-reliefweb-red: #da190b;--cd-reliefweb-red--bg: rgba(218, 25, 11, 0.2);--cd-reliefweb-purple: #9509bb;--cd-reliefweb-purple--bg: rgba(149, 9, 187, 0.2);--cd-reliefweb-grey: #4b4b4b;--cd-reliefweb-grey--bg: rgba(75, 75, 75, 0.2);--cd-reliefweb-brown: #8f5507;--cd-reliefweb-brown--bg: rgba(143, 85, 7, 0.2);--cd-reliefweb-yellow: #f5cb2f;--cd-reliefweb-yellow--bg: rgba(245, 203, 47, 0.2);--cd-reliefweb-cyan: #56c9f7;--cd-reliefweb-cyan--bg: rgba(86, 201, 247, 0.2);--cd-reliefweb-orange--alert: #eb8705;--cd-reliefweb-pink: rgba(246, 92, 81, 0.2);--cd-reliefweb-grey--disable: rgba(230, 236, 239, 0.5);--cd-ocha-blue: #1f69b3;--cd-blue--dark: #144372;--cd-blue--bright: #82b5e9;--cd-blue--light: #d4e5f7;--cd-highlight-red: #e56a54;--cd-contrast-red: #e00000;--cd-white: #fff;--cd-grey--light: #f2f2f2;--cd-grey--mid: #595959;--cd-grey--dark: #4a4a4a;--cd-default-text-color: var(--cd-grey--dark);--cd-black: #000;--cd-blue-grey: #e6ecf1;--cd-blue-grey--dark: #d3dde5;--cd-blue-grey--light: #ebf0f4;--cd-rgb-ocha-blue: 2, 108, 182;--cd-rgb-grey--mid: 89, 89, 89;--cd-rgb-grey--dark: 74, 74, 74;--cd-rgb-highlight-red: 229, 106, 84;--cd-rgb-blue-grey--dark: 211, 221, 229;--cd-max-content-width: 820px;--cd-max-body-width: 1400px;--cd-max-width: 1220px;--cd-container-padding: 0.75rem;--cd-container-padding-tablet: 1.5rem;--cd-container-padding-xlarge: 2.5rem;--cd-flow-space: 1rem;--cd-bumper-space: 1rem;--cd-footer-row-number: 5;--cd-red: #cd3a1f;--cd-red--light: #f8d8d3;--cd-orange: #db7b18;--cd-orange--light: #fae6d1;--cd-yellow: #d5de26;--cd-yellow--light: #f7f8d3;--cd-green: #7fb92f;--cd-green--light: #e8f5d6;--cd-font-size--tiny: 0.75rem;--cd-font-size--small: 0.875rem;--cd-font-size--base: 1.125rem;--cd-font-size--medium: 1.375rem;--cd-font-size--large: 1.625rem;--cd-font-size--2xbase: 1.875rem;--cd-font-size--2xmedium: 2.375rem;--cd-font-size--2xlarge: 2.875rem;--cd-font: helvetica, arial, sans-serif;--cd-font--system: system-ui;--cd-font--noto: "Noto Sans", sans-serif;--cd-font--noto-kufi: "Noto Kufi Arabic", sans-serif;--cd-font--roboto: "Roboto", helvetica, arial, sans-serif;--cd-font--roboto-condensed: "Roboto Condensed", helvetica, arial, sans-serif;--cd-font--roboto-slab: "Roboto Slab", helvetica, arial, sans-serif}@supports(display: grid){@media(min-width: 768px){.cd-layout-container{grid-template-rows:151px auto 1fr auto}}}@media(min-width: 768px){.cd-layout-container .cd-layout-content-wrapper{display:flex;flex-wrap:wrap}}@media(min-width: 768px){.cd-layout-content{flex-basis:0;flex-grow:999}}.cd-global-header__dropdown{background:var(--cd-reliefweb-brand-blue--dark)}.cd-global-header button[aria-expanded=true]::before{border-color:transparent transparent var(--cd-reliefweb-brand-blue--dark)}@media(max-width: 767px){.cd-global-header button[aria-expanded] span[class*=__btn-label]{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}.cd-header button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header{background:var(--cd-reliefweb-brand-blue--dark);background-image:linear-gradient(-180deg, var(--cd-reliefweb-brand-blue--dark) 67%, #04415a 97%)}@supports(display: grid){.cd-site-header__inner{grid-template-columns:52px 1fr}@media(min-width: 768px){.cd-site-header__inner{grid-template-columns:186px 1fr}}}.cd-language-switcher__btn:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-user-menu__dropdown li a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-site-logo{width:52px}.cd-site-logo:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}@media(max-width: 767px){.cd-site-logo{background:url("../img/logos/rw-logo-mobile.svg") center no-repeat;background:linear-gradient(transparent, transparent),url("../img/logos/rw-logo-mobile.svg") center no-repeat}}@media(min-width: 768px){.cd-site-logo{width:140px}}.menu--main button[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red--dark)}.cd-nav__btn[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red--dark)}.cd-nav__btn[aria-expanded=true]::before{background:var(--cd-reliefweb-brand-red--dark)}@media(max-width: 1023px){.cd-site-header__nav-holder .cd-nav>ul>li>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>button.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>button.is-active::before{background:rgba(var(--cd-reliefweb-brand-red--dark), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-brand-red--dark), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-brand-red--dark), 0.6)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}}@media(min-width: 1024px){.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail button::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a:focus::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button:focus::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul a.is-active,.cd-site-header__nav-holder .cd-nav>.menu>li>ul button.is-active{border-left:3px solid var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul>li.menu-item--active-trail .is-active{border-left:3px solid var(--cd-reliefweb-brand-red--dark)}}.cd-ocha-dropdown__link a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-search__btn{color:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn svg{fill:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn:hover,.cd-search__btn:focus{color:#04415a}.cd-search__btn:hover svg,.cd-search__btn:focus svg{fill:#04415a}.cd-search__btn:focus{color:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn:focus svg{fill:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn[aria-expanded=true]{color:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn[aria-expanded=true] svg{fill:var(--cd-reliefweb-brand-red--dark)}.cd-search__submit:focus{background-color:var(--cd-reliefweb-brand-red--dark)}.cd-user-menu--no-language-switcher li:last-child a,.cd-user-menu--no-language-switcher li:last-child button{padding-right:0}.cd-user-menu--no-language-switcher li:last-child a::after,.cd-user-menu--no-language-switcher li:last-child button::after{content:none}.cd-user-menu__item:focus,.cd-global-header .menu>li a:focus,.cd-global-header .menu>li button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button{padding-right:0}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a::after,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button::after{content:none}@media(max-width: 767px){.cd-global-header__user-menu a svg+span{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}[dir=ltr] .admin-menu__btn svg+span{margin-left:10px}[dir=rtl] .admin-menu__btn svg+span{margin-right:10px}.admin-menu__btn .cd-icon:not(.cd-icon--arrow-down){display:inline-block;width:14px;height:14px;vertical-align:middle;fill:var(--cd-white)}.cd-footer{background:var(--cd-reliefweb-brand-blue--dark)}.cd-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-footer-copyright{display:block;margin-top:0;text-align:right;color:#fff;font-size:12px;font-weight:lighter}.cd-footer-copyright p{margin:0}.cd-footer-copyright a{display:inline-block;overflow:hidden;width:140px;height:60px;margin:0 0 -4px 0;padding:0 0 0 140px;background:url(../img/logos/rw-logo-sprite.png) 0 -60px no-repeat;background:rgba(0,0,0,0) url(../img/logos/rw-logo-sprite.svg) 0 -60px no-repeat}.cd-footer-copyright a:hover,.cd-footer-copyright a:active,.cd-footer-copyright a:focus{opacity:.8}@media all and (max-width: 1023px){.cd-footer-copyright{width:100%;text-align:center}}.cd-soft-footer{background:rgba(var(--cd-rgb-ocha-blue), 0.9)}.cd-soft-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}a{color:var(--cd-reliefweb-brand-blue--dark)}a:hover,a:focus{color:var(--cd-reliefweb-brand-blue--dark)}h1,h2{margin:0 0 24px 0;letter-spacing:.5px;font-size:24px;font-weight:bold;line-height:1.3}@media screen and (min-width: 480px){h1,h2{font-size:var(--cd-font-size--2xbase)}}h3{margin:0 0 16px 0;letter-spacing:.5px;font-size:20px;font-weight:bold;line-height:1.3}h4{margin:0 0 16px 0;letter-spacing:.5px;font-size:18px;font-weight:bold;line-height:1.3}h5{margin:0 0 16px 0;letter-spacing:.5px;font-size:17px;font-weight:bold;font-style:italic}h6{margin:0 0 16px 0;letter-spacing:.5px;font-size:16px;font-weight:bold}.rw-article__content *+h3,.rw-article__content *+h4,.rw-article__content *+h5,.rw-article__content *+h6{margin-top:16px}@media all and (max-width: 479px){#main h2{font-size:24px}}p{margin:1rem 0;line-height:1.6}p:first-child{margin-top:0}p:last-child{margin-bottom:0}input[type=search]{-moz-appearance:none;-webkit-appearance:none;appearance:none}input::-webkit-search-decoration{-webkit-appearance:none}input:-ms-input-placeholder{opacity:.7;color:inherit;font-style:italic}input::-moz-placeholder{opacity:.7;color:inherit;font-style:italic}input::placeholder{opacity:.7;color:inherit;font-style:italic}select{max-width:100%}select:not([multitple]){-moz-appearance:menulist-button;-webkit-appearance:menulist-button}fieldset{min-inline-size:auto}table{width:100%;border-collapse:collapse}table caption{margin:12px 0;font-weight:bold}table th,table td{padding:8px;border:1px solid var(--cd-reliefweb-brand-grey--light)}table th{border-left-color:#fff;background:var(--cd-reliefweb-brand-grey--light)}table thead th{border-left-color:#fff}th.field-label>h4.label{margin:0}table thead th:first-child{border-left-color:var(--cd-reliefweb-brand-grey--light)}table tbody th{border-top-color:#fff}table tbody th:first-child{border-top-color:var(--cd-reliefweb-brand-grey--light)}
diff --git a/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss b/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
index 95790dfc8..27888fc3d 100644
--- a/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
+++ b/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
@@ -274,7 +274,7 @@ $zindex: (
 $implementation-primary: var(--cd-reliefweb-brand-blue--dark);
 $implementation-primary-dark: #04415a;
 $implementation-secondary: var(--cd-reliefweb-brand-blue);
-$implementation-highlight: var(--cd-reliefweb-brand-red);
+$implementation-highlight: var(--cd-reliefweb-brand-red--dark);
 $cd-contrast-red: var(--cd-reliefweb-brand-red--dark);
 $cd-blue-grey: var(--cd-reliefweb-brand-grey--light);
 $cd-reliefweb-light-grey: var(--cd-reliefweb-brand-grey--light);

From 337b951656b61d82113a09327375c302016aa979 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 14:25:28 -0700
Subject: [PATCH 025/720] rename sass variables to be consistent with css
 custom property names

---
 .../common_design_subtheme/sass/base/_typography.scss     | 8 ++++----
 .../common_design_subtheme/sass/cd/_cd-variables.scss     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/sass/base/_typography.scss b/html/themes/custom/common_design_subtheme/sass/base/_typography.scss
index 19080f155..c7dc13f72 100644
--- a/html/themes/custom/common_design_subtheme/sass/base/_typography.scss
+++ b/html/themes/custom/common_design_subtheme/sass/base/_typography.scss
@@ -154,11 +154,11 @@ table caption {
 table th,
 table td {
   padding: 8px;
-  border: 1px solid $cd-reliefweb-light-grey;
+  border: 1px solid $cd-reliefweb-brand-grey--light;
 }
 table th {
   border-left-color: white;
-  background: $cd-reliefweb-light-grey;
+  background: $cd-reliefweb-brand-grey--light;
 }
 table thead th {
   border-left-color: white;
@@ -167,11 +167,11 @@ th.field-label > h4.label {
   margin: 0;
 }
 table thead th:first-child {
-  border-left-color: $cd-reliefweb-light-grey;
+  border-left-color: $cd-reliefweb-brand-grey--light;
 }
 table tbody th {
   border-top-color: white;
 }
 table tbody th:first-child {
-  border-top-color: $cd-reliefweb-light-grey;
+  border-top-color: $cd-reliefweb-brand-grey--light;
 }
diff --git a/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss b/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
index 27888fc3d..4b93bb2c3 100644
--- a/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
+++ b/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
@@ -277,4 +277,4 @@ $implementation-secondary: var(--cd-reliefweb-brand-blue);
 $implementation-highlight: var(--cd-reliefweb-brand-red--dark);
 $cd-contrast-red: var(--cd-reliefweb-brand-red--dark);
 $cd-blue-grey: var(--cd-reliefweb-brand-grey--light);
-$cd-reliefweb-light-grey: var(--cd-reliefweb-brand-grey--light);
+$cd-reliefweb-brand-grey--light: var(--cd-reliefweb-brand-grey--light);

From 5079ee2edba59e93855d615556a7de185f5f3d7d Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 15:06:38 -0700
Subject: [PATCH 026/720] extend custom modules, define libraries in sub theme
 and copy relevant colour-based rules to sub theme, replace hexadecimals with
 css custom properties

---
 .../common_design_subtheme.info.yml           |  9 ++++
 .../common_design_subtheme.libraries.yml      | 10 ++++
 .../components/rw-links/rw-links.css          | 17 +++++++
 .../reliefweb-section-links.css               | 17 +++++++
 .../components/rw-topics/rw-topics.css        | 14 ++++++
 .../rw-user-posting-rights.css                | 50 +++++++++++++++++++
 6 files changed, 117 insertions(+)
 create mode 100644 html/themes/custom/common_design_subtheme/components/rw-links/rw-links.css
 create mode 100644 html/themes/custom/common_design_subtheme/components/rw-section-links/reliefweb-section-links.css

diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.info.yml b/html/themes/custom/common_design_subtheme/common_design_subtheme.info.yml
index 298e097f1..cea8c40e6 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.info.yml
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.info.yml
@@ -32,6 +32,15 @@ libraries-extend:
   common_design/cd-button:
     - common_design_subtheme/cd-button
 
+  reliefweb_fields/reliefweb-links:
+    - common_design_subtheme/rw-links
+
+  reliefweb_fields/reliefweb-section-links:
+    - common_design_subtheme/rw-section-links
+
+  reliefweb_fields/reliefweb-user-posting-rights:
+    - common_design_subtheme/rw-user-posting-rights
+
   # Autocomplete form widget.
   reliefweb_form/widget.autocomplete:
     - common_design_subtheme/rw-autocomplete
diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
index 2ee14fc8a..fb7461a0e 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
@@ -172,6 +172,11 @@ rw-key-figures:
     theme:
       components/rw-key-figures/rw-key-figures.css: {}
 
+rw-links:
+  css:
+    theme:
+      components/rw-links/rw-links.css: {}
+
 rw-local-tasks:
   css:
     theme:
@@ -285,6 +290,11 @@ rw-search:
     theme:
       components/rw-search/rw-search.css: {}
 
+rw-section-links:
+  css:
+    theme:
+      components/rw-section-links/rw-section-links.css: {}
+
 rw-site-slogan:
   css:
     theme:
diff --git a/html/themes/custom/common_design_subtheme/components/rw-links/rw-links.css b/html/themes/custom/common_design_subtheme/components/rw-links/rw-links.css
new file mode 100644
index 000000000..f0f08fd91
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/components/rw-links/rw-links.css
@@ -0,0 +1,17 @@
+/**
+ * Country/disaster profile forms.
+ *
+ * This is the form to manage the country and disaster profiles (overview, key
+ * content, appeals and response plans and useful links).
+ *
+ * Scope: .field--type-reliefweb-links
+ */
+.field--type-reliefweb-links table[data-list-archives][data-visible] tbody {
+  background: var(--cd-reliefweb-grey--light--bg);
+}
+.field--type-reliefweb-links [data-link-form] {
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
+}
+.field--type-reliefweb-links tr[data-dragged] td {
+  background-color: var(--cd-reliefweb-brand-grey--light);
+}
diff --git a/html/themes/custom/common_design_subtheme/components/rw-section-links/reliefweb-section-links.css b/html/themes/custom/common_design_subtheme/components/rw-section-links/reliefweb-section-links.css
new file mode 100644
index 000000000..8934add91
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/components/rw-section-links/reliefweb-section-links.css
@@ -0,0 +1,17 @@
+/**
+ * Country/disaster profile forms.
+ *
+ * This is the form to manage the country and disaster profiles (overview, key
+ * content, appeals and response plans and useful links).
+ *
+ * Scope: .field--type-reliefweb-section-links
+ */
+.field--type-reliefweb-section-links table[data-list-archives][data-visible] tbody {
+  background: var(--cd-reliefweb-grey--light--bg);
+}
+.field--type-reliefweb-section-links [data-link-form] {
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
+}
+.field--type-reliefweb-section-links tr[data-dragged] td {
+  background-color: var(--cd-reliefweb-brand-grey--light);
+}
diff --git a/html/themes/custom/common_design_subtheme/components/rw-topics/rw-topics.css b/html/themes/custom/common_design_subtheme/components/rw-topics/rw-topics.css
index d8985f8de..aba6b7bee 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-topics/rw-topics.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-topics/rw-topics.css
@@ -39,3 +39,17 @@
   min-width: 150px;
   max-width: 320px;
 }
+
+/**
+ * Community topics form.
+ *
+ * This the form to manage the community topic links.
+ *
+ * Scope: .community-topics-form
+ */
+.community-topics-form [data-link-form] {
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
+}
+.community-topics-form tr[data-dragged] td {
+  background-color: var(--cd-reliefweb-brand-grey--light);
+}
diff --git a/html/themes/custom/common_design_subtheme/components/rw-user-posting-rights/rw-user-posting-rights.css b/html/themes/custom/common_design_subtheme/components/rw-user-posting-rights/rw-user-posting-rights.css
index cef8575e7..6e04f0e3a 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-user-posting-rights/rw-user-posting-rights.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-user-posting-rights/rw-user-posting-rights.css
@@ -29,3 +29,53 @@
   border-color: var(--cd-reliefweb-green);
   background: var(--cd-reliefweb-green--bg);
 }
+
+/**
+ * User posting rights form.
+ *
+ * This is the form used to manage user posting rights per organization.
+ *
+ * Scope: .field--type-reliefweb-user-posting-rights
+ */
+.field--type-reliefweb-user-posting-rights [data-filters],
+.field--type-reliefweb-user-posting-rights [data-new-form] {
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
+}
+.field--type-reliefweb-user-posting-rights [data-job="0"] label.job span:after,
+.field--type-reliefweb-user-posting-rights [data-training="0"] label.training span:after {
+  background: var(--cd-reliefweb-orange);
+}
+.field--type-reliefweb-user-posting-rights [data-job="1"] label.job span:after,
+.field--type-reliefweb-user-posting-rights [data-training="1"] label.training span:after {
+  background: var(--cd-reliefweb-red);
+}
+.field--type-reliefweb-user-posting-rights [data-job="2"] label.job span:after,
+.field--type-reliefweb-user-posting-rights [data-training="2"] label.training span:after {
+  background: var(--cd-reliefweb-blue);
+}
+.field--type-reliefweb-user-posting-rights [data-job="3"] label.job span:after,
+.field--type-reliefweb-user-posting-rights [data-training="3"] label.training span:after {
+  background: var(--cd-reliefweb-green);
+}
+.field--type-reliefweb-user-posting-rights ul {
+  border-top: 1px solid var(--cd-reliefweb-brand-grey--light);
+}
+.field--type-reliefweb-user-posting-rights ul li {
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
+  border-top: none;
+}
+.field--type-reliefweb-user-posting-rights ul li div button {
+  background: var(--cd-reliefweb-brand-blue--dark);
+}
+.field--type-reliefweb-user-posting-rights ul li div button:hover,
+.field--type-reliefweb-user-posting-rights ul li div button:focus,
+.field--type-reliefweb-user-posting-rights ul li div button:active {
+  background: var(--cd-reliefweb-brand-red--dark);
+}
+.field--type-reliefweb-user-posting-rights li[data-modified] {
+  border-left: 4px solid #055372;
+}
+.field--type-reliefweb-user-posting-rights li[data-status="blocked"] {
+  border-left: 4px solid var(--cd-reliefweb-red);
+  background: var(--cd-reliefweb-brand-grey--light);
+}

From f3bcb8d92540c56e690cd7a06181ed6e475dc7df Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 15:07:13 -0700
Subject: [PATCH 027/720] missing word in description

---
 .../components/reliefweb-links/reliefweb-links.css              | 2 +-
 .../reliefweb-section-links/reliefweb-section-links.css         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/reliefweb_fields/components/reliefweb-links/reliefweb-links.css b/html/modules/custom/reliefweb_fields/components/reliefweb-links/reliefweb-links.css
index 3033cc9db..e2fe5dc24 100644
--- a/html/modules/custom/reliefweb_fields/components/reliefweb-links/reliefweb-links.css
+++ b/html/modules/custom/reliefweb_fields/components/reliefweb-links/reliefweb-links.css
@@ -1,7 +1,7 @@
 /**
  * Country/disaster profile forms.
  *
- * This the form to manage the country and disaster profiles (overview, key
+ * This is the form to manage the country and disaster profiles (overview, key
  * content, appeals and response plans and useful links).
  *
  * Scope: .field--type-reliefweb-links
diff --git a/html/modules/custom/reliefweb_fields/components/reliefweb-section-links/reliefweb-section-links.css b/html/modules/custom/reliefweb_fields/components/reliefweb-section-links/reliefweb-section-links.css
index bdeae6167..a9334a44f 100644
--- a/html/modules/custom/reliefweb_fields/components/reliefweb-section-links/reliefweb-section-links.css
+++ b/html/modules/custom/reliefweb_fields/components/reliefweb-section-links/reliefweb-section-links.css
@@ -1,7 +1,7 @@
 /**
  * Country/disaster profile forms.
  *
- * This the form to manage the country and disaster profiles (overview, key
+ * This is the form to manage the country and disaster profiles (overview, key
  * content, appeals and response plans and useful links).
  *
  * Scope: .field--type-reliefweb-section-links

From 66318db0c7a1a2774a3136d1e5ef732864b77204 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 16:35:24 -0700
Subject: [PATCH 028/720] prevent TOC nav collapse when there is only one item
 by setting flex basis, rules for IE 11 toggle navigation

---
 .../rw-river-letter-navigation.css            | 23 ++++++++
 .../components/rw-toc/rw-toc.css              | 58 ++++++++++++++-----
 2 files changed, 65 insertions(+), 16 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-river-letter-navigation/rw-river-letter-navigation.css b/html/themes/custom/common_design_subtheme/components/rw-river-letter-navigation/rw-river-letter-navigation.css
index 9ec91611e..ee4d6946a 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-river-letter-navigation/rw-river-letter-navigation.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-river-letter-navigation/rw-river-letter-navigation.css
@@ -98,3 +98,26 @@
     --dropdown: false;
   }
 }
+
+@media all and (min-width: 480px) and (-ms-high-contrast: none) {
+  /* This is needed for IE11
+  No support for CSS custom properties means
+  --dropdown: false; property on nav container is not recognised
+  so the cd-dropdown.js creates a toggler button on desktop
+  This hides it when that happens.
+  */
+  .rw-river-letter-navigation__btn {
+    display: none;
+  }
+
+  /* This is needed for IE11
+  No support for CSS custom properties means
+  --dropdown: false; property on nav container is not recognised
+  so the cd-dropdown.js does not run the updateToggler function
+  which toggles the data-cd-hidden attribute.
+  This displays the nav regardless of that attribute value.
+  */
+  .rw-river-letter-navigation[data-cd-hidden="true"] {
+    display: block;
+  }
+}
diff --git a/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css b/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
index 0e43f00ab..c09ce3f02 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
@@ -31,23 +31,26 @@
   font-weight: bold;
 }
 
-.rw-page--sectioned {
-  display: flex;
-  flex-wrap: wrap;
-}
-.rw-page--sectioned > header {
-  width: 100%;
-  margin: 0;
-}
-
-/* To facilitate the sticky TOC */
-.region-content,
-.rw-sectioned-content,
-.node-form,
-.taxonomy-term-form {
-  height: 100%;
+@media screen and (min-width: 768px) {
+  .rw-page--sectioned {
+    display: flex;
+    flex-wrap: wrap;
+  }
+  .rw-page--sectioned > header {
+    width: 100%;
+    margin: 0;
+  }
+  /* To facilitate the sticky TOC */
+  .region-content,
+  .rw-sectioned-content,
+  .node-form,
+  .taxonomy-term-form {
+    height: 100%;
+  }
+  .rw-sectioned-content {
+    flex: 1 0 20%;
+  }
 }
-
 .rw-sectioned-content > section,
 .rw-sectioned-content > form > fieldset,
 .rw-sectioned-content > form > .form-wrapper,
@@ -240,3 +243,26 @@
 .taxonomy-term-form .field--name-field-job-import-feed.form-wrapper {
   margin-top: 0;
 }
+
+@media all and (min-width: 768px) and (-ms-high-contrast: none) {
+  /* This is needed for IE11
+  No support for CSS custom properties means
+  --dropdown: false; property on nav container is not recognised
+  so the cd-dropdown.js creates a toggler button on desktop
+  This hides it when that happens.
+  */
+  .rw-toc__btn {
+    display: none;
+  }
+
+  /* This is needed for IE11
+  No support for CSS custom properties means
+  --dropdown: false; property on nav container is not recognised
+  so the cd-dropdown.js does not run the updateToggler function
+  which toggles the data-cd-hidden attribute.
+  This displays the nav regardless of that attribute value.
+  */
+  .rw-toc[data-cd-hidden="true"] {
+    display: block;
+  }
+}

From 5797038b683a83ec3ef890268d27e8f3f6a8df8b Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 4 Nov 2021 16:36:09 -0700
Subject: [PATCH 029/720] rule to prevent overflow on TOC pages when flex
 layouts are not loaded in IE11

---
 .../components/rw-article/rw-article.css                    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css b/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css
index 19566aff4..4fbf0ba7a 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css
@@ -14,6 +14,12 @@
   padding: 0 0 24px 0;
   border-bottom: 1px solid #e6ecef;
 }
+/* Prevent overflow in IE11 */
+@media all and (min-width: 768px) and (-ms-high-contrast: none) {
+  .rw-river-article {
+    flex: 1 0 100%;
+  }
+}
 .rw-river-article:last-child {
   padding-bottom: 0;
   border-bottom: none;

From ad247e427f7281e289dc592b8a88e56318459d00 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Mon, 8 Nov 2021 12:11:23 -0700
Subject: [PATCH 030/720] adjust selectors to match recent changes to article
 css so rules override for homepage as intended

---
 .../components/rw-homepage/rw-homepage.css                | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-homepage/rw-homepage.css b/html/themes/custom/common_design_subtheme/components/rw-homepage/rw-homepage.css
index 747d3af69..4d2372d04 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-homepage/rw-homepage.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-homepage/rw-homepage.css
@@ -6,23 +6,23 @@
  */
 .rw-river--disasters {
   --cd-flow-space: 1rem;
-  /* border-top: 1px solid #e6ecef; */
+  /* border-top: 1px solid var(--cd-reliefweb-brand-grey--light); */
 }
 .rw-river--disasters .rw-river-article--disaster {
   position: relative;
   /* margin: 16px 0 0 0; */
   padding: 0 0 16px;
-  /* border-top: 1px solid #e6ecef; */
+  /* border-top: 1px solid var(--cd-reliefweb-brand-grey--light); */
 }
 .rw-river--disasters .rw-river-article--disaster:first-child {
   margin: 0;
   /* padding: 8px 0 0 0; */
   border-top: none;
 }
-.rw-river--disasters .rw-river-article--disaster header {
+.rw-river--disasters .rw-river-article--disaster .rw-river-article__header {
   margin-top: 0;
 }
-.rw-river--disasters .rw-river-article--disaster footer {
+.rw-river--disasters .rw-river-article--disaster .rw-river-article__footer {
   padding-top: 0;
 }
 .rw-river--disasters .rw-river-article--disaster .rw-entity-meta {

From 2749a06d1ace7d0637438464d1f3ae8ff5af4b8a Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Mon, 8 Nov 2021 12:26:52 -0700
Subject: [PATCH 031/720] adjust selectors to match recent changes to article
 css so rules override for latest blog list as intended

---
 .../common_design_subtheme/components/rw-blog/rw-blog.css       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-blog/rw-blog.css b/html/themes/custom/common_design_subtheme/components/rw-blog/rw-blog.css
index 058069a0d..1c0d36ac5 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-blog/rw-blog.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-blog/rw-blog.css
@@ -32,7 +32,7 @@
 .rw-river--latest-blog-posts .rw-river-article--blog-post:last-child {
   padding-bottom: 0;
 }
-.rw-river--latest-blog-posts .rw-river-article--blog-post header + footer {
+.rw-river--latest-blog-posts .rw-river-article--blog-post .rw-river-article__header + .rw-river-article__footer {
   padding-top: 0;
 }
 

From 2fc5774e5c65cec887252fb0773bdaecba169eef Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Mon, 8 Nov 2021 15:16:52 -0700
Subject: [PATCH 032/720] correct variable

---
 .../components/rw-moderation-status/rw-moderation-status.css    | 2 +-
 .../rw-user-posting-rights/rw-user-posting-rights.css           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-moderation-status/rw-moderation-status.css b/html/themes/custom/common_design_subtheme/components/rw-moderation-status/rw-moderation-status.css
index 56a1cc7fd..bf582857d 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-moderation-status/rw-moderation-status.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-moderation-status/rw-moderation-status.css
@@ -1,6 +1,6 @@
 [data-moderation-status="draft"] {
   border-color: var(--cd-reliefweb-grey--light);
-  background-color: var(--cd-reliefweb-orange--bg);
+  background-color: var(--cd-reliefweb-grey--light--bg);
 }
 [data-moderation-status="on_hold"],
 [data-moderation-status="alert"],
diff --git a/html/themes/custom/common_design_subtheme/components/rw-user-posting-rights/rw-user-posting-rights.css b/html/themes/custom/common_design_subtheme/components/rw-user-posting-rights/rw-user-posting-rights.css
index 6e04f0e3a..d41fb2738 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-user-posting-rights/rw-user-posting-rights.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-user-posting-rights/rw-user-posting-rights.css
@@ -9,7 +9,7 @@
   vertical-align: middle;
   text-transform: uppercase;
   border: 1px solid var(--cd-reliefweb-grey--light);
-  background: var(--cd-reliefweb-orange--bg);
+  background: var(--cd-reliefweb-grey--light--bg);
   font-size: 10px;
   font-weight: bold;
 }

From 62bec9affc10bb2a6bdf4575e72b6883c5875de9 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 9 Nov 2021 11:59:37 -0700
Subject: [PATCH 033/720] prep RW brand colour buttons, might not use

---
 .../components/cd-button/cd-button.css               | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/components/cd-button/cd-button.css b/html/themes/custom/common_design_subtheme/components/cd-button/cd-button.css
index 4b950bb74..3faa088fb 100755
--- a/html/themes/custom/common_design_subtheme/components/cd-button/cd-button.css
+++ b/html/themes/custom/common_design_subtheme/components/cd-button/cd-button.css
@@ -12,13 +12,23 @@
   --cd-primary-color-h: 197;
   --cd-primary-color-s: 91%;
   --cd-primary-color-l: 38%;
+
+  /* RW Colours in buttons */
+  /*--cd-ie-primary-color: #055372;*/
+  /*--cd-ie-primary-color--light: #19b7f5;*/
+  /*--cd-ie-primary-color--dark: #032e40;*/
+  /*--cd-ie-primary-color--lighter: #45c5f7;*/
+  /*--cd-primary-color-h: 197;*/
+  /*--cd-primary-color-s: 92%;*/
+  /*--cd-primary-color-l: 23%;*/
+
   --cd-primary-color: hsl(var(--cd-primary-color-h), var(--cd-primary-color-s), var(--cd-primary-color-l));
 
   /* lighten */
   --cd-primary-color--light: hsl(var(--cd-primary-color-h), var(--cd-primary-color-s), calc(var(--cd-primary-color-l) + 30%));
 
   /* darken */
-  --cd-primary-color--dark: hsl(var(--cd-primary-color-h), var(--cd-primary-color-s), calc(var(--cd-primary-color-l) - 26%));
+  --cd-primary-color--dark: hsl(var(--cd-primary-color-h), var(--cd-primary-color-s), calc(var(--cd-primary-color-l) - 13%));
 
   /* For cd-button--light */
   /* Change the lightness. Other values remain the same */

From ab7e789d8e6420515126720a80770e54f579f09a Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 9 Nov 2021 12:39:06 -0700
Subject: [PATCH 034/720] template overrides for node and term edit page, to
 add a wrapper div to facilitate TOC sticky nav wihtout overlapping footer

---
 .../layout/page--node--edit.html.twig         | 31 +++++++++++++++++++
 .../page--taxonomy--term--edit.html.twig      |  1 +
 2 files changed, 32 insertions(+)
 create mode 100644 html/themes/custom/common_design_subtheme/templates/layout/page--node--edit.html.twig
 create mode 100644 html/themes/custom/common_design_subtheme/templates/layout/page--taxonomy--term--edit.html.twig

diff --git a/html/themes/custom/common_design_subtheme/templates/layout/page--node--edit.html.twig b/html/themes/custom/common_design_subtheme/templates/layout/page--node--edit.html.twig
new file mode 100644
index 000000000..20ce54c6f
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/templates/layout/page--node--edit.html.twig
@@ -0,0 +1,31 @@
+{% embed '@common_design/layout/page.html.twig' %}
+
+  {% block header %}
+    {% include '@common_design_subtheme/cd/cd-header/cd-header.html.twig' %}
+  {% endblock %}
+
+  {% block main %}
+    {# Link to skip to the main content is in html.html.twig #}
+    <main role="main" {{ attributes.setAttribute('id', 'main-content').addClass(layout_classes) }}>
+
+      {{ page.page_title }}
+
+      <div class="cd-layout-content-wrapper">
+        <div class="cd-layout-content">
+          <div class="rw-page--sectioned">
+            {{ page.content }}
+          </div>
+        </div>{# /.cd-layout-content #}
+
+        {% if page.sidebar_second %}<aside class="cd-layout-sidebar-second" role="complementary">{{ page.sidebar_second }}</aside>
+        {% endif %}
+      </div>
+
+    </main>
+  {% endblock %}
+
+  {% block footer %}
+    {% include '@common_design_subtheme/cd/cd-footer/cd-footer.html.twig' %}
+  {% endblock %}
+
+{% endembed %}
diff --git a/html/themes/custom/common_design_subtheme/templates/layout/page--taxonomy--term--edit.html.twig b/html/themes/custom/common_design_subtheme/templates/layout/page--taxonomy--term--edit.html.twig
new file mode 100644
index 000000000..d60a61198
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/templates/layout/page--taxonomy--term--edit.html.twig
@@ -0,0 +1 @@
+{% extends '@common_design_subtheme/layout/page--node--edit.html.twig' %}

From 3fb55c4fd1acb077da2064d530d05b7ee473ea68 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 9 Nov 2021 12:42:42 -0700
Subject: [PATCH 035/720] add rules with parent selectors to target content
 region for node and term edit pages, reliant on page template markup

---
 .../components/rw-toc/rw-toc.css               | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css b/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
index c09ce3f02..bca66e116 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
@@ -51,6 +51,24 @@
     flex: 1 0 20%;
   }
 }
+/* Node and Term edit pages- see page--[entity]--edit.html.twig */
+@media screen and (min-width: 768px) {
+  .user-logged-in.path-taxonomy .rw-page--sectioned .region-content,
+  .user-logged-in.path-node .rw-page--sectioned .region-content {
+    display: flex;
+    flex-wrap: wrap;
+  }
+  .user-logged-in.path-taxonomy .rw-page--sectioned .region-content > header,
+  .user-logged-in.path-node .rw-page--sectioned .region-content > header,
+  .user-logged-in.path-taxonomy .rw-page--sectioned .region-content .rw-moderation-information,
+  .user-logged-in.path-node .rw-page--sectioned .region-content .rw-moderation-information,
+  .user-logged-in.path-taxonomy .rw-page--sectioned .region-content .block-local-tasks-block,
+  .user-logged-in.path-node .rw-page--sectioned .region-content .block-local-tasks-block,
+  .user-logged-in.path-taxonomy .rw-page--sectioned .region-content .rw-page-title,
+  .user-logged-in.path-node .rw-page--sectioned .region-content .rw-page-title {
+    width: 100%;
+  }
+}
 .rw-sectioned-content > section,
 .rw-sectioned-content > form > fieldset,
 .rw-sectioned-content > form > .form-wrapper,

From f1e7e312f140e621cae951d38c98fe8f91489edd Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 9 Nov 2021 12:48:40 -0700
Subject: [PATCH 036/720] add comment

---
 .../common_design_subtheme/components/rw-toc/rw-toc.css   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css b/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
index bca66e116..95515a6f3 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
@@ -51,7 +51,13 @@
     flex: 1 0 20%;
   }
 }
-/* Node and Term edit pages- see page--[entity]--edit.html.twig */
+/* Node and Term edit page rules so the TOC acts the same as on the full
+   View pages.
+   The parent selectors `user-logged-in.path-[entity]` are also present on
+   Term and Node full node view pages, but the rules below are not applied
+   due to the additional markup present in only `page--[entity]--edit.html.twig`
+   template overrides
+*/
 @media screen and (min-width: 768px) {
   .user-logged-in.path-taxonomy .rw-page--sectioned .region-content,
   .user-logged-in.path-node .rw-page--sectioned .region-content {

From 569ca2b15b219c51de0583678df67315d95f0907 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 9 Nov 2021 14:21:35 -0700
Subject: [PATCH 037/720] remove commented out code, correct typos, remove
 comments that are not relevant, comment out specific rules to test relevance

---
 .../components/cd-button/cd-button.css        | 14 +--
 .../components/cd-card/cd-card.css            |  9 --
 .../rw-admin-menu/rw-admin-menu.css           | 99 -------------------
 .../rw-advanced-search/rw-advanced-search.css |  2 +-
 .../components/rw-article/rw-article.css      |  7 --
 .../rw-article/rw-maps-inforgraphics.css      |  3 +-
 .../rw-autocomplete/rw-autocomplete.css       |  2 -
 .../rw-datepicker/rw-datepicker.css           |  1 -
 .../components/rw-document/rw-document.css    |  5 -
 .../components/rw-dsr/rw-dsr.css              |  3 +-
 .../rw-external-links/rw-external-links.css   |  2 +-
 .../components/rw-form/rw-form--widget.css    | 93 -----------------
 .../components/rw-form/rw-form.css            | 32 +-----
 .../components/rw-homepage/rw-homepage.css    |  4 -
 .../rw-key-figures/rw-key-figures.css         |  1 -
 .../rw-local-tasks/rw-local-tasks.css         |  3 -
 .../rw-moderation/rw-moderation.css           |  1 -
 .../rw-related-content/rw-related-content.css |  1 -
 .../rw-river-letter-navigation.css            | 21 ----
 .../components/rw-search/rw-search.css        |  1 -
 .../components/rw-selection/rw-selection.css  |  1 -
 .../rw-site-slogan/rw-site-slogan.css         |  2 +-
 .../rw-social-media-links.css                 | 14 ---
 .../rw-subscriptions/rw-subscriptions.css     |  1 -
 .../components/rw-toc/rw-toc.css              | 26 -----
 .../rw-useful-links/rw-useful-links.css       |  6 +-
 .../components/rw-user/rw-user.css            |  1 -
 .../components/rw-view-more/rw-view-more.css  |  6 +-
 28 files changed, 21 insertions(+), 340 deletions(-)
 delete mode 100644 html/themes/custom/common_design_subtheme/components/cd-card/cd-card.css

diff --git a/html/themes/custom/common_design_subtheme/components/cd-button/cd-button.css b/html/themes/custom/common_design_subtheme/components/cd-button/cd-button.css
index 3faa088fb..72b8d9141 100755
--- a/html/themes/custom/common_design_subtheme/components/cd-button/cd-button.css
+++ b/html/themes/custom/common_design_subtheme/components/cd-button/cd-button.css
@@ -14,13 +14,13 @@
   --cd-primary-color-l: 38%;
 
   /* RW Colours in buttons */
-  /*--cd-ie-primary-color: #055372;*/
-  /*--cd-ie-primary-color--light: #19b7f5;*/
-  /*--cd-ie-primary-color--dark: #032e40;*/
-  /*--cd-ie-primary-color--lighter: #45c5f7;*/
-  /*--cd-primary-color-h: 197;*/
-  /*--cd-primary-color-s: 92%;*/
-  /*--cd-primary-color-l: 23%;*/
+  /* --cd-ie-primary-color: #055372; */
+  /* --cd-ie-primary-color--light: #19b7f5; */
+  /* --cd-ie-primary-color--dark: #032e40; */
+  /* --cd-ie-primary-color--lighter: #45c5f7; */
+  /* --cd-primary-color-h: 197; */
+  /* --cd-primary-color-s: 92%; */
+  /* --cd-primary-color-l: 23%; */
 
   --cd-primary-color: hsl(var(--cd-primary-color-h), var(--cd-primary-color-s), var(--cd-primary-color-l));
 
diff --git a/html/themes/custom/common_design_subtheme/components/cd-card/cd-card.css b/html/themes/custom/common_design_subtheme/components/cd-card/cd-card.css
deleted file mode 100644
index c39c90a06..000000000
--- a/html/themes/custom/common_design_subtheme/components/cd-card/cd-card.css
+++ /dev/null
@@ -1,9 +0,0 @@
-.cd-card__title,
-.cd-card__title h3 > a {
-  display: block;
-}
-
-.cd-card__title,
-.cd-card__title a {
-  display: initial;
-}
diff --git a/html/themes/custom/common_design_subtheme/components/rw-admin-menu/rw-admin-menu.css b/html/themes/custom/common_design_subtheme/components/rw-admin-menu/rw-admin-menu.css
index 066f81350..7c9cbcfe4 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-admin-menu/rw-admin-menu.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-admin-menu/rw-admin-menu.css
@@ -112,105 +112,6 @@
   padding: 0;
 }
 
-/* .js .cd-header .admin-menu nav { */
-/*  !* Hide by default when javascript is enabled to avoid flickering before the */
-/*   * toggling button is added. *! */
-/*  display: none; */
-/*  position: absolute; */
-/*  left: 0; */
-/*  width: 100%; */
-/*  padding: 22px 0; */
-/*  !* Inherit the padding from the header wrapper. *! */
-/*  padding-left: inherit; */
-/*  padding-right: inherit; */
-/*  -webkit-box-shadow: 0 4px 4px -2px rgba(0, 0, 0, 0.3); */
-/*  box-shadow: 0 4px 4px -2px rgba(0, 0, 0, 0.3); */
-/*  !* Ensures the admin menu popup is above the rest of the header and the main */
-/*   * content. *! */
-/*  z-index: 3; */
-/* } */
-/* .js .cd-header .admin-menu[data-hidden="false"] { */
-/*  display: block; */
-/* } */
-/* Visually hidden. */
-/* .js .cd-header .admin-menu h2 { */
-/*  position: absolute; */
-/*  height: 1px; */
-/*  width: 1px; */
-/*  margin: -1px; */
-/*  border: none; */
-/*  padding: 0; */
-/*  clip-path: inset(100%); */
-/*  clip: rect(0,0,0,0); */
-/*  overflow: hidden; */
-/*  white-space: nowrap; */
-/* } */
-/* .js .cd-header .admin-menu > ul { */
-/*  max-width: 1140px; */
-/*  margin: 0 auto; */
-/*  position: relative; */
-/* } */
-/* .js .cd-header .admin-menu-toggler { */
-/*  display: inline-block; */
-/*  position: relative; */
-/*  height: 35px; */
-/*  padding: 0 20px; */
-/*  margin: 0; */
-/*  border: none; */
-/*  background: none; */
-/*  color: white; */
-/*  font-size: 12px; */
-/*  font-weight: lighter; */
-/*  line-height: 35px; */
-/*  !* Ensures the menu is above the background. *! */
-/*  z-index: 2; */
-/* } */
-/* .js .cd-header .admin-menu-toggler:hover, */
-/* .js .cd-header .admin-menu-toggler:focus, */
-/* .js .cd-header .admin-menu-toggler:active { */
-/*  text-decoration: underline; */
-/* } */
-/* Arrow to show the show that the popup is controlled by the button. */
-/* .js .cd-header .admin-menu-toggler[aria-expanded="true"]:before { */
-/*  content: ""; */
-/*  position: absolute; */
-/*  bottom: 0; */
-/*  left: 50%; */
-/*  width: 12px; */
-/*  margin-left: -6px; */
-/*  border-left: 6px solid transparent; */
-/*  border-right: 6px solid transparent; */
-/*  border-bottom: 6px solid var(--cd-reliefweb-brand-blue--dark); */
-/* } */
-/* .js .cd-header .admin-menu-toggler:after { */
-/*  content: ""; */
-/*  display: inline-block; */
-/*  vertical-align: middle; */
-/*  width: 9px; */
-/*  height: 9px; */
-/*  margin-left: 5px; */
-/*  overflow: hidden; */
-/*  background: url(../../images/rw-icons-sprite.png) -177px 0 no-repeat; */
-/*  background: rgba(0,0,0,0) url(../../images/rw-icons-sprite.svg) -177px 0 no-repeat; */
-/* } */
-/* .js .cd-header  .admin-menu-toggler[aria-expanded="true"]:after { */
-/*  background-position-y: -9px; */
-/* } */
-/* Show an icon and hide the text on small screens. */
-/* @media screen and (max-width: 767px) { */
-/*  .js .cd-header .admin-menu-toggler span { */
-/*    display: inline-block; */
-/*    position: relative; */
-/*    top: 2px; */
-/*    width: 12px; */
-/*    height: 12px; */
-/*    text-indent: 12px; */
-/*    overflow: hidden; */
-/*    background: url(../../images/rw-icons-sprite.png) -108px -168px no-repeat; */
-/*    background: rgba(0,0,0,0) url(../../images/rw-icons-sprite.svg) -108px -168px no-repeat; */
-/*  } */
-/* } */
-
 /* Print. */
 @media print {
   .admin-menu-button {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-advanced-search/rw-advanced-search.css b/html/themes/custom/common_design_subtheme/components/rw-advanced-search/rw-advanced-search.css
index 8c3595779..50fa4d241 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-advanced-search/rw-advanced-search.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-advanced-search/rw-advanced-search.css
@@ -198,7 +198,7 @@
 }
 
 /**
- * Adavanced search form.
+ * Advanced search form.
  */
 .rw-advanced-search__form {
   position: relative;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css b/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css
index ae3a5fc68..203b638b3 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css
@@ -27,10 +27,6 @@
 .rw-river-article:only-child {
   padding-bottom: 0;
 }
-.rw-river-article .rw-river-article__header {
-  /* Compensate the half-leading space from the title line-height. */
-  /* margin-top: -5px; */
-}
 .rw-river-article .rw-river-article__header p.rw-entity-country-slug {
   margin: 2px 6px 0 0;
   padding: 1px 8px;
@@ -53,7 +49,6 @@
   flex: 1 0 auto;
   align-items: center;
   padding-top: 16px;
-  /* #2e3436 with 0.85 opacity on white. */
   color: var(--cd-reliefweb-brand-grey--mid);
 }
 /* Article with a thumbnail preview (typically Map and Infographic). */
@@ -75,8 +70,6 @@
 .rw-river-article .rw-river-article__footer {
   /* Clear any floating from the content. */
   clear: both;
-  /* Compensate  the half-leading space added by the line-height of the <dl>. */
-  /* margin-bottom: -8px; */
   padding-top: 16px;
 }
 .rw-river-article .rw-river-article__header + .rw-river-article__footer {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-article/rw-maps-inforgraphics.css b/html/themes/custom/common_design_subtheme/components/rw-article/rw-maps-inforgraphics.css
index a0aaf68c5..08eea3fce 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-article/rw-maps-inforgraphics.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-article/rw-maps-inforgraphics.css
@@ -47,13 +47,12 @@
       display: none;
     }
   }
-  /* Media queries. */
+
   @media screen and (min-width: 480px) {
     .rw-river--maps-infographics .rw-river__articles {
       display: grid;
       grid-template-columns: repeat(2, 1fr);
       grid-column-gap: 24px;
-      /* padding-top: 24px; */
     }
     .rw-river--maps-infographics article {
       justify-content: flex-end;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-autocomplete/rw-autocomplete.css b/html/themes/custom/common_design_subtheme/components/rw-autocomplete/rw-autocomplete.css
index 02862693e..b6ab9ce28 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-autocomplete/rw-autocomplete.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-autocomplete/rw-autocomplete.css
@@ -64,7 +64,6 @@
 .rw-autocomplete-selector {
   position: absolute;
   /* Ensures the popup is above the content.
-   * @todo Review the value. */
   z-index: 120;
   top: 100%;
   left: 0;
@@ -86,7 +85,6 @@
   /* Suggestions are clickable. */
   cursor: pointer;
   white-space: pre-wrap;
-  /* @todo review in regards to the standard cd-font sizes. */
   font-size: 16px;
   /* Better readability. */
   line-height: 1.5;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-datepicker/rw-datepicker.css b/html/themes/custom/common_design_subtheme/components/rw-datepicker/rw-datepicker.css
index 6b5464e74..923cab1f6 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-datepicker/rw-datepicker.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-datepicker/rw-datepicker.css
@@ -56,7 +56,6 @@
   color: var(--cd-reliefweb-brand-blue--dark);
   border: none;
   background: none;
-  /* @todo review if we can use a CD variable. */
   font-size: 16px;
   line-height: 16px;
   /* Disable text selection of the buttons in the calendar to avoid interfering
diff --git a/html/themes/custom/common_design_subtheme/components/rw-document/rw-document.css b/html/themes/custom/common_design_subtheme/components/rw-document/rw-document.css
index ae64567f5..b4a0977ac 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-document/rw-document.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-document/rw-document.css
@@ -40,11 +40,6 @@
 .rw-document .rw-article__content section {
   padding-top: 24px;
 }
-/* .rw-document .rw-article__content section > h3 { */
-/*  padding: 0 0 0 8px; */
-/*  border-left: 8px solid var(--cd-reliefweb-brand-blue); */
-/* } */
-
 .rw-document > footer {
   width: 100%;
   margin: 0;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-dsr/rw-dsr.css b/html/themes/custom/common_design_subtheme/components/rw-dsr/rw-dsr.css
index 0a1e86424..61e6fff12 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-dsr/rw-dsr.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-dsr/rw-dsr.css
@@ -74,7 +74,6 @@
   text-align: left;
 }
 
-/* Media queries. */
 @media screen and (min-width: 768px) {
   .rw-dsr {
     display: flex;
@@ -95,7 +94,7 @@
      * @todo currently the top margin of the highlights (ul) comes from the
      * browser user agent styling (ex: margin-block-start: 1em;). Setting it
      * to 0 here means the spacing between the title section and the highlights
-     * differs when there is an illustation or not which is not consistent.
+     * differs when there is an illustration or not which is not consistent.
      * So it would be better to have a fixed margin (0 or something else)
      * regardless of the presence of the illustration. This margin should be
      * consistent with the other sections on the page the DSR one is displayed
diff --git a/html/themes/custom/common_design_subtheme/components/rw-external-links/rw-external-links.css b/html/themes/custom/common_design_subtheme/components/rw-external-links/rw-external-links.css
index 8dff59a31..56eb14df6 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-external-links/rw-external-links.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-external-links/rw-external-links.css
@@ -8,5 +8,5 @@
   margin: -2px 0 0 6px;
   content: "";
   vertical-align: middle;
-  background: var(--rw-icons--common--external-link--12--dark-grey);
+  background: var(--rw-icons--common--external-link--12--dark-blue);
 }
diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
index 443e273e3..475377212 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
@@ -1,95 +1,3 @@
-
-/**
- * File and image fields.
- *
- * This includes single and multiple values field. Both file and image fields
- * share some basic styling.
- */
-/* form .file-widget .fieldset-wrapper { */
-/*  !* Necessary to ensure the progress overlay stays within the limits of the */
-/*   * file element. *! */
-/*  position: relative; */
-/*  padding: 8px; */
-/*  border: 1px solid var(--cd-reliefweb-brand-grey--light); */
-/* } */
-/* form table.file-list thead { */
-/*  display: none; */
-/* } */
-/* form table.file-list td:first-child { */
-/*  min-width: 400px; */
-/*  padding: 0; */
-/* } */
-/* form table.file-list td:last-child { */
-/*  width: 200px; */
-/*  min-width: 200px; */
-/* } */
-/* form table.file-list td:last-child .description { */
-/*  display: block; */
-/*  margin-top: 12px; */
-/* } */
-/* form table.file-list td:last-child button { */
-/*  display: block; */
-/*  margin: 0 auto; */
-/* } */
-/* form table.file-list .file-widget .fieldset-wrapper { */
-/*  display: table; */
-/*  width: 100%; */
-/*  border-collapse: collapse; */
-/*  border-top-style: hidden; */
-/*  border-right-style: hidden; */
-/*  border-bottom-style: hidden; */
-/* } */
-/* form table.file-list .file-widget .fieldset-wrapper > div { */
-/*  display: table-cell; */
-/*  width: 50%; */
-/*  padding: 8px 16px; */
-/*  border-left: 1px solid var(--cd-reliefweb-brand-grey--light); */
-/* } */
-/* form table.file-list .file-widget .fieldset-wrapper > div.file-details a[download] { */
-/*  display: block; */
-/*  margin-bottom: 12px; */
-/* } */
-/* form table.file-list .file-widget .fieldset-wrapper .file-preview > div + div { */
-/*  margin-top: 0; */
-/* } */
-/* form table.file-list .file-widget .fieldset-wrapper .preview-image { */
-/*  float: left; */
-/*  width: 100px; */
-/*  height: 100px; */
-/*  margin: 12px 12px 0 0; */
-/*  text-align: center; */
-/* } */
-/* form table.file-list .file-widget .fieldset-wrapper .preview-image a { */
-/*  !* Fallback if flex is not available. *! */
-/*  display: block; */
-/*  display: flex; */
-/*  align-items: center; */
-/*  justify-content: center; */
-/*  width: 102px; */
-/*  height: 102px; */
-/*  text-align: center; */
-/*  border: 1px solid var(--cd-reliefweb-brand-grey--light); */
-/* } */
-/* form table.file-list .file-widget .fieldset-wrapper .preview-image a img { */
-/*  max-width: 100%; */
-/*  max-height: 100%; */
-/* } */
-/* form table.file-list .file-widget .fieldset-wrapper .preview-image + div { */
-/*  margin-top: 0; */
-/*  padding-top: 12px; */
-/* } */
-/* form .table-wrapper + .form-type-managed-file { */
-/*  margin-top: 12px; */
-/* } */
-/* !* No need to display the extra field label as the fieldset legend is enough. *! */
-/* form .field-type-image fieldset .form-type-managed-file > label { */
-/*  display: none; */
-/* } */
-/* form table.file-list .image-widget { */
-/*   border: none; */
-/*   border-left: 1px solid var(--cd-reliefweb-brand-grey--light); */
-/* } */
-
 /* Media widget */
 form .js-media-library-widget .fieldset-wrapper {
   position: relative;
@@ -101,7 +9,6 @@ form .image-widget {
   flex-direction: column;
   flex-wrap: wrap;
   align-items: flex-start;
-  /* border: 1px solid var(--cd-reliefweb-brand-grey--light); */
   padding: 0 16px 16px;
 }
 
diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 33683c62f..b1ce1005b 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -4,9 +4,9 @@
  * This provides basic styling for form elements in the main-content content area.
  */
 /* Todo: remove? */
-form + * {
-  margin-top: 16px;
-}
+/* form + * { */
+/*  margin-top: 16px; */
+/* } */
 form input,
 form label,
 form button,
@@ -95,14 +95,6 @@ form fieldset legend {
   margin: 0;
   padding: 0;
 }
-/* First level form sections. */
-/* form > div > fieldset,
-form > div.form-item,
-form > fieldset,
-form > section {
-  border-top: 1px solid var(--cd-reliefweb-brand-grey--light);
-  padding: 32px 0;
-} */
 form > div > fieldset > legend,
 form > fieldset > legend,
 form > section > h3 {
@@ -272,8 +264,6 @@ form fieldset > legend + a[href="#actions"] {
   font-variant: small-caps;
 }
 form #actions {
-  /* width: auto; */
-  /* min-width: 100%; */
   padding: 0 12px 12px;
   text-align: center;
   border: 1px solid var(--cd-reliefweb-brand-grey--light);
@@ -283,9 +273,6 @@ form #actions {
 form #actions .cd-button {
   margin-top: 12px;
 }
-/* form fieldset + #actions { */
-/*  border-top: none; */
-/* } */
 form #actions + * {
   border-top: none;
 }
@@ -295,16 +282,7 @@ form button:last-child {
 form div.form-actions {
   width: auto;
   min-width: 100%;
-  /* The negative margins are to compensate the button margins. */
-  /* margin: 8px -8px -8px -8px; */
-  /* margin: 0 -8px; */
 }
-/* form #actions div.form-actions { */
-/*  margin-top: -8px; */
-/* } */
-/* form div.form-actions button { */
-/*  margin: 8px; */
-/* } */
 form .form-item + button,
 form button.form-actions {
   margin-top: 16px;
@@ -515,7 +493,3 @@ form button[value="edit"] {
   padding: 8px;
   font-size: 14px;
 }
-
-/* details > summary + .cd-form__item { */
-/*  margin-top: 1.5rem; */
-/* } */
diff --git a/html/themes/custom/common_design_subtheme/components/rw-homepage/rw-homepage.css b/html/themes/custom/common_design_subtheme/components/rw-homepage/rw-homepage.css
index 4d2372d04..653ea4e02 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-homepage/rw-homepage.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-homepage/rw-homepage.css
@@ -6,17 +6,13 @@
  */
 .rw-river--disasters {
   --cd-flow-space: 1rem;
-  /* border-top: 1px solid var(--cd-reliefweb-brand-grey--light); */
 }
 .rw-river--disasters .rw-river-article--disaster {
   position: relative;
-  /* margin: 16px 0 0 0; */
   padding: 0 0 16px;
-  /* border-top: 1px solid var(--cd-reliefweb-brand-grey--light); */
 }
 .rw-river--disasters .rw-river-article--disaster:first-child {
   margin: 0;
-  /* padding: 8px 0 0 0; */
   border-top: none;
 }
 .rw-river--disasters .rw-river-article--disaster .rw-river-article__header {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-key-figures/rw-key-figures.css b/html/themes/custom/common_design_subtheme/components/rw-key-figures/rw-key-figures.css
index 5c7a3ffd2..d207914cb 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-key-figures/rw-key-figures.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-key-figures/rw-key-figures.css
@@ -97,7 +97,6 @@
   content: "";
 }
 
-/* Media queries. */
 @media screen {
   .rw-key-figures ul {
     display: grid;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-local-tasks/rw-local-tasks.css b/html/themes/custom/common_design_subtheme/components/rw-local-tasks/rw-local-tasks.css
index 132105495..9820b439b 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-local-tasks/rw-local-tasks.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-local-tasks/rw-local-tasks.css
@@ -1,7 +1,4 @@
 /* Local tasks */
-.block-local-tasks-block {
-  /* display: table-row; */
-}
 .block-local-tasks-block ul,
 .tabs {
   margin: 0;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
index 4b7491a1f..dcc59cb0f 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
@@ -145,7 +145,6 @@
 }
 .path-moderation .rw-moderation-list .rw-moderation-table tr td:first-child {
   text-align: center;
-  /* white-space: pre; */
 }
 .path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) {
   width: 100%;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-related-content/rw-related-content.css b/html/themes/custom/common_design_subtheme/components/rw-related-content/rw-related-content.css
index c714ac978..821c69cbb 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-related-content/rw-related-content.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-related-content/rw-related-content.css
@@ -11,7 +11,6 @@
 .rw-river--related h2 {
   padding-bottom: 12px;
   border-bottom: 1px solid var(--cd-reliefweb-brand-red--dark);
-  /* margin: 0 0 8px 0; */
   font-size: 24px;
 }
 .rw-river--related article footer {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-river-letter-navigation/rw-river-letter-navigation.css b/html/themes/custom/common_design_subtheme/components/rw-river-letter-navigation/rw-river-letter-navigation.css
index 48342fd3c..9b8bd32dc 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-river-letter-navigation/rw-river-letter-navigation.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-river-letter-navigation/rw-river-letter-navigation.css
@@ -41,11 +41,7 @@
   background: var(--cd-reliefweb-brand-grey--light);
   font-weight: bold;
 }
-/* .js .rw-river-letter-navigation__btn { */
-/*  display: none; */
-/* } */
 
-/* Media query */
 @media screen and (max-width: 479px) {
   .js .rw-river-letter-navigation__btn {
     display: block;
@@ -65,20 +61,6 @@
   [dir="rtl"] .rw-river-letter-navigation__btn[aria-expanded] .cd-icon--arrow-down {
     margin-right: 0.5rem;
   }
-  /* .js .rw-river-letter-navigation__btn:after { */
-  /*  display: inline-block; */
-  /*  overflow: hidden; */
-  /*  width: 9px; */
-  /*  height: 9px; */
-  /*  margin-left: 8px; */
-  /*  content: ""; */
-  /*  vertical-align: middle; */
-  /*  background: url(../../../images/rw-icons-sprite.png) -150px 0 no-repeat; */
-  /*  background: rgba(0, 0, 0, 0) url(../../../images/rw-icons-sprite.svg) -150px 0 no-repeat; */
-  /* } */
-  /* .js .rw-river-letter-navigation__btn[aria-expanded="true"]:after { */
-  /*  background-position-y: -9px; */
-  /* } */
   .js .rw-river-letter-navigation {
     position: absolute;
     z-index: 4;
@@ -88,9 +70,6 @@
     -webkit-box-shadow: 0 0 6px 2px var(--cd-reliefweb-brand-grey--light);
     box-shadow: 0 0 6px 2px var(--cd-reliefweb-brand-grey--light);
   }
-  /* .js .rw-river-letter-navigation[data-hidden="true"] { */
-  /*  display: none; */
-  /* } */
 }
 
 @media screen and (min-width: 480px) {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css b/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css
index 2ad5cee27..2d13e0d15 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css
@@ -1,6 +1,5 @@
 /* Search */
 .rw-river-search {
-  /* margin: -8px 0 32px 0; */
   padding: 0;
   border: none;
 }
diff --git a/html/themes/custom/common_design_subtheme/components/rw-selection/rw-selection.css b/html/themes/custom/common_design_subtheme/components/rw-selection/rw-selection.css
index 08d05e429..ce1421a86 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-selection/rw-selection.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-selection/rw-selection.css
@@ -123,7 +123,6 @@
   padding: 4px 8px;
   word-wrap: break-word;
   background: white;
-  /* @todo review in regards to the standard cd-font sizes. */
   font-size: 15px;
 }
 #main-content [data-selection-messages] .rw-selection [data-value] .message .title {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-site-slogan/rw-site-slogan.css b/html/themes/custom/common_design_subtheme/components/rw-site-slogan/rw-site-slogan.css
index 9e1ad6ff0..0dc98d140 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-site-slogan/rw-site-slogan.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-site-slogan/rw-site-slogan.css
@@ -22,7 +22,7 @@
   text-align: center;
 }
 .cd-header #site-slogan .cd-container > span {
-  /* This is to center vertically the text while staying whithin the defined
+  /* This is to center vertically the text while staying within the defined
    * 50px height. */
   display: table-cell;
   height: 50px;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-social-media-links/rw-social-media-links.css b/html/themes/custom/common_design_subtheme/components/rw-social-media-links/rw-social-media-links.css
index cba1587fd..c806ce831 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-social-media-links/rw-social-media-links.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-social-media-links/rw-social-media-links.css
@@ -9,7 +9,6 @@
   list-style: none;
 }
 .rw-entity-social-media-links li {
-  /* To avoid borders on the next column. */
   display: inline-block;
   margin: 0 0 16px;
   padding: 12px;
@@ -32,19 +31,6 @@
   }
 }
 
-/* External links. Display an icon after the link. */
-.rw-entity-social-media-links--tiles a[target="_blank"][rel~="noopener"]:after {
-  display: inline-block;
-  overflow: hidden;
-  width: 12px;
-  height: 12px;
-  /* The top margin is to have a better vertical alignment. */
-  margin: -2px 0 0 6px;
-  content: "";
-  vertical-align: middle;
-  background: var(--rw-icons--common--external-link--12--dark-blue);
-}
-
 /**
  * Social media links with icons only (ex: report page).
  */
diff --git a/html/themes/custom/common_design_subtheme/components/rw-subscriptions/rw-subscriptions.css b/html/themes/custom/common_design_subtheme/components/rw-subscriptions/rw-subscriptions.css
index 5819e4af2..daa2fa06e 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-subscriptions/rw-subscriptions.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-subscriptions/rw-subscriptions.css
@@ -30,7 +30,6 @@
   opacity: 0;
   font-size: 0;
   line-height: 0;
-  /* mso-hide: all; */
 }
 .header {
   margin-bottom: 20px;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css b/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
index fb3043693..295c8c8be 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
@@ -96,10 +96,6 @@
     padding: 32px 16px 0 0;
     border-bottom: none;
   }
-  /* .rw-sectioned-content .rw-toc ~ section { */
-  /*  padding-top: 32px; */
-  /*  padding-bottom: 32px; */
-  /* } */
   .rw-toc ~ section,
   .rw-toc ~ article,
   .rw-toc ~ fieldset,
@@ -116,11 +112,6 @@
   }
 }
 
-/* Hide the table of content toggler by default. */
-/* .js .rw-toc-toggler { */
-/*  display: none; */
-/* } */
-
 /**
  * Table of contents - javascript enabled.
  *
@@ -147,20 +138,6 @@
   [dir="rtl"] .rw-toc__btn[aria-expanded] .cd-icon--arrow-down {
     margin-right: 0.5rem;
   }
-  /* .js .rw-toc__btn:after { */
-  /*  content: ""; */
-  /*  display: inline-block; */
-  /*  vertical-align: middle; */
-  /*  width: 9px; */
-  /*  height: 9px; */
-  /*  margin-left: 8px; */
-  /*  overflow: hidden; */
-  /*  background: url(../../img/rw-icons-sprite.png) -150px 0 no-repeat; */
-  /*  background: rgba(0,0,0,0) url(../../img/rw-icons-sprite.svg) -150px 0 no-repeat; */
-  /* } */
-  /* .js .rw-toc-toggler[aria-expanded="true"]:after { */
-  /*  background-position-y: -9px; */
-  /* } */
   .js .rw-toc {
     /* display: none; */
     position: absolute;
@@ -179,9 +156,6 @@
     -webkit-box-shadow: 0 0 6px 2px var(--cd-reliefweb-brand-grey--light);
     box-shadow: 0 0 6px 2px var(--cd-reliefweb-brand-grey--light);
   }
-  /* .js .rw-toc[data-hidden="false"] { */
-  /*  display: block; */
-  /* } */
   .js .rw-toc + section,
   .js .rw-toc + article,
   .js .rw-toc + fieldset,
diff --git a/html/themes/custom/common_design_subtheme/components/rw-useful-links/rw-useful-links.css b/html/themes/custom/common_design_subtheme/components/rw-useful-links/rw-useful-links.css
index da48fd56f..2bfd4f640 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-useful-links/rw-useful-links.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-useful-links/rw-useful-links.css
@@ -44,9 +44,9 @@
   margin-top: 24px;
 }
 /* @todo Needed? */
-.rw-entity-useful-links > ul ul + .view-more {
-  margin-top: 24px;
-}
+/* .rw-entity-useful-links > ul ul + .view-more { */
+/*  margin-top: 24px; */
+/* } */
 /* Useful links on 403/404 page */
 .rw-404 .rw-entity-useful-links > ul,
 .rw-403 .rw-entity-useful-links > ul {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-user/rw-user.css b/html/themes/custom/common_design_subtheme/components/rw-user/rw-user.css
index da49d936f..4c9c26532 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-user/rw-user.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-user/rw-user.css
@@ -35,7 +35,6 @@
 }
 .rw-user-dashboard li > * {
   display: inline-block;
-  /* width: 100%; */
 }
 .rw-user-dashboard li + li {
   margin-top: 32px;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-view-more/rw-view-more.css b/html/themes/custom/common_design_subtheme/components/rw-view-more/rw-view-more.css
index 1471ebd84..fe74c456f 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-view-more/rw-view-more.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-view-more/rw-view-more.css
@@ -51,6 +51,6 @@
   float: left;
 }
 /* @todo Is is used anywhere? */
-.view-more li + li {
-  float: right;
-}
+/* .view-more li + li { */
+/*  float: right; */
+/* } */

From c7da176c7602df604bfe18f146411935a2927e0a Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 9 Nov 2021 17:28:40 -0700
Subject: [PATCH 038/720] consistency cubecss cd-flow class name

---
 .../templates/cd/cd-header/cd-search.html.twig                | 2 +-
 .../templates/form/form--community-topics-form.html.twig      | 2 +-
 .../form/form--contact-message-personal-form.html.twig        | 2 +-
 .../templates/form/form--subscription-form.html.twig          | 2 +-
 .../reliefweb_rivers/reliefweb-rivers-river.html.twig         | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/templates/cd/cd-header/cd-search.html.twig b/html/themes/custom/common_design_subtheme/templates/cd/cd-header/cd-search.html.twig
index 0e21dbabc..f2abe3407 100644
--- a/html/themes/custom/common_design_subtheme/templates/cd/cd-header/cd-search.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/cd/cd-header/cd-search.html.twig
@@ -11,7 +11,7 @@
     .addClass('cd-search__form')
   }}>
     <h2 id="site-search-title" class="visually-hidden"><?php rwpt("Content Search"); ?></h2>
-    <form action="/search/results" method="GET" accept-charset="UTF-8" class="cd-flow">
+    <form action="/search/results" method="GET" accept-charset="UTF-8" class="[ cd-flow ]">
       <div class="cd-form__item">
         <label for="site-search-input" class="visually-hidden">{{ 'What are you looking for?'|t }}</label>
         <input {{ create_attribute()
diff --git a/html/themes/custom/common_design_subtheme/templates/form/form--community-topics-form.html.twig b/html/themes/custom/common_design_subtheme/templates/form/form--community-topics-form.html.twig
index 867d832e1..d81168cba 100644
--- a/html/themes/custom/common_design_subtheme/templates/form/form--community-topics-form.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/form/form--community-topics-form.html.twig
@@ -14,6 +14,6 @@
 {{ attach_library('common_design/cd-form') }}
 {{ attach_library('common_design_subtheme/rw-user') }}
 
-<form{{ attributes.addClass('cd-flow cd-form') }}>
+<form{{ attributes.addClass('cd-form [ cd-flow ]') }}>
   {{ children }}
 </form>
diff --git a/html/themes/custom/common_design_subtheme/templates/form/form--contact-message-personal-form.html.twig b/html/themes/custom/common_design_subtheme/templates/form/form--contact-message-personal-form.html.twig
index 867d832e1..d81168cba 100644
--- a/html/themes/custom/common_design_subtheme/templates/form/form--contact-message-personal-form.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/form/form--contact-message-personal-form.html.twig
@@ -14,6 +14,6 @@
 {{ attach_library('common_design/cd-form') }}
 {{ attach_library('common_design_subtheme/rw-user') }}
 
-<form{{ attributes.addClass('cd-flow cd-form') }}>
+<form{{ attributes.addClass('cd-form [ cd-flow ]') }}>
   {{ children }}
 </form>
diff --git a/html/themes/custom/common_design_subtheme/templates/form/form--subscription-form.html.twig b/html/themes/custom/common_design_subtheme/templates/form/form--subscription-form.html.twig
index 867d832e1..d81168cba 100644
--- a/html/themes/custom/common_design_subtheme/templates/form/form--subscription-form.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/form/form--subscription-form.html.twig
@@ -14,6 +14,6 @@
 {{ attach_library('common_design/cd-form') }}
 {{ attach_library('common_design_subtheme/rw-user') }}
 
-<form{{ attributes.addClass('cd-flow cd-form') }}>
+<form{{ attributes.addClass('cd-form [ cd-flow ]') }}>
   {{ children }}
 </form>
diff --git a/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_rivers/reliefweb-rivers-river.html.twig b/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_rivers/reliefweb-rivers-river.html.twig
index 88108ee37..209cb7ff4 100644
--- a/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_rivers/reliefweb-rivers-river.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_rivers/reliefweb-rivers-river.html.twig
@@ -1,6 +1,6 @@
 {% set title_attributes = title_attributes.addClass('cd-block-title') %}
-{% set attributes = attributes.addClass('cd-flow') %}
-{% set river_attributes = river_attributes.addClass('cd-flow') %}
+{% set attributes = attributes.addClass('[ cd-flow ]') %}
+{% set river_attributes = river_attributes.addClass('[ cd-flow ]') %}
 
 {{ attach_library('common_design/cd-block-title') }}
 {{ attach_library('common_design_subtheme/rw-article') }}

From b3933c02c52557b68b65df73239eec03a631ca3b Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 9 Nov 2021 17:29:15 -0700
Subject: [PATCH 039/720] remove comment, no acton taken because too many
 exceptions to warrant

---
 .../common_design_subtheme/components/rw-river/rw-river.css      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-river/rw-river.css b/html/themes/custom/common_design_subtheme/components/rw-river/rw-river.css
index 3642d8e3e..2038fb5f5 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-river/rw-river.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-river/rw-river.css
@@ -1,7 +1,6 @@
 /**
  * Spacing between the sections on a river page.
  *
- * @todo replace with `cd-flow` on the `rw-river-page` parent section?
  */
 .rw-river-page .rw-river-search,
 .rw-river-page .rw-river-letter-navigation-wrapper,

From 91b40c6b7ec8dee8579e75a287467350c92ebcf5 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 10 Nov 2021 08:06:44 -0700
Subject: [PATCH 040/720] adjust button hsl values to reflect RW brand colours

---
 .../components/cd-button/cd-button.css        | 51 +++++++++++++++----
 1 file changed, 40 insertions(+), 11 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/cd-button/cd-button.css b/html/themes/custom/common_design_subtheme/components/cd-button/cd-button.css
index 72b8d9141..4a4c23226 100755
--- a/html/themes/custom/common_design_subtheme/components/cd-button/cd-button.css
+++ b/html/themes/custom/common_design_subtheme/components/cd-button/cd-button.css
@@ -5,30 +5,34 @@
 
   /* Custom properties for IE.
   /* This is needed due to inability to process calc() functions nested within color functions */
+  --cd-ie-primary-color: #1f69b3;
+  --cd-ie-primary-color--light: #82b5e9;
+  --cd-ie-primary-color--dark: #0b2641;
+  --cd-ie-primary-color--lighter: #a8ccf0;
+  --cd-ie-highlight-red: #eb5c6d;
+  --cd-ie-highlight-red--light: #f08995;
+  --cd-primary-color-h: 210;
+  --cd-primary-color-s: 70%;
+  --cd-primary-color-l: 41%;
+
+  /* RW Colours in buttons */
   --cd-ie-primary-color: #0988bb;
   --cd-ie-primary-color--light: #63cef8;
   --cd-ie-primary-color--dark: #032b3a;
-  --cd-ie-primary-color--lighter: #c0ebfc;
+  --cd-ie-primary-color--lighter: #8fdbfa;
+  --cd-ie-highlight-red: #f65c51;
+  --cd-ie-highlight-red--light: #f88981;
   --cd-primary-color-h: 197;
   --cd-primary-color-s: 91%;
   --cd-primary-color-l: 38%;
 
-  /* RW Colours in buttons */
-  /* --cd-ie-primary-color: #055372; */
-  /* --cd-ie-primary-color--light: #19b7f5; */
-  /* --cd-ie-primary-color--dark: #032e40; */
-  /* --cd-ie-primary-color--lighter: #45c5f7; */
-  /* --cd-primary-color-h: 197; */
-  /* --cd-primary-color-s: 92%; */
-  /* --cd-primary-color-l: 23%; */
-
   --cd-primary-color: hsl(var(--cd-primary-color-h), var(--cd-primary-color-s), var(--cd-primary-color-l));
 
   /* lighten */
   --cd-primary-color--light: hsl(var(--cd-primary-color-h), var(--cd-primary-color-s), calc(var(--cd-primary-color-l) + 30%));
 
   /* darken */
-  --cd-primary-color--dark: hsl(var(--cd-primary-color-h), var(--cd-primary-color-s), calc(var(--cd-primary-color-l) - 13%));
+  --cd-primary-color--dark: hsl(var(--cd-primary-color-h), var(--cd-primary-color-s), calc(var(--cd-primary-color-l) - 26%));
 
   /* For cd-button--light */
   /* Change the lightness. Other values remain the same */
@@ -158,3 +162,28 @@
     fill: var(--cd-ie-primary-color--dark);
   }
 }
+
+.cd-button--danger {
+  /* --cd-highlight-red: hsl(4, 90%, 64%) */
+  --cd-primary-color-h: 4;
+  --cd-primary-color-s: 90%;
+  --cd-primary-color-l: 64%;
+  --cd-primary-color: hsl(var(--cd-primary-color-h), var(--cd-primary-color-s), var(--cd-primary-color-l));
+  /* lighten */
+  --cd-primary-color--light: hsl(var(--cd-primary-color-h), var(--cd-primary-color-s), calc(var(--cd-primary-color-l) + 10%));
+}
+
+/* For IE11 */
+@media all and (-ms-high-contrast: none) {
+  .cd-button--danger {
+    background-color: var(--cd-ie-highlight-red);
+  }
+}
+
+/* For IE11 */
+@media all and (-ms-high-contrast: none) {
+  .cd-button--danger:hover,
+  .cd-button--danger:focus {
+    background-color: var(--cd-ie-highlight-red--light);
+  }
+}

From 98384aeaf38bf500e51dbe19c12f932299739e37 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Wed, 10 Nov 2021 16:53:39 +0100
Subject: [PATCH 041/720] Updated docksal

---
 .docksal/docksal.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.docksal/docksal.yml b/.docksal/docksal.yml
index 036878774..6d23a4481 100644
--- a/.docksal/docksal.yml
+++ b/.docksal/docksal.yml
@@ -1,4 +1,5 @@
-version: "2.1"
+version: "3.9"
+
 services:
   # MailHog
   mail:

From 70a78b58e5f1e28cc8fe7c32d5edb6910e46b124 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Wed, 10 Nov 2021 16:57:49 +0100
Subject: [PATCH 042/720] RW-174: User posts

---
 config/core.extension.yml                     |   1 +
 .../src/Form/ModerationPageFilterForm.php     |  13 +-
 .../src/ModerationServiceBase.php             |   9 +-
 .../reliefweb_user_posts.info.yml             |  10 ++
 .../reliefweb_user_posts.links.task.yml       |   5 +
 .../reliefweb_user_posts.permissions.yml      |   6 +
 .../reliefweb_user_posts.routing.yml          |  18 +++
 .../reliefweb_user_posts.services.yml         |   4 +
 .../src/Controller/UserPostsPage.php          | 140 ++++++++++++++++++
 .../src/Services/UserPostsService.php         | 129 ++++++++++++++++
 10 files changed, 329 insertions(+), 6 deletions(-)
 create mode 100644 html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.info.yml
 create mode 100644 html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.links.task.yml
 create mode 100644 html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.permissions.yml
 create mode 100644 html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.routing.yml
 create mode 100644 html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.services.yml
 create mode 100644 html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php
 create mode 100644 html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php

diff --git a/config/core.extension.yml b/config/core.extension.yml
index 096897803..9b02eaaef 100644
--- a/config/core.extension.yml
+++ b/config/core.extension.yml
@@ -61,6 +61,7 @@ module:
   reliefweb_rivers: 0
   reliefweb_subscriptions: 0
   reliefweb_topics: 0
+  reliefweb_user_posts: 0
   reliefweb_utility: 0
   reliefweb_xmlsitemap: 0
   responsive_image: 0
diff --git a/html/modules/custom/reliefweb_moderation/src/Form/ModerationPageFilterForm.php b/html/modules/custom/reliefweb_moderation/src/Form/ModerationPageFilterForm.php
index e80188c09..8dd17a892 100644
--- a/html/modules/custom/reliefweb_moderation/src/Form/ModerationPageFilterForm.php
+++ b/html/modules/custom/reliefweb_moderation/src/Form/ModerationPageFilterForm.php
@@ -241,11 +241,14 @@ public function buildForm(array $form, FormStateInterface $form_state, Moderatio
       '#value' => $this->t('Reset'),
       '#submit' => ['::resetForm'],
     ];
-    $form['actions']['create'] = [
-      '#type' => 'link',
-      '#url' => $create_url,
-      '#title' => $this->t('Create @bundle', ['@bundle' => $bundle]),
-    ];
+
+    if (!empty($bundle)) {
+      $form['actions']['create'] = [
+        '#type' => 'link',
+        '#url' => $create_url,
+        '#title' => $this->t('Create @bundle', ['@bundle' => $bundle]),
+      ];
+    }
 
     // Add the data to be passed to the js scripts (shortcuts etc.).
     $form['content']['#attached'] = [
diff --git a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
index f4d3554c1..b9971c8b9 100644
--- a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
+++ b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
@@ -1125,7 +1125,9 @@ protected function executeQuery(array $filters, $limit = 30) {
     $entity_table_alias = $query->innerJoin($entity_table, $entity_table, "%alias.{$entity_id_field} = cms.content_entity_id");
 
     // Filter for the service entity bundle.
-    $query->condition($entity_table_alias . '.' . $entity_bundle_field, $bundle, '=');
+    if (!empty($bundle)) {
+      $query->condition($entity_table_alias . '.' . $entity_bundle_field, $bundle, '=');
+    }
 
     // Filter the query with the form filters.
     $this->filterQuery($query, $filters);
@@ -1750,6 +1752,11 @@ protected function joinKeyContent(Select $query, array $definition, $entity_type
   protected function joinPostingRights(Select $query, array $definition, $entity_type_id, $entity_base_table, $entity_id_field, $or = FALSE, $values = []) {
     $bundle = $this->getBundle();
 
+    // Skip for empty bundle.
+    if ($bundle === '') {
+      return '';
+    }
+
     // This is only valid for jobs and training. Skip it otherwise.
     if ($bundle !== 'job' && $bundle !== 'training') {
       return '';
diff --git a/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.info.yml b/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.info.yml
new file mode 100644
index 000000000..6e56a1a4c
--- /dev/null
+++ b/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.info.yml
@@ -0,0 +1,10 @@
+type: module
+name: ReliefWeb user posts
+description: 'Provides user posts handling.'
+package: reliefweb
+core_version_requirement: ^9
+dependencies:
+  - drupal:content_moderation
+  - drupal:user
+  - drupal:reliefweb_form
+  - drupal:reliefweb_utility
diff --git a/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.links.task.yml b/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.links.task.yml
new file mode 100644
index 000000000..3d3f59502
--- /dev/null
+++ b/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.links.task.yml
@@ -0,0 +1,5 @@
+reliefweb_user_posts.user:
+  route_name: reliefweb_user_posts.content
+  base_route: entity.user.canonical
+  title: 'My posts'
+  weight: 100
diff --git a/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.permissions.yml b/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.permissions.yml
new file mode 100644
index 000000000..56ca0c3a9
--- /dev/null
+++ b/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.permissions.yml
@@ -0,0 +1,6 @@
+view own posts:
+  title: 'View own posts'
+  description: 'View own posts.'
+view other user posts:
+  title: 'View other user posts'
+  description: 'View other user posts.'
diff --git a/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.routing.yml b/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.routing.yml
new file mode 100644
index 000000000..0da6aca8d
--- /dev/null
+++ b/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.routing.yml
@@ -0,0 +1,18 @@
+reliefweb_user_posts.content:
+  # The parameter is the entity bundle associated to a moderation service.
+  path: '/user/{user}/posts'
+  defaults:
+    _controller: '\Drupal\reliefweb_user_posts\Controller\UserPostsPage::getContent'
+    _title_callback: '\Drupal\reliefweb_user_posts\Controller\UserPostsPage::getPageTitle'
+    service: 'user_posts'
+  options:
+    _admin_route: TRUE
+    parameters:
+      user:
+        type: entity:user
+      service:
+        type: reliefweb_moderation_service
+  requirements:
+    _user_is_logged_in: 'TRUE'
+    _permission: view other user posts
+    user: \d+
diff --git a/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.services.yml b/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.services.yml
new file mode 100644
index 000000000..0273b5dff
--- /dev/null
+++ b/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.services.yml
@@ -0,0 +1,4 @@
+services:
+  reliefweb_moderation.user_posts.moderation:
+    class: Drupal\reliefweb_user_posts\Services\UserPostsService
+    arguments: ['@current_user', '@database', '@date.formatter', '@entity_field.manager', '@entity_type.manager', '@pager.manager', '@pager.parameters', '@request_stack', '@string_translation']
diff --git a/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php b/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php
new file mode 100644
index 000000000..90e3fbc85
--- /dev/null
+++ b/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace Drupal\reliefweb_user_posts\Controller;
+
+use Drupal\reliefweb_moderation\Controller\ModerationPage;
+use Drupal\Core\Form\FormBuilderInterface;
+use Drupal\Core\Form\FormState;
+use Drupal\reliefweb_moderation\ModerationServiceInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Drupal\user\UserInterface;
+
+/**
+ * User posts controller.
+ */
+class UserPostsPage extends ModerationPage {
+
+  /**
+   * The form builder.
+   *
+   * @var \Drupal\Core\Form\FormBuilderInterface
+   */
+  protected $formBuilder;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(FormBuilderInterface $form_builder) {
+    $this->formBuilder = $form_builder;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('form_builder')
+    );
+  }
+
+  /**
+   * Get the page title.
+   *
+   * @param \Drupal\reliefweb_moderation\ModerationServiceInterface $service
+   *   Moderation service.
+   *
+   * @return string|\Drupal\Component\Render\MarkupInterface
+   *   Moderation title.
+   */
+  public function getPageTitle(ModerationServiceInterface $service) {
+    return $this->t('My posts');
+  }
+
+  /**
+   * Get the moderation page content.
+   *
+   * @param \Drupal\user\UserInterface $user
+   *   User accoutn.
+   * @param \Drupal\reliefweb_moderation\ModerationServiceInterface $service
+   *   Moderation service.
+   *
+   * @return array
+   *   Render array.
+   */
+  public function getContent(UserInterface $user, ModerationServiceInterface $service) {
+    // We want the editors to be able to bookmark a moderation page with
+    // a selection of filters so we set the method as GET.
+    $form_state = new FormState();
+    $form_state->addBuildInfo('args', [$service]);
+    $form_state->setMethod('GET');
+    $form_state->setProgrammed(TRUE);
+    $form_state->setProcessInput(TRUE);
+    $form_state->disableCache();
+
+    // Build the filters form.
+    // @todo review the URL parameters and eventually remove the unnecessary
+    // parameters (list can be retrieved with FormState::getCleanValueKeys()).
+    $form = $this->formBuilder
+      ->buildForm('\Drupal\reliefweb_moderation\Form\ModerationPageFilterForm', $form_state);
+
+    // Filter the results.
+    $filters = [];
+    if (!$form_state->getErrors()) {
+      $definitions = $service->getFilterDefinitions();
+
+      $values = $form_state->getValues();
+      $input = $form_state->getUserInput();
+
+      // Status + Other filters.
+      $filters = $values['filters'] ?? [];
+
+      // @todo filter by current user.
+      $filters['author'] = $user->id();
+
+      // Omnibox selections.
+      if (!empty($input['selection'])) {
+        foreach ($input['selection'] as $filter => $items) {
+          if (isset($definitions[$filter]['widget'])) {
+            $widget = $definitions[$filter]['widget'];
+            foreach ($items as $item) {
+              if ($widget === 'search') {
+                $value = $item;
+              }
+              else {
+                list($value,) = explode(':', $item, 2);
+              }
+              // For compatibility with the other type of filters we set the
+              // selected value as key with 1 value to flag it as selected.
+              $filters[$filter][$value] = 1;
+            }
+          }
+        }
+      }
+    }
+
+    return [
+      '#theme' => 'reliefweb_moderation_page',
+      '#filters' => $form,
+      // List of results as a table with a pager.
+      '#list' => $service->getTable($filters, 30),
+    ];
+  }
+
+  /**
+   * Return suggestions for the autocomplete widget on the moderation pages.
+   *
+   * @param \Drupal\reliefweb_moderation\ModerationServiceInterface $service
+   *   Moderation service.
+   * @param string $filter
+   *   Filter name.
+   *
+   * @return \Symfony\Component\HttpFoundation\JsonResponse
+   *   JSON response with the list of suggestions if any.
+   */
+  public function autocomplete(ModerationServiceInterface $service, $filter) {
+    $suggestions = $service->getAutocompleteSuggestions($filter);
+    return new JsonResponse($suggestions);
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
new file mode 100644
index 000000000..d51792a8a
--- /dev/null
+++ b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
@@ -0,0 +1,129 @@
+<?php
+
+namespace Drupal\reliefweb_user_posts\Services;
+
+use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\reliefweb_moderation\EntityModeratedInterface;
+use Drupal\reliefweb_moderation\ModerationServiceBase;
+use Drupal\reliefweb_utility\Helpers\UserHelper;
+
+/**
+ * Moderation service for the report nodes.
+ */
+class UserPostsService extends ModerationServiceBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getBundle() {
+    return '';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getEntityTypeId() {
+    return 'node';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getTitle() {
+    return $this->t('Topics');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getHeaders() {
+    return [
+      'edit' => [
+        'label' => '',
+      ],
+      'data' => [
+        'label' => $this->t('Topic'),
+      ],
+      'date' => [
+        'label' => $this->t('Posted'),
+        'type' => 'property',
+        'specifier' => 'created',
+        'sortable' => TRUE,
+      ],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRows(array $results) {
+    if (empty($results['entities'])) {
+      return [];
+    }
+
+    /** @var \Drupal\reliefweb_moderation\EntityModeratedInterface[] $entities */
+    $entities = $results['entities'];
+
+    // Prepare the table rows' data from the entities.
+    $rows = [];
+    foreach ($entities as $entity) {
+      $cells = [];
+
+      // Edit link + status cell.
+      $cells['edit'] = $this->getEntityEditAndStatusData($entity);
+
+      // Entity data cell.
+      $data = [];
+
+      // Title.
+      $data['title'] = $entity->toLink()->toString();
+
+      // Author information.
+      $info = [];
+      $info['author'] = $this->getEntityAuthorData($entity);
+      $data['info'] = array_filter($info);
+
+      // Revision information.
+      $data['revision'] = $this->getEntityRevisionData($entity);
+
+      // Filter out empty data.
+      $cells['data'] = array_filter($data);
+
+      // Date cell.
+      $cells['date'] = [
+        'date' => $this->getEntityCreationDate($entity),
+      ];
+
+      $rows[] = $cells;
+    }
+
+    return $rows;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function entityAccess(EntityModeratedInterface $entity, $operation = 'view', ?AccountInterface $account = NULL) {
+    // Trello #y0B0wxLi: allow beta tested to view unpublished topics.
+    if ($operation === 'view' && UserHelper::userHasRoles(['beta_tester'], $account)) {
+      return AccessResult::allowed();
+    }
+    return parent::entityAccess($entity, $operation, $account);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function initFilterDefinitions(array $filters = []) {
+    $definitions = parent::initFilterDefinitions([
+      'status',
+      'author',
+      'created',
+      'user_role',
+      'title',
+    ]);
+    return $definitions;
+  }
+
+}

From 4f7eaba7a9b6748d85116a2fc1271afeb1804281 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 10 Nov 2021 09:27:31 -0700
Subject: [PATCH 043/720] split libraries for user posting right/s and add as
 dependency where relevant

---
 .../common_design_subtheme.libraries.yml      |  9 +++++-
 .../rw-user-posting-right.css                 | 31 ++++++++++++++++++
 .../rw-user-posting-rights.css                | 32 -------------------
 3 files changed, 39 insertions(+), 33 deletions(-)
 create mode 100644 html/themes/custom/common_design_subtheme/components/rw-user-posting-right/rw-user-posting-right.css

diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
index fb7461a0e..e45215baa 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
@@ -198,6 +198,7 @@ rw-moderation:
     - common_design_subtheme/rw-datepicker
     - common_design_subtheme/rw-icons
     - common_design_subtheme/rw-selection
+    - common_design_subtheme/rw-user-posting-right
 
 rw-moderation-information:
   css:
@@ -268,6 +269,7 @@ rw-revisions:
   dependencies:
    - common_design_subtheme/rw-icons
    - common_design_subtheme/rw-loading
+   - common_design_subtheme/rw-user-posting-right
 
 rw-river:
   css:
@@ -351,7 +353,12 @@ rw-user-information:
     theme:
       components/rw-user-information/rw-user-information.css: {}
   dependencies:
-   - common_design_subtheme/rw-user-posting-rights
+    - common_design_subtheme/rw-user-posting-right
+
+rw-user-posting-right:
+  css:
+    theme:
+      components/rw-user-posting-right/rw-user-posting-right.css: {}
 
 rw-user-posting-rights:
   css:
diff --git a/html/themes/custom/common_design_subtheme/components/rw-user-posting-right/rw-user-posting-right.css b/html/themes/custom/common_design_subtheme/components/rw-user-posting-right/rw-user-posting-right.css
new file mode 100644
index 000000000..209769d91
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/components/rw-user-posting-right/rw-user-posting-right.css
@@ -0,0 +1,31 @@
+/**
+ * User posting rights.
+ *
+ * Text showing the user posting rights for a source.
+ */
+.rw-user-posting-right {
+  margin-left: 2px;
+  padding: 2px 4px;
+  vertical-align: middle;
+  text-transform: uppercase;
+  border: 1px solid var(--cd-reliefweb-grey--light);
+  background: var(--cd-reliefweb-grey--light--bg);
+  font-size: 10px;
+  font-weight: bold;
+}
+.rw-user-posting-right[data-user-posting-right="blocked"] {
+  border-color: var(--cd-reliefweb-red);
+  background: var(--cd-reliefweb-red--bg);
+}
+.rw-user-posting-right[data-user-posting-right="unverified"] {
+  border-color: var(--cd-reliefweb-orange);
+  background: var(--cd-reliefweb-orange--bg);
+}
+.rw-user-posting-right[data-user-posting-right="allowed"] {
+  border-color: var(--cd-reliefweb-blue);
+  background: var(--cd-reliefweb-blue--bg);
+}
+.rw-user-posting-right[data-user-posting-right="trusted"] {
+  border-color: var(--cd-reliefweb-green);
+  background: var(--cd-reliefweb-green--bg);
+}
diff --git a/html/themes/custom/common_design_subtheme/components/rw-user-posting-rights/rw-user-posting-rights.css b/html/themes/custom/common_design_subtheme/components/rw-user-posting-rights/rw-user-posting-rights.css
index d41fb2738..059ac7ca3 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-user-posting-rights/rw-user-posting-rights.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-user-posting-rights/rw-user-posting-rights.css
@@ -1,35 +1,3 @@
-/**
- * User posting rights.
- *
- * Text showing the user posting rights for a source.
- */
-.rw-user-posting-right {
-  margin-left: 2px;
-  padding: 2px 4px;
-  vertical-align: middle;
-  text-transform: uppercase;
-  border: 1px solid var(--cd-reliefweb-grey--light);
-  background: var(--cd-reliefweb-grey--light--bg);
-  font-size: 10px;
-  font-weight: bold;
-}
-.rw-user-posting-right[data-user-posting-right="blocked"] {
-  border-color: var(--cd-reliefweb-red);
-  background: var(--cd-reliefweb-red--bg);
-}
-.rw-user-posting-right[data-user-posting-right="unverified"] {
-  border-color: var(--cd-reliefweb-orange);
-  background: var(--cd-reliefweb-orange--bg);
-}
-.rw-user-posting-right[data-user-posting-right="allowed"] {
-  border-color: var(--cd-reliefweb-blue);
-  background: var(--cd-reliefweb-blue--bg);
-}
-.rw-user-posting-right[data-user-posting-right="trusted"] {
-  border-color: var(--cd-reliefweb-green);
-  background: var(--cd-reliefweb-green--bg);
-}
-
 /**
  * User posting rights form.
  *

From 9990ff7bb28504b65e5c42da5b02a638c824e9b7 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 10 Nov 2021 09:42:46 -0700
Subject: [PATCH 044/720] correct library

---
 .../reliefweb-moderation-user-posting-right.html.twig           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_moderation/reliefweb-moderation-user-posting-right.html.twig b/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_moderation/reliefweb-moderation-user-posting-right.html.twig
index 8a1658ff0..803a013bc 100644
--- a/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_moderation/reliefweb-moderation-user-posting-right.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_moderation/reliefweb-moderation-user-posting-right.html.twig
@@ -1,4 +1,4 @@
-{{ attach_library('common_design_subtheme/rw-user-posting-rights') }}
+{{ attach_library('common_design_subtheme/rw-user-posting-right') }}
 
 {% set attributes = attributes.addClass('rw-user-posting-right') %}
 

From 4e108f4f05ed1f01b8f691a3a5212200aa548b24 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 10 Nov 2021 10:28:48 -0700
Subject: [PATCH 045/720] remove unneeded rules after testing

---
 .../components/rw-useful-links/rw-useful-links.css           | 5 +----
 .../components/rw-view-more/rw-view-more.css                 | 4 ----
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-useful-links/rw-useful-links.css b/html/themes/custom/common_design_subtheme/components/rw-useful-links/rw-useful-links.css
index 2bfd4f640..66bd46f7e 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-useful-links/rw-useful-links.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-useful-links/rw-useful-links.css
@@ -43,10 +43,7 @@
 .rw-entity-text--resources ul + * {
   margin-top: 24px;
 }
-/* @todo Needed? */
-/* .rw-entity-useful-links > ul ul + .view-more { */
-/*  margin-top: 24px; */
-/* } */
+
 /* Useful links on 403/404 page */
 .rw-404 .rw-entity-useful-links > ul,
 .rw-403 .rw-entity-useful-links > ul {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-view-more/rw-view-more.css b/html/themes/custom/common_design_subtheme/components/rw-view-more/rw-view-more.css
index fe74c456f..8bf4492c2 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-view-more/rw-view-more.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-view-more/rw-view-more.css
@@ -50,7 +50,3 @@
 .view-more li {
   float: left;
 }
-/* @todo Is is used anywhere? */
-/* .view-more li + li { */
-/*  float: right; */
-/* } */

From 1832f6af77f28cf9959ffc53b47ebfeb02967228 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 10 Nov 2021 12:28:03 -0700
Subject: [PATCH 046/720] move article header rule into article component, as
 per todo suggests

---
 .../components/rw-article/rw-article.css      | 23 +++++++++++++++++++
 .../rw-page-title/rw-page-title.css           | 23 -------------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css b/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css
index 203b638b3..1ee9feb2a 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css
@@ -131,3 +131,26 @@
     border-bottom: 1px solid var(--cd-reliefweb-brand-grey--light);
   }
 }
+
+/* Article header and h1.page-title */
+.rw-article__header {
+  width: 100%;
+}
+.rw-article__header--with-icon {
+  position: relative;
+  padding-bottom: 12px;
+  padding-left: 64px;
+  border-bottom: 1px solid var(--cd-reliefweb-brand-red--dark);
+}
+.rw-article__header--with-icon .rw-page-title {
+  padding-bottom: 0;
+  border-bottom: none;
+}
+.rw-article__header--with-meta {
+  padding-bottom: 12px;
+  border-bottom: 1px solid var(--cd-reliefweb-brand-red--dark);
+}
+.rw-article__header--with-meta .rw-page-title {
+  padding-bottom: 8px;
+  border-bottom: none;
+}
diff --git a/html/themes/custom/common_design_subtheme/components/rw-page-title/rw-page-title.css b/html/themes/custom/common_design_subtheme/components/rw-page-title/rw-page-title.css
index f79e687e8..60fd76245 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-page-title/rw-page-title.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-page-title/rw-page-title.css
@@ -5,29 +5,6 @@
   border-bottom: 1px solid var(--cd-reliefweb-brand-red--dark);
 }
 
-/* @todo move that to the rw-article component? Or change class name? */
-.rw-article__header {
-  width: 100%;
-}
-.rw-article__header--with-icon {
-  position: relative;
-  padding-bottom: 12px;
-  padding-left: 64px;
-  border-bottom: 1px solid var(--cd-reliefweb-brand-red--dark);
-}
-.rw-article__header--with-icon .rw-page-title {
-  padding-bottom: 0;
-  border-bottom: none;
-}
-.rw-article__header--with-meta {
-  padding-bottom: 12px;
-  border-bottom: 1px solid var(--cd-reliefweb-brand-red--dark);
-}
-.rw-article__header--with-meta .rw-page-title {
-  padding-bottom: 8px;
-  border-bottom: none;
-}
-
 .rw-403 .rw-page-title,
 .rw-404 .rw-page-title {
   margin-bottom: 24px;

From 34be2916b7d8362f4625e569df9438bc739503bc Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 10 Nov 2021 12:29:21 -0700
Subject: [PATCH 047/720] comment out CD brand variables

---
 .../components/cd-button/cd-button.css        | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/cd-button/cd-button.css b/html/themes/custom/common_design_subtheme/components/cd-button/cd-button.css
index 4a4c23226..6cbe1177d 100755
--- a/html/themes/custom/common_design_subtheme/components/cd-button/cd-button.css
+++ b/html/themes/custom/common_design_subtheme/components/cd-button/cd-button.css
@@ -5,15 +5,15 @@
 
   /* Custom properties for IE.
   /* This is needed due to inability to process calc() functions nested within color functions */
-  --cd-ie-primary-color: #1f69b3;
-  --cd-ie-primary-color--light: #82b5e9;
-  --cd-ie-primary-color--dark: #0b2641;
-  --cd-ie-primary-color--lighter: #a8ccf0;
-  --cd-ie-highlight-red: #eb5c6d;
-  --cd-ie-highlight-red--light: #f08995;
-  --cd-primary-color-h: 210;
-  --cd-primary-color-s: 70%;
-  --cd-primary-color-l: 41%;
+  /* --cd-ie-primary-color: #1f69b3; */
+  /* --cd-ie-primary-color--light: #82b5e9; */
+  /* --cd-ie-primary-color--dark: #0b2641; */
+  /* --cd-ie-primary-color--lighter: #a8ccf0; */
+  /* --cd-ie-highlight-red: #eb5c6d; */
+  /* --cd-ie-highlight-red--light: #f08995; */
+  /* --cd-primary-color-h: 210; */
+  /* --cd-primary-color-s: 70%; */
+  /* --cd-primary-color-l: 41%; */
 
   /* RW Colours in buttons */
   --cd-ie-primary-color: #0988bb;
@@ -25,7 +25,6 @@
   --cd-primary-color-h: 197;
   --cd-primary-color-s: 91%;
   --cd-primary-color-l: 38%;
-
   --cd-primary-color: hsl(var(--cd-primary-color-h), var(--cd-primary-color-s), var(--cd-primary-color-l));
 
   /* lighten */

From 3f475d3304d8d2cb2875363a285ab7be3609039b Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 10 Nov 2021 12:36:31 -0700
Subject: [PATCH 048/720] remove rule and todo after testing

---
 .../common_design_subtheme/components/rw-form/rw-form.css     | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index b1ce1005b..60a70325c 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -3,10 +3,6 @@
  *
  * This provides basic styling for form elements in the main-content content area.
  */
-/* Todo: remove? */
-/* form + * { */
-/*  margin-top: 16px; */
-/* } */
 form input,
 form label,
 form button,

From c37a5fd5c6a5205118f784ed314ba7bd0380fb92 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 10 Nov 2021 12:49:56 -0700
Subject: [PATCH 049/720] remove declarations that are now in base theme
 cd-form component

---
 .../components/rw-form/rw-form--widget.css    | 105 ------------------
 .../components/rw-form/rw-form.css            |   2 +-
 2 files changed, 1 insertion(+), 106 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
index 475377212..a1066da53 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
@@ -1,31 +1,16 @@
 /* Media widget */
 form .js-media-library-widget .fieldset-wrapper {
-  position: relative;
   padding: 8px;
   border: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
 form .image-widget {
-  display: flex;
-  flex-direction: column;
-  flex-wrap: wrap;
-  align-items: flex-start;
   padding: 0 16px 16px;
 }
-
 @media (min-width: 576px) {
   form .image-widget {
-    flex-direction: row;
-    align-items: center;
     justify-content: center;
   }
 }
-form .image-widget article {
-  display: flex;
-  flex: 1 0 auto;
-  flex-direction: column;
-  order: 1;
-}
-
 @media (min-width: 576px) {
   form .image-widget article {
     flex: 1 0 220px;
@@ -33,112 +18,22 @@ form .image-widget article {
 }
 /* File name */
 form .image-widget article > div {
-  margin-bottom: 16px;
   font-size: 14px;
 }
-
 @media (min-width: 576px) {
   form .image-widget article > div {
-    margin-bottom: 0;
     font-size: 14px;
   }
 }
 form .image-widget .js-media-library-item-preview {
   max-width: 220px;
   max-height: 147px;
-  margin: 0 0 16px;
 }
 .node-announcement-form .image-widget .js-media-library-item-preview,
 .node-announcement-edit-form .image-widget .js-media-library-item-preview {
   max-width: 600px;
   max-height: 200px;
 }
-form .image-widget .js-media-library-item-preview img {
-  width: auto;
-  max-width: 100%;
-  height: auto;
-  max-height: 100%;
-  margin: 0 auto;
-}
-form .image-widget .form-submit {
-  order: 2;
-}
-/* Show/Hide media item weight button */
-.js-media-library-widget-toggle-weight {
-  position: absolute;
-  right: 8px;
-  padding: 8px;
-  font-size: 14px;
-}
-/* Media item weight */
-form .image-widget .form-type-number {
-  flex: 0 1 auto;
-  order: 3;
-}
-form .image-widget .form-type-number input {
-  width: 100%;
-}
-
-@media (min-width: 576px) {
-  form .image-widget .form-type-number {
-    flex: 0 1 100px;
-    margin-top: 0;
-    padding: 0 0 0 16px;
-  }
-}
-/* Media library dialog */
-ul.js-media-library-add-form-added-media {
-  margin: 0;
-  padding: 0;
-  list-style-type: none;
-}
-ul.js-media-library-add-form-added-media li {
-  margin: 0;
-  padding: 0;
-}
-.js-media-library-add-form-added-media .form-submit {
-  margin-top: 16px;
-}
-.ui-dialog .ui-dialog-buttonpane button {
-  margin: 0;
-  border-width: 2px;
-  border-color: inherit;
-}
-
-.view-media-library .cd-form--inline,
-.view-media-library .cd-form--inline .cd-form__item {
-  display: block;
-}
-/* File name */
-.view-media-library .field-content article > div {
-  word-wrap: break-word;
-}
-/* Pagination */
-.view-media-library .js-pager__items {
-  margin: 16px 0 0;
-  padding: 0;
-  list-style-type: none;
-}
-.view-media-library .js-pager__items li {
-  display: inline-block;
-  padding: 0 8px 0 0;
-}
-
-/* CD form overrides */
-@media (min-width: 768px) {
-  .view-media-library .cd-form--inline {
-    display: flex;
-    align-items: flex-end;
-    margin-bottom: 1rem;
-  }
-  .view-media-library .cd-form--inline > div {
-    margin-right: 1rem;
-  }
-  .view-media-library .cd-form--inline .cd-form__item {
-    display: flex;
-    flex-direction: column;
-  }
-}
 
 /* Prevent empty divs from taking up space */
 form .js-media-library-widget .js-media-library-selection.form-wrapper,
diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 60a70325c..607c3e949 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -59,7 +59,7 @@ form textarea {
   resize: vertical;
   border: 2px solid var(--cd-reliefweb-brand-grey--light);
   background: white;
-  /* Better readibility similar to paragraphs. */
+  /* Better readability similar to paragraphs. */
   line-height: 1.5;
 }
 form select {

From b3398c05d1f1d868036e3c4940953732e05aa357 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 10 Nov 2021 14:00:53 -0700
Subject: [PATCH 050/720] missing rule from D7 to prevent long URLs from
 breaking layout

---
 .../components/rw-revisions/rw-revisions.css                     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css b/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css
index 2f03e9cde..ee297bd90 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css
@@ -1,6 +1,7 @@
 .rw-revisions-history {
   display: flex;
   flex-direction: column;
+  word-break: break-word;
 }
 .rw-revisions-history__title {
   margin: 0;

From 2928366ba255aaf70fc05c6925906ae6f4723347 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 10 Nov 2021 14:14:31 -0700
Subject: [PATCH 051/720] adjust margin for disable notification checkbox

---
 .../common_design_subtheme/components/rw-form/rw-form.css   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 607c3e949..eece2b956 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -394,6 +394,12 @@ form #edit-organization #edit-field-source-allowed .form-item:last-child {
   margin: 0;
 }
 
+/* Term form Disable Notifications checkbox is inside #actions fieldset */
+form > #actions legend + .form-type-checkbox.form-item-notifications-content-disable,
+.form-item-notifications-content-disable + .form-actions {
+  margin: 0;
+}
+
 /* Field with text that is not wrapped in description div */
 .field--name-body .text-full,
 .field--name-field-how-to-apply .text-full,

From 1faa641c4d4fcf476c00da4cecbf2160f8e7aac1 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 10 Nov 2021 14:34:34 -0700
Subject: [PATCH 052/720] fix comment so it does not break the rule

---
 .../components/rw-autocomplete/rw-autocomplete.css              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-autocomplete/rw-autocomplete.css b/html/themes/custom/common_design_subtheme/components/rw-autocomplete/rw-autocomplete.css
index b6ab9ce28..deb3fa5ae 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-autocomplete/rw-autocomplete.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-autocomplete/rw-autocomplete.css
@@ -63,7 +63,7 @@
 /* List of autocomplete suggestions. */
 .rw-autocomplete-selector {
   position: absolute;
-  /* Ensures the popup is above the content.
+  /* Ensures the popup is above the content. */
   z-index: 120;
   top: 100%;
   left: 0;

From f6585b63ca012ec6688d7c56f8de0b91d9dde90f Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 10 Nov 2021 14:35:02 -0700
Subject: [PATCH 053/720] padding for confirm delete term page

---
 .../common_design_subtheme/components/rw-form/rw-form.css      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index eece2b956..c98c04912 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -449,7 +449,8 @@ form [data-lengthchecker-status="ok"] {
 /* Term forms */
 .taxonomy-term-country-profile-form,
 .taxonomy-term-disaster-profile-form,
-.taxonomy-term-source-user-posting-rights-form {
+.taxonomy-term-source-user-posting-rights-form,
+.taxonomy-term-confirm-form {
   padding-top: 24px;
 }
 

From f35652c83000fcc6f18d18c051d263862c88ffe5 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 10 Nov 2021 15:00:51 -0700
Subject: [PATCH 054/720] add selector to button rule for buttons in field,
 differentiate from main action buttons

---
 .../components/rw-form/rw-form.css              | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index c98c04912..572da8c74 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -12,7 +12,8 @@ form textarea {
   font-size: 16px;
   font-weight: normal;
 }
-form button {
+form button,
+.form-item .cd-button {
   margin: 0 12px 0 0;
   padding: 14px;
   color: white;
@@ -23,10 +24,17 @@ form button {
 }
 form button:hover,
 form button:focus,
-form button:active {
+form button:active,
+.form-item .cd-button:hover,
+.form-item .cd-button:focus,
+.form-item .cd-button:active {
   text-decoration: underline;
   background: var(--cd-reliefweb-brand-red--dark);
 }
+.form-item .cd-button {
+  transition: none;
+  border-radius: 0;
+}
 form input[type="text"],
 form input[type="search"],
 form input[type="password"],
@@ -446,11 +454,12 @@ form [data-lengthchecker-status="ok"] {
 .node-form fieldset.field-new-source-wrapper {
   margin-top: 24px;
 }
-/* Term forms */
+/* Term and Node edit forms */
 .taxonomy-term-country-profile-form,
 .taxonomy-term-disaster-profile-form,
 .taxonomy-term-source-user-posting-rights-form,
-.taxonomy-term-confirm-form {
+.taxonomy-term-confirm-form,
+.node-confirm-form {
   padding-top: 24px;
 }
 

From 26f68d3b573306c990d79f5252bc81062484336a Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 10 Nov 2021 15:57:09 -0700
Subject: [PATCH 055/720] refactor moderation table for font-size to match D7,
 and bold on specific spans

---
 .../rw-moderation/rw-moderation.css           | 45 +++++++++----------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
index dcc59cb0f..8ccabc8c4 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
@@ -116,6 +116,12 @@
   margin: 0 0 24px 0;
   padding: 0;
   text-align: center;
+  font-size: 14px;
+}
+.path-moderation .rw-moderation-content__total-list span {
+  font-size: 14px;
+  line-height: 1.2;
+  display: block;
 }
 .path-moderation .rw-moderation-content__total-list [data-moderation-status] {
   display: inline-block;
@@ -130,11 +136,6 @@
   background: none;
   font-weight: normal;
 }
-.path-moderation .rw-moderation-content__total-list [data-moderation-status] * {
-  display: block;
-  font-size: 16px;
-  line-height: 1.2;
-}
 .path-moderation .rw-moderation-content__total-list [data-moderation-status] strong {
   margin-top: 8px;
 }
@@ -150,28 +151,18 @@
   width: 100%;
   word-break: break-word;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) > * {
-  margin: 0;
-  padding: 0;
-  font-size: 14px;
-  line-height: 1.5;
-}
 .path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) div + div {
   margin-top: 4px;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) .rw-moderation-table__cell__title {
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__title {
   font-size: 16px;
   font-weight: bold;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) .headline-title {
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__info {
   font-size: 15px;
-  font-style: italic;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) .rw-moderation-table__cell__info {
-  font-size: 15px;
-}
-.path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) .rw-moderation-table__cell__info .rw-moderation-table__cell__info__country a,
-.path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) .rw-moderation-table__cell__details .rw-moderation-table__cell__info__source a {
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__info .rw-moderation-table__cell__info__country a,
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__info .rw-moderation-table__cell__info__source a {
   color: var(--cd-reliefweb-brand-grey--dark);
   font-weight: bold;
 }
@@ -179,14 +170,20 @@
   margin-top: 12px;
   font-size: 15px;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) .closing-date {
-  font-weight: bold;
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__datails,
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__revision {
+  font-size: 14px;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) .dates,
-.path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) .cost {
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__datails__closing-date,
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__datails__registration-deadline,
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__datails__training-date,
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__datails__cost {
   font-weight: bold;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) .value {
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__datails__closing-date em,
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__datails__registration-deadline em,
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__datails__training-date em,
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__datails__cost em {
   font-weight: normal;
 }
 .path-moderation .rw-moderation-list .rw-moderation-table__cell__date {

From 2b8a3ba8a350514b981219fe151c4a35cde1a42c Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 10 Nov 2021 16:04:09 -0700
Subject: [PATCH 056/720] display spans inline

---
 .../components/rw-selection/rw-selection.css                 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-selection/rw-selection.css b/html/themes/custom/common_design_subtheme/components/rw-selection/rw-selection.css
index ce1421a86..e8ea9e81d 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-selection/rw-selection.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-selection/rw-selection.css
@@ -34,8 +34,13 @@
   /* Better readability. */
   line-height: 24px;
 }
+.rw-selection [data-value] > span {
+  display: inline-block;
+}
 .rw-selection [data-value] .label {
   font-weight: bold;
+  color: var(--cd-reliefweb-brand-grey--dark);
+  margin-left: 0.25rem;
 }
 .rw-selection [data-value] button {
   position: absolute;

From 6c4a1c4292a5c1078890f70732d4435b58e71be7 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 10 Nov 2021 16:05:18 -0700
Subject: [PATCH 057/720] linting

---
 .../components/rw-form/rw-form--widget.css                    | 3 +++
 .../components/rw-moderation/rw-moderation.css                | 2 +-
 .../components/rw-selection/rw-selection.css                  | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
index a1066da53..7d572d083 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
@@ -6,11 +6,13 @@ form .js-media-library-widget .fieldset-wrapper {
 form .image-widget {
   padding: 0 16px 16px;
 }
+
 @media (min-width: 576px) {
   form .image-widget {
     justify-content: center;
   }
 }
+
 @media (min-width: 576px) {
   form .image-widget article {
     flex: 1 0 220px;
@@ -20,6 +22,7 @@ form .image-widget {
 form .image-widget article > div {
   font-size: 14px;
 }
+
 @media (min-width: 576px) {
   form .image-widget article > div {
     font-size: 14px;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
index 8ccabc8c4..f1540a999 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
@@ -119,9 +119,9 @@
   font-size: 14px;
 }
 .path-moderation .rw-moderation-content__total-list span {
+  display: block;
   font-size: 14px;
   line-height: 1.2;
-  display: block;
 }
 .path-moderation .rw-moderation-content__total-list [data-moderation-status] {
   display: inline-block;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-selection/rw-selection.css b/html/themes/custom/common_design_subtheme/components/rw-selection/rw-selection.css
index e8ea9e81d..2c8d538a6 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-selection/rw-selection.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-selection/rw-selection.css
@@ -38,9 +38,9 @@
   display: inline-block;
 }
 .rw-selection [data-value] .label {
-  font-weight: bold;
-  color: var(--cd-reliefweb-brand-grey--dark);
   margin-left: 0.25rem;
+  color: var(--cd-reliefweb-brand-grey--dark);
+  font-weight: bold;
 }
 .rw-selection [data-value] button {
   position: absolute;

From aa3a76749dc50f64913fda61b5e8cff7d9d667a6 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 11 Nov 2021 15:55:34 +0900
Subject: [PATCH 058/720] [RW-25] WIP - add reliefweb_docstore module with file
 widget

---
 .../custom/reliefweb_docstore/README.md       |   5 +
 .../install/reliefweb_docstore.settings.yml   |   6 +
 .../schema/reliefweb_docstore.schema.yml      |  13 +
 .../reliefweb_docstore.info.yml               |   5 +
 .../reliefweb_docstore.libraries.yml          |   0
 .../reliefweb_docstore.module                 |  76 ++
 .../reliefweb_docstore.permissions.yml        |   3 +
 .../reliefweb_docstore.routing.yml            |   0
 .../reliefweb_docstore.services.yml           |   8 +
 .../src/Controller/FileDownloadController.php | 135 +++
 .../ImageStyleDownloadController.php          | 249 ++++++
 .../Field/FieldFormatter/ReliefWebFile.php    |  45 +
 .../Plugin/Field/FieldType/ReliefWebFile.php  | 823 ++++++++++++++++++
 .../Field/FieldWidget/ReliefWebFile.php       | 631 ++++++++++++++
 .../src/Routing/RouteSubscriber.php           |  28 +
 .../src/Services/DocstoreClient.php           | 235 +++++
 .../reliefweb-file-widget-item.html.twig      |  45 +
 .../templates/reliefweb-file-widget.html.twig |  29 +
 18 files changed, 2336 insertions(+)
 create mode 100644 html/modules/custom/reliefweb_docstore/README.md
 create mode 100644 html/modules/custom/reliefweb_docstore/config/install/reliefweb_docstore.settings.yml
 create mode 100644 html/modules/custom/reliefweb_docstore/config/schema/reliefweb_docstore.schema.yml
 create mode 100644 html/modules/custom/reliefweb_docstore/reliefweb_docstore.info.yml
 create mode 100644 html/modules/custom/reliefweb_docstore/reliefweb_docstore.libraries.yml
 create mode 100644 html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
 create mode 100644 html/modules/custom/reliefweb_docstore/reliefweb_docstore.permissions.yml
 create mode 100644 html/modules/custom/reliefweb_docstore/reliefweb_docstore.routing.yml
 create mode 100644 html/modules/custom/reliefweb_docstore/reliefweb_docstore.services.yml
 create mode 100644 html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php
 create mode 100644 html/modules/custom/reliefweb_docstore/src/Controller/ImageStyleDownloadController.php
 create mode 100644 html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldFormatter/ReliefWebFile.php
 create mode 100644 html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
 create mode 100644 html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
 create mode 100644 html/modules/custom/reliefweb_docstore/src/Routing/RouteSubscriber.php
 create mode 100644 html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php
 create mode 100644 html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget-item.html.twig
 create mode 100644 html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget.html.twig

diff --git a/html/modules/custom/reliefweb_docstore/README.md b/html/modules/custom/reliefweb_docstore/README.md
new file mode 100644
index 000000000..16a9c3ab9
--- /dev/null
+++ b/html/modules/custom/reliefweb_docstore/README.md
@@ -0,0 +1,5 @@
+ReliefWeb Docstore
+==================
+
+This modules provides integration with the OCHA Document Store (docstore) to
+handle report attachments.
diff --git a/html/modules/custom/reliefweb_docstore/config/install/reliefweb_docstore.settings.yml b/html/modules/custom/reliefweb_docstore/config/install/reliefweb_docstore.settings.yml
new file mode 100644
index 000000000..a849e8607
--- /dev/null
+++ b/html/modules/custom/reliefweb_docstore/config/install/reliefweb_docstore.settings.yml
@@ -0,0 +1,6 @@
+# The URL of the OCHA docstore.
+docstore_url: ''
+# The API key for the OCHA docstore provider.
+api_key: ''
+# The prefix used when creating new content (ex: reliefweb_reports).
+prefix: 'reliefweb_'
diff --git a/html/modules/custom/reliefweb_docstore/config/schema/reliefweb_docstore.schema.yml b/html/modules/custom/reliefweb_docstore/config/schema/reliefweb_docstore.schema.yml
new file mode 100644
index 000000000..c5c0b9fc0
--- /dev/null
+++ b/html/modules/custom/reliefweb_docstore/config/schema/reliefweb_docstore.schema.yml
@@ -0,0 +1,13 @@
+reliefweb_docstore.settings:
+  type: config_object
+  label: 'ReliefWeb Docstore settings'
+  mapping:
+    docstore_url:
+      type: string
+      label: 'The URL of the OCHA docstore.'
+    api_key:
+      type: string
+      label: 'The API key for the OCHA docstore provider.'
+    prefix:
+      type: string
+      label: 'The prefix used when creating new content (ex: reliefweb_reports).'
diff --git a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.info.yml b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.info.yml
new file mode 100644
index 000000000..4985c8813
--- /dev/null
+++ b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.info.yml
@@ -0,0 +1,5 @@
+type: module
+name: ReliefWeb Docstore
+description: 'Provides integration with the OCHA Document Store.'
+package: reliefweb
+core_version_requirement: ^9
diff --git a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.libraries.yml b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.libraries.yml
new file mode 100644
index 000000000..e69de29bb
diff --git a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
new file mode 100644
index 000000000..efa6e3c8d
--- /dev/null
+++ b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
@@ -0,0 +1,76 @@
+<?php
+
+/**
+ * @file
+ * ReliefWeb Docstore module file.
+ */
+
+/**
+ * Implements hook_theme().
+ */
+function reliefweb_docstore_theme() {
+  return [
+    'reliefweb_file_widget' => [
+      'render element' => 'element',
+    ],
+    'reliefweb_file_widget_item' => [
+      'render element' => 'element',
+    ],
+  ];
+}
+
+/**
+ * Implemenents hook_preprocess_HOOK() for "reliefweb_file_widget".
+ */
+function reliefweb_docstore_preprocess_reliefweb_file_widget(&$variables) {
+  $element = &$variables['element'];
+
+  if (!isset($element['#attributes'])) {
+    $element['#attributes'] = [];
+  }
+
+  if (!isset($element['#attributes']['id']) && isset($element['#id'])) {
+    $element['#attributes']['id'] = $element['#id'];
+  }
+
+  if (isset($element['#attributes']['id'])) {
+    drupal_attach_tabledrag($element, [
+      'table_id' => $element['#attributes']['id'] . '-table',
+      'action' => 'order',
+      'relationship' => 'sibling',
+      'group' => 'draggable-weight',
+    ]);
+  }
+
+  $variables['attributes'] = $element['#attributes'];
+}
+
+/**
+ * Implemenents hook_preprocess_HOOK() for "reliefweb_file_widget_item".
+ */
+function reliefweb_docstore_preprocess_reliefweb_file_widget_item(&$variables) {
+  $element = &$variables['element'];
+
+  if (!isset($element['#attributes'])) {
+    $element['#attributes'] = [];
+  }
+
+  if (isset($element['weight'])) {
+    $element['weight']['#attributes']['class'][] = 'draggable-weight';
+  }
+}
+
+/**
+ * Implemenents hook_preprocess_HOOK() for "image_style".
+ */
+function reliefweb_docstore_preprocess_image_style(&$variables) {
+  // Workaround to prevent the browser from caching the derivative when
+  // renderd in the form for example, so that it always get the fresh one
+  // when the image is regenerated.
+  if (isset($variables['image']['#attributes']['data-no-cache'])) {
+    $uri = $variables['image']['#uri'];
+    $uri .= (strpos($uri, '?') !== FALSE ? '&' : '?') . microtime(TRUE);
+    $variables['image']['#uri'] = $uri;
+    unset($variables['image']['#attributes']['data-no-cache']);
+  }
+}
diff --git a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.permissions.yml b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.permissions.yml
new file mode 100644
index 000000000..97ba2004f
--- /dev/null
+++ b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.permissions.yml
@@ -0,0 +1,3 @@
+access reliefweb private files:
+  title: 'Access ReliefWeb private files'
+  description: 'Allow users to access the ReliefWeb private files.'
diff --git a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.routing.yml b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.routing.yml
new file mode 100644
index 000000000..e69de29bb
diff --git a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.services.yml b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.services.yml
new file mode 100644
index 000000000..61b09587f
--- /dev/null
+++ b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.services.yml
@@ -0,0 +1,8 @@
+services:
+  reliefweb_docstore.client:
+    class: Drupal\reliefweb_docstore\Services\DocstoreClient
+    arguments: ['@config.factory', '@http_client', '@logger.factory']
+  reliefweb_docstore.route_subscriber:
+    class: Drupal\reliefweb_docstore\Routing\RouteSubscriber
+    tags:
+      - { name: event_subscriber }
diff --git a/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php b/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php
new file mode 100644
index 000000000..364034bae
--- /dev/null
+++ b/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php
@@ -0,0 +1,135 @@
+<?php
+
+namespace Drupal\reliefweb_docstore\Controller;
+
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Session\AccountProxyInterface;
+use Drupal\Core\StreamWrapper\StreamWrapperManagerInterface;
+use Drupal\system\FileDownloadController as OriginalFileDownloadController;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+/**
+ * System file controller.
+ */
+class FileDownloadController extends OriginalFileDownloadController {
+
+  /**
+   * The current user.
+   *
+   * @var \Drupal\Core\Session\AccountProxyInterface
+   */
+  protected $currentUser;
+
+  /**
+   * The entity type manager service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * FileDownloadController constructor.
+   *
+   * @param \Drupal\Core\Session\AccountProxyInterface $current_user
+   *   The current user.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager service.
+   * @param \Drupal\Core\StreamWrapper\StreamWrapperManagerInterface $stream_wrapper_manager
+   *   The stream wrapper manager.
+   */
+  public function __construct(
+    AccountProxyInterface $current_user,
+    EntityTypeManagerInterface $entity_type_manager,
+    StreamWrapperManagerInterface $stream_wrapper_manager
+  ) {
+    parent::__construct($stream_wrapper_manager);
+
+    $this->currentUser = $current_user;
+    $this->entityTypeManager = $entity_type_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('current_user'),
+      $container->get('entity_type.manager'),
+      $container->get('stream_wrapper_manager')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function download(Request $request, $scheme = 'private') {
+    // Public files don't need special here handling so we default to the parent
+    // download controller.
+    if ($scheme !== 'private') {
+      return parent::download($request, $scheme);
+    }
+
+    $uri = $scheme . '://' . $request->query->get('file');
+
+    // @todo use a config setting for the attachments/previews path.
+    $pattern = '#^private://(?:attachments|previews)/([a-z0-9]{2})/([a-z0-9]{2})/\1\2[a-z0-9-]{32}\.#';
+
+    // Let other modules handle the file if it's not a file matching the pattern
+    // used for the reliefweb files.
+    if (preg_match($pattern, $uri) !== 1) {
+      return parent::download($request, $scheme);
+    }
+
+    // Deny access if the user doesn't have the proper permission.
+    if (!$this->currentUser->hasPermission('access reliefweb private files')) {
+      throw new AccessDeniedHttpException();
+    }
+
+    /** @var \Drupal\file\FileInterface $file */
+    $file = $this->loadFileFromUri($uri);
+    if (!isset($file)) {
+      throw new NotFoundHttpException();
+    }
+
+    // Retrieve the file headers and return the file content.
+    // @todo review if we should disable the cache altogether.
+    $headers = file_get_content_headers($file);
+    if (!empty($headers)) {
+      return new BinaryFileResponse($uri, 200, $headers, FALSE);
+    }
+
+    throw new NotFoundHttpException();
+  }
+
+  /**
+   * Load a file from its URI.
+   *
+   * @param string $uri
+   *   File URI.
+   *
+   * @return \Drupal\file\Entity\File|null
+   *   File entity or NULL if none was found.
+   */
+  protected function loadFileFromUri($uri) {
+    /** @var \Drupal\file\FileInterface[] $files */
+    $files = $this->entityTypeManager
+      ->getStorage('file')
+      ->loadByProperties(['uri' => $uri]);
+
+    if (!empty($files)) {
+      foreach ($files as $file) {
+        // Ensure it was a case sensitive match.
+        if ($file->getFileUri() === $uri) {
+          return $file;
+        }
+      }
+    }
+
+    return NULL;
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_docstore/src/Controller/ImageStyleDownloadController.php b/html/modules/custom/reliefweb_docstore/src/Controller/ImageStyleDownloadController.php
new file mode 100644
index 000000000..7b11bcf3c
--- /dev/null
+++ b/html/modules/custom/reliefweb_docstore/src/Controller/ImageStyleDownloadController.php
@@ -0,0 +1,249 @@
+<?php
+
+namespace Drupal\reliefweb_docstore\Controller;
+
+use Drupal\Component\Utility\Crypt;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\File\FileSystemInterface;
+use Drupal\Core\Image\ImageFactory;
+use Drupal\Core\Lock\LockBackendInterface;
+use Drupal\Core\Session\AccountProxyInterface;
+use Drupal\Core\StreamWrapper\StreamWrapperManagerInterface;
+use Drupal\image\Controller\ImageStyleDownloadController as OriginalImageStyleDownloadController;
+use Drupal\image\ImageStyleInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException;
+
+/**
+ * Defines a controller to serve image styles.
+ */
+class ImageStyleDownloadController extends OriginalImageStyleDownloadController {
+
+  /**
+   * The current user.
+   *
+   * @var \Drupal\Core\Session\AccountProxyInterface
+   */
+  protected $currentUser;
+
+  /**
+   * The entity type manager service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * Constructs an ImageStyleDownloadController object.
+   *
+   * @param \Drupal\Core\Session\AccountProxyInterface $current_user
+   *   The current user.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager service.
+   * @param \Drupal\Core\Lock\LockBackendInterface $lock
+   *   The lock backend.
+   * @param \Drupal\Core\Image\ImageFactory $image_factory
+   *   The image factory.
+   * @param \Drupal\Core\StreamWrapper\StreamWrapperManagerInterface $stream_wrapper_manager
+   *   The stream wrapper manager.
+   * @param \Drupal\Core\File\FileSystemInterface $file_system
+   *   The file system service.
+   */
+  public function __construct(
+    AccountProxyInterface $current_user,
+    EntityTypeManagerInterface $entity_type_manager,
+    LockBackendInterface $lock,
+    ImageFactory $image_factory,
+    StreamWrapperManagerInterface $stream_wrapper_manager,
+    FileSystemInterface $file_system = NULL,
+  ) {
+    parent::__construct($lock, $image_factory, $stream_wrapper_manager, $file_system);
+
+    $this->currentUser = $current_user;
+    $this->entityTypeManager = $entity_type_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('current_user'),
+      $container->get('entity_type.manager'),
+      $container->get('lock'),
+      $container->get('image.factory'),
+      $container->get('stream_wrapper_manager'),
+      $container->get('file_system')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function deliver(Request $request, $scheme, ImageStyleInterface $image_style) {
+    if (empty($image_style)) {
+      throw new NotFoundHttpException();
+    }
+
+    // This is normally the URI of the source image.
+    $uri = $scheme . '://' . $request->query->get('file');
+
+    // @todo use a config setting for the attachments/previews path.
+    $pattern = '#^(?:private|public)://(?:attachments|previews)/([a-z0-9]{2})/([a-z0-9]{2})/\1\2[a-z0-9-]{32}\.#';
+
+    // Let other modules handle the file if it's not a file matching the pattern
+    // used for the reliefweb files.
+    if (preg_match($pattern, $uri) !== 1) {
+      return parent::download($request, $scheme);
+    }
+
+    // Check the image token. We return a 404 as it's more likely to be cached
+    // than a 403 and the token is just of DDOS protection and chacking helps
+    // as well with that.
+    if (!$this->validateToken($request, $uri, $image_style)) {
+      throw new NotFoundHttpException();
+    }
+
+    // Deny access if the user doesn't have the proper permission.
+    if ($scheme === 'private' && !$this->currentUser->hasPermission('access reliefweb private files')) {
+      throw new AccessDeniedHttpException();
+    }
+
+    // Get the deriative image URI.
+    $derivative_uri = $image_style->buildUri($uri);
+
+    // Generate the derivative image if doesn't exist.
+    if (!file_exists($derivative_uri)) {
+      // Retrieve the source image to generate the derivative.
+      $uri = $this->getSourceImageUri($uri, $derivative_uri);
+      if (empty($uri)) {
+        throw new NotFoundHttpException('Error generating image, missing source file.');
+      }
+
+      // Generate the derivative image.
+      if (!$this->generateDerivative($uri, $derivative_uri, $image_style)) {
+        $this->logger->notice('Unable to generate the derived image located at %path.', [
+          '%path' => $derivative_uri,
+        ]);
+        return new Response('Error generating image.', 500);
+      }
+    }
+
+    // Get the image object for the derivative image so we can generate the
+    // response headers.
+    $image = $this->imageFactory->get($derivative_uri);
+    $headers = [
+      'Content-Type' => $image->getMimeType(),
+      'Content-Length' => $image->getFileSize(),
+      // No caching so that the new derivative image can be returned when the
+      // base image is changed.
+      'Cache-Control' => 'private',
+      'Last-Modified' => gmdate('F d Y H:i:s.', filemtime($derivative_uri)),
+    ];
+
+    return new BinaryFileResponse($image->getSource(), 200, $headers, TRUE);
+  }
+
+  /**
+   * Validate the request token used for DDOS prevention.
+   *
+   * @param \Symfony\Component\HttpFoundation\Request $request
+   *   Request.
+   * @param string $uri
+   *   Image URI extracted from the request.
+   * @param \Drupal\image\ImageStyleInterface $image_style
+   *   Image style.
+   *
+   * @return bool
+   *   TRUE if the token was valid.
+   */
+  protected function validateToken(Request $request, $uri, ImageStyleInterface $image_style) {
+    return $this->config('image.settings')->get('allow_insecure_derivatives') ||
+      hash_equals($image_style->getPathToken($uri), $request->query->get(IMAGE_DERIVATIVE_TOKEN, ''));
+  }
+
+  /**
+   * Get the source image URI.
+   *
+   * @param string $uri
+   *   Image URI extracted from the request.
+   * @param string $derivative_uri
+   *   Derivative image URI.
+   *
+   * @return string
+   *   Image source URI or empty if the source image doesn't exist.
+   */
+  protected function getSourceImageUri($uri, $derivative_uri) {
+    if (file_exists($uri)) {
+      return $uri;
+    }
+
+    // If the image style converted the extension, it has been added to the
+    // original file, resulting in filenames like image.png.jpeg. So to find
+    // the actual source image, we remove the extension and check if that
+    // image exists.
+    $path_info = pathinfo($this->streamWrapperManager->getTarget($uri));
+    $scheme = $this->streamWrapperManager->getScheme($derivative_uri);
+    $converted_uri = $scheme . '://' . $path_info['dirname'] . '/' . $path_info['filename'];
+
+    if (file_exists($converted_uri)) {
+      return $converted_uri;
+    }
+
+    $this->logger->notice('Source image at %uri not found while trying to generate derivative image at %derivative_uri.', [
+      '%uri' => $uri,
+      '%derivative_uri' => $derivative_uri,
+    ]);
+
+    return '';
+  }
+
+  /**
+   * Generate a derivative image.
+   *
+   * @param string $uri
+   *   Source image URI.
+   * @param string $derivative_uri
+   *   Derivatie image URI.
+   * @param \Drupal\image\ImageStyleInterface $image_style
+   *   Image style.
+   *
+   * @return bool
+   *   TRUE if the derivative could be generated.
+   *
+   * @throws \Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException
+   *   503 Service unavailable with a 3 seconds retry-after header.
+   */
+  protected function generateDerivative($uri, $derivative_uri, ImageStyleInterface $image_style) {
+    // Skip if the derivative image exists (for example if it was just created
+    // by another thread.
+    if (file_exists($derivative_uri)) {
+      return TRUE;
+    }
+
+    $lock_name = 'image_style_deliver:' . $image_style->id() . ':' . Crypt::hashBase64($uri);
+    $lock_acquired = $this->lock->acquire($lock_name);
+
+    // If we cannot acquire the lock, then it means than the derivative image
+    // is being generated. We tell the client to retry in 3 seconds.
+    if (!$lock_acquired) {
+      throw new ServiceUnavailableHttpException(3, 'Image generation in progress. Try again shortly.');
+    }
+
+    // Try to generate the image, unless another thread just did it while we
+    // were acquiring the lock.
+    $success = file_exists($derivative_uri) || $image_style->createDerivative($uri, $derivative_uri);
+
+    if (!empty($lock_acquired)) {
+      $this->lock->release($lock_name);
+    }
+
+    return $success;
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldFormatter/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldFormatter/ReliefWebFile.php
new file mode 100644
index 000000000..184b29a4f
--- /dev/null
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldFormatter/ReliefWebFile.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Drupal\reliefweb_docstore\Plugin\Field\FieldFormatter;
+
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Field\FormatterBase;
+use Drupal\Core\Url;
+
+/**
+ * Plugin implementation of the 'reliefweb_file' formatter.
+ *
+ * @FieldFormatter(
+ *   id = "reliefweb_file",
+ *   label = @Translation("ReliefWeb File"),
+ *   field_types = {
+ *     "reliefweb_file"
+ *   }
+ * )
+ */
+class ReliefWebFile extends FormatterBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function viewElements(FieldItemListInterface $items, $langcode) {
+    // Simple link for active elements.
+    $links = [];
+    foreach ($items as $item) {
+      // DEBUG.
+      $url = 'https://docstore.test/files/' . $item->get('uuid')->getValue();
+
+      $links[] = [
+        'title' => $item->get('filename')->getValue(),
+        'url' => Url::fromUri($url),
+      ];
+    }
+
+    // Reverse the links to have the most recent a the beginning.
+    return [
+      '#theme' => 'links',
+      '#links' => array_reverse($links),
+    ];
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
new file mode 100644
index 000000000..5cb14d3e2
--- /dev/null
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
@@ -0,0 +1,823 @@
+<?php
+
+namespace Drupal\reliefweb_docstore\Plugin\Field\FieldType;
+
+use Drupal\Component\Utility\Random;
+use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\Core\Field\FieldItemBase;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
+use Drupal\Core\TypedData\DataDefinition;
+use Drupal\Core\Url;
+use Drupal\file\Entity\File;
+
+/**
+ * Plugin implementation of the 'reliefweb_file' field type.
+ *
+ * @FieldType(
+ *   id = "reliefweb_file",
+ *   label = @Translation("ReliefWeb File"),
+ *   description = @Translation("File field with OCHA docstore backend"),
+ *   category = @Translation("ReliefWeb"),
+ *   default_widget = "reliefweb_file",
+ *   default_formatter = "reliefweb_file",
+ *   cardinality = -1,
+ * )
+ */
+class ReliefWebFile extends FieldItemBase {
+
+  /**
+   * The entity repository service.
+   *
+   * @var \Drupal\Core\Entity\EntityRepositoryInterface
+   */
+  protected $entityRepository;
+
+  /**
+   * The file system service.
+   *
+   * @var \Drupal\Core\File\FileSystemInterface
+   */
+  protected $fileSystem;
+
+  /**
+   * The docstore client service.
+   *
+   * @var \Drupal\reliefweb_docstore\Services\DocstoreClient
+   */
+  protected $docstoreClient;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function mainPropertyName() {
+    return 'uuid';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
+    // The UUID of the docstore resource.
+    $properties['uuid'] = DataDefinition::create('string')
+      ->setLabel(new TranslatableMarkup('File UUID'))
+      ->setDescription(new TranslatableMarkup('The UUID of the docstore resource.'))
+      ->setRequired(TRUE);
+
+    // The ID of the file revision.
+    $properties['revision_id'] = DataDefinition::create('integer')
+      ->setLabel(new TranslatableMarkup('File revision ID'))
+      ->setDescription(new TranslatableMarkup('The ID of the file revision.'))
+      ->setRequired(TRUE);
+
+    // The status of the file: private or public.
+    $properties['status'] = DataDefinition::create('boolean')
+      ->setLabel(new TranslatableMarkup('Status'))
+      ->setDescription(new TranslatableMarkup('Whether the file is private or public.'))
+      ->setRequired(TRUE);
+
+    // The name of the file as uploaded.
+    $properties['file_name'] = DataDefinition::create('string')
+      ->setLabel(new TranslatableMarkup('File Name'))
+      ->setDescription(new TranslatableMarkup('The file name as uploaded.'))
+      ->setRequired(TRUE);
+
+    // The mime type of the field.
+    $properties['file_mime'] = DataDefinition::create('string')
+      ->setLabel(new TranslatableMarkup('File Mime'))
+      ->setDescription(new TranslatableMarkup('The file mime type.'))
+      ->setRequired(TRUE);
+
+    // The size (in bytes) of the field.
+    $properties['file_size'] = DataDefinition::create('integer')
+      ->setLabel(new TranslatableMarkup('File Size'))
+      ->setDescription(new TranslatableMarkup('The file size in bytes.'))
+      ->setRequired(TRUE);
+
+    // The ISO 639-1 code of the main language of the file content.
+    $properties['language'] = DataDefinition::create('string')
+      ->setLabel(new TranslatableMarkup('Language'))
+      ->setDescription(new TranslatableMarkup('The ISO 639-1 code of the main language of the file content.'))
+      ->setRequired(FALSE);
+
+    // Brief description of the file (ex: label).
+    $properties['description'] = DataDefinition::create('string')
+      ->setLabel(new TranslatableMarkup('Description'))
+      ->setDescription(new TranslatableMarkup('A brief description of the file.'))
+      ->setRequired(FALSE);
+
+    // Number of pages in the file.
+    $properties['page_count'] = DataDefinition::create('integer')
+      ->setLabel(new TranslatableMarkup('Page count'))
+      ->setDescription(new TranslatableMarkup('Number of pages in the file.'))
+      ->setRequired(FALSE);
+
+    // The UUID of the preview file.
+    $properties['preview_uuid'] = DataDefinition::create('string')
+      ->setLabel(new TranslatableMarkup('Preview UUID'))
+      ->setDescription(new TranslatableMarkup('The UUID of the preview file.'))
+      ->setRequired(TRUE);
+
+    // The page used for the file preview.
+    $properties['preview_page'] = DataDefinition::create('integer')
+      ->setLabel(new TranslatableMarkup('Preview page'))
+      ->setDescription(new TranslatableMarkup('The page used for the file preview.'))
+      ->setRequired(FALSE);
+
+    // The rotation of the page used for the preview.
+    $properties['preview_rotation'] = DataDefinition::create('integer')
+      ->setLabel(new TranslatableMarkup('Preview page rotation'))
+      ->setDescription(new TranslatableMarkup('The rotation of the page used for the preview.'))
+      ->setRequired(FALSE);
+
+    return $properties;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function schema(FieldStorageDefinitionInterface $field_definition) {
+    return [
+      'columns' => [
+        'uuid' => [
+          'type' => 'varchar_ascii',
+          'length' => 36,
+          'not null' => TRUE,
+        ],
+        'revision_id' => [
+          'type' => 'int',
+          'size' => 'medium',
+          'not null' => TRUE,
+        ],
+        'status' => [
+          'type' => 'int',
+          'size' => 'tiny',
+          'not null' => TRUE,
+        ],
+        'file_name' => [
+          'type' => 'varchar',
+          'length' => 255,
+          'not null' => TRUE,
+        ],
+        'file_mime' => [
+          'type' => 'varchar',
+          'length' => 255,
+          'not null' => TRUE,
+        ],
+        'file_size' => [
+          'type' => 'int',
+          'size' => 'big',
+          'not null' => TRUE,
+        ],
+        'language' => [
+          'type' => 'varchar_ascii',
+          'length' => 12,
+          'not null' => FALSE,
+        ],
+        'description' => [
+          'type' => 'varchar',
+          'length' => 255,
+          'not null' => FALSE,
+        ],
+        'page_count' => [
+          'type' => 'int',
+          'size' => 'medium',
+          'not null' => FALSE,
+        ],
+        'preview_uuid' => [
+          'type' => 'varchar_ascii',
+          'length' => 36,
+          'not null' => TRUE,
+        ],
+        'preview_page' => [
+          'type' => 'int',
+          'size' => 'medium',
+          'not null' => FALSE,
+        ],
+        'preview_rotation' => [
+          'type' => 'int',
+          'size' => 'tiny',
+          'not null' => FALSE,
+        ],
+      ],
+      'indexes' => [
+        'uuid' => ['uuid'],
+      ],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getConstraints() {
+    $constraints = parent::getConstraints();
+
+    $constraint_manager = \Drupal::typedDataManager()
+      ->getValidationConstraintManager();
+
+    // @todo add a constraint for the preview uuid, page and rotation.
+    $constraints[] = $constraint_manager->create('ComplexData', [
+      'uuid' => [
+        'Uuid' => [],
+      ],
+    ]);
+
+    return $constraints;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function generateSampleValue(FieldDefinitionInterface $field_definition) {
+    $random = new Random();
+
+    $values['uuid'] = static::generateUuid();
+    $values['revision_id'] = mt_rand(1111, 9999);
+    $valyes['status'] = (bool) mt_rand(0, 1);
+    $valyes['file_name'] = $random->string(mt_rand(1, 250)) . '.' . $random->string(mt_rand(1, 4));
+    $valyes['file_mime'] = $random->string(mt_rand(32, 128));
+    $valyes['file_size'] = mt_rand(1111, 99999);
+    $values['language'] = ['en', 'fr', 'sp'][mt_rand(0, 2)];
+    $values['description'] = $random->sentences(mt_rand(1, 5));
+    $valyes['page_count'] = mt_rand(1, 100);
+    $values['preview_uuid'] = static::generateUuid();
+    $values['preview_page'] = mt_rand(1, 100);
+    $values['preview_rotation'] = mt_rand(0, 2);
+
+    return $values;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function isEmpty() {
+    $uuid = $this->get('uuid')->getValue();
+    return empty($uuid);
+  }
+
+  /**
+   * Get data to render the file preview.
+   *
+   * @param string $style
+   *   The image style to use for the preview.
+   * @param bool $generate
+   *   Whether to generate the preview if doesn't exist or not.
+   *
+   * @return array
+   *   Render array.
+   */
+  public function renderPreview($style = 'small', $generate = FALSE) {
+    $preview = $this->getPreview($generate);
+    if (empty($preview)) {
+      return [];
+    }
+
+    $uri = $preview->getFileUri();
+
+    // @todo store the dimensions or use something faster to get
+    // the width and height?
+    $info = getimagesize($uri);
+    if ($info === FALSE) {
+      return [];
+    }
+
+    return [
+      '#theme' => 'image_style',
+      '#style_name' => $style,
+      '#uri' => $uri,
+      '#alt' => $this->t('Preview of @file_name', [
+        '@file_name' => $this->get('file_name')->getValue(),
+      ]),
+      '#attributes' => [
+        'class' => ['rw-file-preview'],
+      ],
+      '#width' => $info[0],
+      '#height' => $info[1],
+    ];
+  }
+
+  /**
+   * Get the file entity of the preview.
+   *
+   * @param bool $generate
+   *   Whether to generate the preview if doesn't exist or not.
+   *
+   * @return \Drupal\file\Entity\File|null
+   *   Managed file or NULL if the item doesn't have a preview or it couldn't
+   *   be generated.
+   */
+  public function getPreview($generate = FALSE) {
+    $preview_uuid = $this->get('preview_uuid')->getValue();
+    if (!empty($preview_uuid)) {
+      return $this->loadFileByUuid($preview_uuid);
+    }
+    elseif ($generate && $this->canHavePreview()) {
+      $page = $this->get('preview_page')->getValue();
+      $rotation = $this->get('preview_rotation')->getValue();
+      return $this->generatePreview($page, $rotation);
+    }
+    return NULL;
+  }
+
+  /**
+   * Generate the file preview if it's a supported format.
+   *
+   * @param int $page
+   *   The page to use for the preview.
+   * @param int $rotation
+   *   The rotation of the preview page (0, 90 or -90).
+   * @param bool $regenerate
+   *   TRUE to force the regeneration of the preview.
+   *
+   * @return \Drupal\file\Entity\File|null
+   *   The preview file entity or NULL if the preview was not generated.
+   */
+  public function generatePreview($page = 0, $rotation = 0, $regenerate = FALSE) {
+    if ($page < 1 || $this->isEmpty() || !$this->canHavePreview() || $this->getPageCount() === 0) {
+      return NULL;
+    }
+
+    // Ensure the page is a valid value.
+    $page = $page > $this->getPageCount() ? 1 : $page;
+
+    // Ensure the rotation is a valid value.
+    $rotation = in_array($rotation, [0, 90, -90]) ? $rotation : 0;
+
+    $preview_uuid = $this->get('preview_uuid')->getValue();
+    $current_page = $this->get('preview_page')->getValue();
+    $current_rotation = $this->get('preview_rotation')->getValue();
+
+    // Skip if the preview already exists for the given page and rotation.
+    if (!$regenerate && !empty($preview_uuid) && $page == $current_page && $rotation == $current_rotation) {
+      return $this->loadFileByUuid($preview_uuid);
+    }
+
+    $uuid = $this->get('uuid')->getValue();
+
+    // Check if there is temporary file for the file item.
+    $file = $this->loadFileByUuid($uuid);
+    // Create the temporary file if doesn't exist.
+    if (empty($file)) {
+      $file = $this->createFile();
+    }
+
+    // Retrieve the file from the docstore.
+    if (!@file_exists($file->getFileUri()) && !$this->updateFile($file)) {
+      return NULL;
+    }
+
+    // Retrieve the preview file.
+    $preview_file = NULL;
+    if (!empty($preview_uuid)) {
+      $preview_file = $this->loadFileByUuid($preview_uuid);
+    }
+    // Create the preview file if doesn't exist.
+    if (empty($preview_file)) {
+      $preview_file = $this->createPreviewFile();
+    }
+
+    // Create the preview.
+    if (!$this->extractPreview($file->getFileUri(), $preview_file->getFileUri(), $page, $rotation)) {
+      return NULL;
+    }
+
+    // Save the preview. We don't mark it yet as permanent so that it can be
+    // garbage collected if the form, for example, is not submitted.
+    $preview_file->save();
+
+    // Update the field item preview uuid as it may be a new file.
+    $this->get('preview_uuid')->setValue($preview_file->uuid());
+    $this->get('preview_page')->setValue($page);
+    $this->get('preview_rotation')->setValue($rotation);
+
+    // Delete the preview derivatives to ensure they correspond to the updated
+    // preview image.
+    image_path_flush($preview_file->getFileUri());
+
+    return $preview_file;
+  }
+
+  /**
+   * Extract the preview from the given file source.
+   *
+   * @param string $source_uri
+   *   URI of the file from which to extract the preview.
+   * @param string $destination_uri
+   *   URI of the file preview file.
+   * @param int $page
+   *   Page to use for the preview.
+   * @param int $rotation
+   *   Rotation of the preview page.
+   *
+   * @return bool
+   *   TRUE if the extraction was successful.
+   */
+  protected function extractPreview($source_uri, $destination_uri, $page, $rotation) {
+    $file_system = $this->getFileSystem();
+
+    // Create the previews directory to store the file.
+    if (!static::prepareDirectory($destination_uri)) {
+      // @todo log the error.
+      return FALSE;
+    }
+
+    // Mutool needs the full real paths of the files. The destination one can
+    // only be retrieved after creating its directory path.
+    $source_path = $file_system->realpath($source_uri);
+    $destination_path = $file_system->realpath($destination_uri);
+    if (empty($source_path) || empty($destination_path)) {
+      // @todo log the information?
+      return FALSE;
+    }
+
+    $source = escapeshellarg($source_path);
+    $destination = escapeshellarg($destination_path);
+    $page = escapeshellarg($page);
+    $rotation = escapeshellarg($rotation);
+
+    $mutool = \Drupal::state()->get('mutool', '/usr/bin/mutool');
+    if (is_executable($mutool)) {
+      // @todo add max dimensions.
+      $command = "{$mutool} draw -R {$rotation} -o {$destination} {$source} {$page}";
+      exec($command, $output, $return_val);
+      // @todo log error?
+      return empty($return_val) && @file_exists($destination_uri);
+    }
+    return FALSE;
+  }
+
+  /**
+   * Regenerate the preview.
+   *
+   * @return bool
+   *   TRUE if the preview generation was successful.
+   */
+  public function regeneratePrevew() {
+    $page = $this->get('preview_page')->getValue();
+    $rotation = $this->get('preview_rotation')->getValue();
+    return $this->generatePreview($page, $rotation, TRUE);
+  }
+
+  /**
+   * Check if a preview can be generated for this field item.
+   *
+   * @return bool
+   *   TRUE if a preview can be generated.
+   */
+  public function canHavePreview() {
+    return $this->get('file_mime')->getValue() === 'application/pdf';
+  }
+
+  /**
+   * Get the number of pages for this field item file.
+   *
+   * @return int
+   *   Number of pages. Returns 0 if the number of pages is irrelevant.
+   */
+  public function getPageCount() {
+    if ($this->canHavePreview()) {
+      return $this->get('page_count')->getValue() ?? 1;
+    }
+    return 0;
+  }
+
+  /**
+   * Get the file URL.
+   *
+   * @return \Drupal\Core\Url
+   *   URL object.
+   */
+  public function getFileUrl() {
+    $uuid = $this->get('uuid')->getValue();
+    $file_name = $this->get('file_name')->getValue();
+    $extension = static::getFileExtension($file_name);
+    $revision_id = $this->get('revision_id')->getValue();
+
+    // If the revision ID is not set, then it's a new file and there should be
+    // an associated managed file and we return its URL.
+    if (empty($revision_id)) {
+      $url = file_create_url(static::getFileUriFromUuid($uuid, $extension, TRUE, FALSE));
+    }
+    // Otherwise use a "direct" link to the file.
+    // @todo this doesn't handle the case were the file is private in the
+    // docstore. We need a different route for that.
+    else {
+      $url = 'internal:/attachments/' . $uuid . '/' . $file_name;
+    }
+    return !empty($url) ? Url::fromUri($url) : '';
+  }
+
+  /**
+   * Create a managed file for the preview.
+   *
+   * @return \Drupal\file\Entity\File
+   *   Managed file.
+   */
+  protected function createPreviewFile() {
+    if ($this->isEmpty()) {
+      return NULL;
+    }
+
+    $uuid = $this->get('uuid')->getValue();
+
+    // The preview is PNG image.
+    $extension = 'png';
+    $file_name = $uuid . '.' . $extension;
+    $file_mime = 'image/' . $extension;
+
+    // Generate the preview URI as private initially. We'll move it to public
+    // if the docstore file is made public.
+    $uri = static::getFileUriFromUuid($uuid, $extension, TRUE, TRUE);
+
+    // Generate a UUID for the preview. We'll store it in this field item only
+    // if the preview generation worked.
+    $preview_uuid = $this->get('preview_uuid')->getValue();
+    if (empty($preview_uuid)) {
+      $preview_uuid = $this->generateUuid();
+    }
+
+    // Create a temporary managed file with the System user.
+    return static::createFileFromUuid($preview_uuid, $uri, $file_name, $file_mime);
+  }
+
+  /**
+   * Create a managed file for this field item.
+   *
+   * @return \Drupal\file\Entity\File
+   *   Managed file.
+   */
+  protected function createFile() {
+    if ($this->isEmpty()) {
+      return NULL;
+    }
+
+    $uuid = $this->get('uuid')->getValue();
+    $file_name = $this->get('file_name')->getValue();
+    $file_mime = $this->get('file_mime')->getValue();
+
+    // Generate the file uri.
+    $extension = static::getFileExtension($file_name);
+    $uri = static::getFileUriFromUuid($uuid, $extension, TRUE, FALSE);
+
+    // Create a temporary managed file with the System user.
+    return static::createFileFromUuid($uuid, $uri, $file_name, $file_mime);
+  }
+
+  /**
+   * Update the file with the content of the docstore file resource.
+   *
+   * @param \Drupal\file\Entity\File $file
+   *   The managed file entity.
+   *
+   * @return bool
+   *   TRUE on success.
+   */
+  protected function updateFile(File $file) {
+    $uuid = $this->get('uuid')->getValue();
+    $revision_id = $this->get('revision_id')->getValue();
+    $uri = $file->getFileUri();
+
+    // Create the private temp directory to store the file.
+    if (!static::prepareDirectory($uri)) {
+      // @todo log error?
+      return FALSE;
+    }
+
+    // Save the docstore file content.
+    $success = $this->getDocstoreClient()
+      ->downloadFileContentToFilePath($uuid, $uri, $revision_id);
+
+    // Update the file entity.
+    if ($success) {
+      // Update the file entity and save it so that we don't have to
+      // re-download the file to generate the preview. Its status being
+      // temporary it will garbage collected as some point by the system.
+      $file->setMimeType($this->getFileMimeType($uri));
+      $file->save();
+    }
+    return $success;
+  }
+
+  /**
+   * Load a file entity by its uuid.
+   *
+   * @param string $uuid
+   *   File entity UUID.
+   *
+   * @return \Drupal\file\Entity\File|null
+   *   File entity or NULL if it couldn't be loaded.
+   */
+  protected function loadFileByUuid($uuid) {
+    return $this->getEntityRepository()->loadEntityByUuid('file', $uuid);
+  }
+
+  /**
+   * Get the entity repository service.
+   *
+   * @return \Drupal\Core\Entity\EntityRepositoryInterface
+   *   The entity repository service.
+   */
+  protected function getEntityRepository() {
+    if (!isset($this->entityRepository)) {
+      $this->entityRepository = \Drupal::service('entity.repository');
+    }
+    return $this->entityRepository;
+  }
+
+  /**
+   * Get the file system serice.
+   *
+   * @return \Drupal\Core\File\FileSystemInterface
+   *   The file system service.
+   */
+  protected function getFileSystem() {
+    if (!isset($this->fileSystem)) {
+      $this->fileSystem = \Drupal::service('file_system');
+    }
+    return $this->fileSystem;
+  }
+
+  /**
+   * Get the docstore client service.
+   *
+   * @return \Drupal\reliefweb_docstore\Services\DocstoreClient
+   *   The docstore client service.
+   */
+  protected function getDocstoreClient() {
+    if (!isset($this->docstoreClient)) {
+      $this->docstoreClient = \Drupal::service('reliefweb_docstore.client');
+    }
+    return $this->docstoreClient;
+  }
+
+  /**
+   * Get the file directory URI from a UUID.
+   *
+   * @param string $uuid
+   *   File UUID.
+   * @param bool $private
+   *   Whether the file is private or not.
+   * @param bool $preview
+   *   Whether the file is a preview or an attachment.
+   *
+   * @return string
+   *   The directory URI.
+   */
+  public static function getFileDirectoryUriFromUuid($uuid, $private = TRUE, $preview = FALSE) {
+    // @todo use a config setting for the attachments/previews path.
+    $directory = $private ? 'private://' : 'public://';
+    $directory .= $preview ? 'previews/' : 'attachments/';
+    $directory .= substr($uuid, 0, 2);
+    $directory .= '/' . substr($uuid, 2, 2);
+    return $directory;
+  }
+
+  /**
+   * Get the file URI from a UUID.
+   *
+   * @param string $uuid
+   *   File UUID.
+   * @param string $extension
+   *   File extension.
+   * @param bool $private
+   *   Whether the file is private or not.
+   * @param bool $preview
+   *   Whether the file is a preview or an attachment.
+   *
+   * @return string
+   *   The file URI.
+   */
+  public static function getFileUriFromUuid($uuid, $extension, $private = TRUE, $preview = FALSE) {
+    $directory = static::getFileDirectoryUriFromUuid($uuid, $private, $preview);
+    return $directory . '/' . $uuid . '.' . $extension;
+  }
+
+  /**
+   * Create a file entity with the given UUID.
+   *
+   * @param string $uuid
+   *   File UUID.
+   * @param string $uri
+   *   File URI.
+   * @param string $file_name
+   *   File name.
+   * @param string $file_mime
+   *   File mime type.
+   *
+   * @return \Drupal\file\Entity\File
+   *   File entity.
+   */
+  public static function createFileFromUuid($uuid, $uri, $file_name, $file_mime) {
+    return File::create([
+      'uuid' => $uuid,
+      // We use the System user as owner of the file as those are used for
+      // global files that have nothing to do with the current user.
+      'uid' => 2,
+      'uri' => $uri,
+      'status' => 0,
+      'filename' => $file_name,
+      'filemime' => $file_mime,
+    ]);
+  }
+
+  /**
+   * Prepare a directory, creating unexisting paths.
+   *
+   * @param string $uri
+   *   File or directory URI.
+   *
+   * @return bool
+   *   TRUE if the preparation succeeded.
+   */
+  public static function prepareDirectory($uri) {
+    $file_system = \Drupal::service('file_system');
+    $directory = $file_system->dirname($uri);
+    return $file_system->prepareDirectory($directory, $file_system::CREATE_DIRECTORY);
+  }
+
+  /**
+   * Get the extension of the file.
+   *
+   * @param string $file_name
+   *   File name.
+   *
+   * @return string
+   *   File extension.
+   */
+  public static function getFileExtension($file_name) {
+    return pathinfo($file_name, PATHINFO_EXTENSION);
+  }
+
+  /**
+   * Get the mime of the file.
+   *
+   * @param string $uri
+   *   File uri.
+   *
+   * @return string
+   *   File mime type.
+   */
+  public static function getFileMimeType($uri) {
+    return \Drupal::service('file.mime_type.guesser')->guessMimeType($uri);
+  }
+
+  /**
+   * Generate a UUID.
+   *
+   * @return string
+   *   UUID.
+   */
+  public static function generateUuid() {
+    return \Drupal::service('uuid')->generate();
+  }
+
+  /**
+   * Check if the file can have a preview.
+   *
+   * @param \Drupal\file\Entity\File $file
+   *   Managed File.
+   *
+   * @return bool
+   *   TRUE if the file preview can be generated.
+   */
+  protected static function fileCanHavePreview(File $file) {
+    return $file->getMimeType() === 'application/pdf';
+  }
+
+  /**
+   * Get the number of pages of a file.
+   *
+   * @param \Drupal\file\Entity\File $file
+   *   File entity.
+   *
+   * @return int
+   *   Number of pages.
+   */
+  public static function getFilePageCount(File $file) {
+    if (!static::fileCanHavePreview($file)) {
+      return 1;
+    }
+
+    $uri = $file->getFileUri();
+    if (empty($uri)) {
+      return 1;
+    }
+
+    $path = \Drupal::service('file_system')->realpath($uri);
+    if (empty($path)) {
+      return 1;
+    }
+
+    $mutool = \Drupal::state()->get('mutool', '/usr/bin/mutool');
+    if (is_executable($mutool)) {
+      $source = escapeshellarg($path);
+      $command = "{$mutool} info -M {$source}";
+      exec($command, $output, $return_val);
+      if (empty($return_val) && preg_match('/Pages: (?<count>\d+)/', implode("\n", $output), $matches) === 1) {
+        return intval($matches['count']);
+      }
+    }
+    return 1;
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
new file mode 100644
index 000000000..9af9df31c
--- /dev/null
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
@@ -0,0 +1,631 @@
+<?php
+
+namespace Drupal\reliefweb_docstore\Plugin\Field\FieldWidget;
+
+use Drupal\Component\Utility\Html;
+use Drupal\Component\Utility\NestedArray;
+use Drupal\Component\Utility\SortArray;
+use Drupal\Core\Ajax\AjaxResponse;
+use Drupal\Core\Ajax\ReplaceCommand;
+use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Field\WidgetBase;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile as ReliefWebFileType;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+/**
+ * Plugin implementation of the 'reliefweb_file' widget.
+ *
+ * @FieldWidget(
+ *   id = "reliefweb_file",
+ *   label = @Translation("ReliefWeb File"),
+ *   field_types = {
+ *     "reliefweb_file"
+ *   }
+ * )
+ */
+class ReliefWebFile extends WidgetBase {
+
+  /**
+   * The request stack.
+   *
+   * @var \Symfony\Component\HttpFoundation\RequestStack
+   */
+  protected $requestStack;
+
+  /**
+   * Ajax wrapper ID.
+   *
+   * @var string
+   */
+  protected $ajaxWrapperId;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(
+    $plugin_id,
+    $plugin_definition,
+    FieldDefinitionInterface $field_definition,
+    array $settings,
+    array $third_party_settings,
+    RequestStack $request_stack
+  ) {
+    parent::__construct(
+      $plugin_id,
+      $plugin_definition,
+      $field_definition,
+      $settings,
+      $third_party_settings
+    );
+    $this->requestStack = $request_stack;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(
+    ContainerInterface $container,
+    array $configuration,
+    $plugin_id,
+    $plugin_definition
+  ) {
+    return new static(
+      $plugin_id,
+      $plugin_definition,
+      $configuration['field_definition'],
+      $configuration['settings'],
+      $configuration['third_party_settings'],
+      $container->get('request_stack')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function handlesMultipleValues() {
+    return FALSE;
+  }
+
+  /**
+   * Overrides \Drupal\Core\Field\WidgetBase::formMultipleElements().
+   *
+   * Special handling for draggable multiple widgets and 'add more' button.
+   *
+   * @todo No changes, can be inherited from FileWidget?
+   */
+  protected function formMultipleElements(FieldItemListInterface $items, array &$form, FormStateInterface $form_state) {
+    $field_name = $this->fieldDefinition->getName();
+    $required = $this->fieldDefinition->isRequired();
+    $parents = $form['#parents'];
+
+    // Load the items for form rebuilds from the field state as they might not
+    // be in $form_state->getValues() because of validation limitations. Also,
+    // they are only passed in as $items when editing existing entities.
+    $field_state = static::getWidgetState($parents, $field_name, $form_state);
+    if (isset($field_state['items'])) {
+      $items->setValue(array_values($field_state['items']));
+    }
+
+    // Container.
+    $elements = [
+      '#theme' => 'reliefweb_file_widget',
+      '#title' => $this->fieldDefinition->getLabel(),
+      '#description' => $this->getFilteredDescription(),
+      '#tree' => TRUE,
+    ];
+
+    // Add an element for every existing item.
+    $delta = 0;
+    foreach ($items as $item) {
+      if (!$item->isEmpty()) {
+        $element = $this->formSingleElement($items, $delta, [], $form, $form_state);
+        if (!empty($element)) {
+          $elements[$delta++] = $element;
+        }
+      }
+    }
+
+    // Add one more empty row for new uploads except when this is a programmed
+    // multiple form as it is not necessary.
+    if (!$form_state->isProgrammed()) {
+      $name = implode('_', array_merge($parents, [$field_name, 'files']));
+      $elements['add_more'] = [
+        '#type' => 'fieldset',
+        '#title' => $this->t('Add file(s)'),
+        'files' => [
+          '#type' => 'file',
+          '#name' => $name,
+          '#multiple' => TRUE,
+        ],
+        'upload' => [
+          '#type' => 'submit',
+          '#value' => $this->t('Upload file(s)'),
+          '#submit' => [[static::class, 'uploadFiles']],
+          // Disable validation of the button.
+          '#limit_validation_errors' => [
+            array_merge($parents, ['add_more']),
+          ],
+          '#ajax' => $this->getAjaxSettings($this->t('Uploading file(s)...')),
+        ],
+        '#required' => $required && $delta == 0,
+      ];
+    }
+
+    // Add the ajax wrapper.
+    $elements['#prefix'] = '<div id="' . $this->getAjaxWrapperId() . '">';
+    $elements['#suffix'] = '</div>';
+
+    // Populate the 'array_parents' information in $form_state->get('field')
+    // after the form is built, so that we catch changes in the form structure
+    // performed in alter() hooks.
+    $elements['#after_build'][] = [static::class, 'afterBuild'];
+    $elements['#field_name'] = $field_name;
+    $elements['#field_parents'] = $parents;
+
+    return $elements;
+  }
+
+  /**
+   * Get the ajax wrapper id for the field.
+   *
+   * @return string
+   *   Wrapper ID.
+   */
+  protected function getAjaxWrapperId() {
+    if (!isset($this->ajaxWrapperId)) {
+      $this->ajaxWrapperId = Html::getUniqueId($this->fieldDefinition->getName() . '-ajax-wrapper');
+    }
+    return $this->ajaxWrapperId;
+  }
+
+  /**
+   * Get the base ajax settings for the operation in the widget.
+   *
+   * @return array
+   *   Array with the ajax settings.
+   */
+  protected function getAjaxSettings($message = '') {
+    return [
+      'callback' => [static::class, 'rebuildWidgetForm'],
+      'wrapper' => $this->getAjaxWrapperId(),
+      'effect' => 'fade',
+      'progress' => [
+        'type' => 'throbber',
+        'message' => $message,
+      ],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
+    $field_name = $this->fieldDefinition->getName();
+    $parents = $form['#parents'];
+    $item = $items[$delta];
+
+    $element['#theme'] = 'reliefweb_file_widget_item';
+
+    // Non editable defaults.
+    $defaults = [
+      'uuid',
+      'revision_id',
+      'status',
+      'file_name',
+      'file_mime',
+      'file_size',
+      'page_count',
+      'preview_uuid',
+    ];
+    foreach ($defaults as $default) {
+      $element[$default] = [
+        '#type' => 'hidden',
+        '#value' => $item->get($default)->getValue(),
+      ];
+    }
+
+    // Link to the file.
+    $file_name = $item->get('file_name')->getValue();
+    $file_size = $item->get('file_size')->getValue();
+    $file_extension = ReliefWebFileType::getFileExtension($file_name);
+    $file_label = $file_name . ' (' . mb_strtoupper($file_extension) . ' | ' . format_size($file_size) . ')';
+    $file_url = $item->getFileUrl();
+
+    if (!empty($file_url)) {
+      $element['link'] = [
+        '#type' => 'link',
+        '#title' => $file_label,
+        '#url' => $file_url,
+      ];
+    }
+    else {
+      $element['link'] = [
+        '#markup' => $file_label,
+      ];
+    }
+
+    $element['description'] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Description'),
+      '#maxlength' => 255,
+      '#default_value' => $item->get('description')->getValue() ?? '',
+    ];
+
+    // @todo move that to a settings on the field.
+    $languages = [
+      'en' => $this->t('English version'),
+      'fr' => $this->t('French version'),
+    ];
+
+    $element['language'] = [
+      '#type' => 'select',
+      '#title' => $this->t('Language version'),
+      '#options' => $languages,
+      '#default_value' => $item->get('language')->getValue() ?? NULL,
+    ];
+
+    // Display the preview and the page and rotation selection.
+    if ($item->canHavePreview()) {
+      $preview_page = $item->get('preview_page')->getValue() ?? 1;
+      $preview_rotation = $item->get('preview_rotation')->getValue() ?? 0;
+
+      $original_preview_page = $item->_original_preview_page ?: $preview_page;
+      $original_preview_rotation = $item->_original_preview_rotation ?: $preview_rotation;
+
+      if (!empty($preview_page)) {
+        $regenerate = $original_preview_page != $preview_page || $original_preview_rotation != $preview_rotation;
+
+        // Ensure the preview is generated.
+        if ($item->generatePreview($preview_page, $preview_rotation, $regenerate) !== NULL) {
+          $element['preview'] = $item->renderPreview('thumbnail');
+
+          // Add state to hide the preview if "no preview" is selected.
+          if (!empty($element['preview'])) {
+            $element['preview']['#type'] = 'item';
+            // Prevent the caching of the derivative image.
+            // @see reliefweb_docstore_preprocess_image_style()
+            $element['preview']['#attributes']['data-no-cache'] = TRUE;
+            $element['preview']['#states']['invisible'] = [
+              ':input[name="' . $field_name . '[' . $delta . '][preview_page]"]' => ['value' => 0],
+            ];
+          }
+        }
+      }
+
+      $pages = range(1, $item->getPageCount());
+      $element['preview_page'] = [
+        '#type' => 'select',
+        '#title' => $this->t('Preview page'),
+        '#options' => array_merge([0 => $this->t('No preview')], $pages),
+        '#default_value' => $preview_page,
+        '#ajax' => $this->getAjaxSettings($this->t('Regenerating preview...')),
+      ];
+
+      $element['preview_rotation'] = [
+        '#type' => 'select',
+        '#title' => $this->t('Preview page rotation'),
+        '#options' => [
+          0 => $this->t('none'),
+          90 => $this->t('clockwise'),
+          -90 => $this->t('counterclockwise'),
+        ],
+        '#default_value' => $preview_rotation,
+        '#ajax' => $this->getAjaxSettings($this->t('Regenerating preview...')),
+      ];
+
+      // Store the original preview page and rotation so that we can compare
+      // with the new values and determine if the preview should be regenerated.
+      $element['_original_preview_page'] = [
+        '#type' => 'hidden',
+        '#value' => $preview_page,
+      ];
+      $element['_original_preview_rotation'] = [
+        '#type' => 'hidden',
+        '#value' => $preview_rotation,
+      ];
+    }
+
+    // Add a button to delete the file.
+    $element['_delete'] = [
+      '#type' => 'submit',
+      '#value' => $this->t('Delete'),
+      '#name' => implode('-', array_merge($parents, [$delta, 'delete'])),
+      '#submit' => [[static::class, 'deleteFile']],
+      // Store the delta so we know which file to mark as deleted.
+      '#file_delta' => $delta,
+      // Disable validation of the button.
+      '#limit_validation_errors' => [
+        array_merge($parents, [$delta]),
+      ],
+      '#ajax' => $this->getAjaxSettings($this->t('Removing file...')),
+    ];
+
+    // Add the input field for the delta (drag-n-drop reordering).
+    $element['_weight'] = [
+      '#type' => 'weight',
+      '#title' => $this->t('Weight for row @number', [
+        '@number' => $delta + 1,
+      ]),
+      '#title_display' => 'invisible',
+      // Note: this 'delta' is the FAPI #type 'weight' element's property.
+      '#delta' => count($items),
+      '#default_value' => $item->_weight ?: $delta,
+      '#weight' => 100,
+    ];
+
+    // Add properties needed by the value() method.
+    $element['#field_name'] = $this->fieldDefinition->getName();
+    $element['#entity_type'] = $items->getEntity()->getEntityTypeId();
+
+    return $element;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function massageFormValues(array $values, array $form, FormStateInterface $form_state) {
+    foreach ($values as &$value) {
+      unset($value['_delete']);
+    }
+    return $values;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function extractFormValues(FieldItemListInterface $items, array $form, FormStateInterface $form_state) {
+    $field_name = $this->fieldDefinition->getName();
+    $parents = $form['#parents'];
+    $field_state = static::getWidgetState($form['#parents'], $field_name, $form_state);
+
+    // Extract the values from $form_state->getValues().
+    $path = array_merge($parents, [$field_name]);
+    $key_exists = FALSE;
+    $values = NestedArray::getValue($form_state->getValues(), $path, $key_exists);
+    if ($key_exists) {
+      // Remove the 'value' of the 'add more' button.
+      unset($values['add_more']);
+
+      // The original delta, before drag-and-drop reordering, is needed to
+      // route errors to the correct form element.
+      foreach ($values as $delta => &$value) {
+        $value['_original_delta'] = $delta;
+      }
+      usort($values, function ($a, $b) {
+        return SortArray::sortByKeyInt($a, $b, '_weight');
+      });
+
+      // Let the widget massage the submitted values.
+      $values = $this->massageFormValues($values, $form, $form_state);
+
+      // Assign the values and remove the empty ones.
+      $items->setValue($values);
+      $items->filterEmptyItems();
+
+      // Put delta mapping in $form_state, so that flagErrors() can use it.
+      // Also, store the original preview page and rotation of each item so we
+      // can determine if their preview needs to be regenerated when the form
+      // is rebuilt.
+      foreach ($items as $delta => $item) {
+        $field_state['original_deltas'][$delta] = $item->_original_delta ?: $delta;
+
+        // We'll let the widget repopulate the weight with the new deltas.
+        unset($item->_original_delta, $item->_weight);
+      }
+    }
+
+    // Update the field state items with the new data.
+    $field_state['items'] = $items->getValue();
+    static::setWidgetState($form['#parents'], $field_name, $form_state, $field_state);
+  }
+
+  /**
+   * Upload new files.
+   *
+   * @param array $form
+   *   Form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   Form state.
+   */
+  public static function uploadFiles(array &$form, FormStateInterface &$form_state) {
+    $button = $form_state->getTriggeringElement();
+    $widget = NestedArray::getValue($form, array_slice($button['#array_parents'], 0, -2));
+    $parents = $form['#parents'];
+
+    // Retrieve the current field state with the list of existing, queued and
+    // deleted files.
+    $field_name = $widget['#field_name'];
+    $field_parents = $widget['#field_parents'];
+    $field_state = static::getWidgetState($field_parents, $field_name, $form_state);
+
+    // Get uploaded files.
+    $name = implode('_', array_merge($parents, [$field_name, 'files']));
+    $files = \Drupal::request()->files->get($name, []);
+
+    if (!empty($files)) {
+      foreach ($files as $file) {
+        try {
+          $field_state['items'][] = static::createNewFileFieldItem($file);
+        }
+        catch (\Exception $exception) {
+          $form_state->setError($widget, $exception->getMessage());
+        }
+      }
+    }
+
+    // Update the widget state with the existing and new files.
+    static::setWidgetState($field_parents, $field_name, $form_state, $field_state);
+    $form_state->setRebuild();
+  }
+
+  /**
+   * Delete a file.
+   *
+   * @param array $form
+   *   Form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   Form state.
+   */
+  public static function deleteFile(array &$form, FormStateInterface &$form_state) {
+    $button = $form_state->getTriggeringElement();
+    $widget = NestedArray::getValue($form, array_slice($button['#array_parents'], 0, -2));
+    $delta = $button['#file_delta'];
+
+    // Retrieve the current field state with the list of existing, queued and
+    // deleted files.
+    $field_name = $widget['#field_name'];
+    $field_parents = $widget['#field_parents'];
+    $field_state = static::getWidgetState($field_parents, $field_name, $form_state);
+
+    if (isset($field_state['items'][$delta]['uuid'])) {
+      $item = $field_state['items'][$delta];
+
+      // If the file is new, we delete it completely.
+      if (empty($item['revision_id'])) {
+        // Load the associated managed file.
+        $file = \Drupal::service('entity.repository')
+          ->loadEntityByUuid('file', $item['uuid']);
+
+        // Remove the managed file.
+        if (!empty($file)) {
+          $file->delete();
+        }
+      }
+
+      // Remove the field item.
+      unset($field_state['items'][$delta]);
+    }
+
+    // Re-index the items.
+    $field_state['items'] = array_values($field_state['items']);
+
+    // Update the widget state with the existing and new files.
+    static::setWidgetState($field_parents, $field_name, $form_state, $field_state);
+    $form_state->setRebuild();
+  }
+
+  /**
+   * Create a new file field item.
+   *
+   * @param \SplFileInfo $file_info
+   *   The uploaded file info.
+   *
+   * @return array
+   *   The new field entry with its uuid, revision_id, file name and status.
+   *
+   * @throws \Exception
+   *   Throw an exception if the temporary file couldn't be created.
+   *
+   * @todo upload to the docstore directly if/once we allow temporary
+   * files to be uploaded. For now we cannot create a docstore file here
+   * because if, for whatever reason, the form submission doesn't fully
+   * finish, then we'll end up with a unused file in the docstore. So instead
+   * we create a temporary managed file that can be garbage collected if the
+   * the submission doesn't finish.
+   */
+  protected static function createNewFileFieldItem(\SplFileInfo $file_info) {
+    $file_name = $file_info->getClientOriginalName();
+
+    // @todo throw a more relevant information.
+    if (!static::validateFile($file_info)) {
+      throw new \Exception(strtr('Invalid file @name.', [
+        '@name' => $file_name,
+      ]));
+    }
+
+    // We generate a UUID before creating the file entity so that we can use
+    // it for the file uri.
+    $uuid = ReliefWebFileType::generateUuid();
+
+    // Generate the file uri.
+    $extension = ReliefWebFileType::getFileExtension($file_name);
+    $uri = ReliefWebFileType::getFileUriFromUuid($uuid, $extension, TRUE, FALSE);
+    $path = $file_info->getRealPath();
+
+    // Create the private temp directory to store the file.
+    if (!ReliefWebFileType::prepareDirectory($uri)) {
+      throw new \Exception(strtr('Unable to create the destination directory for the uploaded file @name.', [
+        '@name' => $file_name,
+      ]));
+    }
+
+    // Move the uploaded file.
+    if (!\Drupal::service('file_system')->moveUploadedFile($path, $uri)) {
+      throw new \Exception(strtr('Unable to copy the uploadedf ile @name.', [
+        '@name' => $file_name,
+      ]));
+    }
+
+    // Try to guess the real mime type of the uploaded file.
+    $file_mime = ReliefWebFileType::getFileMimeType($uri);
+
+    // Create a temporary managed file associated with the uploaded file.
+    $file = ReliefWebFileType::createFileFromUuid($uuid, $uri, $file_name, $file_mime);
+
+    // Save the file. This will notably populate its file size.
+    $file->save();
+
+    // Create a new ReliefWeb item.
+    return [
+      'uuid' => $uuid,
+      // A revision of 0 is an easy way to determine new files.
+      // This will be populated after a successful upload to the
+      // docstore.
+      'revision_id' => 0,
+      'status' => 0,
+      'file_name' => $file_name,
+      'file_mime' => $file_mime,
+      'file_size' => $file->getSize(),
+      'page_count' => ReliefWebFileType::getFilePageCount($file),
+    ];
+  }
+
+  /**
+   * Validate an uploaded file.
+   *
+   * @param \SplFileInfo $file_info
+   *   Uploaded file.
+   *
+   * @return bool
+   *   TRUE if the file is valid.
+   *
+   * @todo check extension and size and $file->getError().
+   *
+   * @see _file_save_upload_single()
+   */
+  protected static function validateFile(\SplFileInfo $file_info) {
+    return $file_info->isValid() &&
+           $file_info->getRealPath() !== FALSE &&
+           // Max allowed length of a managed file name.
+           // @todo check if there is a constant we can use here.
+           mb_strlen($file_info->getClientOriginalName()) <= 255;
+  }
+
+  /**
+   * Rebuild form.
+   *
+   * @param array $form
+   *   The build form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The form state.
+   * @param \Symfony\Component\HttpFoundation\Request $request
+   *   The current request.
+   *
+   * @return \Drupal\Core\Ajax\AjaxResponse
+   *   The ajax response of the ajax upload.
+   */
+  public static function rebuildWidgetForm(array &$form, FormStateInterface &$form_state, Request $request) {
+    $button = $form_state->getTriggeringElement();
+    $widget = NestedArray::getValue($form, array_slice($button['#array_parents'], 0, -2));
+
+    $response = new AjaxResponse();
+    $response->setAttachments($form['#attached']);
+
+    return $response->addCommand(new ReplaceCommand(NULL, $widget));
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_docstore/src/Routing/RouteSubscriber.php b/html/modules/custom/reliefweb_docstore/src/Routing/RouteSubscriber.php
new file mode 100644
index 000000000..96c1023bb
--- /dev/null
+++ b/html/modules/custom/reliefweb_docstore/src/Routing/RouteSubscriber.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Drupal\reliefweb_docstore\Routing;
+
+use Drupal\Core\Routing\RouteSubscriberBase;
+use Symfony\Component\Routing\RouteCollection;
+
+/**
+ * Listens to the dynamic route events.
+ */
+class RouteSubscriber extends RouteSubscriberBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function alterRoutes(RouteCollection $collection) {
+    // Replace the file and image style download controllers so we can control
+    // the access to the reliefweb private files. Otherwise access is always
+    // denied by other modules because they temporary private files.
+    if ($route = $collection->get('system.files')) {
+      $route->setDefault('_controller', '\Drupal\reliefweb_docstore\Controller\FileDownloadController::download');
+    }
+    if ($route = $collection->get('image.style_private')) {
+      $route->setDefault('_controller', '\Drupal\reliefweb_docstore\Controller\ImageStyleDownloadController::deliver');
+    }
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php b/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php
new file mode 100644
index 000000000..44f48db80
--- /dev/null
+++ b/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php
@@ -0,0 +1,235 @@
+<?php
+
+namespace Drupal\reliefweb_docstore\Services;
+
+use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Logger\LoggerChannelFactoryInterface;
+use GuzzleHttp\ClientInterface;
+use GuzzleHttp\Psr7\Utils;
+
+/**
+ * ReliefWeb API client service class.
+ */
+class DocstoreClient {
+
+  /**
+   * ReliefWeb API config.
+   *
+   * @var \Drupal\Core\Config\ImmutableConfig
+   */
+  protected $config;
+
+  /**
+   * The HTTP client service.
+   *
+   * @var \GuzzleHttp\ClientInterface
+   */
+  protected $httpClient;
+
+  /**
+   * The logger service.
+   *
+   * @var \Psr\Log\LoggerInterface
+   */
+  protected $logger;
+
+  /**
+   * Constructor.
+   *
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
+   *   The config factory service.
+   * @param \GuzzleHttp\ClientInterface $http_client
+   *   The HTTP client service.
+   * @param \Drupal\Core\Logger\LoggerChannelFactoryInterface $logger_factory
+   *   The logger factory service.
+   */
+  public function __construct(
+    ConfigFactoryInterface $config_factory,
+    ClientInterface $http_client,
+    LoggerChannelFactoryInterface $logger_factory
+  ) {
+    $this->config = $config_factory->get('reliefweb_docstore.settings');
+    $this->httpClient = $http_client;
+    $this->logger = $logger_factory->get('reliefweb_docstore');
+  }
+
+  /**
+   * Create a file in the docstore.
+   *
+   * @param array $payload
+   *   API request payload (with fields, filters, sort etc.)
+   * @param int $timeout
+   *   Request timeout.
+   *
+   * @return array|null
+   *   The data from the API response or NULL in case of error.
+   */
+  public function createFile(array $payload, $timeout = 5) {
+    $response = $this->request('POST', '/api/v1/files/' . $uuid . '/content', [
+      'json' => $payload,
+    ], $timeout);
+
+    if ($response !== NULL) {
+      $body = $response->getBody();
+      return !empty($body) ? json_decode($body, TRUE) : NULL;
+    }
+
+    return NULL;
+  }
+
+  /**
+   * Create a file in the docstore.
+   *
+   * @param string $uuid
+   *   Docstore file resource UUID.
+   * @param string $path
+   *   File path.
+   * @param int $timeout
+   *   Request timeout.
+   *
+   * @return array|null
+   *   The data from the API response or NULL in case of error.
+   */
+  public function createFileContentFromFilePath($uuid, $path, $timeout = 300) {
+    try {
+      $resource = Utils::TryFopen($path, 'r');
+    }
+    catch (\RuntimeExecption $exception) {
+      $this->logger->error('Unable to read file @path', [
+        '@path' => $path,
+      ]);
+      return NULL;
+    }
+
+    $response = $this->request('POST', '/api/v1/files/' . $uuid . '/content', [
+      'body' => $resource,
+    ], $timeout);
+
+    if ($response !== NULL) {
+      $body = $response->getBody();
+      return !empty($body) ? json_decode($body, TRUE) : NULL;
+    }
+
+    return NULL;
+  }
+
+  /**
+   * Download a docstore file content to the given file path.
+   *
+   * @param string $uuid
+   *   The docstore file resource UUID.
+   * @param string $path
+   *   The path of the file in which the content will be saved.
+   * @param int $revision_id
+   *   The revision of the docstore file resource.
+   * @param int $timeout
+   *   Request timeout.
+   *
+   * @return bool
+   *   TRUE if the request was successful.
+   */
+  public function downloadFileContentToFilePath($uuid, $path, $revision_id = 0, $timeout = 300) {
+    try {
+      $resource = Utils::TryFopen($path, 'w');
+    }
+    catch (\RuntimeExecption $exception) {
+      $this->logger->error('Unable to open file @path for writing', [
+        '@path' => $path,
+      ]);
+      return NULL;
+    }
+
+    // Assume we want to get the latest revision in which case we can do
+    // a direct call the https://docstore/files/uuid endpoint which is much
+    // faster if the file is public.
+    // @todo this doesn't take into account the fact that the file may be
+    // hidden for the provider in that case we need to use the API endpoint.
+    if (empty($revision_id)) {
+      $endpoint = '/files/' . $uuid;
+    }
+    else {
+      $endpoint = '/api/v1/files/' . $uuid . '/revisions/' . $revision_id . '/content';
+    }
+
+    $response = $this->request('GET', $endpoint, [
+      'sink' => $resource,
+    ], $timeout);
+
+    return !empty($response) && $response->isSuccessful();
+  }
+
+  /**
+   * Perform a request against the docstore API.
+   *
+   * @param string $method
+   *   Method.
+   * @param string $endpoint
+   *   API Endpoint. This can also be a full URL for example to retrieve a file.
+   * @param array $options
+   *   Request options.
+   * @param int $timeout
+   *   Request timeout.
+   *
+   * @return \Psr\Http\Message\ResponseInterface|null
+   *   Response.
+   */
+  protected function request($method, $endpoint, array $options, $timeout = 5) {
+    try {
+      $url = $this->createDocstoreUrl($entpoint);
+
+      $headers = $this->getHeaders();
+      if (isset($options['headers'])) {
+        $headers += $options['headers'];
+        unset($options['headers']);
+      }
+
+      return $this->httpClient->request($method, $url, [
+        'timeout' => $timeout,
+        'headers' => $headers,
+      ] + $options);
+    }
+    catch (\Exception $exception) {
+      $this->logger->error('Unable to perform the @method request to the @endpoint endpoint with the options: @options: @error', [
+        '@method' => $method,
+        '@endpoint' => $endpoint,
+        '@options' => print_r($options, TRUE),
+        '@error' => $exception->getMessage(),
+      ]);
+      return NULL;
+    }
+  }
+
+  /**
+   * Create a URL to the docstore for the given endpoint.
+   *
+   * @param string $endpoint
+   *   Docstore endpoint (ex: API endpoint).
+   *
+   * @return string
+   *   Full docstore URL for the endpoint.
+   */
+  protected function createDocstoreUrl($endpoint = '') {
+    $docstore_url = $this->config->get('docstore_url');
+    if (empty($docstore_url)) {
+      throw  new \Execption('The docstore URL is not defined');
+    }
+    if (!empty($endpoint)) {
+      return rtrim($docstore_url, '/') . '/' . ltrim($endpoint, '/');
+    }
+    return $docstore_url;
+  }
+
+  /**
+   * Get the base headers for API requests.
+   *
+   * @return array
+   *   Headers.
+   */
+  protected function getHeaders() {
+    return [
+      'Accept' => 'application/json',
+      'API-KEY' => $this->config->get('api_key'),
+    ];
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget-item.html.twig b/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget-item.html.twig
new file mode 100644
index 000000000..ffdc7d7bb
--- /dev/null
+++ b/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget-item.html.twig
@@ -0,0 +1,45 @@
+{#
+
+/**
+ * @file
+ * Template for the reliefweb_file form widget file item.
+ *
+ * Available variables:
+ * - element: the form element.
+ */
+
+#}
+{%
+  set rendered = [
+    'link',
+    'description',
+    'language',
+    'preview',
+    'preview_page',
+    'preview_rotation',
+    '_delete',
+    '_weight',
+  ]
+%}
+<tr{{ attributes.addClass(['rw-file-widget-item', 'draggable']) }}>
+  <td class="rw-file-widget-item__information">
+    {{ element.link }}
+    {{ element.description }}
+    {{ element.language }}
+    {# Make sure all the element children are rendered. #}
+    {% for key, child in element|without(rendered) if key|first != '#' %}
+      {{ child }}
+    {% endfor %}
+  </td>
+  <td class="rw-file-widget-item__preview">
+    {{ element.preview }}
+    {{ element.preview_page }}
+    {{ element.preview_rotation }}
+  </td>
+  <td class="rw-file-widget-item__operations">
+    {{ element._delete }}
+  </td>
+  <td class="rw-file-widget-item__weight">
+    {{ element._weight }}
+  </td>
+</tr>
diff --git a/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget.html.twig b/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget.html.twig
new file mode 100644
index 000000000..73fd0bad0
--- /dev/null
+++ b/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget.html.twig
@@ -0,0 +1,29 @@
+{#
+
+/**
+ * @file
+ * Template for the reliefweb_file form widget.
+ *
+ * Available variables:
+ * - element: the form element.
+ */
+
+#}
+{% set files = element|without(['add_more'])|filter((v, k) => k|first != '#') %}
+{% set add_more = element['add_more'] %}
+
+<div{{ attributes.addClass('rw-file-widget') }}>
+  {% if files is not empty %}
+  <table id="{{ attributes.id ~ '-table' }}">
+    <thead class="visually-hidden">
+      <tr><th>Information</th><th>Preview</th><th>Operations</th><th>Weight</th></tr>
+    </thead>
+    <tbody>
+      {{ files }}
+    </tbody>
+  </table>
+  </table>
+  {% endif %}
+
+  {{ add_more }}
+</div>

From f3f88f9966c34fa538365fec3e6d1c8053ef107e Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 11 Nov 2021 15:58:56 +0900
Subject: [PATCH 059/720] [RW-25] Do not store the current request but the
 request stack instead so the service is serializable

---
 .../src/ModerationServiceBase.php             | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
index f4d3554c1..dca59580b 100644
--- a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
+++ b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
@@ -86,11 +86,11 @@ abstract class ModerationServiceBase implements ModerationServiceInterface {
   protected $pagerParameters;
 
   /**
-   * The current request.
+   * The request stack.
    *
-   * @var \Symfony\Component\HttpFoundation\Request
+   * @var \Symfony\Component\HttpFoundation\RequestStack
    */
-  protected $request;
+  protected $requestStack;
 
   /**
    * Filters definition for the filter block on the moderation page.
@@ -139,7 +139,7 @@ public function __construct(
     $this->entityTypeManager = $entity_type_manager;
     $this->pagerManager = $pager_manager;
     $this->pagerParameters = $pager_parameters;
-    $this->request = $request_stack->getCurrentRequest();
+    $this->requestStack = $request_stack;
     $this->stringTranslation = $string_translation;
   }
 
@@ -440,7 +440,7 @@ public function getTable(array $filters, $limit = 30) {
     $headers = $this->getOrderInformation()['headers'];
 
     // Compute the sort URL for the sortable headers.
-    $query = $this->request->query->all();
+    $query = $this->getCurrentRequest()->query->all();
     $remove = ['form_build_id', 'form_id', 'submit', 'page'];
     $query = array_diff_key($query, array_flip($remove));
     foreach ($headers as $header => $info) {
@@ -496,7 +496,7 @@ public function hasFilterDefinition($name) {
    * {@inheritdoc}
    */
   public function getAutocompleteSuggestions($filter) {
-    $query = $this->request->query->get('query', '');
+    $query = $this->getCurrentRequest()->query->get('query', '');
 
     if (empty($query) || !$this->hasFilterDefinition($filter)) {
       return [];
@@ -1192,10 +1192,10 @@ protected function executeQuery(array $filters, $limit = 30) {
    */
   protected function getOrderInformation() {
     $headers = $this->getHeaders();
-    $order = $this->request->query->get('order', '');
+    $order = $this->getCurrentRequest()->query->get('order', '');
     // We assume the date header is present and sortable.
     $order = !empty($headers[$order]['sortable']) ? $order : 'date';
-    $sort = strtolower($this->request->query->get('sort', ''));
+    $sort = strtolower($this->getCurrentRequest()->query->get('sort', ''));
     $sort = in_array($sort, ['asc', 'desc']) ? $sort : 'desc';
     $headers[$order]['sort'] = $sort;
 
@@ -2190,7 +2190,7 @@ protected function getFilterLink($title, $parameter, $value) {
     // Get the query parameters, keeping only the moderation page filter form
     // paremeters.
     // @see \Drupal\reliefweb_moderation\Form\ModerationPageFilterForm
-    $parameters = $this->request->query->all();
+    $parameters = $this->getCurrentRequest()->query->all();
     $parameters = array_intersect_key($parameters, [
       'filters' => TRUE,
       'omnibox' => TRUE,
@@ -2432,4 +2432,14 @@ protected function getEntityCreationDate(EntityModeratedInterface $entity) {
     return empty($date) ? '1996-04-01T00:00:00+0000' : $date;
   }
 
+  /**
+   * Get the current request.
+   *
+   * @return \Symfony\Component\HttpFoundation\Request
+   *   The current request.
+   */
+  protected function getCurrentRequest() {
+    return $this->requestStack->getCurrentRequest();
+  }
+
 }

From 65ee970014d1653778c40fc8c9792d9b45799b79 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 11 Nov 2021 16:19:46 +0900
Subject: [PATCH 060/720] [RW-25] Ensure the revisions are rendered with the
 admin theme

---
 config/theme_switcher.rule.request_path.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/theme_switcher.rule.request_path.yml b/config/theme_switcher.rule.request_path.yml
index fea6b669a..f808bb792 100644
--- a/config/theme_switcher.rule.request_path.yml
+++ b/config/theme_switcher.rule.request_path.yml
@@ -12,5 +12,5 @@ admin_theme: common_design_subtheme
 visibility:
   request_path:
     id: request_path
-    pages: "/moderation/content/*\r\n/user/*/edit\r\n/user/*/notifications\r\n/user/*/bookmarks\r\n/user/*/posts\r\n/user/*/contact\r\n/admin/community-topics"
+    pages: "/moderation/content/*\r\n/user/*/edit\r\n/user/*/notifications\r\n/user/*/bookmarks\r\n/user/*/posts\r\n/user/*/contact\r\n/admin/community-topics\r\n/admin/reliefweb_revisions/history/*/*"
     negate: false

From 159f9708c56f04696d388109a03ce9a487e0a50b Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Thu, 11 Nov 2021 09:18:40 +0100
Subject: [PATCH 061/720] RW-174: Filter by type, create links

---
 .../src/Form/ModerationPageFilterForm.php     | 62 ++++++++++++-----
 .../src/ModerationServiceBase.php             |  9 ++-
 .../src/Controller/UserPostsPage.php          |  2 +-
 .../src/Services/UserPostsService.php         | 69 +++++++++++++++++--
 4 files changed, 115 insertions(+), 27 deletions(-)

diff --git a/html/modules/custom/reliefweb_moderation/src/Form/ModerationPageFilterForm.php b/html/modules/custom/reliefweb_moderation/src/Form/ModerationPageFilterForm.php
index 8dd17a892..60912c884 100644
--- a/html/modules/custom/reliefweb_moderation/src/Form/ModerationPageFilterForm.php
+++ b/html/modules/custom/reliefweb_moderation/src/Form/ModerationPageFilterForm.php
@@ -204,20 +204,6 @@ public function buildForm(array $form, FormStateInterface $form_state, Moderatio
       '#weight' => 4,
     ];
 
-    // Link to create a new entity.
-    $bundle = $service->getBundle();
-    $url_options = ['attributes' => ['target' => '_blank']];
-    if ($service->getEntityTypeId() === 'taxonomy_term') {
-      $create_url = Url::fromRoute('entity.taxonomy_term.add_form', [
-        'taxonomy_vocabulary' => $bundle,
-      ], $url_options);
-    }
-    else {
-      $create_url = Url::fromRoute('node.add', [
-        'node_type' => $bundle,
-      ], $url_options);
-    }
-
     // Add the filter and reset buttons.
     $form['actions'] = [
       '#type' => 'actions',
@@ -242,12 +228,50 @@ public function buildForm(array $form, FormStateInterface $form_state, Moderatio
       '#submit' => ['::resetForm'],
     ];
 
+    // Link to create a new entity.
+    $bundle = $service->getBundle();
+
     if (!empty($bundle)) {
-      $form['actions']['create'] = [
-        '#type' => 'link',
-        '#url' => $create_url,
-        '#title' => $this->t('Create @bundle', ['@bundle' => $bundle]),
-      ];
+      if (is_array($bundle)) {
+        foreach ($bundle as $b) {
+          $url_options = ['attributes' => ['target' => '_blank']];
+          if ($service->getEntityTypeId() === 'taxonomy_term') {
+            $create_url = Url::fromRoute('entity.taxonomy_term.add_form', [
+              'taxonomy_vocabulary' => $b,
+            ], $url_options);
+          }
+          else {
+            $create_url = Url::fromRoute('node.add', [
+              'node_type' => $b,
+            ], $url_options);
+          }
+
+          $form['actions']['create_' . $b] = [
+            '#type' => 'link',
+            '#url' => $create_url,
+            '#title' => $this->t('Create @bundle', ['@bundle' => $b]),
+          ];
+        }
+      }
+      else {
+        $url_options = ['attributes' => ['target' => '_blank']];
+        if ($service->getEntityTypeId() === 'taxonomy_term') {
+          $create_url = Url::fromRoute('entity.taxonomy_term.add_form', [
+            'taxonomy_vocabulary' => $bundle,
+          ], $url_options);
+        }
+        else {
+          $create_url = Url::fromRoute('node.add', [
+            'node_type' => $bundle,
+          ], $url_options);
+        }
+
+        $form['actions']['create'] = [
+          '#type' => 'link',
+          '#url' => $create_url,
+          '#title' => $this->t('Create @bundle', ['@bundle' => $bundle]),
+        ];
+      }
     }
 
     // Add the data to be passed to the js scripts (shortcuts etc.).
diff --git a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
index b9971c8b9..40933f205 100644
--- a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
+++ b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
@@ -1126,7 +1126,12 @@ protected function executeQuery(array $filters, $limit = 30) {
 
     // Filter for the service entity bundle.
     if (!empty($bundle)) {
-      $query->condition($entity_table_alias . '.' . $entity_bundle_field, $bundle, '=');
+      if (is_array($bundle)) {
+        $query->condition($entity_table_alias . '.' . $entity_bundle_field, $bundle, 'IN');
+      }
+      else {
+        $query->condition($entity_table_alias . '.' . $entity_bundle_field, $bundle, '=');
+      }
     }
 
     // Filter the query with the form filters.
@@ -1753,7 +1758,7 @@ protected function joinPostingRights(Select $query, array $definition, $entity_t
     $bundle = $this->getBundle();
 
     // Skip for empty bundle.
-    if ($bundle === '') {
+    if ($bundle === '' || is_array($bundle)) {
       return '';
     }
 
diff --git a/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php b/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php
index 90e3fbc85..527340454 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php
@@ -89,7 +89,7 @@ public function getContent(UserInterface $user, ModerationServiceInterface $serv
       // Status + Other filters.
       $filters = $values['filters'] ?? [];
 
-      // @todo filter by current user.
+      // Filter by current user.
       $filters['author'] = $user->id();
 
       // Omnibox selections.
diff --git a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
index d51792a8a..da9bd58bd 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
@@ -17,7 +17,10 @@ class UserPostsService extends ModerationServiceBase {
    * {@inheritdoc}
    */
   public function getBundle() {
-    return '';
+    return [
+      'job',
+      'training',
+    ];
   }
 
   /**
@@ -34,16 +37,43 @@ public function getTitle() {
     return $this->t('Topics');
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getStatuses() {
+    return [
+      'draft' => $this->t('draft'),
+      'pending' => $this->t('pending'),
+      'published' => $this->t('published'),
+      'on_hold' => $this->t('on-hold'),
+      'refused' => $this->t('refused'),
+      'expired' => $this->t('expired'),
+      'duplicate' => $this->t('duplicate'),
+    ];
+  }
+
   /**
    * {@inheritdoc}
    */
   public function getHeaders() {
     return [
-      'edit' => [
-        'label' => '',
+      'id' => [
+        'label' => $this->t('Id'),
+      ],
+      'type' => [
+        'label' => $this->t('Type'),
       ],
-      'data' => [
-        'label' => $this->t('Topic'),
+      'status' => [
+        'label' => $this->t('Status'),
+      ],
+      'poster' => [
+        'label' => $this->t('Poster'),
+      ],
+      'source' => [
+        'label' => $this->t('Source'),
+      ],
+      'title' => [
+        'label' => $this->t('Title'),
       ],
       'date' => [
         'label' => $this->t('Posted'),
@@ -51,6 +81,12 @@ public function getHeaders() {
         'specifier' => 'created',
         'sortable' => TRUE,
       ],
+      'deadline' => [
+        'label' => $this->t('Deadline'),
+        'type' => 'property',
+        'specifier' => 'deadline',
+        'sortable' => TRUE,
+      ],
     ];
   }
 
@@ -76,6 +112,12 @@ public function getRows(array $results) {
       // Entity data cell.
       $data = [];
 
+      // Id.
+      $data['title'] = $entity->id();
+
+      // Id.
+      $data['type'] = $entity->bundle();
+
       // Title.
       $data['title'] = $entity->toLink()->toString();
 
@@ -87,6 +129,20 @@ public function getRows(array $results) {
       // Revision information.
       $data['revision'] = $this->getEntityRevisionData($entity);
 
+      // Source.
+      $sources = [];
+      if ($entity->field_source) {
+        foreach ($entity->field_source as $item) {
+          $source_link = $this->getTaxonomyTermLink($item);
+          if (!empty($source_link)) {
+            $sources[] = $source_link;
+          }
+        }
+        if (!empty($sources)) {
+          $info['source'] = $sources;
+        }
+      }
+
       // Filter out empty data.
       $cells['data'] = array_filter($data);
 
@@ -122,6 +178,9 @@ protected function initFilterDefinitions(array $filters = []) {
       'created',
       'user_role',
       'title',
+      'type',
+      'poster',
+      'source',
     ]);
     return $definitions;
   }

From 27500d2a86a6ba2e1f061da242b9b9c09f0a272a Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Thu, 11 Nov 2021 13:08:56 +0100
Subject: [PATCH 062/720] Table cells

---
 .../src/Services/UserPostsService.php         | 52 +++----------------
 1 file changed, 8 insertions(+), 44 deletions(-)

diff --git a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
index da9bd58bd..9c29ae8d5 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
@@ -107,50 +107,14 @@ public function getRows(array $results) {
       $cells = [];
 
       // Edit link + status cell.
-      $cells['edit'] = $this->getEntityEditAndStatusData($entity);
-
-      // Entity data cell.
-      $data = [];
-
-      // Id.
-      $data['title'] = $entity->id();
-
-      // Id.
-      $data['type'] = $entity->bundle();
-
-      // Title.
-      $data['title'] = $entity->toLink()->toString();
-
-      // Author information.
-      $info = [];
-      $info['author'] = $this->getEntityAuthorData($entity);
-      $data['info'] = array_filter($info);
-
-      // Revision information.
-      $data['revision'] = $this->getEntityRevisionData($entity);
-
-      // Source.
-      $sources = [];
-      if ($entity->field_source) {
-        foreach ($entity->field_source as $item) {
-          $source_link = $this->getTaxonomyTermLink($item);
-          if (!empty($source_link)) {
-            $sources[] = $source_link;
-          }
-        }
-        if (!empty($sources)) {
-          $info['source'] = $sources;
-        }
-      }
-
-      // Filter out empty data.
-      $cells['data'] = array_filter($data);
-
-      // Date cell.
-      $cells['date'] = [
-        'date' => $this->getEntityCreationDate($entity),
-      ];
-
+      $cells['id'] = $entity->id();
+      $cells['type'] = $entity->bundle();
+      $cells['status'] = $entity->getModerationStatusLabel();
+      $cells['poster'] = $entity->getOwner()->label();
+      $cells['source'] = '';
+      $cells['title'] = $entity->toLink()->toString();
+      $cells['date'] = $this->getEntityCreationDate($entity);
+      $cells['deadline'] = $entity->field_registration_deadline ? $entity->field_registration_deadline->value : '';
       $rows[] = $cells;
     }
 

From 4bb05f7c684c23d68e08aa7eff0dabeede5e1911 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Thu, 11 Nov 2021 16:18:40 +0100
Subject: [PATCH 063/720] Page title, filters

---
 .../src/Form/ModerationPageFilterForm.php     | 53 ++++---------
 .../reliefweb_user_posts.routing.yml          |  2 +-
 .../src/Controller/UserPostsPage.php          | 15 +++-
 .../src/Services/UserPostsService.php         | 38 ++++-----
 .../rw-moderation/rw-moderation.css           | 78 +++++++++----------
 5 files changed, 84 insertions(+), 102 deletions(-)

diff --git a/html/modules/custom/reliefweb_moderation/src/Form/ModerationPageFilterForm.php b/html/modules/custom/reliefweb_moderation/src/Form/ModerationPageFilterForm.php
index 60912c884..bec3b3344 100644
--- a/html/modules/custom/reliefweb_moderation/src/Form/ModerationPageFilterForm.php
+++ b/html/modules/custom/reliefweb_moderation/src/Form/ModerationPageFilterForm.php
@@ -231,47 +231,24 @@ public function buildForm(array $form, FormStateInterface $form_state, Moderatio
     // Link to create a new entity.
     $bundle = $service->getBundle();
 
-    if (!empty($bundle)) {
-      if (is_array($bundle)) {
-        foreach ($bundle as $b) {
-          $url_options = ['attributes' => ['target' => '_blank']];
-          if ($service->getEntityTypeId() === 'taxonomy_term') {
-            $create_url = Url::fromRoute('entity.taxonomy_term.add_form', [
-              'taxonomy_vocabulary' => $b,
-            ], $url_options);
-          }
-          else {
-            $create_url = Url::fromRoute('node.add', [
-              'node_type' => $b,
-            ], $url_options);
-          }
-
-          $form['actions']['create_' . $b] = [
-            '#type' => 'link',
-            '#url' => $create_url,
-            '#title' => $this->t('Create @bundle', ['@bundle' => $b]),
-          ];
-        }
+    if (!empty($bundle) && is_string($bundle)) {
+      $url_options = ['attributes' => ['target' => '_blank']];
+      if ($service->getEntityTypeId() === 'taxonomy_term') {
+        $create_url = Url::fromRoute('entity.taxonomy_term.add_form', [
+          'taxonomy_vocabulary' => $bundle,
+        ], $url_options);
       }
       else {
-        $url_options = ['attributes' => ['target' => '_blank']];
-        if ($service->getEntityTypeId() === 'taxonomy_term') {
-          $create_url = Url::fromRoute('entity.taxonomy_term.add_form', [
-            'taxonomy_vocabulary' => $bundle,
-          ], $url_options);
-        }
-        else {
-          $create_url = Url::fromRoute('node.add', [
-            'node_type' => $bundle,
-          ], $url_options);
-        }
-
-        $form['actions']['create'] = [
-          '#type' => 'link',
-          '#url' => $create_url,
-          '#title' => $this->t('Create @bundle', ['@bundle' => $bundle]),
-        ];
+        $create_url = Url::fromRoute('node.add', [
+          'node_type' => $bundle,
+        ], $url_options);
       }
+
+      $form['actions']['create'] = [
+        '#type' => 'link',
+        '#url' => $create_url,
+        '#title' => $this->t('Create @bundle', ['@bundle' => $bundle]),
+      ];
     }
 
     // Add the data to be passed to the js scripts (shortcuts etc.).
diff --git a/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.routing.yml b/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.routing.yml
index 0da6aca8d..8fdd9a020 100644
--- a/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.routing.yml
+++ b/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.routing.yml
@@ -3,7 +3,7 @@ reliefweb_user_posts.content:
   path: '/user/{user}/posts'
   defaults:
     _controller: '\Drupal\reliefweb_user_posts\Controller\UserPostsPage::getContent'
-    _title_callback: '\Drupal\reliefweb_user_posts\Controller\UserPostsPage::getPageTitle'
+    _title_callback: '\Drupal\reliefweb_user_posts\Controller\UserPostsPage::getTitle'
     service: 'user_posts'
   options:
     _admin_route: TRUE
diff --git a/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php b/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php
index 527340454..82fefe839 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php
@@ -41,14 +41,23 @@ public static function create(ContainerInterface $container) {
   /**
    * Get the page title.
    *
+   * @param \Drupal\user\UserInterface $user
+   *   User accoutn.
    * @param \Drupal\reliefweb_moderation\ModerationServiceInterface $service
    *   Moderation service.
    *
    * @return string|\Drupal\Component\Render\MarkupInterface
    *   Moderation title.
    */
-  public function getPageTitle(ModerationServiceInterface $service) {
-    return $this->t('My posts');
+  public function getTitle(UserInterface $user, ModerationServiceInterface $service) {
+    if ($user->id() === $this->currentUser()->id()) {
+      return $this->t('My posts');
+    }
+    else {
+      return $this->t("@name's posts", [
+        '@name' => $user->label(),
+      ]);
+    }
   }
 
   /**
@@ -76,7 +85,7 @@ public function getContent(UserInterface $user, ModerationServiceInterface $serv
     // @todo review the URL parameters and eventually remove the unnecessary
     // parameters (list can be retrieved with FormState::getCleanValueKeys()).
     $form = $this->formBuilder
-      ->buildForm('\Drupal\reliefweb_moderation\Form\ModerationPageFilterForm', $form_state);
+      ->buildForm('\Drupal\reliefweb_user_posts\Form\UserPostsPageFilterForm', $form_state);
 
     // Filter the results.
     $filters = [];
diff --git a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
index 9c29ae8d5..4d89f6a7c 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
@@ -2,11 +2,7 @@
 
 namespace Drupal\reliefweb_user_posts\Services;
 
-use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\reliefweb_moderation\EntityModeratedInterface;
 use Drupal\reliefweb_moderation\ModerationServiceBase;
-use Drupal\reliefweb_utility\Helpers\UserHelper;
 
 /**
  * Moderation service for the report nodes.
@@ -34,7 +30,7 @@ public function getEntityTypeId() {
    * {@inheritdoc}
    */
   public function getTitle() {
-    return $this->t('Topics');
+    return $this->t('My posts');
   }
 
   /**
@@ -65,6 +61,9 @@ public function getHeaders() {
       ],
       'status' => [
         'label' => $this->t('Status'),
+        'type' => 'property',
+        'specifier' => 'status',
+        'sortable' => TRUE,
       ],
       'poster' => [
         'label' => $this->t('Poster'),
@@ -74,6 +73,9 @@ public function getHeaders() {
       ],
       'title' => [
         'label' => $this->t('Title'),
+        'type' => 'property',
+        'specifier' => 'title',
+        'sortable' => TRUE,
       ],
       'date' => [
         'label' => $this->t('Posted'),
@@ -121,31 +123,25 @@ public function getRows(array $results) {
     return $rows;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function entityAccess(EntityModeratedInterface $entity, $operation = 'view', ?AccountInterface $account = NULL) {
-    // Trello #y0B0wxLi: allow beta tested to view unpublished topics.
-    if ($operation === 'view' && UserHelper::userHasRoles(['beta_tester'], $account)) {
-      return AccessResult::allowed();
-    }
-    return parent::entityAccess($entity, $operation, $account);
-  }
-
   /**
    * {@inheritdoc}
    */
   protected function initFilterDefinitions(array $filters = []) {
     $definitions = parent::initFilterDefinitions([
+      'content_type',
+      'title',
       'status',
-      'author',
+      'job_closing_date',
       'created',
-      'user_role',
-      'title',
-      'type',
-      'poster',
       'source',
+      'author',
     ]);
+
+    $definitions['content_type']['values'] = [
+      0 => 'Jobs',
+      2 => 'Training',
+    ];
+
     return $definitions;
   }
 
diff --git a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
index 4b7491a1f..b42c49c36 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
@@ -4,11 +4,11 @@
  * Style the moderation forms used by the editorial teams to review posted
  * documents.
  */
-.path-moderation .rw-moderation-content-filters {
+.rw-moderation-content-filters {
   padding: 24px 0 0 0;
 }
 /* Hide visually the filters title to reduce scrolling. */
-.path-moderation .rw-moderation-filters > legend {
+.rw-moderation-filters > legend {
   position: absolute;
   overflow: hidden;
   clip: rect(0, 0, 0, 0);
@@ -20,11 +20,11 @@
   border: none;
   clip-path: inset(100%);
 }
-.path-moderation #edit-filters {
+.rw-moderation-filters #edit-filters {
   padding-bottom: 0;
   border-bottom: none;
 }
-.path-moderation #edit-filters-status [class*="form-item-filters-status-"] {
+.rw-moderation-filters #edit-filters-status [class*="form-item-filters-status-"] {
   width: 100%;
   margin-bottom: 12px;
   padding: 2px 8px;
@@ -36,48 +36,48 @@
   font-size: 16px;
   line-height: 16px;
 }
-.path-moderation #edit-filters-status.form-checkboxes {
+.rw-moderation-filters #edit-filters-status.form-checkboxes {
   display: grid;
   grid-template-columns: repeat(auto-fill, minmax(140px, 1fr));
   grid-gap: 0 24px;
   margin-bottom: -12px;
 }
-.path-moderation.path-moderation-content-disaster #edit-filters-status .form-checkboxes {
+.path-moderation-content-disaster #edit-filters-status .form-checkboxes {
   grid-template-columns: repeat(auto-fill, minmax(170px, 1fr));
 }
-.path-moderation #edit-filters-other .fieldset-wrapper > * {
+.rw-moderation-filters #edit-filters-other .fieldset-wrapper > * {
   display: inline-block;
   margin-top: 0;
   vertical-align: middle;
 }
-.path-moderation #edit-omnibox .fieldset-wrapper {
+.rw-moderation-filters #edit-omnibox .fieldset-wrapper {
   display: table;
 }
-.path-moderation #edit-omnibox .fieldset-wrapper > * {
+.rw-moderation-filters #edit-omnibox .fieldset-wrapper > * {
   display: table-cell;
   height: 32px;
   margin: 0;
   padding: 0;
   vertical-align: middle;
 }
-.path-moderation #edit-omnibox .fieldset-wrapper > :first-child {
+.rw-moderation-filters #edit-omnibox .fieldset-wrapper > :first-child {
   padding-right: 8px;
 }
-.path-moderation #edit-omnibox .fieldset-wrapper select {
+.rw-moderation-filters #edit-omnibox .fieldset-wrapper select {
   width: auto;
   /* height: 100%; */
 }
-.path-moderation #edit-omnibox div[data-autocomplete] > input {
+.rw-moderation-filters #edit-omnibox div[data-autocomplete] > input {
   border-right: 2px solid var(--cd-reliefweb-brand-grey--light);
 }
-.path-moderation [data-selection] > span span + span {
+.rw-moderation-filters [data-selection] > span span + span {
   font-weight: bold;
 }
-.path-moderation .form-actions.form-item {
+.rw-moderation-filters .form-actions.form-item {
   margin-top: 16px;
 }
 /* Link to create a new entity. */
-.path-moderation .form-actions a {
+.rw-moderation-filters .form-actions a {
   display: inline-block;
   margin-top: 12px;
   margin-inline-start: 0.5rem;
@@ -97,7 +97,7 @@
   padding: 32px 0;
 }
 /* Hide visually the list title to reduce scrolling. */
-.path-moderation .rw-moderation-list > h3 {
+.rw-moderation-list > h3 {
   position: absolute;
   overflow: hidden;
   clip: rect(0, 0, 0, 0);
@@ -109,7 +109,7 @@
   border: none;
   clip-path: inset(100%);
 }
-.path-moderation .rw-moderation-content__total-list {
+.rw-moderation-list .rw-moderation-content__total-list {
   display: grid;
   grid-template-columns: repeat(auto-fit, minmax(80px, 1fr));
   grid-gap: 24px;
@@ -117,7 +117,7 @@
   padding: 0;
   text-align: center;
 }
-.path-moderation .rw-moderation-content__total-list [data-moderation-status] {
+.rw-moderation-list .rw-moderation-content__total-list [data-moderation-status] {
   display: inline-block;
   display: flex;
   flex-direction: column;
@@ -130,20 +130,20 @@
   background: none;
   font-weight: normal;
 }
-.path-moderation .rw-moderation-content__total-list [data-moderation-status] * {
+.rw-moderation-list .rw-moderation-content__total-list [data-moderation-status] * {
   display: block;
   font-size: 16px;
   line-height: 1.2;
 }
-.path-moderation .rw-moderation-content__total-list [data-moderation-status] strong {
+.rw-moderation-list .rw-moderation-content__total-list [data-moderation-status] strong {
   margin-top: 8px;
 }
-.path-moderation .rw-moderation-list td .rw-moderation-status[data-moderation-status] {
+.rw-moderation-list td .rw-moderation-status[data-moderation-status] {
   margin: 12px 0 0 0;
   padding: 6px;
   font-size: 12px;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table tr td:first-child {
+.rw-moderation-list .rw-moderation-table tr td:first-child {
   text-align: center;
   /* white-space: pre; */
 }
@@ -151,52 +151,52 @@
   width: 100%;
   word-break: break-word;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) > * {
+.rw-moderation-list .rw-moderation-table tr td:nth-child(2) > * {
   margin: 0;
   padding: 0;
   font-size: 14px;
   line-height: 1.5;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) div + div {
+.rw-moderation-list .rw-moderation-table tr td:nth-child(2) div + div {
   margin-top: 4px;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) .rw-moderation-table__cell__title {
+.rw-moderation-list .rw-moderation-table tr td:nth-child(2) .rw-moderation-table__cell__title {
   font-size: 16px;
   font-weight: bold;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) .headline-title {
+.rw-moderation-list .rw-moderation-table tr td:nth-child(2) .headline-title {
   font-size: 15px;
   font-style: italic;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) .rw-moderation-table__cell__info {
+.rw-moderation-list .rw-moderation-table tr td:nth-child(2) .rw-moderation-table__cell__info {
   font-size: 15px;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) .rw-moderation-table__cell__info .rw-moderation-table__cell__info__country a,
-.path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) .rw-moderation-table__cell__details .rw-moderation-table__cell__info__source a {
+.rw-moderation-list .rw-moderation-table tr td:nth-child(2) .rw-moderation-table__cell__info .rw-moderation-table__cell__info__country a,
+.rw-moderation-list .rw-moderation-table tr td:nth-child(2) .rw-moderation-table__cell__details .rw-moderation-table__cell__info__source a {
   color: var(--cd-reliefweb-brand-grey--dark);
   font-weight: bold;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table__cell__bury {
+.rw-moderation-list .rw-moderation-table__cell__bury {
   margin-top: 12px;
   font-size: 15px;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) .closing-date {
+.rw-moderation-list .rw-moderation-table tr td:nth-child(2) .closing-date {
   font-weight: bold;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) .dates,
-.path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) .cost {
+.rw-moderation-list .rw-moderation-table tr td:nth-child(2) .dates,
+.rw-moderation-list .rw-moderation-table tr td:nth-child(2) .cost {
   font-weight: bold;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) .value {
+.rw-moderation-list .rw-moderation-table tr td:nth-child(2) .value {
   font-weight: normal;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table__cell__date {
+.rw-moderation-list .rw-moderation-table__cell__date {
   text-align: center;
   white-space: pre;
   font-size: 15px;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table__header--sort--asc:after,
-.path-moderation .rw-moderation-list .rw-moderation-table__header--sort--desc:after {
+.rw-moderation-list .rw-moderation-table__header--sort--asc:after,
+.rw-moderation-list .rw-moderation-table__header--sort--desc:after {
   display: inline-block;
   overflow: hidden;
   width: 12px;
@@ -205,10 +205,10 @@
   vertical-align: middle;
   background: var(--rw-icons--toggle--up--12--dark-blue);
 }
-.path-moderation .rw-moderation-list .rw-moderation-table__header--sort--desc:after {
+.rw-moderation-list .rw-moderation-table__header--sort--desc:after {
   background: var(--rw-icons--toggle--down--12--dark-blue);
 }
-.path-moderation .rw-moderation-list .pager {
+.rw-moderation-list .pager {
   padding-top: 0;
   border-top: none;
 }

From df3a9dd36bfce8b41bc469cf5bc467cb33a1b49c Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 11 Nov 2021 08:24:48 -0700
Subject: [PATCH 064/720] remove more declarations in favour of base theme, add
 rules for media library UI buttons so styles match other UI buttons

---
 .../components/rw-form/rw-form--widget.css    | 32 ++++++++++++++++---
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
index 7d572d083..997c72fea 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
@@ -1,18 +1,15 @@
 /* Media widget */
 form .js-media-library-widget .fieldset-wrapper {
-  padding: 8px;
   border: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
 form .image-widget {
-  padding: 0 16px 16px;
+  padding: 0 0 16px;
 }
-
 @media (min-width: 576px) {
   form .image-widget {
     justify-content: center;
   }
 }
-
 @media (min-width: 576px) {
   form .image-widget article {
     flex: 1 0 220px;
@@ -22,7 +19,6 @@ form .image-widget {
 form .image-widget article > div {
   font-size: 14px;
 }
-
 @media (min-width: 576px) {
   form .image-widget article > div {
     font-size: 14px;
@@ -46,3 +42,29 @@ form .js-media-library-widget .js-media-library-selection.form-wrapper,
 .js-media-library-add-form .image-widget {
   padding: 0;
 }
+
+/* Media UI buttons styled the same as other UI buttons */
+.ui-dialog .ui-dialog-buttonpane .cd-button,
+.view-media-library .cd-button,
+.js-media-library-add-form-added-media .cd-button {
+  padding: 14px;
+  color: white;
+  border: none;
+  background: var(--cd-reliefweb-brand-blue--dark);
+  font-size: 15px;
+  font-weight: bold;
+  transition: none;
+  border-radius: 0;
+}
+.ui-dialog .ui-dialog-buttonpane .cd-button:hover,
+.ui-dialog .ui-dialog-buttonpane .cd-button:focus,
+.ui-dialog .ui-dialog-buttonpane .cd-button:active,
+.view-media-library .cd-button:hover,
+.view-media-library .cd-button:focus,
+.view-media-library .cd-button:active,
+.js-media-library-add-form-added-media .cd-button:hover,
+.js-media-library-add-form-added-media .cd-button:focus,
+.js-media-library-add-form-added-media .cd-button:active {
+  text-decoration: underline;
+  background: var(--cd-reliefweb-brand-red--dark);
+}

From ed9121948d1852e7c30a0165c1aeee726f24ec17 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 11 Nov 2021 08:39:41 -0700
Subject: [PATCH 065/720] linting

---
 .../components/rw-form/rw-form--widget.css                 | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
index 997c72fea..5528aabc4 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
@@ -5,11 +5,13 @@ form .js-media-library-widget .fieldset-wrapper {
 form .image-widget {
   padding: 0 0 16px;
 }
+
 @media (min-width: 576px) {
   form .image-widget {
     justify-content: center;
   }
 }
+
 @media (min-width: 576px) {
   form .image-widget article {
     flex: 1 0 220px;
@@ -19,6 +21,7 @@ form .image-widget {
 form .image-widget article > div {
   font-size: 14px;
 }
+
 @media (min-width: 576px) {
   form .image-widget article > div {
     font-size: 14px;
@@ -48,13 +51,13 @@ form .js-media-library-widget .js-media-library-selection.form-wrapper,
 .view-media-library .cd-button,
 .js-media-library-add-form-added-media .cd-button {
   padding: 14px;
+  transition: none;
   color: white;
   border: none;
+  border-radius: 0;
   background: var(--cd-reliefweb-brand-blue--dark);
   font-size: 15px;
   font-weight: bold;
-  transition: none;
-  border-radius: 0;
 }
 .ui-dialog .ui-dialog-buttonpane .cd-button:hover,
 .ui-dialog .ui-dialog-buttonpane .cd-button:focus,

From 87126d8b8a88a5d0ef615f9b09cbda4fa529ef6f Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 11 Nov 2021 14:53:50 -0700
Subject: [PATCH 066/720] correct typo

---
 .../src/Services/ReportModeration.php          |  2 +-
 .../reliefweb-moderation-table.html.twig       |  2 +-
 .../components/rw-moderation/rw-moderation.css | 18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/html/modules/custom/reliefweb_moderation/src/Services/ReportModeration.php b/html/modules/custom/reliefweb_moderation/src/Services/ReportModeration.php
index 69e4fb253..30652e3c5 100644
--- a/html/modules/custom/reliefweb_moderation/src/Services/ReportModeration.php
+++ b/html/modules/custom/reliefweb_moderation/src/Services/ReportModeration.php
@@ -130,7 +130,7 @@ public function getRows(array $results) {
       // Details.
       $details = [];
       // Content format.
-      $datails['format'] = [];
+      $details['format'] = [];
       foreach ($entity->field_content_format as $item) {
         if (!empty($item->entity)) {
           $item_title = $item->entity->label();
diff --git a/html/modules/custom/reliefweb_moderation/templates/reliefweb-moderation-table.html.twig b/html/modules/custom/reliefweb_moderation/templates/reliefweb-moderation-table.html.twig
index 4535659e0..e8ca78f81 100644
--- a/html/modules/custom/reliefweb_moderation/templates/reliefweb-moderation-table.html.twig
+++ b/html/modules/custom/reliefweb_moderation/templates/reliefweb-moderation-table.html.twig
@@ -62,7 +62,7 @@
           {# Details like content format, language and creator. #}
           <div class="rw-moderation-table__cell__details">
           {% for id, item in cell.details %}
-            <span class="rw-moderation-table__cell__datails__{{ id|clean_class }}">{{ item is iterable ? item|join(', ')|raw : item }}</span>
+            <span class="rw-moderation-table__cell__details__{{ id|clean_class }}">{{ item is iterable ? item|join(', ')|raw : item }}</span>
             {{- loop.last ? '' : ' - ' -}}
           {% endfor %}
           </div>
diff --git a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
index f1540a999..65532104d 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
@@ -170,20 +170,20 @@
   margin-top: 12px;
   font-size: 15px;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__datails,
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details,
 .path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__revision {
   font-size: 14px;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__datails__closing-date,
-.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__datails__registration-deadline,
-.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__datails__training-date,
-.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__datails__cost {
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__closing-date,
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__registration-deadline,
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__training-date,
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__cost {
   font-weight: bold;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__datails__closing-date em,
-.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__datails__registration-deadline em,
-.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__datails__training-date em,
-.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__datails__cost em {
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__closing-date em,
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__registration-deadline em,
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__training-date em,
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__cost em {
   font-weight: normal;
 }
 .path-moderation .rw-moderation-list .rw-moderation-table__cell__date {

From 205da69b3297e51ab8aa35d4307fc95ffbe11603 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 11 Nov 2021 15:42:41 -0700
Subject: [PATCH 067/720] rename css file so it match library definition and is
 thus loaded, add break word so long urls wrap on mobile

---
 .../{reliefweb-section-links.css => rw-section-links.css}    | 5 +++++
 1 file changed, 5 insertions(+)
 rename html/themes/custom/common_design_subtheme/components/rw-section-links/{reliefweb-section-links.css => rw-section-links.css} (85%)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-section-links/reliefweb-section-links.css b/html/themes/custom/common_design_subtheme/components/rw-section-links/rw-section-links.css
similarity index 85%
rename from html/themes/custom/common_design_subtheme/components/rw-section-links/reliefweb-section-links.css
rename to html/themes/custom/common_design_subtheme/components/rw-section-links/rw-section-links.css
index 8934add91..ac8d3cc6b 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-section-links/reliefweb-section-links.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-section-links/rw-section-links.css
@@ -15,3 +15,8 @@
 .field--type-reliefweb-section-links tr[data-dragged] td {
   background-color: var(--cd-reliefweb-brand-grey--light);
 }
+
+/* Related Content Reports search table */
+.rw-section-links table a {
+  word-break: break-word;
+}

From 28c36d8dae8425c1eb7983e587cecbca0a3c83a0 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 11 Nov 2021 16:02:35 -0700
Subject: [PATCH 068/720] add community topics and subscription form Save
 buttons as exception to CSS field UI button rules

---
 .../components/rw-form/rw-form.css                   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 572da8c74..0bb62262e 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -13,7 +13,9 @@ form textarea {
   font-weight: normal;
 }
 form button,
-.form-item .cd-button {
+/* Apply styles to field UI buttons
+  with some exceptions (Notably "Save" buttons) */
+form:not(.subscription-form):not(.community-topics-form) .form-item .cd-button {
   margin: 0 12px 0 0;
   padding: 14px;
   color: white;
@@ -25,13 +27,13 @@ form button,
 form button:hover,
 form button:focus,
 form button:active,
-.form-item .cd-button:hover,
-.form-item .cd-button:focus,
-.form-item .cd-button:active {
+form:not(.subscription-form):not(.community-topics-form) .form-item .cd-button:hover,
+form:not(.subscription-form):not(.community-topics-form) .form-item .cd-button:focus,
+form:not(.subscription-form):not(.community-topics-form) .form-item .cd-button:active {
   text-decoration: underline;
   background: var(--cd-reliefweb-brand-red--dark);
 }
-.form-item .cd-button {
+form:not('.subscription-form'):not('community-topics-form') .form-item .cd-button {
   transition: none;
   border-radius: 0;
 }

From 1924d8392aa3832960c6be1930edbe883c833b3b Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 11 Nov 2021 16:08:07 -0700
Subject: [PATCH 069/720] article header of document pages needs 100% width

---
 .../components/rw-document/rw-document.css                     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-document/rw-document.css b/html/themes/custom/common_design_subtheme/components/rw-document/rw-document.css
index b4a0977ac..0b1db9430 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-document/rw-document.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-document/rw-document.css
@@ -16,6 +16,9 @@
   width: 100%;
   content: "";
 }
+.rw-document .rw-article__header {
+  width: 100%;
+}
 .rw-document figure {
   margin: 0 0 16px 0;
 }

From ec5d4e0617f5c6a180c4fda5eb7d403d6396d034 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 11 Nov 2021 16:38:37 -0700
Subject: [PATCH 070/720] display label inline so multi-word wraps

---
 .../components/rw-selection/rw-selection.css                  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-selection/rw-selection.css b/html/themes/custom/common_design_subtheme/components/rw-selection/rw-selection.css
index 2c8d538a6..d152e8238 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-selection/rw-selection.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-selection/rw-selection.css
@@ -34,10 +34,8 @@
   /* Better readability. */
   line-height: 24px;
 }
-.rw-selection [data-value] > span {
-  display: inline-block;
-}
 .rw-selection [data-value] .label {
+  display: inline;
   margin-left: 0.25rem;
   color: var(--cd-reliefweb-brand-grey--dark);
   font-weight: bold;

From ec1d1dd361febb690ad568e7809cf810779d4e31 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 12 Nov 2021 09:27:03 +0900
Subject: [PATCH 071/720] [RW-25] Remove previous file field

---
 ...ntity_form_display.node.report.default.yml |  8 -----
 ...ntity_view_display.node.report.default.yml | 15 ++++------
 ...tity_view_display.node.report.headline.yml |  7 +++--
 ...entity_view_display.node.report.teaser.yml | 14 ++++-----
 config/field.field.node.report.field_file.yml | 29 -------------------
 config/field.storage.node.field_file.yml      | 20 -------------
 6 files changed, 15 insertions(+), 78 deletions(-)
 delete mode 100644 config/field.field.node.report.field_file.yml
 delete mode 100644 config/field.storage.node.field_file.yml

diff --git a/config/core.entity_form_display.node.report.default.yml b/config/core.entity_form_display.node.report.default.yml
index 992d2504c..b61aaa4d1 100644
--- a/config/core.entity_form_display.node.report.default.yml
+++ b/config/core.entity_form_display.node.report.default.yml
@@ -11,7 +11,6 @@ dependencies:
     - field.field.node.report.field_disaster_type
     - field.field.node.report.field_embargo_date
     - field.field.node.report.field_feature
-    - field.field.node.report.field_file
     - field.field.node.report.field_headline
     - field.field.node.report.field_headline_image
     - field.field.node.report.field_headline_summary
@@ -163,13 +162,6 @@ content:
     third_party_settings: {  }
     type: options_buttons
     region: content
-  field_file:
-    type: media_library_widget
-    weight: 3
-    settings:
-      media_types: {  }
-    third_party_settings: {  }
-    region: content
   field_headline:
     weight: 17
     settings:
diff --git a/config/core.entity_view_display.node.report.default.yml b/config/core.entity_view_display.node.report.default.yml
index 4354bcef8..185d3cae3 100644
--- a/config/core.entity_view_display.node.report.default.yml
+++ b/config/core.entity_view_display.node.report.default.yml
@@ -11,7 +11,6 @@ dependencies:
     - field.field.node.report.field_disaster_type
     - field.field.node.report.field_embargo_date
     - field.field.node.report.field_feature
-    - field.field.node.report.field_file
     - field.field.node.report.field_headline
     - field.field.node.report.field_headline_image
     - field.field.node.report.field_headline_summary
@@ -44,6 +43,11 @@ content:
     third_party_settings: {  }
     type: text_default
     region: content
+  content_moderation_control:
+    weight: -20
+    settings: {  }
+    third_party_settings: {  }
+    region: content
   field_content_format:
     weight: 2
     label: visually_hidden
@@ -76,15 +80,6 @@ content:
     third_party_settings: {  }
     type: entity_reference_label
     region: content
-  field_file:
-    type: entity_reference_entity_view
-    weight: 8
-    label: visually_hidden
-    settings:
-      view_mode: default
-      link: false
-    third_party_settings: {  }
-    region: content
   field_image:
     weight: 6
     label: hidden
diff --git a/config/core.entity_view_display.node.report.headline.yml b/config/core.entity_view_display.node.report.headline.yml
index aa7db72ca..945c3ff09 100644
--- a/config/core.entity_view_display.node.report.headline.yml
+++ b/config/core.entity_view_display.node.report.headline.yml
@@ -12,7 +12,6 @@ dependencies:
     - field.field.node.report.field_disaster_type
     - field.field.node.report.field_embargo_date
     - field.field.node.report.field_feature
-    - field.field.node.report.field_file
     - field.field.node.report.field_headline
     - field.field.node.report.field_headline_image
     - field.field.node.report.field_headline_summary
@@ -36,6 +35,11 @@ targetEntityType: node
 bundle: report
 mode: headline
 content:
+  content_moderation_control:
+    weight: -20
+    settings: {  }
+    third_party_settings: {  }
+    region: content
   field_country:
     weight: 2
     label: visually_hidden
@@ -92,7 +96,6 @@ hidden:
   field_disaster_type: true
   field_embargo_date: true
   field_feature: true
-  field_file: true
   field_headline: true
   field_image: true
   field_language: true
diff --git a/config/core.entity_view_display.node.report.teaser.yml b/config/core.entity_view_display.node.report.teaser.yml
index 38ecddedb..cca7519f3 100644
--- a/config/core.entity_view_display.node.report.teaser.yml
+++ b/config/core.entity_view_display.node.report.teaser.yml
@@ -12,7 +12,6 @@ dependencies:
     - field.field.node.report.field_disaster_type
     - field.field.node.report.field_embargo_date
     - field.field.node.report.field_feature
-    - field.field.node.report.field_file
     - field.field.node.report.field_headline
     - field.field.node.report.field_headline_image
     - field.field.node.report.field_headline_summary
@@ -46,6 +45,11 @@ content:
     settings:
       trim_length: 300
     third_party_settings: {  }
+  content_moderation_control:
+    weight: -20
+    settings: {  }
+    third_party_settings: {  }
+    region: content
   field_content_format:
     type: entity_reference_label
     weight: 4
@@ -62,14 +66,6 @@ content:
     settings:
       link: true
     third_party_settings: {  }
-  field_file:
-    type: entity_reference_label
-    weight: 2
-    region: content
-    label: hidden
-    settings:
-      link: true
-    third_party_settings: {  }
   field_original_publication_date:
     type: datetime_default
     weight: 6
diff --git a/config/field.field.node.report.field_file.yml b/config/field.field.node.report.field_file.yml
deleted file mode 100644
index 30a797131..000000000
--- a/config/field.field.node.report.field_file.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 958a5dcb-a157-4810-8879-b2631a0f175f
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_file
-    - media.type.file_report
-    - node.type.report
-id: node.report.field_file
-field_name: field_file
-entity_type: node
-bundle: report
-label: Attachments
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:media'
-  handler_settings:
-    target_bundles:
-      file_report: file_report
-    sort:
-      field: mid
-      direction: DESC
-    auto_create: false
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/field.storage.node.field_file.yml b/config/field.storage.node.field_file.yml
deleted file mode 100644
index d5a8c383a..000000000
--- a/config/field.storage.node.field_file.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: fd39bfa9-22e4-47d1-9401-fd7595fe0428
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-    - node
-id: node.field_file
-field_name: field_file
-entity_type: node
-type: entity_reference
-settings:
-  target_type: media
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false

From 432be6992582a7187af180d15ffd4b6e00e7101c Mon Sep 17 00:00:00 2001
From: Peter Droogmans <peter@attiks.com>
Date: Fri, 12 Nov 2021 09:19:54 +0100
Subject: [PATCH 072/720] Update
 html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php

Co-authored-by: orakili <github@orakili.net>
---
 .../reliefweb_user_posts/src/Controller/UserPostsPage.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php b/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php
index 82fefe839..90fd1413d 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php
@@ -123,7 +123,7 @@ public function getContent(UserInterface $user, ModerationServiceInterface $serv
     }
 
     return [
-      '#theme' => 'reliefweb_moderation_page',
+      '#theme' => 'reliefweb_moderation_page__user_posts',
       '#filters' => $form,
       // List of results as a table with a pager.
       '#list' => $service->getTable($filters, 30),

From 2e9ab97c83c4566e8a1f60fa5a34081f5056fe02 Mon Sep 17 00:00:00 2001
From: Peter Droogmans <peter@attiks.com>
Date: Fri, 12 Nov 2021 09:20:19 +0100
Subject: [PATCH 073/720] Update
 html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php

Co-authored-by: orakili <github@orakili.net>
---
 .../reliefweb_user_posts/src/Services/UserPostsService.php  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
index 4d89f6a7c..cb137746c 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
@@ -55,9 +55,15 @@ public function getHeaders() {
     return [
       'id' => [
         'label' => $this->t('Id'),
+        'type' => 'property',
+        'specifier' => 'nid',
+        'sortable' => TRUE,
       ],
       'type' => [
         'label' => $this->t('Type'),
+        'type' => 'property',
+        'specifier' => 'type',
+        'sortable' => TRUE,
       ],
       'status' => [
         'label' => $this->t('Status'),

From 244c9d194ac4df42f16bf31574153eec0db71749 Mon Sep 17 00:00:00 2001
From: Peter Droogmans <peter@attiks.com>
Date: Fri, 12 Nov 2021 09:20:47 +0100
Subject: [PATCH 074/720] Update
 html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php

Co-authored-by: orakili <github@orakili.net>
---
 .../reliefweb_user_posts/src/Services/UserPostsService.php   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
index cb137746c..70e45ad37 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
@@ -117,7 +117,10 @@ public function getRows(array $results) {
       // Edit link + status cell.
       $cells['id'] = $entity->id();
       $cells['type'] = $entity->bundle();
-      $cells['status'] = $entity->getModerationStatusLabel();
+      $cells['status'] = new FormattableMarkup('<div class="rw-moderation-status" data-moderation-status="@status">@label</div>', [
+        '@status' => $entity->getModerationStatus(),
+        '@label' => $entity->getModerationStatusLabel(),
+      ]);
       $cells['poster'] = $entity->getOwner()->label();
       $cells['source'] = '';
       $cells['title'] = $entity->toLink()->toString();

From 3132316831bd1e570849446b3dbf61dc5691d4aa Mon Sep 17 00:00:00 2001
From: Peter Droogmans <peter@attiks.com>
Date: Fri, 12 Nov 2021 09:24:09 +0100
Subject: [PATCH 075/720] Update
 html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php

Co-authored-by: orakili <github@orakili.net>
---
 .../src/Services/UserPostsService.php               | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
index 70e45ad37..92b3b5d42 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
@@ -146,9 +146,16 @@ protected function initFilterDefinitions(array $filters = []) {
       'author',
     ]);
 
-    $definitions['content_type']['values'] = [
-      0 => 'Jobs',
-      2 => 'Training',
+    $definitions['bundle'] = [
+      'type' => 'property',
+      'field' => 'type',
+      'label' => $this->t('Type'),
+      'shortcut' => 'ty',
+      'form' => 'other',
+      'values' => [
+        'job' => $this->t('Job'),
+        'training' => $this->t('Training'),
+      ],
     ];
 
     return $definitions;

From 083965e9e5eedc7f60c3f13706c9d00a5d643e57 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Fri, 12 Nov 2021 09:25:44 +0100
Subject: [PATCH 076/720] Add use

---
 .../reliefweb_user_posts/src/Services/UserPostsService.php       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
index 70e45ad37..d181b4b1c 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
@@ -3,6 +3,7 @@
 namespace Drupal\reliefweb_user_posts\Services;
 
 use Drupal\reliefweb_moderation\ModerationServiceBase;
+use Drupal\Component\Render\FormattableMarkup;
 
 /**
  * Moderation service for the report nodes.

From 09b95dbf9163a56bde8ab4d51ba5ad928b48e1e4 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Fri, 12 Nov 2021 09:25:53 +0100
Subject: [PATCH 077/720] Add filter form

---
 .../src/Form/UserPostsPageFilterForm.php      | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 html/modules/custom/reliefweb_user_posts/src/Form/UserPostsPageFilterForm.php

diff --git a/html/modules/custom/reliefweb_user_posts/src/Form/UserPostsPageFilterForm.php b/html/modules/custom/reliefweb_user_posts/src/Form/UserPostsPageFilterForm.php
new file mode 100644
index 000000000..eaf31e74c
--- /dev/null
+++ b/html/modules/custom/reliefweb_user_posts/src/Form/UserPostsPageFilterForm.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Drupal\reliefweb_user_posts\Form;
+
+use Drupal\Component\Render\FormattableMarkup;
+use Drupal\reliefweb_moderation\Form\ModerationPageFilterForm;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Url;
+use Drupal\reliefweb_moderation\ModerationServiceInterface;
+
+/**
+ * Content moderation page filter form handler.
+ */
+class UserPostsPageFilterForm extends ModerationPageFilterForm {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'reliefweb_moderation_page_filter_form';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state, ModerationServiceInterface $service = NULL) {
+    $form = parent::buildForm($form, $form_state, $service);
+
+    // Link to create a new entity.
+    $url_options = ['attributes' => ['target' => '_blank']];
+
+    $links = $this->t('Create a new <a href="@job_url">Job vacancy</a> or a new <a href="@training_url">Training program</a>', [
+      '@job_url' => Url::fromRoute('node.add', [
+        'node_type' => 'job',
+      ], $url_options)->toString(),
+      '@training_url' => Url::fromRoute('node.add', [
+        'node_type' => 'training',
+      ], $url_options)->toString(),
+    ]);
+
+    $form['intro'] = [
+      '#weight' => -100,
+      '#markup' => new FormattableMarkup('<div class="rw-moderation-intro">' . $links . '</div>', []),
+    ];
+
+    return $form;
+  }
+
+}

From 49395ee98b407c5a2d48a79dff177726d8c602d2 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Fri, 12 Nov 2021 09:28:56 +0100
Subject: [PATCH 078/720] Sort moderation state, remove content_type

---
 .../reliefweb_user_posts/src/Services/UserPostsService.php   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
index dc1b4dcb3..645245a61 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
@@ -68,8 +68,8 @@ public function getHeaders() {
       ],
       'status' => [
         'label' => $this->t('Status'),
-        'type' => 'property',
-        'specifier' => 'status',
+        'type' => '',
+        'specifier' => 'moderation_state',
         'sortable' => TRUE,
       ],
       'poster' => [
@@ -138,7 +138,6 @@ public function getRows(array $results) {
    */
   protected function initFilterDefinitions(array $filters = []) {
     $definitions = parent::initFilterDefinitions([
-      'content_type',
       'title',
       'status',
       'job_closing_date',

From 8760d4de637b219fd356f76379629c3a0ad68def Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Fri, 12 Nov 2021 09:46:24 +0100
Subject: [PATCH 079/720] Remove closing date filter

---
 .../reliefweb_user_posts/src/Services/UserPostsService.php       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
index 645245a61..014b99dff 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
@@ -140,7 +140,6 @@ protected function initFilterDefinitions(array $filters = []) {
     $definitions = parent::initFilterDefinitions([
       'title',
       'status',
-      'job_closing_date',
       'created',
       'source',
       'author',

From 68c01d6abaeb853653be6e89c9271604e12a5ff7 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Fri, 12 Nov 2021 10:10:41 +0100
Subject: [PATCH 080/720] Me or other

---
 .../src/Services/UserPostsService.php            | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
index 014b99dff..7ccee7395 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
@@ -122,7 +122,7 @@ public function getRows(array $results) {
         '@status' => $entity->getModerationStatus(),
         '@label' => $entity->getModerationStatusLabel(),
       ]);
-      $cells['poster'] = $entity->getOwner()->label();
+      $cells['poster'] = $this->currentUser->id() == $entity->getOwner()->id() ? $this->t('me') : $this->t('other');
       $cells['source'] = '';
       $cells['title'] = $entity->toLink()->toString();
       $cells['date'] = $this->getEntityCreationDate($entity);
@@ -157,6 +157,20 @@ protected function initFilterDefinitions(array $filters = []) {
       ],
     ];
 
+    $definitions['author2'] = [
+      'type' => 'property',
+      'field' => 'uid',
+      'label' => $this->t('Posted by'),
+      'shortcut' => 'a',
+      'form' => 'other',
+      'join_callback' => 'joinPoster',
+      'operator' => 'OR',
+      'values' => [
+        'me' => $this->t('Me'),
+        'other' => $this->t('Other'),
+      ],
+    ];
+
     return $definitions;
   }
 

From 36d03c3951cf2cfa0dcde411b1f198e7c4f2505e Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Fri, 12 Nov 2021 10:15:38 +0100
Subject: [PATCH 081/720] Deadline and date format

---
 .../src/Services/UserPostsService.php                  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
index 7ccee7395..c8af064e7 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
@@ -126,7 +126,15 @@ public function getRows(array $results) {
       $cells['source'] = '';
       $cells['title'] = $entity->toLink()->toString();
       $cells['date'] = $this->getEntityCreationDate($entity);
-      $cells['deadline'] = $entity->field_registration_deadline ? $entity->field_registration_deadline->value : '';
+
+      $cells['deadline'] = '';
+      if ($entity->field_registration_deadline) {
+        $cells['deadline'] = $this->formatDate($entity->field_registration_deadline->value);
+      }
+      elseif ($entity->field_job_closing_date) {
+        $cells['deadline'] = $this->formatDate($entity->field_job_closing_date->value);
+      }
+
       $rows[] = $cells;
     }
 

From 9335a62e2df96512b9a78d0bf3d81fd91f00e1f0 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Fri, 12 Nov 2021 10:28:47 +0100
Subject: [PATCH 082/720] Fix data bundle for js

---
 .../src/Form/UserPostsPageFilterForm.php                    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/html/modules/custom/reliefweb_user_posts/src/Form/UserPostsPageFilterForm.php b/html/modules/custom/reliefweb_user_posts/src/Form/UserPostsPageFilterForm.php
index eaf31e74c..922effd56 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Form/UserPostsPageFilterForm.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Form/UserPostsPageFilterForm.php
@@ -38,11 +38,17 @@ public function buildForm(array $form, FormStateInterface $form_state, Moderatio
       ], $url_options)->toString(),
     ]);
 
+    // Add intro.
     $form['intro'] = [
       '#weight' => -100,
       '#markup' => new FormattableMarkup('<div class="rw-moderation-intro">' . $links . '</div>', []),
     ];
 
+    // Fix data bundle.
+    if (isset($form['filters']['omnibox']['input']['#attributes']['data-bundle'])) {
+      $form['filters']['omnibox']['input']['#attributes']['data-bundle'] = 'user_posts';
+    }
+
     return $form;
   }
 

From 1a71e74c70d20296ee42dde5c5c8a53e4a16df8a Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Fri, 12 Nov 2021 10:48:34 +0100
Subject: [PATCH 083/720] Filter sources

---
 .../src/Services/UserPostsService.php         | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
index c8af064e7..d05b49564 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
@@ -153,6 +153,7 @@ protected function initFilterDefinitions(array $filters = []) {
       'author',
     ]);
 
+    // Filter by bundle.
     $definitions['bundle'] = [
       'type' => 'property',
       'field' => 'type',
@@ -165,6 +166,9 @@ protected function initFilterDefinitions(array $filters = []) {
       ],
     ];
 
+    // Limti sources.
+    $definitions['source']['autocomplete_callback'] = 'getSourcesTheUserHasPostedFor';
+
     $definitions['author2'] = [
       'type' => 'property',
       'field' => 'uid',
@@ -182,4 +186,30 @@ protected function initFilterDefinitions(array $filters = []) {
     return $definitions;
   }
 
+  /**
+   * Get taxonomy term suggestions for the given term.
+   *
+   * @param string $filter
+   *   Filter name.
+   * @param string $term
+   *   Autocomplete search term.
+   * @param string $conditions
+   *   Stringified database conditions in the form:
+   *   "(@field = 'bar' AND @field = 'bar')".
+   *   This conditions will be duplicated for each passed field and combined
+   *   into a OR condition.
+   * @param array $replacements
+   *   Value replacements for the search condition.
+   *
+   * @return array
+   *   List of suggestions. Each suggestion is an object with a value, label
+   *   and optional abbreviation (abbr).
+   */
+  protected function getSourcesTheUserHasPostedFor($filter, $term, $conditions, array $replacements) {
+    $sources = parent::getTaxonomyTermAutocompleteSuggestions($filter, $term, $conditions, $replacements);
+
+    // @todo filter sources.
+    return $sources;
+  }
+
 }

From 55c5a98a5abfa0789b18ea9a069f73bc563e4918 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Fri, 12 Nov 2021 11:00:27 +0100
Subject: [PATCH 084/720] Filter sources, getUserPostingRights

---
 .../src/Services/UserPostsService.php         | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
index d05b49564..a093f5b0f 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
@@ -2,8 +2,9 @@
 
 namespace Drupal\reliefweb_user_posts\Services;
 
-use Drupal\reliefweb_moderation\ModerationServiceBase;
 use Drupal\Component\Render\FormattableMarkup;
+use Drupal\reliefweb_moderation\Helpers\UserPostingRightsHelper;
+use Drupal\reliefweb_moderation\ModerationServiceBase;
 
 /**
  * Moderation service for the report nodes.
@@ -206,10 +207,29 @@ protected function initFilterDefinitions(array $filters = []) {
    *   and optional abbreviation (abbr).
    */
   protected function getSourcesTheUserHasPostedFor($filter, $term, $conditions, array $replacements) {
-    $sources = parent::getTaxonomyTermAutocompleteSuggestions($filter, $term, $conditions, $replacements);
+    $all_sources = parent::getTaxonomyTermAutocompleteSuggestions($filter, $term, $conditions, $replacements);
+
+    // Filter sources.
+    $sources = [];
+    foreach ($all_sources as $source) {
+      $sources[] = $source->value;
+    }
+
+    $rights = UserPostingRightsHelper::getUserPostingRights($this->currentUser, $sources);
+
+    $allowed_sources = [];
+    foreach ($all_sources as $source) {
+      if (isset($rights[$source->value])) {
+        if (isset($rights[$source->value]['job']) && $rights[$source->value]['job'] > 1) {
+          $allowed_sources[] = $source;
+        }
+        elseif (isset($rights[$source->value]['training']) && $rights[$source->value]['training'] > 1) {
+          $allowed_sources[] = $source;
+        }
+      }
+    }
 
-    // @todo filter sources.
-    return $sources;
+    return $allowed_sources;
   }
 
 }

From 3001ce082adfe3776096e98e51d6608d2dd23068 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Fri, 12 Nov 2021 11:07:55 +0100
Subject: [PATCH 085/720] Filter by nid

---
 .../src/Services/UserPostsService.php                  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
index a093f5b0f..b62b0735b 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
@@ -154,6 +154,16 @@ protected function initFilterDefinitions(array $filters = []) {
       'author',
     ]);
 
+    // Filter by node id.
+    $definitions['nid'] = [
+      'type' => 'property',
+      'field' => 'nid',
+      'label' => $this->t('Id'),
+      'shortcut' => 'i',
+      'form' => 'omnibox',
+      'widget' => 'search',
+    ];
+
     // Filter by bundle.
     $definitions['bundle'] = [
       'type' => 'property',

From da70e49aa59f9b2bed089fafd0a37d46254e0558 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Fri, 12 Nov 2021 12:52:18 +0100
Subject: [PATCH 086/720] Fix condition callback

---
 .../custom/reliefweb_moderation/src/ModerationServiceBase.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
index 40933f205..52b19f54d 100644
--- a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
+++ b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
@@ -1556,7 +1556,7 @@ protected function addFilterCondition(array $definition, Condition $base, $field
     }
 
     if (!empty($definition['condition_callback']) && method_exists($this, $definition['condition_callback'])) {
-      $this->{$definition['condition_callback']}($definition, $base, $field, $value, $operator);
+      $this->{$definition['condition_callback']}($definition, $base, $fields, $value, $operator);
     }
     else {
       if (is_array($fields)) {

From 7f909d967e2bf540cd5ce4e6b0e4c692a61b14c3 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Fri, 12 Nov 2021 12:53:02 +0100
Subject: [PATCH 087/720] Filter on deadline

---
 .../src/Services/UserPostsService.php         | 48 ++++++++++++++++++-
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
index b62b0735b..a458c25c0 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
@@ -3,6 +3,7 @@
 namespace Drupal\reliefweb_user_posts\Services;
 
 use Drupal\Component\Render\FormattableMarkup;
+use Drupal\Core\Database\Query\Select;
 use Drupal\reliefweb_moderation\Helpers\UserPostingRightsHelper;
 use Drupal\reliefweb_moderation\ModerationServiceBase;
 
@@ -93,9 +94,11 @@ public function getHeaders() {
       ],
       'deadline' => [
         'label' => $this->t('Deadline'),
-        'type' => 'property',
+        'type' => '',
         'specifier' => 'deadline',
         'sortable' => TRUE,
+        'join_callback' => 'joinDeadline',
+        'condition_callback' => 'conditionDeadline',
       ],
     ];
   }
@@ -177,9 +180,21 @@ protected function initFilterDefinitions(array $filters = []) {
       ],
     ];
 
-    // Limti sources.
+    // Limit sources.
     $definitions['source']['autocomplete_callback'] = 'getSourcesTheUserHasPostedFor';
 
+    // Filter on deadline.
+    $definitions['deadline'] = [
+      'type' => 'property',
+      'field' => 'deadline',
+      'label' => $this->t('Deadline'),
+      'form' => 'omnibox',
+      'widget' => 'datepicker',
+      'join_callback' => 'joinDeadline',
+      'condition_callback' => 'conditionDeadline',
+      'operator' => 'AND',
+    ];
+
     $definitions['author2'] = [
       'type' => 'property',
       'field' => 'uid',
@@ -242,4 +257,33 @@ protected function getSourcesTheUserHasPostedFor($filter, $term, $conditions, ar
     return $allowed_sources;
   }
 
+  /**
+   * Deadline join callback.
+   *
+   * @see ::joinField()
+   */
+  protected function joinDeadline(Select $query, array $definition, $entity_type_id, $entity_base_table, $entity_id_field, $or = FALSE, $values = []) {
+    $table_job = $this->getFieldTableName('node', 'field_job_closing_date');
+    $field_name_job = $this->getFieldColumnName('node', 'field_job_closing_date', 'value');
+
+    $table_training = $this->getFieldTableName('node', 'field_registration_deadline');
+    $field_name_training = $this->getFieldColumnName('node', 'field_registration_deadline', 'value');
+
+    // Add deadline field.
+    $query->addExpression("COALESCE({$table_job}.{$field_name_job}, {$table_training}.{$field_name_training})", 'deadline');
+
+    // Add joins.
+    $query->leftJoin($table_job, NULL, "{$table_job}.entity_id = {$entity_base_table}.{$entity_id_field}");
+    $query->leftJoin($table_training, NULL, "{$table_training}.entity_id = {$entity_base_table}.{$entity_id_field}");
+
+    return "COALESCE({$table_job}.{$field_name_job}, {$table_training}.{$field_name_training})";
+  }
+
+  /**
+   * Condition callback.
+   */
+  protected function conditionDeadline($definition, $base, $fields, $value, $operator) {
+    $base->where("UNIX_TIMESTAMP({$fields}) {$operator} {$value[0]} AND {$value[1]}");
+  }
+
 }

From 2b7b1f543f174662fb4cf5867f9cd455a7aceffb Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 15 Nov 2021 09:52:21 +0900
Subject: [PATCH 088/720] [RW-25] Refactor widget and add replace functionality

---
 .../install/reliefweb_docstore.settings.yml   |   4 +
 .../schema/reliefweb_docstore.schema.yml      |   6 +
 .../reliefweb_docstore.module                 |  28 +-
 .../src/Controller/FileDownloadController.php |  39 +-
 .../ImageStyleDownloadController.php          |  25 +-
 .../Plugin/Field/FieldType/ReliefWebFile.php  |  49 +-
 .../Field/FieldWidget/ReliefWebFile.php       | 489 +++++++++++++-----
 .../reliefweb-file-widget-item.html.twig      |   4 +-
 8 files changed, 474 insertions(+), 170 deletions(-)

diff --git a/html/modules/custom/reliefweb_docstore/config/install/reliefweb_docstore.settings.yml b/html/modules/custom/reliefweb_docstore/config/install/reliefweb_docstore.settings.yml
index a849e8607..8944de815 100644
--- a/html/modules/custom/reliefweb_docstore/config/install/reliefweb_docstore.settings.yml
+++ b/html/modules/custom/reliefweb_docstore/config/install/reliefweb_docstore.settings.yml
@@ -4,3 +4,7 @@ docstore_url: ''
 api_key: ''
 # The prefix used when creating new content (ex: reliefweb_reports).
 prefix: 'reliefweb_'
+# Name of the directory for the local file attachments.
+file_directory: 'attachments'
+# Name of the directory for the local file previews.
+preview_directory: 'previews'
diff --git a/html/modules/custom/reliefweb_docstore/config/schema/reliefweb_docstore.schema.yml b/html/modules/custom/reliefweb_docstore/config/schema/reliefweb_docstore.schema.yml
index c5c0b9fc0..793a8d234 100644
--- a/html/modules/custom/reliefweb_docstore/config/schema/reliefweb_docstore.schema.yml
+++ b/html/modules/custom/reliefweb_docstore/config/schema/reliefweb_docstore.schema.yml
@@ -11,3 +11,9 @@ reliefweb_docstore.settings:
     prefix:
       type: string
       label: 'The prefix used when creating new content (ex: reliefweb_reports).'
+    file_directory:
+      type: string
+      label: 'Name of the directory for the local file attachments.'
+    preview_directory:
+      type: string
+      label: 'Name of the directory for the local file previews.'
diff --git a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
index efa6e3c8d..5f22839db 100644
--- a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
+++ b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
@@ -69,8 +69,34 @@ function reliefweb_docstore_preprocess_image_style(&$variables) {
   // when the image is regenerated.
   if (isset($variables['image']['#attributes']['data-no-cache'])) {
     $uri = $variables['image']['#uri'];
-    $uri .= (strpos($uri, '?') !== FALSE ? '&' : '?') . microtime(TRUE);
+    $uri .= (strpos($uri, '?') !== FALSE ? '&' : '?') . 'time=' . microtime(TRUE);
     $variables['image']['#uri'] = $uri;
     unset($variables['image']['#attributes']['data-no-cache']);
   }
 }
+
+/**
+ * Get the list of languages supported by ReliefWeb.
+ *
+ * @return array
+ *   List of languages keyed by their ISO 639-1 code.
+ */
+function reliefweb_docstore_get_languages() {
+  static $languages;
+
+  if (!isset($languages)) {
+    $storage = \Drupal::service('entity_type.manager')->getStorage('taxonomy_term');
+    $bundle_key = $storage->getEntityType()->getkey('bundle');
+    $entities = $storage->loadByProperties([$bundle_key => 'language']);
+
+    $languages = [];
+    foreach ($entities as $entity) {
+      $code = $entity->field_language_code->value;
+      if (!empty($code)) {
+        $languages[$code] = $entity->label();
+      }
+    }
+  }
+
+  return $languages;
+}
diff --git a/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php b/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php
index 364034bae..d1f3e3135 100644
--- a/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php
+++ b/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\reliefweb_docstore\Controller;
 
+use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Session\AccountProxyInterface;
 use Drupal\Core\StreamWrapper\StreamWrapperManagerInterface;
@@ -17,6 +18,13 @@
  */
 class FileDownloadController extends OriginalFileDownloadController {
 
+  /**
+   * ReliefWeb Docstore config.
+   *
+   * @var \Drupal\Core\Config\ImmutableConfig
+   */
+  protected $config;
+
   /**
    * The current user.
    *
@@ -34,6 +42,8 @@ class FileDownloadController extends OriginalFileDownloadController {
   /**
    * FileDownloadController constructor.
    *
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
+   *   The config factory service.
    * @param \Drupal\Core\Session\AccountProxyInterface $current_user
    *   The current user.
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
@@ -42,12 +52,14 @@ class FileDownloadController extends OriginalFileDownloadController {
    *   The stream wrapper manager.
    */
   public function __construct(
+    ConfigFactoryInterface $config_factory,
     AccountProxyInterface $current_user,
     EntityTypeManagerInterface $entity_type_manager,
     StreamWrapperManagerInterface $stream_wrapper_manager
   ) {
     parent::__construct($stream_wrapper_manager);
 
+    $this->config = $config_factory->get('reliefweb_docstore.settings');
     $this->currentUser = $current_user;
     $this->entityTypeManager = $entity_type_manager;
   }
@@ -57,6 +69,7 @@ public function __construct(
    */
   public static function create(ContainerInterface $container) {
     return new static(
+      $container->get('config.factory'),
       $container->get('current_user'),
       $container->get('entity_type.manager'),
       $container->get('stream_wrapper_manager')
@@ -67,16 +80,15 @@ public static function create(ContainerInterface $container) {
    * {@inheritdoc}
    */
   public function download(Request $request, $scheme = 'private') {
-    // Public files don't need special here handling so we default to the parent
-    // download controller.
-    if ($scheme !== 'private') {
-      return parent::download($request, $scheme);
-    }
-
     $uri = $scheme . '://' . $request->query->get('file');
 
-    // @todo use a config setting for the attachments/previews path.
-    $pattern = '#^private://(?:attachments|previews)/([a-z0-9]{2})/([a-z0-9]{2})/\1\2[a-z0-9-]{32}\.#';
+    // Retrieve the base directory in which the previews are stored.
+    $file_directory = $this->config->get('file_directory') ?? 'attachments';
+
+    // Pattern for the preview files.
+    $pattern = '#^(?:private|public)://' .
+               preg_quote($file_directory) .
+               '/([a-z0-9]{2})/([a-z0-9]{2})/\1\2[a-z0-9-]{32}\.#';
 
     // Let other modules handle the file if it's not a file matching the pattern
     // used for the reliefweb files.
@@ -85,7 +97,7 @@ public function download(Request $request, $scheme = 'private') {
     }
 
     // Deny access if the user doesn't have the proper permission.
-    if (!$this->currentUser->hasPermission('access reliefweb private files')) {
+    if ($scheme === 'private' && !$this->currentUser->hasPermission('access reliefweb private files')) {
       throw new AccessDeniedHttpException();
     }
 
@@ -96,13 +108,10 @@ public function download(Request $request, $scheme = 'private') {
     }
 
     // Retrieve the file headers and return the file content.
-    // @todo review if we should disable the cache altogether.
+    // @todo review how to deal with the file caching to deal with file
+    // replacements.
     $headers = file_get_content_headers($file);
-    if (!empty($headers)) {
-      return new BinaryFileResponse($uri, 200, $headers, FALSE);
-    }
-
-    throw new NotFoundHttpException();
+    return new BinaryFileResponse($uri, 200, $headers, FALSE);
   }
 
   /**
diff --git a/html/modules/custom/reliefweb_docstore/src/Controller/ImageStyleDownloadController.php b/html/modules/custom/reliefweb_docstore/src/Controller/ImageStyleDownloadController.php
index 7b11bcf3c..aaff50147 100644
--- a/html/modules/custom/reliefweb_docstore/src/Controller/ImageStyleDownloadController.php
+++ b/html/modules/custom/reliefweb_docstore/src/Controller/ImageStyleDownloadController.php
@@ -3,6 +3,7 @@
 namespace Drupal\reliefweb_docstore\Controller;
 
 use Drupal\Component\Utility\Crypt;
+use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\Image\ImageFactory;
@@ -24,6 +25,13 @@
  */
 class ImageStyleDownloadController extends OriginalImageStyleDownloadController {
 
+  /**
+   * ReliefWeb Docstore config.
+   *
+   * @var \Drupal\Core\Config\ImmutableConfig
+   */
+  protected $config;
+
   /**
    * The current user.
    *
@@ -41,6 +49,8 @@ class ImageStyleDownloadController extends OriginalImageStyleDownloadController
   /**
    * Constructs an ImageStyleDownloadController object.
    *
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
+   *   The config factory service.
    * @param \Drupal\Core\Session\AccountProxyInterface $current_user
    *   The current user.
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
@@ -55,6 +65,7 @@ class ImageStyleDownloadController extends OriginalImageStyleDownloadController
    *   The file system service.
    */
   public function __construct(
+    ConfigFactoryInterface $config_factory,
     AccountProxyInterface $current_user,
     EntityTypeManagerInterface $entity_type_manager,
     LockBackendInterface $lock,
@@ -64,6 +75,7 @@ public function __construct(
   ) {
     parent::__construct($lock, $image_factory, $stream_wrapper_manager, $file_system);
 
+    $this->config = $config_factory->get('reliefweb_docstore.settings');
     $this->currentUser = $current_user;
     $this->entityTypeManager = $entity_type_manager;
   }
@@ -73,6 +85,7 @@ public function __construct(
    */
   public static function create(ContainerInterface $container) {
     return new static(
+      $container->get('config.factory'),
       $container->get('current_user'),
       $container->get('entity_type.manager'),
       $container->get('lock'),
@@ -93,8 +106,13 @@ public function deliver(Request $request, $scheme, ImageStyleInterface $image_st
     // This is normally the URI of the source image.
     $uri = $scheme . '://' . $request->query->get('file');
 
-    // @todo use a config setting for the attachments/previews path.
-    $pattern = '#^(?:private|public)://(?:attachments|previews)/([a-z0-9]{2})/([a-z0-9]{2})/\1\2[a-z0-9-]{32}\.#';
+    // Retrieve the base directory in which the previews are stored.
+    $preview_directory = $this->config->get('preview_directory') ?? 'previews';
+
+    // Pattern for the preview files.
+    $pattern = '#^(?:private|public)://' .
+               preg_quote($preview_directory) .
+               '/([a-z0-9]{2})/([a-z0-9]{2})/\1\2[a-z0-9-]{32}\.#';
 
     // Let other modules handle the file if it's not a file matching the pattern
     // used for the reliefweb files.
@@ -140,10 +158,7 @@ public function deliver(Request $request, $scheme, ImageStyleInterface $image_st
     $headers = [
       'Content-Type' => $image->getMimeType(),
       'Content-Length' => $image->getFileSize(),
-      // No caching so that the new derivative image can be returned when the
-      // base image is changed.
       'Cache-Control' => 'private',
-      'Last-Modified' => gmdate('F d Y H:i:s.', filemtime($derivative_uri)),
     ];
 
     return new BinaryFileResponse($image->getSource(), 200, $headers, TRUE);
diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
index 5cb14d3e2..d696cce8c 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
@@ -70,9 +70,9 @@ public static function propertyDefinitions(FieldStorageDefinitionInterface $fiel
       ->setDescription(new TranslatableMarkup('The ID of the file revision.'))
       ->setRequired(TRUE);
 
-    // The status of the file: private or public.
-    $properties['status'] = DataDefinition::create('boolean')
-      ->setLabel(new TranslatableMarkup('Status'))
+    // Whether the file is private or public.
+    $properties['private'] = DataDefinition::create('boolean')
+      ->setLabel(new TranslatableMarkup('Private'))
       ->setDescription(new TranslatableMarkup('Whether the file is private or public.'))
       ->setRequired(TRUE);
 
@@ -116,7 +116,7 @@ public static function propertyDefinitions(FieldStorageDefinitionInterface $fiel
     $properties['preview_uuid'] = DataDefinition::create('string')
       ->setLabel(new TranslatableMarkup('Preview UUID'))
       ->setDescription(new TranslatableMarkup('The UUID of the preview file.'))
-      ->setRequired(TRUE);
+      ->setRequired(FALSE);
 
     // The page used for the file preview.
     $properties['preview_page'] = DataDefinition::create('integer')
@@ -149,7 +149,7 @@ public static function schema(FieldStorageDefinitionInterface $field_definition)
           'size' => 'medium',
           'not null' => TRUE,
         ],
-        'status' => [
+        'private' => [
           'type' => 'int',
           'size' => 'tiny',
           'not null' => TRUE,
@@ -187,7 +187,7 @@ public static function schema(FieldStorageDefinitionInterface $field_definition)
         'preview_uuid' => [
           'type' => 'varchar_ascii',
           'length' => 36,
-          'not null' => TRUE,
+          'not null' => FALSE,
         ],
         'preview_page' => [
           'type' => 'int',
@@ -233,7 +233,7 @@ public static function generateSampleValue(FieldDefinitionInterface $field_defin
 
     $values['uuid'] = static::generateUuid();
     $values['revision_id'] = mt_rand(1111, 9999);
-    $valyes['status'] = (bool) mt_rand(0, 1);
+    $valyes['private'] = (bool) mt_rand(0, 1);
     $valyes['file_name'] = $random->string(mt_rand(1, 250)) . '.' . $random->string(mt_rand(1, 4));
     $valyes['file_mime'] = $random->string(mt_rand(32, 128));
     $valyes['file_size'] = mt_rand(1111, 99999);
@@ -664,10 +664,16 @@ protected function getDocstoreClient() {
    *   The directory URI.
    */
   public static function getFileDirectoryUriFromUuid($uuid, $private = TRUE, $preview = FALSE) {
-    // @todo use a config setting for the attachments/previews path.
+    $settings = \Drupal::service('config.factory')->get('reliefweb_docstore.settings');
+
     $directory = $private ? 'private://' : 'public://';
-    $directory .= $preview ? 'previews/' : 'attachments/';
-    $directory .= substr($uuid, 0, 2);
+    if ($preview) {
+      $directory .= $settings->get('preview_directory') ?? 'previews';
+    }
+    else {
+      $directory .= $settings->get('file_directory') ?? 'attachments';
+    }
+    $directory .= '/' . substr($uuid, 0, 2);
     $directory .= '/' . substr($uuid, 2, 2);
     return $directory;
   }
@@ -714,6 +720,7 @@ public static function createFileFromUuid($uuid, $uri, $file_name, $file_mime) {
       // global files that have nothing to do with the current user.
       'uid' => 2,
       'uri' => $uri,
+      // Temporary file that can be garbage collected if not set permanent.
       'status' => 0,
       'filename' => $file_name,
       'filemime' => $file_mime,
@@ -735,6 +742,28 @@ public static function prepareDirectory($uri) {
     return $file_system->prepareDirectory($directory, $file_system::CREATE_DIRECTORY);
   }
 
+  /**
+   * Delete a managed file with the given UUID.
+   *
+   * @param string $uuid
+   *   File UUID.
+   * @param bool $preview
+   *   Whether the file is a preview or not.
+   */
+  public static function deleteFileFromUuid($uuid, $preview = FALSE) {
+    $file = \Drupal::service('entity.repository')
+      ->loadEntityByUuid('file', $uuid);
+
+    if (!empty($file)) {
+      // Remove the derivative images.
+      if ($preview) {
+        image_path_flush($file->getFileUri());
+      }
+
+      $file->delete();
+    }
+  }
+
   /**
    * Get the extension of the file.
    *
diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
index 9af9df31c..bee9e58af 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
@@ -10,7 +10,10 @@
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Field\WidgetBase;
+use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Logger\LoggerChannelFactoryInterface;
+use Drupal\Core\Render\Markup;
 use Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile as ReliefWebFileType;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -29,6 +32,20 @@
  */
 class ReliefWebFile extends WidgetBase {
 
+  /**
+   * The file system service.
+   *
+   * @var Drupal\Core\File\FileSystemInterface
+   */
+  protected $fileSystem;
+
+  /**
+   * The logger service.
+   *
+   * @var \Psr\Log\LoggerInterface
+   */
+  protected $logger;
+
   /**
    * The request stack.
    *
@@ -52,6 +69,8 @@ public function __construct(
     FieldDefinitionInterface $field_definition,
     array $settings,
     array $third_party_settings,
+    FileSystemInterface $file_system,
+    LoggerChannelFactoryInterface $logger_factory,
     RequestStack $request_stack
   ) {
     parent::__construct(
@@ -61,7 +80,9 @@ public function __construct(
       $settings,
       $third_party_settings
     );
+    $this->fileSystem = $file_system;
     $this->requestStack = $request_stack;
+    $this->logger = $logger_factory->get('reliefweb_file_widget');
   }
 
   /**
@@ -79,6 +100,8 @@ public static function create(
       $configuration['field_definition'],
       $configuration['settings'],
       $configuration['third_party_settings'],
+      $container->get('file_system'),
+      $container->get('logger.factory'),
       $container->get('request_stack')
     );
   }
@@ -98,9 +121,10 @@ protected function handlesMultipleValues() {
    * @todo No changes, can be inherited from FileWidget?
    */
   protected function formMultipleElements(FieldItemListInterface $items, array &$form, FormStateInterface $form_state) {
+    $parents = $form['#parents'];
     $field_name = $this->fieldDefinition->getName();
+    $field_parents = array_merge($parents, [$field_name]);
     $required = $this->fieldDefinition->isRequired();
-    $parents = $form['#parents'];
 
     // Load the items for form rebuilds from the field state as they might not
     // be in $form_state->getValues() because of validation limitations. Also,
@@ -109,6 +133,16 @@ protected function formMultipleElements(FieldItemListInterface $items, array &$f
     if (isset($field_state['items'])) {
       $items->setValue(array_values($field_state['items']));
     }
+    // Otherwise if $items is not empty, then store the original values so we
+    // can provide restore functionalities.
+    elseif ($items->count() > 0) {
+      foreach ($items as $item) {
+        if (!$item->isEmpty()) {
+          $field_state['original_values'][$item->get('uuid')->getValue()] = $item->getValue();
+        }
+      }
+      static::setWidgetState($parents, $field_name, $form_state);
+    }
 
     // Container.
     $elements = [
@@ -132,24 +166,26 @@ protected function formMultipleElements(FieldItemListInterface $items, array &$f
     // Add one more empty row for new uploads except when this is a programmed
     // multiple form as it is not necessary.
     if (!$form_state->isProgrammed()) {
-      $name = implode('_', array_merge($parents, [$field_name, 'files']));
       $elements['add_more'] = [
         '#type' => 'fieldset',
         '#title' => $this->t('Add file(s)'),
         'files' => [
           '#type' => 'file',
-          '#name' => $name,
+          '#name' => implode('-', array_merge($field_parents, ['files'])),
           '#multiple' => TRUE,
         ],
         'upload' => [
           '#type' => 'submit',
           '#value' => $this->t('Upload file(s)'),
-          '#submit' => [[static::class, 'uploadFiles']],
-          // Disable validation of the button.
+          '#name' => implode('-', array_merge($field_parents, ['upload'])),
+          '#submit' => [[static::class, 'submit']],
+          // Limit the validation to the uploaded files.
           '#limit_validation_errors' => [
-            array_merge($parents, ['add_more']),
+            array_merge($field_parents, ['add_more', 'files']),
           ],
-          '#ajax' => $this->getAjaxSettings($this->t('Uploading file(s)...')),
+          '#ajax' => $this->getAjaxSettings($this->t('Uploading file(s)...'), $field_parents),
+          // Store information to identify the button in ::extractFormValues().
+          '#field_parents' => $field_parents,
         ],
         '#required' => $required && $delta == 0,
       ];
@@ -185,12 +221,24 @@ protected function getAjaxWrapperId() {
   /**
    * Get the base ajax settings for the operation in the widget.
    *
+   * @param string $message
+   *   The message to display while the request is being performed.
+   * @param array $field_parents
+   *   The parents of the field.
+   *
    * @return array
    *   Array with the ajax settings.
    */
-  protected function getAjaxSettings($message = '') {
+  protected function getAjaxSettings($message, array $field_parents) {
     return [
       'callback' => [static::class, 'rebuildWidgetForm'],
+      'options' => [
+        'query' => [
+          // This will be used in the ::rebuildWidgetForm() callback to
+          // retrieve the widget.
+          'field_parents' => implode('/', $field_parents),
+        ],
+      ],
       'wrapper' => $this->getAjaxWrapperId(),
       'effect' => 'fade',
       'progress' => [
@@ -205,16 +253,19 @@ protected function getAjaxSettings($message = '') {
    */
   public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
     $field_name = $this->fieldDefinition->getName();
-    $parents = $form['#parents'];
+    $field_parents = array_merge($form['#parents'], [$field_name]);
+    $element_parents = array_merge($field_parents, [$delta]);
+
     $item = $items[$delta];
 
+    $element['#type'] = 'form_element';
     $element['#theme'] = 'reliefweb_file_widget_item';
 
     // Non editable defaults.
     $defaults = [
       'uuid',
       'revision_id',
-      'status',
+      'private',
       'file_name',
       'file_mime',
       'file_size',
@@ -228,18 +279,32 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
       ];
     }
 
+    // Store the original UUID of the item.
+    //
+    // This allows us to distinguish between the 3 cases:
+    // - if the original UUID is empty then it's a new file
+    // - if the current UUID is the same as the original UUID then the
+    //   underlying file is unchanged
+    // - if the current UUID is different from the original UUID then its a
+    //   replaced file.
+    $element['_original_uuid'] = [
+      '#type' => 'hidden',
+      '#value' => isset($item->_original_uuid) ? $item->_original_uuid : $item->get('uuid')->getValue(),
+    ];
+
     // Link to the file.
     $file_name = $item->get('file_name')->getValue();
     $file_size = $item->get('file_size')->getValue();
     $file_extension = ReliefWebFileType::getFileExtension($file_name);
     $file_label = $file_name . ' (' . mb_strtoupper($file_extension) . ' | ' . format_size($file_size) . ')';
     $file_url = $item->getFileUrl();
-
     if (!empty($file_url)) {
       $element['link'] = [
         '#type' => 'link',
         '#title' => $file_label,
-        '#url' => $file_url,
+        // We add a timestamp to prevent caching by the browser so that
+        // it can display replaced files.
+        '#url' => $file_url->setOption('query', ['time' => microtime(TRUE)]),
       ];
     }
     else {
@@ -248,23 +313,17 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
       ];
     }
 
+    // Information fields.
     $element['description'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Description'),
       '#maxlength' => 255,
       '#default_value' => $item->get('description')->getValue() ?? '',
     ];
-
-    // @todo move that to a settings on the field.
-    $languages = [
-      'en' => $this->t('English version'),
-      'fr' => $this->t('French version'),
-    ];
-
     $element['language'] = [
       '#type' => 'select',
       '#title' => $this->t('Language version'),
-      '#options' => $languages,
+      '#options' => reliefweb_docstore_get_languages(),
       '#default_value' => $item->get('language')->getValue() ?? NULL,
     ];
 
@@ -277,6 +336,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
       $original_preview_rotation = $item->_original_preview_rotation ?: $preview_rotation;
 
       if (!empty($preview_page)) {
+        // Only regenerated the preview if the page or rotation changed.
         $regenerate = $original_preview_page != $preview_page || $original_preview_rotation != $preview_rotation;
 
         // Ensure the preview is generated.
@@ -296,15 +356,17 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
         }
       }
 
-      $pages = range(1, $item->getPageCount());
+      // Preview page and rotation information.
       $element['preview_page'] = [
         '#type' => 'select',
         '#title' => $this->t('Preview page'),
-        '#options' => array_merge([0 => $this->t('No preview')], $pages),
+        '#options' => array_merge(
+          [0 => $this->t('No preview')],
+          range(1, $item->getPageCount())
+        ),
         '#default_value' => $preview_page,
-        '#ajax' => $this->getAjaxSettings($this->t('Regenerating preview...')),
+        '#ajax' => $this->getAjaxSettings($this->t('Regenerating preview...'), $field_parents),
       ];
-
       $element['preview_rotation'] = [
         '#type' => 'select',
         '#title' => $this->t('Preview page rotation'),
@@ -314,7 +376,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
           -90 => $this->t('counterclockwise'),
         ],
         '#default_value' => $preview_rotation,
-        '#ajax' => $this->getAjaxSettings($this->t('Regenerating preview...')),
+        '#ajax' => $this->getAjaxSettings($this->t('Regenerating preview...'), $field_parents),
       ];
 
       // Store the original preview page and rotation so that we can compare
@@ -329,19 +391,52 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
       ];
     }
 
+    // Wrapper for the delete and replace operations on the file.
+    // We "hide" them inside an initially closed <details> to limit wrong
+    // interactions.
+    $element['operations'] = [
+      '#type' => 'details',
+      '#title' => $this->t('Edit'),
+    ];
+
     // Add a button to delete the file.
-    $element['_delete'] = [
+    $element['operations']['delete'] = [
       '#type' => 'submit',
       '#value' => $this->t('Delete'),
-      '#name' => implode('-', array_merge($parents, [$delta, 'delete'])),
-      '#submit' => [[static::class, 'deleteFile']],
-      // Store the delta so we know which file to mark as deleted.
-      '#file_delta' => $delta,
-      // Disable validation of the button.
+      '#name' => implode('-', array_merge($element_parents, ['delete'])),
+      '#submit' => [[static::class, 'submit']],
+      // Limit the validation to the button to prevent trying to validate
+      // the element being removed.
+      '#limit_validation_errors' => [
+        array_merge($element_parents, ['operations', 'delete']),
+      ],
+      '#ajax' => $this->getAjaxSettings($this->t('Removing file...'), $field_parents),
+      // Store information to identify the button in ::extractFormValues().
+      '#delta' => $delta,
+      '#field_parents' => $field_parents,
+    ];
+
+    // Add a file widget to upload a replacement.
+    $element['operations']['file'] = [
+      '#type' => 'file',
+      '#name' => implode('-', array_merge($element_parents, ['file'])),
+      '#multiple' => FALSE,
+    ];
+
+    // Add a button to replace the file.
+    $element['operations']['replace'] = [
+      '#type' => 'submit',
+      '#value' => $this->t('Upload replacement'),
+      '#name' => implode('-', array_merge($element_parents, ['replace'])),
+      '#submit' => [[static::class, 'submit']],
+      // Limit the validation to the element.
       '#limit_validation_errors' => [
-        array_merge($parents, [$delta]),
+        $element_parents,
       ],
-      '#ajax' => $this->getAjaxSettings($this->t('Removing file...')),
+      '#ajax' => $this->getAjaxSettings($this->t('Uploading file...'), $field_parents),
+      // Store information to identify the button in ::extractFormValues().
+      '#delta' => $delta,
+      '#field_parents' => $field_parents,
     ];
 
     // Add the input field for the delta (drag-n-drop reordering).
@@ -351,16 +446,13 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
         '@number' => $delta + 1,
       ]),
       '#title_display' => 'invisible',
-      // Note: this 'delta' is the FAPI #type 'weight' element's property.
-      '#delta' => count($items),
+      // Note: this 'delta' is the FAPI #type 'weight' element's property not
+      // the delta of the current element.
+      '#delta' => $items->count(),
       '#default_value' => $item->_weight ?: $delta,
       '#weight' => 100,
     ];
 
-    // Add properties needed by the value() method.
-    $element['#field_name'] = $this->fieldDefinition->getName();
-    $element['#entity_type'] = $items->getEntity()->getEntityTypeId();
-
     return $element;
   }
 
@@ -369,7 +461,8 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
    */
   public function massageFormValues(array $values, array $form, FormStateInterface $form_state) {
     foreach ($values as &$value) {
-      unset($value['_delete']);
+      unset($value['preview']);
+      unset($value['operations']);
     }
     return $values;
   }
@@ -378,38 +471,69 @@ public function massageFormValues(array $values, array $form, FormStateInterface
    * {@inheritdoc}
    */
   public function extractFormValues(FieldItemListInterface $items, array $form, FormStateInterface $form_state) {
-    $field_name = $this->fieldDefinition->getName();
     $parents = $form['#parents'];
-    $field_state = static::getWidgetState($form['#parents'], $field_name, $form_state);
+    $field_name = $this->fieldDefinition->getName();
+    $field_parents = array_merge($parents, [$field_name]);
+    $field_state = static::getWidgetState($parents, $field_name, $form_state);
+    $widget = NestedArray::getValue($form, $field_state['array_parents']);
+
+    // Retrieve any action perfom on the widget (ex: upload files).
+    $action = '';
+    $button = $form_state->getTriggeringElement();
+    if (isset($button['#field_parents']) && $button['#field_parents'] === $field_parents) {
+      $action = end($button['#array_parents']);
+    }
 
     // Extract the values from $form_state->getValues().
-    $path = array_merge($parents, [$field_name]);
     $key_exists = FALSE;
-    $values = NestedArray::getValue($form_state->getValues(), $path, $key_exists);
+    $values = NestedArray::getValue($form_state->getValues(), $field_parents, $key_exists);
     if ($key_exists) {
-      // Remove the 'value' of the 'add more' button.
-      unset($values['add_more']);
-
-      // The original delta, before drag-and-drop reordering, is needed to
-      // route errors to the correct form element.
-      foreach ($values as $delta => &$value) {
-        $value['_original_delta'] = $delta;
+      // Extract the existing items and store their original delta to be
+      // able to flag errors to the correct form elements before proceeding
+      // with any reordering.
+      $files = [];
+      foreach ($values as $delta => $value) {
+        if (is_numeric($delta) && !empty($value)) {
+          $element = NestedArray::getValue($widget, [$delta]);
+
+          // Delete the value.
+          if ($action === 'delete' && $button['#delta'] === $delta) {
+            $value = $this->deleteFieldItem($element, $form_state, $value);
+          }
+          elseif ($action === 'replace' && $button['#delta'] === $delta) {
+            $value = $this->replaceFieldItem($element, $form_state, $value);
+          }
+          if (!empty($value)) {
+            $value['_original_delta'] = $delta;
+            $value['_weight'] = isset($value['_weight']) ? $value['_weight'] : $delta;
+            $files[] = $value;
+          }
+        }
       }
-      usort($values, function ($a, $b) {
+
+      // Apply any re-ordering to the existing items.
+      usort($files, function ($a, $b) {
         return SortArray::sortByKeyInt($a, $b, '_weight');
       });
 
+      // Add the newly uploaded items if any.
+      if ($action === 'upload') {
+        $element = NestedArray::getValue($widget, ['add_more', 'files']);
+        $files = array_merge($files, $this->uploadFiles($element, $form_state));
+      }
+
       // Let the widget massage the submitted values.
-      $values = $this->massageFormValues($values, $form, $form_state);
+      //
+      // Note: this updates the form state values as they are returned by
+      // reference by NestedArray::getValue() so we don't need any additional
+      // cleaning.
+      $values = $this->massageFormValues($files, $form, $form_state);
 
       // Assign the values and remove the empty ones.
       $items->setValue($values);
       $items->filterEmptyItems();
 
       // Put delta mapping in $form_state, so that flagErrors() can use it.
-      // Also, store the original preview page and rotation of each item so we
-      // can determine if their preview needs to be regenerated when the form
-      // is rebuilt.
       foreach ($items as $delta => $item) {
         $field_state['original_deltas'][$delta] = $item->_original_delta ?: $delta;
 
@@ -420,105 +544,141 @@ public function extractFormValues(FieldItemListInterface $items, array $form, Fo
 
     // Update the field state items with the new data.
     $field_state['items'] = $items->getValue();
-    static::setWidgetState($form['#parents'], $field_name, $form_state, $field_state);
+    static::setWidgetState($parents, $field_name, $form_state, $field_state);
   }
 
   /**
-   * Upload new files.
+   * Handle uploaded files.
    *
-   * @param array $form
-   *   Form.
+   * This moves the uploaded files and create managed files and their
+   * associated field items.
+   *
+   * @param array $element
+   *   File upload button.
    * @param \Drupal\Core\Form\FormStateInterface $form_state
    *   Form state.
    */
-  public static function uploadFiles(array &$form, FormStateInterface &$form_state) {
-    $button = $form_state->getTriggeringElement();
-    $widget = NestedArray::getValue($form, array_slice($button['#array_parents'], 0, -2));
-    $parents = $form['#parents'];
-
-    // Retrieve the current field state with the list of existing, queued and
-    // deleted files.
-    $field_name = $widget['#field_name'];
-    $field_parents = $widget['#field_parents'];
-    $field_state = static::getWidgetState($field_parents, $field_name, $form_state);
-
-    // Get uploaded files.
-    $name = implode('_', array_merge($parents, [$field_name, 'files']));
-    $files = \Drupal::request()->files->get($name, []);
+  protected function uploadFiles(array $element, FormStateInterface $form_state) {
+    return $this->processUploadedFiles($element, $form_state, $element['#name']);
+  }
 
-    if (!empty($files)) {
-      foreach ($files as $file) {
-        try {
-          $field_state['items'][] = static::createNewFileFieldItem($file);
+  /**
+   * Delete a field item.
+   *
+   * @param array $element
+   *   Form element to which attach the errors if any.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The form state to add the errors.
+   * @param array $values
+   *   The original field item values.
+   *
+   * @return null
+   *   Empty field item values to ensure the item is deleted.
+   */
+  protected function deleteFieldItem(array $element, FormStateInterface $form_state, array $values) {
+    try {
+      // If the file was new or replaced, remove its associated managed files.
+      if ($values['uuid'] !== $values['_original_uuid']) {
+        if (!empty($values['uuid'])) {
+          ReliefWebFileType::deleteFileFromUuid($values['uuid']);
         }
-        catch (\Exception $exception) {
-          $form_state->setError($widget, $exception->getMessage());
+        if (!empty($values['preview_uuid'])) {
+          ReliefWebFileType::deleteFileFromUuid($values['preview_uuid'], TRUE);
         }
       }
     }
+    catch (\Exception $exception) {
+      $form_state->setError($element, $exception->getMessage());
+    }
+    return NULL;
+  }
 
-    // Update the widget state with the existing and new files.
-    static::setWidgetState($field_parents, $field_name, $form_state, $field_state);
-    $form_state->setRebuild();
+  /**
+   * Create field items from upload files.
+   *
+   * @param array $element
+   *   Form element to which attach the errors if any.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The form state to add the errors.
+   * @param array $values
+   *   The original field item values.
+   *
+   * @return array
+   *   The new field item values.
+   */
+  protected function replaceFieldItem(array $element, FormStateInterface $form_state, array $values) {
+    // Create a new field item with associated managed files and replace the
+    // original values with its values.
+    $name = $element['operations']['file']['#name'];
+    $items = $this->processUploadedFiles($element, $form_state, $name);
+    if (!empty($items)) {
+      $item = reset($items);
+      // Copy some properties from the original file.
+      $item['description'] = $values['description'];
+      $item['language'] = $values['language'];
+      $item['_original_uuid'] = $values['_original_uuid'];
+      return $item;
+    }
+    // If we couldn't replace the file, keep the original values.
+    return $values;
   }
 
   /**
-   * Delete a file.
+   * Create field items from upload files.
    *
-   * @param array $form
-   *   Form.
+   * @param array $element
+   *   Form element to which attach the errors if any.
    * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   Form state.
+   *   The form state to add the errors.
+   * @param string $name
+   *   Name of the request property that contain the upload files.
+   *
+   * @return array
+   *   List of field item data.
    */
-  public static function deleteFile(array &$form, FormStateInterface &$form_state) {
-    $button = $form_state->getTriggeringElement();
-    $widget = NestedArray::getValue($form, array_slice($button['#array_parents'], 0, -2));
-    $delta = $button['#file_delta'];
-
-    // Retrieve the current field state with the list of existing, queued and
-    // deleted files.
-    $field_name = $widget['#field_name'];
-    $field_parents = $widget['#field_parents'];
-    $field_state = static::getWidgetState($field_parents, $field_name, $form_state);
-
-    if (isset($field_state['items'][$delta]['uuid'])) {
-      $item = $field_state['items'][$delta];
-
-      // If the file is new, we delete it completely.
-      if (empty($item['revision_id'])) {
-        // Load the associated managed file.
-        $file = \Drupal::service('entity.repository')
-          ->loadEntityByUuid('file', $item['uuid']);
-
-        // Remove the managed file.
-        if (!empty($file)) {
-          $file->delete();
+  protected function processUploadedFiles(array $element, FormStateInterface $form_state, $name) {
+    /** @var \Symfony\Component\HttpFoundation\FileBag $file_bag */
+    $file_bag = $this->requestStack->getCurrentRequest()->files;
+
+    // For fields that accept multiple uploads the parameter name ends with
+    // `[]` and we need to strip it to retrieve the files.
+    if (substr($name, -2) === '[]') {
+      $name = substr($name, 0, -2);
+      $files = $file_bag->get($name, []);
+    }
+    else {
+      $files = [$file_bag->get($name, NULL)];
+    }
+
+    $items = [];
+    foreach ($files as $file) {
+      if (!empty($file)) {
+        try {
+          $items[] = $this->createFieldItem($file);
+        }
+        catch (\Exception $exception) {
+          $form_state->setError($element, $exception->getMessage());
         }
       }
-
-      // Remove the field item.
-      unset($field_state['items'][$delta]);
     }
 
-    // Re-index the items.
-    $field_state['items'] = array_values($field_state['items']);
-
-    // Update the widget state with the existing and new files.
-    static::setWidgetState($field_parents, $field_name, $form_state, $field_state);
-    $form_state->setRebuild();
+    // Remove the files so that they are not processed again.
+    $file_bag->remove($name);
+    return $items;
   }
 
   /**
-   * Create a new file field item.
+   * Create a new file field item with the given file info.
    *
    * @param \SplFileInfo $file_info
    *   The uploaded file info.
    *
-   * @return array
-   *   The new field entry with its uuid, revision_id, file name and status.
+   * @return \Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile
+   *   New field item created with the file information.
    *
    * @throws \Exception
-   *   Throw an exception if the temporary file couldn't be created.
+   *   Throw an exception if the managed file or the field item couldn't be
+   *   created.
    *
    * @todo upload to the docstore directly if/once we allow temporary
    * files to be uploaded. For now we cannot create a docstore file here
@@ -527,11 +687,11 @@ public static function deleteFile(array &$form, FormStateInterface &$form_state)
    * we create a temporary managed file that can be garbage collected if the
    * the submission doesn't finish.
    */
-  protected static function createNewFileFieldItem(\SplFileInfo $file_info) {
+  protected function createFieldItem(\SplFileInfo $file_info) {
     $file_name = $file_info->getClientOriginalName();
 
     // @todo throw a more relevant information.
-    if (!static::validateFile($file_info)) {
+    if (!$this->validateUploadedFile($file_info)) {
       throw new \Exception(strtr('Invalid file @name.', [
         '@name' => $file_name,
       ]));
@@ -554,8 +714,8 @@ protected static function createNewFileFieldItem(\SplFileInfo $file_info) {
     }
 
     // Move the uploaded file.
-    if (!\Drupal::service('file_system')->moveUploadedFile($path, $uri)) {
-      throw new \Exception(strtr('Unable to copy the uploadedf ile @name.', [
+    if (!$this->fileSystem->moveUploadedFile($path, $uri)) {
+      throw new \Exception(strtr('Unable to copy the uploaded file @name.', [
         '@name' => $file_name,
       ]));
     }
@@ -569,19 +729,41 @@ protected static function createNewFileFieldItem(\SplFileInfo $file_info) {
     // Save the file. This will notably populate its file size.
     $file->save();
 
-    // Create a new ReliefWeb item.
-    return [
+    // Create a field item that we can validate.
+    $item = ReliefWebFileType::createInstance($this->fieldDefinition->getItemDefinition());
+    $item->setValue([
       'uuid' => $uuid,
       // A revision of 0 is an easy way to determine new files.
       // This will be populated after a successful upload to the
       // docstore.
       'revision_id' => 0,
-      'status' => 0,
+      // We mark the item as private initially. It may be changed to public
+      // depending on the status of the entity the field is attached to etc.
+      'private' => TRUE,
       'file_name' => $file_name,
       'file_mime' => $file_mime,
       'file_size' => $file->getSize(),
       'page_count' => ReliefWebFileType::getFilePageCount($file),
-    ];
+      // Mark the item as new by setting the original UUID to false.
+      '_original_uuid' => '',
+    ]);
+
+    // Validate the field item.
+    $violations = $item->validate();
+    if ($violations->count() > 0) {
+      foreach ($violations as $violation) {
+        $this->logger->error('Field item violation at @property_path for file @name : @message', [
+          '@property_path' => $violation->getPropertyPath(),
+          '@name' => $file_name,
+          '@message' => $violation->getMessage(),
+        ]);
+      }
+      throw new \Exception(strtr('Invalid field item data for the uploaded file @name.', [
+        '@name' => $file_name,
+      ]));
+    }
+
+    return $item->getValue();
   }
 
   /**
@@ -597,12 +779,26 @@ protected static function createNewFileFieldItem(\SplFileInfo $file_info) {
    *
    * @see _file_save_upload_single()
    */
-  protected static function validateFile(\SplFileInfo $file_info) {
+  protected function validateUploadedFile(\SplFileInfo $file_info) {
     return $file_info->isValid() &&
            $file_info->getRealPath() !== FALSE &&
            // Max allowed length of a managed file name.
-           // @todo check if there is a constant we can use here.
-           mb_strlen($file_info->getClientOriginalName()) <= 255;
+           // @see file_validate_name_length()
+           mb_strlen($file_info->getClientOriginalName()) <= 240;
+  }
+
+  /**
+   * Submit callback for the different operations in the widget.
+   *
+   * This simply instructs to rebuild the form.
+   *
+   * @param array $form
+   *   Form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   Form state.
+   */
+  public static function submit(array &$form, FormStateInterface &$form_state) {
+    $form_state->setRebuild();
   }
 
   /**
@@ -619,12 +815,31 @@ protected static function validateFile(\SplFileInfo $file_info) {
    *   The ajax response of the ajax upload.
    */
   public static function rebuildWidgetForm(array &$form, FormStateInterface &$form_state, Request $request) {
-    $button = $form_state->getTriggeringElement();
-    $widget = NestedArray::getValue($form, array_slice($button['#array_parents'], 0, -2));
+    /** @var \Drupal\Core\Render\RendererInterface $renderer */
+    $renderer = \Drupal::service('renderer');
+
+    // Retrieve the updated widget.
+    $parents = explode('/', $request->query->get('field_parents'));
+    $field_name = array_pop($parents);
+    $field_state = static::getWidgetState($parents, $field_name, $form_state);
+
+    // The array parents are populaed in the WidgetBase::afterBuild().
+    $widget = NestedArray::getValue($form, $field_state['array_parents']);
+
+    // Display the status messages at the top of the widget. This is notably
+    // useful to indicate to the user that the form needs to be saved if the
+    // files were re-ordered for example.
+    $status_messages = ['#type' => 'status_messages'];
+    $widget['#prefix'] = Markup::create(implode('', [
+      $widget['#prefix'] ?? '',
+      $renderer->renderRoot($status_messages),
+    ]));
 
+    // Create the response and ensure the widget attachments will be loaded.
     $response = new AjaxResponse();
-    $response->setAttachments($form['#attached']);
+    $response->setAttachments($widget['#attached'] ?? []);
 
+    // This will replace the widget with the new one in the form.
     return $response->addCommand(new ReplaceCommand(NULL, $widget));
   }
 
diff --git a/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget-item.html.twig b/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget-item.html.twig
index ffdc7d7bb..81b7cc53b 100644
--- a/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget-item.html.twig
+++ b/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget-item.html.twig
@@ -17,7 +17,7 @@
     'preview',
     'preview_page',
     'preview_rotation',
-    '_delete',
+    'operations',
     '_weight',
   ]
 %}
@@ -37,7 +37,7 @@
     {{ element.preview_rotation }}
   </td>
   <td class="rw-file-widget-item__operations">
-    {{ element._delete }}
+    {{ element.operations }}
   </td>
   <td class="rw-file-widget-item__weight">
     {{ element._weight }}

From 3452fff9483ad9dd4dfc898fe108441d0358d549 Mon Sep 17 00:00:00 2001
From: Peter Droogmans <peter@attiks.com>
Date: Tue, 16 Nov 2021 09:17:36 +0100
Subject: [PATCH 089/720] Update
 html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php

Co-authored-by: orakili <github@orakili.net>
---
 .../src/Services/UserPostsService.php                | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
index a458c25c0..26e051dc7 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
@@ -269,14 +269,12 @@ protected function joinDeadline(Select $query, array $definition, $entity_type_i
     $table_training = $this->getFieldTableName('node', 'field_registration_deadline');
     $field_name_training = $this->getFieldColumnName('node', 'field_registration_deadline', 'value');
 
-    // Add deadline field.
-    $query->addExpression("COALESCE({$table_job}.{$field_name_job}, {$table_training}.{$field_name_training})", 'deadline');
-
     // Add joins.
-    $query->leftJoin($table_job, NULL, "{$table_job}.entity_id = {$entity_base_table}.{$entity_id_field}");
-    $query->leftJoin($table_training, NULL, "{$table_training}.entity_id = {$entity_base_table}.{$entity_id_field}");
-
-    return "COALESCE({$table_job}.{$field_name_job}, {$table_training}.{$field_name_training})";
+    $table_alias_job = $query->leftJoin($table_job, $table_job, "%alias.entity_id = {$entity_base_table}.{$entity_id_field}");
+    $table_alias_training = $query->leftJoin($table_training, $table_training, "%alias.entity_id = {$entity_base_table}.{$entity_id_field}");
+    
+    // Add deadline field.
+    return $query->addExpression("COALESCE({$table_alias_job}.{$field_name_job}, {$table_alias_training}.{$field_name_training})", 'deadline');
   }
 
   /**

From 0fb782412c5693d5febdf684493995c593ab6413 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 16 Nov 2021 09:21:58 +0100
Subject: [PATCH 090/720] Fix filter on deadline

---
 .../reliefweb_user_posts/src/Services/UserPostsService.php   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
index 26e051dc7..08fa85609 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
@@ -272,9 +272,10 @@ protected function joinDeadline(Select $query, array $definition, $entity_type_i
     // Add joins.
     $table_alias_job = $query->leftJoin($table_job, $table_job, "%alias.entity_id = {$entity_base_table}.{$entity_id_field}");
     $table_alias_training = $query->leftJoin($table_training, $table_training, "%alias.entity_id = {$entity_base_table}.{$entity_id_field}");
-    
+
     // Add deadline field.
-    return $query->addExpression("COALESCE({$table_alias_job}.{$field_name_job}, {$table_alias_training}.{$field_name_training})", 'deadline');
+    $query->addExpression("COALESCE({$table_alias_job}.{$field_name_job}, {$table_alias_training}.{$field_name_training})", 'deadline');
+    return "COALESCE({$table_alias_job}.{$field_name_job}, {$table_alias_training}.{$field_name_training})";
   }
 
   /**

From 508e3214d6af0096e4d79121e3b833b2a083a332 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 16 Nov 2021 10:06:28 +0100
Subject: [PATCH 091/720] Sort on deadline

---
 .../src/Services/UserPostsService.php         | 55 ++++++++++++++++++-
 1 file changed, 52 insertions(+), 3 deletions(-)

diff --git a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
index 08fa85609..56ee1f6b5 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
@@ -94,11 +94,9 @@ public function getHeaders() {
       ],
       'deadline' => [
         'label' => $this->t('Deadline'),
-        'type' => '',
+        'type' => 'custom',
         'specifier' => 'deadline',
         'sortable' => TRUE,
-        'join_callback' => 'joinDeadline',
-        'condition_callback' => 'conditionDeadline',
       ],
     ];
   }
@@ -285,4 +283,55 @@ protected function conditionDeadline($definition, $base, $fields, $value, $opera
     $base->where("UNIX_TIMESTAMP({$fields}) {$operator} {$value[0]} AND {$value[1]}");
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function wrapQuery(Select $query, $limit = 30) {
+    // Get the order information.
+    $info = $this->getOrderInformation();
+    $sort_direction = $info['sort'] ?? 'desc';
+
+    // Special handling of the headline sorting.
+    $deadline_alias = '';
+    if (isset($info['order']) && $info['order'] === 'deadline') {
+      // Check if the join for the headline field was already performed.
+      foreach ($query->getExpressions() as $expression) {
+        if (strpos($expression['alias'], 'headline') === 0) {
+          $deadline_alias = $expression['alias'];
+          break;
+        }
+      }
+
+      // If not, join the tables.
+      if (empty($deadline_alias)) {
+        // Entity information.
+        $entity_type_id = $this->getEntityTypeId();
+        $entity_base_table = $this->getEntityTypeDataTable($entity_type_id);
+        $entity_id_field = $this->getEntityTypeIdField($entity_type_id);
+
+        // Filter definition.
+        $definition = $this->getFilterDefinitions()['deadline'];
+
+        // Join the deadline tables.
+        $deadline_alias = $this->joinDeadline($query, $definition, $entity_type_id, $entity_base_table, $entity_id_field);
+      }
+    }
+
+    // Let the parent wrap the query.
+    $wrapper = parent::wrapQuery($query, $limit);
+
+    // Add the sort property to the wrapper query.
+    if (!empty($deadline_alias)) {
+      // Clear existing order.
+      $existing_order = &$wrapper->getOrderBy();
+      $existing_order = [];
+
+      // Add field and order.
+      $wrapper->addField('subquery', 'deadline');
+      $wrapper->orderBy("subquery.deadline", $sort_direction);
+    }
+
+    return $wrapper;
+  }
+
 }

From edec9608efcd366b15b407855c31395504556a7d Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 16 Nov 2021 10:08:41 +0100
Subject: [PATCH 092/720] Property labels

---
 .../src/Form/UserPostsPageFilterForm.php             | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/html/modules/custom/reliefweb_user_posts/src/Form/UserPostsPageFilterForm.php b/html/modules/custom/reliefweb_user_posts/src/Form/UserPostsPageFilterForm.php
index 922effd56..0eecc6936 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Form/UserPostsPageFilterForm.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Form/UserPostsPageFilterForm.php
@@ -49,6 +49,18 @@ public function buildForm(array $form, FormStateInterface $form_state, Moderatio
       $form['filters']['omnibox']['input']['#attributes']['data-bundle'] = 'user_posts';
     }
 
+    // Add the filter labels to the properties.
+    $definitions = $service->getFilterDefinitions();
+    foreach ($definitions as $name => $filter) {
+      if (isset($form['filters']['other'][$name], $filter['label'])) {
+        $form['filters']['other'][$name]['#title'] = $filter['label'];
+      }
+    }
+    // Hide the properties label.
+    if (isset($form['filters']['other'])) {
+      $form['filters']['other']['#title_display'] = 'invisible';
+    }
+
     return $form;
   }
 

From a8055a099c727772d56ae3f8b04fd9b931a78479 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 16 Nov 2021 10:22:51 +0100
Subject: [PATCH 093/720] Add template, change filter id

---
 .../reliefweb_user_posts.module               | 28 +++++++++++++++++++
 .../src/Form/UserPostsPageFilterForm.php      |  5 +++-
 .../reliefweb-user-posts-page.html.twig       | 20 +++++++++++++
 3 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.module
 create mode 100644 html/modules/custom/reliefweb_user_posts/templates/reliefweb-user-posts-page.html.twig

diff --git a/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.module b/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.module
new file mode 100644
index 000000000..8ddd2c4fc
--- /dev/null
+++ b/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.module
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * @file
+ * Theme declaration etc. for the reliefweb_user_posts module.
+ */
+
+/**
+ * Implements hook_theme().
+ */
+function reliefweb_user_posts_theme() {
+  $themes = [
+    'reliefweb_user_posts_page' => [
+      'variables' => [
+        // Entity list filters.
+        'filters' => NULL,
+        // Attributes for the filters.
+        'filters_attributes' => NULL,
+        // List of entities. @see reliefweb_moderation_table below.
+        'list' => NULL,
+        // Attributes for the list.
+        'list_attributes' => NULL,
+      ],
+    ],
+  ];
+
+  return $themes;
+}
diff --git a/html/modules/custom/reliefweb_user_posts/src/Form/UserPostsPageFilterForm.php b/html/modules/custom/reliefweb_user_posts/src/Form/UserPostsPageFilterForm.php
index 0eecc6936..93f3e7945 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Form/UserPostsPageFilterForm.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Form/UserPostsPageFilterForm.php
@@ -17,7 +17,7 @@ class UserPostsPageFilterForm extends ModerationPageFilterForm {
    * {@inheritdoc}
    */
   public function getFormId() {
-    return 'reliefweb_moderation_page_filter_form';
+    return 'reliefweb_user_posts_page_filter_form';
   }
 
   /**
@@ -61,6 +61,9 @@ public function buildForm(array $form, FormStateInterface $form_state, Moderatio
       $form['filters']['other']['#title_display'] = 'invisible';
     }
 
+    // Make js work.
+    $form['#attributes']['id'] = 'reliefweb-moderation-page-filter-form';
+
     return $form;
   }
 
diff --git a/html/modules/custom/reliefweb_user_posts/templates/reliefweb-user-posts-page.html.twig b/html/modules/custom/reliefweb_user_posts/templates/reliefweb-user-posts-page.html.twig
new file mode 100644
index 000000000..5d968a22a
--- /dev/null
+++ b/html/modules/custom/reliefweb_user_posts/templates/reliefweb-user-posts-page.html.twig
@@ -0,0 +1,20 @@
+{#
+
+/**
+ * @file
+ * Template for the content moderation pages.
+ */
+
+#}
+
+{{ attach_library('reliefweb_moderation/moderation') }}
+
+<section{{ filters_attributes.addClass('rw-moderation-filters') }}>
+  <h2 class="visually-hidden">{{ 'Filters'|t }}</h2>
+  {{ filters }}
+</section>
+
+<section{{ list_attributes.addClass('rw-moderation-list') }}>
+  <h2 class="visually-hidden">{{ 'List'|t }}</h2>
+  {{ list }}
+</section>

From 1a058b10b6150a0edfa3e59c3b9199160ca5c433 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 16 Nov 2021 10:58:15 +0100
Subject: [PATCH 094/720] Ongoing training

---
 .../src/Services/TrainingModeration.php                    | 4 ++--
 .../reliefweb_user_posts/src/Services/UserPostsService.php | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/html/modules/custom/reliefweb_moderation/src/Services/TrainingModeration.php b/html/modules/custom/reliefweb_moderation/src/Services/TrainingModeration.php
index 150f57aa0..cf850bcb6 100644
--- a/html/modules/custom/reliefweb_moderation/src/Services/TrainingModeration.php
+++ b/html/modules/custom/reliefweb_moderation/src/Services/TrainingModeration.php
@@ -115,7 +115,7 @@ public function getRows(array $results) {
       $details = [];
       // Registration deadline.
       $registration_deadline = $entity->field_registration_deadline->value;
-      if (!empty($registration_deadline)) {
+      if (!empty($registration_deadline) && $registration_deadline != 'Array') {
         $details['registration-deadline'] = $this->t('Registration deadline: %date', [
           '%date' => $this->formatDate($registration_deadline),
         ]);
@@ -123,7 +123,7 @@ public function getRows(array $results) {
       // Training dates (start and end).
       $training_date_start = $entity->field_training_date->value;
       $training_date_end = $entity->field_training_date->end_value;
-      if (!empty($training_date_start)) {
+      if (!empty($training_date_start) && $training_date_start != 'Array') {
         if ($training_date_start === $training_date_end) {
           $training_date = $this->formatDate($training_date_start);
         }
diff --git a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
index 56ee1f6b5..7fa597697 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
@@ -131,7 +131,12 @@ public function getRows(array $results) {
 
       $cells['deadline'] = '';
       if ($entity->field_registration_deadline) {
-        $cells['deadline'] = $this->formatDate($entity->field_registration_deadline->value);
+        if ($entity->field_registration_deadline->value == 'Array') {
+          $cells['deadline'] = $this->t('Ongoing');
+        }
+        else {
+          $cells['deadline'] = $this->formatDate($entity->field_registration_deadline->value);
+        }
       }
       elseif ($entity->field_job_closing_date) {
         $cells['deadline'] = $this->formatDate($entity->field_job_closing_date->value);

From 577cea1fe8f35cd1b343eaddfaefc3d4632c8450 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 16 Nov 2021 09:27:33 -0700
Subject: [PATCH 095/720] adjustment to form component based on additions in
 the base theme

---
 .../components/rw-form/rw-form--widget.css    | 20 +++++++++----------
 .../components/rw-form/rw-form.css            |  6 ------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
index 5528aabc4..a408c6dd2 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
@@ -12,30 +12,25 @@ form .image-widget {
   }
 }
 
-@media (min-width: 576px) {
-  form .image-widget article {
-    flex: 1 0 220px;
-  }
-}
 /* File name */
 form .image-widget article > div {
   font-size: 14px;
 }
-
 @media (min-width: 576px) {
   form .image-widget article > div {
     font-size: 14px;
   }
 }
-form .image-widget .js-media-library-item-preview {
-  max-width: 220px;
-  max-height: 147px;
-}
-.node-announcement-form .image-widget .js-media-library-item-preview,
+
 .node-announcement-edit-form .image-widget .js-media-library-item-preview {
+  width: auto;
+  height: auto;
   max-width: 600px;
   max-height: 200px;
 }
+.node-announcement-edit-form .image-widget .js-media-library-item-preview img {
+  width: auto;
+}
 
 /* Prevent empty divs from taking up space */
 form .js-media-library-widget .js-media-library-selection.form-wrapper,
@@ -46,6 +41,9 @@ form .js-media-library-widget .js-media-library-selection.form-wrapper,
   padding: 0;
 }
 
+form .views-field-media-library-select-form .form-type-checkbox:only-of-type {
+  margin-right: 24px;
+}
 /* Media UI buttons styled the same as other UI buttons */
 .ui-dialog .ui-dialog-buttonpane .cd-button,
 .view-media-library .cd-button,
diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 0bb62262e..b79f8f7c3 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -488,12 +488,6 @@ form button[data-formatter="pdf"] {
   top: -7px;
   right: 0;
 }
-
-/* Table drag */
-a.tabledrag-handle .handle {
-  width: auto;
-  height: auto;
-}
 /* Show/Hide row weight button */
 .tabledrag-toggle-weight {
   padding: 8px;

From 7bd79d335f8dd39a4d340b98e2e82704e4f3d112 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 16 Nov 2021 09:28:56 -0700
Subject: [PATCH 096/720] template override for generic full node, applies to
 announcement node, page title rule for announcement, margin for revisions

---
 .../components/rw-article/rw-article.css      |  4 +
 .../components/rw-revisions/rw-revisions.css  |  1 +
 .../templates/content/node--full.html.twig    | 98 +++++++++++++++++++
 3 files changed, 103 insertions(+)
 create mode 100644 html/themes/custom/common_design_subtheme/templates/content/node--full.html.twig

diff --git a/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css b/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css
index 1ee9feb2a..d1f6f4a87 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css
@@ -154,3 +154,7 @@
   padding-bottom: 8px;
   border-bottom: none;
 }
+
+.node--announcement--full .rw-article__header {
+  margin-bottom: 24px;
+}
diff --git a/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css b/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css
index ee297bd90..7b12c5693 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css
@@ -2,6 +2,7 @@
   display: flex;
   flex-direction: column;
   word-break: break-word;
+  margin-top: 32px;
 }
 .rw-revisions-history__title {
   margin: 0;
diff --git a/html/themes/custom/common_design_subtheme/templates/content/node--full.html.twig b/html/themes/custom/common_design_subtheme/templates/content/node--full.html.twig
new file mode 100644
index 000000000..dc174de38
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/templates/content/node--full.html.twig
@@ -0,0 +1,98 @@
+{#
+/**
+ * @file
+ * Theme override to display a node.
+ *
+ * Available variables:
+ * - node: The node entity with limited access to object properties and methods.
+ *   Only method names starting with "get", "has", or "is" and a few common
+ *   methods such as "id", "label", and "bundle" are available. For example:
+ *   - node.getCreatedTime() will return the node creation timestamp.
+ *   - node.hasField('field_example') returns TRUE if the node bundle includes
+ *     field_example. (This does not indicate the presence of a value in this
+ *     field.)
+ *   - node.isPublished() will return whether the node is published or not.
+ *   Calling other methods, such as node.delete(), will result in an exception.
+ *   See \Drupal\node\Entity\Node for a full list of public properties and
+ *   methods for the node object.
+ * - label: (optional) The title of the node.
+ * - content: All node items. Use {{ content }} to print them all,
+ *   or print a subset such as {{ content.field_example }}. Use
+ *   {{ content|without('field_example') }} to temporarily suppress the printing
+ *   of a given child element.
+ * - author_picture: The node author user entity, rendered using the "compact"
+ *   view mode.
+ * - metadata: Metadata for this node.
+ * - date: (optional) Themed creation date field.
+ * - author_name: (optional) Themed author name field.
+ * - url: Direct URL of the current node.
+ * - display_submitted: Whether submission information should be displayed.
+ * - attributes: HTML attributes for the containing element.
+ *   The attributes.class element may contain one or more of the following
+ *   classes:
+ *   - node: The current template type (also known as a "theming hook").
+ *   - node--type-[type]: The current node type. For example, if the node is an
+ *     "Article" it would result in "node--type-article". Note that the machine
+ *     name will often be in a short form of the human readable label.
+ *   - node--view-mode-[view_mode]: The View Mode of the node; for example, a
+ *     teaser would result in: "node--view-mode-teaser", and
+ *     full: "node--view-mode-full".
+ *   The following are controlled through the node publishing options.
+ *   - node--promoted: Appears on nodes promoted to the front page.
+ *   - node--sticky: Appears on nodes ordered above other non-sticky nodes in
+ *     teaser listings.
+ *   - node--unpublished: Appears on unpublished nodes visible only to site
+ *     admins.
+ * - title_attributes: Same as attributes, except applied to the main title
+ *   tag that appears in the template.
+ * - content_attributes: Same as attributes, except applied to the main
+ *   content tag that appears in the template.
+ * - author_attributes: Same as attributes, except applied to the author of
+ *   the node tag that appears in the template.
+ * - title_prefix: Additional output populated by modules, intended to be
+ *   displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ *   displayed after the main title tag that appears in the template.
+ * - view_mode: View mode; for example, "teaser" or "full".
+ * - teaser: Flag for the teaser state. Will be true if view_mode is 'teaser'.
+ * - page: Flag for the full page state. Will be true if view_mode is 'full'.
+ * - readmore: Flag for more state. Will be true if the teaser content of the
+ *   node cannot hold the main body content.
+ * - logged_in: Flag for authenticated user status. Will be true when the
+ *   current user is a logged-in member.
+ * - is_admin: Flag for admin user status. Will be true when the current user
+ *   is an administrator.
+ *
+ * @see template_preprocess_node()
+ *
+ *   rendered twice on a page this is invalid CSS for example: two lists
+ *   in different view modes.
+ */
+#}
+{{ attach_library('common_design_subtheme/rw-article') }}
+
+{{ local_tasks }}
+<article{{ attributes
+  .addClass([
+    'node',
+    'node--' ~ node.bundle(),
+    'node--full',
+    'node--' ~ node.bundle() ~ '--full',
+    'rw-article',
+    'rw-article--' ~ node.bundle(),
+    'rw-document',
+  ])
+.setAttribute('data-id', node.id())
+}}>
+
+  <header class="rw-article__header">
+    {{ title|merge({'#title_attributes': title_attributes.addClass('rw-article__title')}) }}
+  </header>
+
+  <div class="rw-article__content">
+    {{ content }}
+  </div>
+
+</article>
+
+{{ node.getHistory() }}

From 7fcebcd042c781f506bd4c7ce68bafed722d9199 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 16 Nov 2021 09:29:30 -0700
Subject: [PATCH 097/720] linting

---
 .../components/rw-form/rw-form--widget.css                     | 3 ++-
 .../components/rw-revisions/rw-revisions.css                   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
index a408c6dd2..a74c61065 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
@@ -16,6 +16,7 @@ form .image-widget {
 form .image-widget article > div {
   font-size: 14px;
 }
+
 @media (min-width: 576px) {
   form .image-widget article > div {
     font-size: 14px;
@@ -24,8 +25,8 @@ form .image-widget article > div {
 
 .node-announcement-edit-form .image-widget .js-media-library-item-preview {
   width: auto;
-  height: auto;
   max-width: 600px;
+  height: auto;
   max-height: 200px;
 }
 .node-announcement-edit-form .image-widget .js-media-library-item-preview img {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css b/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css
index 7b12c5693..85dd36544 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-revisions/rw-revisions.css
@@ -1,8 +1,8 @@
 .rw-revisions-history {
   display: flex;
   flex-direction: column;
-  word-break: break-word;
   margin-top: 32px;
+  word-break: break-word;
 }
 .rw-revisions-history__title {
   margin: 0;

From 2a0d849f14ed6f53f943861746063e3d0d6ff2d6 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 16 Nov 2021 13:28:28 -0700
Subject: [PATCH 098/720] reinstate image field preview size control, but
 remove fixed height

---
 .../components/rw-form/rw-form--widget.css           | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
index a74c61065..3f6340529 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
@@ -12,11 +12,21 @@ form .image-widget {
   }
 }
 
+form .image-widget .js-media-library-item-preview {
+  width: 220px;
+  height: auto;
+}
+form .image-widget .js-media-library-item-preview img {
+  width: auto;
+  height: auto;
+  max-width: 100%;
+  max-height: 100%;
+}
+
 /* File name */
 form .image-widget article > div {
   font-size: 14px;
 }
-
 @media (min-width: 576px) {
   form .image-widget article > div {
     font-size: 14px;

From 955264b4a196c467100faf0eb25b4d26ebc0350a Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 16 Nov 2021 13:35:49 -0700
Subject: [PATCH 099/720] remove unneccessary image width declaration

---
 .../components/rw-form/rw-form--widget.css                     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
index 3f6340529..b444d6d93 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
@@ -39,9 +39,6 @@ form .image-widget article > div {
   height: auto;
   max-height: 200px;
 }
-.node-announcement-edit-form .image-widget .js-media-library-item-preview img {
-  width: auto;
-}
 
 /* Prevent empty divs from taking up space */
 form .js-media-library-widget .js-media-library-selection.form-wrapper,

From 4b142742a9d79b42967193e9b2d6c53cf6305f18 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 16 Nov 2021 14:55:23 -0700
Subject: [PATCH 100/720] linting

---
 .../components/rw-form/rw-form--widget.css                     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
index b444d6d93..742649023 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
@@ -18,8 +18,8 @@ form .image-widget .js-media-library-item-preview {
 }
 form .image-widget .js-media-library-item-preview img {
   width: auto;
-  height: auto;
   max-width: 100%;
+  height: auto;
   max-height: 100%;
 }
 
@@ -27,6 +27,7 @@ form .image-widget .js-media-library-item-preview img {
 form .image-widget article > div {
   font-size: 14px;
 }
+
 @media (min-width: 576px) {
   form .image-widget article > div {
     font-size: 14px;

From bb0d0b6f776d3d780e1cc74ac1c9ef9ec3f6d14b Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 16 Nov 2021 15:50:22 -0700
Subject: [PATCH 101/720] update base theme

---
 composer.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/composer.lock b/composer.lock
index b5b659d57..c67db75aa 100644
--- a/composer.lock
+++ b/composer.lock
@@ -12388,12 +12388,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/UN-OCHA/common_design.git",
-                "reference": "219d7e3bda39d984a337fe81d784f0907448f217"
+                "reference": "921b3b8c2c9a7518ef8b06b28236c87afb0132e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/219d7e3bda39d984a337fe81d784f0907448f217",
-                "reference": "219d7e3bda39d984a337fe81d784f0907448f217",
+                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/921b3b8c2c9a7518ef8b06b28236c87afb0132e9",
+                "reference": "921b3b8c2c9a7518ef8b06b28236c87afb0132e9",
                 "shasum": ""
             },
             "require": {
@@ -12408,7 +12408,7 @@
                 "source": "https://github.com/UN-OCHA/common_design/tree/cd-304-forms",
                 "issues": "https://github.com/UN-OCHA/common_design/issues"
             },
-            "time": "2021-11-01T22:42:52+00:00"
+            "time": "2021-11-16T20:27:33+00:00"
         },
         {
             "name": "webflo/drupal-finder",
@@ -14485,5 +14485,5 @@
     "platform-overrides": {
         "php": "8.0"
     },
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.0.0"
 }

From a1025cd1b88348c0c9c4da0c266227f429afc0f0 Mon Sep 17 00:00:00 2001
From: Peter Lieverdink <lieverdink@reliefweb.int>
Date: Wed, 17 Nov 2021 12:05:21 +1100
Subject: [PATCH 102/720] [OPS-7896] Use the latest build steps for GitHub.
 Remove the SSL cert from the image.

---
 .github/workflows/docker-build-image.yml | 93 +++++++++++++++++-------
 docker/Dockerfile                        |  4 -
 2 files changed, 66 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/docker-build-image.yml b/.github/workflows/docker-build-image.yml
index 883f68a63..90da0f298 100644
--- a/.github/workflows/docker-build-image.yml
+++ b/.github/workflows/docker-build-image.yml
@@ -13,55 +13,94 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
+    - name: Configure AWS Credentials
+      id: aws
+      uses: aws-actions/configure-aws-credentials@v1
+      with:
+        aws-access-key-id: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
+        aws-secret-access-key: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}
+        aws-region: us-east-1
+
     - name: Checkout code
       id: checkout
       uses: actions/checkout@v1
+      with:
+        fetch-depth: 0
 
     - name: Determine environment type
       id: env
-      uses: docker://unocha/actions:determine-environment-main
+      uses: docker://ghcr.io/un-ocha/actions:determine-environment-main
 
-    - name: Configure AWS Credentials
-      id: aws
-      uses: aws-actions/configure-aws-credentials@v1
+    - name: Image Metadata
+      id: meta
+      run: |
+        export DOCKER_TAG="${GITHUB_REF#refs/*/}"
+        export DOCKER_TAG=${DOCKER_TAG//[^[:alnum:].-]/-}
+        echo ::set-output name=DOCKER_TAG::${DOCKER_TAG}
+        export VCS_REF=`git rev-parse --short HEAD`
+        echo ::set-output name=VCS_REF::${VCS_REF}
+        export VCS_URL=`git config --get remote.origin.url | sed 's#git@github.com:#https://github.com/#'`
+        echo ::set-output name=VCS_URL::${VCS_URL}
+        export BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"`
+        echo ::set-output name=BUILD_DATE::${BUILD_DATE}
+
+    - name: Login to Public ECR
+      id: login
+      uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
       with:
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        aws-region: us-east-1
+        registry: public.ecr.aws
+        username: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
+        password: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}
+      env:
+        AWS_REGION: us-east-1
 
     - name: Build docker image
       id: build
+      uses: docker/build-push-action@v2
+      with:
+        build-args: |
+          BRANCH_ENVIRONMENT=${BRANCH_ENVIRONMENT}
+          VCS_REF=${{ steps.meta.outputs.VCS_REF }}
+          VCS_URL=${{ steps.meta.outputs.VCS_URL }}
+          BUILD_DATE=${{ steps.meta.outputs.BUILD_DATE }}
+          GITHUB_ACTOR=${{ github.actor }}
+          GITHUB_REPOSITORY=${{ github.repository }}
+          GITHUB_SHA=${{ github.sha }}
+          GITHUB_REF=${{ github.ref }}
+        labels: |
+          info.humanitarianresponse.build.date=${{ steps.meta.outputs.BUILD_DATE }}
+          info.humanitarianresponse.build.person=${{ github.actor }}
+          info.humanitarianresponse.build.vcs-url=${{ steps.meta.outputs.VCS_URL }}
+          info.humanitarianresponse.build.vcs-ref=${{ steps.meta.outputs.VCS_REF }}
+        file: docker/Dockerfile
+        push: true
+        tags: public.ecr.aws/unocha/rwint9-site:${{ steps.meta.outputs.DOCKER_TAG }}
+        secrets: |
+          "github_token=${{ secrets.ECR_GITHUB_TOKEN }}"
+
+    - name: Webhook
+      id: jenkins
+      if: success()
+      env:
+        DOCKER_TAG: ${{ steps.meta.outputs.DOCKER_TAG }}
+        JENKINS_TOKEN: ${{ secrets.JENKINS_ECR_TOKEN }}
       run: |
-        export DOCKER_TAG="${GITHUB_REF#refs/*/}"
-        export DOCKER_TAG=${DOCKER_TAG//[^[:alnum:].-]/-}
-        aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/unocha || exit 1
-        docker build \
-            --build-arg BRANCH_ENVIRONMENT=${BRANCH_ENVIRONMENT} \
-            --build-arg VCS_REF=`git rev-parse --short HEAD` \
-            --build-arg VCS_URL=`git config --get remote.origin.url | sed 's#git@github.com:#https://github.com/#'` \
-            --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-            --build-arg GITHUB_ACTOR=${GITHUB_ACTOR} \
-            --build-arg GITHUB_REPOSITORY=${GITHUB_REPOSITORY} \
-            --build-arg GITHUB_SHA=${GITHUB_SHA} \
-            --build-arg GITHUB_REF=${GITHUB_REF} \
-         . --file docker/Dockerfile --tag public.ecr.aws/unocha/rwint9-site:${DOCKER_TAG} || exit 1
-        docker push public.ecr.aws/unocha/rwint9-site:${DOCKER_TAG} || exit 1
-      continue-on-error: true
+        curl -H "Token: ${JENKINS_TOKEN}" -X POST "https://jenkins.aws.ahconu.org/generic-webhook-trigger/invoke?DOCKER_IMAGE=rwint9-site&DOCKER_TAG=${DOCKER_TAG}"
 
     - name: Flowdock Failure
       id: failure
-      if: steps.build.outputs.exitcode == 1
-      uses: docker://unocha/actions:flowdock-notify-main
+      if: failure()
+      uses: docker://ghcr.io/un-ocha/actions:flowdock-notify-main
       env:
         FLOWDOCK_TOKEN: ${{ secrets.FLOWDOCK_TOKEN }}
-        FLOWDOCK_ICON: 'warning'
+        FLOWDOCK_ICON: '-1'
         FLOWDOCK_MESSAGE: 'Failed to build a new `unocha/rwint9-site` image from ${{ github.ref }} , please go check [GitHub](https://github.com/UN-OCHA/rwint9-site/actions/workflows/docker-build-image.yml).'
         FLOWDOCK_TAGS: 'build,docker,${{ github.actor }}'
 
     - name: Flowdock Success
       id: success
-      if: steps.build.outputs.exitcode == 0
-      uses: docker://unocha/actions:flowdock-notify-main
+      if: success()
+      uses: docker://ghcr.io/un-ocha/actions:flowdock-notify-main
       env:
         FLOWDOCK_TOKEN: ${{ secrets.FLOWDOCK_TOKEN }}
         FLOWDOCK_ICON: 'package'
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 87228aca1..5d0e5a5bd 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -54,10 +54,6 @@ LABEL info.humanitarianresponse.build.date=$BUILD_DATE \
       info.humanitarianresponse.build.vcs-url=$VCS_URL \
       info.humanitarianresponse.build.vcs-ref=$VCS_REF
 
-# Add the AWS RDS global certificate bundle into the image, so PDO can use it.
-RUN  curl -s -o /etc/ssl/global-bundle.pem https://truststore.pki.rds.amazonaws.com/global/global-bundle.pem && \
-     chmod 644 /etc/ssl/global-bundle.pem
-
 COPY --from=builder /srv/www/config /srv/www/config/
 COPY --from=builder /srv/www/html /srv/www/html/
 COPY --from=builder /srv/www/vendor /srv/www/vendor/

From 7186a3199a4889aec6c20561b3096a1447d6f30d Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 17 Nov 2021 12:20:40 -0700
Subject: [PATCH 103/720] adjust icon display

---
 .../components/rw-guidelines/rw-guidelines.css               | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
index 12efbb13e..45403b55b 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
@@ -13,6 +13,7 @@ form[data-with-guidelines] button[data-guideline] {
 }
 form[data-with-guidelines] button[data-guideline]:hover {
   background: var(--rw-icons--common--help--12--dark-red);
+  background-color: var(--cd-reliefweb-brand-grey--light);
 }
 form[data-with-guidelines] .rw-guideline:before {
   position: fixed;
@@ -57,13 +58,13 @@ form[data-with-guidelines] .rw-guideline > button[value="close"]:after {
   width: 12px;
   height: 12px;
   content: "";
-  background: var(--rw-icons--common--close--18--dark-grey);
+  background: var(--rw-icons--common--close--12--dark-blue);
 }
 form[data-with-guidelines] .rw-guideline > button[value="close"]:hover {
   border-color: var(--cd-reliefweb-brand-red--dark);
 }
 form[data-with-guidelines] .rw-guideline > button[value="close"]:hover:after {
-  background: var(--rw-icons--common--close--18--dark-red);
+  background: var(--rw-icons--common--close--12--dark-red);
 }
 form[data-with-guidelines] .rw-guideline > div {
   position: relative;

From a077e546263bcb4c5689b9a16a8ec9cfc12c951a Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 17 Nov 2021 12:32:40 -0700
Subject: [PATCH 104/720] extend reliefweb custom module with sub theme
 component

---
 .../common_design_subtheme/common_design_subtheme.info.yml    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.info.yml b/html/themes/custom/common_design_subtheme/common_design_subtheme.info.yml
index cea8c40e6..c08f6bcd5 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.info.yml
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.info.yml
@@ -49,6 +49,10 @@ libraries-extend:
   reliefweb_form/widget.datepicker:
     - common_design_subtheme/rw-datepicker
 
+  # Guidelines.
+  reliefweb_form/form.guidelines:
+    - common_design_subtheme/rw-guidelines
+
 
 # Custom namespace
 # https://www.drupal.org/docs/contributed-modules/components/understanding-twig-namespaces

From f08465e0b55bcf2bd99ab12b39de9d201669527f Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 17 Nov 2021 15:59:39 -0700
Subject: [PATCH 105/720] adjust selectors to suit D9 markup and BEM selectors,
 some rules to override rw-document component

---
 .../components/rw-report/rw-report.css        | 52 +++++++++++--------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-report/rw-report.css b/html/themes/custom/common_design_subtheme/components/rw-report/rw-report.css
index 61b9eeba8..5deb544f6 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-report/rw-report.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-report/rw-report.css
@@ -4,85 +4,86 @@
  * Individual report pages. Those are made of the main content body with
  * eventual attachments.
  */
-/* Lists in content */
-.node--report--full li {
-  margin: 8px 0 0;
-}
+
 /* Attachments. */
-.node--report--full #attachments {
+.node--report--full .rw-report__content section {
+  padding-top: 0;
+}
+.node--report--full .rw-attachment {
   margin: 0 auto 24px auto;
   padding-top: 0;
 }
-.node--report--full #attachments.report {
+.node--report--full .rw-attachment.rw-attachment--report {
   max-width: 220px;
 }
 
 @media screen and (min-width: 480px) {
-  .node--report--full #attachments.report {
+  .node--report--full .rw-attachment.rw-attachment--report {
     float: right;
     margin-left: 24px;
   }
 }
-.node--report--full #attachments ul {
+.node--report--full .rw-attachment ul {
   margin: 0;
   padding: 0;
   list-style: none;
 }
-.node--report--full #attachments li {
+.node--report--full .rw-attachment li {
   margin: 0;
   padding: 16px 0;
   text-align: center;
   border: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
-.node--report--full #attachments li + li {
+.node--report--full .rw-attachment li + li {
   margin-top: 24px;
 }
-.node--report--full #attachments img {
+.node--report--full .rw-attachment img {
   width: 100%;
   margin: -16px 0 8px 0;
   border-bottom: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
-.node--report--full #attachments strong {
+.node--report--full .rw-attachment strong {
   display: block;
   padding: 0 16px;
 }
-.node--report--full #attachments strong:first-letter {
+.node--report--full .rw-attachment strong:first-letter {
   text-transform: capitalize;
 }
-.node--report--full #attachments span {
+.node--report--full .rw-attachment span {
   display: block;
   padding: 4px 16px 0 16px;
   font-size: 14px;
 }
 /* Interactive tool screenshots. */
-.node--report--full #interactive {
+.node--report--full .rw-attachment--interactive {
   padding-top: 0;
   text-align: center;
 }
-.node--report--full #interactive h3 {
+.node--report--full .rw-attachment--interactive h3 {
   margin: 0;
   padding: 0 0 20px 0;
   border: none;
   font-size: 16px;
   font-weight: normal;
 }
-.node--report--full #interactive figure a:after {
+.node--report--full .rw-attachment--interactive figure a[target="_blank"][rel~="noopener"]::after {
   display: none;
 }
-.node--report--full #interactive figure figcaption {
+.node--report--full .rw-attachment--interactive figure figcaption {
   padding: 4px;
   background: var(--cd-reliefweb-brand-grey--light);
 }
-.node--report--full #interactive figure img {
+.node--report--full .rw-attachment--interactive figure img {
   width: 100%;
+  margin: 0;
   border: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
-.node--report--full #interactive figure a:hover img,
-.node--report--full #interactive figure a:active img,
-.node--report--full #interactive figure a:focus img {
+.node--report--full .rw-attachment--interactive figure a:hover img,
+.node--report--full .rw-attachment--interactive figure a:active img,
+.node--report--full .rw-attachment--interactive figure a:focus img {
   border-color: var(--cd-reliefweb-brand-blue--dark);
 }
-.node--report--full #interactive footer {
+.node--report--full .rw-attachment--interactive footer {
   padding-top: 4px;
 }
 
@@ -100,3 +101,8 @@
   margin: 4px 0 0 0;
   padding: 0;
 }
+
+/* Lists in content */
+.node--report--full li {
+  margin: 8px 0 0;
+}

From 0577ff9c2e01d54626bb37f80540e1a88baab993 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 17 Nov 2021 16:05:27 -0700
Subject: [PATCH 106/720] add inside wrapper div around body content and
 attachment so sitrep document float rule is respected, comment out example
 attachment markup for testing

---
 .../content/node--report--full.html.twig      | 47 ++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/templates/content/node--report--full.html.twig b/html/themes/custom/common_design_subtheme/templates/content/node--report--full.html.twig
index 3f2109775..557ad07ac 100644
--- a/html/themes/custom/common_design_subtheme/templates/content/node--report--full.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/content/node--report--full.html.twig
@@ -158,12 +158,57 @@
       }) }}
     {% endif %}
 
-    {# @todo add attachments. #}
+    <div class="rw-report__content">
+
+{#      Report#}
+{#      <section id="attachments" class="rw-attachment rw-attachment--report">#}
+{#        <h3 class="visually-hidden">Attachments</h3>#}
+{#        <ul>#}
+{#          <li>#}
+{#            <a href="#" download="Asia-Pacific COVID-19 update 9 November 2021.pdf">#}
+{#              <img src="https://reliefweb.int/sites/reliefweb.int/files/styles/report-small/public/resources-pdf-previews/1589432-Asia-Pacific%20COVID-19%20update%209%20November%202021.png?itok=IYA05TKD" alt="">#}
+{#              <strong>Download document</strong>#}
+{#              <span>(PDF | 439.83 KB)</span>#}
+{#            </a>#}
+{#          </li>#}
+{#        </ul>#}
+{#      </section>#}
+
+{#      Interactive#}
+{#      <section id="interactive" class="rw-attachment rw-attachment--interactive">#}
+{#        <h3>Screenshot(s) of the interactive content as of 30 Apr 2021</h3>#}
+{#        <div class="rw-attachment__content">#}
+{#          <figure>#}
+{#            <a href="#" target="_blank" rel="noopener">#}
+{#              <img src="https://reliefweb.int/sites/reliefweb.int/files/styles/report-large/public/resources-pdf-previews/1575720-SOMALIA%20%20%20UNHCR%205W%20%20Who%20is%20doing%20What%20Where%20When%20for%20Whom%20.png?itok=4fIvGZts" alt="Screenshot 1">#}
+{#            </a>#}
+{#            <figcaption aria-hidden="true">Screenshot 1</figcaption>#}
+{#          </figure>#}
+{#        </div>#}
+{#        <footer class="rw-attachment__footer">#}
+{#          <a href="#" target="_blank" rel="noopener">View the interactive content page</a>#}
+{#        </footer>#}
+{#      </section>#}
+
+{#      Map or Infographic#}
+{#      <section id="attachments" class="rw-attachment rw-attachment--map">#}
+{#        <h3 class="visually-hidden">Attachments</h3>#}
+{#        <ul>#}
+{#          <li>#}
+{#            <a href="#" download="partner_presence.pdf">#}
+{#              <img src="https://reliefweb.int/sites/reliefweb.int/files/styles/report-large/public/resources-pdf-previews/1575739-partner_presence.png?itok=6nzWdeYx" alt="">#}
+{#              <strong>Download Map</strong>#}
+{#              <span>(PDF | 236.67 KB)</span>#}
+{#            </a>#}
+{#          </li>#}
+{#        </ul>#}
+{#      </section>#}
 
     {{ content.body.0|render|sanitize_html(false, 2) }}
 
     {{ node.getSourceDisclaimers() }}
 
+    </div>
   </div>
 
   <footer class="rw-article__footer">

From 20004e9a0a0f5c5d29fde8c5d8fa4b5fd467cfdb Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 18 Nov 2021 15:14:54 +0900
Subject: [PATCH 107/720] [RW-25] Handle file revisioning, refine widget, add
 download routes and docstore integration

---
 .../schema/reliefweb_docstore.schema.yml      |  13 +
 .../reliefweb_docstore.module                 |  28 +
 .../reliefweb_docstore.routing.yml            |  10 +
 .../src/Controller/FileDownloadController.php | 196 +++++
 .../Field/FieldFormatter/ReliefWebFile.php    |   2 +-
 .../Plugin/Field/FieldType/ReliefWebFile.php  | 709 ++++++++++++++++--
 .../Field/FieldType/ReliefWebFileList.php     |  52 ++
 .../Field/FieldWidget/ReliefWebFile.php       | 326 +++++---
 .../src/Services/DocstoreClient.php           |  61 +-
 9 files changed, 1241 insertions(+), 156 deletions(-)
 create mode 100644 html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php

diff --git a/html/modules/custom/reliefweb_docstore/config/schema/reliefweb_docstore.schema.yml b/html/modules/custom/reliefweb_docstore/config/schema/reliefweb_docstore.schema.yml
index 793a8d234..a2fb44aff 100644
--- a/html/modules/custom/reliefweb_docstore/config/schema/reliefweb_docstore.schema.yml
+++ b/html/modules/custom/reliefweb_docstore/config/schema/reliefweb_docstore.schema.yml
@@ -17,3 +17,16 @@ reliefweb_docstore.settings:
     preview_directory:
       type: string
       label: 'Name of the directory for the local file previews.'
+
+field.field_settings.reliefweb_file:
+  type: mapping
+  mapping:
+    local:
+      type: boolean
+      label: 'Flag to store the files locally instead of remotely'
+    file_extensions:
+      type: string
+      label: 'Allowed file extensions'
+    max_filesize:
+      type: string
+      label: 'Maximum upload size'
diff --git a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
index 5f22839db..2955e32a1 100644
--- a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
+++ b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
@@ -5,6 +5,8 @@
  * ReliefWeb Docstore module file.
  */
 
+use Drupal\file\Entity\File;
+
 /**
  * Implements hook_theme().
  */
@@ -100,3 +102,29 @@ function reliefweb_docstore_get_languages() {
 
   return $languages;
 }
+
+/**
+ * Validate the mime type of file.
+ *
+ * @param \Drupal\file\Entity\File $file
+ *   File entity to validate.
+ * @param string $mime_type
+ *   Mime type to compare with.
+ *
+ * @return bool
+ *   An empty array if the file mime type is a match or an array containing an
+ *   error message if it's not.
+ *
+ * @see file_validate()
+ */
+function reliefweb_docostore_file_validate_mime_type(File $file, $mime_type) {
+  $errors = [];
+
+  if ($file->getMimeType() !== $mime_type) {
+    $errors[] = t('The file mime type is not %mime_type.', [
+      '%mime_type' => $mime_type,
+    ]);
+  }
+
+  return $errors;
+}
diff --git a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.routing.yml b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.routing.yml
index e69de29bb..f902827a9 100644
--- a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.routing.yml
+++ b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.routing.yml
@@ -0,0 +1,10 @@
+reliefweb_docstore.attachment.public:
+  path: '/attachments/{uuid}/{filename}'
+  defaults:
+    _controller: '\Drupal\reliefweb_docstore\Controller\FileDownloadController::downloadPublicAttachment'
+    _title: 'Download a public attachment'
+reliefweb_docstore.attachment.private:
+  path: '/private/attachments/{uuid}/{filename}'
+  defaults:
+    _controller: '\Drupal\reliefweb_docstore\Controller\FileDownloadController::downloadPrivateAttachment'
+    _title: 'Download a private attachment'
diff --git a/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php b/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php
index d1f3e3135..087a45457 100644
--- a/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php
+++ b/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php
@@ -4,11 +4,14 @@
 
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Logger\LoggerChannelFactoryInterface;
 use Drupal\Core\Session\AccountProxyInterface;
 use Drupal\Core\StreamWrapper\StreamWrapperManagerInterface;
+use Drupal\reliefweb_docstore\Services\DocstoreClient;
 use Drupal\system\FileDownloadController as OriginalFileDownloadController;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\StreamedResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -32,6 +35,13 @@ class FileDownloadController extends OriginalFileDownloadController {
    */
   protected $currentUser;
 
+  /**
+   * The OCHA docstore client service.
+   *
+   * @var \Drupal\reliefweb_docstore\Services\DocstoreClient
+   */
+  protected $docstoreClient;
+
   /**
    * The entity type manager service.
    *
@@ -39,6 +49,13 @@ class FileDownloadController extends OriginalFileDownloadController {
    */
   protected $entityTypeManager;
 
+  /**
+   * The logger service.
+   *
+   * @var \Psr\Log\LoggerInterface
+   */
+  protected $logger;
+
   /**
    * FileDownloadController constructor.
    *
@@ -46,22 +63,30 @@ class FileDownloadController extends OriginalFileDownloadController {
    *   The config factory service.
    * @param \Drupal\Core\Session\AccountProxyInterface $current_user
    *   The current user.
+   * @param \Drupal\reliefweb_docstore\Services\DocstoreClient $docstore_client
+   *   The OCHA docstore client service.
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The entity type manager service.
+   * @param \Drupal\Core\Logger\LoggerChannelFactoryInterface $logger_factory
+   *   The logger factory service.
    * @param \Drupal\Core\StreamWrapper\StreamWrapperManagerInterface $stream_wrapper_manager
    *   The stream wrapper manager.
    */
   public function __construct(
     ConfigFactoryInterface $config_factory,
     AccountProxyInterface $current_user,
+    DocstoreClient $docstore_client,
     EntityTypeManagerInterface $entity_type_manager,
+    LoggerChannelFactoryInterface $logger_factory,
     StreamWrapperManagerInterface $stream_wrapper_manager
   ) {
     parent::__construct($stream_wrapper_manager);
 
     $this->config = $config_factory->get('reliefweb_docstore.settings');
     $this->currentUser = $current_user;
+    $this->docstoreClient = $docstore_client;
     $this->entityTypeManager = $entity_type_manager;
+    $this->logger = $logger_factory->get('reliefweb_docstore');
   }
 
   /**
@@ -71,7 +96,9 @@ public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
       $container->get('current_user'),
+      $container->get('docstore_client'),
       $container->get('entity_type.manager'),
+      $container->get('logger.factory'),
       $container->get('stream_wrapper_manager')
     );
   }
@@ -114,6 +141,175 @@ public function download(Request $request, $scheme = 'private') {
     return new BinaryFileResponse($uri, 200, $headers, FALSE);
   }
 
+  /**
+   * Download a public attachment.
+   *
+   * @param string $uuid
+   *   File resource UUID.
+   * @param string $filename
+   *   File name.
+   *
+   * @return \Symfony\Component\HttpFoundation\Response
+   *   Response to download the file.
+   *
+   * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
+   *   403 if the user is not authorized to download the file.
+   * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
+   *   404 if the file was not found.
+   */
+  public function downloadPublicAttachment($uuid, $filename) {
+    return $this->downloadAttachment($uuid, $filename);
+  }
+
+  /**
+   * Download a private attachment.
+   *
+   * @param string $uuid
+   *   File resource UUID.
+   * @param string $filename
+   *   File name.
+   *
+   * @return \Symfony\Component\HttpFoundation\Response
+   *   Response to download the file.
+   *
+   * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
+   *   403 if the user is not authorized to download the file.
+   * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
+   *   404 if the file was not found.
+   */
+  public function downloadPrivateAttachment($uuid, $filename) {
+    return $this->downloadAttachment($uuid, $filename, TRUE);
+  }
+
+  /**
+   * Download a file attachment.
+   *
+   * Note: this tries to download the public file if exists first, then if
+   * private is set and the user has access to the private files attempt to
+   * download it.
+   *
+   * @param string $uuid
+   *   File resource UUID.
+   * @param string $filename
+   *   File name.
+   * @param bool $private
+   *   TRUE to check private files.
+   *
+   * @return \Symfony\Component\HttpFoundation\Response
+   *   Response to download the file.
+   *
+   * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
+   *   403 if the user is not authorized to download the file.
+   * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
+   *   404 if the file was not found.
+   */
+  protected function downloadAttachment($uuid, $filename, $private = FALSE) {
+    try {
+      // Try to download the public file matching the given UUID.
+      $response = $this->downloadLocalFile($uuid, $filename);
+      if (empty($response)) {
+        $response = $this->downloadRemoteFile($uuid, $filename);
+      }
+
+      // Try to download the private file matching the given UUID.
+      if (empty($response) && $private) {
+        // No need to try to fetch the files if the user doesn't have access.
+        if (!$this->currentUser->hasPermission('access reliefweb private files')) {
+          throw new AccessDeniedHttpException();
+        }
+        if (empty($response)) {
+          $response = $this->downloadLocalFile($uuid, $filename, TRUE);
+        }
+        if (empty($response)) {
+          $response = $this->downloadRemoteFile($uuid, $filename, TRUE);
+        }
+      }
+
+      // If the file was found, send its content.
+      if (!empty($response)) {
+        return $response;
+      }
+    }
+    catch (AccessDeniedHttpException $exception) {
+      throw $exception;
+    }
+    catch (NotFoundHttpException $exception) {
+      throw $exception;
+    }
+    catch (\Exception $exception) {
+      // @todo log error.
+    }
+    throw new NotFoundHttpException('Not Found');
+  }
+
+  /**
+   * Download a local file.
+   *
+   * @param string $uuid
+   *   File resource UUID.
+   * @param string $filename
+   *   File name.
+   *
+   * @return \Symfony\Component\HttpFoundation\BinaryFileResponse|null
+   *   Response to download the file or NULL if the file was not found. We
+   *   don't throw a 404 in that case so that the caller function can perform
+   *   additional requests if necessary.
+   *
+   * @see ::downloadAttachment()
+   */
+  protected function downloadLocalFile($uuid, $filename) {
+    $extension = ReliefWebFile::getFileExtension($filename);
+    $uri = ReliefWebFile::getFileUriFromUuid($uuid, $extension, $private);
+    $headers = ['Cache-Control' => 'private, must-revalidate'];
+
+    if (file_exists($uri)) {
+      return new BinaryFileResponse($uri, 200, $headers, $private, 'attachment', TRUE);
+    }
+    return NULL;
+  }
+
+  /**
+   * Download a remote file.
+   *
+   * @param string $uuid
+   *   File resource UUID.
+   * @param string $filename
+   *   File name.
+   *
+   * @return \Symfony\Component\HttpFoundation\StreamedResponse|null
+   *   Response to download the file or NULL if the file was not found. We
+   *   don't throw a 404 in that case so that the caller function can perform
+   *   additional requests if necessary.
+   *
+   * @see ::downloadAttachment()
+   *
+   * @throws \Exception
+   *   Exception if something was wrong with the request.
+   */
+  protected function downloadRemoteFile($uuid, $filename) {
+    $response = $this->docstoreClient->request('GET', '/files/' . $uuid . '/' . $filename, [
+      'stream' => TRUE,
+    ], 1200);
+
+    // Skip if something went wrong with the request. The error is already
+    // logged in DocstoreClient::request().
+    if (empty($response)) {
+      throw new \Exception();
+    }
+
+    // Stream the response content.
+    if ($response->isSuccessful()) {
+      return new StreamedResponse([$response->getBody(), 'getContents'], 200, $response->getHeaders());
+    }
+    // If the response was not successful nor a 404, throw an exception with the
+    // status code and reason so we can log it.
+    elseif ($response->getStatusCode() !== 404) {
+      throw new \Exception($response->getStatusCode(), $response->getReasonPhrase());
+    }
+
+    return NULL;
+  }
+
   /**
    * Load a file from its URI.
    *
diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldFormatter/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldFormatter/ReliefWebFile.php
index 184b29a4f..9aeaa3a57 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldFormatter/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldFormatter/ReliefWebFile.php
@@ -30,7 +30,7 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
       $url = 'https://docstore.test/files/' . $item->get('uuid')->getValue();
 
       $links[] = [
-        'title' => $item->get('filename')->getValue(),
+        'title' => $item->get('file_name')->getValue(),
         'url' => Url::fromUri($url),
       ];
     }
diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
index d696cce8c..2561379cd 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
@@ -2,10 +2,16 @@
 
 namespace Drupal\reliefweb_docstore\Plugin\Field\FieldType;
 
+use Drupal\Component\Utility\Bytes;
+use Drupal\Component\Utility\Environment;
 use Drupal\Component\Utility\Random;
+use Drupal\Core\Entity\EntityPublishedInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FieldItemBase;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\Core\File\Exception\FileException;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\StreamWrapper\StreamWrapperManager;
 use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\Core\TypedData\DataDefinition;
 use Drupal\Core\Url;
@@ -21,6 +27,7 @@
  *   category = @Translation("ReliefWeb"),
  *   default_widget = "reliefweb_file",
  *   default_formatter = "reliefweb_file",
+ *   list_class = "\Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFileList",
  *   cardinality = -1,
  * )
  */
@@ -33,6 +40,13 @@ class ReliefWebFile extends FieldItemBase {
    */
   protected $entityRepository;
 
+  /**
+   * The entity type manager service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
   /**
    * The file system service.
    *
@@ -47,6 +61,210 @@ class ReliefWebFile extends FieldItemBase {
    */
   protected $docstoreClient;
 
+  /**
+   * {@inheritdoc}
+   */
+  public static function defaultFieldSettings() {
+    return [
+      'local' => TRUE,
+      'file_extensions' => '',
+      'max_filesize' => NULL,
+    ] + parent::defaultFieldSettings();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
+    $element = parent::fieldSettingsForm($form, $form_state);
+    $settings = $this->getSettings();
+
+    $element['local'] = [
+      '#type' => 'checkbox',
+      '#title' => $this->t('Store files locally'),
+      '#description' => $this->t('Check if the files should be stored locally instead of remotely.'),
+      '#default_value' => $this->getSetting('local'),
+    ];
+
+    // Make the extension list a little more human-friendly by comma-separation.
+    $extensions = str_replace(' ', ', ', $settings['file_extensions']);
+    $element['file_extensions'] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Allowed file extensions'),
+      '#default_value' => $extensions,
+      '#description' => $this->t("Separate extensions with a comma or space. Each extension can contain alphanumeric characters, '.', and '_', and should start and end with an alphanumeric character."),
+      '#element_validate' => [[static::class, 'validateExtensions']],
+      '#maxlength' => 255,
+      // By making this field required, we prevent a potential security issue
+      // that would allow files of any type to be uploaded.
+      '#required' => TRUE,
+    ];
+
+    $element['max_filesize'] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Maximum upload size'),
+      '#default_value' => $settings['max_filesize'],
+      '#description' => $this->t('Enter a value like "512" (bytes), "80 KB" (kilobytes) or "50 MB" (megabytes) in order to restrict the allowed file size. If left empty the file sizes will be limited only by PHP\'s maximum post and file upload sizes (current limit <strong>%limit</strong>).', [
+        '%limit' => format_size(Environment::getUploadMaxSize()),
+      ]),
+      '#size' => 10,
+      '#element_validate' => [[static::class, 'validateMaxFilesize']],
+    ];
+
+    return $element;
+  }
+
+  /**
+   * Form API callback.
+   *
+   * This doubles as a convenience clean-up function and a validation routine.
+   * Commas are allowed for the end-user, but ultimately the value will be
+   * stored as a space-separated list for compatibility with
+   * file_validate_extensions().
+   *
+   * This function is assigned as an #element_validate callback in
+   * fieldSettingsForm().
+   *
+   * @param array $element
+   *   Form element to validate.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   Form state.
+   */
+  public static function validateExtensions(array $element, FormStateInterface $form_state) {
+    if (!empty($element['#value'])) {
+      $extensions = preg_replace('/([, ]+\.?)/', ' ', trim(strtolower($element['#value'])));
+      $extension_array = array_unique(array_filter(explode(' ', $extensions)));
+      $extensions = implode(' ', $extension_array);
+      if (!preg_match('/^([a-z0-9]+([._][a-z0-9])* ?)+$/', $extensions)) {
+        $form_state->setError($element, t("The list of allowed extensions is not valid. Allowed characters are a-z, 0-9, '.', and '_'. The first and last characters cannot be '.' or '_', and these two characters cannot appear next to each other. Separate extensions with a comma or space."));
+      }
+      else {
+        $form_state->setValueForElement($element, $extensions);
+      }
+
+      // If insecure uploads are not allowed and txt is not in the list of
+      // allowed extensions, ensure that no insecure extensions are allowed.
+      if (!in_array('txt', $extension_array, TRUE) && !\Drupal::config('system.file')->get('allow_insecure_uploads')) {
+        foreach ($extension_array as $extension) {
+          if (preg_match(FileSystemInterface::INSECURE_EXTENSION_REGEX, 'test.' . $extension)) {
+            $form_state->setError($element, t('Add %txt_extension to the list of allowed extensions to securely upload files with a %extension extension. The %txt_extension extension will then be added automatically.', [
+              '%extension' => $extension,
+              '%txt_extension' => 'txt',
+            ]));
+            break;
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Form API callback.
+   *
+   * Ensures that a size has been entered and that it can be parsed by
+   * \Drupal\Component\Utility\Bytes::toNumber().
+   *
+   * This function is assigned as an #element_validate callback in
+   * fieldSettingsForm().
+   *
+   * @param array $element
+   *   Form element to validate.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   Form state.
+   */
+  public static function validateMaxFilesize(array $element, FormStateInterface $form_state) {
+    $element['#value'] = trim($element['#value']);
+    $form_state->setValue(['settings', 'max_filesize'], $element['#value']);
+    if (!empty($element['#value']) && !Bytes::validate($element['#value'])) {
+      $form_state->setError($element, $this->t('The "@name" option must contain a valid value. You may either leave the text field empty or enter a string like "512" (bytes), "80 KB" (kilobytes) or "50 MB" (megabytes).', [
+        '@name' => $element['#title'],
+      ]));
+    }
+  }
+
+  /**
+   * Retrieves the upload validators for a file field.
+   *
+   * @return array
+   *   An array suitable for passing to file_save_upload() or the file field
+   *   element's '#upload_validators' property.
+   */
+  public function getUploadValidators() {
+    $validators = [];
+
+    // Validate the extension, limiting to the current one if defined, to
+    // ensure a file can be replaced only by a file of the same type.
+    $extensions = $this->getAllowedFileExtensions();
+    if (!empty($extensions)) {
+      $validators['file_validate_extensions'] = [implode(' ', $extensions)];
+    }
+
+    // Validate the file mime as well if defined, to  ensure a file can be
+    // replaced only by a file of the same type.
+    $file_mime = $this->get('file_mime')->getValue();
+    if (!empty($file_mime)) {
+      $validators['reliefweb_docostore_file_validate_mime_type'] = [$file_mime];
+    }
+
+    // There is always a file size limit due to the PHP server limit.
+    $validators['file_validate_size'] = [$this->getMaxFileSize()];
+
+    // Validate the filename length.
+    $validators['file_validate_name_length'] = [];
+
+    return $validators;
+  }
+
+  /**
+   * Get the upload max file size.
+   *
+   * @return int
+   *   The max file size in bytes.
+   */
+  public function getMaxFileSize() {
+    $settings = $this->getSettings();
+
+    $max_filesize = Bytes::toNumber(Environment::getUploadMaxSize());
+    if (!empty($settings['max_filesize'])) {
+      $max_filesize = min($max_filesize, Bytes::toNumber($settings['max_filesize']));
+    }
+
+    return $max_filesize;
+  }
+
+  /**
+   * Get the allowed file extensions for validation and description.
+   *
+   * @return array
+   *   Allowed file extensions.
+   */
+  public function getAllowedFileExtensions() {
+    $settings = $this->getSettings();
+
+    $file_name = $this->get('file_name')->getValue();
+    if (!empty($file_name)) {
+      return [static::getFileExtension($file_name)];
+    }
+    elseif (!empty($settings['file_extensions'])) {
+      return explode(' ', $settings['file_extensions']);
+    }
+    return [];
+  }
+
+  /**
+   * Get the description with the allowed extensions and file size.
+   *
+   * @return \Drupal\Component\Render\MarkupInterface
+   *   The upload description.
+   */
+  public function getUploadDescription() {
+    $extensions = $this->getAllowedFileExtensions();
+    return $this->t('Allowed extensions: %extensions. Max file size: %max_filesize.', [
+      '%extensions' => !empty($extensions) ? implode(', ', $extensions) : $this->t('any'),
+      '%max_filesize' => format_size($this->getMaxFileSize()),
+    ]);
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -58,22 +276,31 @@ public static function mainPropertyName() {
    * {@inheritdoc}
    */
   public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
-    // The UUID of the docstore resource.
+    // The UUID of the file resource used notably to generate the permanent URL.
     $properties['uuid'] = DataDefinition::create('string')
       ->setLabel(new TranslatableMarkup('File UUID'))
-      ->setDescription(new TranslatableMarkup('The UUID of the docstore resource.'))
+      ->setDescription(new TranslatableMarkup('The UUID of the file resource.'))
       ->setRequired(TRUE);
 
     // The ID of the file revision.
+    // When "remote" is selected in the settngs, this is ID of the resource
+    // revision.
+    // When "local" is selected in the settings, this is ID of the permanent
+    // local file.
+    // It's set to 0 for content being created.
     $properties['revision_id'] = DataDefinition::create('integer')
       ->setLabel(new TranslatableMarkup('File revision ID'))
       ->setDescription(new TranslatableMarkup('The ID of the file revision.'))
       ->setRequired(TRUE);
 
-    // Whether the file is private or public.
-    $properties['private'] = DataDefinition::create('boolean')
-      ->setLabel(new TranslatableMarkup('Private'))
-      ->setDescription(new TranslatableMarkup('Whether the file is private or public.'))
+    // The UUID of the local file associated with the field item.
+    // When "remote" is selected in the settngs, this is the UUID of the
+    // temporary file used to store the file content to generate the preview.
+    // When "local" is selected in the settings, this is the UUID of the
+    // permanent file associated with the field item.
+    $properties['file_uuid'] = DataDefinition::create('string')
+      ->setLabel(new TranslatableMarkup('Preview UUID'))
+      ->setDescription(new TranslatableMarkup('The UUID of the preview file.'))
       ->setRequired(TRUE);
 
     // The name of the file as uploaded.
@@ -113,6 +340,7 @@ public static function propertyDefinitions(FieldStorageDefinitionInterface $fiel
       ->setRequired(FALSE);
 
     // The UUID of the preview file.
+    // When it exists, this is the UUID of the permanent local preview file.
     $properties['preview_uuid'] = DataDefinition::create('string')
       ->setLabel(new TranslatableMarkup('Preview UUID'))
       ->setDescription(new TranslatableMarkup('The UUID of the preview file.'))
@@ -233,7 +461,7 @@ public static function generateSampleValue(FieldDefinitionInterface $field_defin
 
     $values['uuid'] = static::generateUuid();
     $values['revision_id'] = mt_rand(1111, 9999);
-    $valyes['private'] = (bool) mt_rand(0, 1);
+    $values['file_uuid'] = static::generateUuid();
     $valyes['file_name'] = $random->string(mt_rand(1, 250)) . '.' . $random->string(mt_rand(1, 4));
     $valyes['file_mime'] = $random->string(mt_rand(32, 128));
     $valyes['file_size'] = mt_rand(1111, 99999);
@@ -307,11 +535,8 @@ public function renderPreview($style = 'small', $generate = FALSE) {
    *   be generated.
    */
   public function getPreview($generate = FALSE) {
-    $preview_uuid = $this->get('preview_uuid')->getValue();
-    if (!empty($preview_uuid)) {
-      return $this->loadFileByUuid($preview_uuid);
-    }
-    elseif ($generate && $this->canHavePreview()) {
+    $file = $this->loadPreviewFile();
+    if (empty($file) && $generate && $this->canHavePreview()) {
       $page = $this->get('preview_page')->getValue();
       $rotation = $this->get('preview_rotation')->getValue();
       return $this->generatePreview($page, $rotation);
@@ -352,26 +577,26 @@ public function generatePreview($page = 0, $rotation = 0, $regenerate = FALSE) {
       return $this->loadFileByUuid($preview_uuid);
     }
 
-    $uuid = $this->get('uuid')->getValue();
-
-    // Check if there is temporary file for the file item.
-    $file = $this->loadFileByUuid($uuid);
-    // Create the temporary file if doesn't exist.
-    if (empty($file)) {
-      $file = $this->createFile();
-    }
-
-    // Retrieve the file from the docstore.
-    if (!@file_exists($file->getFileUri()) && !$this->updateFile($file)) {
-      return NULL;
+    // Load or create a file associated with the field item.
+    $file = $this->loadFile();
+    if (empty($file) || !file_exists($file->getFileUri())) {
+      // For local files, we cannot generate the preview if there is no file
+      // associated with the field item.
+      if ($this->getSetting('local') === TRUE) {
+        return NULL;
+      }
+      // For remote files, we try to retrieve the file content and create a
+      // temporary local file.
+      else {
+        $file = $file ?? $this->createFile();
+        if (!$this->updateFileFromRemote($file)) {
+          return NULL;
+        }
+      }
     }
 
-    // Retrieve the preview file.
-    $preview_file = NULL;
-    if (!empty($preview_uuid)) {
-      $preview_file = $this->loadFileByUuid($preview_uuid);
-    }
-    // Create the preview file if doesn't exist.
+    // Retrieve or create the preview file.
+    $preview_file = $this->loadPreviewFile();
     if (empty($preview_file)) {
       $preview_file = $this->createPreviewFile();
     }
@@ -468,6 +693,18 @@ public function canHavePreview() {
     return $this->get('file_mime')->getValue() === 'application/pdf';
   }
 
+  /**
+   * Delete the preview file and its derivative images.
+   */
+  protected function deletePreview() {
+    $file = $this->loadPreviewFile();
+    if (!empty($file)) {
+      $uri = $file->getFileUri();
+      $file->delete();
+      image_path_flush($uri);
+    }
+  }
+
   /**
    * Get the number of pages for this field item file.
    *
@@ -481,13 +718,33 @@ public function getPageCount() {
     return 0;
   }
 
+  /**
+   * Load the file associated with the field item.
+   *
+   * @return \Drupal\file\Entity\File|null
+   *   File entity or NULL if it couldn't be loaded.
+   */
+  public function loadFile() {
+    return $this->loadFileByUuid($this->get('file_uuid')->getValue());
+  }
+
+  /**
+   * Load the preview file associated with the field item.
+   *
+   * @return \Drupal\file\Entity\File|null
+   *   File entity or NULL if it couldn't be loaded.
+   */
+  public function loadPreviewFile() {
+    return $this->loadFileByUuid($this->get('preview_uuid')->getValue());
+  }
+
   /**
    * Get the file URL.
    *
    * @return \Drupal\Core\Url
    *   URL object.
    */
-  public function getFileUrl() {
+  public function getFileUrl($private = FALSE) {
     $uuid = $this->get('uuid')->getValue();
     $file_name = $this->get('file_name')->getValue();
     $extension = static::getFileExtension($file_name);
@@ -496,11 +753,12 @@ public function getFileUrl() {
     // If the revision ID is not set, then it's a new file and there should be
     // an associated managed file and we return its URL.
     if (empty($revision_id)) {
-      $url = file_create_url(static::getFileUriFromUuid($uuid, $extension, TRUE, FALSE));
+      $url = file_create_url(static::getFileUriFromUuid($file_uuid, $extension));
     }
     // Otherwise use a "direct" link to the file.
-    // @todo this doesn't handle the case were the file is private in the
-    // docstore. We need a different route for that.
+    elseif ($private) {
+      $url = 'internal:/private/attachments/' . $uuid . '/' . $file_name;
+    }
     else {
       $url = 'internal:/attachments/' . $uuid . '/' . $file_name;
     }
@@ -525,16 +783,13 @@ protected function createPreviewFile() {
     $file_name = $uuid . '.' . $extension;
     $file_mime = 'image/' . $extension;
 
-    // Generate the preview URI as private initially. We'll move it to public
-    // if the docstore file is made public.
-    $uri = static::getFileUriFromUuid($uuid, $extension, TRUE, TRUE);
-
     // Generate a UUID for the preview. We'll store it in this field item only
     // if the preview generation worked.
-    $preview_uuid = $this->get('preview_uuid')->getValue();
-    if (empty($preview_uuid)) {
-      $preview_uuid = $this->generateUuid();
-    }
+    $preview_uuid = $this->generateUuid();
+
+    // Generate the preview URI as private initially. We'll move it to public
+    // if the docstore file is made public.
+    $uri = static::getFileUriFromUuid($preview_uuid, $extension, TRUE, TRUE);
 
     // Create a temporary managed file with the System user.
     return static::createFileFromUuid($preview_uuid, $uri, $file_name, $file_mime);
@@ -551,16 +806,21 @@ protected function createFile() {
       return NULL;
     }
 
-    $uuid = $this->get('uuid')->getValue();
+    $file_uuid = $this->get('file_uuid')->getValue();
     $file_name = $this->get('file_name')->getValue();
     $file_mime = $this->get('file_mime')->getValue();
 
+    if (empty($file_uuid)) {
+      $file_uuid = static::generateUuid();
+      $this->setValue('file_uuid', $file_uuid);
+    }
+
     // Generate the file uri.
     $extension = static::getFileExtension($file_name);
-    $uri = static::getFileUriFromUuid($uuid, $extension, TRUE, FALSE);
+    $uri = static::getFileUriFromUuid($file_uuid, $extension, TRUE);
 
     // Create a temporary managed file with the System user.
-    return static::createFileFromUuid($uuid, $uri, $file_name, $file_mime);
+    return static::createFileFromUuid($file_uuid, $uri, $file_name, $file_mime);
   }
 
   /**
@@ -572,7 +832,7 @@ protected function createFile() {
    * @return bool
    *   TRUE on success.
    */
-  protected function updateFile(File $file) {
+  protected function updateFileFromRemote(File $file) {
     $uuid = $this->get('uuid')->getValue();
     $revision_id = $this->get('revision_id')->getValue();
     $uri = $file->getFileUri();
@@ -591,15 +851,16 @@ protected function updateFile(File $file) {
     if ($success) {
       // Update the file entity and save it so that we don't have to
       // re-download the file to generate the preview. Its status being
-      // temporary it will garbage collected as some point by the system.
+      // temporary it will be garbage collected as some point by the system.
       $file->setMimeType($this->getFileMimeType($uri));
+      $file->setTemporary();
       $file->save();
     }
     return $success;
   }
 
   /**
-   * Load a file entity by its uuid.
+   * Load a file entity by its UUID.
    *
    * @param string $uuid
    *   File entity UUID.
@@ -608,9 +869,28 @@ protected function updateFile(File $file) {
    *   File entity or NULL if it couldn't be loaded.
    */
   protected function loadFileByUuid($uuid) {
+    if (empty($uuid)) {
+      return NULL;
+    }
     return $this->getEntityRepository()->loadEntityByUuid('file', $uuid);
   }
 
+  /**
+   * Get the permanent file URI for the field item.
+   *
+   * @param bool $preview
+   *   Whether the URI is for the preview file or the local file.
+   *
+   * @return string
+   *   URI.
+   */
+  public function getPermanentUri($preview = TRUE) {
+    $uuid = $this->get('uuid')->getValue();
+    $private = $this->get('private')->getValue();
+    $extension = self::getFileExtension($file->getFileName());
+    return static::getFileUriFromUuid($uuid, $extension, !empty($private), $preview);
+  }
+
   /**
    * Get the entity repository service.
    *
@@ -624,6 +904,19 @@ protected function getEntityRepository() {
     return $this->entityRepository;
   }
 
+  /**
+   * Get the entity type manager service.
+   *
+   * @return \Drupal\Core\Entity\EntityTypeManagerInterface
+   *   The entity type manager service.
+   */
+  protected function getEntityTypeManager() {
+    if (!isset($this->entityTypeManager)) {
+      $this->entityTypeManager = \Drupal::service('entity_type.manager');
+    }
+    return $this->entityTypeManager;
+  }
+
   /**
    * Get the file system serice.
    *
@@ -742,6 +1035,28 @@ public static function prepareDirectory($uri) {
     return $file_system->prepareDirectory($directory, $file_system::CREATE_DIRECTORY);
   }
 
+  /**
+   * Move a file.
+   *
+   * @param string $source
+   *   Source URI.
+   * @param string $destination
+   *   Destination URI.
+   *
+   * @throws \Drupal\Core\File\Exception\FileException
+   *   Exception if the file couldn't be moved.
+   */
+  public static function moveFile($source, $destination) {
+    if (!static::prepareDirectory($destination)) {
+      throw new FileException(strtr('Unable to create destination directory for @destination', [
+        '@destination' => $destination,
+      ]));
+    }
+
+    $file_system = \Drupal::service('file_system');
+    $file_system->move($source, $destination, $file_system::EXISTS_REPLACE);
+  }
+
   /**
    * Delete a managed file with the given UUID.
    *
@@ -751,16 +1066,18 @@ public static function prepareDirectory($uri) {
    *   Whether the file is a preview or not.
    */
   public static function deleteFileFromUuid($uuid, $preview = FALSE) {
-    $file = \Drupal::service('entity.repository')
-      ->loadEntityByUuid('file', $uuid);
+    if (!empty($uuid)) {
+      $file = \Drupal::service('entity.repository')
+        ->loadEntityByUuid('file', $uuid);
 
-    if (!empty($file)) {
-      // Remove the derivative images.
-      if ($preview) {
-        image_path_flush($file->getFileUri());
-      }
+      if (!empty($file)) {
+        // Remove the derivative images.
+        if ($preview) {
+          image_path_flush($file->getFileUri());
+        }
 
-      $file->delete();
+        $file->delete();
+      }
     }
   }
 
@@ -771,10 +1088,10 @@ public static function deleteFileFromUuid($uuid, $preview = FALSE) {
    *   File name.
    *
    * @return string
-   *   File extension.
+   *   File extension in lower case.
    */
   public static function getFileExtension($file_name) {
-    return pathinfo($file_name, PATHINFO_EXTENSION);
+    return mb_strtolower(pathinfo($file_name, PATHINFO_EXTENSION));
   }
 
   /**
@@ -790,6 +1107,19 @@ public static function getFileMimeType($uri) {
     return \Drupal::service('file.mime_type.guesser')->guessMimeType($uri);
   }
 
+  /**
+   * Check if a file URI is private.
+   *
+   * @param string $uri
+   *   File uri.
+   *
+   * @return bool
+   *   TRUE if the file uri is private.
+   */
+  public static function isFilePrivate($uri) {
+    return StreamWrapperManager::getScheme($uri) === 'private';
+  }
+
   /**
    * Generate a UUID.
    *
@@ -849,4 +1179,267 @@ public static function getFilePageCount(File $file) {
     return 1;
   }
 
+  /**
+   * Get a file URI based on its UUID.
+   *
+   * @param \Drupal\file\Entity\File $file
+   *   File.
+   * @param bool $private
+   *   Whether to return a private URI or a public one.
+   *
+   * @return string
+   *   URI.
+   */
+  public static function getFileUuidUri(File $file, $private = TRUE) {
+    $extension = self::getFileExtension($file->getFileName());
+    return static::getFileUriFromUuid($file->uuid(), $extension, $private);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function preSave() {
+    $original_item = $this->_original_item ?? NULL;
+
+    try {
+      if ($this->getSetting('local') === TRUE) {
+        if (isset($original_item)) {
+          $this->replaceLocalFile($this->_original_item);
+        }
+        else {
+          $this->createLocalFile();
+        }
+      }
+      else {
+        $this->updateRemoteFile();
+      }
+
+      // Update the preview if any.
+      $this->updatePreviewFile($original_item);
+    }
+    // @todo log the error and see what to tell the user.
+    catch (\Exception $exception) {
+      throw $exception;
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function postSave($updated) {
+    $entity = $this->getEntity();
+    if ($entity instanceof EntityPublishedInterface) {
+      // Mark the file as public if the entity the file belongs to is published
+      // make it private otherwise.
+      $item->updateFileStatus($entity->isPublished());
+    }
+    return parent::postSave($updated);
+  }
+
+  /**
+   * Create a local file.
+   *
+   * @throws \Exception
+   *   Exception if the file couldn't be created.
+   */
+  protected function createLocalFile() {
+    $file = $this->loadFile();
+
+    // @todo better error message.
+    if (empty($file)) {
+      throw new \Exception('Unable to load the local file');
+    }
+
+    // Move the file to its the permanent URI (private initially).
+    $uri = $this->getPermanentUri();
+    static::moveFile($file->getFileUri(), $uri);
+
+    // Save the file as permanent.
+    $new_file->setFileUri($uri);
+    $new_file->setPermanent();
+    $new_file->save();
+
+    // Update the revision id with the file ID to distinguish from new items.
+    $this->setValue('revision_id', $file->id());
+  }
+
+  /**
+   * Replace a local file.
+   *
+   * @param \Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile $old_item
+   *   The old field item.
+   *
+   * @throws \Exception
+   *   Exception if the file couldn't be replaced.
+   */
+  protected function replaceLocalFile(ReliefWebFile $old_item) {
+    $new_file = $this->loadFile();
+    $old_file = $old_item->loadFile();
+
+    // @todo better error messages.
+    if (empty($new_file)) {
+      throw new \Exception('Unable to load the new file');
+    }
+    if (empty($old_file)) {
+      throw new \Exception('Unable to load the old file');
+    }
+
+    $new_uri = $old_file->getFileUri();
+    $old_uri = $old_item->getFileUuidUri($old_file);
+
+    // Move the old file to its new location based on its UUID.
+    static::moveFile($old_file->getFileUri(), $old_uri);
+    $old_file->setFileUri($old_uri);
+    $old_file->setPermanent();
+    $old_file->save();
+
+    // Move the new file to the permanent URI (old URI).
+    static::moveFile($new_file->getFileUri(), $new_uri);
+    $new_file->setFileUri($new_uri);
+    $new_file->setPermanent();
+    $new_file->save();
+  }
+
+  /**
+   * Update or create a remote file.
+   *
+   * @throws \Exception
+   *   Exception if the file's content couldn't be updated.
+   */
+  protected function updateRemoteFile() {
+    $file = $this->loadFile();
+
+    // @todo better error message.
+    if (empty($file)) {
+      throw \Exception('Unable to load the local file.');
+    }
+
+    $client = $this->getDocstoreClient();
+    $uuid = $this->get('uuid')->getValue();
+
+    // Check if the remote file exists.
+    $result = $client->getFile($uuid);
+    if (empty($result)) {
+      // Create the file resource in the docstore.
+      $result = $client->createFile([
+        'uuid' => $uuid,
+        'filename' => $this->get('file_name')->getValue(),
+        'mimetype' => $this->get('file_mime')->getValue(),
+        // Mark the new file as private initially. We'll change it that after
+        // the entity the field is attached to is properly saved.
+        'private' => TRUE,
+      ]);
+
+      if (empty($result)) {
+        throw \Exception('Unable to create remote file resource');
+      }
+    }
+
+    // Upload the file content.
+    $result = $client->updateFileContentFromFilePath($uuid, $file->getFileUri());
+
+    // @todo better error message.
+    if (!isset($result['revision_id'])) {
+      throw new \Exception('Unable to update remote file content');
+    }
+
+    // Store the new revision returned by the docstore.
+    $this->setValue('revision_id', $result['revision_id']);
+
+    // Delete the local file.
+    $file->delete();
+  }
+
+  /**
+   * Update the preview file.
+   *
+   * @param \Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile|null $old_item
+   *   The old field item if any.
+   *
+   * @throws \Exception
+   *   Exception if the file's content couldn't be updated.
+   */
+  protected function updatePreviewFile(?ReliefWebFile $old_item) {
+    // Delete the old preview if any.
+    if (isset($old_item)) {
+      $old_item->deletePreview();
+    }
+
+    // If "no preview" was selected, delete the preview.
+    $preview_page = $this->get('preview_page')->getValue();
+    if (empty($preview_page) || !$this->canHavePreview()) {
+      $this->deletePreview();
+    }
+
+    // Get the preview (generate it if necessary).
+    $file = $this->getPreview(TRUE);
+    if (empty($file)) {
+      return;
+    }
+
+    // Move the preview to its permanent location.
+    $uri = $this->getPermanentUri(TRUE);
+    $this->moveFile($file->getFileUri(), $uri);
+
+    // Mark the filed as permanent.
+    $file->setFileUri($uri);
+    $file->setPermanent();
+    $file->save();
+  }
+
+  /**
+   * Update the status of the file associated with this field item.
+   *
+   * @param bool $published
+   *   TRUE if the file should be made public.
+   */
+  protected function updateFileStatus($published) {
+    // For local files, move to the private or public location if the status
+    // is different.
+    if ($this->getSetting('local') === TRUE) {
+      $file = $this->loadFile();
+      if (!empty($file)) {
+        $private = $this->isFilePrivate($file->getFileUri());
+        if ($private === $published) {
+          $this->swapFileLocation($file);
+        }
+      }
+    }
+    // For remote files, mark the file resource as private or public.
+    else {
+      $uuid = $this->get('uuid')->getValue();
+      $this->getDocstoreClient()->updateFileStatus($uuid, !$published);
+    }
+
+    // Update the preview file as well.
+    $preview_file = $this->loadPreviewFile();
+    if (!empty($file)) {
+      $private = $this->isFilePrivate($preview_file->getFileUri());
+      if ($private === $published) {
+        $this->swapFileLocation($preview_file);
+      }
+    }
+  }
+
+  /**
+   * Swap the location of a local file.
+   *
+   * @param \Drupal\file\Entity\File $file
+   *   File entity.
+   *
+   * @throws \Drupal\Core\File\Exception\FileException
+   *   Exception if the file couldn't be moved.
+   *
+   * @todo do something about the exception.
+   */
+  protected function swapFileLocation(File $file) {
+    $uri = $file->getFileUri();
+    $scheme = StreamWrapperManager::getScheme($uri);
+    $target = StreamWrapperManager::getTarget($uri);
+    if ($scheme !== FALSE && $target !== FALSE) {
+      $scheme = $scheme === 'private' ? 'public' : 'private';
+      $this->moveFile($uri, $scheme . '://' . $target);
+    }
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php
new file mode 100644
index 000000000..c8f05dc30
--- /dev/null
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Drupal\reliefweb_docstore\Plugin\Field\FieldType;
+
+use Drupal\Core\Field\FieldItemList;
+
+/**
+ * List of ReliefWebFile field items.
+ */
+class ReliefWebFileList extends FieldItemList {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function preSave() {
+    $original_items = [];
+
+    // Extract the original items so that we can process replaced files,
+    // create revisions for old ones etc.
+    $original = $this->getEntity()->original;
+    if (isset($original)) {
+      foreach ($original->get($this->definition->getName()) as $item) {
+        if (!$item->isEmpty()) {
+          $original_items[$item->get('uuid')->getValue()] = $item;
+        }
+      }
+    }
+
+    // Add the original items to the replaced ones.
+    foreach ($this->list as $item) {
+      $uuid = $item->get('uuid')->getValue();
+      $revision_id = $item->get('revision_id')->getValue();
+      // Add the original item, if it's been replaced.
+      if (isset($original_items[$uuid]) && empty($revision_id)) {
+        $item->_original_item = $original_items[$uuid];
+      }
+
+      // Remove items that exists in both the current list and old one so
+      // that only the items that need to be deleted are left.
+      unset($original_items[$uuid]);
+    }
+
+    // Mark all "deleted" items as private.
+    foreach ($original_items as $item) {
+      $item->updateFileStatus(FALSE);
+    }
+
+    // Call "preSave" on each item.
+    $this->delegateMethod('preSave');
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
index bee9e58af..279304fa0 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
@@ -14,6 +14,7 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Logger\LoggerChannelFactoryInterface;
 use Drupal\Core\Render\Markup;
+use Drupal\Core\Render\RendererInterface;
 use Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile as ReliefWebFileType;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -46,6 +47,13 @@ class ReliefWebFile extends WidgetBase {
    */
   protected $logger;
 
+  /**
+   * The renderer service.
+   *
+   * @var \Drupal\Core\Render\RendererInterface
+   */
+  protected $renderer;
+
   /**
    * The request stack.
    *
@@ -71,6 +79,7 @@ public function __construct(
     array $third_party_settings,
     FileSystemInterface $file_system,
     LoggerChannelFactoryInterface $logger_factory,
+    RendererInterface $renderer,
     RequestStack $request_stack
   ) {
     parent::__construct(
@@ -81,8 +90,9 @@ public function __construct(
       $third_party_settings
     );
     $this->fileSystem = $file_system;
-    $this->requestStack = $request_stack;
     $this->logger = $logger_factory->get('reliefweb_file_widget');
+    $this->renderer = $renderer;
+    $this->requestStack = $request_stack;
   }
 
   /**
@@ -102,6 +112,7 @@ public static function create(
       $configuration['third_party_settings'],
       $container->get('file_system'),
       $container->get('logger.factory'),
+      $container->get('renderer'),
       $container->get('request_stack')
     );
   }
@@ -141,7 +152,7 @@ protected function formMultipleElements(FieldItemListInterface $items, array &$f
           $field_state['original_values'][$item->get('uuid')->getValue()] = $item->getValue();
         }
       }
-      static::setWidgetState($parents, $field_name, $form_state);
+      static::setWidgetState($parents, $field_name, $form_state, $field_state);
     }
 
     // Container.
@@ -166,29 +177,46 @@ protected function formMultipleElements(FieldItemListInterface $items, array &$f
     // Add one more empty row for new uploads except when this is a programmed
     // multiple form as it is not necessary.
     if (!$form_state->isProgrammed()) {
+      // Dummy item to get the default upload description and allowed
+      // file extensions.
+      $dummy_item = $this->createFieldItem();
+
+      // Wrapper to add more files.
       $elements['add_more'] = [
         '#type' => 'fieldset',
         '#title' => $this->t('Add file(s)'),
-        'files' => [
-          '#type' => 'file',
-          '#name' => implode('-', array_merge($field_parents, ['files'])),
-          '#multiple' => TRUE,
-        ],
-        'upload' => [
-          '#type' => 'submit',
-          '#value' => $this->t('Upload file(s)'),
-          '#name' => implode('-', array_merge($field_parents, ['upload'])),
-          '#submit' => [[static::class, 'submit']],
-          // Limit the validation to the uploaded files.
-          '#limit_validation_errors' => [
-            array_merge($field_parents, ['add_more', 'files']),
-          ],
-          '#ajax' => $this->getAjaxSettings($this->t('Uploading file(s)...'), $field_parents),
-          // Store information to identify the button in ::extractFormValues().
-          '#field_parents' => $field_parents,
-        ],
+        // @todo review if that's the correct place to add the required.
         '#required' => $required && $delta == 0,
       ];
+
+      // File upload widget.
+      $elements['add_more']['files'] = [
+        '#type' => 'file',
+        '#name' => implode('-', array_merge($field_parents, ['files'])),
+        '#multiple' => TRUE,
+        '#description' => $dummy_item->getUploadDescription(),
+      ];
+
+      // Limit the type of files that can be uplaoded.
+      $extensions = $dummy_item->getAllowedFileExtensions();
+      if (!empty($extensions)) {
+        $element['add_more']['files']['#attributes']['accept'] = '.' . implode(',.', $extensions);
+      }
+
+      // Upload button.
+      $elements['add_more']['upload'] = [
+        '#type' => 'submit',
+        '#value' => $this->t('Upload file(s)'),
+        '#name' => implode('-', array_merge($field_parents, ['upload'])),
+        '#submit' => [[static::class, 'submit']],
+        // Limit the validation to the uploaded files.
+        '#limit_validation_errors' => [
+          array_merge($field_parents, ['add_more', 'files']),
+        ],
+        '#ajax' => $this->getAjaxSettings($this->t('Uploading file(s)...'), $field_parents),
+        // Store information to identify the button in ::extractFormValues().
+        '#field_parents' => $field_parents,
+      ];
     }
 
     // Add the ajax wrapper.
@@ -266,6 +294,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
       'uuid',
       'revision_id',
       'private',
+      'file_uuid',
       'file_name',
       'file_mime',
       'file_size',
@@ -279,25 +308,12 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
       ];
     }
 
-    // Store the original UUID of the item.
-    //
-    // This allows us to distinguish between the 3 cases:
-    // - if the original UUID is empty then it's a new file
-    // - if the current UUID is the same as the original UUID then the
-    //   underlying file is unchanged
-    // - if the current UUID is different from the original UUID then its a
-    //   replaced file.
-    $element['_original_uuid'] = [
-      '#type' => 'hidden',
-      '#value' => isset($item->_original_uuid) ? $item->_original_uuid : $item->get('uuid')->getValue(),
-    ];
-
     // Link to the file.
     $file_name = $item->get('file_name')->getValue();
     $file_size = $item->get('file_size')->getValue();
     $file_extension = ReliefWebFileType::getFileExtension($file_name);
     $file_label = $file_name . ' (' . mb_strtoupper($file_extension) . ' | ' . format_size($file_size) . ')';
-    $file_url = $item->getFileUrl();
+    $file_url = $item->getFileUrl(TRUE);
     if (!empty($file_url)) {
       $element['link'] = [
         '#type' => 'link',
@@ -437,8 +453,15 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
       // Store information to identify the button in ::extractFormValues().
       '#delta' => $delta,
       '#field_parents' => $field_parents,
+      '#description' => $item->getUploadDescription(),
     ];
 
+    // Limit the type of files that can be uplaoded.
+    $extensions = $item->getAllowedFileExtensions();
+    if (!empty($extensions)) {
+      $element['operations']['replace']['#attributes']['accept'] = '.' . implode(',.', $extensions);
+    }
+
     // Add the input field for the delta (drag-n-drop reordering).
     $element['_weight'] = [
       '#type' => 'weight',
@@ -542,6 +565,10 @@ public function extractFormValues(FieldItemListInterface $items, array $form, Fo
       }
     }
 
+    // Store the original items so we can process deleted and replaced files
+    // when saving the field's data.
+    $items->_original_values = $field_state['original_values'] ?? [];
+
     // Update the field state items with the new data.
     $field_state['items'] = $items->getValue();
     static::setWidgetState($parents, $field_name, $form_state, $field_state);
@@ -562,6 +589,23 @@ protected function uploadFiles(array $element, FormStateInterface $form_state) {
     return $this->processUploadedFiles($element, $form_state, $element['#name']);
   }
 
+  /**
+   * Create a ReliefWebFile field item.
+   *
+   * @param array|null $values
+   *   Optional values to initialize the field item with.
+   *
+   * @return \Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile
+   *   Field item.
+   */
+  protected function createFieldItem(?array $values = NULL) {
+    $item = ReliefWebFileType::createInstance($this->fieldDefinition->getItemDefinition());
+    if (!is_null($values)) {
+      $item->setValue($values);
+    }
+    return $item;
+  }
+
   /**
    * Delete a field item.
    *
@@ -578,13 +622,9 @@ protected function uploadFiles(array $element, FormStateInterface $form_state) {
   protected function deleteFieldItem(array $element, FormStateInterface $form_state, array $values) {
     try {
       // If the file was new or replaced, remove its associated managed files.
-      if ($values['uuid'] !== $values['_original_uuid']) {
-        if (!empty($values['uuid'])) {
-          ReliefWebFileType::deleteFileFromUuid($values['uuid']);
-        }
-        if (!empty($values['preview_uuid'])) {
-          ReliefWebFileType::deleteFileFromUuid($values['preview_uuid'], TRUE);
-        }
+      if (empty($values['revision_id'])) {
+        ReliefWebFileType::deleteFileFromUuid($values['file_uuid']);
+        ReliefWebFileType::deleteFileFromUuid($values['preview_uuid'], TRUE);
       }
     }
     catch (\Exception $exception) {
@@ -607,16 +647,20 @@ protected function deleteFieldItem(array $element, FormStateInterface $form_stat
    *   The new field item values.
    */
   protected function replaceFieldItem(array $element, FormStateInterface $form_state, array $values) {
+    // Retrieve the upload validators for the original item. This will
+    // ensure the replacement is of the same type.
+    $validators = $this->createFieldItem($values)->getUploadValidators();
+
     // Create a new field item with associated managed files and replace the
     // original values with its values.
     $name = $element['operations']['file']['#name'];
-    $items = $this->processUploadedFiles($element, $form_state, $name);
+    $items = $this->processUploadedFiles($element, $form_state, $name, $validators);
     if (!empty($items)) {
       $item = reset($items);
       // Copy some properties from the original file.
+      $item['uuid'] = $values['uuid'];
       $item['description'] = $values['description'];
       $item['language'] = $values['language'];
-      $item['_original_uuid'] = $values['_original_uuid'];
       return $item;
     }
     // If we couldn't replace the file, keep the original values.
@@ -632,11 +676,13 @@ protected function replaceFieldItem(array $element, FormStateInterface $form_sta
    *   The form state to add the errors.
    * @param string $name
    *   Name of the request property that contain the upload files.
+   * @param array $validators
+   *   Upload validators as expected by file_validate().
    *
    * @return array
    *   List of field item data.
    */
-  protected function processUploadedFiles(array $element, FormStateInterface $form_state, $name) {
+  protected function processUploadedFiles(array $element, FormStateInterface $form_state, $name, array $validators = []) {
     /** @var \Symfony\Component\HttpFoundation\FileBag $file_bag */
     $file_bag = $this->requestStack->getCurrentRequest()->files;
 
@@ -651,27 +697,37 @@ protected function processUploadedFiles(array $element, FormStateInterface $form
     }
 
     $items = [];
+    $errors = [];
     foreach ($files as $file) {
       if (!empty($file)) {
         try {
-          $items[] = $this->createFieldItem($file);
+          $items[] = $this->processUploadedFile($file, $validators)->getValue();
         }
         catch (\Exception $exception) {
-          $form_state->setError($element, $exception->getMessage());
+          $errors[] = $exception->getMessage();
+
+          // Try to delete the uploaded file.
+          $this->deleteUploadedFile($file->getRealPath());
         }
       }
     }
 
+    if (!empty($errors)) {
+      $form_state->setError($element, $this->generateErrorList($errors));
+    }
+
     // Remove the files so that they are not processed again.
     $file_bag->remove($name);
     return $items;
   }
 
   /**
-   * Create a new file field item with the given file info.
+   * Process an uploaded file and create a field item from it.
    *
    * @param \SplFileInfo $file_info
    *   The uploaded file info.
+   * @param array $validators
+   *   Upload validators as expected by file_validate().
    *
    * @return \Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile
    *   New field item created with the file information.
@@ -687,83 +743,183 @@ protected function processUploadedFiles(array $element, FormStateInterface $form
    * we create a temporary managed file that can be garbage collected if the
    * the submission doesn't finish.
    */
-  protected function createFieldItem(\SplFileInfo $file_info) {
+  protected function processUploadedFile(\SplFileInfo $file_info, array $validators = []) {
     $file_name = $file_info->getClientOriginalName();
 
     // @todo throw a more relevant information.
     if (!$this->validateUploadedFile($file_info)) {
-      throw new \Exception(strtr('Invalid file @name.', [
-        '@name' => $file_name,
+      $this->throwError($this->t('Invalid file %name.', [
+        '%name' => $file_name,
       ]));
     }
 
+    // Create a field item that we can validate.
+    $item = $this->createFieldItem();
+
+    // Get the real path of the uploaded file.
+    $path = $file_info->getRealPath();
+
     // We generate a UUID before creating the file entity so that we can use
     // it for the file uri.
-    $uuid = ReliefWebFileType::generateUuid();
+    $file_uuid = ReliefWebFileType::generateUuid();
 
     // Generate the file uri.
     $extension = ReliefWebFileType::getFileExtension($file_name);
-    $uri = ReliefWebFileType::getFileUriFromUuid($uuid, $extension, TRUE, FALSE);
-    $path = $file_info->getRealPath();
+    $uri = ReliefWebFileType::getFileUriFromUuid($file_uuid, $extension, TRUE);
+
+    // Try to guess the real mime type of the uploaded file.
+    $file_mime = ReliefWebFileType::getFileMimeType($uri);
+
+    // Create a temporary managed file associated with the uploaded file.
+    $file = ReliefWebFileType::createFileFromUuid($file_uuid, $uri, $file_name, $file_mime);
+
+    // Set the file size.
+    $file->setSize(@filesize($path) ?? 0);
+
+    // Validate the file.
+    $errors = file_validate($file, $validators + $item->getUploadValidators());
+
+    // Bail out if the uploaded file is invalid.
+    if (!empty($errors)) {
+      $this->throwError($this->t('Unable to upload the file %name. @errors', [
+        '%name' => $file_name,
+        '@errors' => $this->generateErrorList($errors),
+      ]));
+    }
 
     // Create the private temp directory to store the file.
     if (!ReliefWebFileType::prepareDirectory($uri)) {
-      throw new \Exception(strtr('Unable to create the destination directory for the uploaded file @name.', [
-        '@name' => $file_name,
+      $this->throwError($this->t('Unable to create the destination directory for the uploaded file %name.', [
+        '%name' => $file_name,
       ]));
     }
 
     // Move the uploaded file.
     if (!$this->fileSystem->moveUploadedFile($path, $uri)) {
-      throw new \Exception(strtr('Unable to copy the uploaded file @name.', [
-        '@name' => $file_name,
+      $this->throwError($this->t('Unable to copy the uploaded file %name.', [
+        '%name' => $file_name,
       ]));
     }
 
-    // Try to guess the real mime type of the uploaded file.
-    $file_mime = ReliefWebFileType::getFileMimeType($uri);
+    // Update the file.
+    $file->setMimeType(ReliefWebFileType::getFileMimeType($uri));
+    $file->setSize(@filesize($uri) ?? 0);
 
-    // Create a temporary managed file associated with the uploaded file.
-    $file = ReliefWebFileType::createFileFromUuid($uuid, $uri, $file_name, $file_mime);
-
-    // Save the file. This will notably populate its file size.
-    $file->save();
+    // Populate and return the field item.
+    return $this->populateFieldItemFromFile($item, $file);
+  }
 
-    // Create a field item that we can validate.
-    $item = ReliefWebFileType::createInstance($this->fieldDefinition->getItemDefinition());
+  /**
+   * Populate a field item with the data from a file entity.
+   *
+   * @param \Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile $item
+   *   Field item.
+   * @param \Drupal\file\Entity\File $file
+   *   File entity.
+   *
+   * @return \Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile
+   *   The updated field item.
+   *
+   * @throws \Exception
+   *   Throws an exception if the field item data is invalid.
+   */
+  protected function populateFieldItemFromFile(ReliefWebFileType $item, File $file) {
     $item->setValue([
-      'uuid' => $uuid,
+      'uuid' => ReliefWebFileType::generateUuid(),
       // A revision of 0 is an easy way to determine new files.
-      // This will be populated after a successful upload to the
-      // docstore.
+      // This will be populated after a successful upload for remote files or
+      // when saving the local file as permanent.
       'revision_id' => 0,
       // We mark the item as private initially. It may be changed to public
       // depending on the status of the entity the field is attached to etc.
       'private' => TRUE,
-      'file_name' => $file_name,
-      'file_mime' => $file_mime,
+      'file_uuid' => $file->uuid(),
+      'file_name' => $file->getFilename(),
+      'file_mime' => $file->getMimeType(),
       'file_size' => $file->getSize(),
       'page_count' => ReliefWebFileType::getFilePageCount($file),
-      // Mark the item as new by setting the original UUID to false.
-      '_original_uuid' => '',
     ]);
 
     // Validate the field item.
     $violations = $item->validate();
     if ($violations->count() > 0) {
+      $file_name = $file->getFilename();
+
       foreach ($violations as $violation) {
-        $this->logger->error('Field item violation at @property_path for file @name : @message', [
-          '@property_path' => $violation->getPropertyPath(),
-          '@name' => $file_name,
+        $this->logger->error('Field item violation at %property_path for file %name : @message', [
+          '%property_path' => $violation->getPropertyPath(),
+          '%name' => $file_name,
           '@message' => $violation->getMessage(),
         ]);
       }
-      throw new \Exception(strtr('Invalid field item data for the uploaded file @name.', [
-        '@name' => $file_name,
+
+      $this->deleteUploadedFile($file->getFileUri());
+
+      $this->throwError($this->t('Invalid field item data for the uploaded file %name.', [
+        '%name' => $file_name,
       ]));
     }
 
-    return $item->getValue();
+    // Save the file.
+    $file->setTemporary();
+    $file->save();
+
+    return $item;
+  }
+
+  /**
+   * Throw an error message to display as a form error.
+   *
+   * @param \Drupal\Component\Render\MarkupInterface|string $message
+   *   The error message.
+   *
+   * @throws \Exception
+   *   The error message wrapped in an exception.
+   */
+  protected function throwError($message) {
+    throw new \Exception($message);
+  }
+
+  /**
+   * Group several errors to disply by FormStateInterface::setErrorByName().
+   *
+   * The Form API doesn't allow to set several errors on an element so we need
+   * to group and pre-render them.
+   *
+   * @param array $errors
+   *   List of error messages.
+   *
+   * @return \Drupal\Component\Render\MarkupInterface|string
+   *   The grouped errors.
+   */
+  protected function generateErrorList(array $errors) {
+    if (empty($errors)) {
+      return '';
+    }
+    foreach ($errors as &$error) {
+      $error = Markup::create($error);
+    }
+    if (count($errors) > 1) {
+      $message = [
+        '#theme' => 'item_list',
+        '#items' => $errors,
+      ];
+      return $this->renderer->renderRoot($message);
+    }
+    return reset($errors);
+  }
+
+  /**
+   * Delete an uploaded file.
+   *
+   * @param string $uri
+   *   File URI.
+   *
+   * @return bool
+   *   TRUE if the file was deleted.
+   */
+  protected function deleteUploadedFile($uri) {
+    return $this->fileSystem->unlink($uri);
   }
 
   /**
@@ -815,9 +971,6 @@ public static function submit(array &$form, FormStateInterface &$form_state) {
    *   The ajax response of the ajax upload.
    */
   public static function rebuildWidgetForm(array &$form, FormStateInterface &$form_state, Request $request) {
-    /** @var \Drupal\Core\Render\RendererInterface $renderer */
-    $renderer = \Drupal::service('renderer');
-
     // Retrieve the updated widget.
     $parents = explode('/', $request->query->get('field_parents'));
     $field_name = array_pop($parents);
@@ -826,15 +979,6 @@ public static function rebuildWidgetForm(array &$form, FormStateInterface &$form
     // The array parents are populaed in the WidgetBase::afterBuild().
     $widget = NestedArray::getValue($form, $field_state['array_parents']);
 
-    // Display the status messages at the top of the widget. This is notably
-    // useful to indicate to the user that the form needs to be saved if the
-    // files were re-ordered for example.
-    $status_messages = ['#type' => 'status_messages'];
-    $widget['#prefix'] = Markup::create(implode('', [
-      $widget['#prefix'] ?? '',
-      $renderer->renderRoot($status_messages),
-    ]));
-
     // Create the response and ensure the widget attachments will be loaded.
     $response = new AjaxResponse();
     $response->setAttachments($widget['#attached'] ?? []);
diff --git a/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php b/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php
index 44f48db80..293545b82 100644
--- a/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php
+++ b/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php
@@ -53,6 +53,28 @@ public function __construct(
     $this->logger = $logger_factory->get('reliefweb_docstore');
   }
 
+  /**
+   * Get a file in the docstore.
+   *
+   * @param string $uuid
+   *   The file resource UUID.
+   * @param int $timeout
+   *   Request timeout.
+   *
+   * @return array|null
+   *   The data from the API response or NULL in case of error.
+   */
+  public function getFile($uuid, $timeout = 5) {
+    $response = $this->request('GET', '/api/v1/files/' . $uuid, [], $timeout);
+
+    if ($response !== NULL) {
+      $body = $response->getBody();
+      return !empty($body) ? json_decode($body, TRUE) : NULL;
+    }
+
+    return NULL;
+  }
+
   /**
    * Create a file in the docstore.
    *
@@ -65,7 +87,7 @@ public function __construct(
    *   The data from the API response or NULL in case of error.
    */
   public function createFile(array $payload, $timeout = 5) {
-    $response = $this->request('POST', '/api/v1/files/' . $uuid . '/content', [
+    $response = $this->request('POST', '/api/v1/files', [
       'json' => $payload,
     ], $timeout);
 
@@ -78,7 +100,7 @@ public function createFile(array $payload, $timeout = 5) {
   }
 
   /**
-   * Create a file in the docstore.
+   * Update a file's content in the docstore.
    *
    * @param string $uuid
    *   Docstore file resource UUID.
@@ -90,7 +112,7 @@ public function createFile(array $payload, $timeout = 5) {
    * @return array|null
    *   The data from the API response or NULL in case of error.
    */
-  public function createFileContentFromFilePath($uuid, $path, $timeout = 300) {
+  public function updateFileContentFromFilePath($uuid, $path, $timeout = 300) {
     try {
       $resource = Utils::TryFopen($path, 'r');
     }
@@ -145,7 +167,7 @@ public function downloadFileContentToFilePath($uuid, $path, $revision_id = 0, $t
     // @todo this doesn't take into account the fact that the file may be
     // hidden for the provider in that case we need to use the API endpoint.
     if (empty($revision_id)) {
-      $endpoint = '/files/' . $uuid;
+      $endpoint = '/files/' . $uuid . '/' . basename($path);
     }
     else {
       $endpoint = '/api/v1/files/' . $uuid . '/revisions/' . $revision_id . '/content';
@@ -158,6 +180,34 @@ public function downloadFileContentToFilePath($uuid, $path, $revision_id = 0, $t
     return !empty($response) && $response->isSuccessful();
   }
 
+  /**
+   * Update a file status in the docstore.
+   *
+   * @param string $uuid
+   *   The file resource UUID.
+   * @param bool $private
+   *   TRUE if the file should be made private.
+   * @param int $timeout
+   *   Request timeout.
+   *
+   * @return array|null
+   *   The data from the API response or NULL in case of error.
+   */
+  public function updateFileStatus($uuid, $private, $timeout = 5) {
+    $response = $this->request('PATCH', '/api/v1/files/' . $uuid, [
+      'json' => [
+        'private' => $private,
+      ],
+    ], $timeout);
+
+    if ($response !== NULL) {
+      $body = $response->getBody();
+      return !empty($body) ? json_decode($body, TRUE) : NULL;
+    }
+
+    return NULL;
+  }
+
   /**
    * Perform a request against the docstore API.
    *
@@ -173,7 +223,7 @@ public function downloadFileContentToFilePath($uuid, $path, $revision_id = 0, $t
    * @return \Psr\Http\Message\ResponseInterface|null
    *   Response.
    */
-  protected function request($method, $endpoint, array $options, $timeout = 5) {
+  public function request($method, $endpoint, array $options, $timeout = 5) {
     try {
       $url = $this->createDocstoreUrl($entpoint);
 
@@ -227,7 +277,6 @@ protected function createDocstoreUrl($endpoint = '') {
    */
   protected function getHeaders() {
     return [
-      'Accept' => 'application/json',
       'API-KEY' => $this->config->get('api_key'),
     ];
   }

From 508814772b4f0f553fb54025fca1fe72f5105ff3 Mon Sep 17 00:00:00 2001
From: Peter Lieverdink <lieverdink@reliefweb.int>
Date: Thu, 18 Nov 2021 17:31:54 +1100
Subject: [PATCH 108/720] [OPS-7896] Completely refactor the build and re-use a
 central action.

---
 .github/workflows/docker-build-image.yml | 104 +++--------------------
 1 file changed, 13 insertions(+), 91 deletions(-)

diff --git a/.github/workflows/docker-build-image.yml b/.github/workflows/docker-build-image.yml
index 90da0f298..4c06e0acc 100644
--- a/.github/workflows/docker-build-image.yml
+++ b/.github/workflows/docker-build-image.yml
@@ -13,96 +13,18 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - name: Configure AWS Credentials
-      id: aws
-      uses: aws-actions/configure-aws-credentials@v1
-      with:
-        aws-access-key-id: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}
-        aws-region: us-east-1
-
-    - name: Checkout code
-      id: checkout
-      uses: actions/checkout@v1
-      with:
-        fetch-depth: 0
-
-    - name: Determine environment type
-      id: env
-      uses: docker://ghcr.io/un-ocha/actions:determine-environment-main
-
-    - name: Image Metadata
-      id: meta
-      run: |
-        export DOCKER_TAG="${GITHUB_REF#refs/*/}"
-        export DOCKER_TAG=${DOCKER_TAG//[^[:alnum:].-]/-}
-        echo ::set-output name=DOCKER_TAG::${DOCKER_TAG}
-        export VCS_REF=`git rev-parse --short HEAD`
-        echo ::set-output name=VCS_REF::${VCS_REF}
-        export VCS_URL=`git config --get remote.origin.url | sed 's#git@github.com:#https://github.com/#'`
-        echo ::set-output name=VCS_URL::${VCS_URL}
-        export BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"`
-        echo ::set-output name=BUILD_DATE::${BUILD_DATE}
 
-    - name: Login to Public ECR
-      id: login
-      uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+    - name: Build
+      id: build-action
+      uses: UN-OCHA/actions/drupal-docker-build@main
       with:
-        registry: public.ecr.aws
-        username: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
-        password: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}
-      env:
-        AWS_REGION: us-east-1
-
-    - name: Build docker image
-      id: build
-      uses: docker/build-push-action@v2
-      with:
-        build-args: |
-          BRANCH_ENVIRONMENT=${BRANCH_ENVIRONMENT}
-          VCS_REF=${{ steps.meta.outputs.VCS_REF }}
-          VCS_URL=${{ steps.meta.outputs.VCS_URL }}
-          BUILD_DATE=${{ steps.meta.outputs.BUILD_DATE }}
-          GITHUB_ACTOR=${{ github.actor }}
-          GITHUB_REPOSITORY=${{ github.repository }}
-          GITHUB_SHA=${{ github.sha }}
-          GITHUB_REF=${{ github.ref }}
-        labels: |
-          info.humanitarianresponse.build.date=${{ steps.meta.outputs.BUILD_DATE }}
-          info.humanitarianresponse.build.person=${{ github.actor }}
-          info.humanitarianresponse.build.vcs-url=${{ steps.meta.outputs.VCS_URL }}
-          info.humanitarianresponse.build.vcs-ref=${{ steps.meta.outputs.VCS_REF }}
-        file: docker/Dockerfile
-        push: true
-        tags: public.ecr.aws/unocha/rwint9-site:${{ steps.meta.outputs.DOCKER_TAG }}
-        secrets: |
-          "github_token=${{ secrets.ECR_GITHUB_TOKEN }}"
-
-    - name: Webhook
-      id: jenkins
-      if: success()
-      env:
-        DOCKER_TAG: ${{ steps.meta.outputs.DOCKER_TAG }}
-        JENKINS_TOKEN: ${{ secrets.JENKINS_ECR_TOKEN }}
-      run: |
-        curl -H "Token: ${JENKINS_TOKEN}" -X POST "https://jenkins.aws.ahconu.org/generic-webhook-trigger/invoke?DOCKER_IMAGE=rwint9-site&DOCKER_TAG=${DOCKER_TAG}"
-
-    - name: Flowdock Failure
-      id: failure
-      if: failure()
-      uses: docker://ghcr.io/un-ocha/actions:flowdock-notify-main
-      env:
-        FLOWDOCK_TOKEN: ${{ secrets.FLOWDOCK_TOKEN }}
-        FLOWDOCK_ICON: '-1'
-        FLOWDOCK_MESSAGE: 'Failed to build a new `unocha/rwint9-site` image from ${{ github.ref }} , please go check [GitHub](https://github.com/UN-OCHA/rwint9-site/actions/workflows/docker-build-image.yml).'
-        FLOWDOCK_TAGS: 'build,docker,${{ github.actor }}'
-
-    - name: Flowdock Success
-      id: success
-      if: success()
-      uses: docker://ghcr.io/un-ocha/actions:flowdock-notify-main
-      env:
-        FLOWDOCK_TOKEN: ${{ secrets.FLOWDOCK_TOKEN }}
-        FLOWDOCK_ICON: 'package'
-        FLOWDOCK_MESSAGE: 'Built a new `unocha/rwint9-site` image from ${{ github.ref }} and pushed to [Amazon ECR](https://gallery.ecr.aws/unocha/rwint9-site).'
-        FLOWDOCK_TAGS: 'build,docker,${{ github.actor }}'
+        aws_access_key_id: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
+        aws_secret_access_key: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
+        docker_registry_url: public.ecr.aws
+        docker_registry_path: /unocha/
+        docker_image: rwint9-site
+        docker_username: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
+        docker_password: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}
+        ecr_github_token: ${{ secrets.ECR_GITHUB_TOKEN }}
+        ecr_jenkins_token: ${{ secrets.JENKINS_ECR_TOKEN }}
+        flowdock_token: ${{ secrets.FLOWDOCK_TOKEN }}

From 9513692ea793080738c95872b575dfa4e2ee3642 Mon Sep 17 00:00:00 2001
From: Peter Lieverdink <lieverdink@reliefweb.int>
Date: Thu, 18 Nov 2021 17:37:32 +1100
Subject: [PATCH 109/720] [OPS-7896] Maintain the custom build fail
 notification icon.

---
 .github/workflows/docker-build-image.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/docker-build-image.yml b/.github/workflows/docker-build-image.yml
index 4c06e0acc..01d837267 100644
--- a/.github/workflows/docker-build-image.yml
+++ b/.github/workflows/docker-build-image.yml
@@ -28,3 +28,4 @@ jobs:
         ecr_github_token: ${{ secrets.ECR_GITHUB_TOKEN }}
         ecr_jenkins_token: ${{ secrets.JENKINS_ECR_TOKEN }}
         flowdock_token: ${{ secrets.FLOWDOCK_TOKEN }}
+        flowdock_icon_failure: 'warning'

From eea4a3f365fd118f7f027c77e6df0bd4e44d9c2f Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 18 Nov 2021 16:52:30 +0900
Subject: [PATCH 110/720] [RW-174] Fix training dates when selecting ongoing

---
 .../reliefweb_entities/src/Services/TrainingFormAlter.php    | 5 ++---
 .../reliefweb_moderation/src/Services/TrainingModeration.php | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/html/modules/custom/reliefweb_entities/src/Services/TrainingFormAlter.php b/html/modules/custom/reliefweb_entities/src/Services/TrainingFormAlter.php
index 8b4dbd823..e080fc218 100644
--- a/html/modules/custom/reliefweb_entities/src/Services/TrainingFormAlter.php
+++ b/html/modules/custom/reliefweb_entities/src/Services/TrainingFormAlter.php
@@ -262,9 +262,8 @@ public function validateTrainingDateFields(array $form, FormStateInterface $form
     }
     // Otherwise empty the date fields.
     else {
-      $form_state->setValue(['field_training_date', 0, 'value'], []);
-      $form_state->setValue(['field_training_date', 0, 'end_value'], []);
-      $form_state->setValue(['field_registration_deadline', 0, 'value'], []);
+      $form_state->setValue(['field_training_date'], []);
+      $form_state->setValue(['field_registration_deadline'], []);
     }
   }
 
diff --git a/html/modules/custom/reliefweb_moderation/src/Services/TrainingModeration.php b/html/modules/custom/reliefweb_moderation/src/Services/TrainingModeration.php
index cf850bcb6..150f57aa0 100644
--- a/html/modules/custom/reliefweb_moderation/src/Services/TrainingModeration.php
+++ b/html/modules/custom/reliefweb_moderation/src/Services/TrainingModeration.php
@@ -115,7 +115,7 @@ public function getRows(array $results) {
       $details = [];
       // Registration deadline.
       $registration_deadline = $entity->field_registration_deadline->value;
-      if (!empty($registration_deadline) && $registration_deadline != 'Array') {
+      if (!empty($registration_deadline)) {
         $details['registration-deadline'] = $this->t('Registration deadline: %date', [
           '%date' => $this->formatDate($registration_deadline),
         ]);
@@ -123,7 +123,7 @@ public function getRows(array $results) {
       // Training dates (start and end).
       $training_date_start = $entity->field_training_date->value;
       $training_date_end = $entity->field_training_date->end_value;
-      if (!empty($training_date_start) && $training_date_start != 'Array') {
+      if (!empty($training_date_start)) {
         if ($training_date_start === $training_date_end) {
           $training_date = $this->formatDate($training_date_start);
         }

From c481cc0c6e1f88313542a8fb6599fdce9ef310c6 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 18 Nov 2021 16:58:09 +0900
Subject: [PATCH 111/720] [RW-174] Fix user posts table cells

---
 .../reliefweb_user_posts.services.yml         |   2 +-
 .../src/Services/UserPostsService.php         | 107 ++++++++++++++++--
 2 files changed, 100 insertions(+), 9 deletions(-)

diff --git a/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.services.yml b/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.services.yml
index 0273b5dff..8b97be211 100644
--- a/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.services.yml
+++ b/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.services.yml
@@ -1,4 +1,4 @@
 services:
   reliefweb_moderation.user_posts.moderation:
     class: Drupal\reliefweb_user_posts\Services\UserPostsService
-    arguments: ['@current_user', '@database', '@date.formatter', '@entity_field.manager', '@entity_type.manager', '@pager.manager', '@pager.parameters', '@request_stack', '@string_translation']
+    arguments: ['@current_user', '@database', '@date.formatter', '@entity_field.manager', '@entity_type.manager', '@pager.manager', '@pager.parameters', '@request_stack', '@string_translation', '@current_route_match']
diff --git a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
index 7fa597697..d48dbb4d4 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
@@ -3,15 +3,82 @@
 namespace Drupal\reliefweb_user_posts\Services;
 
 use Drupal\Component\Render\FormattableMarkup;
+use Drupal\Core\Database\Connection;
 use Drupal\Core\Database\Query\Select;
+use Drupal\Core\Datetime\DateFormatterInterface;
+use Drupal\Core\Entity\EntityFieldManagerInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Pager\PagerManagerInterface;
+use Drupal\Core\Pager\PagerParametersInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Session\AccountProxyInterface;
+use Drupal\Core\StringTranslation\TranslationInterface;
 use Drupal\reliefweb_moderation\Helpers\UserPostingRightsHelper;
 use Drupal\reliefweb_moderation\ModerationServiceBase;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * Moderation service for the report nodes.
  */
 class UserPostsService extends ModerationServiceBase {
 
+  /**
+   * The route match service.
+   *
+   * @var \Drupal\Core\Routing\RouteMatchInterface
+   */
+  protected $routeMatch;
+
+  /**
+   * Constructor.
+   *
+   * @param \Drupal\Core\Session\AccountProxyInterface $current_user
+   *   The current user.
+   * @param \Drupal\Core\Database\Connection $database
+   *   The database connection.
+   * @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
+   *   The date formatter service.
+   * @param \Drupal\Core\Entity\EntityFieldManagerInterface $entity_field_manager
+   *   The entity field manager service.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager service.
+   * @param \Drupal\Core\Pager\PagerManagerInterface $pager_manager
+   *   The pager manager service.
+   * @param \Drupal\Core\Pager\PagerParametersInterface $pager_parameters
+   *   The pager parameter service.
+   * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
+   *   The request stack.
+   * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
+   *   The translation manager service.
+   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
+   *   The route match service.
+   */
+  public function __construct(
+    AccountProxyInterface $current_user,
+    Connection $database,
+    DateFormatterInterface $date_formatter,
+    EntityFieldManagerInterface $entity_field_manager,
+    EntityTypeManagerInterface $entity_type_manager,
+    PagerManagerInterface $pager_manager,
+    PagerParametersInterface $pager_parameters,
+    RequestStack $request_stack,
+    TranslationInterface $string_translation,
+    RouteMatchInterface $route_match
+  ) {
+    parent::__construct(
+      $current_user,
+      $database,
+      $date_formatter,
+      $entity_field_manager,
+      $entity_type_manager,
+      $pager_manager,
+      $pager_parameters,
+      $request_stack,
+      $string_translation
+    );
+    $this->routeMatch = $route_match;
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -109,6 +176,10 @@ public function getRows(array $results) {
       return [];
     }
 
+    // Retrieve the user for this page.
+    $user = $this->routeMatch->getParameter('user');
+    $user_id = !empty($user) ? $user->id() : NULL;
+
     /** @var \Drupal\reliefweb_moderation\EntityModeratedInterface[] $entities */
     $entities = $results['entities'];
 
@@ -117,28 +188,48 @@ public function getRows(array $results) {
     foreach ($entities as $entity) {
       $cells = [];
 
-      // Edit link + status cell.
       $cells['id'] = $entity->id();
       $cells['type'] = $entity->bundle();
       $cells['status'] = new FormattableMarkup('<div class="rw-moderation-status" data-moderation-status="@status">@label</div>', [
         '@status' => $entity->getModerationStatus(),
         '@label' => $entity->getModerationStatusLabel(),
       ]);
-      $cells['poster'] = $this->currentUser->id() == $entity->getOwner()->id() ? $this->t('me') : $this->t('other');
-      $cells['source'] = '';
+
+      // Me if the entity author is the user for this My Posts page.
+      $cells['poster'] = $user_id == $entity->getOwnerId() ? $this->t('me') : $this->t('other');
+
+      // Jobs can have 1 source, training can have several.
+      $sources = [];
+      foreach ($entity->field_source->referencedEntities() as $source) {
+        $source_label = $source->field_shortname->value ?? $source->label();
+        $sources[] = $source->toLink($source_label)->toString();
+      }
+      if (count($sources) > 1) {
+        $cells['source'] = [
+          '#theme' => 'item_list',
+          '#items' => $sources,
+        ];
+      }
+      else {
+        $cells['source'] = reset($sources);
+      }
+
       $cells['title'] = $entity->toLink()->toString();
-      $cells['date'] = $this->getEntityCreationDate($entity);
 
-      $cells['deadline'] = '';
-      if ($entity->field_registration_deadline) {
-        if ($entity->field_registration_deadline->value == 'Array') {
+      // The `reliefweb-moderation-table.hml.twig` template expects an array or
+      // object with a date property for the "date" cells.
+      $cells['date']['date'] = $this->getEntityCreationDate($entity);
+
+      // Registration deadline for training or closing date for jobs.
+      if ($entity->bundle() === 'training') {
+        if ($entity->field_registration_deadline->isEmpty()) {
           $cells['deadline'] = $this->t('Ongoing');
         }
         else {
           $cells['deadline'] = $this->formatDate($entity->field_registration_deadline->value);
         }
       }
-      elseif ($entity->field_job_closing_date) {
+      else {
         $cells['deadline'] = $this->formatDate($entity->field_job_closing_date->value);
       }
 

From 15b3937818beb3af80e9952ab9ec6fc04ecb5b77 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Thu, 18 Nov 2021 10:53:20 +0100
Subject: [PATCH 112/720] RW-174: Fix getUserPostingRights

---
 .../src/Helpers/UserPostingRightsHelper.php                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_moderation/src/Helpers/UserPostingRightsHelper.php b/html/modules/custom/reliefweb_moderation/src/Helpers/UserPostingRightsHelper.php
index 535da87f6..ba79fe94f 100644
--- a/html/modules/custom/reliefweb_moderation/src/Helpers/UserPostingRightsHelper.php
+++ b/html/modules/custom/reliefweb_moderation/src/Helpers/UserPostingRightsHelper.php
@@ -110,7 +110,7 @@ public static function getUserPostingRights(?AccountInterface $account = NULL, a
     }
 
     // Skip the query for the anonymous user.
-    if (!empty($account->uid)) {
+    if (!empty($account->id())) {
       $table = $helper->getFieldTableName('taxonomy_term', 'field_user_posting_rights');
       $id_field = $helper->getFieldColumnName('taxonomy_term', 'field_user_posting_rights', 'id');
       $job_field = $helper->getFieldColumnName('taxonomy_term', 'field_user_posting_rights', 'job');

From 1175be8b46d451777a7bf912afd19985188b910f Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Thu, 18 Nov 2021 12:15:21 +0100
Subject: [PATCH 113/720] RW-174: Filter by poster

---
 .../src/Controller/UserPostsPage.php          |  3 --
 .../src/Services/UserPostsService.php         | 52 +++++++++++++++++--
 2 files changed, 49 insertions(+), 6 deletions(-)

diff --git a/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php b/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php
index 90fd1413d..b311b75f0 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php
@@ -98,9 +98,6 @@ public function getContent(UserInterface $user, ModerationServiceInterface $serv
       // Status + Other filters.
       $filters = $values['filters'] ?? [];
 
-      // Filter by current user.
-      $filters['author'] = $user->id();
-
       // Omnibox selections.
       if (!empty($input['selection'])) {
         foreach ($input['selection'] as $filter => $items) {
diff --git a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
index d48dbb4d4..1d7956b77 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
@@ -289,18 +289,19 @@ protected function initFilterDefinitions(array $filters = []) {
       'operator' => 'AND',
     ];
 
-    $definitions['author2'] = [
+    $definitions['poster'] = [
       'type' => 'property',
       'field' => 'uid',
       'label' => $this->t('Posted by'),
       'shortcut' => 'a',
       'form' => 'other',
-      'join_callback' => 'joinPoster',
-      'operator' => 'OR',
+      'operator' => 'AND',
       'values' => [
         'me' => $this->t('Me'),
         'other' => $this->t('Other'),
       ],
+      'join_callback' => '',
+      'condition_callback' => 'conditionPoster',
     ];
 
     return $definitions;
@@ -351,6 +352,48 @@ protected function getSourcesTheUserHasPostedFor($filter, $term, $conditions, ar
     return $allowed_sources;
   }
 
+  /**
+   * Poster join.
+   */
+  protected function joinPoster(Select $query) {
+    // Join to current user.
+    $conditions = $query->orConditionGroup();
+    $conditions->condition('node_field_data.uid', $this->currentUser->id());
+
+    // Join sources.
+    $rights = UserPostingRightsHelper::getUserPostingRights($this->currentUser, []);
+
+    $allowed_sources = [];
+    foreach ($rights as $right) {
+      if (isset($right['job']) && $right['job'] > 1) {
+        $allowed_sources[$right['tid']] = $right;
+      }
+      elseif (isset($right['training']) && $right['training'] > 1) {
+        $allowed_sources[$right['tid']] = $right;
+      }
+    }
+
+    // Join the source field table.
+    $join_table = $this->getFieldTableName('node', 'field_source');
+    $query->leftJoin($join_table, 'user_sources', "user_sources.entity_id = node_field_data.nid");
+
+    $conditions->condition('user_sources.field_source_target_id', array_keys($allowed_sources), 'IN');
+
+    $query->condition($conditions);
+  }
+
+  /**
+   * Poster condition.
+   */
+  protected function conditionPoster($definition, $base, $fields, $value, $operator) {
+    if ($value === 'me') {
+      $base->where("node_field_data.uid = {$this->currentUser->id()}");
+    }
+    elseif ($value === 'other') {
+      $base->where("node_field_data.uid <> {$this->currentUser->id()}");
+    }
+  }
+
   /**
    * Deadline join callback.
    *
@@ -383,6 +426,9 @@ protected function conditionDeadline($definition, $base, $fields, $value, $opera
    * {@inheritdoc}
    */
   protected function wrapQuery(Select $query, $limit = 30) {
+    // Join poster.
+    $this->joinPoster($query);
+
     // Get the order information.
     $info = $this->getOrderInformation();
     $sort_direction = $info['sort'] ?? 'desc';

From 0c79fd73c623dd2c898bd3097979be4b6b6d0980 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Thu, 18 Nov 2021 12:21:39 +0100
Subject: [PATCH 114/720] Revert css

---
 .../rw-moderation/rw-moderation.css           | 102 +++++++++---------
 1 file changed, 49 insertions(+), 53 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
index b42c49c36..8b9fe0335 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
@@ -4,11 +4,11 @@
  * Style the moderation forms used by the editorial teams to review posted
  * documents.
  */
-.rw-moderation-content-filters {
+ .path-moderation .rw-moderation-content-filters {
   padding: 24px 0 0 0;
 }
 /* Hide visually the filters title to reduce scrolling. */
-.rw-moderation-filters > legend {
+.path-moderation .rw-moderation-filters > legend {
   position: absolute;
   overflow: hidden;
   clip: rect(0, 0, 0, 0);
@@ -20,11 +20,11 @@
   border: none;
   clip-path: inset(100%);
 }
-.rw-moderation-filters #edit-filters {
+.path-moderation #edit-filters {
   padding-bottom: 0;
   border-bottom: none;
 }
-.rw-moderation-filters #edit-filters-status [class*="form-item-filters-status-"] {
+.path-moderation #edit-filters-status [class*="form-item-filters-status-"] {
   width: 100%;
   margin-bottom: 12px;
   padding: 2px 8px;
@@ -36,48 +36,48 @@
   font-size: 16px;
   line-height: 16px;
 }
-.rw-moderation-filters #edit-filters-status.form-checkboxes {
+.path-moderation #edit-filters-status.form-checkboxes {
   display: grid;
   grid-template-columns: repeat(auto-fill, minmax(140px, 1fr));
   grid-gap: 0 24px;
   margin-bottom: -12px;
 }
-.path-moderation-content-disaster #edit-filters-status .form-checkboxes {
+.path-moderation.path-moderation-content-disaster #edit-filters-status .form-checkboxes {
   grid-template-columns: repeat(auto-fill, minmax(170px, 1fr));
 }
-.rw-moderation-filters #edit-filters-other .fieldset-wrapper > * {
+.path-moderation #edit-filters-other .fieldset-wrapper > * {
   display: inline-block;
   margin-top: 0;
   vertical-align: middle;
 }
-.rw-moderation-filters #edit-omnibox .fieldset-wrapper {
+.path-moderation #edit-omnibox .fieldset-wrapper {
   display: table;
 }
-.rw-moderation-filters #edit-omnibox .fieldset-wrapper > * {
+.path-moderation #edit-omnibox .fieldset-wrapper > * {
   display: table-cell;
   height: 32px;
   margin: 0;
   padding: 0;
   vertical-align: middle;
 }
-.rw-moderation-filters #edit-omnibox .fieldset-wrapper > :first-child {
+.path-moderation #edit-omnibox .fieldset-wrapper > :first-child {
   padding-right: 8px;
 }
-.rw-moderation-filters #edit-omnibox .fieldset-wrapper select {
+.path-moderation #edit-omnibox .fieldset-wrapper select {
   width: auto;
   /* height: 100%; */
 }
-.rw-moderation-filters #edit-omnibox div[data-autocomplete] > input {
+.path-moderation #edit-omnibox div[data-autocomplete] > input {
   border-right: 2px solid var(--cd-reliefweb-brand-grey--light);
 }
-.rw-moderation-filters [data-selection] > span span + span {
+.path-moderation [data-selection] > span span + span {
   font-weight: bold;
 }
-.rw-moderation-filters .form-actions.form-item {
+.path-moderation .form-actions.form-item {
   margin-top: 16px;
 }
 /* Link to create a new entity. */
-.rw-moderation-filters .form-actions a {
+.path-moderation .form-actions a {
   display: inline-block;
   margin-top: 12px;
   margin-inline-start: 0.5rem;
@@ -97,7 +97,7 @@
   padding: 32px 0;
 }
 /* Hide visually the list title to reduce scrolling. */
-.rw-moderation-list > h3 {
+.path-moderation .rw-moderation-list > h3 {
   position: absolute;
   overflow: hidden;
   clip: rect(0, 0, 0, 0);
@@ -109,15 +109,21 @@
   border: none;
   clip-path: inset(100%);
 }
-.rw-moderation-list .rw-moderation-content__total-list {
+.path-moderation .rw-moderation-content__total-list {
   display: grid;
   grid-template-columns: repeat(auto-fit, minmax(80px, 1fr));
   grid-gap: 24px;
   margin: 0 0 24px 0;
   padding: 0;
   text-align: center;
+  font-size: 14px;
+}
+.path-moderation .rw-moderation-content__total-list span {
+  display: block;
+  font-size: 14px;
+  line-height: 1.2;
 }
-.rw-moderation-list .rw-moderation-content__total-list [data-moderation-status] {
+.path-moderation .rw-moderation-content__total-list [data-moderation-status] {
   display: inline-block;
   display: flex;
   flex-direction: column;
@@ -130,73 +136,63 @@
   background: none;
   font-weight: normal;
 }
-.rw-moderation-list .rw-moderation-content__total-list [data-moderation-status] * {
-  display: block;
-  font-size: 16px;
-  line-height: 1.2;
-}
-.rw-moderation-list .rw-moderation-content__total-list [data-moderation-status] strong {
+.path-moderation .rw-moderation-content__total-list [data-moderation-status] strong {
   margin-top: 8px;
 }
-.rw-moderation-list td .rw-moderation-status[data-moderation-status] {
+.path-moderation .rw-moderation-list td .rw-moderation-status[data-moderation-status] {
   margin: 12px 0 0 0;
   padding: 6px;
   font-size: 12px;
 }
-.rw-moderation-list .rw-moderation-table tr td:first-child {
+.path-moderation .rw-moderation-list .rw-moderation-table tr td:first-child {
   text-align: center;
-  /* white-space: pre; */
 }
 .path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) {
   width: 100%;
   word-break: break-word;
 }
-.rw-moderation-list .rw-moderation-table tr td:nth-child(2) > * {
-  margin: 0;
-  padding: 0;
-  font-size: 14px;
-  line-height: 1.5;
-}
-.rw-moderation-list .rw-moderation-table tr td:nth-child(2) div + div {
+.path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) div + div {
   margin-top: 4px;
 }
-.rw-moderation-list .rw-moderation-table tr td:nth-child(2) .rw-moderation-table__cell__title {
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__title {
   font-size: 16px;
   font-weight: bold;
 }
-.rw-moderation-list .rw-moderation-table tr td:nth-child(2) .headline-title {
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__info {
   font-size: 15px;
-  font-style: italic;
 }
-.rw-moderation-list .rw-moderation-table tr td:nth-child(2) .rw-moderation-table__cell__info {
-  font-size: 15px;
-}
-.rw-moderation-list .rw-moderation-table tr td:nth-child(2) .rw-moderation-table__cell__info .rw-moderation-table__cell__info__country a,
-.rw-moderation-list .rw-moderation-table tr td:nth-child(2) .rw-moderation-table__cell__details .rw-moderation-table__cell__info__source a {
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__info .rw-moderation-table__cell__info__country a,
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__info .rw-moderation-table__cell__info__source a {
   color: var(--cd-reliefweb-brand-grey--dark);
   font-weight: bold;
 }
-.rw-moderation-list .rw-moderation-table__cell__bury {
+.path-moderation .rw-moderation-list .rw-moderation-table__cell__bury {
   margin-top: 12px;
   font-size: 15px;
 }
-.rw-moderation-list .rw-moderation-table tr td:nth-child(2) .closing-date {
-  font-weight: bold;
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details,
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__revision {
+  font-size: 14px;
 }
-.rw-moderation-list .rw-moderation-table tr td:nth-child(2) .dates,
-.rw-moderation-list .rw-moderation-table tr td:nth-child(2) .cost {
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__closing-date,
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__registration-deadline,
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__training-date,
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__cost {
   font-weight: bold;
 }
-.rw-moderation-list .rw-moderation-table tr td:nth-child(2) .value {
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__closing-date em,
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__registration-deadline em,
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__training-date em,
+.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__cost em {
   font-weight: normal;
 }
-.rw-moderation-list .rw-moderation-table__cell__date {
+.path-moderation .rw-moderation-list .rw-moderation-table__cell__date {
   text-align: center;
   white-space: pre;
   font-size: 15px;
 }
-.rw-moderation-list .rw-moderation-table__header--sort--asc:after,
-.rw-moderation-list .rw-moderation-table__header--sort--desc:after {
+.path-moderation .rw-moderation-list .rw-moderation-table__header--sort--asc:after,
+.path-moderation .rw-moderation-list .rw-moderation-table__header--sort--desc:after {
   display: inline-block;
   overflow: hidden;
   width: 12px;
@@ -205,10 +201,10 @@
   vertical-align: middle;
   background: var(--rw-icons--toggle--up--12--dark-blue);
 }
-.rw-moderation-list .rw-moderation-table__header--sort--desc:after {
+.path-moderation .rw-moderation-list .rw-moderation-table__header--sort--desc:after {
   background: var(--rw-icons--toggle--down--12--dark-blue);
 }
-.rw-moderation-list .pager {
+.path-moderation .rw-moderation-list .pager {
   padding-top: 0;
   border-top: none;
 }

From 2a5f895708956c15246820e7552390eb3f074d04 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Thu, 18 Nov 2021 12:27:35 +0100
Subject: [PATCH 115/720] Fix css

---
 .../rw-moderation/rw-moderation.css           | 88 +++++++++----------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
index 8b9fe0335..296ef9490 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
@@ -4,11 +4,11 @@
  * Style the moderation forms used by the editorial teams to review posted
  * documents.
  */
- .path-moderation .rw-moderation-content-filters {
+.rw-moderation-content-filters {
   padding: 24px 0 0 0;
 }
 /* Hide visually the filters title to reduce scrolling. */
-.path-moderation .rw-moderation-filters > legend {
+.rw-moderation-filters > legend {
   position: absolute;
   overflow: hidden;
   clip: rect(0, 0, 0, 0);
@@ -20,11 +20,11 @@
   border: none;
   clip-path: inset(100%);
 }
-.path-moderation #edit-filters {
+.rw-moderation-filters #edit-filters {
   padding-bottom: 0;
   border-bottom: none;
 }
-.path-moderation #edit-filters-status [class*="form-item-filters-status-"] {
+.rw-moderation-filters #edit-filters-status [class*="form-item-filters-status-"] {
   width: 100%;
   margin-bottom: 12px;
   padding: 2px 8px;
@@ -36,48 +36,48 @@
   font-size: 16px;
   line-height: 16px;
 }
-.path-moderation #edit-filters-status.form-checkboxes {
+.rw-moderation-filters #edit-filters-status.form-checkboxes {
   display: grid;
   grid-template-columns: repeat(auto-fill, minmax(140px, 1fr));
   grid-gap: 0 24px;
   margin-bottom: -12px;
 }
-.path-moderation.path-moderation-content-disaster #edit-filters-status .form-checkboxes {
+.path-moderation-content-disaster .rw-moderation-filters #edit-filters-status .form-checkboxes {
   grid-template-columns: repeat(auto-fill, minmax(170px, 1fr));
 }
-.path-moderation #edit-filters-other .fieldset-wrapper > * {
+.rw-moderation-filters #edit-filters-other .fieldset-wrapper > * {
   display: inline-block;
   margin-top: 0;
   vertical-align: middle;
 }
-.path-moderation #edit-omnibox .fieldset-wrapper {
+.rw-moderation-filters #edit-omnibox .fieldset-wrapper {
   display: table;
 }
-.path-moderation #edit-omnibox .fieldset-wrapper > * {
+.rw-moderation-filters #edit-omnibox .fieldset-wrapper > * {
   display: table-cell;
   height: 32px;
   margin: 0;
   padding: 0;
   vertical-align: middle;
 }
-.path-moderation #edit-omnibox .fieldset-wrapper > :first-child {
+.rw-moderation-filters #edit-omnibox .fieldset-wrapper > :first-child {
   padding-right: 8px;
 }
-.path-moderation #edit-omnibox .fieldset-wrapper select {
+.rw-moderation-filters #edit-omnibox .fieldset-wrapper select {
   width: auto;
   /* height: 100%; */
 }
-.path-moderation #edit-omnibox div[data-autocomplete] > input {
+.rw-moderation-filters #edit-omnibox div[data-autocomplete] > input {
   border-right: 2px solid var(--cd-reliefweb-brand-grey--light);
 }
-.path-moderation [data-selection] > span span + span {
+.rw-moderation-filters [data-selection] > span span + span {
   font-weight: bold;
 }
-.path-moderation .form-actions.form-item {
+.rw-moderation-filters .form-actions.form-item {
   margin-top: 16px;
 }
 /* Link to create a new entity. */
-.path-moderation .form-actions a {
+.rw-moderation-filters .form-actions a {
   display: inline-block;
   margin-top: 12px;
   margin-inline-start: 0.5rem;
@@ -97,7 +97,7 @@
   padding: 32px 0;
 }
 /* Hide visually the list title to reduce scrolling. */
-.path-moderation .rw-moderation-list > h3 {
+.rw-moderation-list > h3 {
   position: absolute;
   overflow: hidden;
   clip: rect(0, 0, 0, 0);
@@ -109,7 +109,7 @@
   border: none;
   clip-path: inset(100%);
 }
-.path-moderation .rw-moderation-content__total-list {
+.rw-moderation-content__total-list {
   display: grid;
   grid-template-columns: repeat(auto-fit, minmax(80px, 1fr));
   grid-gap: 24px;
@@ -118,12 +118,12 @@
   text-align: center;
   font-size: 14px;
 }
-.path-moderation .rw-moderation-content__total-list span {
+.rw-moderation-content__total-list span {
   display: block;
   font-size: 14px;
   line-height: 1.2;
 }
-.path-moderation .rw-moderation-content__total-list [data-moderation-status] {
+.rw-moderation-content__total-list [data-moderation-status] {
   display: inline-block;
   display: flex;
   flex-direction: column;
@@ -136,63 +136,63 @@
   background: none;
   font-weight: normal;
 }
-.path-moderation .rw-moderation-content__total-list [data-moderation-status] strong {
+.rw-moderation-content__total-list [data-moderation-status] strong {
   margin-top: 8px;
 }
-.path-moderation .rw-moderation-list td .rw-moderation-status[data-moderation-status] {
+.rw-moderation-list td .rw-moderation-status[data-moderation-status] {
   margin: 12px 0 0 0;
   padding: 6px;
   font-size: 12px;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table tr td:first-child {
+.rw-moderation-list .rw-moderation-table tr td:first-child {
   text-align: center;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) {
+.rw-moderation-list .rw-moderation-table tr td:nth-child(2) {
   width: 100%;
   word-break: break-word;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table tr td:nth-child(2) div + div {
+.rw-moderation-list .rw-moderation-table tr td:nth-child(2) div + div {
   margin-top: 4px;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__title {
+.rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__title {
   font-size: 16px;
   font-weight: bold;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__info {
+.rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__info {
   font-size: 15px;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__info .rw-moderation-table__cell__info__country a,
-.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__info .rw-moderation-table__cell__info__source a {
+.rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__info .rw-moderation-table__cell__info__country a,
+.rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__info .rw-moderation-table__cell__info__source a {
   color: var(--cd-reliefweb-brand-grey--dark);
   font-weight: bold;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table__cell__bury {
+.rw-moderation-list .rw-moderation-table__cell__bury {
   margin-top: 12px;
   font-size: 15px;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details,
-.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__revision {
+.rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details,
+.rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__revision {
   font-size: 14px;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__closing-date,
-.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__registration-deadline,
-.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__training-date,
-.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__cost {
+.rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__closing-date,
+.rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__registration-deadline,
+.rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__training-date,
+.rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__cost {
   font-weight: bold;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__closing-date em,
-.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__registration-deadline em,
-.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__training-date em,
-.path-moderation .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__cost em {
+.rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__closing-date em,
+.rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__registration-deadline em,
+.rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__training-date em,
+.rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details__cost em {
   font-weight: normal;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table__cell__date {
+.rw-moderation-list .rw-moderation-table__cell__date {
   text-align: center;
   white-space: pre;
   font-size: 15px;
 }
-.path-moderation .rw-moderation-list .rw-moderation-table__header--sort--asc:after,
-.path-moderation .rw-moderation-list .rw-moderation-table__header--sort--desc:after {
+.rw-moderation-list .rw-moderation-table__header--sort--asc:after,
+.rw-moderation-list .rw-moderation-table__header--sort--desc:after {
   display: inline-block;
   overflow: hidden;
   width: 12px;
@@ -201,10 +201,10 @@
   vertical-align: middle;
   background: var(--rw-icons--toggle--up--12--dark-blue);
 }
-.path-moderation .rw-moderation-list .rw-moderation-table__header--sort--desc:after {
+.rw-moderation-list .rw-moderation-table__header--sort--desc:after {
   background: var(--rw-icons--toggle--down--12--dark-blue);
 }
-.path-moderation .rw-moderation-list .pager {
+.rw-moderation-list .pager {
   padding-top: 0;
   border-top: none;
 }

From ca021217dfc8b738b2e03ff04af6a0b3177deec5 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Thu, 18 Nov 2021 19:30:27 +0100
Subject: [PATCH 116/720] Fieldable help for fields

---
 .../extended_field_description/composer.json  |  13 +
 .../description_entity.page.inc               |  30 ++
 .../extended_field_description.info.yml       |   5 +
 ...xtended_field_description.links.action.yml |   5 +
 .../extended_field_description.links.menu.yml |  14 +
 .../extended_field_description.links.task.yml |  26 ++
 .../extended_field_description.module         |  73 +++++
 ...extended_field_description.permissions.yml |  31 ++
 .../DescriptionEntityController.php           | 209 +++++++++++++
 .../DescriptionEntityAccessControlHandler.php |  55 ++++
 .../DescriptionEntityHtmlRouteProvider.php    | 196 ++++++++++++
 .../src/DescriptionEntityListBuilder.php      |  39 +++
 .../src/DescriptionEntityStorage.php          |  58 ++++
 .../src/DescriptionEntityStorageInterface.php |  61 ++++
 .../DescriptionEntityTranslationHandler.php   |  13 +
 .../src/Entity/DescriptionEntity.php          | 283 ++++++++++++++++++
 .../src/Entity/DescriptionEntityInterface.php |  98 ++++++
 .../src/Entity/DescriptionEntityViewsData.php |  23 ++
 .../src/Form/DescriptionEntityDeleteForm.php  |  15 +
 .../src/Form/DescriptionEntityForm.php        |  87 ++++++
 .../DescriptionEntityRevisionDeleteForm.php   | 108 +++++++
 .../DescriptionEntityRevisionRevertForm.php   | 137 +++++++++
 ...ionEntityRevisionRevertTranslationForm.php |  97 ++++++
 .../Form/DescriptionEntitySettingsForm.php    |  53 ++++
 .../templates/description_entity.html.twig    |  22 ++
 .../extended-field-description.html.twig      |   1 +
 26 files changed, 1752 insertions(+)
 create mode 100644 html/modules/custom/extended_field_description/composer.json
 create mode 100644 html/modules/custom/extended_field_description/description_entity.page.inc
 create mode 100644 html/modules/custom/extended_field_description/extended_field_description.info.yml
 create mode 100644 html/modules/custom/extended_field_description/extended_field_description.links.action.yml
 create mode 100644 html/modules/custom/extended_field_description/extended_field_description.links.menu.yml
 create mode 100644 html/modules/custom/extended_field_description/extended_field_description.links.task.yml
 create mode 100644 html/modules/custom/extended_field_description/extended_field_description.module
 create mode 100644 html/modules/custom/extended_field_description/extended_field_description.permissions.yml
 create mode 100644 html/modules/custom/extended_field_description/src/Controller/DescriptionEntityController.php
 create mode 100644 html/modules/custom/extended_field_description/src/DescriptionEntityAccessControlHandler.php
 create mode 100644 html/modules/custom/extended_field_description/src/DescriptionEntityHtmlRouteProvider.php
 create mode 100644 html/modules/custom/extended_field_description/src/DescriptionEntityListBuilder.php
 create mode 100644 html/modules/custom/extended_field_description/src/DescriptionEntityStorage.php
 create mode 100644 html/modules/custom/extended_field_description/src/DescriptionEntityStorageInterface.php
 create mode 100644 html/modules/custom/extended_field_description/src/DescriptionEntityTranslationHandler.php
 create mode 100644 html/modules/custom/extended_field_description/src/Entity/DescriptionEntity.php
 create mode 100644 html/modules/custom/extended_field_description/src/Entity/DescriptionEntityInterface.php
 create mode 100644 html/modules/custom/extended_field_description/src/Entity/DescriptionEntityViewsData.php
 create mode 100644 html/modules/custom/extended_field_description/src/Form/DescriptionEntityDeleteForm.php
 create mode 100644 html/modules/custom/extended_field_description/src/Form/DescriptionEntityForm.php
 create mode 100644 html/modules/custom/extended_field_description/src/Form/DescriptionEntityRevisionDeleteForm.php
 create mode 100644 html/modules/custom/extended_field_description/src/Form/DescriptionEntityRevisionRevertForm.php
 create mode 100644 html/modules/custom/extended_field_description/src/Form/DescriptionEntityRevisionRevertTranslationForm.php
 create mode 100644 html/modules/custom/extended_field_description/src/Form/DescriptionEntitySettingsForm.php
 create mode 100644 html/modules/custom/extended_field_description/templates/description_entity.html.twig
 create mode 100644 html/modules/custom/extended_field_description/templates/extended-field-description.html.twig

diff --git a/html/modules/custom/extended_field_description/composer.json b/html/modules/custom/extended_field_description/composer.json
new file mode 100644
index 000000000..e9603ab67
--- /dev/null
+++ b/html/modules/custom/extended_field_description/composer.json
@@ -0,0 +1,13 @@
+{
+    "name": "drupal/extended_field_description",
+    "type": "drupal-module",
+    "description": "My Awesome Module",
+    "keywords": [
+    ],
+    "homepage": "https://www.drupal.org/project/extended_field_description",
+    "minimum-stability": "dev",
+    "support": {
+        "issues": "https://www.drupal.org/project/issues/extended_field_description",
+        "source": "http://cgit.drupalcode.org/extended_field_description",
+    }
+}
diff --git a/html/modules/custom/extended_field_description/description_entity.page.inc b/html/modules/custom/extended_field_description/description_entity.page.inc
new file mode 100644
index 000000000..252364ac5
--- /dev/null
+++ b/html/modules/custom/extended_field_description/description_entity.page.inc
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * @file
+ * Contains description_entity.page.inc.
+ *
+ * Page callback for Description entity entities.
+ */
+
+use Drupal\Core\Render\Element;
+
+/**
+ * Prepares variables for Description entity templates.
+ *
+ * Default template: description_entity.html.twig.
+ *
+ * @param array $variables
+ *   An associative array containing:
+ *   - elements: An associative array containing the user information and any
+ *   - attributes: HTML attributes for the containing element.
+ */
+function template_preprocess_description_entity(array &$variables) {
+  // Fetch DescriptionEntity Entity Object.
+  $description_entity = $variables['elements']['#description_entity'];
+
+  // Helpful $content variable for templates.
+  foreach (Element::children($variables['elements']) as $key) {
+    $variables['content'][$key] = $variables['elements'][$key];
+  }
+}
diff --git a/html/modules/custom/extended_field_description/extended_field_description.info.yml b/html/modules/custom/extended_field_description/extended_field_description.info.yml
new file mode 100644
index 000000000..38fd23831
--- /dev/null
+++ b/html/modules/custom/extended_field_description/extended_field_description.info.yml
@@ -0,0 +1,5 @@
+name: 'extended_field_description'
+type: module
+description: 'My Awesome Module'
+core_version_requirement: ^9
+package: 'Custom'
diff --git a/html/modules/custom/extended_field_description/extended_field_description.links.action.yml b/html/modules/custom/extended_field_description/extended_field_description.links.action.yml
new file mode 100644
index 000000000..9489aa64f
--- /dev/null
+++ b/html/modules/custom/extended_field_description/extended_field_description.links.action.yml
@@ -0,0 +1,5 @@
+entity.description_entity.add_form:
+  route_name: entity.description_entity.add_form
+  title: 'Add Description entity'
+  appears_on:
+    - entity.description_entity.collection
diff --git a/html/modules/custom/extended_field_description/extended_field_description.links.menu.yml b/html/modules/custom/extended_field_description/extended_field_description.links.menu.yml
new file mode 100644
index 000000000..442f7dc6f
--- /dev/null
+++ b/html/modules/custom/extended_field_description/extended_field_description.links.menu.yml
@@ -0,0 +1,14 @@
+
+# Description entity menu items definition
+entity.description_entity.collection:
+  title: 'Description entity list'
+  route_name: entity.description_entity.collection
+  description: 'List Description entity entities'
+  parent: system.admin_structure
+  weight: 100
+
+description_entity.admin.structure.settings:
+  title: 'Description entity settings'
+  description: 'Configure Description entity entities'
+  route_name: description_entity.settings
+  parent: system.admin_structure
diff --git a/html/modules/custom/extended_field_description/extended_field_description.links.task.yml b/html/modules/custom/extended_field_description/extended_field_description.links.task.yml
new file mode 100644
index 000000000..0e46bb4e9
--- /dev/null
+++ b/html/modules/custom/extended_field_description/extended_field_description.links.task.yml
@@ -0,0 +1,26 @@
+# Description entity routing definition
+description_entity.settings_tab:
+  route_name: description_entity.settings
+  title: 'Settings'
+  base_route: description_entity.settings
+
+entity.description_entity.canonical:
+  route_name: entity.description_entity.canonical
+  base_route: entity.description_entity.canonical
+  title: 'View'
+
+entity.description_entity.edit_form:
+  route_name: entity.description_entity.edit_form
+  base_route: entity.description_entity.canonical
+  title: 'Edit'
+
+entity.description_entity.version_history:
+  route_name: entity.description_entity.version_history
+  base_route: entity.description_entity.canonical
+  title: 'Revisions'
+
+entity.description_entity.delete_form:
+  route_name:  entity.description_entity.delete_form
+  base_route:  entity.description_entity.canonical
+  title: Delete
+  weight: 10
diff --git a/html/modules/custom/extended_field_description/extended_field_description.module b/html/modules/custom/extended_field_description/extended_field_description.module
new file mode 100644
index 000000000..e730a3888
--- /dev/null
+++ b/html/modules/custom/extended_field_description/extended_field_description.module
@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * @file
+ * Contains extended_field_description.module.
+ */
+
+use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\extended_field_description\Entity\DescriptionEntity;
+use Drupal\Core\Entity\ContentEntityForm;
+
+
+/**
+ * Implements hook_help().
+ */
+function extended_field_description_help($route_name, RouteMatchInterface $route_match) {
+  switch ($route_name) {
+    // Main module help for the extended_field_description module.
+    case 'help.page.extended_field_description':
+      $output = '';
+      $output .= '<h3>' . t('About') . '</h3>';
+      $output .= '<p>' . t('My Awesome Module') . '</p>';
+      return $output;
+
+    default:
+  }
+}
+
+/**
+ * Implements hook_theme().
+ */
+function extended_field_description_theme() {
+  return [
+    'extended_field_description' => [
+      'render element' => 'children',
+    ],
+  ];
+}
+
+/**
+ * Implements hook_field_widget_form_alter().
+ */
+function extended_field_description_field_widget_form_alter(&$element, FormStateInterface &$form_state, $context) {
+  static $description = [];
+
+  $bundle = '';
+  $form_object = $form_state->getFormObject();
+  $entity_type = $form_object->getEntity()->getEntityType()->id();
+  if ($form_object instanceof ContentEntityForm) {
+    $bundle = $form_object->getEntity()->bundle();
+  }
+  $field_name = $context['items']->getName();
+
+  if (!isset($descriptions[$entity_type])) {
+    /** @var Drupal\extended_field_description\Entity\DescriptionEntity[] $description_entities */
+    $description_entities = DescriptionEntity::loadByEntity($entity_type);
+    foreach ($description_entities as $description_entity) {
+      foreach ($description_entity->field_field as $field) {
+        $descriptions[$entity_type][$field->target_id] = $description_entity;
+      }
+    }
+  }
+
+  $key = $entity_type . '.' . $bundle . '.' . $field_name;
+  if (isset($descriptions[$entity_type][$key])) {
+
+    $view_builder = \Drupal::entityTypeManager()->getViewBuilder('description_entity');
+    $pre_render = $view_builder->view($descriptions[$entity_type][$key], 'default');
+    $render_output = render($pre_render);
+    $element['value']['#description'] = $render_output;
+  }
+}
diff --git a/html/modules/custom/extended_field_description/extended_field_description.permissions.yml b/html/modules/custom/extended_field_description/extended_field_description.permissions.yml
new file mode 100644
index 000000000..13f769c43
--- /dev/null
+++ b/html/modules/custom/extended_field_description/extended_field_description.permissions.yml
@@ -0,0 +1,31 @@
+add description entity entities:
+  title: 'Create new Description entity entities'
+
+administer description entity entities:
+  title: 'Administer Description entity entities'
+  description: 'Allow to access the administration form to configure Description entity entities.'
+  restrict access: true
+
+delete description entity entities:
+  title: 'Delete Description entity entities'
+
+edit description entity entities:
+  title: 'Edit Description entity entities'
+
+view published description entity entities:
+  title: 'View published Description entity entities'
+
+view unpublished description entity entities:
+  title: 'View unpublished Description entity entities'
+
+view all description entity revisions:
+  title: 'View all Description entity revisions'
+
+revert all description entity revisions:
+  title: 'Revert all Description entity revisions'
+  description: 'Role requires permission <em>view Description entity revisions</em> and <em>edit rights</em> for description entity entities in question or <em>administer description entity entities</em>.'
+
+delete all description entity revisions:
+  title: 'Delete all revisions'
+  description: 'Role requires permission to <em>view Description entity revisions</em> and <em>delete rights</em> for description entity entities in question or <em>administer description entity entities</em>.'
+
diff --git a/html/modules/custom/extended_field_description/src/Controller/DescriptionEntityController.php b/html/modules/custom/extended_field_description/src/Controller/DescriptionEntityController.php
new file mode 100644
index 000000000..26a5daea4
--- /dev/null
+++ b/html/modules/custom/extended_field_description/src/Controller/DescriptionEntityController.php
@@ -0,0 +1,209 @@
+<?php
+
+namespace Drupal\extended_field_description\Controller;
+
+use Drupal\Component\Utility\Xss;
+use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
+use Drupal\Core\Url;
+use Drupal\extended_field_description\Entity\DescriptionEntityInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Class DescriptionEntityController.
+ *
+ *  Returns responses for Description entity routes.
+ */
+class DescriptionEntityController extends ControllerBase implements ContainerInjectionInterface {
+
+  /**
+   * The date formatter.
+   *
+   * @var \Drupal\Core\Datetime\DateFormatter
+   */
+  protected $dateFormatter;
+
+  /**
+   * The renderer.
+   *
+   * @var \Drupal\Core\Render\Renderer
+   */
+  protected $renderer;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    $instance = parent::create($container);
+    $instance->dateFormatter = $container->get('date.formatter');
+    $instance->renderer = $container->get('renderer');
+    return $instance;
+  }
+
+  /**
+   * Displays a Description entity revision.
+   *
+   * @param int $description_entity_revision
+   *   The Description entity revision ID.
+   *
+   * @return array
+   *   An array suitable for drupal_render().
+   */
+  public function revisionShow($description_entity_revision) {
+    $description_entity = $this->entityTypeManager()->getStorage('description_entity')
+      ->loadRevision($description_entity_revision);
+    $view_builder = $this->entityTypeManager()->getViewBuilder('description_entity');
+
+    return $view_builder->view($description_entity);
+  }
+
+  /**
+   * Page title callback for a Description entity revision.
+   *
+   * @param int $description_entity_revision
+   *   The Description entity revision ID.
+   *
+   * @return string
+   *   The page title.
+   */
+  public function revisionPageTitle($description_entity_revision) {
+    $description_entity = $this->entityTypeManager()->getStorage('description_entity')
+      ->loadRevision($description_entity_revision);
+    return $this->t('Revision of %title from %date', [
+      '%title' => $description_entity->label(),
+      '%date' => $this->dateFormatter->format($description_entity->getRevisionCreationTime()),
+    ]);
+  }
+
+  /**
+   * Generates an overview table of older revisions of a Description entity.
+   *
+   * @param \Drupal\extended_field_description\Entity\DescriptionEntityInterface $description_entity
+   *   A Description entity object.
+   *
+   * @return array
+   *   An array as expected by drupal_render().
+   */
+  public function revisionOverview(DescriptionEntityInterface $description_entity) {
+    $account = $this->currentUser();
+    $description_entity_storage = $this->entityTypeManager()->getStorage('description_entity');
+
+    $langcode = $description_entity->language()->getId();
+    $langname = $description_entity->language()->getName();
+    $languages = $description_entity->getTranslationLanguages();
+    $has_translations = (count($languages) > 1);
+    $build['#title'] = $has_translations ? $this->t('@langname revisions for %title', ['@langname' => $langname, '%title' => $description_entity->label()]) : $this->t('Revisions for %title', ['%title' => $description_entity->label()]);
+
+    $header = [$this->t('Revision'), $this->t('Operations')];
+    $revert_permission = (($account->hasPermission("revert all description entity revisions") || $account->hasPermission('administer description entity entities')));
+    $delete_permission = (($account->hasPermission("delete all description entity revisions") || $account->hasPermission('administer description entity entities')));
+
+    $rows = [];
+
+    $vids = $description_entity_storage->revisionIds($description_entity);
+
+    $latest_revision = TRUE;
+
+    foreach (array_reverse($vids) as $vid) {
+      /** @var \Drupal\extended_field_description\DescriptionEntityInterface $revision */
+      $revision = $description_entity_storage->loadRevision($vid);
+      // Only show revisions that are affected by the language that is being
+      // displayed.
+      if ($revision->hasTranslation($langcode) && $revision->getTranslation($langcode)->isRevisionTranslationAffected()) {
+        $username = [
+          '#theme' => 'username',
+          '#account' => $revision->getRevisionUser(),
+        ];
+
+        // Use revision link to link to revisions that are not active.
+        $date = $this->dateFormatter->format($revision->getRevisionCreationTime(), 'short');
+        if ($vid != $description_entity->getRevisionId()) {
+          $link = $this->l($date, new Url('entity.description_entity.revision', [
+            'description_entity' => $description_entity->id(),
+            'description_entity_revision' => $vid,
+          ]));
+        }
+        else {
+          $link = $description_entity->link($date);
+        }
+
+        $row = [];
+        $column = [
+          'data' => [
+            '#type' => 'inline_template',
+            '#template' => '{% trans %}{{ date }} by {{ username }}{% endtrans %}{% if message %}<p class="revision-log">{{ message }}</p>{% endif %}',
+            '#context' => [
+              'date' => $link,
+              'username' => $this->renderer->renderPlain($username),
+              'message' => [
+                '#markup' => $revision->getRevisionLogMessage(),
+                '#allowed_tags' => Xss::getHtmlTagList(),
+              ],
+            ],
+          ],
+        ];
+        $row[] = $column;
+
+        if ($latest_revision) {
+          $row[] = [
+            'data' => [
+              '#prefix' => '<em>',
+              '#markup' => $this->t('Current revision'),
+              '#suffix' => '</em>',
+            ],
+          ];
+          foreach ($row as &$current) {
+            $current['class'] = ['revision-current'];
+          }
+          $latest_revision = FALSE;
+        }
+        else {
+          $links = [];
+          if ($revert_permission) {
+            $links['revert'] = [
+              'title' => $this->t('Revert'),
+              'url' => $has_translations ?
+              Url::fromRoute('entity.description_entity.translation_revert', [
+                'description_entity' => $description_entity->id(),
+                'description_entity_revision' => $vid,
+                'langcode' => $langcode,
+              ]) :
+              Url::fromRoute('entity.description_entity.revision_revert', [
+                'description_entity' => $description_entity->id(),
+                'description_entity_revision' => $vid,
+              ]),
+            ];
+          }
+
+          if ($delete_permission) {
+            $links['delete'] = [
+              'title' => $this->t('Delete'),
+              'url' => Url::fromRoute('entity.description_entity.revision_delete', [
+                'description_entity' => $description_entity->id(),
+                'description_entity_revision' => $vid,
+              ]),
+            ];
+          }
+
+          $row[] = [
+            'data' => [
+              '#type' => 'operations',
+              '#links' => $links,
+            ],
+          ];
+        }
+
+        $rows[] = $row;
+      }
+    }
+
+    $build['description_entity_revisions_table'] = [
+      '#theme' => 'table',
+      '#rows' => $rows,
+      '#header' => $header,
+    ];
+
+    return $build;
+  }
+
+}
diff --git a/html/modules/custom/extended_field_description/src/DescriptionEntityAccessControlHandler.php b/html/modules/custom/extended_field_description/src/DescriptionEntityAccessControlHandler.php
new file mode 100644
index 000000000..9135c8857
--- /dev/null
+++ b/html/modules/custom/extended_field_description/src/DescriptionEntityAccessControlHandler.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Drupal\extended_field_description;
+
+use Drupal\Core\Entity\EntityAccessControlHandler;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Access\AccessResult;
+
+/**
+ * Access controller for the Description entity entity.
+ *
+ * @see \Drupal\extended_field_description\Entity\DescriptionEntity.
+ */
+class DescriptionEntityAccessControlHandler extends EntityAccessControlHandler {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
+    /** @var \Drupal\extended_field_description\Entity\DescriptionEntityInterface $entity */
+
+    switch ($operation) {
+
+      case 'view':
+
+        if (!$entity->isPublished()) {
+          return AccessResult::allowedIfHasPermission($account, 'view unpublished description entity entities');
+        }
+
+
+        return AccessResult::allowedIfHasPermission($account, 'view published description entity entities');
+
+      case 'update':
+
+        return AccessResult::allowedIfHasPermission($account, 'edit description entity entities');
+
+      case 'delete':
+
+        return AccessResult::allowedIfHasPermission($account, 'delete description entity entities');
+    }
+
+    // Unknown operation, no opinion.
+    return AccessResult::neutral();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function checkCreateAccess(AccountInterface $account, array $context, $entity_bundle = NULL) {
+    return AccessResult::allowedIfHasPermission($account, 'add description entity entities');
+  }
+
+
+}
diff --git a/html/modules/custom/extended_field_description/src/DescriptionEntityHtmlRouteProvider.php b/html/modules/custom/extended_field_description/src/DescriptionEntityHtmlRouteProvider.php
new file mode 100644
index 000000000..7aa801e18
--- /dev/null
+++ b/html/modules/custom/extended_field_description/src/DescriptionEntityHtmlRouteProvider.php
@@ -0,0 +1,196 @@
+<?php
+
+namespace Drupal\extended_field_description;
+
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Entity\Routing\AdminHtmlRouteProvider;
+use Symfony\Component\Routing\Route;
+
+/**
+ * Provides routes for Description entity entities.
+ *
+ * @see \Drupal\Core\Entity\Routing\AdminHtmlRouteProvider
+ * @see \Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider
+ */
+class DescriptionEntityHtmlRouteProvider extends AdminHtmlRouteProvider {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRoutes(EntityTypeInterface $entity_type) {
+    $collection = parent::getRoutes($entity_type);
+
+    $entity_type_id = $entity_type->id();
+
+    if ($history_route = $this->getHistoryRoute($entity_type)) {
+      $collection->add("entity.{$entity_type_id}.version_history", $history_route);
+    }
+
+    if ($revision_route = $this->getRevisionRoute($entity_type)) {
+      $collection->add("entity.{$entity_type_id}.revision", $revision_route);
+    }
+
+    if ($revert_route = $this->getRevisionRevertRoute($entity_type)) {
+      $collection->add("entity.{$entity_type_id}.revision_revert", $revert_route);
+    }
+
+    if ($delete_route = $this->getRevisionDeleteRoute($entity_type)) {
+      $collection->add("entity.{$entity_type_id}.revision_delete", $delete_route);
+    }
+
+    if ($translation_route = $this->getRevisionTranslationRevertRoute($entity_type)) {
+      $collection->add("{$entity_type_id}.revision_revert_translation_confirm", $translation_route);
+    }
+
+    if ($settings_form_route = $this->getSettingsFormRoute($entity_type)) {
+      $collection->add("$entity_type_id.settings", $settings_form_route);
+    }
+
+    return $collection;
+  }
+
+  /**
+   * Gets the version history route.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   *
+   * @return \Symfony\Component\Routing\Route|null
+   *   The generated route, if available.
+   */
+  protected function getHistoryRoute(EntityTypeInterface $entity_type) {
+    if ($entity_type->hasLinkTemplate('version-history')) {
+      $route = new Route($entity_type->getLinkTemplate('version-history'));
+      $route
+        ->setDefaults([
+          '_title' => "{$entity_type->getLabel()} revisions",
+          '_controller' => '\Drupal\extended_field_description\Controller\DescriptionEntityController::revisionOverview',
+        ])
+        ->setRequirement('_permission', 'view all description entity revisions')
+        ->setOption('_admin_route', TRUE);
+
+      return $route;
+    }
+  }
+
+  /**
+   * Gets the revision route.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   *
+   * @return \Symfony\Component\Routing\Route|null
+   *   The generated route, if available.
+   */
+  protected function getRevisionRoute(EntityTypeInterface $entity_type) {
+    if ($entity_type->hasLinkTemplate('revision')) {
+      $route = new Route($entity_type->getLinkTemplate('revision'));
+      $route
+        ->setDefaults([
+          '_controller' => '\Drupal\extended_field_description\Controller\DescriptionEntityController::revisionShow',
+          '_title_callback' => '\Drupal\extended_field_description\Controller\DescriptionEntityController::revisionPageTitle',
+        ])
+        ->setRequirement('_permission', 'view all description entity revisions')
+        ->setOption('_admin_route', TRUE);
+
+      return $route;
+    }
+  }
+
+  /**
+   * Gets the revision revert route.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   *
+   * @return \Symfony\Component\Routing\Route|null
+   *   The generated route, if available.
+   */
+  protected function getRevisionRevertRoute(EntityTypeInterface $entity_type) {
+    if ($entity_type->hasLinkTemplate('revision_revert')) {
+      $route = new Route($entity_type->getLinkTemplate('revision_revert'));
+      $route
+        ->setDefaults([
+          '_form' => '\Drupal\extended_field_description\Form\DescriptionEntityRevisionRevertForm',
+          '_title' => 'Revert to earlier revision',
+        ])
+        ->setRequirement('_permission', 'revert all description entity revisions')
+        ->setOption('_admin_route', TRUE);
+
+      return $route;
+    }
+  }
+
+  /**
+   * Gets the revision delete route.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   *
+   * @return \Symfony\Component\Routing\Route|null
+   *   The generated route, if available.
+   */
+  protected function getRevisionDeleteRoute(EntityTypeInterface $entity_type) {
+    if ($entity_type->hasLinkTemplate('revision_delete')) {
+      $route = new Route($entity_type->getLinkTemplate('revision_delete'));
+      $route
+        ->setDefaults([
+          '_form' => '\Drupal\extended_field_description\Form\DescriptionEntityRevisionDeleteForm',
+          '_title' => 'Delete earlier revision',
+        ])
+        ->setRequirement('_permission', 'delete all description entity revisions')
+        ->setOption('_admin_route', TRUE);
+
+      return $route;
+    }
+  }
+
+  /**
+   * Gets the revision translation revert route.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   *
+   * @return \Symfony\Component\Routing\Route|null
+   *   The generated route, if available.
+   */
+  protected function getRevisionTranslationRevertRoute(EntityTypeInterface $entity_type) {
+    if ($entity_type->hasLinkTemplate('translation_revert')) {
+      $route = new Route($entity_type->getLinkTemplate('translation_revert'));
+      $route
+        ->setDefaults([
+          '_form' => '\Drupal\extended_field_description\Form\DescriptionEntityRevisionRevertTranslationForm',
+          '_title' => 'Revert to earlier revision of a translation',
+        ])
+        ->setRequirement('_permission', 'revert all description entity revisions')
+        ->setOption('_admin_route', TRUE);
+
+      return $route;
+    }
+  }
+
+  /**
+   * Gets the settings form route.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   *
+   * @return \Symfony\Component\Routing\Route|null
+   *   The generated route, if available.
+   */
+  protected function getSettingsFormRoute(EntityTypeInterface $entity_type) {
+    if (!$entity_type->getBundleEntityType()) {
+      $route = new Route("/admin/structure/{$entity_type->id()}/settings");
+      $route
+        ->setDefaults([
+          '_form' => 'Drupal\extended_field_description\Form\DescriptionEntitySettingsForm',
+          '_title' => "{$entity_type->getLabel()} settings",
+        ])
+        ->setRequirement('_permission', $entity_type->getAdminPermission())
+        ->setOption('_admin_route', TRUE);
+
+      return $route;
+    }
+  }
+
+}
diff --git a/html/modules/custom/extended_field_description/src/DescriptionEntityListBuilder.php b/html/modules/custom/extended_field_description/src/DescriptionEntityListBuilder.php
new file mode 100644
index 000000000..e87785ad3
--- /dev/null
+++ b/html/modules/custom/extended_field_description/src/DescriptionEntityListBuilder.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Drupal\extended_field_description;
+
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityListBuilder;
+use Drupal\Core\Link;
+
+/**
+ * Defines a class to build a listing of Description entity entities.
+ *
+ * @ingroup extended_field_description
+ */
+class DescriptionEntityListBuilder extends EntityListBuilder {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildHeader() {
+    $header['id'] = $this->t('Description entity ID');
+    $header['name'] = $this->t('Name');
+    return $header + parent::buildHeader();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildRow(EntityInterface $entity) {
+    /* @var \Drupal\extended_field_description\Entity\DescriptionEntity $entity */
+    $row['id'] = $entity->id();
+    $row['name'] = Link::createFromRoute(
+      $entity->label(),
+      'entity.description_entity.edit_form',
+      ['description_entity' => $entity->id()]
+    );
+    return $row + parent::buildRow($entity);
+  }
+
+}
diff --git a/html/modules/custom/extended_field_description/src/DescriptionEntityStorage.php b/html/modules/custom/extended_field_description/src/DescriptionEntityStorage.php
new file mode 100644
index 000000000..6c85f53ad
--- /dev/null
+++ b/html/modules/custom/extended_field_description/src/DescriptionEntityStorage.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Drupal\extended_field_description;
+
+use Drupal\Core\Entity\Sql\SqlContentEntityStorage;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\extended_field_description\Entity\DescriptionEntityInterface;
+
+/**
+ * Defines the storage handler class for Description entity entities.
+ *
+ * This extends the base storage class, adding required special handling for
+ * Description entity entities.
+ *
+ * @ingroup extended_field_description
+ */
+class DescriptionEntityStorage extends SqlContentEntityStorage implements DescriptionEntityStorageInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function revisionIds(DescriptionEntityInterface $entity) {
+    return $this->database->query(
+      'SELECT vid FROM {description_entity_revision} WHERE id=:id ORDER BY vid',
+      [':id' => $entity->id()]
+    )->fetchCol();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function userRevisionIds(AccountInterface $account) {
+    return $this->database->query(
+      'SELECT vid FROM {description_entity_field_revision} WHERE uid = :uid ORDER BY vid',
+      [':uid' => $account->id()]
+    )->fetchCol();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function countDefaultLanguageRevisions(DescriptionEntityInterface $entity) {
+    return $this->database->query('SELECT COUNT(*) FROM {description_entity_field_revision} WHERE id = :id AND default_langcode = 1', [':id' => $entity->id()])
+      ->fetchField();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function clearRevisionsLanguage(LanguageInterface $language) {
+    return $this->database->update('description_entity_revision')
+      ->fields(['langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED])
+      ->condition('langcode', $language->getId())
+      ->execute();
+  }
+
+}
diff --git a/html/modules/custom/extended_field_description/src/DescriptionEntityStorageInterface.php b/html/modules/custom/extended_field_description/src/DescriptionEntityStorageInterface.php
new file mode 100644
index 000000000..9b54aebbf
--- /dev/null
+++ b/html/modules/custom/extended_field_description/src/DescriptionEntityStorageInterface.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Drupal\extended_field_description;
+
+use Drupal\Core\Entity\ContentEntityStorageInterface;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\extended_field_description\Entity\DescriptionEntityInterface;
+
+/**
+ * Defines the storage handler class for Description entity entities.
+ *
+ * This extends the base storage class, adding required special handling for
+ * Description entity entities.
+ *
+ * @ingroup extended_field_description
+ */
+interface DescriptionEntityStorageInterface extends ContentEntityStorageInterface {
+
+  /**
+   * Gets a list of Description entity revision IDs for a specific Description entity.
+   *
+   * @param \Drupal\extended_field_description\Entity\DescriptionEntityInterface $entity
+   *   The Description entity entity.
+   *
+   * @return int[]
+   *   Description entity revision IDs (in ascending order).
+   */
+  public function revisionIds(DescriptionEntityInterface $entity);
+
+  /**
+   * Gets a list of revision IDs having a given user as Description entity author.
+   *
+   * @param \Drupal\Core\Session\AccountInterface $account
+   *   The user entity.
+   *
+   * @return int[]
+   *   Description entity revision IDs (in ascending order).
+   */
+  public function userRevisionIds(AccountInterface $account);
+
+  /**
+   * Counts the number of revisions in the default language.
+   *
+   * @param \Drupal\extended_field_description\Entity\DescriptionEntityInterface $entity
+   *   The Description entity entity.
+   *
+   * @return int
+   *   The number of revisions in the default language.
+   */
+  public function countDefaultLanguageRevisions(DescriptionEntityInterface $entity);
+
+  /**
+   * Unsets the language for all Description entity with the given language.
+   *
+   * @param \Drupal\Core\Language\LanguageInterface $language
+   *   The language object.
+   */
+  public function clearRevisionsLanguage(LanguageInterface $language);
+
+}
diff --git a/html/modules/custom/extended_field_description/src/DescriptionEntityTranslationHandler.php b/html/modules/custom/extended_field_description/src/DescriptionEntityTranslationHandler.php
new file mode 100644
index 000000000..24a4b4e67
--- /dev/null
+++ b/html/modules/custom/extended_field_description/src/DescriptionEntityTranslationHandler.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Drupal\extended_field_description;
+
+use Drupal\content_translation\ContentTranslationHandler;
+
+/**
+ * Defines the translation handler for description_entity.
+ */
+class DescriptionEntityTranslationHandler extends ContentTranslationHandler {
+
+  // Override here the needed methods from ContentTranslationHandler.
+}
diff --git a/html/modules/custom/extended_field_description/src/Entity/DescriptionEntity.php b/html/modules/custom/extended_field_description/src/Entity/DescriptionEntity.php
new file mode 100644
index 000000000..e3a2f5270
--- /dev/null
+++ b/html/modules/custom/extended_field_description/src/Entity/DescriptionEntity.php
@@ -0,0 +1,283 @@
+<?php
+
+namespace Drupal\extended_field_description\Entity;
+
+use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\Core\Entity\EditorialContentEntityBase;
+use Drupal\Core\Entity\RevisionableInterface;
+use Drupal\Core\Entity\EntityChangedTrait;
+use Drupal\Core\Entity\EntityPublishedTrait;
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\user\UserInterface;
+
+/**
+ * Defines the Description entity entity.
+ *
+ * @ingroup extended_field_description
+ *
+ * @ContentEntityType(
+ *   id = "description_entity",
+ *   label = @Translation("Description entity"),
+ *   handlers = {
+ *     "storage" = "Drupal\extended_field_description\DescriptionEntityStorage",
+ *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
+ *     "list_builder" = "Drupal\extended_field_description\DescriptionEntityListBuilder",
+ *     "views_data" = "Drupal\extended_field_description\Entity\DescriptionEntityViewsData",
+ *     "translation" = "Drupal\extended_field_description\DescriptionEntityTranslationHandler",
+ *
+ *     "form" = {
+ *       "default" = "Drupal\extended_field_description\Form\DescriptionEntityForm",
+ *       "add" = "Drupal\extended_field_description\Form\DescriptionEntityForm",
+ *       "edit" = "Drupal\extended_field_description\Form\DescriptionEntityForm",
+ *       "delete" = "Drupal\extended_field_description\Form\DescriptionEntityDeleteForm",
+ *     },
+ *     "route_provider" = {
+ *       "html" = "Drupal\extended_field_description\DescriptionEntityHtmlRouteProvider",
+ *     },
+ *     "access" = "Drupal\extended_field_description\DescriptionEntityAccessControlHandler",
+ *   },
+ *   base_table = "description_entity",
+ *   data_table = "description_entity_field_data",
+ *   revision_table = "description_entity_revision",
+ *   revision_data_table = "description_entity_field_revision",
+ *   translatable = TRUE,
+ *   admin_permission = "administer description entity entities",
+ *   entity_keys = {
+ *     "id" = "id",
+ *     "revision" = "vid",
+ *     "label" = "name",
+ *     "uuid" = "uuid",
+ *     "uid" = "user_id",
+ *     "langcode" = "langcode",
+ *     "published" = "status",
+ *   },
+ *   revision_metadata_keys = {
+ *     "revision_user" = "revision_user",
+ *     "revision_created" = "revision_created",
+ *     "revision_log_message" = "revision_log",
+ *   },
+ *   links = {
+ *     "canonical" = "/admin/structure/description_entity/{description_entity}",
+ *     "add-form" = "/admin/structure/description_entity/add",
+ *     "edit-form" = "/admin/structure/description_entity/{description_entity}/edit",
+ *     "delete-form" = "/admin/structure/description_entity/{description_entity}/delete",
+ *     "version-history" = "/admin/structure/description_entity/{description_entity}/revisions",
+ *     "revision" = "/admin/structure/description_entity/{description_entity}/revisions/{description_entity_revision}/view",
+ *     "revision_revert" = "/admin/structure/description_entity/{description_entity}/revisions/{description_entity_revision}/revert",
+ *     "revision_delete" = "/admin/structure/description_entity/{description_entity}/revisions/{description_entity_revision}/delete",
+ *     "translation_revert" = "/admin/structure/description_entity/{description_entity}/revisions/{description_entity_revision}/revert/{langcode}",
+ *     "collection" = "/admin/structure/description_entity",
+ *   },
+ *   field_ui_base_route = "description_entity.settings"
+ * )
+ */
+class DescriptionEntity extends EditorialContentEntityBase implements DescriptionEntityInterface {
+
+  use EntityChangedTrait;
+  use EntityPublishedTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function preCreate(EntityStorageInterface $storage_controller, array &$values) {
+    parent::preCreate($storage_controller, $values);
+    $values += [
+      'user_id' => \Drupal::currentUser()->id(),
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function urlRouteParameters($rel) {
+    $uri_route_parameters = parent::urlRouteParameters($rel);
+
+    if ($rel === 'revision_revert' && $this instanceof RevisionableInterface) {
+      $uri_route_parameters[$this->getEntityTypeId() . '_revision'] = $this->getRevisionId();
+    }
+    elseif ($rel === 'revision_delete' && $this instanceof RevisionableInterface) {
+      $uri_route_parameters[$this->getEntityTypeId() . '_revision'] = $this->getRevisionId();
+    }
+
+    return $uri_route_parameters;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function preSave(EntityStorageInterface $storage) {
+    parent::preSave($storage);
+
+    foreach (array_keys($this->getTranslationLanguages()) as $langcode) {
+      $translation = $this->getTranslation($langcode);
+
+      // If no owner has been set explicitly, make the anonymous user the owner.
+      if (!$translation->getOwner()) {
+        $translation->setOwnerId(0);
+      }
+    }
+
+    // If no revision author has been set explicitly,
+    // make the description_entity owner the revision author.
+    if (!$this->getRevisionUser()) {
+      $this->setRevisionUserId($this->getOwnerId());
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getName() {
+    return $this->get('name')->value;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setName($name) {
+    $this->set('name', $name);
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCreatedTime() {
+    return $this->get('created')->value;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setCreatedTime($timestamp) {
+    $this->set('created', $timestamp);
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getOwner() {
+    return $this->get('user_id')->entity;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getOwnerId() {
+    return $this->get('user_id')->target_id;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setOwnerId($uid) {
+    $this->set('user_id', $uid);
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setOwner(UserInterface $account) {
+    $this->set('user_id', $account->id());
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
+    $fields = parent::baseFieldDefinitions($entity_type);
+
+    // Add the published field.
+    $fields += static::publishedBaseFieldDefinitions($entity_type);
+
+    $fields['user_id'] = BaseFieldDefinition::create('entity_reference')
+      ->setLabel(t('Authored by'))
+      ->setDescription(t('The user ID of author of the Description entity entity.'))
+      ->setRevisionable(TRUE)
+      ->setSetting('target_type', 'user')
+      ->setSetting('handler', 'default')
+      ->setTranslatable(TRUE)
+      ->setDisplayOptions('view', [
+        'label' => 'hidden',
+        'type' => 'author',
+        'weight' => 0,
+      ])
+      ->setDisplayOptions('form', [
+        'type' => 'entity_reference_autocomplete',
+        'weight' => 5,
+        'settings' => [
+          'match_operator' => 'CONTAINS',
+          'size' => '60',
+          'autocomplete_type' => 'tags',
+          'placeholder' => '',
+        ],
+      ])
+      ->setDisplayConfigurable('form', TRUE)
+      ->setDisplayConfigurable('view', TRUE);
+
+    $fields['name'] = BaseFieldDefinition::create('string')
+      ->setLabel(t('Name'))
+      ->setDescription(t('The name of the Description entity entity.'))
+      ->setRevisionable(TRUE)
+      ->setSettings([
+        'max_length' => 50,
+        'text_processing' => 0,
+      ])
+      ->setDefaultValue('')
+      ->setDisplayOptions('view', [
+        'label' => 'above',
+        'type' => 'string',
+        'weight' => -4,
+      ])
+      ->setDisplayOptions('form', [
+        'type' => 'string_textfield',
+        'weight' => -4,
+      ])
+      ->setDisplayConfigurable('form', TRUE)
+      ->setDisplayConfigurable('view', TRUE)
+      ->setRequired(TRUE);
+
+    $fields['status']->setDescription(t('A boolean indicating whether the Description entity is published.'))
+      ->setDisplayOptions('form', [
+        'type' => 'boolean_checkbox',
+        'weight' => -3,
+      ]);
+
+    $fields['created'] = BaseFieldDefinition::create('created')
+      ->setLabel(t('Created'))
+      ->setDescription(t('The time that the entity was created.'));
+
+    $fields['changed'] = BaseFieldDefinition::create('changed')
+      ->setLabel(t('Changed'))
+      ->setDescription(t('The time that the entity was last edited.'));
+
+    $fields['revision_translation_affected'] = BaseFieldDefinition::create('boolean')
+      ->setLabel(t('Revision translation affected'))
+      ->setDescription(t('Indicates if the last edit of a translation belongs to current revision.'))
+      ->setReadOnly(TRUE)
+      ->setRevisionable(TRUE)
+      ->setTranslatable(TRUE);
+
+    return $fields;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function loadByEntity($entity) {
+    $entity_type_repository = \Drupal::service('entity_type.repository');
+    $entity_type_manager = \Drupal::entityTypeManager();
+    $storage = $entity_type_manager->getStorage($entity_type_repository->getEntityTypeFromClass(static::class));
+
+    $query = $storage->getQuery();
+    $query->condition('field_field', $entity . '.', 'STARTS_WITH');
+
+    $result = $query->execute();
+    return $result ? $storage->loadMultiple($result) : [];
+  }
+
+}
diff --git a/html/modules/custom/extended_field_description/src/Entity/DescriptionEntityInterface.php b/html/modules/custom/extended_field_description/src/Entity/DescriptionEntityInterface.php
new file mode 100644
index 000000000..75cf536e4
--- /dev/null
+++ b/html/modules/custom/extended_field_description/src/Entity/DescriptionEntityInterface.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace Drupal\extended_field_description\Entity;
+
+use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\Core\Entity\RevisionLogInterface;
+use Drupal\Core\Entity\EntityChangedInterface;
+use Drupal\Core\Entity\EntityPublishedInterface;
+use Drupal\user\EntityOwnerInterface;
+
+/**
+ * Provides an interface for defining Description entity entities.
+ *
+ * @ingroup extended_field_description
+ */
+interface DescriptionEntityInterface extends ContentEntityInterface, RevisionLogInterface, EntityChangedInterface, EntityPublishedInterface, EntityOwnerInterface {
+
+  /**
+   * Add get/set methods for your configuration properties here.
+   */
+
+  /**
+   * Gets the Description entity name.
+   *
+   * @return string
+   *   Name of the Description entity.
+   */
+  public function getName();
+
+  /**
+   * Sets the Description entity name.
+   *
+   * @param string $name
+   *   The Description entity name.
+   *
+   * @return \Drupal\extended_field_description\Entity\DescriptionEntityInterface
+   *   The called Description entity entity.
+   */
+  public function setName($name);
+
+  /**
+   * Gets the Description entity creation timestamp.
+   *
+   * @return int
+   *   Creation timestamp of the Description entity.
+   */
+  public function getCreatedTime();
+
+  /**
+   * Sets the Description entity creation timestamp.
+   *
+   * @param int $timestamp
+   *   The Description entity creation timestamp.
+   *
+   * @return \Drupal\extended_field_description\Entity\DescriptionEntityInterface
+   *   The called Description entity entity.
+   */
+  public function setCreatedTime($timestamp);
+
+  /**
+   * Gets the Description entity revision creation timestamp.
+   *
+   * @return int
+   *   The UNIX timestamp of when this revision was created.
+   */
+  public function getRevisionCreationTime();
+
+  /**
+   * Sets the Description entity revision creation timestamp.
+   *
+   * @param int $timestamp
+   *   The UNIX timestamp of when this revision was created.
+   *
+   * @return \Drupal\extended_field_description\Entity\DescriptionEntityInterface
+   *   The called Description entity entity.
+   */
+  public function setRevisionCreationTime($timestamp);
+
+  /**
+   * Gets the Description entity revision author.
+   *
+   * @return \Drupal\user\UserInterface
+   *   The user entity for the revision author.
+   */
+  public function getRevisionUser();
+
+  /**
+   * Sets the Description entity revision author.
+   *
+   * @param int $uid
+   *   The user ID of the revision author.
+   *
+   * @return \Drupal\extended_field_description\Entity\DescriptionEntityInterface
+   *   The called Description entity entity.
+   */
+  public function setRevisionUserId($uid);
+
+}
diff --git a/html/modules/custom/extended_field_description/src/Entity/DescriptionEntityViewsData.php b/html/modules/custom/extended_field_description/src/Entity/DescriptionEntityViewsData.php
new file mode 100644
index 000000000..dcfa004c6
--- /dev/null
+++ b/html/modules/custom/extended_field_description/src/Entity/DescriptionEntityViewsData.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Drupal\extended_field_description\Entity;
+
+use Drupal\views\EntityViewsData;
+
+/**
+ * Provides Views data for Description entity entities.
+ */
+class DescriptionEntityViewsData extends EntityViewsData {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getViewsData() {
+    $data = parent::getViewsData();
+
+    // Additional information for Views integration, such as table joins, can be
+    // put here.
+    return $data;
+  }
+
+}
diff --git a/html/modules/custom/extended_field_description/src/Form/DescriptionEntityDeleteForm.php b/html/modules/custom/extended_field_description/src/Form/DescriptionEntityDeleteForm.php
new file mode 100644
index 000000000..e45b7bf17
--- /dev/null
+++ b/html/modules/custom/extended_field_description/src/Form/DescriptionEntityDeleteForm.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Drupal\extended_field_description\Form;
+
+use Drupal\Core\Entity\ContentEntityDeleteForm;
+
+/**
+ * Provides a form for deleting Description entity entities.
+ *
+ * @ingroup extended_field_description
+ */
+class DescriptionEntityDeleteForm extends ContentEntityDeleteForm {
+
+
+}
diff --git a/html/modules/custom/extended_field_description/src/Form/DescriptionEntityForm.php b/html/modules/custom/extended_field_description/src/Form/DescriptionEntityForm.php
new file mode 100644
index 000000000..176a90dd3
--- /dev/null
+++ b/html/modules/custom/extended_field_description/src/Form/DescriptionEntityForm.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace Drupal\extended_field_description\Form;
+
+use Drupal\Core\Entity\ContentEntityForm;
+use Drupal\Core\Form\FormStateInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Form controller for Description entity edit forms.
+ *
+ * @ingroup extended_field_description
+ */
+class DescriptionEntityForm extends ContentEntityForm {
+
+  /**
+   * The current user account.
+   *
+   * @var \Drupal\Core\Session\AccountProxyInterface
+   */
+  protected $account;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    // Instantiates this form class.
+    $instance = parent::create($container);
+    $instance->account = $container->get('current_user');
+    return $instance;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    /* @var \Drupal\extended_field_description\Entity\DescriptionEntity $entity */
+    $form = parent::buildForm($form, $form_state);
+
+    if (!$this->entity->isNew()) {
+      $form['new_revision'] = [
+        '#type' => 'checkbox',
+        '#title' => $this->t('Create new revision'),
+        '#default_value' => FALSE,
+        '#weight' => 10,
+      ];
+    }
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function save(array $form, FormStateInterface $form_state) {
+    $entity = $this->entity;
+
+    // Save as a new revision if requested to do so.
+    if (!$form_state->isValueEmpty('new_revision') && $form_state->getValue('new_revision') != FALSE) {
+      $entity->setNewRevision();
+
+      // If a new revision is created, save the current user as revision author.
+      $entity->setRevisionCreationTime($this->time->getRequestTime());
+      $entity->setRevisionUserId($this->account->id());
+    }
+    else {
+      $entity->setNewRevision(FALSE);
+    }
+
+    $status = parent::save($form, $form_state);
+
+    switch ($status) {
+      case SAVED_NEW:
+        $this->messenger()->addMessage($this->t('Created the %label Description entity.', [
+          '%label' => $entity->label(),
+        ]));
+        break;
+
+      default:
+        $this->messenger()->addMessage($this->t('Saved the %label Description entity.', [
+          '%label' => $entity->label(),
+        ]));
+    }
+    $form_state->setRedirect('entity.description_entity.canonical', ['description_entity' => $entity->id()]);
+  }
+
+}
diff --git a/html/modules/custom/extended_field_description/src/Form/DescriptionEntityRevisionDeleteForm.php b/html/modules/custom/extended_field_description/src/Form/DescriptionEntityRevisionDeleteForm.php
new file mode 100644
index 000000000..2598e59ec
--- /dev/null
+++ b/html/modules/custom/extended_field_description/src/Form/DescriptionEntityRevisionDeleteForm.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace Drupal\extended_field_description\Form;
+
+use Drupal\Core\Form\ConfirmFormBase;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Url;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides a form for deleting a Description entity revision.
+ *
+ * @ingroup extended_field_description
+ */
+class DescriptionEntityRevisionDeleteForm extends ConfirmFormBase {
+
+  /**
+   * The Description entity revision.
+   *
+   * @var \Drupal\extended_field_description\Entity\DescriptionEntityInterface
+   */
+  protected $revision;
+
+  /**
+   * The Description entity storage.
+   *
+   * @var \Drupal\Core\Entity\EntityStorageInterface
+   */
+  protected $descriptionEntityStorage;
+
+  /**
+   * The database connection.
+   *
+   * @var \Drupal\Core\Database\Connection
+   */
+  protected $connection;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    $instance = parent::create($container);
+    $instance->descriptionEntityStorage = $container->get('entity_type.manager')->getStorage('description_entity');
+    $instance->connection = $container->get('database');
+    return $instance;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'description_entity_revision_delete_confirm';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getQuestion() {
+    return $this->t('Are you sure you want to delete the revision from %revision-date?', [
+      '%revision-date' => format_date($this->revision->getRevisionCreationTime()),
+    ]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCancelUrl() {
+    return new Url('entity.description_entity.version_history', ['description_entity' => $this->revision->id()]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getConfirmText() {
+    return $this->t('Delete');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state, $description_entity_revision = NULL) {
+    $this->revision = $this->DescriptionEntityStorage->loadRevision($description_entity_revision);
+    $form = parent::buildForm($form, $form_state);
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    $this->DescriptionEntityStorage->deleteRevision($this->revision->getRevisionId());
+
+    $this->logger('content')->notice('Description entity: deleted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
+    $this->messenger()->addMessage(t('Revision from %revision-date of Description entity %title has been deleted.', ['%revision-date' => format_date($this->revision->getRevisionCreationTime()), '%title' => $this->revision->label()]));
+    $form_state->setRedirect(
+      'entity.description_entity.canonical',
+       ['description_entity' => $this->revision->id()]
+    );
+    if ($this->connection->query('SELECT COUNT(DISTINCT vid) FROM {description_entity_field_revision} WHERE id = :id', [':id' => $this->revision->id()])->fetchField() > 1) {
+      $form_state->setRedirect(
+        'entity.description_entity.version_history',
+         ['description_entity' => $this->revision->id()]
+      );
+    }
+  }
+
+}
diff --git a/html/modules/custom/extended_field_description/src/Form/DescriptionEntityRevisionRevertForm.php b/html/modules/custom/extended_field_description/src/Form/DescriptionEntityRevisionRevertForm.php
new file mode 100644
index 000000000..3bc53c94d
--- /dev/null
+++ b/html/modules/custom/extended_field_description/src/Form/DescriptionEntityRevisionRevertForm.php
@@ -0,0 +1,137 @@
+<?php
+
+namespace Drupal\extended_field_description\Form;
+
+use Drupal\Core\Form\ConfirmFormBase;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Url;
+use Drupal\extended_field_description\Entity\DescriptionEntityInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides a form for reverting a Description entity revision.
+ *
+ * @ingroup extended_field_description
+ */
+class DescriptionEntityRevisionRevertForm extends ConfirmFormBase {
+
+  /**
+   * The Description entity revision.
+   *
+   * @var \Drupal\extended_field_description\Entity\DescriptionEntityInterface
+   */
+  protected $revision;
+
+  /**
+   * The Description entity storage.
+   *
+   * @var \Drupal\Core\Entity\EntityStorageInterface
+   */
+  protected $descriptionEntityStorage;
+
+  /**
+   * The date formatter service.
+   *
+   * @var \Drupal\Core\Datetime\DateFormatterInterface
+   */
+  protected $dateFormatter;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    $instance = parent::create($container);
+    $instance->descriptionEntityStorage = $container->get('entity_type.manager')->getStorage('description_entity');
+    $instance->dateFormatter = $container->get('date.formatter');
+    return $instance;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'description_entity_revision_revert_confirm';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getQuestion() {
+    return $this->t('Are you sure you want to revert to the revision from %revision-date?', [
+      '%revision-date' => $this->dateFormatter->format($this->revision->getRevisionCreationTime()),
+    ]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCancelUrl() {
+    return new Url('entity.description_entity.version_history', ['description_entity' => $this->revision->id()]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getConfirmText() {
+    return $this->t('Revert');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDescription() {
+    return '';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state, $description_entity_revision = NULL) {
+    $this->revision = $this->DescriptionEntityStorage->loadRevision($description_entity_revision);
+    $form = parent::buildForm($form, $form_state);
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    // The revision timestamp will be updated when the revision is saved. Keep
+    // the original one for the confirmation message.
+    $original_revision_timestamp = $this->revision->getRevisionCreationTime();
+
+    $this->revision = $this->prepareRevertedRevision($this->revision, $form_state);
+    $this->revision->revision_log = $this->t('Copy of the revision from %date.', [
+      '%date' => $this->dateFormatter->format($original_revision_timestamp),
+    ]);
+    $this->revision->save();
+
+    $this->logger('content')->notice('Description entity: reverted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
+    $this->messenger()->addMessage(t('Description entity %title has been reverted to the revision from %revision-date.', ['%title' => $this->revision->label(), '%revision-date' => $this->dateFormatter->format($original_revision_timestamp)]));
+    $form_state->setRedirect(
+      'entity.description_entity.version_history',
+      ['description_entity' => $this->revision->id()]
+    );
+  }
+
+  /**
+   * Prepares a revision to be reverted.
+   *
+   * @param \Drupal\extended_field_description\Entity\DescriptionEntityInterface $revision
+   *   The revision to be reverted.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   *
+   * @return \Drupal\extended_field_description\Entity\DescriptionEntityInterface
+   *   The prepared revision ready to be stored.
+   */
+  protected function prepareRevertedRevision(DescriptionEntityInterface $revision, FormStateInterface $form_state) {
+    $revision->setNewRevision();
+    $revision->isDefaultRevision(TRUE);
+    $revision->setRevisionCreationTime(REQUEST_TIME);
+
+    return $revision;
+  }
+
+}
diff --git a/html/modules/custom/extended_field_description/src/Form/DescriptionEntityRevisionRevertTranslationForm.php b/html/modules/custom/extended_field_description/src/Form/DescriptionEntityRevisionRevertTranslationForm.php
new file mode 100644
index 000000000..e9f7884d9
--- /dev/null
+++ b/html/modules/custom/extended_field_description/src/Form/DescriptionEntityRevisionRevertTranslationForm.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Drupal\extended_field_description\Form;
+
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\extended_field_description\Entity\DescriptionEntityInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides a form for reverting a Description entity revision for a single trans.
+ *
+ * @ingroup extended_field_description
+ */
+class DescriptionEntityRevisionRevertTranslationForm extends DescriptionEntityRevisionRevertForm {
+
+  /**
+   * The language to be reverted.
+   *
+   * @var string
+   */
+  protected $langcode;
+
+  /**
+   * The language manager.
+   *
+   * @var \Drupal\Core\Language\LanguageManagerInterface
+   */
+  protected $languageManager;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    $instance = parent::create($container);
+    $instance->languageManager = $container->get('language_manager');
+    return $instance;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'description_entity_revision_revert_translation_confirm';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getQuestion() {
+    return $this->t('Are you sure you want to revert @language translation to the revision from %revision-date?', [
+      '@language' => $this->languageManager->getLanguageName($this->langcode),
+      '%revision-date' => $this->dateFormatter->format($this->revision->getRevisionCreationTime()),
+    ]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state, $description_entity_revision = NULL, $langcode = NULL) {
+    $this->langcode = $langcode;
+    $form = parent::buildForm($form, $form_state, $description_entity_revision);
+
+    $form['revert_untranslated_fields'] = [
+      '#type' => 'checkbox',
+      '#title' => $this->t('Revert content shared among translations'),
+      '#default_value' => FALSE,
+    ];
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function prepareRevertedRevision(DescriptionEntityInterface $revision, FormStateInterface $form_state) {
+    $revert_untranslated_fields = $form_state->getValue('revert_untranslated_fields');
+
+    /** @var \Drupal\extended_field_description\Entity\DescriptionEntityInterface $default_revision */
+    $latest_revision = $this->DescriptionEntityStorage->load($revision->id());
+    $latest_revision_translation = $latest_revision->getTranslation($this->langcode);
+
+    $revision_translation = $revision->getTranslation($this->langcode);
+
+    foreach ($latest_revision_translation->getFieldDefinitions() as $field_name => $definition) {
+      if ($definition->isTranslatable() || $revert_untranslated_fields) {
+        $latest_revision_translation->set($field_name, $revision_translation->get($field_name)->getValue());
+      }
+    }
+
+    $latest_revision_translation->setNewRevision();
+    $latest_revision_translation->isDefaultRevision(TRUE);
+    $revision->setRevisionCreationTime(REQUEST_TIME);
+
+    return $latest_revision_translation;
+  }
+
+}
diff --git a/html/modules/custom/extended_field_description/src/Form/DescriptionEntitySettingsForm.php b/html/modules/custom/extended_field_description/src/Form/DescriptionEntitySettingsForm.php
new file mode 100644
index 000000000..aca986e47
--- /dev/null
+++ b/html/modules/custom/extended_field_description/src/Form/DescriptionEntitySettingsForm.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace Drupal\extended_field_description\Form;
+
+use Drupal\Core\Form\FormBase;
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Class DescriptionEntitySettingsForm.
+ *
+ * @ingroup extended_field_description
+ */
+class DescriptionEntitySettingsForm extends FormBase {
+
+  /**
+   * Returns a unique string identifying the form.
+   *
+   * @return string
+   *   The unique string identifying the form.
+   */
+  public function getFormId() {
+    return 'descriptionentity_settings';
+  }
+
+  /**
+   * Form submission handler.
+   *
+   * @param array $form
+   *   An associative array containing the structure of the form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    // Empty implementation of the abstract submit class.
+  }
+
+  /**
+   * Defines the settings form for Description entity entities.
+   *
+   * @param array $form
+   *   An associative array containing the structure of the form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   *
+   * @return array
+   *   Form definition array.
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    $form['descriptionentity_settings']['#markup'] = 'Settings form for Description entity entities. Manage field settings here.';
+    return $form;
+  }
+
+}
diff --git a/html/modules/custom/extended_field_description/templates/description_entity.html.twig b/html/modules/custom/extended_field_description/templates/description_entity.html.twig
new file mode 100644
index 000000000..945050625
--- /dev/null
+++ b/html/modules/custom/extended_field_description/templates/description_entity.html.twig
@@ -0,0 +1,22 @@
+{#
+/**
+ * @file description_entity.html.twig
+ * Default theme implementation to present Description entity data.
+ *
+ * This template is used when viewing Description entity pages.
+ *
+ *
+ * Available variables:
+ * - content: A list of content items. Use 'content' to print all content, or
+ * - attributes: HTML attributes for the container element.
+ *
+ * @see template_preprocess_description_entity()
+ *
+ * @ingroup themeable
+ */
+#}
+<div{{ attributes.addClass('description_entity') }}>
+  {% if content %}
+    {{- content -}}
+  {% endif %}
+</div>
diff --git a/html/modules/custom/extended_field_description/templates/extended-field-description.html.twig b/html/modules/custom/extended_field_description/templates/extended-field-description.html.twig
new file mode 100644
index 000000000..95722bd34
--- /dev/null
+++ b/html/modules/custom/extended_field_description/templates/extended-field-description.html.twig
@@ -0,0 +1 @@
+<!-- Add you custom twig html here -->

From 3b5ae8a99420404f5d381bf1e2cc23fc271322cf Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Thu, 18 Nov 2021 19:32:12 +0100
Subject: [PATCH 117/720] Basic config

---
 ...tion_entity.description_entity.default.yml | 79 +++++++++++++++++++
 ...tion_entity.description_entity.default.yml | 52 ++++++++++++
 config/core.extension.yml                     |  1 +
 ...y.description_entity.field_description.yml | 28 +++++++
 ..._entity.description_entity.field_field.yml | 24 ++++++
 ...entity.description_entity.field_images.yml | 38 +++++++++
 ..._entity.description_entity.field_title.yml | 20 +++++
 ...e.description_entity.field_description.yml | 19 +++++
 ...storage.description_entity.field_field.yml | 19 +++++
 ...torage.description_entity.field_images.yml | 30 +++++++
 ...storage.description_entity.field_title.yml | 21 +++++
 11 files changed, 331 insertions(+)
 create mode 100644 config/core.entity_form_display.description_entity.description_entity.default.yml
 create mode 100644 config/core.entity_view_display.description_entity.description_entity.default.yml
 create mode 100644 config/field.field.description_entity.description_entity.field_description.yml
 create mode 100644 config/field.field.description_entity.description_entity.field_field.yml
 create mode 100644 config/field.field.description_entity.description_entity.field_images.yml
 create mode 100644 config/field.field.description_entity.description_entity.field_title.yml
 create mode 100644 config/field.storage.description_entity.field_description.yml
 create mode 100644 config/field.storage.description_entity.field_field.yml
 create mode 100644 config/field.storage.description_entity.field_images.yml
 create mode 100644 config/field.storage.description_entity.field_title.yml

diff --git a/config/core.entity_form_display.description_entity.description_entity.default.yml b/config/core.entity_form_display.description_entity.description_entity.default.yml
new file mode 100644
index 000000000..b1a84ecf1
--- /dev/null
+++ b/config/core.entity_form_display.description_entity.description_entity.default.yml
@@ -0,0 +1,79 @@
+uuid: a9a2ce9a-7a0f-4fe2-82a1-8e7b45cea0ad
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.description_entity.description_entity.field_description
+    - field.field.description_entity.description_entity.field_field
+    - field.field.description_entity.description_entity.field_images
+    - field.field.description_entity.description_entity.field_title
+    - image.style.thumbnail
+  module:
+    - extended_field_description
+    - svg_image
+    - text
+id: description_entity.description_entity.default
+targetEntityType: description_entity
+bundle: description_entity
+mode: default
+content:
+  field_description:
+    weight: 3
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+    type: text_textarea
+    region: content
+  field_field:
+    weight: 1
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+    type: entity_reference_autocomplete
+    region: content
+  field_images:
+    weight: 4
+    settings:
+      progress_indicator: throbber
+      preview_image_style: thumbnail
+    third_party_settings: {  }
+    type: image_image
+    region: content
+  field_title:
+    weight: 2
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+    type: string_textfield
+    region: content
+  langcode:
+    type: language_select
+    weight: 5
+    region: content
+    settings:
+      include_locked: true
+    third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: 0
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  user_id:
+    type: entity_reference_autocomplete
+    weight: 6
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+hidden: {  }
diff --git a/config/core.entity_view_display.description_entity.description_entity.default.yml b/config/core.entity_view_display.description_entity.description_entity.default.yml
new file mode 100644
index 000000000..bae5aa75d
--- /dev/null
+++ b/config/core.entity_view_display.description_entity.description_entity.default.yml
@@ -0,0 +1,52 @@
+uuid: 92c05009-9be6-4ead-91f6-d86be83b7a33
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.description_entity.description_entity.field_description
+    - field.field.description_entity.description_entity.field_field
+    - field.field.description_entity.description_entity.field_images
+    - field.field.description_entity.description_entity.field_title
+    - image.style.media_library
+  module:
+    - extended_field_description
+    - svg_image
+    - text
+id: description_entity.description_entity.default
+targetEntityType: description_entity
+bundle: description_entity
+mode: default
+content:
+  field_description:
+    weight: 1
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    type: text_default
+    region: content
+  field_images:
+    weight: 2
+    label: hidden
+    settings:
+      image_style: media_library
+      image_link: ''
+      svg_render_as_image: true
+      svg_attributes:
+        width: null
+        height: null
+    third_party_settings: {  }
+    type: image
+    region: content
+  field_title:
+    weight: 0
+    label: hidden
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    type: string
+    region: content
+hidden:
+  field_field: true
+  langcode: true
+  name: true
+  user_id: true
diff --git a/config/core.extension.yml b/config/core.extension.yml
index 096897803..a71cf55c5 100644
--- a/config/core.extension.yml
+++ b/config/core.extension.yml
@@ -13,6 +13,7 @@ module:
   datetime: 0
   datetime_range: 0
   dynamic_page_cache: 0
+  extended_field_description: 0
   field: 0
   field_ui: 0
   file: 0
diff --git a/config/field.field.description_entity.description_entity.field_description.yml b/config/field.field.description_entity.description_entity.field_description.yml
new file mode 100644
index 000000000..b33c57f71
--- /dev/null
+++ b/config/field.field.description_entity.description_entity.field_description.yml
@@ -0,0 +1,28 @@
+uuid: 6c16d4f1-b591-45b6-b16a-5613a947132c
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.description_entity.field_description
+  module:
+    - allowed_formats
+    - extended_field_description
+    - text
+third_party_settings:
+  allowed_formats:
+    markdown: markdown
+    plain_text: '0'
+    html: '0'
+    token_markdown: '0'
+id: description_entity.description_entity.field_description
+field_name: field_description
+entity_type: description_entity
+bundle: description_entity
+label: Description
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: text_long
diff --git a/config/field.field.description_entity.description_entity.field_field.yml b/config/field.field.description_entity.description_entity.field_field.yml
new file mode 100644
index 000000000..f443666ff
--- /dev/null
+++ b/config/field.field.description_entity.description_entity.field_field.yml
@@ -0,0 +1,24 @@
+uuid: 92dd1b58-84bc-412f-bdd4-3e5edba1b294
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.description_entity.field_field
+  module:
+    - extended_field_description
+id: description_entity.description_entity.field_field
+field_name: field_field
+entity_type: description_entity
+bundle: description_entity
+label: Field
+description: 'Field to attach description to'
+required: true
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:field_config'
+  handler_settings:
+    target_bundles: null
+    auto_create: false
+field_type: entity_reference
diff --git a/config/field.field.description_entity.description_entity.field_images.yml b/config/field.field.description_entity.description_entity.field_images.yml
new file mode 100644
index 000000000..83355826a
--- /dev/null
+++ b/config/field.field.description_entity.description_entity.field_images.yml
@@ -0,0 +1,38 @@
+uuid: e633e153-9e60-47cd-b40a-1454b587aaa8
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.description_entity.field_images
+  module:
+    - extended_field_description
+    - image
+id: description_entity.description_entity.field_images
+field_name: field_images
+entity_type: description_entity
+bundle: description_entity
+label: Images
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  file_directory: 'descriptions/[date:custom:Y]-[date:custom:m]'
+  file_extensions: 'png gif jpg jpeg'
+  max_filesize: ''
+  max_resolution: ''
+  min_resolution: ''
+  alt_field: true
+  alt_field_required: false
+  title_field: false
+  title_field_required: false
+  default_image:
+    uuid: ''
+    alt: ''
+    title: ''
+    width: null
+    height: null
+  handler: 'default:file'
+  handler_settings: {  }
+field_type: image
diff --git a/config/field.field.description_entity.description_entity.field_title.yml b/config/field.field.description_entity.description_entity.field_title.yml
new file mode 100644
index 000000000..a64e2a8cb
--- /dev/null
+++ b/config/field.field.description_entity.description_entity.field_title.yml
@@ -0,0 +1,20 @@
+uuid: 2c0abcb5-95ab-4bf4-be8d-087bf629eeb7
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.description_entity.field_title
+  module:
+    - extended_field_description
+id: description_entity.description_entity.field_title
+field_name: field_title
+entity_type: description_entity
+bundle: description_entity
+label: Title
+description: ''
+required: true
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string
diff --git a/config/field.storage.description_entity.field_description.yml b/config/field.storage.description_entity.field_description.yml
new file mode 100644
index 000000000..6c80f18b2
--- /dev/null
+++ b/config/field.storage.description_entity.field_description.yml
@@ -0,0 +1,19 @@
+uuid: 3b828c8b-7de3-42a2-9c8f-01e19b60cf63
+langcode: en
+status: true
+dependencies:
+  module:
+    - extended_field_description
+    - text
+id: description_entity.field_description
+field_name: field_description
+entity_type: description_entity
+type: text_long
+settings: {  }
+module: text
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/field.storage.description_entity.field_field.yml b/config/field.storage.description_entity.field_field.yml
new file mode 100644
index 000000000..5b05fa31f
--- /dev/null
+++ b/config/field.storage.description_entity.field_field.yml
@@ -0,0 +1,19 @@
+uuid: e911199b-0b9c-41b1-be92-8a8b9b3c234c
+langcode: en
+status: true
+dependencies:
+  module:
+    - extended_field_description
+id: description_entity.field_field
+field_name: field_field
+entity_type: description_entity
+type: entity_reference
+settings:
+  target_type: field_config
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/field.storage.description_entity.field_images.yml b/config/field.storage.description_entity.field_images.yml
new file mode 100644
index 000000000..071c3f5bf
--- /dev/null
+++ b/config/field.storage.description_entity.field_images.yml
@@ -0,0 +1,30 @@
+uuid: 730513ad-378a-4f3f-a08c-adc68b11dedd
+langcode: en
+status: true
+dependencies:
+  module:
+    - extended_field_description
+    - file
+    - image
+id: description_entity.field_images
+field_name: field_images
+entity_type: description_entity
+type: image
+settings:
+  uri_scheme: public
+  default_image:
+    uuid: ''
+    alt: ''
+    title: ''
+    width: null
+    height: null
+  target_type: file
+  display_field: false
+  display_default: false
+module: image
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/field.storage.description_entity.field_title.yml b/config/field.storage.description_entity.field_title.yml
new file mode 100644
index 000000000..5d7a01136
--- /dev/null
+++ b/config/field.storage.description_entity.field_title.yml
@@ -0,0 +1,21 @@
+uuid: f4328262-1cb7-43dc-ab65-700bcf88d6dd
+langcode: en
+status: true
+dependencies:
+  module:
+    - extended_field_description
+id: description_entity.field_title
+field_name: field_title
+entity_type: description_entity
+type: string
+settings:
+  max_length: 255
+  is_ascii: false
+  case_sensitive: false
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

From 902a0a3fc3a2e6b345175bb7735719649a369dd5 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Fri, 19 Nov 2021 13:00:58 +0100
Subject: [PATCH 118/720] WIP

---
 ...lay.guideline.field_guideline.default.yml} |  38 +++--
 ...lay.guideline.field_guideline.default.yml} |  24 +--
 config/core.extension.yml                     |   2 +-
 ..._entity.description_entity.field_field.yml |  24 ---
 ..._entity.description_entity.field_title.yml |  20 ---
 ...ine.field_guideline.field_description.yml} |  15 +-
 ....guideline.field_guideline.field_field.yml |  21 +++
 ...uideline.field_guideline.field_images.yml} |  14 +-
 ....guideline.field_guideline.field_title.yml |  19 +++
 ...storage.description_entity.field_field.yml |  19 ---
 ...d.storage.guideline.field_description.yml} |   8 +-
 .../field.storage.guideline.field_field.yml   |  21 +++
 ... field.storage.guideline.field_images.yml} |   8 +-
 ...> field.storage.guideline.field_title.yml} |   8 +-
 config/filter.format.guideline.yml            |  33 +++++
 ...delines.guideline_type.field_guideline.yml |   6 +
 config/image.style.guideline_thumbnail.yml    |  16 ++
 config/user.role.webmaster.yml                |   1 +
 .../extended_field_description/composer.json  |  13 --
 .../extended_field_description.info.yml       |   5 -
 ...xtended_field_description.links.action.yml |   5 -
 .../extended_field_description.links.menu.yml |  14 --
 .../extended_field_description.links.task.yml |  26 ----
 .../extended_field_description.module         |  73 ---------
 ...extended_field_description.permissions.yml |  31 ----
 .../DescriptionEntityAccessControlHandler.php |  55 -------
 .../src/DescriptionEntityStorage.php          |  58 --------
 .../src/DescriptionEntityStorageInterface.php |  61 --------
 .../DescriptionEntityTranslationHandler.php   |  13 --
 .../src/Entity/DescriptionEntityInterface.php |  98 -------------
 .../src/Form/DescriptionEntityDeleteForm.php  |  15 --
 html/modules/custom/guidelines/composer.json  |  13 ++
 .../config/schema/guideline_type.schema.yml   |  12 ++
 .../guideline.page.inc}                       |  14 +-
 .../custom/guidelines/guidelines.info.yml     |   5 +
 .../guidelines/guidelines.links.action.yml    |  10 ++
 .../guidelines/guidelines.links.menu.yml      |  17 +++
 .../guidelines/guidelines.links.task.yml      |  22 +++
 .../custom/guidelines/guidelines.module       | 119 +++++++++++++++
 .../guidelines/guidelines.permissions.yml     |  33 +++++
 .../custom/guidelines/guidelines.schema.yml   |  10 ++
 .../src/Controller/GuidelineController.php}   | 100 ++++++-------
 .../src/Entity/Guideline.php}                 |  77 +++++-----
 .../src/Entity/GuidelineInterface.php         |  98 +++++++++++++
 .../guidelines/src/Entity/GuidelineType.php   |  62 ++++++++
 .../src/Entity/GuidelineTypeInterface.php     |  13 ++
 .../src/Entity/GuidelineViewsData.php}        |   6 +-
 .../src/Form/GuidelineDeleteForm.php          |  15 ++
 .../src/Form/GuidelineForm.php}               |  16 +-
 .../src/Form/GuidelineRevisionDeleteForm.php} |  42 +++---
 .../src/Form/GuidelineRevisionRevertForm.php} |  42 +++---
 ...uidelineRevisionRevertTranslationForm.php} |  22 +--
 .../src/Form/GuidelineSettingsForm.php}       |  14 +-
 .../src/Form/GuidelineTypeDeleteForm.php      |  51 +++++++
 .../guidelines/src/Form/GuidelineTypeForm.php |  65 +++++++++
 .../src/GuidelineAccessControlHandler.php     | 116 +++++++++++++++
 .../src/GuidelineHtmlRouteProvider.php}       |  30 ++--
 .../src/GuidelineListBuilder.php}             |  16 +-
 .../guidelines/src/GuidelinePermissions.php   |  80 ++++++++++
 .../guidelines/src/GuidelineStorage.php       |  58 ++++++++
 .../src/GuidelineStorageInterface.php         |  61 ++++++++
 .../src/GuidelineTranslationHandler.php       |  13 ++
 .../src/GuidelineTypeHtmlRouteProvider.php    |  26 ++++
 .../src/GuidelineTypeListBuilder.php          |  32 ++++
 .../GuidelineFieldTargetFormatter.php         |  80 ++++++++++
 .../FieldType/GuidelineFieldTargetType.php    | 103 +++++++++++++
 .../GuidelineFieldTargetWidget.php            | 138 ++++++++++++++++++
 .../guideline-content-add-list.html.twig      |  23 +++
 .../templates/guideline.html.twig}            |  10 +-
 .../templates/guidelines.html.twig}           |   0
 70 files changed, 1651 insertions(+), 777 deletions(-)
 rename config/{core.entity_form_display.description_entity.description_entity.default.yml => core.entity_form_display.guideline.field_guideline.default.yml} (64%)
 rename config/{core.entity_view_display.description_entity.description_entity.default.yml => core.entity_view_display.guideline.field_guideline.default.yml} (56%)
 delete mode 100644 config/field.field.description_entity.description_entity.field_field.yml
 delete mode 100644 config/field.field.description_entity.description_entity.field_title.yml
 rename config/{field.field.description_entity.description_entity.field_description.yml => field.field.guideline.field_guideline.field_description.yml} (57%)
 create mode 100644 config/field.field.guideline.field_guideline.field_field.yml
 rename config/{field.field.description_entity.description_entity.field_images.yml => field.field.guideline.field_guideline.field_images.yml} (65%)
 create mode 100644 config/field.field.guideline.field_guideline.field_title.yml
 delete mode 100644 config/field.storage.description_entity.field_field.yml
 rename config/{field.storage.description_entity.field_description.yml => field.storage.guideline.field_description.yml} (62%)
 create mode 100644 config/field.storage.guideline.field_field.yml
 rename config/{field.storage.description_entity.field_images.yml => field.storage.guideline.field_images.yml} (74%)
 rename config/{field.storage.description_entity.field_title.yml => field.storage.guideline.field_title.yml} (66%)
 create mode 100644 config/filter.format.guideline.yml
 create mode 100644 config/guidelines.guideline_type.field_guideline.yml
 create mode 100644 config/image.style.guideline_thumbnail.yml
 delete mode 100644 html/modules/custom/extended_field_description/composer.json
 delete mode 100644 html/modules/custom/extended_field_description/extended_field_description.info.yml
 delete mode 100644 html/modules/custom/extended_field_description/extended_field_description.links.action.yml
 delete mode 100644 html/modules/custom/extended_field_description/extended_field_description.links.menu.yml
 delete mode 100644 html/modules/custom/extended_field_description/extended_field_description.links.task.yml
 delete mode 100644 html/modules/custom/extended_field_description/extended_field_description.module
 delete mode 100644 html/modules/custom/extended_field_description/extended_field_description.permissions.yml
 delete mode 100644 html/modules/custom/extended_field_description/src/DescriptionEntityAccessControlHandler.php
 delete mode 100644 html/modules/custom/extended_field_description/src/DescriptionEntityStorage.php
 delete mode 100644 html/modules/custom/extended_field_description/src/DescriptionEntityStorageInterface.php
 delete mode 100644 html/modules/custom/extended_field_description/src/DescriptionEntityTranslationHandler.php
 delete mode 100644 html/modules/custom/extended_field_description/src/Entity/DescriptionEntityInterface.php
 delete mode 100644 html/modules/custom/extended_field_description/src/Form/DescriptionEntityDeleteForm.php
 create mode 100644 html/modules/custom/guidelines/composer.json
 create mode 100644 html/modules/custom/guidelines/config/schema/guideline_type.schema.yml
 rename html/modules/custom/{extended_field_description/description_entity.page.inc => guidelines/guideline.page.inc} (54%)
 create mode 100644 html/modules/custom/guidelines/guidelines.info.yml
 create mode 100644 html/modules/custom/guidelines/guidelines.links.action.yml
 create mode 100644 html/modules/custom/guidelines/guidelines.links.menu.yml
 create mode 100644 html/modules/custom/guidelines/guidelines.links.task.yml
 create mode 100644 html/modules/custom/guidelines/guidelines.module
 create mode 100644 html/modules/custom/guidelines/guidelines.permissions.yml
 create mode 100644 html/modules/custom/guidelines/guidelines.schema.yml
 rename html/modules/custom/{extended_field_description/src/Controller/DescriptionEntityController.php => guidelines/src/Controller/GuidelineController.php} (51%)
 rename html/modules/custom/{extended_field_description/src/Entity/DescriptionEntity.php => guidelines/src/Entity/Guideline.php} (69%)
 create mode 100644 html/modules/custom/guidelines/src/Entity/GuidelineInterface.php
 create mode 100644 html/modules/custom/guidelines/src/Entity/GuidelineType.php
 create mode 100644 html/modules/custom/guidelines/src/Entity/GuidelineTypeInterface.php
 rename html/modules/custom/{extended_field_description/src/Entity/DescriptionEntityViewsData.php => guidelines/src/Entity/GuidelineViewsData.php} (62%)
 create mode 100644 html/modules/custom/guidelines/src/Form/GuidelineDeleteForm.php
 rename html/modules/custom/{extended_field_description/src/Form/DescriptionEntityForm.php => guidelines/src/Form/GuidelineForm.php} (81%)
 rename html/modules/custom/{extended_field_description/src/Form/DescriptionEntityRevisionDeleteForm.php => guidelines/src/Form/GuidelineRevisionDeleteForm.php} (50%)
 rename html/modules/custom/{extended_field_description/src/Form/DescriptionEntityRevisionRevertForm.php => guidelines/src/Form/GuidelineRevisionRevertForm.php} (58%)
 rename html/modules/custom/{extended_field_description/src/Form/DescriptionEntityRevisionRevertTranslationForm.php => guidelines/src/Form/GuidelineRevisionRevertTranslationForm.php} (71%)
 rename html/modules/custom/{extended_field_description/src/Form/DescriptionEntitySettingsForm.php => guidelines/src/Form/GuidelineSettingsForm.php} (70%)
 create mode 100644 html/modules/custom/guidelines/src/Form/GuidelineTypeDeleteForm.php
 create mode 100644 html/modules/custom/guidelines/src/Form/GuidelineTypeForm.php
 create mode 100644 html/modules/custom/guidelines/src/GuidelineAccessControlHandler.php
 rename html/modules/custom/{extended_field_description/src/DescriptionEntityHtmlRouteProvider.php => guidelines/src/GuidelineHtmlRouteProvider.php} (79%)
 rename html/modules/custom/{extended_field_description/src/DescriptionEntityListBuilder.php => guidelines/src/GuidelineListBuilder.php} (53%)
 create mode 100644 html/modules/custom/guidelines/src/GuidelinePermissions.php
 create mode 100644 html/modules/custom/guidelines/src/GuidelineStorage.php
 create mode 100644 html/modules/custom/guidelines/src/GuidelineStorageInterface.php
 create mode 100644 html/modules/custom/guidelines/src/GuidelineTranslationHandler.php
 create mode 100644 html/modules/custom/guidelines/src/GuidelineTypeHtmlRouteProvider.php
 create mode 100644 html/modules/custom/guidelines/src/GuidelineTypeListBuilder.php
 create mode 100644 html/modules/custom/guidelines/src/Plugin/Field/FieldFormatter/GuidelineFieldTargetFormatter.php
 create mode 100644 html/modules/custom/guidelines/src/Plugin/Field/FieldType/GuidelineFieldTargetType.php
 create mode 100644 html/modules/custom/guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetWidget.php
 create mode 100644 html/modules/custom/guidelines/templates/guideline-content-add-list.html.twig
 rename html/modules/custom/{extended_field_description/templates/description_entity.html.twig => guidelines/templates/guideline.html.twig} (50%)
 rename html/modules/custom/{extended_field_description/templates/extended-field-description.html.twig => guidelines/templates/guidelines.html.twig} (100%)

diff --git a/config/core.entity_form_display.description_entity.description_entity.default.yml b/config/core.entity_form_display.guideline.field_guideline.default.yml
similarity index 64%
rename from config/core.entity_form_display.description_entity.description_entity.default.yml
rename to config/core.entity_form_display.guideline.field_guideline.default.yml
index b1a84ecf1..d82163722 100644
--- a/config/core.entity_form_display.description_entity.description_entity.default.yml
+++ b/config/core.entity_form_display.guideline.field_guideline.default.yml
@@ -1,20 +1,21 @@
-uuid: a9a2ce9a-7a0f-4fe2-82a1-8e7b45cea0ad
+uuid: d8b74fea-a0fb-4a3a-a0e3-4a973234e563
 langcode: en
 status: true
 dependencies:
   config:
-    - field.field.description_entity.description_entity.field_description
-    - field.field.description_entity.description_entity.field_field
-    - field.field.description_entity.description_entity.field_images
-    - field.field.description_entity.description_entity.field_title
+    - field.field.guideline.field_guideline.field_description
+    - field.field.guideline.field_guideline.field_field
+    - field.field.guideline.field_guideline.field_images
+    - field.field.guideline.field_guideline.field_title
+    - guidelines.guideline_type.field_guideline
     - image.style.thumbnail
   module:
-    - extended_field_description
+    - guidelines
     - svg_image
     - text
-id: description_entity.description_entity.default
-targetEntityType: description_entity
-bundle: description_entity
+id: guideline.field_guideline.default
+targetEntityType: guideline
+bundle: field_guideline
 mode: default
 content:
   field_description:
@@ -28,12 +29,17 @@ content:
   field_field:
     weight: 1
     settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
+      enabled_entities:
+        - node.announcement
+        - node.job
+        - node.report
+        - node.topic
+        - node.training
+        - taxonomy_term.country
+        - taxonomy_term.disaster
+        - taxonomy_term.disaster_type
     third_party_settings: {  }
-    type: entity_reference_autocomplete
+    type: guideline_field_target_widget
     region: content
   field_images:
     weight: 4
@@ -69,11 +75,11 @@ content:
   user_id:
     type: entity_reference_autocomplete
     weight: 6
-    region: content
     settings:
       match_operator: CONTAINS
-      match_limit: 10
       size: 60
       placeholder: ''
+      match_limit: 10
+    region: content
     third_party_settings: {  }
 hidden: {  }
diff --git a/config/core.entity_view_display.description_entity.description_entity.default.yml b/config/core.entity_view_display.guideline.field_guideline.default.yml
similarity index 56%
rename from config/core.entity_view_display.description_entity.description_entity.default.yml
rename to config/core.entity_view_display.guideline.field_guideline.default.yml
index bae5aa75d..9a7b5ffb5 100644
--- a/config/core.entity_view_display.description_entity.description_entity.default.yml
+++ b/config/core.entity_view_display.guideline.field_guideline.default.yml
@@ -1,20 +1,20 @@
-uuid: 92c05009-9be6-4ead-91f6-d86be83b7a33
+uuid: 5dd6495f-dd1a-4df1-b0b2-a01aa1964e04
 langcode: en
 status: true
 dependencies:
   config:
-    - field.field.description_entity.description_entity.field_description
-    - field.field.description_entity.description_entity.field_field
-    - field.field.description_entity.description_entity.field_images
-    - field.field.description_entity.description_entity.field_title
-    - image.style.media_library
+    - field.field.guideline.field_guideline.field_description
+    - field.field.guideline.field_guideline.field_field
+    - field.field.guideline.field_guideline.field_images
+    - field.field.guideline.field_guideline.field_title
+    - guidelines.guideline_type.field_guideline
+    - image.style.guideline_thumbnail
   module:
-    - extended_field_description
     - svg_image
     - text
-id: description_entity.description_entity.default
-targetEntityType: description_entity
-bundle: description_entity
+id: guideline.field_guideline.default
+targetEntityType: guideline
+bundle: field_guideline
 mode: default
 content:
   field_description:
@@ -28,8 +28,8 @@ content:
     weight: 2
     label: hidden
     settings:
-      image_style: media_library
-      image_link: ''
+      image_style: guideline_thumbnail
+      image_link: file
       svg_render_as_image: true
       svg_attributes:
         width: null
diff --git a/config/core.extension.yml b/config/core.extension.yml
index a71cf55c5..6ab2d025c 100644
--- a/config/core.extension.yml
+++ b/config/core.extension.yml
@@ -13,13 +13,13 @@ module:
   datetime: 0
   datetime_range: 0
   dynamic_page_cache: 0
-  extended_field_description: 0
   field: 0
   field_ui: 0
   file: 0
   filter: 0
   geofield: 0
   google_tag: 0
+  guidelines: 0
   image: 0
   imageapi_optimize: 0
   imageapi_optimize_binaries: 0
diff --git a/config/field.field.description_entity.description_entity.field_field.yml b/config/field.field.description_entity.description_entity.field_field.yml
deleted file mode 100644
index f443666ff..000000000
--- a/config/field.field.description_entity.description_entity.field_field.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: 92dd1b58-84bc-412f-bdd4-3e5edba1b294
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.description_entity.field_field
-  module:
-    - extended_field_description
-id: description_entity.description_entity.field_field
-field_name: field_field
-entity_type: description_entity
-bundle: description_entity
-label: Field
-description: 'Field to attach description to'
-required: true
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:field_config'
-  handler_settings:
-    target_bundles: null
-    auto_create: false
-field_type: entity_reference
diff --git a/config/field.field.description_entity.description_entity.field_title.yml b/config/field.field.description_entity.description_entity.field_title.yml
deleted file mode 100644
index a64e2a8cb..000000000
--- a/config/field.field.description_entity.description_entity.field_title.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 2c0abcb5-95ab-4bf4-be8d-087bf629eeb7
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.description_entity.field_title
-  module:
-    - extended_field_description
-id: description_entity.description_entity.field_title
-field_name: field_title
-entity_type: description_entity
-bundle: description_entity
-label: Title
-description: ''
-required: true
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/field.field.description_entity.description_entity.field_description.yml b/config/field.field.guideline.field_guideline.field_description.yml
similarity index 57%
rename from config/field.field.description_entity.description_entity.field_description.yml
rename to config/field.field.guideline.field_guideline.field_description.yml
index b33c57f71..b173f6465 100644
--- a/config/field.field.description_entity.description_entity.field_description.yml
+++ b/config/field.field.guideline.field_guideline.field_description.yml
@@ -1,23 +1,24 @@
-uuid: 6c16d4f1-b591-45b6-b16a-5613a947132c
+uuid: 0f8dcaca-8baf-4d35-8071-1ad3c4f35f1b
 langcode: en
 status: true
 dependencies:
   config:
-    - field.storage.description_entity.field_description
+    - field.storage.guideline.field_description
+    - guidelines.guideline_type.field_guideline
   module:
     - allowed_formats
-    - extended_field_description
     - text
 third_party_settings:
   allowed_formats:
-    markdown: markdown
+    guideline: guideline
+    markdown: '0'
     plain_text: '0'
     html: '0'
     token_markdown: '0'
-id: description_entity.description_entity.field_description
+id: guideline.field_guideline.field_description
 field_name: field_description
-entity_type: description_entity
-bundle: description_entity
+entity_type: guideline
+bundle: field_guideline
 label: Description
 description: ''
 required: false
diff --git a/config/field.field.guideline.field_guideline.field_field.yml b/config/field.field.guideline.field_guideline.field_field.yml
new file mode 100644
index 000000000..fdeb83b4b
--- /dev/null
+++ b/config/field.field.guideline.field_guideline.field_field.yml
@@ -0,0 +1,21 @@
+uuid: 6f2c048f-a870-4564-bcd0-bbb99bdb2230
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.guideline.field_field
+    - guidelines.guideline_type.field_guideline
+  module:
+    - guidelines
+id: guideline.field_guideline.field_field
+field_name: field_field
+entity_type: guideline
+bundle: field_guideline
+label: Field
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: guideline_field_target_type
diff --git a/config/field.field.description_entity.description_entity.field_images.yml b/config/field.field.guideline.field_guideline.field_images.yml
similarity index 65%
rename from config/field.field.description_entity.description_entity.field_images.yml
rename to config/field.field.guideline.field_guideline.field_images.yml
index 83355826a..e5a6a73fc 100644
--- a/config/field.field.description_entity.description_entity.field_images.yml
+++ b/config/field.field.guideline.field_guideline.field_images.yml
@@ -1,16 +1,16 @@
-uuid: e633e153-9e60-47cd-b40a-1454b587aaa8
+uuid: 009da1be-68e9-4c4b-af3b-b7f16a914aad
 langcode: en
 status: true
 dependencies:
   config:
-    - field.storage.description_entity.field_images
+    - field.storage.guideline.field_images
+    - guidelines.guideline_type.field_guideline
   module:
-    - extended_field_description
     - image
-id: description_entity.description_entity.field_images
+id: guideline.field_guideline.field_images
 field_name: field_images
-entity_type: description_entity
-bundle: description_entity
+entity_type: guideline
+bundle: field_guideline
 label: Images
 description: ''
 required: false
@@ -18,7 +18,7 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  file_directory: 'descriptions/[date:custom:Y]-[date:custom:m]'
+  file_directory: 'guidelines/[date:custom:Y]-[date:custom:m]'
   file_extensions: 'png gif jpg jpeg'
   max_filesize: ''
   max_resolution: ''
diff --git a/config/field.field.guideline.field_guideline.field_title.yml b/config/field.field.guideline.field_guideline.field_title.yml
new file mode 100644
index 000000000..6a84ba7bc
--- /dev/null
+++ b/config/field.field.guideline.field_guideline.field_title.yml
@@ -0,0 +1,19 @@
+uuid: 940acb12-d9cd-4884-a950-ca03f6fedcba
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.guideline.field_title
+    - guidelines.guideline_type.field_guideline
+id: guideline.field_guideline.field_title
+field_name: field_title
+entity_type: guideline
+bundle: field_guideline
+label: Title
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string
diff --git a/config/field.storage.description_entity.field_field.yml b/config/field.storage.description_entity.field_field.yml
deleted file mode 100644
index 5b05fa31f..000000000
--- a/config/field.storage.description_entity.field_field.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-uuid: e911199b-0b9c-41b1-be92-8a8b9b3c234c
-langcode: en
-status: true
-dependencies:
-  module:
-    - extended_field_description
-id: description_entity.field_field
-field_name: field_field
-entity_type: description_entity
-type: entity_reference
-settings:
-  target_type: field_config
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/field.storage.description_entity.field_description.yml b/config/field.storage.guideline.field_description.yml
similarity index 62%
rename from config/field.storage.description_entity.field_description.yml
rename to config/field.storage.guideline.field_description.yml
index 6c80f18b2..a51c5c69b 100644
--- a/config/field.storage.description_entity.field_description.yml
+++ b/config/field.storage.guideline.field_description.yml
@@ -1,13 +1,13 @@
-uuid: 3b828c8b-7de3-42a2-9c8f-01e19b60cf63
+uuid: 63011e49-3133-4297-abc7-3fb47eab242f
 langcode: en
 status: true
 dependencies:
   module:
-    - extended_field_description
+    - guidelines
     - text
-id: description_entity.field_description
+id: guideline.field_description
 field_name: field_description
-entity_type: description_entity
+entity_type: guideline
 type: text_long
 settings: {  }
 module: text
diff --git a/config/field.storage.guideline.field_field.yml b/config/field.storage.guideline.field_field.yml
new file mode 100644
index 000000000..a29acb46a
--- /dev/null
+++ b/config/field.storage.guideline.field_field.yml
@@ -0,0 +1,21 @@
+uuid: bd31610f-d04b-4819-b2e8-182079b7c500
+langcode: en
+status: true
+dependencies:
+  module:
+    - guidelines
+id: guideline.field_field
+field_name: field_field
+entity_type: guideline
+type: guideline_field_target_type
+settings:
+  enabled_entities:
+    node: node
+    terms: 0
+module: guidelines
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/field.storage.description_entity.field_images.yml b/config/field.storage.guideline.field_images.yml
similarity index 74%
rename from config/field.storage.description_entity.field_images.yml
rename to config/field.storage.guideline.field_images.yml
index 071c3f5bf..e4b15efe9 100644
--- a/config/field.storage.description_entity.field_images.yml
+++ b/config/field.storage.guideline.field_images.yml
@@ -1,14 +1,14 @@
-uuid: 730513ad-378a-4f3f-a08c-adc68b11dedd
+uuid: 000df8e9-190f-4ca7-9c1f-d6f3e7da5e6c
 langcode: en
 status: true
 dependencies:
   module:
-    - extended_field_description
     - file
+    - guidelines
     - image
-id: description_entity.field_images
+id: guideline.field_images
 field_name: field_images
-entity_type: description_entity
+entity_type: guideline
 type: image
 settings:
   uri_scheme: public
diff --git a/config/field.storage.description_entity.field_title.yml b/config/field.storage.guideline.field_title.yml
similarity index 66%
rename from config/field.storage.description_entity.field_title.yml
rename to config/field.storage.guideline.field_title.yml
index 5d7a01136..14d2a5bd3 100644
--- a/config/field.storage.description_entity.field_title.yml
+++ b/config/field.storage.guideline.field_title.yml
@@ -1,12 +1,12 @@
-uuid: f4328262-1cb7-43dc-ab65-700bcf88d6dd
+uuid: f3a5baf7-f41f-4d83-b691-23f3eb58d165
 langcode: en
 status: true
 dependencies:
   module:
-    - extended_field_description
-id: description_entity.field_title
+    - guidelines
+id: guideline.field_title
 field_name: field_title
-entity_type: description_entity
+entity_type: guideline
 type: string
 settings:
   max_length: 255
diff --git a/config/filter.format.guideline.yml b/config/filter.format.guideline.yml
new file mode 100644
index 000000000..e9ca53070
--- /dev/null
+++ b/config/filter.format.guideline.yml
@@ -0,0 +1,33 @@
+uuid: 3be53895-5be9-45d3-8886-9fdb66c4e93e
+langcode: en
+status: true
+dependencies:
+  module:
+    - media
+    - reliefweb_utility
+name: Guideline
+format: guideline
+weight: 0
+filters:
+  media_embed:
+    id: media_embed
+    provider: media
+    status: false
+    weight: 100
+    settings:
+      default_view_mode: default
+      allowed_media_types: {  }
+      allowed_view_modes: {  }
+  reliefweb_token_filter:
+    id: reliefweb_token_filter
+    provider: reliefweb_utility
+    status: false
+    weight: 0
+    settings:
+      replace_empty: '0'
+  filter_markdown:
+    id: filter_markdown
+    provider: reliefweb_utility
+    status: true
+    weight: -20
+    settings: {  }
diff --git a/config/guidelines.guideline_type.field_guideline.yml b/config/guidelines.guideline_type.field_guideline.yml
new file mode 100644
index 000000000..dc29bdeb5
--- /dev/null
+++ b/config/guidelines.guideline_type.field_guideline.yml
@@ -0,0 +1,6 @@
+uuid: 33cf67f7-6536-4f60-99be-13b52a3a7124
+langcode: en
+status: true
+dependencies: {  }
+id: field_guideline
+label: 'Field guideline'
diff --git a/config/image.style.guideline_thumbnail.yml b/config/image.style.guideline_thumbnail.yml
new file mode 100644
index 000000000..6f4593258
--- /dev/null
+++ b/config/image.style.guideline_thumbnail.yml
@@ -0,0 +1,16 @@
+uuid: 3153f7d4-05a0-4a0f-964c-e1ccc3a8bfdd
+langcode: en
+status: true
+dependencies: {  }
+name: guideline_thumbnail
+label: 'Guideline thumbnail'
+effects:
+  9788b5f9-ff16-47a9-92a0-1c66b68753cb:
+    uuid: 9788b5f9-ff16-47a9-92a0-1c66b68753cb
+    id: image_scale
+    weight: 1
+    data:
+      width: null
+      height: 200
+      upscale: false
+pipeline: ''
diff --git a/config/user.role.webmaster.yml b/config/user.role.webmaster.yml
index c831b773f..99c3de4ae 100644
--- a/config/user.role.webmaster.yml
+++ b/config/user.role.webmaster.yml
@@ -65,5 +65,6 @@ permissions:
   - 'edit terms in vulnerable_group'
   - 'revert term revision'
   - 'use report transition archived'
+  - 'use text format guideline'
   - 'view term revision data'
   - 'view term revision list'
diff --git a/html/modules/custom/extended_field_description/composer.json b/html/modules/custom/extended_field_description/composer.json
deleted file mode 100644
index e9603ab67..000000000
--- a/html/modules/custom/extended_field_description/composer.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "name": "drupal/extended_field_description",
-    "type": "drupal-module",
-    "description": "My Awesome Module",
-    "keywords": [
-    ],
-    "homepage": "https://www.drupal.org/project/extended_field_description",
-    "minimum-stability": "dev",
-    "support": {
-        "issues": "https://www.drupal.org/project/issues/extended_field_description",
-        "source": "http://cgit.drupalcode.org/extended_field_description",
-    }
-}
diff --git a/html/modules/custom/extended_field_description/extended_field_description.info.yml b/html/modules/custom/extended_field_description/extended_field_description.info.yml
deleted file mode 100644
index 38fd23831..000000000
--- a/html/modules/custom/extended_field_description/extended_field_description.info.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: 'extended_field_description'
-type: module
-description: 'My Awesome Module'
-core_version_requirement: ^9
-package: 'Custom'
diff --git a/html/modules/custom/extended_field_description/extended_field_description.links.action.yml b/html/modules/custom/extended_field_description/extended_field_description.links.action.yml
deleted file mode 100644
index 9489aa64f..000000000
--- a/html/modules/custom/extended_field_description/extended_field_description.links.action.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-entity.description_entity.add_form:
-  route_name: entity.description_entity.add_form
-  title: 'Add Description entity'
-  appears_on:
-    - entity.description_entity.collection
diff --git a/html/modules/custom/extended_field_description/extended_field_description.links.menu.yml b/html/modules/custom/extended_field_description/extended_field_description.links.menu.yml
deleted file mode 100644
index 442f7dc6f..000000000
--- a/html/modules/custom/extended_field_description/extended_field_description.links.menu.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-# Description entity menu items definition
-entity.description_entity.collection:
-  title: 'Description entity list'
-  route_name: entity.description_entity.collection
-  description: 'List Description entity entities'
-  parent: system.admin_structure
-  weight: 100
-
-description_entity.admin.structure.settings:
-  title: 'Description entity settings'
-  description: 'Configure Description entity entities'
-  route_name: description_entity.settings
-  parent: system.admin_structure
diff --git a/html/modules/custom/extended_field_description/extended_field_description.links.task.yml b/html/modules/custom/extended_field_description/extended_field_description.links.task.yml
deleted file mode 100644
index 0e46bb4e9..000000000
--- a/html/modules/custom/extended_field_description/extended_field_description.links.task.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-# Description entity routing definition
-description_entity.settings_tab:
-  route_name: description_entity.settings
-  title: 'Settings'
-  base_route: description_entity.settings
-
-entity.description_entity.canonical:
-  route_name: entity.description_entity.canonical
-  base_route: entity.description_entity.canonical
-  title: 'View'
-
-entity.description_entity.edit_form:
-  route_name: entity.description_entity.edit_form
-  base_route: entity.description_entity.canonical
-  title: 'Edit'
-
-entity.description_entity.version_history:
-  route_name: entity.description_entity.version_history
-  base_route: entity.description_entity.canonical
-  title: 'Revisions'
-
-entity.description_entity.delete_form:
-  route_name:  entity.description_entity.delete_form
-  base_route:  entity.description_entity.canonical
-  title: Delete
-  weight: 10
diff --git a/html/modules/custom/extended_field_description/extended_field_description.module b/html/modules/custom/extended_field_description/extended_field_description.module
deleted file mode 100644
index e730a3888..000000000
--- a/html/modules/custom/extended_field_description/extended_field_description.module
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains extended_field_description.module.
- */
-
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\extended_field_description\Entity\DescriptionEntity;
-use Drupal\Core\Entity\ContentEntityForm;
-
-
-/**
- * Implements hook_help().
- */
-function extended_field_description_help($route_name, RouteMatchInterface $route_match) {
-  switch ($route_name) {
-    // Main module help for the extended_field_description module.
-    case 'help.page.extended_field_description':
-      $output = '';
-      $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('My Awesome Module') . '</p>';
-      return $output;
-
-    default:
-  }
-}
-
-/**
- * Implements hook_theme().
- */
-function extended_field_description_theme() {
-  return [
-    'extended_field_description' => [
-      'render element' => 'children',
-    ],
-  ];
-}
-
-/**
- * Implements hook_field_widget_form_alter().
- */
-function extended_field_description_field_widget_form_alter(&$element, FormStateInterface &$form_state, $context) {
-  static $description = [];
-
-  $bundle = '';
-  $form_object = $form_state->getFormObject();
-  $entity_type = $form_object->getEntity()->getEntityType()->id();
-  if ($form_object instanceof ContentEntityForm) {
-    $bundle = $form_object->getEntity()->bundle();
-  }
-  $field_name = $context['items']->getName();
-
-  if (!isset($descriptions[$entity_type])) {
-    /** @var Drupal\extended_field_description\Entity\DescriptionEntity[] $description_entities */
-    $description_entities = DescriptionEntity::loadByEntity($entity_type);
-    foreach ($description_entities as $description_entity) {
-      foreach ($description_entity->field_field as $field) {
-        $descriptions[$entity_type][$field->target_id] = $description_entity;
-      }
-    }
-  }
-
-  $key = $entity_type . '.' . $bundle . '.' . $field_name;
-  if (isset($descriptions[$entity_type][$key])) {
-
-    $view_builder = \Drupal::entityTypeManager()->getViewBuilder('description_entity');
-    $pre_render = $view_builder->view($descriptions[$entity_type][$key], 'default');
-    $render_output = render($pre_render);
-    $element['value']['#description'] = $render_output;
-  }
-}
diff --git a/html/modules/custom/extended_field_description/extended_field_description.permissions.yml b/html/modules/custom/extended_field_description/extended_field_description.permissions.yml
deleted file mode 100644
index 13f769c43..000000000
--- a/html/modules/custom/extended_field_description/extended_field_description.permissions.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-add description entity entities:
-  title: 'Create new Description entity entities'
-
-administer description entity entities:
-  title: 'Administer Description entity entities'
-  description: 'Allow to access the administration form to configure Description entity entities.'
-  restrict access: true
-
-delete description entity entities:
-  title: 'Delete Description entity entities'
-
-edit description entity entities:
-  title: 'Edit Description entity entities'
-
-view published description entity entities:
-  title: 'View published Description entity entities'
-
-view unpublished description entity entities:
-  title: 'View unpublished Description entity entities'
-
-view all description entity revisions:
-  title: 'View all Description entity revisions'
-
-revert all description entity revisions:
-  title: 'Revert all Description entity revisions'
-  description: 'Role requires permission <em>view Description entity revisions</em> and <em>edit rights</em> for description entity entities in question or <em>administer description entity entities</em>.'
-
-delete all description entity revisions:
-  title: 'Delete all revisions'
-  description: 'Role requires permission to <em>view Description entity revisions</em> and <em>delete rights</em> for description entity entities in question or <em>administer description entity entities</em>.'
-
diff --git a/html/modules/custom/extended_field_description/src/DescriptionEntityAccessControlHandler.php b/html/modules/custom/extended_field_description/src/DescriptionEntityAccessControlHandler.php
deleted file mode 100644
index 9135c8857..000000000
--- a/html/modules/custom/extended_field_description/src/DescriptionEntityAccessControlHandler.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-namespace Drupal\extended_field_description;
-
-use Drupal\Core\Entity\EntityAccessControlHandler;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Access\AccessResult;
-
-/**
- * Access controller for the Description entity entity.
- *
- * @see \Drupal\extended_field_description\Entity\DescriptionEntity.
- */
-class DescriptionEntityAccessControlHandler extends EntityAccessControlHandler {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
-    /** @var \Drupal\extended_field_description\Entity\DescriptionEntityInterface $entity */
-
-    switch ($operation) {
-
-      case 'view':
-
-        if (!$entity->isPublished()) {
-          return AccessResult::allowedIfHasPermission($account, 'view unpublished description entity entities');
-        }
-
-
-        return AccessResult::allowedIfHasPermission($account, 'view published description entity entities');
-
-      case 'update':
-
-        return AccessResult::allowedIfHasPermission($account, 'edit description entity entities');
-
-      case 'delete':
-
-        return AccessResult::allowedIfHasPermission($account, 'delete description entity entities');
-    }
-
-    // Unknown operation, no opinion.
-    return AccessResult::neutral();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function checkCreateAccess(AccountInterface $account, array $context, $entity_bundle = NULL) {
-    return AccessResult::allowedIfHasPermission($account, 'add description entity entities');
-  }
-
-
-}
diff --git a/html/modules/custom/extended_field_description/src/DescriptionEntityStorage.php b/html/modules/custom/extended_field_description/src/DescriptionEntityStorage.php
deleted file mode 100644
index 6c85f53ad..000000000
--- a/html/modules/custom/extended_field_description/src/DescriptionEntityStorage.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace Drupal\extended_field_description;
-
-use Drupal\Core\Entity\Sql\SqlContentEntityStorage;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\extended_field_description\Entity\DescriptionEntityInterface;
-
-/**
- * Defines the storage handler class for Description entity entities.
- *
- * This extends the base storage class, adding required special handling for
- * Description entity entities.
- *
- * @ingroup extended_field_description
- */
-class DescriptionEntityStorage extends SqlContentEntityStorage implements DescriptionEntityStorageInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function revisionIds(DescriptionEntityInterface $entity) {
-    return $this->database->query(
-      'SELECT vid FROM {description_entity_revision} WHERE id=:id ORDER BY vid',
-      [':id' => $entity->id()]
-    )->fetchCol();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function userRevisionIds(AccountInterface $account) {
-    return $this->database->query(
-      'SELECT vid FROM {description_entity_field_revision} WHERE uid = :uid ORDER BY vid',
-      [':uid' => $account->id()]
-    )->fetchCol();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function countDefaultLanguageRevisions(DescriptionEntityInterface $entity) {
-    return $this->database->query('SELECT COUNT(*) FROM {description_entity_field_revision} WHERE id = :id AND default_langcode = 1', [':id' => $entity->id()])
-      ->fetchField();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function clearRevisionsLanguage(LanguageInterface $language) {
-    return $this->database->update('description_entity_revision')
-      ->fields(['langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED])
-      ->condition('langcode', $language->getId())
-      ->execute();
-  }
-
-}
diff --git a/html/modules/custom/extended_field_description/src/DescriptionEntityStorageInterface.php b/html/modules/custom/extended_field_description/src/DescriptionEntityStorageInterface.php
deleted file mode 100644
index 9b54aebbf..000000000
--- a/html/modules/custom/extended_field_description/src/DescriptionEntityStorageInterface.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace Drupal\extended_field_description;
-
-use Drupal\Core\Entity\ContentEntityStorageInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\extended_field_description\Entity\DescriptionEntityInterface;
-
-/**
- * Defines the storage handler class for Description entity entities.
- *
- * This extends the base storage class, adding required special handling for
- * Description entity entities.
- *
- * @ingroup extended_field_description
- */
-interface DescriptionEntityStorageInterface extends ContentEntityStorageInterface {
-
-  /**
-   * Gets a list of Description entity revision IDs for a specific Description entity.
-   *
-   * @param \Drupal\extended_field_description\Entity\DescriptionEntityInterface $entity
-   *   The Description entity entity.
-   *
-   * @return int[]
-   *   Description entity revision IDs (in ascending order).
-   */
-  public function revisionIds(DescriptionEntityInterface $entity);
-
-  /**
-   * Gets a list of revision IDs having a given user as Description entity author.
-   *
-   * @param \Drupal\Core\Session\AccountInterface $account
-   *   The user entity.
-   *
-   * @return int[]
-   *   Description entity revision IDs (in ascending order).
-   */
-  public function userRevisionIds(AccountInterface $account);
-
-  /**
-   * Counts the number of revisions in the default language.
-   *
-   * @param \Drupal\extended_field_description\Entity\DescriptionEntityInterface $entity
-   *   The Description entity entity.
-   *
-   * @return int
-   *   The number of revisions in the default language.
-   */
-  public function countDefaultLanguageRevisions(DescriptionEntityInterface $entity);
-
-  /**
-   * Unsets the language for all Description entity with the given language.
-   *
-   * @param \Drupal\Core\Language\LanguageInterface $language
-   *   The language object.
-   */
-  public function clearRevisionsLanguage(LanguageInterface $language);
-
-}
diff --git a/html/modules/custom/extended_field_description/src/DescriptionEntityTranslationHandler.php b/html/modules/custom/extended_field_description/src/DescriptionEntityTranslationHandler.php
deleted file mode 100644
index 24a4b4e67..000000000
--- a/html/modules/custom/extended_field_description/src/DescriptionEntityTranslationHandler.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Drupal\extended_field_description;
-
-use Drupal\content_translation\ContentTranslationHandler;
-
-/**
- * Defines the translation handler for description_entity.
- */
-class DescriptionEntityTranslationHandler extends ContentTranslationHandler {
-
-  // Override here the needed methods from ContentTranslationHandler.
-}
diff --git a/html/modules/custom/extended_field_description/src/Entity/DescriptionEntityInterface.php b/html/modules/custom/extended_field_description/src/Entity/DescriptionEntityInterface.php
deleted file mode 100644
index 75cf536e4..000000000
--- a/html/modules/custom/extended_field_description/src/Entity/DescriptionEntityInterface.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-namespace Drupal\extended_field_description\Entity;
-
-use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Entity\RevisionLogInterface;
-use Drupal\Core\Entity\EntityChangedInterface;
-use Drupal\Core\Entity\EntityPublishedInterface;
-use Drupal\user\EntityOwnerInterface;
-
-/**
- * Provides an interface for defining Description entity entities.
- *
- * @ingroup extended_field_description
- */
-interface DescriptionEntityInterface extends ContentEntityInterface, RevisionLogInterface, EntityChangedInterface, EntityPublishedInterface, EntityOwnerInterface {
-
-  /**
-   * Add get/set methods for your configuration properties here.
-   */
-
-  /**
-   * Gets the Description entity name.
-   *
-   * @return string
-   *   Name of the Description entity.
-   */
-  public function getName();
-
-  /**
-   * Sets the Description entity name.
-   *
-   * @param string $name
-   *   The Description entity name.
-   *
-   * @return \Drupal\extended_field_description\Entity\DescriptionEntityInterface
-   *   The called Description entity entity.
-   */
-  public function setName($name);
-
-  /**
-   * Gets the Description entity creation timestamp.
-   *
-   * @return int
-   *   Creation timestamp of the Description entity.
-   */
-  public function getCreatedTime();
-
-  /**
-   * Sets the Description entity creation timestamp.
-   *
-   * @param int $timestamp
-   *   The Description entity creation timestamp.
-   *
-   * @return \Drupal\extended_field_description\Entity\DescriptionEntityInterface
-   *   The called Description entity entity.
-   */
-  public function setCreatedTime($timestamp);
-
-  /**
-   * Gets the Description entity revision creation timestamp.
-   *
-   * @return int
-   *   The UNIX timestamp of when this revision was created.
-   */
-  public function getRevisionCreationTime();
-
-  /**
-   * Sets the Description entity revision creation timestamp.
-   *
-   * @param int $timestamp
-   *   The UNIX timestamp of when this revision was created.
-   *
-   * @return \Drupal\extended_field_description\Entity\DescriptionEntityInterface
-   *   The called Description entity entity.
-   */
-  public function setRevisionCreationTime($timestamp);
-
-  /**
-   * Gets the Description entity revision author.
-   *
-   * @return \Drupal\user\UserInterface
-   *   The user entity for the revision author.
-   */
-  public function getRevisionUser();
-
-  /**
-   * Sets the Description entity revision author.
-   *
-   * @param int $uid
-   *   The user ID of the revision author.
-   *
-   * @return \Drupal\extended_field_description\Entity\DescriptionEntityInterface
-   *   The called Description entity entity.
-   */
-  public function setRevisionUserId($uid);
-
-}
diff --git a/html/modules/custom/extended_field_description/src/Form/DescriptionEntityDeleteForm.php b/html/modules/custom/extended_field_description/src/Form/DescriptionEntityDeleteForm.php
deleted file mode 100644
index e45b7bf17..000000000
--- a/html/modules/custom/extended_field_description/src/Form/DescriptionEntityDeleteForm.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace Drupal\extended_field_description\Form;
-
-use Drupal\Core\Entity\ContentEntityDeleteForm;
-
-/**
- * Provides a form for deleting Description entity entities.
- *
- * @ingroup extended_field_description
- */
-class DescriptionEntityDeleteForm extends ContentEntityDeleteForm {
-
-
-}
diff --git a/html/modules/custom/guidelines/composer.json b/html/modules/custom/guidelines/composer.json
new file mode 100644
index 000000000..5173b4a6a
--- /dev/null
+++ b/html/modules/custom/guidelines/composer.json
@@ -0,0 +1,13 @@
+{
+    "name": "drupal/guidelines",
+    "type": "drupal-module",
+    "description": "Add guidelines to entities and fields",
+    "keywords": [
+    ],
+    "homepage": "https://www.drupal.org/project/guidelines",
+    "minimum-stability": "dev",
+    "support": {
+        "issues": "https://www.drupal.org/project/issues/guidelines",
+        "source": "http://cgit.drupalcode.org/guidelines"
+    }
+}
diff --git a/html/modules/custom/guidelines/config/schema/guideline_type.schema.yml b/html/modules/custom/guidelines/config/schema/guideline_type.schema.yml
new file mode 100644
index 000000000..37c49bcd5
--- /dev/null
+++ b/html/modules/custom/guidelines/config/schema/guideline_type.schema.yml
@@ -0,0 +1,12 @@
+guidelines.guideline_type.*:
+  type: config_entity
+  label: 'Guideline type config'
+  mapping:
+    id:
+      type: string
+      label: 'ID'
+    label:
+      type: label
+      label: 'Label'
+    uuid:
+      type: string
diff --git a/html/modules/custom/extended_field_description/description_entity.page.inc b/html/modules/custom/guidelines/guideline.page.inc
similarity index 54%
rename from html/modules/custom/extended_field_description/description_entity.page.inc
rename to html/modules/custom/guidelines/guideline.page.inc
index 252364ac5..61fcd3c84 100644
--- a/html/modules/custom/extended_field_description/description_entity.page.inc
+++ b/html/modules/custom/guidelines/guideline.page.inc
@@ -2,26 +2,26 @@
 
 /**
  * @file
- * Contains description_entity.page.inc.
+ * Contains guideline.page.inc.
  *
- * Page callback for Description entity entities.
+ * Page callback for Guideline entities.
  */
 
 use Drupal\Core\Render\Element;
 
 /**
- * Prepares variables for Description entity templates.
+ * Prepares variables for Guideline templates.
  *
- * Default template: description_entity.html.twig.
+ * Default template: guideline.html.twig.
  *
  * @param array $variables
  *   An associative array containing:
  *   - elements: An associative array containing the user information and any
  *   - attributes: HTML attributes for the containing element.
  */
-function template_preprocess_description_entity(array &$variables) {
-  // Fetch DescriptionEntity Entity Object.
-  $description_entity = $variables['elements']['#description_entity'];
+function template_preprocess_guideline(array &$variables) {
+  // Fetch Guideline Entity Object.
+  $guideline = $variables['elements']['#guideline'];
 
   // Helpful $content variable for templates.
   foreach (Element::children($variables['elements']) as $key) {
diff --git a/html/modules/custom/guidelines/guidelines.info.yml b/html/modules/custom/guidelines/guidelines.info.yml
new file mode 100644
index 000000000..9366642c9
--- /dev/null
+++ b/html/modules/custom/guidelines/guidelines.info.yml
@@ -0,0 +1,5 @@
+name: 'Guidelines'
+type: module
+description: 'Add guidelines to entities and fields'
+core_version_requirement: ^9
+package: 'Custom'
diff --git a/html/modules/custom/guidelines/guidelines.links.action.yml b/html/modules/custom/guidelines/guidelines.links.action.yml
new file mode 100644
index 000000000..9c4df42ed
--- /dev/null
+++ b/html/modules/custom/guidelines/guidelines.links.action.yml
@@ -0,0 +1,10 @@
+entity.guideline.add_form:
+  route_name: entity.guideline.add_page
+  title: 'Add Guideline'
+  appears_on:
+    - entity.guideline.collection
+entity.guideline_type.add_form:
+  route_name: entity.guideline_type.add_form
+  title: 'Add Guideline type'
+  appears_on:
+    - entity.guideline_type.collection
diff --git a/html/modules/custom/guidelines/guidelines.links.menu.yml b/html/modules/custom/guidelines/guidelines.links.menu.yml
new file mode 100644
index 000000000..2704d590b
--- /dev/null
+++ b/html/modules/custom/guidelines/guidelines.links.menu.yml
@@ -0,0 +1,17 @@
+
+# Guideline menu items definition
+entity.guideline.collection:
+  title: 'Guideline list'
+  route_name: entity.guideline.collection
+  description: 'List Guideline entities'
+  parent: system.admin_structure
+  weight: 100
+
+
+# Guideline type menu items definition
+entity.guideline_type.collection:
+  title: 'Guideline type'
+  route_name: entity.guideline_type.collection
+  description: 'List Guideline type (bundles)'
+  parent: system.admin_structure
+  weight: 99
diff --git a/html/modules/custom/guidelines/guidelines.links.task.yml b/html/modules/custom/guidelines/guidelines.links.task.yml
new file mode 100644
index 000000000..5c4d340b3
--- /dev/null
+++ b/html/modules/custom/guidelines/guidelines.links.task.yml
@@ -0,0 +1,22 @@
+# Guideline routing definition
+
+entity.guideline.canonical:
+  route_name: entity.guideline.canonical
+  base_route: entity.guideline.canonical
+  title: 'View'
+
+entity.guideline.edit_form:
+  route_name: entity.guideline.edit_form
+  base_route: entity.guideline.canonical
+  title: 'Edit'
+
+entity.guideline.version_history:
+  route_name: entity.guideline.version_history
+  base_route: entity.guideline.canonical
+  title: 'Revisions'
+
+entity.guideline.delete_form:
+  route_name:  entity.guideline.delete_form
+  base_route:  entity.guideline.canonical
+  title: Delete
+  weight: 10
diff --git a/html/modules/custom/guidelines/guidelines.module b/html/modules/custom/guidelines/guidelines.module
new file mode 100644
index 000000000..8b7be6270
--- /dev/null
+++ b/html/modules/custom/guidelines/guidelines.module
@@ -0,0 +1,119 @@
+<?php
+
+/**
+ * @file
+ * Contains guidelines.module.
+ */
+
+use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Entity\ContentEntityForm;
+use Drupal\Core\Entity\EntityFieldManager;
+use Drupal\guidelines\Entity\Guideline;
+use Drupal\Core\Entity\EntityFieldManagerInterface;
+
+/**
+ * Implements hook_help().
+ */
+function guidelines_help($route_name, RouteMatchInterface $route_match) {
+  switch ($route_name) {
+    // Main module help for the guidelines module.
+    case 'help.page.guidelines':
+      $output = '';
+      $output .= '<h3>' . t('About') . '</h3>';
+      $output .= '<p>' . t('Add guidelines to entities and fields') . '</p>';
+      return $output;
+
+    default:
+  }
+}
+
+/*
+- old id from trello
+- grouping
+  - terms
+  - book
+- moderation
+- use nodes
+*/
+
+/**
+ * Implements hook_theme().
+ */
+function guidelines_theme() {
+  $theme = [];
+  $theme['guideline'] = [
+    'render element' => 'elements',
+    'file' => 'guideline.page.inc',
+    'template' => 'guideline',
+  ];
+  $theme['guideline_content_add_list'] = [
+    'render element' => 'content',
+    'variables' => ['content' => NULL],
+    'file' => 'guideline.page.inc',
+  ];
+  return $theme;
+}
+
+/**
+ * Implements hook_theme_suggestions_HOOK().
+ */
+function guidelines_theme_suggestions_guideline(array $variables) {
+  $suggestions = [];
+  $entity = $variables['elements']['#guideline'];
+  $sanitized_view_mode = strtr($variables['elements']['#view_mode'], '.', '_');
+
+  $suggestions[] = 'guideline__' . $sanitized_view_mode;
+  $suggestions[] = 'guideline__' . $entity->bundle();
+  $suggestions[] = 'guideline__' . $entity->bundle() . '__' . $sanitized_view_mode;
+  $suggestions[] = 'guideline__' . $entity->id();
+  $suggestions[] = 'guideline__' . $entity->id() . '__' . $sanitized_view_mode;
+  return $suggestions;
+}
+
+/**
+ * Implements hook_field_widget_form_alter().
+ */
+function guidelines_field_widget_form_alter(&$element, FormStateInterface &$form_state, $context) {
+  guidelines_attach_to_widget($element, $form_state, $context);
+}
+
+/**
+ * Attach guideline to a widget.
+ */
+function guidelines_attach_to_widget(&$element, FormStateInterface &$form_state, $context) {
+  static $descriptions = [];
+
+  $bundle = '';
+  $form_object = $form_state->getFormObject();
+  $entity_type = $form_object->getEntity()->getEntityType()->id();
+  if ($form_object instanceof ContentEntityForm) {
+    $bundle = $form_object->getEntity()->bundle();
+  }
+  $field_name = $context['items']->getName();
+
+  if (!isset($descriptions[$entity_type])) {
+    /** @var Drupal\extended_field_description\Entity\DescriptionEntity[] $description_entities */
+    $description_entities = Guideline::loadByEntity($entity_type);
+    foreach ($description_entities as $description_entity) {
+      foreach ($description_entity->field_field as $field) {
+        $descriptions[$entity_type][$field->value] = $description_entity;
+      }
+    }
+  }
+
+  $key = $entity_type . '.' . $bundle . '.' . $field_name;
+  if (isset($descriptions[$entity_type][$key])) {
+    $view_builder = \Drupal::entityTypeManager()->getViewBuilder('guideline');
+    $pre_render = $view_builder->view($descriptions[$entity_type][$key], 'default');
+    $render_output = render($pre_render);
+
+    if (isset($element['#description'])) {
+      $element['#description'] = $render_output;
+    }
+
+    if (isset($element['value']['#description'])) {
+      $element['value']['#description'] = $render_output;
+    }
+  }
+}
diff --git a/html/modules/custom/guidelines/guidelines.permissions.yml b/html/modules/custom/guidelines/guidelines.permissions.yml
new file mode 100644
index 000000000..4e0edc6c5
--- /dev/null
+++ b/html/modules/custom/guidelines/guidelines.permissions.yml
@@ -0,0 +1,33 @@
+add guideline entities:
+  title: 'Create new Guideline entities'
+
+administer guideline entities:
+  title: 'Administer Guideline entities'
+  description: 'Allow to access the administration form to configure Guideline entities.'
+  restrict access: true
+
+delete guideline entities:
+  title: 'Delete Guideline entities'
+
+edit guideline entities:
+  title: 'Edit Guideline entities'
+
+view published guideline entities:
+  title: 'View published Guideline entities'
+
+view unpublished guideline entities:
+  title: 'View unpublished Guideline entities'
+
+view all guideline revisions:
+  title: 'View all Guideline revisions'
+
+revert all guideline revisions:
+  title: 'Revert all Guideline revisions'
+  description: 'Role requires permission <em>view Guideline revisions</em> and <em>edit rights</em> for guideline entities in question or <em>administer guideline entities</em>.'
+
+delete all guideline revisions:
+  title: 'Delete all revisions'
+  description: 'Role requires permission to <em>view Guideline revisions</em> and <em>delete rights</em> for guideline entities in question or <em>administer guideline entities</em>.'
+
+permission_callbacks:
+  - \Drupal\guidelines\GuidelinePermissions::generatePermissions
diff --git a/html/modules/custom/guidelines/guidelines.schema.yml b/html/modules/custom/guidelines/guidelines.schema.yml
new file mode 100644
index 000000000..3baeb93ca
--- /dev/null
+++ b/html/modules/custom/guidelines/guidelines.schema.yml
@@ -0,0 +1,10 @@
+field.widget.settings.guideline_field_target_widget:
+  type: mapping
+  label: 'Guideline field target widget widget settings'
+  mapping:
+    size:
+      type: integer
+      label: 'Size'
+    placeholder:
+      type: textfield
+      label: 'Placeholder'
diff --git a/html/modules/custom/extended_field_description/src/Controller/DescriptionEntityController.php b/html/modules/custom/guidelines/src/Controller/GuidelineController.php
similarity index 51%
rename from html/modules/custom/extended_field_description/src/Controller/DescriptionEntityController.php
rename to html/modules/custom/guidelines/src/Controller/GuidelineController.php
index 26a5daea4..18c71e6af 100644
--- a/html/modules/custom/extended_field_description/src/Controller/DescriptionEntityController.php
+++ b/html/modules/custom/guidelines/src/Controller/GuidelineController.php
@@ -1,20 +1,20 @@
 <?php
 
-namespace Drupal\extended_field_description\Controller;
+namespace Drupal\guidelines\Controller;
 
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Url;
-use Drupal\extended_field_description\Entity\DescriptionEntityInterface;
+use Drupal\guidelines\Entity\GuidelineInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Class DescriptionEntityController.
+ * Class GuidelineController.
  *
- *  Returns responses for Description entity routes.
+ *  Returns responses for Guideline routes.
  */
-class DescriptionEntityController extends ControllerBase implements ContainerInjectionInterface {
+class GuidelineController extends ControllerBase implements ContainerInjectionInterface {
 
   /**
    * The date formatter.
@@ -41,72 +41,72 @@ public static function create(ContainerInterface $container) {
   }
 
   /**
-   * Displays a Description entity revision.
+   * Displays a Guideline revision.
    *
-   * @param int $description_entity_revision
-   *   The Description entity revision ID.
+   * @param int $guideline_revision
+   *   The Guideline revision ID.
    *
    * @return array
    *   An array suitable for drupal_render().
    */
-  public function revisionShow($description_entity_revision) {
-    $description_entity = $this->entityTypeManager()->getStorage('description_entity')
-      ->loadRevision($description_entity_revision);
-    $view_builder = $this->entityTypeManager()->getViewBuilder('description_entity');
+  public function revisionShow($guideline_revision) {
+    $guideline = $this->entityTypeManager()->getStorage('guideline')
+      ->loadRevision($guideline_revision);
+    $view_builder = $this->entityTypeManager()->getViewBuilder('guideline');
 
-    return $view_builder->view($description_entity);
+    return $view_builder->view($guideline);
   }
 
   /**
-   * Page title callback for a Description entity revision.
+   * Page title callback for a Guideline revision.
    *
-   * @param int $description_entity_revision
-   *   The Description entity revision ID.
+   * @param int $guideline_revision
+   *   The Guideline revision ID.
    *
    * @return string
    *   The page title.
    */
-  public function revisionPageTitle($description_entity_revision) {
-    $description_entity = $this->entityTypeManager()->getStorage('description_entity')
-      ->loadRevision($description_entity_revision);
+  public function revisionPageTitle($guideline_revision) {
+    $guideline = $this->entityTypeManager()->getStorage('guideline')
+      ->loadRevision($guideline_revision);
     return $this->t('Revision of %title from %date', [
-      '%title' => $description_entity->label(),
-      '%date' => $this->dateFormatter->format($description_entity->getRevisionCreationTime()),
+      '%title' => $guideline->label(),
+      '%date' => $this->dateFormatter->format($guideline->getRevisionCreationTime()),
     ]);
   }
 
   /**
-   * Generates an overview table of older revisions of a Description entity.
+   * Generates an overview table of older revisions of a Guideline.
    *
-   * @param \Drupal\extended_field_description\Entity\DescriptionEntityInterface $description_entity
-   *   A Description entity object.
+   * @param \Drupal\guidelines\Entity\GuidelineInterface $guideline
+   *   A Guideline object.
    *
    * @return array
    *   An array as expected by drupal_render().
    */
-  public function revisionOverview(DescriptionEntityInterface $description_entity) {
+  public function revisionOverview(GuidelineInterface $guideline) {
     $account = $this->currentUser();
-    $description_entity_storage = $this->entityTypeManager()->getStorage('description_entity');
+    $guideline_storage = $this->entityTypeManager()->getStorage('guideline');
 
-    $langcode = $description_entity->language()->getId();
-    $langname = $description_entity->language()->getName();
-    $languages = $description_entity->getTranslationLanguages();
+    $langcode = $guideline->language()->getId();
+    $langname = $guideline->language()->getName();
+    $languages = $guideline->getTranslationLanguages();
     $has_translations = (count($languages) > 1);
-    $build['#title'] = $has_translations ? $this->t('@langname revisions for %title', ['@langname' => $langname, '%title' => $description_entity->label()]) : $this->t('Revisions for %title', ['%title' => $description_entity->label()]);
+    $build['#title'] = $has_translations ? $this->t('@langname revisions for %title', ['@langname' => $langname, '%title' => $guideline->label()]) : $this->t('Revisions for %title', ['%title' => $guideline->label()]);
 
     $header = [$this->t('Revision'), $this->t('Operations')];
-    $revert_permission = (($account->hasPermission("revert all description entity revisions") || $account->hasPermission('administer description entity entities')));
-    $delete_permission = (($account->hasPermission("delete all description entity revisions") || $account->hasPermission('administer description entity entities')));
+    $revert_permission = (($account->hasPermission("revert all guideline revisions") || $account->hasPermission('administer guideline entities')));
+    $delete_permission = (($account->hasPermission("delete all guideline revisions") || $account->hasPermission('administer guideline entities')));
 
     $rows = [];
 
-    $vids = $description_entity_storage->revisionIds($description_entity);
+    $vids = $guideline_storage->revisionIds($guideline);
 
     $latest_revision = TRUE;
 
     foreach (array_reverse($vids) as $vid) {
-      /** @var \Drupal\extended_field_description\DescriptionEntityInterface $revision */
-      $revision = $description_entity_storage->loadRevision($vid);
+      /** @var \Drupal\guidelines\GuidelineInterface $revision */
+      $revision = $guideline_storage->loadRevision($vid);
       // Only show revisions that are affected by the language that is being
       // displayed.
       if ($revision->hasTranslation($langcode) && $revision->getTranslation($langcode)->isRevisionTranslationAffected()) {
@@ -117,14 +117,14 @@ public function revisionOverview(DescriptionEntityInterface $description_entity)
 
         // Use revision link to link to revisions that are not active.
         $date = $this->dateFormatter->format($revision->getRevisionCreationTime(), 'short');
-        if ($vid != $description_entity->getRevisionId()) {
-          $link = $this->l($date, new Url('entity.description_entity.revision', [
-            'description_entity' => $description_entity->id(),
-            'description_entity_revision' => $vid,
+        if ($vid != $guideline->getRevisionId()) {
+          $link = $this->l($date, new Url('entity.guideline.revision', [
+            'guideline' => $guideline->id(),
+            'guideline_revision' => $vid,
           ]));
         }
         else {
-          $link = $description_entity->link($date);
+          $link = $guideline->link($date);
         }
 
         $row = [];
@@ -163,14 +163,14 @@ public function revisionOverview(DescriptionEntityInterface $description_entity)
             $links['revert'] = [
               'title' => $this->t('Revert'),
               'url' => $has_translations ?
-              Url::fromRoute('entity.description_entity.translation_revert', [
-                'description_entity' => $description_entity->id(),
-                'description_entity_revision' => $vid,
+              Url::fromRoute('entity.guideline.translation_revert', [
+                'guideline' => $guideline->id(),
+                'guideline_revision' => $vid,
                 'langcode' => $langcode,
               ]) :
-              Url::fromRoute('entity.description_entity.revision_revert', [
-                'description_entity' => $description_entity->id(),
-                'description_entity_revision' => $vid,
+              Url::fromRoute('entity.guideline.revision_revert', [
+                'guideline' => $guideline->id(),
+                'guideline_revision' => $vid,
               ]),
             ];
           }
@@ -178,9 +178,9 @@ public function revisionOverview(DescriptionEntityInterface $description_entity)
           if ($delete_permission) {
             $links['delete'] = [
               'title' => $this->t('Delete'),
-              'url' => Url::fromRoute('entity.description_entity.revision_delete', [
-                'description_entity' => $description_entity->id(),
-                'description_entity_revision' => $vid,
+              'url' => Url::fromRoute('entity.guideline.revision_delete', [
+                'guideline' => $guideline->id(),
+                'guideline_revision' => $vid,
               ]),
             ];
           }
@@ -197,7 +197,7 @@ public function revisionOverview(DescriptionEntityInterface $description_entity)
       }
     }
 
-    $build['description_entity_revisions_table'] = [
+    $build['guideline_revisions_table'] = [
       '#theme' => 'table',
       '#rows' => $rows,
       '#header' => $header,
diff --git a/html/modules/custom/extended_field_description/src/Entity/DescriptionEntity.php b/html/modules/custom/guidelines/src/Entity/Guideline.php
similarity index 69%
rename from html/modules/custom/extended_field_description/src/Entity/DescriptionEntity.php
rename to html/modules/custom/guidelines/src/Entity/Guideline.php
index e3a2f5270..a87269f05 100644
--- a/html/modules/custom/extended_field_description/src/Entity/DescriptionEntity.php
+++ b/html/modules/custom/guidelines/src/Entity/Guideline.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\extended_field_description\Entity;
+namespace Drupal\guidelines\Entity;
 
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
@@ -12,40 +12,43 @@
 use Drupal\user\UserInterface;
 
 /**
- * Defines the Description entity entity.
+ * Defines the Guideline entity.
  *
- * @ingroup extended_field_description
+ * @ingroup guidelines
  *
  * @ContentEntityType(
- *   id = "description_entity",
- *   label = @Translation("Description entity"),
+ *   id = "guideline",
+ *   label = @Translation("Guideline"),
+ *   bundle_label = @Translation("Guideline type"),
  *   handlers = {
- *     "storage" = "Drupal\extended_field_description\DescriptionEntityStorage",
+ *     "storage" = "Drupal\guidelines\GuidelineStorage",
  *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
- *     "list_builder" = "Drupal\extended_field_description\DescriptionEntityListBuilder",
- *     "views_data" = "Drupal\extended_field_description\Entity\DescriptionEntityViewsData",
- *     "translation" = "Drupal\extended_field_description\DescriptionEntityTranslationHandler",
+ *     "list_builder" = "Drupal\guidelines\GuidelineListBuilder",
+ *     "views_data" = "Drupal\guidelines\Entity\GuidelineViewsData",
+ *     "translation" = "Drupal\guidelines\GuidelineTranslationHandler",
  *
  *     "form" = {
- *       "default" = "Drupal\extended_field_description\Form\DescriptionEntityForm",
- *       "add" = "Drupal\extended_field_description\Form\DescriptionEntityForm",
- *       "edit" = "Drupal\extended_field_description\Form\DescriptionEntityForm",
- *       "delete" = "Drupal\extended_field_description\Form\DescriptionEntityDeleteForm",
+ *       "default" = "Drupal\guidelines\Form\GuidelineForm",
+ *       "add" = "Drupal\guidelines\Form\GuidelineForm",
+ *       "edit" = "Drupal\guidelines\Form\GuidelineForm",
+ *       "delete" = "Drupal\guidelines\Form\GuidelineDeleteForm",
  *     },
  *     "route_provider" = {
- *       "html" = "Drupal\extended_field_description\DescriptionEntityHtmlRouteProvider",
+ *       "html" = "Drupal\guidelines\GuidelineHtmlRouteProvider",
  *     },
- *     "access" = "Drupal\extended_field_description\DescriptionEntityAccessControlHandler",
+ *     "access" = "Drupal\guidelines\GuidelineAccessControlHandler",
  *   },
- *   base_table = "description_entity",
- *   data_table = "description_entity_field_data",
- *   revision_table = "description_entity_revision",
- *   revision_data_table = "description_entity_field_revision",
+ *   base_table = "guideline",
+ *   data_table = "guideline_field_data",
+ *   revision_table = "guideline_revision",
+ *   revision_data_table = "guideline_field_revision",
  *   translatable = TRUE,
- *   admin_permission = "administer description entity entities",
+ *   permission_granularity = "bundle",
+ *   admin_permission = "administer guideline entities",
  *   entity_keys = {
  *     "id" = "id",
  *     "revision" = "vid",
+ *     "bundle" = "type",
  *     "label" = "name",
  *     "uuid" = "uuid",
  *     "uid" = "user_id",
@@ -58,21 +61,23 @@
  *     "revision_log_message" = "revision_log",
  *   },
  *   links = {
- *     "canonical" = "/admin/structure/description_entity/{description_entity}",
- *     "add-form" = "/admin/structure/description_entity/add",
- *     "edit-form" = "/admin/structure/description_entity/{description_entity}/edit",
- *     "delete-form" = "/admin/structure/description_entity/{description_entity}/delete",
- *     "version-history" = "/admin/structure/description_entity/{description_entity}/revisions",
- *     "revision" = "/admin/structure/description_entity/{description_entity}/revisions/{description_entity_revision}/view",
- *     "revision_revert" = "/admin/structure/description_entity/{description_entity}/revisions/{description_entity_revision}/revert",
- *     "revision_delete" = "/admin/structure/description_entity/{description_entity}/revisions/{description_entity_revision}/delete",
- *     "translation_revert" = "/admin/structure/description_entity/{description_entity}/revisions/{description_entity_revision}/revert/{langcode}",
- *     "collection" = "/admin/structure/description_entity",
+ *     "canonical" = "/admin/structure/guideline/{guideline}",
+ *     "add-page" = "/admin/structure/guideline/add",
+ *     "add-form" = "/admin/structure/guideline/add/{guideline_type}",
+ *     "edit-form" = "/admin/structure/guideline/{guideline}/edit",
+ *     "delete-form" = "/admin/structure/guideline/{guideline}/delete",
+ *     "version-history" = "/admin/structure/guideline/{guideline}/revisions",
+ *     "revision" = "/admin/structure/guideline/{guideline}/revisions/{guideline_revision}/view",
+ *     "revision_revert" = "/admin/structure/guideline/{guideline}/revisions/{guideline_revision}/revert",
+ *     "revision_delete" = "/admin/structure/guideline/{guideline}/revisions/{guideline_revision}/delete",
+ *     "translation_revert" = "/admin/structure/guideline/{guideline}/revisions/{guideline_revision}/revert/{langcode}",
+ *     "collection" = "/admin/structure/guideline",
  *   },
- *   field_ui_base_route = "description_entity.settings"
+ *   bundle_entity_type = "guideline_type",
+ *   field_ui_base_route = "entity.guideline_type.edit_form"
  * )
  */
-class DescriptionEntity extends EditorialContentEntityBase implements DescriptionEntityInterface {
+class Guideline extends EditorialContentEntityBase implements GuidelineInterface {
 
   use EntityChangedTrait;
   use EntityPublishedTrait;
@@ -119,7 +124,7 @@ public function preSave(EntityStorageInterface $storage) {
     }
 
     // If no revision author has been set explicitly,
-    // make the description_entity owner the revision author.
+    // make the guideline owner the revision author.
     if (!$this->getRevisionUser()) {
       $this->setRevisionUserId($this->getOwnerId());
     }
@@ -196,7 +201,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
 
     $fields['user_id'] = BaseFieldDefinition::create('entity_reference')
       ->setLabel(t('Authored by'))
-      ->setDescription(t('The user ID of author of the Description entity entity.'))
+      ->setDescription(t('The user ID of author of the Guideline entity.'))
       ->setRevisionable(TRUE)
       ->setSetting('target_type', 'user')
       ->setSetting('handler', 'default')
@@ -221,7 +226,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
 
     $fields['name'] = BaseFieldDefinition::create('string')
       ->setLabel(t('Name'))
-      ->setDescription(t('The name of the Description entity entity.'))
+      ->setDescription(t('The name of the Guideline entity.'))
       ->setRevisionable(TRUE)
       ->setSettings([
         'max_length' => 50,
@@ -241,7 +246,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
       ->setDisplayConfigurable('view', TRUE)
       ->setRequired(TRUE);
 
-    $fields['status']->setDescription(t('A boolean indicating whether the Description entity is published.'))
+    $fields['status']->setDescription(t('A boolean indicating whether the Guideline is published.'))
       ->setDisplayOptions('form', [
         'type' => 'boolean_checkbox',
         'weight' => -3,
diff --git a/html/modules/custom/guidelines/src/Entity/GuidelineInterface.php b/html/modules/custom/guidelines/src/Entity/GuidelineInterface.php
new file mode 100644
index 000000000..3beec152c
--- /dev/null
+++ b/html/modules/custom/guidelines/src/Entity/GuidelineInterface.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace Drupal\guidelines\Entity;
+
+use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\Core\Entity\RevisionLogInterface;
+use Drupal\Core\Entity\EntityChangedInterface;
+use Drupal\Core\Entity\EntityPublishedInterface;
+use Drupal\user\EntityOwnerInterface;
+
+/**
+ * Provides an interface for defining Guideline entities.
+ *
+ * @ingroup guidelines
+ */
+interface GuidelineInterface extends ContentEntityInterface, RevisionLogInterface, EntityChangedInterface, EntityPublishedInterface, EntityOwnerInterface {
+
+  /**
+   * Add get/set methods for your configuration properties here.
+   */
+
+  /**
+   * Gets the Guideline name.
+   *
+   * @return string
+   *   Name of the Guideline.
+   */
+  public function getName();
+
+  /**
+   * Sets the Guideline name.
+   *
+   * @param string $name
+   *   The Guideline name.
+   *
+   * @return \Drupal\guidelines\Entity\GuidelineInterface
+   *   The called Guideline entity.
+   */
+  public function setName($name);
+
+  /**
+   * Gets the Guideline creation timestamp.
+   *
+   * @return int
+   *   Creation timestamp of the Guideline.
+   */
+  public function getCreatedTime();
+
+  /**
+   * Sets the Guideline creation timestamp.
+   *
+   * @param int $timestamp
+   *   The Guideline creation timestamp.
+   *
+   * @return \Drupal\guidelines\Entity\GuidelineInterface
+   *   The called Guideline entity.
+   */
+  public function setCreatedTime($timestamp);
+
+  /**
+   * Gets the Guideline revision creation timestamp.
+   *
+   * @return int
+   *   The UNIX timestamp of when this revision was created.
+   */
+  public function getRevisionCreationTime();
+
+  /**
+   * Sets the Guideline revision creation timestamp.
+   *
+   * @param int $timestamp
+   *   The UNIX timestamp of when this revision was created.
+   *
+   * @return \Drupal\guidelines\Entity\GuidelineInterface
+   *   The called Guideline entity.
+   */
+  public function setRevisionCreationTime($timestamp);
+
+  /**
+   * Gets the Guideline revision author.
+   *
+   * @return \Drupal\user\UserInterface
+   *   The user entity for the revision author.
+   */
+  public function getRevisionUser();
+
+  /**
+   * Sets the Guideline revision author.
+   *
+   * @param int $uid
+   *   The user ID of the revision author.
+   *
+   * @return \Drupal\guidelines\Entity\GuidelineInterface
+   *   The called Guideline entity.
+   */
+  public function setRevisionUserId($uid);
+
+}
diff --git a/html/modules/custom/guidelines/src/Entity/GuidelineType.php b/html/modules/custom/guidelines/src/Entity/GuidelineType.php
new file mode 100644
index 000000000..00ccc89e9
--- /dev/null
+++ b/html/modules/custom/guidelines/src/Entity/GuidelineType.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Drupal\guidelines\Entity;
+
+use Drupal\Core\Config\Entity\ConfigEntityBundleBase;
+
+/**
+ * Defines the Guideline type entity.
+ *
+ * @ConfigEntityType(
+ *   id = "guideline_type",
+ *   label = @Translation("Guideline type"),
+ *   handlers = {
+ *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
+ *     "list_builder" = "Drupal\guidelines\GuidelineTypeListBuilder",
+ *     "form" = {
+ *       "add" = "Drupal\guidelines\Form\GuidelineTypeForm",
+ *       "edit" = "Drupal\guidelines\Form\GuidelineTypeForm",
+ *       "delete" = "Drupal\guidelines\Form\GuidelineTypeDeleteForm"
+ *     },
+ *     "route_provider" = {
+ *       "html" = "Drupal\guidelines\GuidelineTypeHtmlRouteProvider",
+ *     },
+ *   },
+ *   config_prefix = "guideline_type",
+ *   admin_permission = "administer site configuration",
+ *   bundle_of = "guideline",
+ *   entity_keys = {
+ *     "id" = "id",
+ *     "label" = "label",
+ *     "uuid" = "uuid"
+ *   },
+ *   config_export = {
+ *     "id",
+ *     "label",
+ *   },
+ *   links = {
+ *     "canonical" = "/admin/structure/guideline_type/{guideline_type}",
+ *     "add-form" = "/admin/structure/guideline_type/add",
+ *     "edit-form" = "/admin/structure/guideline_type/{guideline_type}/edit",
+ *     "delete-form" = "/admin/structure/guideline_type/{guideline_type}/delete",
+ *     "collection" = "/admin/structure/guideline_type"
+ *   }
+ * )
+ */
+class GuidelineType extends ConfigEntityBundleBase implements GuidelineTypeInterface {
+
+  /**
+   * The Guideline type ID.
+   *
+   * @var string
+   */
+  protected $id;
+
+  /**
+   * The Guideline type label.
+   *
+   * @var string
+   */
+  protected $label;
+
+}
diff --git a/html/modules/custom/guidelines/src/Entity/GuidelineTypeInterface.php b/html/modules/custom/guidelines/src/Entity/GuidelineTypeInterface.php
new file mode 100644
index 000000000..bdbfff65f
--- /dev/null
+++ b/html/modules/custom/guidelines/src/Entity/GuidelineTypeInterface.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Drupal\guidelines\Entity;
+
+use Drupal\Core\Config\Entity\ConfigEntityInterface;
+
+/**
+ * Provides an interface for defining Guideline type entities.
+ */
+interface GuidelineTypeInterface extends ConfigEntityInterface {
+
+  // Add get/set methods for your configuration properties here.
+}
diff --git a/html/modules/custom/extended_field_description/src/Entity/DescriptionEntityViewsData.php b/html/modules/custom/guidelines/src/Entity/GuidelineViewsData.php
similarity index 62%
rename from html/modules/custom/extended_field_description/src/Entity/DescriptionEntityViewsData.php
rename to html/modules/custom/guidelines/src/Entity/GuidelineViewsData.php
index dcfa004c6..b7a3be7b6 100644
--- a/html/modules/custom/extended_field_description/src/Entity/DescriptionEntityViewsData.php
+++ b/html/modules/custom/guidelines/src/Entity/GuidelineViewsData.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Drupal\extended_field_description\Entity;
+namespace Drupal\guidelines\Entity;
 
 use Drupal\views\EntityViewsData;
 
 /**
- * Provides Views data for Description entity entities.
+ * Provides Views data for Guideline entities.
  */
-class DescriptionEntityViewsData extends EntityViewsData {
+class GuidelineViewsData extends EntityViewsData {
 
   /**
    * {@inheritdoc}
diff --git a/html/modules/custom/guidelines/src/Form/GuidelineDeleteForm.php b/html/modules/custom/guidelines/src/Form/GuidelineDeleteForm.php
new file mode 100644
index 000000000..b04fa9b6e
--- /dev/null
+++ b/html/modules/custom/guidelines/src/Form/GuidelineDeleteForm.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Drupal\guidelines\Form;
+
+use Drupal\Core\Entity\ContentEntityDeleteForm;
+
+/**
+ * Provides a form for deleting Guideline entities.
+ *
+ * @ingroup guidelines
+ */
+class GuidelineDeleteForm extends ContentEntityDeleteForm {
+
+
+}
diff --git a/html/modules/custom/extended_field_description/src/Form/DescriptionEntityForm.php b/html/modules/custom/guidelines/src/Form/GuidelineForm.php
similarity index 81%
rename from html/modules/custom/extended_field_description/src/Form/DescriptionEntityForm.php
rename to html/modules/custom/guidelines/src/Form/GuidelineForm.php
index 176a90dd3..78b51ec0a 100644
--- a/html/modules/custom/extended_field_description/src/Form/DescriptionEntityForm.php
+++ b/html/modules/custom/guidelines/src/Form/GuidelineForm.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Drupal\extended_field_description\Form;
+namespace Drupal\guidelines\Form;
 
 use Drupal\Core\Entity\ContentEntityForm;
 use Drupal\Core\Form\FormStateInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Form controller for Description entity edit forms.
+ * Form controller for Guideline edit forms.
  *
- * @ingroup extended_field_description
+ * @ingroup guidelines
  */
-class DescriptionEntityForm extends ContentEntityForm {
+class GuidelineForm extends ContentEntityForm {
 
   /**
    * The current user account.
@@ -34,7 +34,7 @@ public static function create(ContainerInterface $container) {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    /* @var \Drupal\extended_field_description\Entity\DescriptionEntity $entity */
+    /* @var \Drupal\guidelines\Entity\Guideline $entity */
     $form = parent::buildForm($form, $form_state);
 
     if (!$this->entity->isNew()) {
@@ -71,17 +71,17 @@ public function save(array $form, FormStateInterface $form_state) {
 
     switch ($status) {
       case SAVED_NEW:
-        $this->messenger()->addMessage($this->t('Created the %label Description entity.', [
+        $this->messenger()->addMessage($this->t('Created the %label Guideline.', [
           '%label' => $entity->label(),
         ]));
         break;
 
       default:
-        $this->messenger()->addMessage($this->t('Saved the %label Description entity.', [
+        $this->messenger()->addMessage($this->t('Saved the %label Guideline.', [
           '%label' => $entity->label(),
         ]));
     }
-    $form_state->setRedirect('entity.description_entity.canonical', ['description_entity' => $entity->id()]);
+    $form_state->setRedirect('entity.guideline.canonical', ['guideline' => $entity->id()]);
   }
 
 }
diff --git a/html/modules/custom/extended_field_description/src/Form/DescriptionEntityRevisionDeleteForm.php b/html/modules/custom/guidelines/src/Form/GuidelineRevisionDeleteForm.php
similarity index 50%
rename from html/modules/custom/extended_field_description/src/Form/DescriptionEntityRevisionDeleteForm.php
rename to html/modules/custom/guidelines/src/Form/GuidelineRevisionDeleteForm.php
index 2598e59ec..6950df3e5 100644
--- a/html/modules/custom/extended_field_description/src/Form/DescriptionEntityRevisionDeleteForm.php
+++ b/html/modules/custom/guidelines/src/Form/GuidelineRevisionDeleteForm.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\extended_field_description\Form;
+namespace Drupal\guidelines\Form;
 
 use Drupal\Core\Form\ConfirmFormBase;
 use Drupal\Core\Form\FormStateInterface;
@@ -8,25 +8,25 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Provides a form for deleting a Description entity revision.
+ * Provides a form for deleting a Guideline revision.
  *
- * @ingroup extended_field_description
+ * @ingroup guidelines
  */
-class DescriptionEntityRevisionDeleteForm extends ConfirmFormBase {
+class GuidelineRevisionDeleteForm extends ConfirmFormBase {
 
   /**
-   * The Description entity revision.
+   * The Guideline revision.
    *
-   * @var \Drupal\extended_field_description\Entity\DescriptionEntityInterface
+   * @var \Drupal\guidelines\Entity\GuidelineInterface
    */
   protected $revision;
 
   /**
-   * The Description entity storage.
+   * The Guideline storage.
    *
    * @var \Drupal\Core\Entity\EntityStorageInterface
    */
-  protected $descriptionEntityStorage;
+  protected $guidelineStorage;
 
   /**
    * The database connection.
@@ -40,7 +40,7 @@ class DescriptionEntityRevisionDeleteForm extends ConfirmFormBase {
    */
   public static function create(ContainerInterface $container) {
     $instance = parent::create($container);
-    $instance->descriptionEntityStorage = $container->get('entity_type.manager')->getStorage('description_entity');
+    $instance->guidelineStorage = $container->get('entity_type.manager')->getStorage('guideline');
     $instance->connection = $container->get('database');
     return $instance;
   }
@@ -49,7 +49,7 @@ public static function create(ContainerInterface $container) {
    * {@inheritdoc}
    */
   public function getFormId() {
-    return 'description_entity_revision_delete_confirm';
+    return 'guideline_revision_delete_confirm';
   }
 
   /**
@@ -65,7 +65,7 @@ public function getQuestion() {
    * {@inheritdoc}
    */
   public function getCancelUrl() {
-    return new Url('entity.description_entity.version_history', ['description_entity' => $this->revision->id()]);
+    return new Url('entity.guideline.version_history', ['guideline' => $this->revision->id()]);
   }
 
   /**
@@ -78,8 +78,8 @@ public function getConfirmText() {
   /**
    * {@inheritdoc}
    */
-  public function buildForm(array $form, FormStateInterface $form_state, $description_entity_revision = NULL) {
-    $this->revision = $this->DescriptionEntityStorage->loadRevision($description_entity_revision);
+  public function buildForm(array $form, FormStateInterface $form_state, $guideline_revision = NULL) {
+    $this->revision = $this->GuidelineStorage->loadRevision($guideline_revision);
     $form = parent::buildForm($form, $form_state);
 
     return $form;
@@ -89,18 +89,18 @@ public function buildForm(array $form, FormStateInterface $form_state, $descript
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
-    $this->DescriptionEntityStorage->deleteRevision($this->revision->getRevisionId());
+    $this->GuidelineStorage->deleteRevision($this->revision->getRevisionId());
 
-    $this->logger('content')->notice('Description entity: deleted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
-    $this->messenger()->addMessage(t('Revision from %revision-date of Description entity %title has been deleted.', ['%revision-date' => format_date($this->revision->getRevisionCreationTime()), '%title' => $this->revision->label()]));
+    $this->logger('content')->notice('Guideline: deleted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
+    $this->messenger()->addMessage(t('Revision from %revision-date of Guideline %title has been deleted.', ['%revision-date' => format_date($this->revision->getRevisionCreationTime()), '%title' => $this->revision->label()]));
     $form_state->setRedirect(
-      'entity.description_entity.canonical',
-       ['description_entity' => $this->revision->id()]
+      'entity.guideline.canonical',
+       ['guideline' => $this->revision->id()]
     );
-    if ($this->connection->query('SELECT COUNT(DISTINCT vid) FROM {description_entity_field_revision} WHERE id = :id', [':id' => $this->revision->id()])->fetchField() > 1) {
+    if ($this->connection->query('SELECT COUNT(DISTINCT vid) FROM {guideline_field_revision} WHERE id = :id', [':id' => $this->revision->id()])->fetchField() > 1) {
       $form_state->setRedirect(
-        'entity.description_entity.version_history',
-         ['description_entity' => $this->revision->id()]
+        'entity.guideline.version_history',
+         ['guideline' => $this->revision->id()]
       );
     }
   }
diff --git a/html/modules/custom/extended_field_description/src/Form/DescriptionEntityRevisionRevertForm.php b/html/modules/custom/guidelines/src/Form/GuidelineRevisionRevertForm.php
similarity index 58%
rename from html/modules/custom/extended_field_description/src/Form/DescriptionEntityRevisionRevertForm.php
rename to html/modules/custom/guidelines/src/Form/GuidelineRevisionRevertForm.php
index 3bc53c94d..28a4d637c 100644
--- a/html/modules/custom/extended_field_description/src/Form/DescriptionEntityRevisionRevertForm.php
+++ b/html/modules/custom/guidelines/src/Form/GuidelineRevisionRevertForm.php
@@ -1,33 +1,33 @@
 <?php
 
-namespace Drupal\extended_field_description\Form;
+namespace Drupal\guidelines\Form;
 
 use Drupal\Core\Form\ConfirmFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
-use Drupal\extended_field_description\Entity\DescriptionEntityInterface;
+use Drupal\guidelines\Entity\GuidelineInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Provides a form for reverting a Description entity revision.
+ * Provides a form for reverting a Guideline revision.
  *
- * @ingroup extended_field_description
+ * @ingroup guidelines
  */
-class DescriptionEntityRevisionRevertForm extends ConfirmFormBase {
+class GuidelineRevisionRevertForm extends ConfirmFormBase {
 
   /**
-   * The Description entity revision.
+   * The Guideline revision.
    *
-   * @var \Drupal\extended_field_description\Entity\DescriptionEntityInterface
+   * @var \Drupal\guidelines\Entity\GuidelineInterface
    */
   protected $revision;
 
   /**
-   * The Description entity storage.
+   * The Guideline storage.
    *
    * @var \Drupal\Core\Entity\EntityStorageInterface
    */
-  protected $descriptionEntityStorage;
+  protected $guidelineStorage;
 
   /**
    * The date formatter service.
@@ -41,7 +41,7 @@ class DescriptionEntityRevisionRevertForm extends ConfirmFormBase {
    */
   public static function create(ContainerInterface $container) {
     $instance = parent::create($container);
-    $instance->descriptionEntityStorage = $container->get('entity_type.manager')->getStorage('description_entity');
+    $instance->guidelineStorage = $container->get('entity_type.manager')->getStorage('guideline');
     $instance->dateFormatter = $container->get('date.formatter');
     return $instance;
   }
@@ -50,7 +50,7 @@ public static function create(ContainerInterface $container) {
    * {@inheritdoc}
    */
   public function getFormId() {
-    return 'description_entity_revision_revert_confirm';
+    return 'guideline_revision_revert_confirm';
   }
 
   /**
@@ -66,7 +66,7 @@ public function getQuestion() {
    * {@inheritdoc}
    */
   public function getCancelUrl() {
-    return new Url('entity.description_entity.version_history', ['description_entity' => $this->revision->id()]);
+    return new Url('entity.guideline.version_history', ['guideline' => $this->revision->id()]);
   }
 
   /**
@@ -86,8 +86,8 @@ public function getDescription() {
   /**
    * {@inheritdoc}
    */
-  public function buildForm(array $form, FormStateInterface $form_state, $description_entity_revision = NULL) {
-    $this->revision = $this->DescriptionEntityStorage->loadRevision($description_entity_revision);
+  public function buildForm(array $form, FormStateInterface $form_state, $guideline_revision = NULL) {
+    $this->revision = $this->GuidelineStorage->loadRevision($guideline_revision);
     $form = parent::buildForm($form, $form_state);
 
     return $form;
@@ -107,26 +107,26 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
     ]);
     $this->revision->save();
 
-    $this->logger('content')->notice('Description entity: reverted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
-    $this->messenger()->addMessage(t('Description entity %title has been reverted to the revision from %revision-date.', ['%title' => $this->revision->label(), '%revision-date' => $this->dateFormatter->format($original_revision_timestamp)]));
+    $this->logger('content')->notice('Guideline: reverted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
+    $this->messenger()->addMessage(t('Guideline %title has been reverted to the revision from %revision-date.', ['%title' => $this->revision->label(), '%revision-date' => $this->dateFormatter->format($original_revision_timestamp)]));
     $form_state->setRedirect(
-      'entity.description_entity.version_history',
-      ['description_entity' => $this->revision->id()]
+      'entity.guideline.version_history',
+      ['guideline' => $this->revision->id()]
     );
   }
 
   /**
    * Prepares a revision to be reverted.
    *
-   * @param \Drupal\extended_field_description\Entity\DescriptionEntityInterface $revision
+   * @param \Drupal\guidelines\Entity\GuidelineInterface $revision
    *   The revision to be reverted.
    * @param \Drupal\Core\Form\FormStateInterface $form_state
    *   The current state of the form.
    *
-   * @return \Drupal\extended_field_description\Entity\DescriptionEntityInterface
+   * @return \Drupal\guidelines\Entity\GuidelineInterface
    *   The prepared revision ready to be stored.
    */
-  protected function prepareRevertedRevision(DescriptionEntityInterface $revision, FormStateInterface $form_state) {
+  protected function prepareRevertedRevision(GuidelineInterface $revision, FormStateInterface $form_state) {
     $revision->setNewRevision();
     $revision->isDefaultRevision(TRUE);
     $revision->setRevisionCreationTime(REQUEST_TIME);
diff --git a/html/modules/custom/extended_field_description/src/Form/DescriptionEntityRevisionRevertTranslationForm.php b/html/modules/custom/guidelines/src/Form/GuidelineRevisionRevertTranslationForm.php
similarity index 71%
rename from html/modules/custom/extended_field_description/src/Form/DescriptionEntityRevisionRevertTranslationForm.php
rename to html/modules/custom/guidelines/src/Form/GuidelineRevisionRevertTranslationForm.php
index e9f7884d9..c764348bf 100644
--- a/html/modules/custom/extended_field_description/src/Form/DescriptionEntityRevisionRevertTranslationForm.php
+++ b/html/modules/custom/guidelines/src/Form/GuidelineRevisionRevertTranslationForm.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace Drupal\extended_field_description\Form;
+namespace Drupal\guidelines\Form;
 
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\extended_field_description\Entity\DescriptionEntityInterface;
+use Drupal\guidelines\Entity\GuidelineInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Provides a form for reverting a Description entity revision for a single trans.
+ * Provides a form for reverting a Guideline revision for a single trans.
  *
- * @ingroup extended_field_description
+ * @ingroup guidelines
  */
-class DescriptionEntityRevisionRevertTranslationForm extends DescriptionEntityRevisionRevertForm {
+class GuidelineRevisionRevertTranslationForm extends GuidelineRevisionRevertForm {
 
   /**
    * The language to be reverted.
@@ -40,7 +40,7 @@ public static function create(ContainerInterface $container) {
    * {@inheritdoc}
    */
   public function getFormId() {
-    return 'description_entity_revision_revert_translation_confirm';
+    return 'guideline_revision_revert_translation_confirm';
   }
 
   /**
@@ -56,9 +56,9 @@ public function getQuestion() {
   /**
    * {@inheritdoc}
    */
-  public function buildForm(array $form, FormStateInterface $form_state, $description_entity_revision = NULL, $langcode = NULL) {
+  public function buildForm(array $form, FormStateInterface $form_state, $guideline_revision = NULL, $langcode = NULL) {
     $this->langcode = $langcode;
-    $form = parent::buildForm($form, $form_state, $description_entity_revision);
+    $form = parent::buildForm($form, $form_state, $guideline_revision);
 
     $form['revert_untranslated_fields'] = [
       '#type' => 'checkbox',
@@ -72,11 +72,11 @@ public function buildForm(array $form, FormStateInterface $form_state, $descript
   /**
    * {@inheritdoc}
    */
-  protected function prepareRevertedRevision(DescriptionEntityInterface $revision, FormStateInterface $form_state) {
+  protected function prepareRevertedRevision(GuidelineInterface $revision, FormStateInterface $form_state) {
     $revert_untranslated_fields = $form_state->getValue('revert_untranslated_fields');
 
-    /** @var \Drupal\extended_field_description\Entity\DescriptionEntityInterface $default_revision */
-    $latest_revision = $this->DescriptionEntityStorage->load($revision->id());
+    /** @var \Drupal\guidelines\Entity\GuidelineInterface $default_revision */
+    $latest_revision = $this->GuidelineStorage->load($revision->id());
     $latest_revision_translation = $latest_revision->getTranslation($this->langcode);
 
     $revision_translation = $revision->getTranslation($this->langcode);
diff --git a/html/modules/custom/extended_field_description/src/Form/DescriptionEntitySettingsForm.php b/html/modules/custom/guidelines/src/Form/GuidelineSettingsForm.php
similarity index 70%
rename from html/modules/custom/extended_field_description/src/Form/DescriptionEntitySettingsForm.php
rename to html/modules/custom/guidelines/src/Form/GuidelineSettingsForm.php
index aca986e47..c2be7ddc6 100644
--- a/html/modules/custom/extended_field_description/src/Form/DescriptionEntitySettingsForm.php
+++ b/html/modules/custom/guidelines/src/Form/GuidelineSettingsForm.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\extended_field_description\Form;
+namespace Drupal\guidelines\Form;
 
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 
 /**
- * Class DescriptionEntitySettingsForm.
+ * Class GuidelineSettingsForm.
  *
- * @ingroup extended_field_description
+ * @ingroup guidelines
  */
-class DescriptionEntitySettingsForm extends FormBase {
+class GuidelineSettingsForm extends FormBase {
 
   /**
    * Returns a unique string identifying the form.
@@ -19,7 +19,7 @@ class DescriptionEntitySettingsForm extends FormBase {
    *   The unique string identifying the form.
    */
   public function getFormId() {
-    return 'descriptionentity_settings';
+    return 'guideline_settings';
   }
 
   /**
@@ -35,7 +35,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
   }
 
   /**
-   * Defines the settings form for Description entity entities.
+   * Defines the settings form for Guideline entities.
    *
    * @param array $form
    *   An associative array containing the structure of the form.
@@ -46,7 +46,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
    *   Form definition array.
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['descriptionentity_settings']['#markup'] = 'Settings form for Description entity entities. Manage field settings here.';
+    $form['guideline_settings']['#markup'] = 'Settings form for Guideline entities. Manage field settings here.';
     return $form;
   }
 
diff --git a/html/modules/custom/guidelines/src/Form/GuidelineTypeDeleteForm.php b/html/modules/custom/guidelines/src/Form/GuidelineTypeDeleteForm.php
new file mode 100644
index 000000000..e83a576e1
--- /dev/null
+++ b/html/modules/custom/guidelines/src/Form/GuidelineTypeDeleteForm.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Drupal\guidelines\Form;
+
+use Drupal\Core\Entity\EntityConfirmFormBase;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Url;
+
+/**
+ * Builds the form to delete Guideline type entities.
+ */
+class GuidelineTypeDeleteForm extends EntityConfirmFormBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getQuestion() {
+    return $this->t('Are you sure you want to delete %name?', ['%name' => $this->entity->label()]);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getCancelUrl() {
+    return new Url('entity.guideline_type.collection');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getConfirmText() {
+    return $this->t('Delete');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    $this->entity->delete();
+
+    $this->messenger()->addMessage(
+      $this->t('content @type: deleted @label.', [
+        '@type' => $this->entity->bundle(),
+        '@label' => $this->entity->label(),
+      ])
+    );
+
+    $form_state->setRedirectUrl($this->getCancelUrl());
+  }
+
+}
diff --git a/html/modules/custom/guidelines/src/Form/GuidelineTypeForm.php b/html/modules/custom/guidelines/src/Form/GuidelineTypeForm.php
new file mode 100644
index 000000000..987a13c03
--- /dev/null
+++ b/html/modules/custom/guidelines/src/Form/GuidelineTypeForm.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Drupal\guidelines\Form;
+
+use Drupal\Core\Entity\EntityForm;
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Class GuidelineTypeForm.
+ */
+class GuidelineTypeForm extends EntityForm {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function form(array $form, FormStateInterface $form_state) {
+    $form = parent::form($form, $form_state);
+
+    $guideline_type = $this->entity;
+    $form['label'] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Label'),
+      '#maxlength' => 255,
+      '#default_value' => $guideline_type->label(),
+      '#description' => $this->t("Label for the Guideline type."),
+      '#required' => TRUE,
+    ];
+
+    $form['id'] = [
+      '#type' => 'machine_name',
+      '#default_value' => $guideline_type->id(),
+      '#machine_name' => [
+        'exists' => '\Drupal\guidelines\Entity\GuidelineType::load',
+      ],
+      '#disabled' => !$guideline_type->isNew(),
+    ];
+
+    /* You will need additional form elements for your custom properties. */
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function save(array $form, FormStateInterface $form_state) {
+    $guideline_type = $this->entity;
+    $status = $guideline_type->save();
+
+    switch ($status) {
+      case SAVED_NEW:
+        $this->messenger()->addMessage($this->t('Created the %label Guideline type.', [
+          '%label' => $guideline_type->label(),
+        ]));
+        break;
+
+      default:
+        $this->messenger()->addMessage($this->t('Saved the %label Guideline type.', [
+          '%label' => $guideline_type->label(),
+        ]));
+    }
+    $form_state->setRedirectUrl($guideline_type->toUrl('collection'));
+  }
+
+}
diff --git a/html/modules/custom/guidelines/src/GuidelineAccessControlHandler.php b/html/modules/custom/guidelines/src/GuidelineAccessControlHandler.php
new file mode 100644
index 000000000..7867403c4
--- /dev/null
+++ b/html/modules/custom/guidelines/src/GuidelineAccessControlHandler.php
@@ -0,0 +1,116 @@
+<?php
+
+namespace Drupal\guidelines;
+
+use Drupal\Core\Entity\EntityAccessControlHandler;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Access\AccessResult;
+
+/**
+ * Access controller for the Guideline entity.
+ *
+ * @see \Drupal\guidelines\Entity\Guideline.
+ */
+class GuidelineAccessControlHandler extends EntityAccessControlHandler {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
+    /** @var \Drupal\guidelines\Entity\GuidelineInterface $entity */
+
+    switch ($operation) {
+
+      case 'view':
+
+        if (!$entity->isPublished()) {
+          $permission = $this->checkOwn($entity, 'view unpublished', $account);
+          if (!empty($permission)) {
+            return AccessResult::allowed();
+          }
+
+          return AccessResult::allowedIfHasPermission($account, 'view unpublished guideline entities');
+        }
+
+        $permission = $this->checkOwn($entity, $operation, $account);
+        if (!empty($permission)) {
+          return AccessResult::allowed();
+        }
+
+        return AccessResult::allowedIfHasPermission($account, 'view published guideline entities');
+
+      case 'update':
+
+        $permission = $this->checkOwn($entity, $operation, $account);
+        if (!empty($permission)) {
+          return AccessResult::allowed();
+        }
+        return AccessResult::allowedIfHasPermission($account, 'edit guideline entities');
+
+      case 'delete':
+
+        $permission = $this->checkOwn($entity, $operation, $account);
+        if (!empty($permission)) {
+          return AccessResult::allowed();
+        }
+        return AccessResult::allowedIfHasPermission($account, 'delete guideline entities');
+    }
+
+    // Unknown operation, no opinion.
+    return AccessResult::neutral();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function checkCreateAccess(AccountInterface $account, array $context, $entity_bundle = NULL) {
+    return AccessResult::allowedIfHasPermission($account, 'add guideline entities');
+  }
+
+  /**
+   * Test for given 'own' permission.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   * @param $operation
+   * @param \Drupal\Core\Session\AccountInterface $account
+   *
+   * @return string|null
+   *   The permission string indicating it's allowed.
+   */
+  protected function checkOwn(EntityInterface $entity, $operation, AccountInterface $account) {
+    $status = $entity->isPublished();
+    $uid = $entity->getOwnerId();
+
+    $is_own = $account->isAuthenticated() && $account->id() == $uid;
+    if (!$is_own) {
+      return;
+    }
+
+    $bundle = $entity->bundle();
+
+    $ops = [
+      'create' => '%bundle add own %bundle entities',
+      'view unpublished' => '%bundle view own unpublished %bundle entities',
+      'view' => '%bundle view own entities',
+      'update' => '%bundle edit own entities',
+      'delete' => '%bundle delete own entities',
+    ];
+    $permission = strtr($ops[$operation], ['%bundle' => $bundle]);
+
+    if ($operation === 'view unpublished') {
+      if (!$status && $account->hasPermission($permission)) {
+        return $permission;
+      }
+      else {
+        return NULL;
+      }
+    }
+    if ($account->hasPermission($permission)) {
+      return $permission;
+    }
+
+    return NULL;
+  }
+
+}
diff --git a/html/modules/custom/extended_field_description/src/DescriptionEntityHtmlRouteProvider.php b/html/modules/custom/guidelines/src/GuidelineHtmlRouteProvider.php
similarity index 79%
rename from html/modules/custom/extended_field_description/src/DescriptionEntityHtmlRouteProvider.php
rename to html/modules/custom/guidelines/src/GuidelineHtmlRouteProvider.php
index 7aa801e18..d8ff17cc5 100644
--- a/html/modules/custom/extended_field_description/src/DescriptionEntityHtmlRouteProvider.php
+++ b/html/modules/custom/guidelines/src/GuidelineHtmlRouteProvider.php
@@ -1,18 +1,18 @@
 <?php
 
-namespace Drupal\extended_field_description;
+namespace Drupal\guidelines;
 
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\Routing\AdminHtmlRouteProvider;
 use Symfony\Component\Routing\Route;
 
 /**
- * Provides routes for Description entity entities.
+ * Provides routes for Guideline entities.
  *
  * @see \Drupal\Core\Entity\Routing\AdminHtmlRouteProvider
  * @see \Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider
  */
-class DescriptionEntityHtmlRouteProvider extends AdminHtmlRouteProvider {
+class GuidelineHtmlRouteProvider extends AdminHtmlRouteProvider {
 
   /**
    * {@inheritdoc}
@@ -64,9 +64,9 @@ protected function getHistoryRoute(EntityTypeInterface $entity_type) {
       $route
         ->setDefaults([
           '_title' => "{$entity_type->getLabel()} revisions",
-          '_controller' => '\Drupal\extended_field_description\Controller\DescriptionEntityController::revisionOverview',
+          '_controller' => '\Drupal\guidelines\Controller\GuidelineController::revisionOverview',
         ])
-        ->setRequirement('_permission', 'view all description entity revisions')
+        ->setRequirement('_permission', 'view all guideline revisions')
         ->setOption('_admin_route', TRUE);
 
       return $route;
@@ -87,10 +87,10 @@ protected function getRevisionRoute(EntityTypeInterface $entity_type) {
       $route = new Route($entity_type->getLinkTemplate('revision'));
       $route
         ->setDefaults([
-          '_controller' => '\Drupal\extended_field_description\Controller\DescriptionEntityController::revisionShow',
-          '_title_callback' => '\Drupal\extended_field_description\Controller\DescriptionEntityController::revisionPageTitle',
+          '_controller' => '\Drupal\guidelines\Controller\GuidelineController::revisionShow',
+          '_title_callback' => '\Drupal\guidelines\Controller\GuidelineController::revisionPageTitle',
         ])
-        ->setRequirement('_permission', 'view all description entity revisions')
+        ->setRequirement('_permission', 'view all guideline revisions')
         ->setOption('_admin_route', TRUE);
 
       return $route;
@@ -111,10 +111,10 @@ protected function getRevisionRevertRoute(EntityTypeInterface $entity_type) {
       $route = new Route($entity_type->getLinkTemplate('revision_revert'));
       $route
         ->setDefaults([
-          '_form' => '\Drupal\extended_field_description\Form\DescriptionEntityRevisionRevertForm',
+          '_form' => '\Drupal\guidelines\Form\GuidelineRevisionRevertForm',
           '_title' => 'Revert to earlier revision',
         ])
-        ->setRequirement('_permission', 'revert all description entity revisions')
+        ->setRequirement('_permission', 'revert all guideline revisions')
         ->setOption('_admin_route', TRUE);
 
       return $route;
@@ -135,10 +135,10 @@ protected function getRevisionDeleteRoute(EntityTypeInterface $entity_type) {
       $route = new Route($entity_type->getLinkTemplate('revision_delete'));
       $route
         ->setDefaults([
-          '_form' => '\Drupal\extended_field_description\Form\DescriptionEntityRevisionDeleteForm',
+          '_form' => '\Drupal\guidelines\Form\GuidelineRevisionDeleteForm',
           '_title' => 'Delete earlier revision',
         ])
-        ->setRequirement('_permission', 'delete all description entity revisions')
+        ->setRequirement('_permission', 'delete all guideline revisions')
         ->setOption('_admin_route', TRUE);
 
       return $route;
@@ -159,10 +159,10 @@ protected function getRevisionTranslationRevertRoute(EntityTypeInterface $entity
       $route = new Route($entity_type->getLinkTemplate('translation_revert'));
       $route
         ->setDefaults([
-          '_form' => '\Drupal\extended_field_description\Form\DescriptionEntityRevisionRevertTranslationForm',
+          '_form' => '\Drupal\guidelines\Form\GuidelineRevisionRevertTranslationForm',
           '_title' => 'Revert to earlier revision of a translation',
         ])
-        ->setRequirement('_permission', 'revert all description entity revisions')
+        ->setRequirement('_permission', 'revert all guideline revisions')
         ->setOption('_admin_route', TRUE);
 
       return $route;
@@ -183,7 +183,7 @@ protected function getSettingsFormRoute(EntityTypeInterface $entity_type) {
       $route = new Route("/admin/structure/{$entity_type->id()}/settings");
       $route
         ->setDefaults([
-          '_form' => 'Drupal\extended_field_description\Form\DescriptionEntitySettingsForm',
+          '_form' => 'Drupal\guidelines\Form\GuidelineSettingsForm',
           '_title' => "{$entity_type->getLabel()} settings",
         ])
         ->setRequirement('_permission', $entity_type->getAdminPermission())
diff --git a/html/modules/custom/extended_field_description/src/DescriptionEntityListBuilder.php b/html/modules/custom/guidelines/src/GuidelineListBuilder.php
similarity index 53%
rename from html/modules/custom/extended_field_description/src/DescriptionEntityListBuilder.php
rename to html/modules/custom/guidelines/src/GuidelineListBuilder.php
index e87785ad3..d0aa1efc6 100644
--- a/html/modules/custom/extended_field_description/src/DescriptionEntityListBuilder.php
+++ b/html/modules/custom/guidelines/src/GuidelineListBuilder.php
@@ -1,23 +1,23 @@
 <?php
 
-namespace Drupal\extended_field_description;
+namespace Drupal\guidelines;
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityListBuilder;
 use Drupal\Core\Link;
 
 /**
- * Defines a class to build a listing of Description entity entities.
+ * Defines a class to build a listing of Guideline entities.
  *
- * @ingroup extended_field_description
+ * @ingroup guidelines
  */
-class DescriptionEntityListBuilder extends EntityListBuilder {
+class GuidelineListBuilder extends EntityListBuilder {
 
   /**
    * {@inheritdoc}
    */
   public function buildHeader() {
-    $header['id'] = $this->t('Description entity ID');
+    $header['id'] = $this->t('Guideline ID');
     $header['name'] = $this->t('Name');
     return $header + parent::buildHeader();
   }
@@ -26,12 +26,12 @@ public function buildHeader() {
    * {@inheritdoc}
    */
   public function buildRow(EntityInterface $entity) {
-    /* @var \Drupal\extended_field_description\Entity\DescriptionEntity $entity */
+    /* @var \Drupal\guidelines\Entity\Guideline $entity */
     $row['id'] = $entity->id();
     $row['name'] = Link::createFromRoute(
       $entity->label(),
-      'entity.description_entity.edit_form',
-      ['description_entity' => $entity->id()]
+      'entity.guideline.edit_form',
+      ['guideline' => $entity->id()]
     );
     return $row + parent::buildRow($entity);
   }
diff --git a/html/modules/custom/guidelines/src/GuidelinePermissions.php b/html/modules/custom/guidelines/src/GuidelinePermissions.php
new file mode 100644
index 000000000..25ff2d3aa
--- /dev/null
+++ b/html/modules/custom/guidelines/src/GuidelinePermissions.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace Drupal\guidelines;
+
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\guidelines\Entity\Guideline;
+
+
+/**
+ * Provides dynamic permissions for Guideline of different types.
+ *
+ * @ingroup guidelines
+ *
+ */
+class GuidelinePermissions{
+
+  use StringTranslationTrait;
+
+  /**
+   * Returns an array of node type permissions.
+   *
+   * @return array
+   *   The Guideline by bundle permissions.
+   *   @see \Drupal\user\PermissionHandlerInterface::getPermissions()
+   */
+  public function generatePermissions() {
+    $perms = [];
+
+    foreach (Guideline::loadMultiple() as $type) {
+      $perms += $this->buildPermissions($type);
+    }
+
+    return $perms;
+  }
+
+  /**
+   * Returns a list of node permissions for a given node type.
+   *
+   * @param \Drupal\guidelines\Entity\Guideline $type
+   *   The Guideline type.
+   *
+   * @return array
+   *   An associative array of permission names and descriptions.
+   */
+  protected function buildPermissions(Guideline $type) {
+    $type_id = $type->id();
+    $type_params = ['%type_name' => $type->label()];
+
+    return [
+      "$type_id create entities" => [
+        'title' => $this->t('Create new %type_name entities', $type_params),
+      ],
+      "$type_id edit own entities" => [
+        'title' => $this->t('Edit own %type_name entities', $type_params),
+      ],
+      "$type_id edit any entities" => [
+        'title' => $this->t('Edit any %type_name entities', $type_params),
+      ],
+      "$type_id delete own entities" => [
+        'title' => $this->t('Delete own %type_name entities', $type_params),
+      ],
+      "$type_id delete any entities" => [
+        'title' => $this->t('Delete any %type_name entities', $type_params),
+      ],
+      "$type_id view revisions" => [
+        'title' => $this->t('View %type_name revisions', $type_params),
+        'description' => t('To view a revision, you also need permission to view the entity item.'),
+      ],
+      "$type_id revert revisions" => [
+        'title' => $this->t('Revert %type_name revisions', $type_params),
+        'description' => t('To revert a revision, you also need permission to edit the entity item.'),
+      ],
+      "$type_id delete revisions" => [
+        'title' => $this->t('Delete %type_name revisions', $type_params),
+        'description' => $this->t('To delete a revision, you also need permission to delete the entity item.'),
+      ],
+    ];
+  }
+
+}
diff --git a/html/modules/custom/guidelines/src/GuidelineStorage.php b/html/modules/custom/guidelines/src/GuidelineStorage.php
new file mode 100644
index 000000000..569c84e89
--- /dev/null
+++ b/html/modules/custom/guidelines/src/GuidelineStorage.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Drupal\guidelines;
+
+use Drupal\Core\Entity\Sql\SqlContentEntityStorage;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\guidelines\Entity\GuidelineInterface;
+
+/**
+ * Defines the storage handler class for Guideline entities.
+ *
+ * This extends the base storage class, adding required special handling for
+ * Guideline entities.
+ *
+ * @ingroup guidelines
+ */
+class GuidelineStorage extends SqlContentEntityStorage implements GuidelineStorageInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function revisionIds(GuidelineInterface $entity) {
+    return $this->database->query(
+      'SELECT vid FROM {guideline_revision} WHERE id=:id ORDER BY vid',
+      [':id' => $entity->id()]
+    )->fetchCol();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function userRevisionIds(AccountInterface $account) {
+    return $this->database->query(
+      'SELECT vid FROM {guideline_field_revision} WHERE uid = :uid ORDER BY vid',
+      [':uid' => $account->id()]
+    )->fetchCol();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function countDefaultLanguageRevisions(GuidelineInterface $entity) {
+    return $this->database->query('SELECT COUNT(*) FROM {guideline_field_revision} WHERE id = :id AND default_langcode = 1', [':id' => $entity->id()])
+      ->fetchField();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function clearRevisionsLanguage(LanguageInterface $language) {
+    return $this->database->update('guideline_revision')
+      ->fields(['langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED])
+      ->condition('langcode', $language->getId())
+      ->execute();
+  }
+
+}
diff --git a/html/modules/custom/guidelines/src/GuidelineStorageInterface.php b/html/modules/custom/guidelines/src/GuidelineStorageInterface.php
new file mode 100644
index 000000000..ab09f5118
--- /dev/null
+++ b/html/modules/custom/guidelines/src/GuidelineStorageInterface.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Drupal\guidelines;
+
+use Drupal\Core\Entity\ContentEntityStorageInterface;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Language\LanguageInterface;
+use Drupal\guidelines\Entity\GuidelineInterface;
+
+/**
+ * Defines the storage handler class for Guideline entities.
+ *
+ * This extends the base storage class, adding required special handling for
+ * Guideline entities.
+ *
+ * @ingroup guidelines
+ */
+interface GuidelineStorageInterface extends ContentEntityStorageInterface {
+
+  /**
+   * Gets a list of Guideline revision IDs for a specific Guideline.
+   *
+   * @param \Drupal\guidelines\Entity\GuidelineInterface $entity
+   *   The Guideline entity.
+   *
+   * @return int[]
+   *   Guideline revision IDs (in ascending order).
+   */
+  public function revisionIds(GuidelineInterface $entity);
+
+  /**
+   * Gets a list of revision IDs having a given user as Guideline author.
+   *
+   * @param \Drupal\Core\Session\AccountInterface $account
+   *   The user entity.
+   *
+   * @return int[]
+   *   Guideline revision IDs (in ascending order).
+   */
+  public function userRevisionIds(AccountInterface $account);
+
+  /**
+   * Counts the number of revisions in the default language.
+   *
+   * @param \Drupal\guidelines\Entity\GuidelineInterface $entity
+   *   The Guideline entity.
+   *
+   * @return int
+   *   The number of revisions in the default language.
+   */
+  public function countDefaultLanguageRevisions(GuidelineInterface $entity);
+
+  /**
+   * Unsets the language for all Guideline with the given language.
+   *
+   * @param \Drupal\Core\Language\LanguageInterface $language
+   *   The language object.
+   */
+  public function clearRevisionsLanguage(LanguageInterface $language);
+
+}
diff --git a/html/modules/custom/guidelines/src/GuidelineTranslationHandler.php b/html/modules/custom/guidelines/src/GuidelineTranslationHandler.php
new file mode 100644
index 000000000..978875e5c
--- /dev/null
+++ b/html/modules/custom/guidelines/src/GuidelineTranslationHandler.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Drupal\guidelines;
+
+use Drupal\content_translation\ContentTranslationHandler;
+
+/**
+ * Defines the translation handler for guideline.
+ */
+class GuidelineTranslationHandler extends ContentTranslationHandler {
+
+  // Override here the needed methods from ContentTranslationHandler.
+}
diff --git a/html/modules/custom/guidelines/src/GuidelineTypeHtmlRouteProvider.php b/html/modules/custom/guidelines/src/GuidelineTypeHtmlRouteProvider.php
new file mode 100644
index 000000000..4476c13c6
--- /dev/null
+++ b/html/modules/custom/guidelines/src/GuidelineTypeHtmlRouteProvider.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Drupal\guidelines;
+
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Entity\Routing\AdminHtmlRouteProvider;
+
+/**
+ * Provides routes for Guideline type entities.
+ *
+ * @see Drupal\Core\Entity\Routing\AdminHtmlRouteProvider
+ * @see Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider
+ */
+class GuidelineTypeHtmlRouteProvider extends AdminHtmlRouteProvider {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRoutes(EntityTypeInterface $entity_type) {
+    $collection = parent::getRoutes($entity_type);
+
+    // Provide your custom entity routes here.
+    return $collection;
+  }
+
+}
diff --git a/html/modules/custom/guidelines/src/GuidelineTypeListBuilder.php b/html/modules/custom/guidelines/src/GuidelineTypeListBuilder.php
new file mode 100644
index 000000000..7591a0a39
--- /dev/null
+++ b/html/modules/custom/guidelines/src/GuidelineTypeListBuilder.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Drupal\guidelines;
+
+use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
+use Drupal\Core\Entity\EntityInterface;
+
+/**
+ * Provides a listing of Guideline type entities.
+ */
+class GuidelineTypeListBuilder extends ConfigEntityListBuilder {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildHeader() {
+    $header['label'] = $this->t('Guideline type');
+    $header['id'] = $this->t('Machine name');
+    return $header + parent::buildHeader();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildRow(EntityInterface $entity) {
+    $row['label'] = $entity->label();
+    $row['id'] = $entity->id();
+    // You probably want a few more properties here...
+    return $row + parent::buildRow($entity);
+  }
+
+}
diff --git a/html/modules/custom/guidelines/src/Plugin/Field/FieldFormatter/GuidelineFieldTargetFormatter.php b/html/modules/custom/guidelines/src/Plugin/Field/FieldFormatter/GuidelineFieldTargetFormatter.php
new file mode 100644
index 000000000..18b5b8254
--- /dev/null
+++ b/html/modules/custom/guidelines/src/Plugin/Field/FieldFormatter/GuidelineFieldTargetFormatter.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace Drupal\guidelines\Plugin\Field\FieldFormatter;
+
+use Drupal\Component\Utility\Html;
+use Drupal\Core\Field\FieldItemInterface;
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Field\FormatterBase;
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Plugin implementation of the 'guideline_field_target_formatter' formatter.
+ *
+ * @FieldFormatter(
+ *   id = "guideline_field_target_formatter",
+ *   label = @Translation("Guideline field target formatter"),
+ *   field_types = {
+ *     "guideline_field_target_type"
+ *   }
+ * )
+ */
+class GuidelineFieldTargetFormatter extends FormatterBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function defaultSettings() {
+    return [
+      // Implement default settings.
+    ] + parent::defaultSettings();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function settingsForm(array $form, FormStateInterface $form_state) {
+    return [
+      // Implement settings form.
+    ] + parent::settingsForm($form, $form_state);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function settingsSummary() {
+    $summary = [];
+    // Implement settings summary.
+
+    return $summary;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function viewElements(FieldItemListInterface $items, $langcode) {
+    $elements = [];
+
+    foreach ($items as $delta => $item) {
+      $elements[$delta] = ['#markup' => $this->viewValue($item)];
+    }
+
+    return $elements;
+  }
+
+  /**
+   * Generate the output appropriate for one field item.
+   *
+   * @param \Drupal\Core\Field\FieldItemInterface $item
+   *   One field item.
+   *
+   * @return string
+   *   The textual output generated.
+   */
+  protected function viewValue(FieldItemInterface $item) {
+    // The text value has no text format assigned to it, so the user input
+    // should equal the output, including newlines.
+    return nl2br(Html::escape($item->value));
+  }
+
+}
diff --git a/html/modules/custom/guidelines/src/Plugin/Field/FieldType/GuidelineFieldTargetType.php b/html/modules/custom/guidelines/src/Plugin/Field/FieldType/GuidelineFieldTargetType.php
new file mode 100644
index 000000000..8494ca626
--- /dev/null
+++ b/html/modules/custom/guidelines/src/Plugin/Field/FieldType/GuidelineFieldTargetType.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace Drupal\guidelines\Plugin\Field\FieldType;
+
+use Drupal\Component\Utility\Random;
+use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\Core\Field\FieldItemBase;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
+use Drupal\Core\TypedData\DataDefinition;
+
+/**
+ * Plugin implementation of the 'guideline_field_target_type' field type.
+ *
+ * @FieldType(
+ *   id = "guideline_field_target_type",
+ *   label = @Translation("Guideline field target type"),
+ *   description = @Translation("My Field Type"),
+ *   default_widget = "guideline_field_target_widget",
+ *   default_formatter = "guideline_field_target_formatter"
+ * )
+ */
+class GuidelineFieldTargetType extends FieldItemBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function defaultStorageSettings() {
+    return [
+      'enabled_entities' => [],
+    ] + parent::defaultStorageSettings();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
+    // Prevent early t() calls by using the TranslatableMarkup.
+    $properties['value'] = DataDefinition::create('string')
+      ->setLabel(new TranslatableMarkup('Target'))
+      ->setRequired(TRUE);
+
+    return $properties;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function schema(FieldStorageDefinitionInterface $field_definition) {
+    $schema = [
+      'columns' => [
+        'value' => [
+          'type' => 'varchar',
+          'length' => 255,
+          'binary' => FALSE,
+        ],
+      ],
+    ];
+
+    return $schema;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function generateSampleValue(FieldDefinitionInterface $field_definition) {
+    $random = new Random();
+    $values['value'] = $random->word(mt_rand(1, 100));
+    return $values;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function storageSettingsForm(array &$form, FormStateInterface $form_state, $has_data) {
+    $elements = [];
+
+    $elements['enabled_entities'] = [
+      '#type' => 'checkboxes',
+      '#title' => t('Allowed entities'),
+      '#default_value' => $this->getSetting('enabled_entities'),
+      '#required' => FALSE,
+      '#description' => t('The entities that are allowed.'),
+      '#disabled' => $has_data,
+      '#options' => [
+        'node' => t('Node'),
+        'terms' => t('Terms'),
+      ]
+    ];
+
+    return $elements;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function isEmpty() {
+    $value = $this->get('value')->getValue();
+    return $value === NULL || $value === '';
+  }
+
+}
diff --git a/html/modules/custom/guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetWidget.php b/html/modules/custom/guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetWidget.php
new file mode 100644
index 000000000..34fc3469b
--- /dev/null
+++ b/html/modules/custom/guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetWidget.php
@@ -0,0 +1,138 @@
+<?php
+
+namespace Drupal\guidelines\Plugin\Field\FieldWidget;
+
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Field\Plugin\Field\FieldWidget\OptionsButtonsWidget;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Entity\FieldableEntityInterface;
+use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\field\Entity\FieldConfig;
+
+/**
+ * Plugin implementation of the 'guideline_field_target_widget' widget.
+ *
+ * @FieldWidget(
+ *   id = "guideline_field_target_widget",
+ *   module = "guidelines",
+ *   label = @Translation("Guideline field target widget"),
+ *   multiple_values = true,
+ *   field_types = {
+ *     "guideline_field_target_type"
+ *   }
+ * )
+ */
+class GuidelineFieldTargetWidget extends OptionsButtonsWidget {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function defaultSettings() {
+    return [
+      'enabled_entities' => [],
+    ] + parent::defaultSettings();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function settingsForm(array $form, FormStateInterface $form_state) {
+    $elements = [];
+
+    $content_entities = array_keys(\Drupal::service('entity_type.repository')->getEntityTypeLabels(TRUE)['Content']);
+
+    /** @var \Drupal\Core\Entity\EntityTypeBundleInfo $entity_type_bundle_info */
+    $entity_type_bundle_info = \Drupal::service('entity_type.bundle.info');
+    $all_bundle_info = $entity_type_bundle_info->getAllBundleInfo();
+
+    $options = [];
+    foreach ($content_entities as $content_entity) {
+      $options[$content_entity] = [];
+      foreach ($all_bundle_info[$content_entity] as $bundle => $info) {
+        $options[$content_entity][$content_entity . '.' . $bundle] = $info['label'];
+      }
+    }
+
+    $elements['enabled_entities'] = [
+      '#type' => 'select',
+      '#title' => t('Enabled entities'),
+      '#default_value' => $this->getSetting('enabled_entities'),
+      '#required' => FALSE,
+      '#multiple' => TRUE,
+      '#options' => $options,
+    ];
+
+    return $elements;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function settingsSummary() {
+    $summary = [];
+
+    $summary[] = t('Enabled entities: @enabled_entities', [
+      '@enabled_entities' => implode(', ', array_filter($this->getSetting('enabled_entities'))),
+    ]);
+
+    return $summary;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
+    $element = parent::formElement($items, $delta, $element, $form, $form_state);
+    return $element;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getOptions(FieldableEntityInterface $entity) {
+    if (!isset($this->options)) {
+      $options = [];
+      $hidden_base_fields = [
+        'nid',
+        'uuid',
+        'vid',
+        'type',
+        'revision_timestamp',
+        'revision_uid',
+        'uid',
+        'default_langcode',
+        'revision_default',
+        'revision_translation_affected',
+      ];
+
+      /** @var \Drupal\Core\Entity\EntityFieldManager $entity_field_manager */
+      $entity_field_manager = \Drupal::service('entity_field.manager');
+
+      $enabled_entities = array_filter($this->getSetting('enabled_entities'));
+      foreach ($enabled_entities as $enabled_entity) {
+        list($entity_type, $bundle) = explode('.', $enabled_entity);
+        $field_definitions = $entity_field_manager->getFieldDefinitions($entity_type, $bundle);
+        foreach ($field_definitions as $field_name => $field_definition) {
+          if ($field_definition instanceof BaseFieldDefinition) {
+            if (in_array($field_name, $hidden_base_fields)) {
+              continue;
+            }
+
+            /** @var \Drupal\Core\Field\BaseFieldDefinition $field_definition */
+            $key = 'node.' . $bundle . '.' . $field_name;
+            $options[$key] = $bundle . ' > ' . $field_definition->getLabel() . ' (' . $field_name . ')';
+          }
+          elseif ($field_definition instanceof FieldConfig) {
+            /** @var \Drupal\field\Entity\FieldConfig $field_definition */
+            $key = 'node.' . $bundle . '.' . $field_name;
+            $options[$key] = $bundle . ' > ' . $field_definition->getLabel() . ' (' . $field_name . ')';
+          }
+        }
+      }
+
+      $this->options = $options;
+    }
+
+    return $this->options;
+  }
+}
diff --git a/html/modules/custom/guidelines/templates/guideline-content-add-list.html.twig b/html/modules/custom/guidelines/templates/guideline-content-add-list.html.twig
new file mode 100644
index 000000000..0dec8ebe1
--- /dev/null
+++ b/html/modules/custom/guidelines/templates/guideline-content-add-list.html.twig
@@ -0,0 +1,23 @@
+{#
+/**
+ * @file
+ * Default theme implementation to present a list of custom content entity types/bundles.
+ *
+ * Available variables:
+ * - types: A collection of all the available custom entity types/bundles.
+ *   Each type/bundle contains the following:
+ *   - link: A link to add a content entity of this type.
+ *   - description: A description of this content entity types/bundle.
+ *
+ * @see template_preprocess_guideline_content_add_list()
+ *
+ * @ingroup themeable
+ */
+#}
+{% spaceless %}
+  <dl>
+    {% for type in types %}
+      <dt>{{ type.link }}</dt>
+    {% endfor %}
+  </dl>
+{% endspaceless %}
diff --git a/html/modules/custom/extended_field_description/templates/description_entity.html.twig b/html/modules/custom/guidelines/templates/guideline.html.twig
similarity index 50%
rename from html/modules/custom/extended_field_description/templates/description_entity.html.twig
rename to html/modules/custom/guidelines/templates/guideline.html.twig
index 945050625..b60b6bfe4 100644
--- a/html/modules/custom/extended_field_description/templates/description_entity.html.twig
+++ b/html/modules/custom/guidelines/templates/guideline.html.twig
@@ -1,21 +1,21 @@
 {#
 /**
- * @file description_entity.html.twig
- * Default theme implementation to present Description entity data.
+ * @file guideline.html.twig
+ * Default theme implementation to present Guideline data.
  *
- * This template is used when viewing Description entity pages.
+ * This template is used when viewing Guideline pages.
  *
  *
  * Available variables:
  * - content: A list of content items. Use 'content' to print all content, or
  * - attributes: HTML attributes for the container element.
  *
- * @see template_preprocess_description_entity()
+ * @see template_preprocess_guideline()
  *
  * @ingroup themeable
  */
 #}
-<div{{ attributes.addClass('description_entity') }}>
+<div{{ attributes.addClass('guideline') }}>
   {% if content %}
     {{- content -}}
   {% endif %}
diff --git a/html/modules/custom/extended_field_description/templates/extended-field-description.html.twig b/html/modules/custom/guidelines/templates/guidelines.html.twig
similarity index 100%
rename from html/modules/custom/extended_field_description/templates/extended-field-description.html.twig
rename to html/modules/custom/guidelines/templates/guidelines.html.twig

From f52b44804c6b69adec8ae27934b2d0f40de41677 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 19 Nov 2021 23:45:36 +0900
Subject: [PATCH 119/720] [RW-25] Allow other modules to prevent the file URI
 renaming

---
 .../custom/reliefweb_utility/reliefweb_utility.module      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_utility/reliefweb_utility.module b/html/modules/custom/reliefweb_utility/reliefweb_utility.module
index 3c076ae9e..19b52503a 100644
--- a/html/modules/custom/reliefweb_utility/reliefweb_utility.module
+++ b/html/modules/custom/reliefweb_utility/reliefweb_utility.module
@@ -35,9 +35,14 @@ function reliefweb_utility_file_update(FileInterface $file) {
   $uuid = $file->uuid();
   $uri = $file->getFileUri();
 
+  // Let other modules decide if this should apply.
+  $apply = TRUE;
+  $clone = clone $file;
+  \Drupal::moduleHandler()->alter('reliefweb_utility_file_update', $clone, $apply);
+
   // Only process files with a valid uuid and uri and if not already processed
   // which can be determined by looking for the file uuid in its uri.
-  if (!empty($uuid) && !empty($uri) && preg_match('#/' . $uuid . '#', $uri) !== 1) {
+  if ($apply && !empty($uuid) && !empty($uri) && preg_match('#/' . $uuid . '#', $uri) !== 1) {
     $file_system = \Drupal::service('file_system');
     $logger = \Drupal::logger('reliefweb_utility');
 

From 09de691ae1fc6378c8f9258ca64cec462443e0c9 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 19 Nov 2021 23:48:56 +0900
Subject: [PATCH 120/720] [RW-25] Fix several behavior, move local/remote
 setting to module level, add formatter and templates

---
 .../install/reliefweb_docstore.settings.yml   |   2 +
 .../schema/reliefweb_docstore.schema.yml      |   6 +-
 .../reliefweb_docstore.module                 |  54 +-
 .../src/Controller/FileDownloadController.php |   4 +-
 .../Field/FieldFormatter/ReliefWebFile.php    |  35 +-
 .../Plugin/Field/FieldType/ReliefWebFile.php  | 831 +++++++++++-------
 .../Field/FieldType/ReliefWebFileList.php     |  22 +-
 .../Field/FieldWidget/ReliefWebFile.php       |  79 +-
 .../src/Services/DocstoreClient.php           |  69 +-
 ...reliefweb-file-list--interactive.html.twig |  22 +
 .../templates/reliefweb-file-list.html.twig   |  25 +
 11 files changed, 762 insertions(+), 387 deletions(-)
 create mode 100644 html/modules/custom/reliefweb_docstore/templates/reliefweb-file-list--interactive.html.twig
 create mode 100644 html/modules/custom/reliefweb_docstore/templates/reliefweb-file-list.html.twig

diff --git a/html/modules/custom/reliefweb_docstore/config/install/reliefweb_docstore.settings.yml b/html/modules/custom/reliefweb_docstore/config/install/reliefweb_docstore.settings.yml
index 8944de815..8d6bae283 100644
--- a/html/modules/custom/reliefweb_docstore/config/install/reliefweb_docstore.settings.yml
+++ b/html/modules/custom/reliefweb_docstore/config/install/reliefweb_docstore.settings.yml
@@ -4,6 +4,8 @@ docstore_url: ''
 api_key: ''
 # The prefix used when creating new content (ex: reliefweb_reports).
 prefix: 'reliefweb_'
+# Wether to store the files locally or remotely in the docstore.
+local: true
 # Name of the directory for the local file attachments.
 file_directory: 'attachments'
 # Name of the directory for the local file previews.
diff --git a/html/modules/custom/reliefweb_docstore/config/schema/reliefweb_docstore.schema.yml b/html/modules/custom/reliefweb_docstore/config/schema/reliefweb_docstore.schema.yml
index a2fb44aff..1a5c5a216 100644
--- a/html/modules/custom/reliefweb_docstore/config/schema/reliefweb_docstore.schema.yml
+++ b/html/modules/custom/reliefweb_docstore/config/schema/reliefweb_docstore.schema.yml
@@ -11,6 +11,9 @@ reliefweb_docstore.settings:
     prefix:
       type: string
       label: 'The prefix used when creating new content (ex: reliefweb_reports).'
+    local:
+      type: boolean
+      label: 'Flag to store the files locally instead of remotely'
     file_directory:
       type: string
       label: 'Name of the directory for the local file attachments.'
@@ -21,9 +24,6 @@ reliefweb_docstore.settings:
 field.field_settings.reliefweb_file:
   type: mapping
   mapping:
-    local:
-      type: boolean
-      label: 'Flag to store the files locally instead of remotely'
     file_extensions:
       type: string
       label: 'Allowed file extensions'
diff --git a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
index 2955e32a1..d063d8920 100644
--- a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
+++ b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
@@ -12,12 +12,40 @@ use Drupal\file\Entity\File;
  */
 function reliefweb_docstore_theme() {
   return [
+    // Theme for a file list form widget.
     'reliefweb_file_widget' => [
       'render element' => 'element',
     ],
+    // Theme for a file item form widget.
     'reliefweb_file_widget_item' => [
       'render element' => 'element',
     ],
+    // Theme for a list of files.
+    'reliefweb_file_list' => [
+      'variables' => [
+        // Section heading level.
+        'level' => 2,
+        // Section attributes.
+        'attributes' => NULL,
+        // Section title.
+        'title' => t('Attachments'),
+        // Section title attributes.
+        'title_attributes' => NULL,
+        // List of files. Each item has the following properties:
+        // - item: field item
+        // - url: link to the file
+        // - name: file name
+        // - label: file name or 'Download' etc.
+        // - description: file description (extension, size, language etc.)
+        'list' => [],
+        // List attributes.
+        'list_attributes' => NULL,
+        // Section footer.
+        'footer' => NULL,
+        // Section footer attributes.
+        'footer_attributes' => NULL,
+      ],
+    ],
   ];
 }
 
@@ -67,7 +95,7 @@ function reliefweb_docstore_preprocess_reliefweb_file_widget_item(&$variables) {
  */
 function reliefweb_docstore_preprocess_image_style(&$variables) {
   // Workaround to prevent the browser from caching the derivative when
-  // renderd in the form for example, so that it always get the fresh one
+  // rendered in the form for example, so that it always get the fresh one
   // when the image is regenerated.
   if (isset($variables['image']['#attributes']['data-no-cache'])) {
     $uri = $variables['image']['#uri'];
@@ -111,13 +139,13 @@ function reliefweb_docstore_get_languages() {
  * @param string $mime_type
  *   Mime type to compare with.
  *
- * @return bool
+ * @return array
  *   An empty array if the file mime type is a match or an array containing an
  *   error message if it's not.
  *
  * @see file_validate()
  */
-function reliefweb_docostore_file_validate_mime_type(File $file, $mime_type) {
+function reliefweb_docstore_file_validate_mime_type(File $file, $mime_type) {
   $errors = [];
 
   if ($file->getMimeType() !== $mime_type) {
@@ -128,3 +156,23 @@ function reliefweb_docostore_file_validate_mime_type(File $file, $mime_type) {
 
   return $errors;
 }
+
+/**
+ * Implements hook_reliefweb_utility_file_update_alter().
+ */
+function reliefweb_docstore_reliefweb_utility_file_update_alter(File $file, &$apply) {
+  $settings = \Drupal::config('reliefweb_docstore.settings');
+
+  // Get the ttachment and preview directories.
+  $file_directory = $settings->get('file_directory') ?? 'attachments';
+  $preview_directory = $settings->get('preview_directory') ?? 'previews';
+  $directories = [preg_quote($file_directory), preg_quote($preview_directory)];
+
+  // Pattern for the preview files.
+  $pattern = '#^(?:private|public)://(?:' .
+             implode('|', $directories) .
+             ')/([a-z0-9]{2})/([a-z0-9]{2})/\1\2[a-z0-9-]{32}\.#';
+
+  // Do not apply the file URI transformation for files managed by this module.
+  $apply = $apply && preg_match($pattern, $file->getFileUri()) !== 1;
+}
diff --git a/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php b/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php
index 087a45457..f9070599c 100644
--- a/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php
+++ b/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php
@@ -96,7 +96,7 @@ public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
       $container->get('current_user'),
-      $container->get('docstore_client'),
+      $container->get('reliefweb_docstore.client'),
       $container->get('entity_type.manager'),
       $container->get('logger.factory'),
       $container->get('stream_wrapper_manager')
@@ -258,7 +258,7 @@ protected function downloadAttachment($uuid, $filename, $private = FALSE) {
    * @see ::downloadAttachment()
    */
   protected function downloadLocalFile($uuid, $filename) {
-    $extension = ReliefWebFile::getFileExtension($filename);
+    $extension = ReliefWebFile::extractFileExtension($filename);
     $uri = ReliefWebFile::getFileUriFromUuid($uuid, $extension, $private);
     $headers = ['Cache-Control' => 'private, must-revalidate'];
 
diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldFormatter/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldFormatter/ReliefWebFile.php
index 9aeaa3a57..18d8f8f6a 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldFormatter/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldFormatter/ReliefWebFile.php
@@ -4,7 +4,6 @@
 
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Field\FormatterBase;
-use Drupal\Core\Url;
 
 /**
  * Plugin implementation of the 'reliefweb_file' formatter.
@@ -23,22 +22,32 @@ class ReliefWebFile extends FormatterBase {
    * {@inheritdoc}
    */
   public function viewElements(FieldItemListInterface $items, $langcode) {
-    // Simple link for active elements.
-    $links = [];
+    $list = [];
     foreach ($items as $item) {
-      // DEBUG.
-      $url = 'https://docstore.test/files/' . $item->get('uuid')->getValue();
-
-      $links[] = [
-        'title' => $item->get('file_name')->getValue(),
-        'url' => Url::fromUri($url),
-      ];
+      $url = $item->getFileUrl();
+      if (!empty($url)) {
+        $list[] = [
+          'item' => $item,
+          'url' => $url->toString(),
+          'name' => $item->getFileName(),
+          'preview' => $item->renderPreview('small'),
+          'label' => $item->getFileName(),
+          'description' => '(' . implode(' | ', array_filter([
+            mb_strtoupper($item->getFileExtension()),
+            format_size($item->getFileSize()),
+            implode(' - ', array_filter([
+              $item->getFileDescription(),
+              $item->getFileLanguage(),
+            ])),
+          ])) . ')',
+        ];
+      }
     }
 
     // Reverse the links to have the most recent a the beginning.
-    return [
-      '#theme' => 'links',
-      '#links' => array_reverse($links),
+    return empty($list) ? [] : [
+      '#theme' => 'reliefweb_file_list',
+      '#list' => $list,
     ];
   }
 
diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
index 2561379cd..a798d0e2b 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
@@ -10,6 +10,7 @@
 use Drupal\Core\Field\FieldItemBase;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\File\Exception\FileException;
+use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\StreamWrapper\StreamWrapperManager;
 use Drupal\Core\StringTranslation\TranslatableMarkup;
@@ -33,6 +34,27 @@
  */
 class ReliefWebFile extends FieldItemBase {
 
+  /**
+   * The current user.
+   *
+   * @var \Drupal\Core\Session\AccountProxyInterface
+   */
+  protected $currentUser;
+
+  /**
+   * The docstore client service.
+   *
+   * @var \Drupal\reliefweb_docstore\Services\DocstoreClient
+   */
+  protected $docstoreClient;
+
+  /**
+   * The docstore config.
+   *
+   * @var \Drupal\Core\Config\ImmutableConfig
+   */
+  protected $docstoreConfig;
+
   /**
    * The entity repository service.
    *
@@ -54,19 +76,11 @@ class ReliefWebFile extends FieldItemBase {
    */
   protected $fileSystem;
 
-  /**
-   * The docstore client service.
-   *
-   * @var \Drupal\reliefweb_docstore\Services\DocstoreClient
-   */
-  protected $docstoreClient;
-
   /**
    * {@inheritdoc}
    */
   public static function defaultFieldSettings() {
     return [
-      'local' => TRUE,
       'file_extensions' => '',
       'max_filesize' => NULL,
     ] + parent::defaultFieldSettings();
@@ -79,13 +93,6 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
     $element = parent::fieldSettingsForm($form, $form_state);
     $settings = $this->getSettings();
 
-    $element['local'] = [
-      '#type' => 'checkbox',
-      '#title' => $this->t('Store files locally'),
-      '#description' => $this->t('Check if the files should be stored locally instead of remotely.'),
-      '#default_value' => $this->getSetting('local'),
-    ];
-
     // Make the extension list a little more human-friendly by comma-separation.
     $extensions = str_replace(' ', ', ', $settings['file_extensions']);
     $element['file_extensions'] = [
@@ -201,9 +208,9 @@ public function getUploadValidators() {
 
     // Validate the file mime as well if defined, to  ensure a file can be
     // replaced only by a file of the same type.
-    $file_mime = $this->get('file_mime')->getValue();
+    $file_mime = $this->getFileMime();
     if (!empty($file_mime)) {
-      $validators['reliefweb_docostore_file_validate_mime_type'] = [$file_mime];
+      $validators['reliefweb_docstore_file_validate_mime_type'] = [$file_mime];
     }
 
     // There is always a file size limit due to the PHP server limit.
@@ -241,9 +248,9 @@ public function getMaxFileSize() {
   public function getAllowedFileExtensions() {
     $settings = $this->getSettings();
 
-    $file_name = $this->get('file_name')->getValue();
-    if (!empty($file_name)) {
-      return [static::getFileExtension($file_name)];
+    $extension = $this->getFileExtension();
+    if (!empty($extension)) {
+      return [$extension];
     }
     elseif (!empty($settings['file_extensions'])) {
       return explode(' ', $settings['file_extensions']);
@@ -377,9 +384,9 @@ public static function schema(FieldStorageDefinitionInterface $field_definition)
           'size' => 'medium',
           'not null' => TRUE,
         ],
-        'private' => [
-          'type' => 'int',
-          'size' => 'tiny',
+        'file_uuid' => [
+          'type' => 'varchar_ascii',
+          'length' => 36,
           'not null' => TRUE,
         ],
         'file_name' => [
@@ -479,10 +486,20 @@ public static function generateSampleValue(FieldDefinitionInterface $field_defin
    * {@inheritdoc}
    */
   public function isEmpty() {
-    $uuid = $this->get('uuid')->getValue();
+    $uuid = $this->getUuid();
     return empty($uuid);
   }
 
+  /**
+   * Check if we are storing the files locally or remotely.
+   *
+   * @return bool
+   *   TRUE if the files are stored locally.
+   */
+  public function storeLocally() {
+    return $this->getDocstoreConfig()->get('local') === TRUE;
+  }
+
   /**
    * Get data to render the file preview.
    *
@@ -514,7 +531,7 @@ public function renderPreview($style = 'small', $generate = FALSE) {
       '#style_name' => $style,
       '#uri' => $uri,
       '#alt' => $this->t('Preview of @file_name', [
-        '@file_name' => $this->get('file_name')->getValue(),
+        '@file_name' => $this->getFileName(),
       ]),
       '#attributes' => [
         'class' => ['rw-file-preview'],
@@ -537,11 +554,11 @@ public function renderPreview($style = 'small', $generate = FALSE) {
   public function getPreview($generate = FALSE) {
     $file = $this->loadPreviewFile();
     if (empty($file) && $generate && $this->canHavePreview()) {
-      $page = $this->get('preview_page')->getValue();
-      $rotation = $this->get('preview_rotation')->getValue();
+      $page = $this->getPreviewPage();
+      $rotation = $this->getPreviewRotation();
       return $this->generatePreview($page, $rotation);
     }
-    return NULL;
+    return $file;
   }
 
   /**
@@ -553,11 +570,13 @@ public function getPreview($generate = FALSE) {
    *   The rotation of the preview page (0, 90 or -90).
    * @param bool $regenerate
    *   TRUE to force the regeneration of the preview.
+   * @param bool $new
+   *   TRUE to force the creation of a new preview file.
    *
    * @return \Drupal\file\Entity\File|null
    *   The preview file entity or NULL if the preview was not generated.
    */
-  public function generatePreview($page = 0, $rotation = 0, $regenerate = FALSE) {
+  public function generatePreview($page = 0, $rotation = 0, $regenerate = FALSE, $new = FALSE) {
     if ($page < 1 || $this->isEmpty() || !$this->canHavePreview() || $this->getPageCount() === 0) {
       return NULL;
     }
@@ -568,13 +587,13 @@ public function generatePreview($page = 0, $rotation = 0, $regenerate = FALSE) {
     // Ensure the rotation is a valid value.
     $rotation = in_array($rotation, [0, 90, -90]) ? $rotation : 0;
 
-    $preview_uuid = $this->get('preview_uuid')->getValue();
-    $current_page = $this->get('preview_page')->getValue();
-    $current_rotation = $this->get('preview_rotation')->getValue();
+    $preview_uuid = $this->getPreviewUuid();
+    $current_page = $this->getPreviewPage();
+    $current_rotation = $this->getPreviewRotation();
 
     // Skip if the preview already exists for the given page and rotation.
     if (!$regenerate && !empty($preview_uuid) && $page == $current_page && $rotation == $current_rotation) {
-      return $this->loadFileByUuid($preview_uuid);
+      return $this->loadPreviewFile();
     }
 
     // Load or create a file associated with the field item.
@@ -582,7 +601,7 @@ public function generatePreview($page = 0, $rotation = 0, $regenerate = FALSE) {
     if (empty($file) || !file_exists($file->getFileUri())) {
       // For local files, we cannot generate the preview if there is no file
       // associated with the field item.
-      if ($this->getSetting('local') === TRUE) {
+      if ($this->storeLocally()) {
         return NULL;
       }
       // For remote files, we try to retrieve the file content and create a
@@ -596,7 +615,7 @@ public function generatePreview($page = 0, $rotation = 0, $regenerate = FALSE) {
     }
 
     // Retrieve or create the preview file.
-    $preview_file = $this->loadPreviewFile();
+    $preview_file = $new ? NULL : $this->loadPreviewFile();
     if (empty($preview_file)) {
       $preview_file = $this->createPreviewFile();
     }
@@ -606,8 +625,10 @@ public function generatePreview($page = 0, $rotation = 0, $regenerate = FALSE) {
       return NULL;
     }
 
-    // Save the preview. We don't mark it yet as permanent so that it can be
-    // garbage collected if the form, for example, is not submitted.
+    // Save the preview. We mark it as temporary so that it can be garbage
+    // collected if the form, for example, is not submitted. It will be saved
+    // as permanent in ::preSave() when the form is submitted.
+    $preview_file->setTemporary();
     $preview_file->save();
 
     // Update the field item preview uuid as it may be a new file.
@@ -617,7 +638,7 @@ public function generatePreview($page = 0, $rotation = 0, $regenerate = FALSE) {
 
     // Delete the preview derivatives to ensure they correspond to the updated
     // preview image.
-    image_path_flush($preview_file->getFileUri());
+    $this->deletePreviewDerivatives($preview_file->getFileUri());
 
     return $preview_file;
   }
@@ -678,8 +699,8 @@ protected function extractPreview($source_uri, $destination_uri, $page, $rotatio
    *   TRUE if the preview generation was successful.
    */
   public function regeneratePrevew() {
-    $page = $this->get('preview_page')->getValue();
-    $rotation = $this->get('preview_rotation')->getValue();
+    $page = $this->getPreviewPage();
+    $rotation = $this->getPreviewRotation();
     return $this->generatePreview($page, $rotation, TRUE);
   }
 
@@ -690,32 +711,44 @@ public function regeneratePrevew() {
    *   TRUE if a preview can be generated.
    */
   public function canHavePreview() {
-    return $this->get('file_mime')->getValue() === 'application/pdf';
+    return $this->getFileMime() === 'application/pdf';
+  }
+
+  /**
+   * Delete the field item file.
+   *
+   * Note: this doesn't remove the remote file.
+   */
+  public function deleteFile() {
+    $file = $this->loadFile();
+    if (!empty($file)) {
+      $uri = $file->getFileUri();
+      $this->deleteFileOnDisk($uri);
+      $file->delete();
+    }
   }
 
   /**
    * Delete the preview file and its derivative images.
    */
-  protected function deletePreview() {
+  public function deletePreview() {
     $file = $this->loadPreviewFile();
     if (!empty($file)) {
       $uri = $file->getFileUri();
+      $this->deleteFileOnDisk($uri);
+      $this->deletePreviewDerivatives($uri);
       $file->delete();
-      image_path_flush($uri);
     }
   }
 
   /**
-   * Get the number of pages for this field item file.
+   * Delete the derivative images that might have been created for the preview.
    *
-   * @return int
-   *   Number of pages. Returns 0 if the number of pages is irrelevant.
+   * @param string $uri
+   *   Preview image URI.
    */
-  public function getPageCount() {
-    if ($this->canHavePreview()) {
-      return $this->get('page_count')->getValue() ?? 1;
-    }
-    return 0;
+  protected function deletePreviewDerivatives($uri) {
+    image_path_flush($uri);
   }
 
   /**
@@ -725,7 +758,7 @@ public function getPageCount() {
    *   File entity or NULL if it couldn't be loaded.
    */
   public function loadFile() {
-    return $this->loadFileByUuid($this->get('file_uuid')->getValue());
+    return $this->loadFileByUuid($this->getFileUuid());
   }
 
   /**
@@ -735,34 +768,50 @@ public function loadFile() {
    *   File entity or NULL if it couldn't be loaded.
    */
   public function loadPreviewFile() {
-    return $this->loadFileByUuid($this->get('preview_uuid')->getValue());
+    return $this->loadFileByUuid($this->getPreviewUuid());
   }
 
   /**
    * Get the file URL.
    *
-   * @return \Drupal\Core\Url
-   *   URL object.
+   * @return \Drupal\Core\Url|null
+   *   URL object or NULL if we couldn't generate the URL or the current user
+   *   doesn't have access to it.
    */
-  public function getFileUrl($private = FALSE) {
-    $uuid = $this->get('uuid')->getValue();
-    $file_name = $this->get('file_name')->getValue();
-    $extension = static::getFileExtension($file_name);
-    $revision_id = $this->get('revision_id')->getValue();
+  public function getFileUrl() {
+    $file = $this->loadFile();
+    if (empty($file)) {
+      return NULL;
+    }
+
+    $uri = $file->getFileUri();
 
-    // If the revision ID is not set, then it's a new file and there should be
-    // an associated managed file and we return its URL.
-    if (empty($revision_id)) {
-      $url = file_create_url(static::getFileUriFromUuid($file_uuid, $extension));
+    // Retrieve the file URI scheme so we can generate the appropriate URL.
+    $scheme = StreamWrapperManager::getScheme($uri);
+    $private = $scheme === 'private';
+
+    if ($scheme === FALSE) {
+      return NULL;
     }
-    // Otherwise use a "direct" link to the file.
-    elseif ($private) {
-      $url = 'internal:/private/attachments/' . $uuid . '/' . $file_name;
+    // Only people with access to the private files can have a link to the file.
+    elseif ($private && !$this->getCurrentUser()->hasPermission('access reliefweb private files')) {
+      return NULL;
     }
-    else {
-      $url = 'internal:/attachments/' . $uuid . '/' . $file_name;
+    // New or replaced files have an empty revision id and there should be a
+    // file on disk for them.
+    elseif (empty($this->getRevisionId())) {
+      return Url::fromUri(file_create_url($uri));
+    }
+    // For existing files, they should be accessible via the permanent URL.
+    elseif ($uri === $this->getPermanentUri($private)) {
+      $url = 'internal:/';
+      $url .= $private ? 'private/' : '';
+      $url .= static::getFileDirectory() . '/';
+      $url .= $this->getUuid() . '/' . $this->getFileName();
+      return Url::fromUri($url);
     }
-    return !empty($url) ? Url::fromUri($url) : '';
+
+    return NULL;
   }
 
   /**
@@ -776,11 +825,9 @@ protected function createPreviewFile() {
       return NULL;
     }
 
-    $uuid = $this->get('uuid')->getValue();
-
     // The preview is PNG image.
     $extension = 'png';
-    $file_name = $uuid . '.' . $extension;
+    $file_name = $this->getUuid() . '.' . $extension;
     $file_mime = 'image/' . $extension;
 
     // Generate a UUID for the preview. We'll store it in this field item only
@@ -806,17 +853,17 @@ protected function createFile() {
       return NULL;
     }
 
-    $file_uuid = $this->get('file_uuid')->getValue();
-    $file_name = $this->get('file_name')->getValue();
-    $file_mime = $this->get('file_mime')->getValue();
+    $file_uuid = $this->getFileUuid();
+    $file_name = $this->getFileName();
+    $file_mime = $this->getFileMime();
 
     if (empty($file_uuid)) {
       $file_uuid = static::generateUuid();
-      $this->setValue('file_uuid', $file_uuid);
+      $this->get('file_uuid')->setValue($file_uuid);
     }
 
     // Generate the file uri.
-    $extension = static::getFileExtension($file_name);
+    $extension = static::extractFileExtension($file_name);
     $uri = static::getFileUriFromUuid($file_uuid, $extension, TRUE);
 
     // Create a temporary managed file with the System user.
@@ -833,8 +880,8 @@ protected function createFile() {
    *   TRUE on success.
    */
   protected function updateFileFromRemote(File $file) {
-    $uuid = $this->get('uuid')->getValue();
-    $revision_id = $this->get('revision_id')->getValue();
+    $uuid = $this->getUuid();
+    $revision_id = $this->getRevisionId();
     $uri = $file->getFileUri();
 
     // Create the private temp directory to store the file.
@@ -852,7 +899,7 @@ protected function updateFileFromRemote(File $file) {
       // Update the file entity and save it so that we don't have to
       // re-download the file to generate the preview. Its status being
       // temporary it will be garbage collected as some point by the system.
-      $file->setMimeType($this->getFileMimeType($uri));
+      $file->setMimeType(static::guessFileMimeType($uri));
       $file->setTemporary();
       $file->save();
     }
@@ -878,69 +925,37 @@ protected function loadFileByUuid($uuid) {
   /**
    * Get the permanent file URI for the field item.
    *
+   * @param bool $private
+   *   Whether to use the private URI or the public one.
    * @param bool $preview
    *   Whether the URI is for the preview file or the local file.
    *
    * @return string
    *   URI.
    */
-  public function getPermanentUri($preview = TRUE) {
-    $uuid = $this->get('uuid')->getValue();
-    $private = $this->get('private')->getValue();
-    $extension = self::getFileExtension($file->getFileName());
-    return static::getFileUriFromUuid($uuid, $extension, !empty($private), $preview);
-  }
-
-  /**
-   * Get the entity repository service.
-   *
-   * @return \Drupal\Core\Entity\EntityRepositoryInterface
-   *   The entity repository service.
-   */
-  protected function getEntityRepository() {
-    if (!isset($this->entityRepository)) {
-      $this->entityRepository = \Drupal::service('entity.repository');
-    }
-    return $this->entityRepository;
+  public function getPermanentUri($private = FALSE, $preview = FALSE) {
+    $uuid = $this->getUuid();
+    $extension = $preview ? 'png' : $this->getFileExtension();
+    return static::getFileUriFromUuid($uuid, $extension, $private, $preview);
   }
 
   /**
-   * Get the entity type manager service.
+   * Get the file directory from the module settings.
    *
-   * @return \Drupal\Core\Entity\EntityTypeManagerInterface
-   *   The entity type manager service.
-   */
-  protected function getEntityTypeManager() {
-    if (!isset($this->entityTypeManager)) {
-      $this->entityTypeManager = \Drupal::service('entity_type.manager');
-    }
-    return $this->entityTypeManager;
-  }
-
-  /**
-   * Get the file system serice.
+   * @param bool $preview
+   *   Whether the directory is for a preview or an attachment.
    *
-   * @return \Drupal\Core\File\FileSystemInterface
-   *   The file system service.
+   * @return string
+   *   The directory.
    */
-  protected function getFileSystem() {
-    if (!isset($this->fileSystem)) {
-      $this->fileSystem = \Drupal::service('file_system');
+  public static function getFileDirectory($preview = FALSE) {
+    $settings = \Drupal::service('config.factory')->get('reliefweb_docstore.settings');
+    if ($preview) {
+      return $settings->get('preview_directory') ?? 'previews';
     }
-    return $this->fileSystem;
-  }
-
-  /**
-   * Get the docstore client service.
-   *
-   * @return \Drupal\reliefweb_docstore\Services\DocstoreClient
-   *   The docstore client service.
-   */
-  protected function getDocstoreClient() {
-    if (!isset($this->docstoreClient)) {
-      $this->docstoreClient = \Drupal::service('reliefweb_docstore.client');
+    else {
+      return $settings->get('file_directory') ?? 'attachments';
     }
-    return $this->docstoreClient;
   }
 
   /**
@@ -957,15 +972,8 @@ protected function getDocstoreClient() {
    *   The directory URI.
    */
   public static function getFileDirectoryUriFromUuid($uuid, $private = TRUE, $preview = FALSE) {
-    $settings = \Drupal::service('config.factory')->get('reliefweb_docstore.settings');
-
     $directory = $private ? 'private://' : 'public://';
-    if ($preview) {
-      $directory .= $settings->get('preview_directory') ?? 'previews';
-    }
-    else {
-      $directory .= $settings->get('file_directory') ?? 'attachments';
-    }
+    $directory .= static::getFileDirectory($preview);
     $directory .= '/' . substr($uuid, 0, 2);
     $directory .= '/' . substr($uuid, 2, 2);
     return $directory;
@@ -1043,6 +1051,9 @@ public static function prepareDirectory($uri) {
    * @param string $destination
    *   Destination URI.
    *
+   * @return string
+   *   The destination URI.
+   *
    * @throws \Drupal\Core\File\Exception\FileException
    *   Exception if the file couldn't be moved.
    */
@@ -1054,35 +1065,11 @@ public static function moveFile($source, $destination) {
     }
 
     $file_system = \Drupal::service('file_system');
-    $file_system->move($source, $destination, $file_system::EXISTS_REPLACE);
-  }
-
-  /**
-   * Delete a managed file with the given UUID.
-   *
-   * @param string $uuid
-   *   File UUID.
-   * @param bool $preview
-   *   Whether the file is a preview or not.
-   */
-  public static function deleteFileFromUuid($uuid, $preview = FALSE) {
-    if (!empty($uuid)) {
-      $file = \Drupal::service('entity.repository')
-        ->loadEntityByUuid('file', $uuid);
-
-      if (!empty($file)) {
-        // Remove the derivative images.
-        if ($preview) {
-          image_path_flush($file->getFileUri());
-        }
-
-        $file->delete();
-      }
-    }
+    return $file_system->move($source, $destination, $file_system::EXISTS_REPLACE);
   }
 
   /**
-   * Get the extension of the file.
+   * Extract the extension of the file.
    *
    * @param string $file_name
    *   File name.
@@ -1090,7 +1077,10 @@ public static function deleteFileFromUuid($uuid, $preview = FALSE) {
    * @return string
    *   File extension in lower case.
    */
-  public static function getFileExtension($file_name) {
+  public static function extractFileExtension($file_name) {
+    if (empty($file_name)) {
+      return '';
+    }
     return mb_strtolower(pathinfo($file_name, PATHINFO_EXTENSION));
   }
 
@@ -1103,23 +1093,13 @@ public static function getFileExtension($file_name) {
    * @return string
    *   File mime type.
    */
-  public static function getFileMimeType($uri) {
+  public static function guessFileMimeType($uri) {
+    if (empty($uri)) {
+      return '';
+    }
     return \Drupal::service('file.mime_type.guesser')->guessMimeType($uri);
   }
 
-  /**
-   * Check if a file URI is private.
-   *
-   * @param string $uri
-   *   File uri.
-   *
-   * @return bool
-   *   TRUE if the file uri is private.
-   */
-  public static function isFilePrivate($uri) {
-    return StreamWrapperManager::getScheme($uri) === 'private';
-  }
-
   /**
    * Generate a UUID.
    *
@@ -1133,13 +1113,16 @@ public static function generateUuid() {
   /**
    * Check if the file can have a preview.
    *
-   * @param \Drupal\file\Entity\File $file
+   * @param \Drupal\file\Entity\File|null $file
    *   Managed File.
    *
    * @return bool
    *   TRUE if the file preview can be generated.
    */
-  protected static function fileCanHavePreview(File $file) {
+  public static function fileCanHavePreview(?File $file) {
+    if (empty($file)) {
+      return FALSE;
+    }
     return $file->getMimeType() === 'application/pdf';
   }
 
@@ -1191,31 +1174,194 @@ public static function getFilePageCount(File $file) {
    *   URI.
    */
   public static function getFileUuidUri(File $file, $private = TRUE) {
-    $extension = self::getFileExtension($file->getFileName());
+    $extension = static::extractFileExtension($file->getFileName());
     return static::getFileUriFromUuid($file->uuid(), $extension, $private);
   }
 
+  /**
+   * Get the permanent UUID.
+   *
+   * @return string
+   *   Permanent UUID.
+   */
+  public function getUuid() {
+    return $this->get('uuid')->getValue();
+  }
+
+  /**
+   * Get the revision ID.
+   *
+   * @return int
+   *   Revision ID.
+   */
+  public function getRevisionId() {
+    return $this->get('revision_id')->getValue();
+  }
+
+  /**
+   * Get the file UUID.
+   *
+   * @return string
+   *   File UUID.
+   */
+  public function getFileUuid() {
+    return $this->get('file_uuid')->getValue();
+  }
+
+  /**
+   * Get the file name.
+   *
+   * @return string
+   *   File name.
+   */
+  public function getFileName() {
+    return $this->get('file_name')->getValue();
+  }
+
+  /**
+   * Get the file extension.
+   *
+   * @return string
+   *   File extension.
+   */
+  public function getFileExtension() {
+    return static::extractFileExtension($this->getFileName());
+  }
+
+  /**
+   * Get the file mime type.
+   *
+   * @return string
+   *   File mime type.
+   */
+  public function getFileMime() {
+    return $this->get('file_mime')->getValue();
+  }
+
+  /**
+   * Get the file size.
+   *
+   * @return int
+   *   File size in bytes.
+   */
+  public function getFileSize() {
+    return $this->get('file_size')->getValue();
+  }
+
+  /**
+   * Get the file language.
+   *
+   * @return string
+   *   File language.
+   */
+  public function getFileLanguage() {
+    return $this->get('language')->getValue();
+  }
+
+  /**
+   * Get the description.
+   *
+   * @return string
+   *   File description.
+   */
+  public function getFileDescription() {
+    return trim($this->get('description')->getValue() ?? '');
+  }
+
+  /**
+   * Get the preview file UUID.
+   *
+   * @return string
+   *   Preview file UUID.
+   */
+  public function getPreviewUuid() {
+    return $this->get('preview_uuid')->getValue();
+  }
+
+  /**
+   * Get the preview page.
+   *
+   * @return int
+   *   Preview page.
+   */
+  public function getPreviewPage() {
+    return $this->get('preview_page')->getValue();
+  }
+
+  /**
+   * Get the preview rotation.
+   *
+   * @return int
+   *   Preview rotation.
+   */
+  public function getPreviewRotation() {
+    return $this->get('preview_rotation')->getValue();
+  }
+
+  /**
+   * Get the number of pages for this field item file.
+   *
+   * @return int
+   *   Number of pages. Returns 0 if the number of pages is irrelevant.
+   */
+  public function getPageCount() {
+    if ($this->canHavePreview()) {
+      return $this->get('page_count')->getValue() ?? 1;
+    }
+    return 0;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function delete() {
+    // @todo check if this is called for each revision being deleted
+    // and delete file and preview.
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function deleteRevision() {
+    // @todo check if this is called for each revision being deleted
+    // and delete file and preview.
+  }
+
   /**
    * {@inheritdoc}
    */
-  public function preSave() {
-    $original_item = $this->_original_item ?? NULL;
+  public function preSave(?ReliefWebFile $original_item = NULL) {
+    $update_file = empty($original_item) ||
+      $original_item->getFileUuid() !== $this->getFileUuid();
+
+    $update_preview = empty($original_item) ||
+      $original_item->getPreviewUuid() !== $this->getPreviewUuid();
 
     try {
-      if ($this->getSetting('local') === TRUE) {
-        if (isset($original_item)) {
-          $this->replaceLocalFile($this->_original_item);
+      if ($update_file) {
+        // Move the old file.
+        if (!empty($original_item)) {
+          $original_item->moveFileToUuidUri();
+        }
+
+        // Update the field item file.
+        if ($this->storeLocally()) {
+          $this->updateLocalFile();
         }
         else {
-          $this->createLocalFile();
+          $this->updateRemoteFile();
         }
       }
-      else {
-        $this->updateRemoteFile();
-      }
 
-      // Update the preview if any.
-      $this->updatePreviewFile($original_item);
+      if ($update_preview) {
+        // Delete the old preview.
+        if (!empty($original_item)) {
+          $original_item->deletePreview();
+        }
+
+        // Update the preview if any.
+        $this->updatePreviewFile();
+      }
     }
     // @todo log the error and see what to tell the user.
     catch (\Exception $exception) {
@@ -1231,73 +1377,34 @@ public function postSave($updated) {
     if ($entity instanceof EntityPublishedInterface) {
       // Mark the file as public if the entity the file belongs to is published
       // make it private otherwise.
-      $item->updateFileStatus($entity->isPublished());
+      $this->updateFileStatus(!$entity->isPublished());
     }
-    return parent::postSave($updated);
-  }
 
-  /**
-   * Create a local file.
-   *
-   * @throws \Exception
-   *   Exception if the file couldn't be created.
-   */
-  protected function createLocalFile() {
-    $file = $this->loadFile();
-
-    // @todo better error message.
-    if (empty($file)) {
-      throw new \Exception('Unable to load the local file');
+    // Mark the file revision as active for us.
+    if (!$this->storeLocally()) {
+      $this->getDocstoreClient()->selectFileRevision($this->getUuid(), $this->getRevisionId());
     }
 
-    // Move the file to its the permanent URI (private initially).
-    $uri = $this->getPermanentUri();
-    static::moveFile($file->getFileUri(), $uri);
-
-    // Save the file as permanent.
-    $new_file->setFileUri($uri);
-    $new_file->setPermanent();
-    $new_file->save();
-
-    // Update the revision id with the file ID to distinguish from new items.
-    $this->setValue('revision_id', $file->id());
+    return parent::postSave($updated);
   }
 
   /**
    * Replace a local file.
    *
-   * @param \Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile $old_item
-   *   The old field item.
-   *
    * @throws \Exception
    *   Exception if the file couldn't be replaced.
    */
-  protected function replaceLocalFile(ReliefWebFile $old_item) {
-    $new_file = $this->loadFile();
-    $old_file = $old_item->loadFile();
-
-    // @todo better error messages.
-    if (empty($new_file)) {
-      throw new \Exception('Unable to load the new file');
-    }
-    if (empty($old_file)) {
-      throw new \Exception('Unable to load the old file');
+  protected function updateLocalFile() {
+    // Move the new file to the permanent URI.
+    $file = $this->loadFile();
+    // @todo better error message.
+    if (empty($file)) {
+      throw new \Exception('Unable to load the new local file');
     }
+    $this->changeFileLocation($file, $this->getPermanentUri(TRUE, FALSE));
 
-    $new_uri = $old_file->getFileUri();
-    $old_uri = $old_item->getFileUuidUri($old_file);
-
-    // Move the old file to its new location based on its UUID.
-    static::moveFile($old_file->getFileUri(), $old_uri);
-    $old_file->setFileUri($old_uri);
-    $old_file->setPermanent();
-    $old_file->save();
-
-    // Move the new file to the permanent URI (old URI).
-    static::moveFile($new_file->getFileUri(), $new_uri);
-    $new_file->setFileUri($new_uri);
-    $new_file->setPermanent();
-    $new_file->save();
+    // Update the revision id with the file ID to distinguish from new items.
+    $this->get('revision_id')->setValue($file->id());
   }
 
   /**
@@ -1308,14 +1415,13 @@ protected function replaceLocalFile(ReliefWebFile $old_item) {
    */
   protected function updateRemoteFile() {
     $file = $this->loadFile();
-
     // @todo better error message.
     if (empty($file)) {
       throw \Exception('Unable to load the local file.');
     }
 
     $client = $this->getDocstoreClient();
-    $uuid = $this->get('uuid')->getValue();
+    $uuid = $this->getUuid();
 
     // Check if the remote file exists.
     $result = $client->getFile($uuid);
@@ -1323,8 +1429,8 @@ protected function updateRemoteFile() {
       // Create the file resource in the docstore.
       $result = $client->createFile([
         'uuid' => $uuid,
-        'filename' => $this->get('file_name')->getValue(),
-        'mimetype' => $this->get('file_mime')->getValue(),
+        'filename' => $this->getFileName(),
+        'mimetype' => $this->getFileMime(),
         // Mark the new file as private initially. We'll change it that after
         // the entity the field is attached to is properly saved.
         'private' => TRUE,
@@ -1344,29 +1450,24 @@ protected function updateRemoteFile() {
     }
 
     // Store the new revision returned by the docstore.
-    $this->setValue('revision_id', $result['revision_id']);
+    $this->get('revision_id')->setValue($result['revision_id']);
 
     // Delete the local file.
-    $file->delete();
+    $this->deleteFileOnDisk($file->getFileUri());
+
+    // Change the URI of the field item file to ther permanent URI.
+    $this->changeFileLocation($file, $this->getPermanentUri(TRUE, FALSE));
   }
 
   /**
    * Update the preview file.
    *
-   * @param \Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile|null $old_item
-   *   The old field item if any.
-   *
    * @throws \Exception
-   *   Exception if the file's content couldn't be updated.
+   *   Exception if the preview file couldn't be updated.
    */
-  protected function updatePreviewFile(?ReliefWebFile $old_item) {
-    // Delete the old preview if any.
-    if (isset($old_item)) {
-      $old_item->deletePreview();
-    }
-
+  protected function updatePreviewFile() {
     // If "no preview" was selected, delete the preview.
-    $preview_page = $this->get('preview_page')->getValue();
+    $preview_page = $this->getPreviewPage();
     if (empty($preview_page) || !$this->canHavePreview()) {
       $this->deletePreview();
     }
@@ -1378,68 +1479,194 @@ protected function updatePreviewFile(?ReliefWebFile $old_item) {
     }
 
     // Move the preview to its permanent location.
-    $uri = $this->getPermanentUri(TRUE);
-    $this->moveFile($file->getFileUri(), $uri);
-
-    // Mark the filed as permanent.
-    $file->setFileUri($uri);
-    $file->setPermanent();
-    $file->save();
+    $this->changeFileLocation($file, $this->getPermanentUri(TRUE, TRUE));
   }
 
   /**
    * Update the status of the file associated with this field item.
    *
-   * @param bool $published
-   *   TRUE if the file should be made public.
-   */
-  protected function updateFileStatus($published) {
-    // For local files, move to the private or public location if the status
-    // is different.
-    if ($this->getSetting('local') === TRUE) {
-      $file = $this->loadFile();
-      if (!empty($file)) {
-        $private = $this->isFilePrivate($file->getFileUri());
-        if ($private === $published) {
-          $this->swapFileLocation($file);
-        }
-      }
-    }
+   * @param bool $private
+   *   TRUE if the file should be made private.
+   */
+  public function updateFileStatus($private) {
+    // Swap the file location from private to public or vice versa.
+    $this->swapFileLocation($this->loadFile(), $private);
+
     // For remote files, mark the file resource as private or public.
-    else {
-      $uuid = $this->get('uuid')->getValue();
-      $this->getDocstoreClient()->updateFileStatus($uuid, !$published);
+    if (!$this->storeLocally()) {
+      // @todo log any error.
+      $this->getDocstoreClient()->updateFileStatus($this->getUuid(), $private);
     }
 
     // Update the preview file as well.
-    $preview_file = $this->loadPreviewFile();
-    if (!empty($file)) {
-      $private = $this->isFilePrivate($preview_file->getFileUri());
-      if ($private === $published) {
-        $this->swapFileLocation($preview_file);
-      }
+    $this->swapFileLocation($this->loadPreviewFile(), $private);
+  }
+
+  /**
+   * Move the field item file to the file UUID uri.
+   *
+   * @throws \Exception
+   *   Exception if the file couldn't me moved.
+   */
+  protected function moveFileToUuidUri() {
+    $file = $this->loadFile();
+    // @todo better error message.
+    if (empty($file)) {
+      throw new \Exception('Unable to load old file');
     }
+    $this->changeFileLocation($file, $this->getFileUuidUri($file));
   }
 
   /**
    * Swap the location of a local file.
    *
-   * @param \Drupal\file\Entity\File $file
+   * @param \Drupal\file\Entity\File|null $file
    *   File entity.
+   * @param bool $private
+   *   Wether to make the file private or not.
    *
    * @throws \Drupal\Core\File\Exception\FileException
    *   Exception if the file couldn't be moved.
    *
    * @todo do something about the exception.
    */
-  protected function swapFileLocation(File $file) {
-    $uri = $file->getFileUri();
-    $scheme = StreamWrapperManager::getScheme($uri);
-    $target = StreamWrapperManager::getTarget($uri);
-    if ($scheme !== FALSE && $target !== FALSE) {
-      $scheme = $scheme === 'private' ? 'public' : 'private';
-      $this->moveFile($uri, $scheme . '://' . $target);
+  protected function swapFileLocation(?File $file, $private) {
+    if (empty($file)) {
+      return;
+    }
+
+    $source = $file->getFileUri();
+    $target = StreamWrapperManager::getTarget($source);
+    if ($target === FALSE) {
+      return;
+    }
+
+    // Move the file if the URI has changed.
+    $destination = ($private ? 'private' : 'public') . '://' . $target;
+    if ($source !== $destination) {
+      $this->changeFileLocation($file, $destination);
+    }
+  }
+
+  /**
+   * Change the location of a file.
+   *
+   * Note: the file doesn't need to exists on disk.
+   *
+   * @param \Drupal\file\Entity\File|null $file
+   *   File entity.
+   * @param string $destination
+   *   The destination URI.
+   *
+   * @throws \Drupal\Core\File\Exception\FileException
+   *   Exception if the file couldn't be moved.
+   *
+   * @todo do something about the exception.
+   */
+  protected function changeFileLocation(?File $file, $destination) {
+    if (empty($file)) {
+      return;
+    }
+
+    $source = $file->getFileUri();
+    if ($source !== $destination && file_exists($source)) {
+      static::moveFile($source, $destination);
+    }
+
+    $file->setFileUri($destination);
+    $file->setPermanent();
+    $file->save();
+  }
+
+  /**
+   * Delete a file on disk.
+   *
+   * @param string $uri
+   *   URI of the file on disk.
+   *
+   * @return bool
+   *   TRUE if the file could be deleted.
+   */
+  protected function deleteFileOnDisk($uri) {
+    return $this->getFileSystem()->unlink($uri);
+  }
+
+  /**
+   * Get the current user.
+   *
+   * @return \Drupal\Core\Session\AccountProxyInterface
+   *   Current user.
+   */
+  protected function getCurrentUser() {
+    if (!isset($this->currentUser)) {
+      $this->currentUser = \Drupal::currentUser();
+    }
+    return $this->currentUser;
+  }
+
+  /**
+   * Get the docstore client service.
+   *
+   * @return \Drupal\reliefweb_docstore\Services\DocstoreClient
+   *   The docstore client service.
+   */
+  protected function getDocstoreClient() {
+    if (!isset($this->docstoreClient)) {
+      $this->docstoreClient = \Drupal::service('reliefweb_docstore.client');
+    }
+    return $this->docstoreClient;
+  }
+
+  /**
+   * Get the reliefweb docstore config.
+   *
+   * @return \Drupal\Core\Config\ImmutableConfig
+   *   Docstore config.
+   */
+  protected function getDocstoreConfig() {
+    if (!isset($this->docstoreConfig)) {
+      $this->docstoreConfig = \Drupal::config('reliefweb_docstore.settings');
+    }
+    return $this->docstoreConfig;
+  }
+
+  /**
+   * Get the entity repository service.
+   *
+   * @return \Drupal\Core\Entity\EntityRepositoryInterface
+   *   The entity repository service.
+   */
+  protected function getEntityRepository() {
+    if (!isset($this->entityRepository)) {
+      $this->entityRepository = \Drupal::service('entity.repository');
+    }
+    return $this->entityRepository;
+  }
+
+  /**
+   * Get the entity type manager service.
+   *
+   * @return \Drupal\Core\Entity\EntityTypeManagerInterface
+   *   The entity type manager service.
+   */
+  protected function getEntityTypeManager() {
+    if (!isset($this->entityTypeManager)) {
+      $this->entityTypeManager = \Drupal::service('entity_type.manager');
+    }
+    return $this->entityTypeManager;
+  }
+
+  /**
+   * Get the file system serice.
+   *
+   * @return \Drupal\Core\File\FileSystemInterface
+   *   The file system service.
+   */
+  protected function getFileSystem() {
+    if (!isset($this->fileSystem)) {
+      $this->fileSystem = \Drupal::service('file_system');
     }
+    return $this->fileSystem;
   }
 
 }
diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php
index c8f05dc30..4b7c4d1c0 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php
@@ -13,27 +13,28 @@ class ReliefWebFileList extends FieldItemList {
    * {@inheritdoc}
    */
   public function preSave() {
-    $original_items = [];
+    // Filter out empty items.
+    $this->filterEmptyItems();
 
     // Extract the original items so that we can process replaced files,
     // create revisions for old ones etc.
+    $original_items = [];
     $original = $this->getEntity()->original;
     if (isset($original)) {
       foreach ($original->get($this->definition->getName()) as $item) {
         if (!$item->isEmpty()) {
-          $original_items[$item->get('uuid')->getValue()] = $item;
+          $original_items[$item->getUuid()] = $item;
         }
       }
     }
 
     // Add the original items to the replaced ones.
     foreach ($this->list as $item) {
-      $uuid = $item->get('uuid')->getValue();
-      $revision_id = $item->get('revision_id')->getValue();
-      // Add the original item, if it's been replaced.
-      if (isset($original_items[$uuid]) && empty($revision_id)) {
-        $item->_original_item = $original_items[$uuid];
-      }
+      $uuid = $item->getUuid();
+
+      // Call preSave on the item with the original item so we can compare what
+      // changed.
+      $item->preSave($original_items[$uuid] ?? NULL);
 
       // Remove items that exists in both the current list and old one so
       // that only the items that need to be deleted are left.
@@ -42,11 +43,8 @@ public function preSave() {
 
     // Mark all "deleted" items as private.
     foreach ($original_items as $item) {
-      $item->updateFileStatus(FALSE);
+      $item->updateFileStatus(TRUE);
     }
-
-    // Call "preSave" on each item.
-    $this->delegateMethod('preSave');
   }
 
 }
diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
index 279304fa0..650c9a148 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
@@ -15,6 +15,7 @@
 use Drupal\Core\Logger\LoggerChannelFactoryInterface;
 use Drupal\Core\Render\Markup;
 use Drupal\Core\Render\RendererInterface;
+use Drupal\file\Entity\File;
 use Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile as ReliefWebFileType;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -149,7 +150,7 @@ protected function formMultipleElements(FieldItemListInterface $items, array &$f
     elseif ($items->count() > 0) {
       foreach ($items as $item) {
         if (!$item->isEmpty()) {
-          $field_state['original_values'][$item->get('uuid')->getValue()] = $item->getValue();
+          $field_state['original_values'][$item->getUuid()] = $item->getValue();
         }
       }
       static::setWidgetState($parents, $field_name, $form_state, $field_state);
@@ -293,7 +294,6 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
     $defaults = [
       'uuid',
       'revision_id',
-      'private',
       'file_uuid',
       'file_name',
       'file_mime',
@@ -309,11 +309,11 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
     }
 
     // Link to the file.
-    $file_name = $item->get('file_name')->getValue();
-    $file_size = $item->get('file_size')->getValue();
-    $file_extension = ReliefWebFileType::getFileExtension($file_name);
+    $file_name = $item->getFileName();
+    $file_size = $item->getFileSize();
+    $file_extension = $item->getFileExtension();
     $file_label = $file_name . ' (' . mb_strtoupper($file_extension) . ' | ' . format_size($file_size) . ')';
-    $file_url = $item->getFileUrl(TRUE);
+    $file_url = $item->getFileUrl();
     if (!empty($file_url)) {
       $element['link'] = [
         '#type' => 'link',
@@ -334,20 +334,26 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
       '#type' => 'textfield',
       '#title' => $this->t('Description'),
       '#maxlength' => 255,
-      '#default_value' => $item->get('description')->getValue() ?? '',
+      '#default_value' => $item->getFileDescription() ?? '',
     ];
     $element['language'] = [
       '#type' => 'select',
       '#title' => $this->t('Language version'),
-      '#options' => reliefweb_docstore_get_languages(),
-      '#default_value' => $item->get('language')->getValue() ?? NULL,
+      // @todo add the empty option.
+      '#options' => array_merge(
+        ['' => ' - select - '],
+        reliefweb_docstore_get_languages()
+      ),
+      '#default_value' => $item->getFileLanguage() ?? NULL,
     ];
 
     // Display the preview and the page and rotation selection.
     if ($item->canHavePreview()) {
-      $preview_page = $item->get('preview_page')->getValue() ?? 1;
-      $preview_rotation = $item->get('preview_rotation')->getValue() ?? 0;
+      $preview_uuid = $item->getPreviewUuid();
+      $preview_page = $item->getPreviewPage() ?? 1;
+      $preview_rotation = $item->getPreviewRotation() ?? 0;
 
+      $original_preview_uuid = $item->_original_preview_uuid ?: $preview_uuid;
       $original_preview_page = $item->_original_preview_page ?: $preview_page;
       $original_preview_rotation = $item->_original_preview_rotation ?: $preview_rotation;
 
@@ -355,8 +361,13 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
         // Only regenerated the preview if the page or rotation changed.
         $regenerate = $original_preview_page != $preview_page || $original_preview_rotation != $preview_rotation;
 
+        // For the createion of new file if there is already one to prevent
+        // changing the existing preview that is displayed to the end users
+        // while the form is being edited.
+        $new_preview_file = $regenerate && $original_preview_uuid === $preview_uuid;
+
         // Ensure the preview is generated.
-        if ($item->generatePreview($preview_page, $preview_rotation, $regenerate) !== NULL) {
+        if ($item->generatePreview($preview_page, $preview_rotation, $regenerate, $new_preview_file) !== NULL) {
           $element['preview'] = $item->renderPreview('thumbnail');
 
           // Add state to hide the preview if "no preview" is selected.
@@ -395,8 +406,13 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
         '#ajax' => $this->getAjaxSettings($this->t('Regenerating preview...'), $field_parents),
       ];
 
-      // Store the original preview page and rotation so that we can compare
-      // with the new values and determine if the preview should be regenerated.
+      // Store the original preview uuid, page and rotation so that we can
+      // compare with the new values and determine if the preview should be
+      // regenerated.
+      $element['_original_preview_uuid'] = [
+        '#type' => 'hidden',
+        '#value' => $preview_uuid,
+      ];
       $element['_original_preview_page'] = [
         '#type' => 'hidden',
         '#value' => $preview_page,
@@ -623,8 +639,9 @@ protected function deleteFieldItem(array $element, FormStateInterface $form_stat
     try {
       // If the file was new or replaced, remove its associated managed files.
       if (empty($values['revision_id'])) {
-        ReliefWebFileType::deleteFileFromUuid($values['file_uuid']);
-        ReliefWebFileType::deleteFileFromUuid($values['preview_uuid'], TRUE);
+        $item = $this->createFieldItem($values);
+        $item->deleteFile();
+        $item->deletePreview();
       }
     }
     catch (\Exception $exception) {
@@ -647,9 +664,11 @@ protected function deleteFieldItem(array $element, FormStateInterface $form_stat
    *   The new field item values.
    */
   protected function replaceFieldItem(array $element, FormStateInterface $form_state, array $values) {
+    $previous_item = $this->createFieldItem($values);
+
     // Retrieve the upload validators for the original item. This will
     // ensure the replacement is of the same type.
-    $validators = $this->createFieldItem($values)->getUploadValidators();
+    $validators = $previous_item->getUploadValidators();
 
     // Create a new field item with associated managed files and replace the
     // original values with its values.
@@ -657,10 +676,15 @@ protected function replaceFieldItem(array $element, FormStateInterface $form_sta
     $items = $this->processUploadedFiles($element, $form_state, $name, $validators);
     if (!empty($items)) {
       $item = reset($items);
-      // Copy some properties from the original file.
-      $item['uuid'] = $values['uuid'];
-      $item['description'] = $values['description'];
-      $item['language'] = $values['language'];
+      // Copy some properties from the original field item.
+      $item['uuid'] = $previous_item->getUuid();
+      $item['file_name'] = $previous_item->getFileName();
+      $item['description'] = $previous_item->getFileDescription();
+      $item['language'] = $previous_item->getFileLanguage();
+
+      // Delete the previous item if it was a replacement, to reduce leftovers.
+      $this->deleteFieldItem($element, $form_state, $values);
+
       return $item;
     }
     // If we couldn't replace the file, keep the original values.
@@ -763,12 +787,12 @@ protected function processUploadedFile(\SplFileInfo $file_info, array $validator
     // it for the file uri.
     $file_uuid = ReliefWebFileType::generateUuid();
 
-    // Generate the file uri.
-    $extension = ReliefWebFileType::getFileExtension($file_name);
+    // Generate the file uri (private).
+    $extension = ReliefWebFileType::extractFileExtension($file_name);
     $uri = ReliefWebFileType::getFileUriFromUuid($file_uuid, $extension, TRUE);
 
     // Try to guess the real mime type of the uploaded file.
-    $file_mime = ReliefWebFileType::getFileMimeType($uri);
+    $file_mime = ReliefWebFileType::guessFileMimeType($uri);
 
     // Create a temporary managed file associated with the uploaded file.
     $file = ReliefWebFileType::createFileFromUuid($file_uuid, $uri, $file_name, $file_mime);
@@ -802,7 +826,7 @@ protected function processUploadedFile(\SplFileInfo $file_info, array $validator
     }
 
     // Update the file.
-    $file->setMimeType(ReliefWebFileType::getFileMimeType($uri));
+    $file->setMimeType(ReliefWebFileType::guessFileMimeType($uri));
     $file->setSize(@filesize($uri) ?? 0);
 
     // Populate and return the field item.
@@ -830,9 +854,6 @@ protected function populateFieldItemFromFile(ReliefWebFileType $item, File $file
       // This will be populated after a successful upload for remote files or
       // when saving the local file as permanent.
       'revision_id' => 0,
-      // We mark the item as private initially. It may be changed to public
-      // depending on the status of the entity the field is attached to etc.
-      'private' => TRUE,
       'file_uuid' => $file->uuid(),
       'file_name' => $file->getFilename(),
       'file_mime' => $file->getMimeType(),
@@ -853,6 +874,8 @@ protected function populateFieldItemFromFile(ReliefWebFileType $item, File $file
         ]);
       }
 
+      // Remove the uploaded file. There is no need to remove the file entity
+      // as it hasn't been saved to the database yet.
       $this->deleteUploadedFile($file->getFileUri());
 
       $this->throwError($this->t('Invalid field item data for the uploaded file %name.', [
diff --git a/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php b/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php
index 293545b82..323741e31 100644
--- a/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php
+++ b/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php
@@ -54,7 +54,7 @@ public function __construct(
   }
 
   /**
-   * Get a file in the docstore.
+   * Get a file resource in the docstore.
    *
    * @param string $uuid
    *   The file resource UUID.
@@ -67,12 +67,7 @@ public function __construct(
   public function getFile($uuid, $timeout = 5) {
     $response = $this->request('GET', '/api/v1/files/' . $uuid, [], $timeout);
 
-    if ($response !== NULL) {
-      $body = $response->getBody();
-      return !empty($body) ? json_decode($body, TRUE) : NULL;
-    }
-
-    return NULL;
+    return $this->decodeResponseBody($response);
   }
 
   /**
@@ -91,12 +86,7 @@ public function createFile(array $payload, $timeout = 5) {
       'json' => $payload,
     ], $timeout);
 
-    if ($response !== NULL) {
-      $body = $response->getBody();
-      return !empty($body) ? json_decode($body, TRUE) : NULL;
-    }
-
-    return NULL;
+    return $this->decodeResponseBody($response);
   }
 
   /**
@@ -127,12 +117,7 @@ public function updateFileContentFromFilePath($uuid, $path, $timeout = 300) {
       'body' => $resource,
     ], $timeout);
 
-    if ($response !== NULL) {
-      $body = $response->getBody();
-      return !empty($body) ? json_decode($body, TRUE) : NULL;
-    }
-
-    return NULL;
+    return $this->decodeResponseBody($response);
   }
 
   /**
@@ -200,12 +185,28 @@ public function updateFileStatus($uuid, $private, $timeout = 5) {
       ],
     ], $timeout);
 
-    if ($response !== NULL) {
-      $body = $response->getBody();
-      return !empty($body) ? json_decode($body, TRUE) : NULL;
-    }
+    return $this->decodeResponseBody($response);
+  }
 
-    return NULL;
+  /**
+   * Select the file version to make active for us.
+   *
+   * @param string $uuid
+   *   The file resource UUID.
+   * @param int $revision_id
+   *   The file revision id.
+   *
+   * @return bool
+   *   TRUE on success.
+   */
+  public function selectFileVersion($uuid, $revision_id) {
+    $response = $this->request('PUT', '/api/v1/files/' . $uuid . '/select', [
+      'json' => [
+        'target' => $revision_id,
+      ],
+    ], $timeout);
+
+    return !empty($response) && $resposne->isSuccessful();
   }
 
   /**
@@ -249,6 +250,26 @@ public function request($method, $endpoint, array $options, $timeout = 5) {
     }
   }
 
+  /**
+   * Decode the response body.
+   *
+   * Note: this assumes the body is JSON encoded data.
+   *
+   * @param \Psr\Http\Message\ResponseInterface|null $response
+   *   The request's response.
+   *
+   * @return mixed
+   *   NULL if the response body couldn't be decoded otherwise whatever the
+   *   was in the body.
+   */
+  public function decodeResponseBody(?ResponseInterface $response) {
+    if ($response !== NULL) {
+      $body = $response->getBody();
+      return !empty($body) ? json_decode($body, TRUE) : NULL;
+    }
+    return NULL;
+  }
+
   /**
    * Create a URL to the docstore for the given endpoint.
    *
diff --git a/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-list--interactive.html.twig b/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-list--interactive.html.twig
new file mode 100644
index 000000000..d3eb466dd
--- /dev/null
+++ b/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-list--interactive.html.twig
@@ -0,0 +1,22 @@
+{#
+
+/**
+ * @file
+ * Template for a list of files.
+ */
+
+#}
+{% if list is not empty %}
+<section{{ attributes.addClass(['rw-file-list', 'rw-file-list--interactive']) }}>
+  <h{{ level }}{{ title_attributes }}>{{ title }}</h{{ level }}>
+  <div{{ list_attributes }}>
+    {% for item in list %}
+    <figure>
+      <a href="{{ item.url }}" target="_blank" rel="noopener">{{ item.preview }}</a>
+      <figcaption>{{ item.label }}</figcaption>
+    </figure>
+    {% endfor %}
+  </div>
+  {{ footer }}
+</section>
+{% endif %}
diff --git a/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-list.html.twig b/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-list.html.twig
new file mode 100644
index 000000000..05f681e4e
--- /dev/null
+++ b/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-list.html.twig
@@ -0,0 +1,25 @@
+{#
+
+/**
+ * @file
+ * Template for a list of files.
+ */
+
+#}
+{% if list is not empty %}
+<section{{ attributes.addClass('rw-file-list') }}>
+  <h{{ level }}{{ title_attributes.addClass('visually-hidden') }}>{{ title }}</h{{ level }}>
+  <ul{{ list_attributes }}>
+    {% for item in list %}
+    <li>
+      <a href="{{ item.url }}" download="{{ item.name }}">
+        {{ item.preview }}
+        <strong class="rw-file__label">{{ item.label }}</strong>
+        <span class="rw-file__description">{{ item.description }}</span>
+      </a>
+    </li>
+    {% endfor %}
+  </ul>
+</section>
+{% endif %}
+

From 0d2b5295de43f2b577934ab5646211fd3a2a4523 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 19 Nov 2021 23:50:24 +0900
Subject: [PATCH 121/720] [RW-25] Add method on Report entity to get the
 attachments render array

---
 .../reliefweb_entities/src/Entity/Report.php  | 83 +++++++++++++++++++
 1 file changed, 83 insertions(+)

diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Report.php b/html/modules/custom/reliefweb_entities/src/Entity/Report.php
index 95e20b05e..51715b3cf 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Report.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Report.php
@@ -2,6 +2,8 @@
 
 namespace Drupal\reliefweb_entities\Entity;
 
+use Drupal\Core\Link;
+use Drupal\Core\Url;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\node\Entity\Node;
 use Drupal\reliefweb_entities\BundleEntityInterface;
@@ -11,6 +13,7 @@
 use Drupal\reliefweb_moderation\EntityModeratedTrait;
 use Drupal\reliefweb_revisions\EntityRevisionedInterface;
 use Drupal\reliefweb_revisions\EntityRevisionedTrait;
+use Drupal\reliefweb_utility\Helpers\DateHelper;
 use Drupal\reliefweb_utility\Helpers\UrlHelper;
 
 /**
@@ -94,4 +97,84 @@ public function getSourceDisclaimers() {
     ];
   }
 
+  /**
+   * Get the report attachments.
+   *
+   * @return array
+   *   Render array with the list of attachments.
+   */
+  public function getAttachments() {
+    if (!$this->hasField('field_file') || $this->field_file->isEmpty()) {
+      return [];
+    }
+
+    $build = $this->field_file->view();
+    if (empty($build)) {
+      return [];
+    }
+
+    $formats = [];
+    foreach ($this->field_content_format as $item) {
+      $formats[$item->target_id] = $item->target_id;
+    }
+
+    // The report is an interactive content.
+    if (isset($formats[38974])) {
+      $build['#theme'] = 'reliefweb_file_list__interactive';
+
+      $build['#title'] = $this->t('Screenshot(s) of the interactive content as of @date', [
+        '@date' => DateHelper::format($this->getCreatedTime(), 'custom', 'j m Y'),
+      ]);
+
+      $build['#footer'] = Link::fromTextAndUrl(
+        $this->t('View the interactive content page'),
+        Url::fromUri($this->origin_notes->value, [
+          'attributes' => [
+            'target' => '_blank',
+            'rel' => 'noopener',
+          ],
+        ])
+      );
+
+      foreach ($build['#list'] as $index => &$item) {
+        $description = $item['item']->getFileDescription();
+        if (!empty($description)) {
+          $item['label'] = $this->t('Screenshot @index: @description', [
+            '@index' => $index + 1,
+            '@description' => $description,
+          ]);
+        }
+        else {
+          $item['label'] = $this->t('Screenshot @index', [
+            '@index' => $index + 1,
+          ]);
+        }
+        if (isset($item['preview'])) {
+          $item['preview']['#style_name'] = 'large';
+          $item['preview']['#alt'] = $item['label'];
+        }
+      }
+    }
+    // The report is a map or an infographic.
+    elseif (isset($formats[12]) || isset($formats[12570])) {
+      $label = isset($formats[12]) ? $this->t('Download Map') : $this->t('Download Infographic');
+      $build['#attributes']['class'][] = 'rw-file-list--map';
+      foreach ($build['#list'] as &$item) {
+        if (isset($item['preview'])) {
+          $item['preview']['#style_name'] = 'large';
+        }
+        $item['label'] = $label;
+      }
+    }
+    else {
+      $label = $this->t('Download Report');
+      $build['#attributes']['class'][] = 'rw-file-list--report';
+      foreach ($build['#list'] as &$item) {
+        $item['label'] = $label;
+      }
+    }
+
+    return $build;
+  }
+
 }

From b92e4eeac288323887c4fb2ff1b8d3d880c5381e Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 19 Nov 2021 23:51:00 +0900
Subject: [PATCH 122/720] [RW-25] Display attachments in report template

---
 .../content/node--report--full.html.twig      | 48 ++-----------------
 1 file changed, 3 insertions(+), 45 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/templates/content/node--report--full.html.twig b/html/themes/custom/common_design_subtheme/templates/content/node--report--full.html.twig
index 557ad07ac..3e0a28d87 100644
--- a/html/themes/custom/common_design_subtheme/templates/content/node--report--full.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/content/node--report--full.html.twig
@@ -160,53 +160,11 @@
 
     <div class="rw-report__content">
 
-{#      Report#}
-{#      <section id="attachments" class="rw-attachment rw-attachment--report">#}
-{#        <h3 class="visually-hidden">Attachments</h3>#}
-{#        <ul>#}
-{#          <li>#}
-{#            <a href="#" download="Asia-Pacific COVID-19 update 9 November 2021.pdf">#}
-{#              <img src="https://reliefweb.int/sites/reliefweb.int/files/styles/report-small/public/resources-pdf-previews/1589432-Asia-Pacific%20COVID-19%20update%209%20November%202021.png?itok=IYA05TKD" alt="">#}
-{#              <strong>Download document</strong>#}
-{#              <span>(PDF | 439.83 KB)</span>#}
-{#            </a>#}
-{#          </li>#}
-{#        </ul>#}
-{#      </section>#}
+      {{ node.getAttachments() }}
 
-{#      Interactive#}
-{#      <section id="interactive" class="rw-attachment rw-attachment--interactive">#}
-{#        <h3>Screenshot(s) of the interactive content as of 30 Apr 2021</h3>#}
-{#        <div class="rw-attachment__content">#}
-{#          <figure>#}
-{#            <a href="#" target="_blank" rel="noopener">#}
-{#              <img src="https://reliefweb.int/sites/reliefweb.int/files/styles/report-large/public/resources-pdf-previews/1575720-SOMALIA%20%20%20UNHCR%205W%20%20Who%20is%20doing%20What%20Where%20When%20for%20Whom%20.png?itok=4fIvGZts" alt="Screenshot 1">#}
-{#            </a>#}
-{#            <figcaption aria-hidden="true">Screenshot 1</figcaption>#}
-{#          </figure>#}
-{#        </div>#}
-{#        <footer class="rw-attachment__footer">#}
-{#          <a href="#" target="_blank" rel="noopener">View the interactive content page</a>#}
-{#        </footer>#}
-{#      </section>#}
+      {{ content.body.0|render|sanitize_html(false, 2) }}
 
-{#      Map or Infographic#}
-{#      <section id="attachments" class="rw-attachment rw-attachment--map">#}
-{#        <h3 class="visually-hidden">Attachments</h3>#}
-{#        <ul>#}
-{#          <li>#}
-{#            <a href="#" download="partner_presence.pdf">#}
-{#              <img src="https://reliefweb.int/sites/reliefweb.int/files/styles/report-large/public/resources-pdf-previews/1575739-partner_presence.png?itok=6nzWdeYx" alt="">#}
-{#              <strong>Download Map</strong>#}
-{#              <span>(PDF | 236.67 KB)</span>#}
-{#            </a>#}
-{#          </li>#}
-{#        </ul>#}
-{#      </section>#}
-
-    {{ content.body.0|render|sanitize_html(false, 2) }}
-
-    {{ node.getSourceDisclaimers() }}
+      {{ node.getSourceDisclaimers() }}
 
     </div>
   </div>

From 9c97cfef800e39064708a0e917ca37f47965e6c3 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Mon, 22 Nov 2021 10:25:19 +0100
Subject: [PATCH 123/720] Add weight and parent properties

---
 config/filter.format.guideline.yml            | 17 +++-
 .../guidelines/src/Entity/Guideline.php       | 46 +++++++++++
 .../guidelines/src/Form/GuidelineForm.php     | 77 +++++++++++++++++++
 3 files changed, 136 insertions(+), 4 deletions(-)

diff --git a/config/filter.format.guideline.yml b/config/filter.format.guideline.yml
index e9ca53070..c4cbdd023 100644
--- a/config/filter.format.guideline.yml
+++ b/config/filter.format.guideline.yml
@@ -25,9 +25,18 @@ filters:
     weight: 0
     settings:
       replace_empty: '0'
-  filter_markdown:
-    id: filter_markdown
-    provider: reliefweb_utility
+  filter_autop:
+    id: filter_autop
+    provider: filter
     status: true
-    weight: -20
+    weight: 0
     settings: {  }
+  filter_html:
+    id: filter_html
+    provider: filter
+    status: true
+    weight: -10
+    settings:
+      allowed_html: '<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type=''1 A I''> <li> <dl> <dt> <dd> <h2 id=''jump-*''> <h3 id> <h4 id> <h5 id> <h6 id>'
+      filter_html_help: true
+      filter_html_nofollow: false
diff --git a/html/modules/custom/guidelines/src/Entity/Guideline.php b/html/modules/custom/guidelines/src/Entity/Guideline.php
index a87269f05..82683dcd5 100644
--- a/html/modules/custom/guidelines/src/Entity/Guideline.php
+++ b/html/modules/custom/guidelines/src/Entity/Guideline.php
@@ -190,6 +190,41 @@ public function setOwner(UserInterface $account) {
     return $this;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getWeight() {
+    return $this->get('weight')->value;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setWeight($weight) {
+    $this->set('weight', $weight);
+    return $this;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getParents() {
+    $ids = [];
+    foreach ($this->get('parent')->referencedEntities() as $parent) {
+      $ids[] = $parent->id();
+    }
+
+    return $ids;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function setParents($parent) {
+    $this->set('parent', $parent);
+    return $this;
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -267,6 +302,17 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
       ->setRevisionable(TRUE)
       ->setTranslatable(TRUE);
 
+    $fields['weight'] = BaseFieldDefinition::create('integer')
+      ->setLabel(t('Weight'))
+      ->setDescription(t('The weight of this guideline in relation to other guidelines.'))
+      ->setDefaultValue(0);
+
+    $fields['parent'] = BaseFieldDefinition::create('entity_reference')
+      ->setLabel(t('Guideline parents'))
+      ->setDescription(t('The parents of this term.'))
+      ->setSetting('target_type', 'guideline')
+      ->setCardinality(BaseFieldDefinition::CARDINALITY_UNLIMITED);
+
     return $fields;
   }
 
diff --git a/html/modules/custom/guidelines/src/Form/GuidelineForm.php b/html/modules/custom/guidelines/src/Form/GuidelineForm.php
index 78b51ec0a..a1b17a99a 100644
--- a/html/modules/custom/guidelines/src/Form/GuidelineForm.php
+++ b/html/modules/custom/guidelines/src/Form/GuidelineForm.php
@@ -46,9 +46,79 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       ];
     }
 
+    $guideline_storage = $this->entityTypeManager->getStorage('guideline');
+    $guidelines = $guideline_storage->loadMultiple();
+    $guideline_options = [
+      '<' . $this->t('root') . '>',
+    ];
+
+    foreach ($guidelines as $guideline) {
+      if ($guideline->id() != $this->entity->id()) {
+        $guideline_options[$guideline->id()] = $guideline->label();
+      }
+    }
+
+    $form['relations'] = [
+      '#type' => 'details',
+      '#title' => $this->t('Relations'),
+      '#open' => count($guideline_options) > 1,
+      '#weight' => 10,
+    ];
+
+    $form['relations']['parent'] = [
+      '#type' => 'select',
+      '#title' => $this->t('Parent guideline(s)'),
+      '#options' => $guideline_options,
+      '#default_value' => $this->entity->getParents(),
+      '#multiple' => TRUE,
+    ];
+
+    $form['relations']['weight'] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Weight'),
+      '#size' => 6,
+      '#default_value' => $this->entity->getWeight(),
+      '#description' => $this->t('Guilines are displayed in ascending order by weight.'),
+      '#required' => TRUE,
+    ];
+
     return $form;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+    parent::validateForm($form, $form_state);
+
+    // Ensure numeric values.
+    if ($form_state->hasValue('weight') && !is_numeric($form_state->getValue('weight'))) {
+      $form_state->setErrorByName('weight', $this->t('Weight value must be numeric.'));
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildEntity(array $form, FormStateInterface $form_state) {
+    $guideline = parent::buildEntity($form, $form_state);
+
+    // Prevent leading and trailing spaces in guideline names.
+    $guideline->setName(trim($guideline->getName()));
+
+    // Assign parents with proper delta values starting from 0.
+    $guideline->parent = array_values($form_state->getValue('parent'));
+
+    return $guideline;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEditedFieldNames(FormStateInterface $form_state) {
+    return array_merge(['parent', 'weight'], parent::getEditedFieldNames($form_state));
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -67,6 +137,12 @@ public function save(array $form, FormStateInterface $form_state) {
       $entity->setNewRevision(FALSE);
     }
 
+    $current_parent_count = count($form_state->getValue('parent'));
+    // Root doesn't count if it's the only parent.
+    if ($current_parent_count == 1 && $form_state->hasValue(['parent', 0])) {
+      $form_state->setValue('parent', []);
+    }
+
     $status = parent::save($form, $form_state);
 
     switch ($status) {
@@ -81,6 +157,7 @@ public function save(array $form, FormStateInterface $form_state) {
           '%label' => $entity->label(),
         ]));
     }
+
     $form_state->setRedirect('entity.guideline.canonical', ['guideline' => $entity->id()]);
   }
 

From 2590107059cc809a60e86bce06d5c8236abb6d00 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Mon, 22 Nov 2021 10:25:26 +0100
Subject: [PATCH 124/720] Add weight and parent properties

---
 html/modules/custom/guidelines/src/Form/GuidelineForm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/modules/custom/guidelines/src/Form/GuidelineForm.php b/html/modules/custom/guidelines/src/Form/GuidelineForm.php
index a1b17a99a..8ff6a5a4d 100644
--- a/html/modules/custom/guidelines/src/Form/GuidelineForm.php
+++ b/html/modules/custom/guidelines/src/Form/GuidelineForm.php
@@ -34,7 +34,7 @@ public static function create(ContainerInterface $container) {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    /* @var \Drupal\guidelines\Entity\Guideline $entity */
+    /** @var \Drupal\guidelines\Entity\Guideline $this->entity */
     $form = parent::buildForm($form, $form_state);
 
     if (!$this->entity->isNew()) {

From 8db947f3028c6e8bd546f0e3c21e19b6c7001e85 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Mon, 22 Nov 2021 11:50:28 +0100
Subject: [PATCH 125/720] Show weight and parents in list

---
 html/modules/custom/guidelines/README.md      |  5 ++++
 .../guidelines/src/Entity/Guideline.php       |  7 ++++++
 .../guidelines/src/Form/GuidelineForm.php     |  2 +-
 .../guidelines/src/GuidelineListBuilder.php   | 24 +++++++++++++++++--
 4 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 html/modules/custom/guidelines/README.md

diff --git a/html/modules/custom/guidelines/README.md b/html/modules/custom/guidelines/README.md
new file mode 100644
index 000000000..00ccf8091
--- /dev/null
+++ b/html/modules/custom/guidelines/README.md
@@ -0,0 +1,5 @@
+# Guidelines
+
+## Todo
+
+- [ ] Add overview per guideline type with drag and drop
diff --git a/html/modules/custom/guidelines/src/Entity/Guideline.php b/html/modules/custom/guidelines/src/Entity/Guideline.php
index 82683dcd5..86b285811 100644
--- a/html/modules/custom/guidelines/src/Entity/Guideline.php
+++ b/html/modules/custom/guidelines/src/Entity/Guideline.php
@@ -209,6 +209,13 @@ public function setWeight($weight) {
    * {@inheritdoc}
    */
   public function getParents() {
+    return $this->get('parent')->referencedEntities();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getParentIds() {
     $ids = [];
     foreach ($this->get('parent')->referencedEntities() as $parent) {
       $ids[] = $parent->id();
diff --git a/html/modules/custom/guidelines/src/Form/GuidelineForm.php b/html/modules/custom/guidelines/src/Form/GuidelineForm.php
index 8ff6a5a4d..72065f0ee 100644
--- a/html/modules/custom/guidelines/src/Form/GuidelineForm.php
+++ b/html/modules/custom/guidelines/src/Form/GuidelineForm.php
@@ -69,7 +69,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#type' => 'select',
       '#title' => $this->t('Parent guideline(s)'),
       '#options' => $guideline_options,
-      '#default_value' => $this->entity->getParents(),
+      '#default_value' => $this->entity->getParentIds(),
       '#multiple' => TRUE,
     ];
 
diff --git a/html/modules/custom/guidelines/src/GuidelineListBuilder.php b/html/modules/custom/guidelines/src/GuidelineListBuilder.php
index d0aa1efc6..ef4577102 100644
--- a/html/modules/custom/guidelines/src/GuidelineListBuilder.php
+++ b/html/modules/custom/guidelines/src/GuidelineListBuilder.php
@@ -19,6 +19,8 @@ class GuidelineListBuilder extends EntityListBuilder {
   public function buildHeader() {
     $header['id'] = $this->t('Guideline ID');
     $header['name'] = $this->t('Name');
+    $header['weight'] = $this->t('Weight');
+    $header['parent'] = $this->t('Parent(s)');
     return $header + parent::buildHeader();
   }
 
@@ -26,13 +28,31 @@ public function buildHeader() {
    * {@inheritdoc}
    */
   public function buildRow(EntityInterface $entity) {
-    /* @var \Drupal\guidelines\Entity\Guideline $entity */
+    /** @var \Drupal\guidelines\Entity\Guideline $entity */
     $row['id'] = $entity->id();
     $row['name'] = Link::createFromRoute(
       $entity->label(),
-      'entity.guideline.edit_form',
+      'entity.guideline.canonical',
       ['guideline' => $entity->id()]
     );
+    $row['weight'] = !empty($entity->getWeight()) ? $entity->getWeight() : '';
+
+    $parents = [];
+    $parent_entities = $entity->getParents();
+    foreach ($parent_entities as $parent_entity) {
+      $parents[] = Link::createFromRoute(
+        $parent_entity->label(),
+        'entity.guideline.canonical',
+        ['guideline' => $parent_entity->id()]
+      )->toString();
+    }
+
+    $row['parent'] = [
+      'data' => [
+        '#markup' => implode(', ', $parents),
+      ],
+    ];
+
     return $row + parent::buildRow($entity);
   }
 

From aee5d94352df1269c7c611325c670f71990cbe0c Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Mon, 22 Nov 2021 16:14:23 +0100
Subject: [PATCH 126/720] Add drag and drop

---
 composer.json                                 |  1 +
 composer.lock                                 | 70 ++++++++++++++++++-
 composer.patches.json                         |  6 +-
 html/modules/custom/guidelines/README.md      |  4 +-
 .../guidelines/src/Entity/Guideline.php       |  1 +
 .../guidelines/src/GuidelineListBuilder.php   | 30 +++++---
 6 files changed, 98 insertions(+), 14 deletions(-)

diff --git a/composer.json b/composer.json
index 163f2f58b..28dfd095d 100644
--- a/composer.json
+++ b/composer.json
@@ -58,6 +58,7 @@
         "drupal/core-composer-scaffold": "^9.2.4",
         "drupal/core-dev": "^9.2.4",
         "drupal/core-recommended": "^9.2.4",
+        "drupal/entity": "1.x-dev@dev",
         "drupal/geofield": "^1.22",
         "drupal/google_tag": "^1.4",
         "drupal/imageapi_optimize_binaries": "^1.0-alpha2",
diff --git a/composer.lock b/composer.lock
index c67db75aa..d7d3dc52d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "8db2f3649b52fc7fb83aabb714b29d48",
+    "content-hash": "8c8ecbc83d911da0ae4d3807a66b4e06",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -2844,6 +2844,71 @@
                 "issues": "https://www.drupal.org/project/issues/ctools"
             }
         },
+        {
+            "name": "drupal/entity",
+            "version": "dev-1.x",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupalcode.org/project/entity.git",
+                "reference": "e74400440e0f1ccb5604d05561763e04018512ea"
+            },
+            "require": {
+                "drupal/core": "^8.8 || ^9"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.x": "1.x-dev"
+                },
+                "drupal": {
+                    "version": "8.x-1.2+5-dev",
+                    "datestamp": "1635842317",
+                    "security-coverage": {
+                        "status": "not-covered",
+                        "message": "Dev releases are not covered by Drupal security advisories."
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Berdir",
+                    "homepage": "https://www.drupal.org/user/214652"
+                },
+                {
+                    "name": "TR",
+                    "homepage": "https://www.drupal.org/user/202830"
+                },
+                {
+                    "name": "bojanz",
+                    "homepage": "https://www.drupal.org/user/86106"
+                },
+                {
+                    "name": "dawehner",
+                    "homepage": "https://www.drupal.org/user/99340"
+                },
+                {
+                    "name": "dixon_",
+                    "homepage": "https://www.drupal.org/user/239911"
+                },
+                {
+                    "name": "fago",
+                    "homepage": "https://www.drupal.org/user/16747"
+                },
+                {
+                    "name": "mglaman",
+                    "homepage": "https://www.drupal.org/user/2416470"
+                }
+            ],
+            "description": "Provides expanded entity APIs, which will be moved to Drupal core one day.",
+            "homepage": "http://drupal.org/project/entity",
+            "support": {
+                "source": "https://git.drupalcode.org/project/entity"
+            }
+        },
         {
             "name": "drupal/entity_reference_revisions",
             "version": "1.9.0",
@@ -14472,6 +14537,7 @@
     "aliases": [],
     "minimum-stability": "dev",
     "stability-flags": {
+        "drupal/entity": 20,
         "drupal/mimemail": 15,
         "drupal/taxonomy_term_revision": 20,
         "unocha/common_design": 20
@@ -14485,5 +14551,5 @@
     "platform-overrides": {
         "php": "8.0"
     },
-    "plugin-api-version": "2.0.0"
+    "plugin-api-version": "2.1.0"
 }
diff --git a/composer.patches.json b/composer.patches.json
index 72c7f4cd3..3b9091064 100644
--- a/composer.patches.json
+++ b/composer.patches.json
@@ -2,7 +2,11 @@
     "patches": {
         "drupal/core" : {
             "https://www.drupal.org/project/drupal/issues/2570593": "patches/core--drupal--2570593-bundle-entity-class.patch",
-            "https://www.drupal.org/project/drupal/issues/3047110": "patches/core--drupal--3047110-taxonomy-term-moderation-class.patch"
+            "https://www.drupal.org/project/drupal/issues/3047110": "patches/core--drupal--3047110-taxonomy-term-moderation-class.patch",
+            "https://www.drupal.org/node/2989889": "https://www.drupal.org/files/issues/2021-06-29/2989889-17.patch"
+        },
+        "drupal/entity": {
+          "https://www.drupal.org/project/entity/issues/2990784": "https://www.drupal.org/files/issues/2020-02-26/2990784-11-draggable-list-builder.patch"
         }
     }
 }
diff --git a/html/modules/custom/guidelines/README.md b/html/modules/custom/guidelines/README.md
index 00ccf8091..742fb753a 100644
--- a/html/modules/custom/guidelines/README.md
+++ b/html/modules/custom/guidelines/README.md
@@ -2,4 +2,6 @@
 
 ## Todo
 
-- [ ] Add overview per guideline type with drag and drop
+- [ ] Add moderation
+- [ ] Add overview per guideline type
+- [ ] Add drag and drop, https://www.drupal.org/project/drupal/issues/2989889
diff --git a/html/modules/custom/guidelines/src/Entity/Guideline.php b/html/modules/custom/guidelines/src/Entity/Guideline.php
index 86b285811..1a78a846a 100644
--- a/html/modules/custom/guidelines/src/Entity/Guideline.php
+++ b/html/modules/custom/guidelines/src/Entity/Guideline.php
@@ -54,6 +54,7 @@
  *     "uid" = "user_id",
  *     "langcode" = "langcode",
  *     "published" = "status",
+ *     "weight" = "weight",
  *   },
  *   revision_metadata_keys = {
  *     "revision_user" = "revision_user",
diff --git a/html/modules/custom/guidelines/src/GuidelineListBuilder.php b/html/modules/custom/guidelines/src/GuidelineListBuilder.php
index ef4577102..db2526ea8 100644
--- a/html/modules/custom/guidelines/src/GuidelineListBuilder.php
+++ b/html/modules/custom/guidelines/src/GuidelineListBuilder.php
@@ -3,25 +3,37 @@
 namespace Drupal\guidelines;
 
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityListBuilder;
 use Drupal\Core\Link;
+use Drupal\entity\DraggableListBuilder;
 
 /**
  * Defines a class to build a listing of Guideline entities.
  *
  * @ingroup guidelines
  */
-class GuidelineListBuilder extends EntityListBuilder {
+class GuidelineListBuilder extends DraggableListBuilder {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $limit = FALSE;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'guidelines_list';
+  }
 
   /**
    * {@inheritdoc}
    */
   public function buildHeader() {
-    $header['id'] = $this->t('Guideline ID');
-    $header['name'] = $this->t('Name');
-    $header['weight'] = $this->t('Weight');
+    $header['label'] = $this->t('Name');
     $header['parent'] = $this->t('Parent(s)');
-    return $header + parent::buildHeader();
+    $header = $header + parent::buildHeader();
+
+    return $header;
   }
 
   /**
@@ -29,13 +41,11 @@ public function buildHeader() {
    */
   public function buildRow(EntityInterface $entity) {
     /** @var \Drupal\guidelines\Entity\Guideline $entity */
-    $row['id'] = $entity->id();
-    $row['name'] = Link::createFromRoute(
+    $row['label'] = Link::createFromRoute(
       $entity->label(),
       'entity.guideline.canonical',
       ['guideline' => $entity->id()]
-    );
-    $row['weight'] = !empty($entity->getWeight()) ? $entity->getWeight() : '';
+    )->toString();
 
     $parents = [];
     $parent_entities = $entity->getParents();

From 323426aaeb243c945f6197990c322d7c52ec79e5 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 23 Nov 2021 12:50:46 +0100
Subject: [PATCH 127/720] WIP: import from trello

---
 .../custom/guidelines/guidelines.module       |  61 ++++++++
 .../guidelines/src/Entity/Guideline.php       |   2 +-
 .../guidelines/src/GuidelinesFromTrello.php   | 138 ++++++++++++++++++
 3 files changed, 200 insertions(+), 1 deletion(-)
 create mode 100644 html/modules/custom/guidelines/src/GuidelinesFromTrello.php

diff --git a/html/modules/custom/guidelines/guidelines.module b/html/modules/custom/guidelines/guidelines.module
index 8b7be6270..744b0b655 100644
--- a/html/modules/custom/guidelines/guidelines.module
+++ b/html/modules/custom/guidelines/guidelines.module
@@ -117,3 +117,64 @@ function guidelines_attach_to_widget(&$element, FormStateInterface &$form_state,
     }
   }
 }
+
+function reliefweb_guidelines_migrate() {
+  $config = \Drupal::config('reliefweb_trello.settings');
+  $key = $config->get('key');
+  $token = $config->get('token');
+
+  $trello = new \Drupal\guidelines\GuidelinesFromTrello($key, $token, \Drupal::service('config.factory'), \Drupal::service('http_client'), \Drupal::service('logger.factory'));
+
+  $lists = $trello->getLists('554c519c9b98caa2495ea5db');
+  foreach ($lists as $weight_list => $list) {
+    // Create guideline.
+    $values = [
+      'type' => 'guideline_list',
+      'name' => $list['name'],
+      'parent' => [],
+      'weight' => $weight_list,
+      'field_title' => $list['name'],
+    ];
+
+    $guideline_list = Guideline::create($values);
+    $guideline_list->save();
+
+    // Get cards.
+    $cards = $trello->getCards($list['id']);
+    foreach ($cards as $weight_card => $card) {
+      // Create guideline, check labels.
+      $values = [
+        'type' => 'field_guideline',
+        'name' => $card['name'],
+        'parent' => [],
+        'weight' => $weight_card,
+        'field_title' => $card['name'],
+        'field_description' => [
+          'value' => $card['desc'],
+          'format' => 'guideline',
+        ],
+      ];
+
+      // Check labels.
+      foreach ($card['labels'] as $label) {
+        if (strpos($label['name'], 'form-') === 0) {
+          $field_name = substr($label['name'], 5);
+          $bundle = $guideline_list->label();
+        }
+      }
+
+      $guideline = Guideline::create($values);
+      $guideline->setParents([$guideline_list]);
+      $guideline->save();
+
+      // Get attachments.
+      if ($card['badges']['attachments'] > 0) {
+        $attachments = $trello->getCardAttachments($card['id']);
+        foreach($attachments as $attachment) {
+          dpm($attachment);
+        }
+      }
+    }
+  }
+
+}
diff --git a/html/modules/custom/guidelines/src/Entity/Guideline.php b/html/modules/custom/guidelines/src/Entity/Guideline.php
index 1a78a846a..1c87a6923 100644
--- a/html/modules/custom/guidelines/src/Entity/Guideline.php
+++ b/html/modules/custom/guidelines/src/Entity/Guideline.php
@@ -272,7 +272,7 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
       ->setDescription(t('The name of the Guideline entity.'))
       ->setRevisionable(TRUE)
       ->setSettings([
-        'max_length' => 50,
+        'max_length' => 250,
         'text_processing' => 0,
       ])
       ->setDefaultValue('')
diff --git a/html/modules/custom/guidelines/src/GuidelinesFromTrello.php b/html/modules/custom/guidelines/src/GuidelinesFromTrello.php
new file mode 100644
index 000000000..0dc24c4f1
--- /dev/null
+++ b/html/modules/custom/guidelines/src/GuidelinesFromTrello.php
@@ -0,0 +1,138 @@
+<?php
+
+namespace Drupal\guidelines;
+
+use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Logger\LoggerChannelFactoryInterface;
+use Drupal\Core\Url;
+use GuzzleHttp\ClientInterface;
+use GuzzleHttp\Exception\ClientException;
+
+class GuidelinesFromTrello {
+  protected $key = '';
+  protected $token = '';
+
+  /**
+   * The HTTP client service.
+   *
+   * @var \GuzzleHttp\ClientInterface
+   */
+  protected $httpClient;
+
+  /**
+   * Constructor.
+   *
+   * @param string $key
+   *   Trello key.
+   * @param string $key
+   *   Trello token.
+   * @param Drupal\Core\Config\ConfigFactoryInterface $config_factory
+   *   The config factory service.
+   * @param \GuzzleHttp\ClientInterface $http_client
+   *   The HTTP client service.
+   * @param Drupal\Core\Logger\LoggerChannelFactoryInterface $logger_factory
+   *   The logger factory service.
+   */
+  public function __construct($key, $token, ConfigFactoryInterface $config_factory, ClientInterface $http_client, LoggerChannelFactoryInterface $logger_factory) {
+    $this->key = $key;
+    $this->token = $token;
+    $this->config = $config_factory;
+    $this->httpClient = $http_client;
+    $this->logger = $logger_factory->get('reliefweb_guidelines');
+  }
+
+  public function getBoards() {
+    $url = 'https://api.trello.com/1/members/me/boards';
+    $parmeters = [
+      'fields' => 'name,url',
+    ];
+
+    return $this->fetchData($url, $parmeters);
+  }
+
+  public function getLists($board_id, $status = 'open') {
+    $url = strtr('https://api.trello.com/1/boards/@id/lists/@status', [
+      '@id' => $board_id,
+      '@status' => $status,
+    ]);
+    $parmeters = [
+      'fields' => 'name,url,pos',
+    ];
+
+    return $this->fetchData($url, $parmeters);
+  }
+
+  public function getCards($list_id) {
+    $url = strtr('https://api.trello.com/1/lists/@id/cards', [
+      '@id' => $list_id,
+    ]);
+    $parmeters = [
+      'fields' => 'desc,idBoard,idList,idShort,name,shortLink,badges,shortUrl,labels,idAttachmentCover',
+    ];
+
+    return $this->fetchData($url, $parmeters);
+  }
+
+  public function getCard($card_id) {
+    $url = strtr('https://api.trello.com/1/cards/@id', [
+      '@id' => $card_id,
+    ]);
+    $parmeters = [
+      'fields' => 'desc,idBoard,idList,idShort,name,shortLink,badges,shortUrl,labels,idAttachmentCover',
+    ];
+
+    return $this->fetchData($url, $parmeters);
+  }
+
+  public function getCardAttachments($card_id) {
+    $url = strtr('https://api.trello.com/1/cards/@id/attachments', [
+      '@id' => $card_id,
+    ]);
+    $parmeters = [
+      'fields' => 'name,isUpload,url,filename,idBoard,idList',
+    ];
+
+    return $this->fetchData($url, $parmeters);
+  }
+
+  protected function fetchData($url, $parameters = []) {
+    $parameters += [
+      'key' => $this->key,
+      'token' => $this->token,
+    ];
+
+    $url = Url::fromUri($url, [
+      'query' => $parameters,
+    ])->toUriString();
+dpm($url);
+    try {
+      $response = $this->httpClient->request('GET', $url);
+    }
+    catch (ClientException $exception) {
+      return NULL;
+    }
+
+    // Decode the JSON response.
+    $data = NULL;
+    if ($response->getStatusCode() === 200) {
+      $body = (string) $response->getBody();
+      if (!empty($body)) {
+        // Decode the data, skip if invalid.
+        try {
+          $data = json_decode($body, TRUE, 512, JSON_THROW_ON_ERROR);
+        }
+        catch (\Exception $exception) {
+          $this->logger->notice('Unable to decode json.');
+        }
+      }
+    }
+    else {
+      $this->logger->notice('Unable to retrieve data - response code: @code', [
+        '@code' => $response->getStatusCode(),
+      ]);
+    }
+
+    return $data;
+  }
+
+}

From 9161008a5b7c1d395331c4612e794ad489111a34 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 23 Nov 2021 16:16:33 +0100
Subject: [PATCH 128/720] Add sorting on entity

---
 composer.json                                 |   1 -
 composer.lock                                 |  68 +------
 composer.patches.json                         |   6 +-
 ...splay.guideline.guideline_list.default.yml |  57 ++++++
 ...splay.guideline.guideline_list.default.yml |  48 +++++
 ...eline.guideline_list.field_description.yml |  29 +++
 ...d.guideline.guideline_list.field_title.yml |  19 ++
 config/filter.format.guideline.yml            |  17 +-
 ...idelines.guideline_type.guideline_list.yml |   6 +
 html/modules/custom/guidelines/README.md      |   4 +-
 .../guidelines/guidelines.links.task.yml      |   6 +
 .../guidelines/guidelines.permissions.yml     |   3 +
 .../src/Controller/GuidelineController.php    |   9 +-
 .../guidelines/src/Entity/Guideline.php       |  18 ++
 .../src/Entity/GuidelineInterface.php         |  30 +++
 .../guidelines/src/Form/GuidelineSortForm.php | 182 ++++++++++++++++++
 .../src/GuidelineHtmlRouteProvider.php        |  37 ++++
 .../guidelines/src/GuidelineListBuilder.php   |   4 +-
 18 files changed, 452 insertions(+), 92 deletions(-)
 create mode 100644 config/core.entity_form_display.guideline.guideline_list.default.yml
 create mode 100644 config/core.entity_view_display.guideline.guideline_list.default.yml
 create mode 100644 config/field.field.guideline.guideline_list.field_description.yml
 create mode 100644 config/field.field.guideline.guideline_list.field_title.yml
 create mode 100644 config/guidelines.guideline_type.guideline_list.yml
 create mode 100644 html/modules/custom/guidelines/src/Form/GuidelineSortForm.php

diff --git a/composer.json b/composer.json
index 28dfd095d..163f2f58b 100644
--- a/composer.json
+++ b/composer.json
@@ -58,7 +58,6 @@
         "drupal/core-composer-scaffold": "^9.2.4",
         "drupal/core-dev": "^9.2.4",
         "drupal/core-recommended": "^9.2.4",
-        "drupal/entity": "1.x-dev@dev",
         "drupal/geofield": "^1.22",
         "drupal/google_tag": "^1.4",
         "drupal/imageapi_optimize_binaries": "^1.0-alpha2",
diff --git a/composer.lock b/composer.lock
index d7d3dc52d..4d697c10c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "8c8ecbc83d911da0ae4d3807a66b4e06",
+    "content-hash": "8db2f3649b52fc7fb83aabb714b29d48",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -2844,71 +2844,6 @@
                 "issues": "https://www.drupal.org/project/issues/ctools"
             }
         },
-        {
-            "name": "drupal/entity",
-            "version": "dev-1.x",
-            "source": {
-                "type": "git",
-                "url": "https://git.drupalcode.org/project/entity.git",
-                "reference": "e74400440e0f1ccb5604d05561763e04018512ea"
-            },
-            "require": {
-                "drupal/core": "^8.8 || ^9"
-            },
-            "type": "drupal-module",
-            "extra": {
-                "branch-alias": {
-                    "dev-1.x": "1.x-dev"
-                },
-                "drupal": {
-                    "version": "8.x-1.2+5-dev",
-                    "datestamp": "1635842317",
-                    "security-coverage": {
-                        "status": "not-covered",
-                        "message": "Dev releases are not covered by Drupal security advisories."
-                    }
-                }
-            },
-            "notification-url": "https://packages.drupal.org/8/downloads",
-            "license": [
-                "GPL-2.0-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "Berdir",
-                    "homepage": "https://www.drupal.org/user/214652"
-                },
-                {
-                    "name": "TR",
-                    "homepage": "https://www.drupal.org/user/202830"
-                },
-                {
-                    "name": "bojanz",
-                    "homepage": "https://www.drupal.org/user/86106"
-                },
-                {
-                    "name": "dawehner",
-                    "homepage": "https://www.drupal.org/user/99340"
-                },
-                {
-                    "name": "dixon_",
-                    "homepage": "https://www.drupal.org/user/239911"
-                },
-                {
-                    "name": "fago",
-                    "homepage": "https://www.drupal.org/user/16747"
-                },
-                {
-                    "name": "mglaman",
-                    "homepage": "https://www.drupal.org/user/2416470"
-                }
-            ],
-            "description": "Provides expanded entity APIs, which will be moved to Drupal core one day.",
-            "homepage": "http://drupal.org/project/entity",
-            "support": {
-                "source": "https://git.drupalcode.org/project/entity"
-            }
-        },
         {
             "name": "drupal/entity_reference_revisions",
             "version": "1.9.0",
@@ -14537,7 +14472,6 @@
     "aliases": [],
     "minimum-stability": "dev",
     "stability-flags": {
-        "drupal/entity": 20,
         "drupal/mimemail": 15,
         "drupal/taxonomy_term_revision": 20,
         "unocha/common_design": 20
diff --git a/composer.patches.json b/composer.patches.json
index 3b9091064..72c7f4cd3 100644
--- a/composer.patches.json
+++ b/composer.patches.json
@@ -2,11 +2,7 @@
     "patches": {
         "drupal/core" : {
             "https://www.drupal.org/project/drupal/issues/2570593": "patches/core--drupal--2570593-bundle-entity-class.patch",
-            "https://www.drupal.org/project/drupal/issues/3047110": "patches/core--drupal--3047110-taxonomy-term-moderation-class.patch",
-            "https://www.drupal.org/node/2989889": "https://www.drupal.org/files/issues/2021-06-29/2989889-17.patch"
-        },
-        "drupal/entity": {
-          "https://www.drupal.org/project/entity/issues/2990784": "https://www.drupal.org/files/issues/2020-02-26/2990784-11-draggable-list-builder.patch"
+            "https://www.drupal.org/project/drupal/issues/3047110": "patches/core--drupal--3047110-taxonomy-term-moderation-class.patch"
         }
     }
 }
diff --git a/config/core.entity_form_display.guideline.guideline_list.default.yml b/config/core.entity_form_display.guideline.guideline_list.default.yml
new file mode 100644
index 000000000..fcb56b4e3
--- /dev/null
+++ b/config/core.entity_form_display.guideline.guideline_list.default.yml
@@ -0,0 +1,57 @@
+uuid: fa478884-5372-490a-bc41-defb49fc5a8d
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.guideline.guideline_list.field_description
+    - field.field.guideline.guideline_list.field_title
+    - guidelines.guideline_type.guideline_list
+  module:
+    - text
+id: guideline.guideline_list.default
+targetEntityType: guideline
+bundle: guideline_list
+mode: default
+content:
+  field_description:
+    weight: 27
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+    type: text_textarea
+    region: content
+  field_title:
+    weight: 26
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+    type: string_textfield
+    region: content
+  langcode:
+    type: language_select
+    weight: 2
+    region: content
+    settings:
+      include_locked: true
+    third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: -4
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  user_id:
+    type: entity_reference_autocomplete
+    weight: 5
+    settings:
+      match_operator: CONTAINS
+      size: 60
+      placeholder: ''
+      match_limit: 10
+    region: content
+    third_party_settings: {  }
+hidden: {  }
diff --git a/config/core.entity_view_display.guideline.guideline_list.default.yml b/config/core.entity_view_display.guideline.guideline_list.default.yml
new file mode 100644
index 000000000..e9503e18b
--- /dev/null
+++ b/config/core.entity_view_display.guideline.guideline_list.default.yml
@@ -0,0 +1,48 @@
+uuid: 88c9dd4f-7421-428d-bf5c-c561dc66f0dc
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.guideline.guideline_list.field_description
+    - field.field.guideline.guideline_list.field_title
+    - guidelines.guideline_type.guideline_list
+  module:
+    - text
+    - user
+id: guideline.guideline_list.default
+targetEntityType: guideline
+bundle: guideline_list
+mode: default
+content:
+  field_description:
+    weight: 2
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    type: text_default
+    region: content
+  field_title:
+    weight: 1
+    label: above
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    type: string
+    region: content
+  name:
+    label: above
+    type: string
+    weight: -4
+    region: content
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+  user_id:
+    label: hidden
+    type: author
+    weight: 0
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+hidden:
+  langcode: true
diff --git a/config/field.field.guideline.guideline_list.field_description.yml b/config/field.field.guideline.guideline_list.field_description.yml
new file mode 100644
index 000000000..221a47bb9
--- /dev/null
+++ b/config/field.field.guideline.guideline_list.field_description.yml
@@ -0,0 +1,29 @@
+uuid: 564dfe43-cc34-48dd-b80a-a87f2ec0a0f7
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.guideline.field_description
+    - guidelines.guideline_type.guideline_list
+  module:
+    - allowed_formats
+    - text
+third_party_settings:
+  allowed_formats:
+    guideline: guideline
+    markdown: '0'
+    plain_text: '0'
+    html: '0'
+    token_markdown: '0'
+id: guideline.guideline_list.field_description
+field_name: field_description
+entity_type: guideline
+bundle: guideline_list
+label: Description
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: text_long
diff --git a/config/field.field.guideline.guideline_list.field_title.yml b/config/field.field.guideline.guideline_list.field_title.yml
new file mode 100644
index 000000000..9d734d5e5
--- /dev/null
+++ b/config/field.field.guideline.guideline_list.field_title.yml
@@ -0,0 +1,19 @@
+uuid: dd89ed7c-df45-45d7-aa35-8f9793c28755
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.guideline.field_title
+    - guidelines.guideline_type.guideline_list
+id: guideline.guideline_list.field_title
+field_name: field_title
+entity_type: guideline
+bundle: guideline_list
+label: Title
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string
diff --git a/config/filter.format.guideline.yml b/config/filter.format.guideline.yml
index c4cbdd023..e9ca53070 100644
--- a/config/filter.format.guideline.yml
+++ b/config/filter.format.guideline.yml
@@ -25,18 +25,9 @@ filters:
     weight: 0
     settings:
       replace_empty: '0'
-  filter_autop:
-    id: filter_autop
-    provider: filter
+  filter_markdown:
+    id: filter_markdown
+    provider: reliefweb_utility
     status: true
-    weight: 0
+    weight: -20
     settings: {  }
-  filter_html:
-    id: filter_html
-    provider: filter
-    status: true
-    weight: -10
-    settings:
-      allowed_html: '<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type=''1 A I''> <li> <dl> <dt> <dd> <h2 id=''jump-*''> <h3 id> <h4 id> <h5 id> <h6 id>'
-      filter_html_help: true
-      filter_html_nofollow: false
diff --git a/config/guidelines.guideline_type.guideline_list.yml b/config/guidelines.guideline_type.guideline_list.yml
new file mode 100644
index 000000000..1562f2c99
--- /dev/null
+++ b/config/guidelines.guideline_type.guideline_list.yml
@@ -0,0 +1,6 @@
+uuid: a5377093-5dee-404b-ad55-e416b117c166
+langcode: en
+status: true
+dependencies: {  }
+id: guideline_list
+label: 'Guideline list'
diff --git a/html/modules/custom/guidelines/README.md b/html/modules/custom/guidelines/README.md
index 742fb753a..ae64e610b 100644
--- a/html/modules/custom/guidelines/README.md
+++ b/html/modules/custom/guidelines/README.md
@@ -3,5 +3,5 @@
 ## Todo
 
 - [ ] Add moderation
-- [ ] Add overview per guideline type
-- [ ] Add drag and drop, https://www.drupal.org/project/drupal/issues/2989889
+- [ ] Add tab for child pages
+- [x] Add drag and drop, https://www.drupal.org/project/drupal/issues/2989889
diff --git a/html/modules/custom/guidelines/guidelines.links.task.yml b/html/modules/custom/guidelines/guidelines.links.task.yml
index 5c4d340b3..997aa40b3 100644
--- a/html/modules/custom/guidelines/guidelines.links.task.yml
+++ b/html/modules/custom/guidelines/guidelines.links.task.yml
@@ -20,3 +20,9 @@ entity.guideline.delete_form:
   base_route:  entity.guideline.canonical
   title: Delete
   weight: 10
+
+entity.guideline.sort:
+  route_name:  entity.guideline.sort
+  base_route:  entity.guideline.canonical
+  title: Sort
+  weight: 10
diff --git a/html/modules/custom/guidelines/guidelines.permissions.yml b/html/modules/custom/guidelines/guidelines.permissions.yml
index 4e0edc6c5..4ff8906e3 100644
--- a/html/modules/custom/guidelines/guidelines.permissions.yml
+++ b/html/modules/custom/guidelines/guidelines.permissions.yml
@@ -21,6 +21,9 @@ view unpublished guideline entities:
 view all guideline revisions:
   title: 'View all Guideline revisions'
 
+sort all guideline:
+  title: 'Sort all guideline'
+
 revert all guideline revisions:
   title: 'Revert all Guideline revisions'
   description: 'Role requires permission <em>view Guideline revisions</em> and <em>edit rights</em> for guideline entities in question or <em>administer guideline entities</em>.'
diff --git a/html/modules/custom/guidelines/src/Controller/GuidelineController.php b/html/modules/custom/guidelines/src/Controller/GuidelineController.php
index 18c71e6af..8ae96dcd5 100644
--- a/html/modules/custom/guidelines/src/Controller/GuidelineController.php
+++ b/html/modules/custom/guidelines/src/Controller/GuidelineController.php
@@ -92,7 +92,12 @@ public function revisionOverview(GuidelineInterface $guideline) {
     $langname = $guideline->language()->getName();
     $languages = $guideline->getTranslationLanguages();
     $has_translations = (count($languages) > 1);
-    $build['#title'] = $has_translations ? $this->t('@langname revisions for %title', ['@langname' => $langname, '%title' => $guideline->label()]) : $this->t('Revisions for %title', ['%title' => $guideline->label()]);
+    $build['#title'] = $has_translations ? $this->t('@langname revisions for %title', [
+      '@langname' => $langname,
+      '%title' => $guideline->label(),
+    ]) : $this->t('Revisions for %title', [
+      '%title' => $guideline->label(),
+    ]);
 
     $header = [$this->t('Revision'), $this->t('Operations')];
     $revert_permission = (($account->hasPermission("revert all guideline revisions") || $account->hasPermission('administer guideline entities')));
@@ -124,7 +129,7 @@ public function revisionOverview(GuidelineInterface $guideline) {
           ]));
         }
         else {
-          $link = $guideline->link($date);
+          $link = $guideline->toLink($date)->toString();
         }
 
         $row = [];
diff --git a/html/modules/custom/guidelines/src/Entity/Guideline.php b/html/modules/custom/guidelines/src/Entity/Guideline.php
index 1c87a6923..e7e457282 100644
--- a/html/modules/custom/guidelines/src/Entity/Guideline.php
+++ b/html/modules/custom/guidelines/src/Entity/Guideline.php
@@ -32,6 +32,7 @@
  *       "add" = "Drupal\guidelines\Form\GuidelineForm",
  *       "edit" = "Drupal\guidelines\Form\GuidelineForm",
  *       "delete" = "Drupal\guidelines\Form\GuidelineDeleteForm",
+ *       "sort" = "Drupal\guidelines\Form\GuidelineSortForm",
  *     },
  *     "route_provider" = {
  *       "html" = "Drupal\guidelines\GuidelineHtmlRouteProvider",
@@ -66,6 +67,7 @@
  *     "add-page" = "/admin/structure/guideline/add",
  *     "add-form" = "/admin/structure/guideline/add/{guideline_type}",
  *     "edit-form" = "/admin/structure/guideline/{guideline}/edit",
+ *     "sort-form" = "/admin/structure/guideline/{guideline}/sort",
  *     "delete-form" = "/admin/structure/guideline/{guideline}/delete",
  *     "version-history" = "/admin/structure/guideline/{guideline}/revisions",
  *     "revision" = "/admin/structure/guideline/{guideline}/revisions/{guideline_revision}/view",
@@ -233,6 +235,22 @@ public function setParents($parent) {
     return $this;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getChildren() {
+    $entity_type_repository = \Drupal::service('entity_type.repository');
+    $entity_type_manager = \Drupal::entityTypeManager();
+    $storage = $entity_type_manager->getStorage($entity_type_repository->getEntityTypeFromClass(static::class));
+
+    $query = $storage->getQuery();
+    $query->condition('parent', $this->id());
+    $query->sort('weight');
+
+    $result = $query->execute();
+    return $result ? $storage->loadMultiple($result) : [];
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/html/modules/custom/guidelines/src/Entity/GuidelineInterface.php b/html/modules/custom/guidelines/src/Entity/GuidelineInterface.php
index 3beec152c..23241fbf5 100644
--- a/html/modules/custom/guidelines/src/Entity/GuidelineInterface.php
+++ b/html/modules/custom/guidelines/src/Entity/GuidelineInterface.php
@@ -95,4 +95,34 @@ public function getRevisionUser();
    */
   public function setRevisionUserId($uid);
 
+  /**
+   * Get weight.
+   */
+  public function getWeight();
+
+  /**
+   * Set weight.
+   */
+  public function setWeight($weight);
+
+  /**
+   * Get parents.
+   */
+  public function getParents();
+
+  /**
+   * Get parent Ids.
+   */
+  public function getParentIds();
+
+  /**
+   * Set parents.
+   */
+  public function setParents($parent);
+
+  /**
+   * Get children.
+   */
+  public function getChildren();
+
 }
diff --git a/html/modules/custom/guidelines/src/Form/GuidelineSortForm.php b/html/modules/custom/guidelines/src/Form/GuidelineSortForm.php
new file mode 100644
index 000000000..19a0a67ad
--- /dev/null
+++ b/html/modules/custom/guidelines/src/Form/GuidelineSortForm.php
@@ -0,0 +1,182 @@
+<?php
+
+namespace Drupal\guidelines\Form;
+
+use Drupal\Core\Entity\ContentEntityForm;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\FieldableEntityInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Link;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Form controller for Guideline edit forms.
+ *
+ * @ingroup guidelines
+ */
+class GuidelineSortForm extends ContentEntityForm {
+
+  /**
+   * The current user account.
+   *
+   * @var \Drupal\Core\Session\AccountProxyInterface
+   */
+  protected $account;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    // Instantiates this form class.
+    $instance = parent::create($container);
+    $instance->account = $container->get('current_user');
+    return $instance;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'guideline_sort_form';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    /** @var \Drupal\guidelines\Entity\Guideline $guideline */
+    $guideline = $this->entity;
+
+    $children = $guideline->getChildren();
+    if (empty($children)) {
+      return;
+    }
+
+    $items = [];
+    foreach ($children as $child) {
+      $data = [];
+      $data['id'] = $child->id();
+      $data['label'] = Link::createFromRoute(
+        $child->label(),
+        'entity.guideline.canonical',
+        ['guideline' => $child->id()]
+      )->toString();
+
+      $parents = [];
+      $parent_entities = $child->getParents();
+      foreach ($parent_entities as $parent_entity) {
+        $parents[] = Link::createFromRoute(
+          $parent_entity->label(),
+          'entity.guideline.canonical',
+          ['guideline' => $parent_entity->id()]
+        )->toString();
+      }
+
+      $data['parent'] = implode(', ', $parents);
+      $data['weight'] = $child->getWeight();
+
+      $items[$child->id()] = $data;
+    }
+
+    // Build table.
+    $group_class = 'group-order-weight';
+    $form['items'] = [
+      '#type' => 'table',
+      '#caption' => $this->t('Items'),
+      '#header' => [
+        $this->t('ID'),
+        $this->t('Label'),
+        $this->t('Parent(s)'),
+        $this->t('Weight'),
+      ],
+      '#empty' => $this->t('No items.'),
+      '#tableselect' => FALSE,
+      '#tabledrag' => [
+        [
+          'action' => 'order',
+          'relationship' => 'sibling',
+          'group' => $group_class,
+        ],
+      ],
+    ];
+
+    // Build rows.
+    foreach ($items as $key => $value) {
+      $form['items'][$key]['#attributes']['class'][] = 'draggable';
+      $form['items'][$key]['#weight'] = $value['weight'];
+
+      // Id.
+      $form['items'][$key]['id'] = [
+        '#plain_text' => $value['id'],
+      ];
+
+      // Label.
+      $form['items'][$key]['label'] = [
+        '#markup' => $value['label'],
+      ];
+
+      // Parent(s).
+      $form['items'][$key]['parent'] = [
+        '#markup' => $value['parent'],
+      ];
+
+      // Weight.
+      $form['items'][$key]['weight'] = [
+        '#type' => 'weight',
+        '#title' => $this->t('Weight for @title', ['@title' => $value['label']]),
+        '#title_display' => 'invisible',
+        '#default_value' => $value['weight'],
+        '#attributes' => ['class' => [$group_class]],
+      ];
+    }
+
+    $form['actions']['#type'] = 'actions';
+    $form['actions']['submit'] = [
+      '#type' => 'submit',
+      '#value' => $this->t('Save'),
+      '#button_type' => 'primary',
+    ];
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function extractFormValues(FieldableEntityInterface $entity, array &$form, FormStateInterface $form_state) {
+    return [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function copyFormValuesToEntity(EntityInterface $entity, array $form, FormStateInterface $form_state) {
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    /** @var \Drupal\guidelines\Entity\Guideline $guideline */
+    $guideline = $this->entity;
+
+    $children = $guideline->getChildren();
+    $new_weights = $form_state->getValue('items');
+
+    foreach ($children as $child) {
+      if (isset($new_weights[$child->id()])) {
+        if ($child->getWeight() !== $new_weights[$child->id()]['weight']) {
+          $child->setWeight($new_weights[$child->id()]['weight']);
+          $child->save();
+        }
+      }
+    }
+  }
+
+}
diff --git a/html/modules/custom/guidelines/src/GuidelineHtmlRouteProvider.php b/html/modules/custom/guidelines/src/GuidelineHtmlRouteProvider.php
index d8ff17cc5..804b24999 100644
--- a/html/modules/custom/guidelines/src/GuidelineHtmlRouteProvider.php
+++ b/html/modules/custom/guidelines/src/GuidelineHtmlRouteProvider.php
@@ -46,9 +46,46 @@ public function getRoutes(EntityTypeInterface $entity_type) {
       $collection->add("$entity_type_id.settings", $settings_form_route);
     }
 
+    if ($sort_route = $this->getSortRoute($entity_type)) {
+      $collection->add("entity.{$entity_type_id}.sort", $sort_route);
+    }
+
     return $collection;
   }
 
+  /**
+   * Gets the sort route.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+   *   The entity type.
+   *
+   * @return \Symfony\Component\Routing\Route|null
+   *   The generated route, if available.
+   */
+  protected function getSortRoute(EntityTypeInterface $entity_type) {
+    if ($entity_type->hasLinkTemplate('sort-form')) {
+      $entity_type_id = $entity_type->id();
+      $route = new Route($entity_type->getLinkTemplate('sort-form'));
+      $route
+        ->setDefaults([
+          '_entity_form' => "{$entity_type_id}.sort",
+          '_title' => "Sort {$entity_type->getLabel()} children",
+        ])
+        ->setRequirement('_permission', 'sort guideline')
+        ->setOption('_admin_route', TRUE)
+        ->setRequirement('_entity_access', "{$entity_type_id}.update")
+        ->setOption('parameters', [
+          $entity_type_id => ['type' => 'entity:' . $entity_type_id],
+        ]);
+
+      if ($this->getEntityTypeIdKeyType($entity_type) === 'integer') {
+        $route->setRequirement($entity_type_id, '\d+');
+      }
+
+      return $route;
+    }
+  }
+
   /**
    * Gets the version history route.
    *
diff --git a/html/modules/custom/guidelines/src/GuidelineListBuilder.php b/html/modules/custom/guidelines/src/GuidelineListBuilder.php
index db2526ea8..5174870ec 100644
--- a/html/modules/custom/guidelines/src/GuidelineListBuilder.php
+++ b/html/modules/custom/guidelines/src/GuidelineListBuilder.php
@@ -3,15 +3,15 @@
 namespace Drupal\guidelines;
 
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityListBuilder;
 use Drupal\Core\Link;
-use Drupal\entity\DraggableListBuilder;
 
 /**
  * Defines a class to build a listing of Guideline entities.
  *
  * @ingroup guidelines
  */
-class GuidelineListBuilder extends DraggableListBuilder {
+class GuidelineListBuilder extends EntityListBuilder {
 
   /**
    * {@inheritdoc}

From 358e87b043945fe8a32a42c20d775ece3bfc3c36 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 23 Nov 2021 18:05:27 -0700
Subject: [PATCH 129/720] template override for user posts page to add class to
 list wrapper for styling

---
 ...fweb-moderation-page--user-posts.html.twig | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_moderation/reliefweb-moderation-page--user-posts.html.twig

diff --git a/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_moderation/reliefweb-moderation-page--user-posts.html.twig b/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_moderation/reliefweb-moderation-page--user-posts.html.twig
new file mode 100644
index 000000000..481a877b8
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_moderation/reliefweb-moderation-page--user-posts.html.twig
@@ -0,0 +1,21 @@
+{#
+
+/**
+ * @file
+ * Template for the content moderation pages.
+ */
+
+#}
+
+{{ attach_library('reliefweb_moderation/moderation') }}
+{{ attach_library('common_design_subtheme/rw-moderation') }}
+
+<section{{ filters_attributes.addClass('rw-moderation-filters') }}>
+  <h2 class="visually-hidden">{{ 'Filters'|t }}</h2>
+  {{ filters }}
+</section>
+
+<section{{ list_attributes.addClass('rw-moderation-list rw-moderation-list--user-posts') }}>
+  <h2 class="visually-hidden">{{ 'List'|t }}</h2>
+  {{ list }}
+</section>

From 40f54312ddb62499bf29309db2d3aa2a915c338a Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 23 Nov 2021 18:06:38 -0700
Subject: [PATCH 130/720] rules for user post moderation table to correct
 column width for type, and better control date display

---
 .../rw-moderation/rw-moderation.css           | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
index 296ef9490..2b33d1881 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
@@ -208,3 +208,27 @@
   padding-top: 0;
   border-top: none;
 }
+
+/* User posts type column */
+.rw-moderation-list--user-posts .rw-moderation-table tr td:nth-child(2) {
+  width: auto;
+  word-break: unset;
+}
+/* User posts posted and deadline date columns */
+.rw-moderation-list--user-posts .rw-moderation-table .rw-moderation-table__cell__date,
+.rw-moderation-list--user-posts .rw-moderation-table tr td:last-child {
+  text-align: center;
+  white-space: unset;
+  font-size: 15px;
+}
+/* Prevent the Sortable icon from break to a new line */
+.rw-moderation-list--user-posts .rw-moderation-table .rw-moderation-table__header--date {
+  white-space: nowrap;
+}
+
+@media screen and (min-width: 768px) {
+  .rw-moderation-list--user-posts .rw-moderation-table .rw-moderation-table__cell__date,
+  .rw-moderation-list--user-posts .rw-moderation-table tr td:last-child {
+    white-space: nowrap;
+  }
+}

From 6d718270f9375a239a0145888f18cf911dd7a712 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 24 Nov 2021 15:09:57 +0900
Subject: [PATCH 131/720] [RW-25] Fix docstore client issues and add provider
 uuid header

---
 .../install/reliefweb_docstore.settings.yml   |  2 +
 .../schema/reliefweb_docstore.schema.yml      |  3 +
 .../src/Services/DocstoreClient.php           | 86 +++++++++++++++++--
 3 files changed, 86 insertions(+), 5 deletions(-)

diff --git a/html/modules/custom/reliefweb_docstore/config/install/reliefweb_docstore.settings.yml b/html/modules/custom/reliefweb_docstore/config/install/reliefweb_docstore.settings.yml
index 8d6bae283..b08002901 100644
--- a/html/modules/custom/reliefweb_docstore/config/install/reliefweb_docstore.settings.yml
+++ b/html/modules/custom/reliefweb_docstore/config/install/reliefweb_docstore.settings.yml
@@ -1,5 +1,7 @@
 # The URL of the OCHA docstore.
 docstore_url: ''
+# The UUID of the provider in the OCHA docstore.
+provider_uuid: ''
 # The API key for the OCHA docstore provider.
 api_key: ''
 # The prefix used when creating new content (ex: reliefweb_reports).
diff --git a/html/modules/custom/reliefweb_docstore/config/schema/reliefweb_docstore.schema.yml b/html/modules/custom/reliefweb_docstore/config/schema/reliefweb_docstore.schema.yml
index 1a5c5a216..638fd3f58 100644
--- a/html/modules/custom/reliefweb_docstore/config/schema/reliefweb_docstore.schema.yml
+++ b/html/modules/custom/reliefweb_docstore/config/schema/reliefweb_docstore.schema.yml
@@ -5,6 +5,9 @@ reliefweb_docstore.settings:
     docstore_url:
       type: string
       label: 'The URL of the OCHA docstore.'
+    provider_uuid:
+      type: string
+      label: 'The UUID of the provider in the OCHA docstore.'
     api_key:
       type: string
       label: 'The API key for the OCHA docstore provider.'
diff --git a/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php b/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php
index 323741e31..d397f169a 100644
--- a/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php
+++ b/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php
@@ -6,6 +6,7 @@
 use Drupal\Core\Logger\LoggerChannelFactoryInterface;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Psr7\Utils;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * ReliefWeb API client service class.
@@ -70,6 +71,25 @@ public function getFile($uuid, $timeout = 5) {
     return $this->decodeResponseBody($response);
   }
 
+  /**
+   * Get a revision of a file resource in the docstore.
+   *
+   * @param string $uuid
+   *   The file resource UUID.
+   * @param int $revision_id
+   *   The ID of the file revision.
+   * @param int $timeout
+   *   Request timeout.
+   *
+   * @return array|null
+   *   The data from the API response or NULL in case of error.
+   */
+  public function getFileRevision($uuid, $revision_id, $timeout = 5) {
+    $response = $this->request('GET', '/api/v1/files/' . $uuid . '/revisions/' . $revision_id, [], $timeout);
+
+    return $this->decodeResponseBody($response);
+  }
+
   /**
    * Create a file in the docstore.
    *
@@ -162,7 +182,7 @@ public function downloadFileContentToFilePath($uuid, $path, $revision_id = 0, $t
       'sink' => $resource,
     ], $timeout);
 
-    return !empty($response) && $response->isSuccessful();
+    return $this->isResponseSuccessful($response);
   }
 
   /**
@@ -189,24 +209,62 @@ public function updateFileStatus($uuid, $private, $timeout = 5) {
   }
 
   /**
-   * Select the file version to make active for us.
+   * Select the file revision to make active for us.
    *
    * @param string $uuid
    *   The file resource UUID.
    * @param int $revision_id
    *   The file revision id.
+   * @param int $timeout
+   *   Request timeout.
    *
    * @return bool
    *   TRUE on success.
    */
-  public function selectFileVersion($uuid, $revision_id) {
+  public function selectFileRevision($uuid, $revision_id, $timeout = 5) {
     $response = $this->request('PUT', '/api/v1/files/' . $uuid . '/select', [
       'json' => [
         'target' => $revision_id,
       ],
     ], $timeout);
 
-    return !empty($response) && $resposne->isSuccessful();
+    return $this->isResponseSuccessful($response);
+  }
+
+  /**
+   * Delete a file.
+   *
+   * @param string $uuid
+   *   The file resource UUID.
+   * @param int $timeout
+   *   Request timeout.
+   *
+   * @return bool
+   *   TRUE on success.
+   */
+  public function deleteFile($uuid, $timeout = 30) {
+    $response = $this->request('DELETE', '/api/v1/files/' . $uuid, [], $timeout);
+
+    return $this->isResponseSuccessful($response);
+  }
+
+  /**
+   * Delete a file revision.
+   *
+   * @param string $uuid
+   *   The file resource UUID.
+   * @param int $revision_id
+   *   The file revision id.
+   * @param int $timeout
+   *   Request timeout.
+   *
+   * @return bool
+   *   TRUE on success.
+   */
+  public function deleteFileRevision($uuid, $revision_id, $timeout = 10) {
+    $response = $this->request('DELETE', '/api/v1/files/' . $uuid . '/revisions/' . $revision_id, [], $timeout);
+
+    return $this->isResponseSuccessful($response);
   }
 
   /**
@@ -226,7 +284,7 @@ public function selectFileVersion($uuid, $revision_id) {
    */
   public function request($method, $endpoint, array $options, $timeout = 5) {
     try {
-      $url = $this->createDocstoreUrl($entpoint);
+      $url = $this->createDocstoreUrl($endpoint);
 
       $headers = $this->getHeaders();
       if (isset($options['headers'])) {
@@ -270,6 +328,23 @@ public function decodeResponseBody(?ResponseInterface $response) {
     return NULL;
   }
 
+  /**
+   * Check if a response is sucessful.
+   *
+   * @param \Psr\Http\Message\ResponseInterface|null $response
+   *   The request's response.
+   *
+   * @return bool
+   *   TRUE if the response is successful.
+   */
+  public function isResponseSuccessful(?ResponseInterface $response) {
+    if ($response !== NULL) {
+      $code = $response->getStatusCode();
+      return $code >= 200 && $code < 300;
+    }
+    return FALSE;
+  }
+
   /**
    * Create a URL to the docstore for the given endpoint.
    *
@@ -299,6 +374,7 @@ protected function createDocstoreUrl($endpoint = '') {
   protected function getHeaders() {
     return [
       'API-KEY' => $this->config->get('api_key'),
+      'X-Docstore-Provider-Uuid' => $this->config->get('provider_uuid'),
     ];
   }
 

From 211fafa18e0248da4e81ea2c18db5ca8ce902b1d Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 24 Nov 2021 15:10:33 +0900
Subject: [PATCH 132/720] [RW-25] Add basic permissions for the attachments
 endpoints

---
 .../custom/reliefweb_docstore/reliefweb_docstore.routing.yml  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.routing.yml b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.routing.yml
index f902827a9..d5bdd6a10 100644
--- a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.routing.yml
+++ b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.routing.yml
@@ -3,8 +3,12 @@ reliefweb_docstore.attachment.public:
   defaults:
     _controller: '\Drupal\reliefweb_docstore\Controller\FileDownloadController::downloadPublicAttachment'
     _title: 'Download a public attachment'
+  requirements:
+    _permission: 'access content'
 reliefweb_docstore.attachment.private:
   path: '/private/attachments/{uuid}/{filename}'
   defaults:
     _controller: '\Drupal\reliefweb_docstore\Controller\FileDownloadController::downloadPrivateAttachment'
     _title: 'Download a private attachment'
+  requirements:
+    _permission: 'access content'

From dbaf56275ed5caeb9f3356974251f4add959c590 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 24 Nov 2021 15:10:58 +0900
Subject: [PATCH 133/720] [RW-25] Fix download controller

---
 .../src/Controller/FileDownloadController.php | 61 ++++++++++++-------
 1 file changed, 40 insertions(+), 21 deletions(-)

diff --git a/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php b/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php
index f9070599c..22dfe7783 100644
--- a/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php
+++ b/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php
@@ -2,13 +2,16 @@
 
 namespace Drupal\reliefweb_docstore\Controller;
 
+use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Logger\LoggerChannelFactoryInterface;
 use Drupal\Core\Session\AccountProxyInterface;
 use Drupal\Core\StreamWrapper\StreamWrapperManagerInterface;
+use Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile;
 use Drupal\reliefweb_docstore\Services\DocstoreClient;
 use Drupal\system\FileDownloadController as OriginalFileDownloadController;
+use GuzzleHttp\Psr7\StreamWrapper;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 use Symfony\Component\HttpFoundation\StreamedResponse;
@@ -205,24 +208,16 @@ public function downloadPrivateAttachment($uuid, $filename) {
    */
   protected function downloadAttachment($uuid, $filename, $private = FALSE) {
     try {
-      // Try to download the public file matching the given UUID.
-      $response = $this->downloadLocalFile($uuid, $filename);
-      if (empty($response)) {
-        $response = $this->downloadRemoteFile($uuid, $filename);
+      // No need to try to fetch the file if the user doesn't have access.
+      if ($private && !$this->currentUser->hasPermission('access reliefweb private files')) {
+        throw new AccessDeniedHttpException();
       }
 
-      // Try to download the private file matching the given UUID.
-      if (empty($response) && $private) {
-        // No need to try to fetch the files if the user doesn't have access.
-        if (!$this->currentUser->hasPermission('access reliefweb private files')) {
-          throw new AccessDeniedHttpException();
-        }
-        if (empty($response)) {
-          $response = $this->downloadLocalFile($uuid, $filename, TRUE);
-        }
-        if (empty($response)) {
-          $response = $this->downloadRemoteFile($uuid, $filename, TRUE);
-        }
+      // Try to download the local file matching the given UUID.
+      $response = $this->downloadLocalFile($uuid, $filename, $private);
+      // Try to download the remote file matching the given UUID.
+      if (empty($response)) {
+        $response = $this->downloadRemoteFile($uuid, $filename);
       }
 
       // If the file was found, send its content.
@@ -249,6 +244,8 @@ protected function downloadAttachment($uuid, $filename, $private = FALSE) {
    *   File resource UUID.
    * @param string $filename
    *   File name.
+   * @param bool $private
+   *   TRUE if the file is private.
    *
    * @return \Symfony\Component\HttpFoundation\BinaryFileResponse|null
    *   Response to download the file or NULL if the file was not found. We
@@ -257,10 +254,15 @@ protected function downloadAttachment($uuid, $filename, $private = FALSE) {
    *
    * @see ::downloadAttachment()
    */
-  protected function downloadLocalFile($uuid, $filename) {
+  protected function downloadLocalFile($uuid, $filename, $private = FALSE) {
     $extension = ReliefWebFile::extractFileExtension($filename);
     $uri = ReliefWebFile::getFileUriFromUuid($uuid, $extension, $private);
-    $headers = ['Cache-Control' => 'private, must-revalidate'];
+
+    // Ensure the latest version of the attachment is always returned.
+    $headers = [
+      'Cache-Control' => 'private, must-revalidate',
+      'Content-Disposition' => 'attachment; filename="' . Unicode::mimeHeaderEncode($filename) . '"',
+    ];
 
     if (file_exists($uri)) {
       return new BinaryFileResponse($uri, 200, $headers, $private, 'attachment', TRUE);
@@ -287,7 +289,20 @@ protected function downloadLocalFile($uuid, $filename) {
    *   Exception if something was wrong with the request.
    */
   protected function downloadRemoteFile($uuid, $filename) {
-    $response = $this->docstoreClient->request('GET', '/files/' . $uuid . '/' . $filename, [
+    $client = $this->docstoreClient;
+    $extension = ReliefWebFile::extractFileExtension($filename);
+
+    // Ensure the latest version of the attachment is always returned.
+    $headers = [
+      'Cache-Control' => 'private, must-revalidate',
+      'Content-Disposition' => 'attachment; filename="' . Unicode::mimeHeaderEncode($filename) . '"',
+    ];
+
+    // Download the remote file.
+    // We're not using the filename to have better compatibility and handle
+    // files with encoded space characters for example. The docstore doesn't
+    // care about the filename and we send a header with the proper filename.
+    $response = $client->request('GET', '/files/' . $uuid . '/' . $uuid . '.' . $extension, [
       'stream' => TRUE,
     ], 1200);
 
@@ -298,8 +313,12 @@ protected function downloadRemoteFile($uuid, $filename) {
     }
 
     // Stream the response content.
-    if ($response->isSuccessful()) {
-      return new StreamedResponse([$response->getBody(), 'getContents'], 200, $response->getHeaders());
+    if ($client->isResponseSuccessful($response)) {
+      return new StreamedResponse(function () use ($response) {
+        $input = StreamWrapper::getResource($response->getBody());
+        $output = fopen('php://output', 'wb');
+        stream_copy_to_stream($input, $output);
+      }, 200, $headers + $response->getHeaders());
     }
     // If the response was not successful nor a 404, throw an exception with the
     // status code and reason so we can log it.

From d9ad0166c5deec51ec80fabdf72b9152d47c7bde Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 24 Nov 2021 15:11:33 +0900
Subject: [PATCH 134/720] [RW-25] Fix entity status update in moderation
 service

---
 .../reliefweb_moderation/src/ModerationServiceBase.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
index dca59580b..2f2efa5f6 100644
--- a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
+++ b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
@@ -16,6 +16,7 @@
 use Drupal\Core\Link;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Session\AccountProxyInterface;
+use Drupal\Core\Session\AnonymousUserSession;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\StringTranslation\TranslationInterface;
 use Drupal\Core\Url;
@@ -248,8 +249,15 @@ public function entityPresave(EntityModeratedInterface $entity) {
     }
 
     // Mark as published if the status is viewable by everybody.
+    // @todo check if the status is properly set by the content_moderation
+    // module in which case that may be unnecessary.
     if ($entity instanceof EntityPublishedInterface) {
-      $entity->setPublished($this->isViewableStatus($status));
+      if ($this->isViewableStatus($status, new AnonymousUserSession())) {
+        $entity->setPublished();
+      }
+      else {
+        $entity->setUnpublished();
+      }
     }
   }
 

From 4ae3da46c273a386874d65840be204c6c9843e2a Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 24 Nov 2021 15:11:57 +0900
Subject: [PATCH 135/720] [RW-25] Add helper method to retrieve a field
 revision table

---
 .../src/Traits/EntityDatabaseInfoTrait.php    | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/html/modules/custom/reliefweb_utility/src/Traits/EntityDatabaseInfoTrait.php b/html/modules/custom/reliefweb_utility/src/Traits/EntityDatabaseInfoTrait.php
index c618692a0..2be8ed39e 100644
--- a/html/modules/custom/reliefweb_utility/src/Traits/EntityDatabaseInfoTrait.php
+++ b/html/modules/custom/reliefweb_utility/src/Traits/EntityDatabaseInfoTrait.php
@@ -86,6 +86,33 @@ protected function getFieldTableName($entity_type_id, $field_name) {
       ->getFieldTableName($field_name);
   }
 
+  /**
+   * Get the revision table name for a field.
+   *
+   * @param string $entity_type_id
+   *   Entity type id.
+   * @param string $field_name
+   *   Field name.
+   *
+   * @return string
+   *   Field table name.
+   *
+   * @throws \Drupal\Core\Entity\Sql\SqlContentEntityStorageException
+   *   Exception of the field name table couldn't be retrieved.
+   */
+  protected function getFieldRevisionTableName($entity_type_id, $field_name) {
+    $field_storage_definitions = $this->getEntityFieldManager()
+      ->getFieldStorageDefinitions($entity_type_id);
+
+    if (!isset($field_storage_definitions[$field_name])) {
+      throw new SqlContentEntityStorageException("The {$entity_type_id} doesn't have the {$field_name} field");
+    }
+
+    return $this->getEntityTypeStorage($entity_type_id)
+      ->getTableMapping()
+      ->getDedicatedRevisionTableName($field_storage_definitions[$field_name]);
+  }
+
   /**
    * Generates a column name for a field property.
    *

From 22a2d09fa21ab3f8ce8f4af21c236ec903db1f3b Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 24 Nov 2021 15:12:44 +0900
Subject: [PATCH 136/720] [RW-25] Fix file widget to ensure the preview UUID is
 set when saving

---
 .../Field/FieldWidget/ReliefWebFile.php       | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
index 650c9a148..a315e527c 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
@@ -290,24 +290,6 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
     $element['#type'] = 'form_element';
     $element['#theme'] = 'reliefweb_file_widget_item';
 
-    // Non editable defaults.
-    $defaults = [
-      'uuid',
-      'revision_id',
-      'file_uuid',
-      'file_name',
-      'file_mime',
-      'file_size',
-      'page_count',
-      'preview_uuid',
-    ];
-    foreach ($defaults as $default) {
-      $element[$default] = [
-        '#type' => 'hidden',
-        '#value' => $item->get($default)->getValue(),
-      ];
-    }
-
     // Link to the file.
     $file_name = $item->getFileName();
     $file_size = $item->getFileSize();
@@ -492,6 +474,25 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
       '#weight' => 100,
     ];
 
+    // Save the non editable field item values. This needs to happen at the end
+    // so that we can save the preview UUID notably.
+    $defaults = [
+      'uuid',
+      'revision_id',
+      'file_uuid',
+      'file_name',
+      'file_mime',
+      'file_size',
+      'page_count',
+      'preview_uuid',
+    ];
+    foreach ($defaults as $default) {
+      $element[$default] = [
+        '#type' => 'hidden',
+        '#value' => $item->get($default)->getValue(),
+      ];
+    }
+
     return $element;
   }
 

From 2bc9e188cdbe6025480e5a14165031f1cc22587c Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 24 Nov 2021 15:13:49 +0900
Subject: [PATCH 137/720] [RW-25] Handle full entity deletion, revision
 deletion and fix various issues

---
 .../Plugin/Field/FieldType/ReliefWebFile.php  | 154 ++++++++++----
 .../Field/FieldType/ReliefWebFileList.php     | 196 +++++++++++++++++-
 2 files changed, 309 insertions(+), 41 deletions(-)

diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
index a798d0e2b..be5c9901c 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
@@ -379,6 +379,7 @@ public static function schema(FieldStorageDefinitionInterface $field_definition)
           'length' => 36,
           'not null' => TRUE,
         ],
+        // @todo change to int(10) unsigned.
         'revision_id' => [
           'type' => 'int',
           'size' => 'medium',
@@ -591,9 +592,13 @@ public function generatePreview($page = 0, $rotation = 0, $regenerate = FALSE, $
     $current_page = $this->getPreviewPage();
     $current_rotation = $this->getPreviewRotation();
 
-    // Skip if the preview already exists for the given page and rotation.
+    // Skip if the preview already exists for the given page and rotation and
+    // the preview file exists.
     if (!$regenerate && !empty($preview_uuid) && $page == $current_page && $rotation == $current_rotation) {
-      return $this->loadPreviewFile();
+      $preview_file = $this->loadPreviewFile();
+      if (!empty($preview_file)) {
+        return $preview_file;
+      }
     }
 
     // Load or create a file associated with the field item.
@@ -1315,16 +1320,60 @@ public function getPageCount() {
    * {@inheritdoc}
    */
   public function delete() {
-    // @todo check if this is called for each revision being deleted
-    // and delete file and preview.
+    $uuid = $this->getUuid();
+
+    // Move the files to their private location so that they are not accessible
+    // anymore.
+    $this->updateFileStatus(TRUE);
+
+    // Try to delete the remote file. If it's used by another provider, then
+    // the request will fail.
+    if (!$this->storeLocally() && !empty($uuid)) {
+      $this->getDocstoreClient()->deleteFile($uuid);
+    }
+
+    // Delete the file and preview.
+    $this->deleteFile();
+    $this->deletePreview();
   }
 
   /**
    * {@inheritdoc}
    */
   public function deleteRevision() {
-    // @todo check if this is called for each revision being deleted
-    // and delete file and preview.
+    $uuid = $this->getUuid();
+    $revision_id = $this->getRevisionId();
+
+    // Try to delete the remote revision. If it's used by another provider, then
+    // the request will fail.
+    if (!$this->storeLocally() && !empty($uuid) && !empty($revision_id)) {
+      $this->getDocstoreClient()->deleteFileRevision($uuid, $revision_id);
+    }
+
+    // Delete the file and preview.
+    $this->deleteFile();
+    $this->deletePreview();
+  }
+
+  /**
+   * Update the file and preview of the item that is going to be removed.
+   */
+  public function updateRemovedItem() {
+    try {
+      // Move the field item file to its UUID URI so that it's not possible to
+      // directly access the filesanymore with the permanent URI.
+      $this->moveFileToUuidUri();
+      // Delete the preview and its derivatives as they should not be accessible
+      // anymore either.
+      $this->deletePreview();
+      // Update the file status to private to restrict further access to the
+      // file.
+      $this->updateFileStatus(TRUE);
+    }
+    // @todo log the error and see what to tell the user.
+    catch (\Exception $exception) {
+      throw $exception;
+    }
   }
 
   /**
@@ -1335,7 +1384,8 @@ public function preSave(?ReliefWebFile $original_item = NULL) {
       $original_item->getFileUuid() !== $this->getFileUuid();
 
     $update_preview = empty($original_item) ||
-      $original_item->getPreviewUuid() !== $this->getPreviewUuid();
+      $original_item->getPreviewUuid() !== $this->getPreviewUuid() ||
+      $original_item->getRevisionId() !== $this->getRevisionId();
 
     try {
       if ($update_file) {
@@ -1354,14 +1404,25 @@ public function preSave(?ReliefWebFile $original_item = NULL) {
       }
 
       if ($update_preview) {
-        // Delete the old preview.
+        // Delete the old preview. We don't need to keep the it. It
+        // we be recreated when reverting if that ever happens.
         if (!empty($original_item)) {
+          // @todo instead of deleting the old preview completely, swap the
+          // preview files and regenerate the derivatives?
           $original_item->deletePreview();
         }
 
         // Update the preview if any.
         $this->updatePreviewFile();
       }
+
+      // Ensure there is no local file left if we are storing remotely.
+      if (!$this->storeLocally()) {
+        $file = $this->loadFile();
+        if (!empty($file)) {
+          $this->deleteFileOnDisk($file->getFileUri());
+        }
+      }
     }
     // @todo log the error and see what to tell the user.
     catch (\Exception $exception) {
@@ -1423,39 +1484,54 @@ protected function updateRemoteFile() {
     $client = $this->getDocstoreClient();
     $uuid = $this->getUuid();
 
-    // Check if the remote file exists.
-    $result = $client->getFile($uuid);
-    if (empty($result)) {
-      // Create the file resource in the docstore.
-      $result = $client->createFile([
-        'uuid' => $uuid,
-        'filename' => $this->getFileName(),
-        'mimetype' => $this->getFileMime(),
-        // Mark the new file as private initially. We'll change it that after
-        // the entity the field is attached to is properly saved.
-        'private' => TRUE,
-      ]);
+    // Check if there is already a file with the revision ID in the docstore.
+    // If that's the case, then we don't have anything special to do.
+    $revision_id = $this->getRevisionId();
+    if (!empty($revision_id)) {
+      $result = $client->getFileRevision($uuid, $revision_id);
 
+      // We cannot revert if the file doesn't exist in the docstore anymore.
       if (empty($result)) {
-        throw \Exception('Unable to create remote file resource');
+        throw \Exception('The remote file revision doesn\'t exist anymore.');
       }
     }
+    // Check if the remote file exists and create one if it doesn't then
+    // update its content.
+    else {
+      // Check if the remote file exists.
+      $result = $client->getFile($uuid);
+      if (empty($result)) {
+        // Create the file resource in the docstore.
+        $result = $client->createFile([
+          'uuid' => $uuid,
+          'filename' => $this->getFileName(),
+          'mimetype' => $this->getFileMime(),
+          // Mark the new file as private initially. We'll change it that after
+          // the entity the field is attached to is properly saved.
+          'private' => TRUE,
+        ]);
+
+        if (empty($result)) {
+          throw \Exception('Unable to create remote file resource');
+        }
+      }
 
-    // Upload the file content.
-    $result = $client->updateFileContentFromFilePath($uuid, $file->getFileUri());
+      // Upload the file content.
+      $result = $client->updateFileContentFromFilePath($uuid, $file->getFileUri());
 
-    // @todo better error message.
-    if (!isset($result['revision_id'])) {
-      throw new \Exception('Unable to update remote file content');
-    }
+      // @todo better error message.
+      if (!isset($result['revision_id'])) {
+        throw new \Exception('Unable to update remote file content');
+      }
 
-    // Store the new revision returned by the docstore.
-    $this->get('revision_id')->setValue($result['revision_id']);
+      // Store the new revision returned by the docstore.
+      $this->get('revision_id')->setValue($result['revision_id']);
+    }
 
-    // Delete the local file.
+    // Delete the local file if any.
     $this->deleteFileOnDisk($file->getFileUri());
 
-    // Change the URI of the field item file to ther permanent URI.
+    // Change the URI of the field item file to its permanent URI.
     $this->changeFileLocation($file, $this->getPermanentUri(TRUE, FALSE));
   }
 
@@ -1503,16 +1579,19 @@ public function updateFileStatus($private) {
   }
 
   /**
-   * Move the field item file to the file UUID uri.
+   * Move the field item or preview file to the file UUID uri.
+   *
+   * @param bool $preview
+   *   Whether to move the field item file or the preview file.
    *
    * @throws \Exception
    *   Exception if the file couldn't me moved.
    */
-  protected function moveFileToUuidUri() {
-    $file = $this->loadFile();
+  protected function moveFileToUuidUri($preview = FALSE) {
+    $file = $preview ? $this->loadPreviewFile() : $this->loadFile();
     // @todo better error message.
     if (empty($file)) {
-      throw new \Exception('Unable to load old file');
+      throw new \Exception('Unable to load file to move to UUID URI');
     }
     $this->changeFileLocation($file, $this->getFileUuidUri($file));
   }
@@ -1588,7 +1667,10 @@ protected function changeFileLocation(?File $file, $destination) {
    *   TRUE if the file could be deleted.
    */
   protected function deleteFileOnDisk($uri) {
-    return $this->getFileSystem()->unlink($uri);
+    if (!empty($uri) && file_exists($uri)) {
+      return $this->getFileSystem()->unlink($uri);
+    }
+    return FALSE;
   }
 
   /**
diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php
index 4b7c4d1c0..9a963e843 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php
@@ -3,12 +3,36 @@
 namespace Drupal\reliefweb_docstore\Plugin\Field\FieldType;
 
 use Drupal\Core\Field\FieldItemList;
+use Drupal\reliefweb_utility\Traits\EntityDatabaseInfoTrait;
 
 /**
  * List of ReliefWebFile field items.
  */
 class ReliefWebFileList extends FieldItemList {
 
+  use EntityDatabaseInfoTrait;
+
+  /**
+   * The docstore client service.
+   *
+   * @var \Drupal\reliefweb_docstore\Services\DocstoreClient
+   */
+  protected $docstoreClient;
+
+  /**
+   * The docstore config.
+   *
+   * @var \Drupal\Core\Config\ImmutableConfig
+   */
+  protected $docstoreConfig;
+
+  /**
+   * The file system service.
+   *
+   * @var \Drupal\Core\File\FileSystemInterface
+   */
+  protected $fileSystem;
+
   /**
    * {@inheritdoc}
    */
@@ -29,22 +53,184 @@ public function preSave() {
     }
 
     // Add the original items to the replaced ones.
+    $presave = [];
     foreach ($this->list as $item) {
       $uuid = $item->getUuid();
 
-      // Call preSave on the item with the original item so we can compare what
-      // changed.
-      $item->preSave($original_items[$uuid] ?? NULL);
+      // Store the item and its original version to use when calling the item
+      // ::preSave() later. We cannot call it now because we need to take care
+      // of the "deleted" items first to avoid URI conflicts when moving files
+      // around. Notably to ensure there is no 2 items using the same permanent
+      // URI.
+      $presave[$uuid] = [
+        'item' => $item,
+        'original_item' => $original_items[$uuid] ?? NULL,
+      ];
 
       // Remove items that exists in both the current list and old one so
       // that only the items that need to be deleted are left.
       unset($original_items[$uuid]);
     }
 
-    // Mark all "deleted" items as private.
+    // Update all "deleted" items.
     foreach ($original_items as $item) {
-      $item->updateFileStatus(TRUE);
+      $item->updateRemovedItem();
+    }
+
+    // Call presave on the items than needs to be saved, passing the original
+    // version so we can compare what changed.
+    foreach ($presave as $item) {
+      $item['item']->preSave($item['original_item']);
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function delete() {
+    $entity = $this->getEntity();
+    $entity_type_id = $entity->getEntityTypeId();
+    $field_name = $this->definition->getName();
+
+    $table = $this->getFieldRevisionTableName($entity_type_id, $field_name);
+    $fields = [
+      $this->getFieldColumnName($entity_type_id, $field_name, 'uuid') => 'uuid',
+      $this->getFieldColumnName($entity_type_id, $field_name, 'file_uuid') => 'file_uid',
+      $this->getFieldColumnName($entity_type_id, $field_name, 'preview_uuid') => 'preview_uuid',
+    ];
+
+    $query = $this->getDatabase()
+      ->select($table, $table)
+      ->fields($table, $fields)
+      ->condition($table . '.entity_id', $entity->id(), '=');
+
+    // If we are deleting a translation, limit to the translation language.
+    if (!$entity->isDefaultTranslation()) {
+      $query->condition($table . '.langcode', $this->getLangcode());
+    }
+
+    // Retrieve the item and file UUIDs from the field revisions.
+    $records = $query->distinct()->execute();
+
+    $uuids = [];
+    $file_uuids = [];
+    if (!empty($records)) {
+      foreach ($records as $record) {
+        if (!empty($record->uuid)) {
+          $uuids[$record->uuid] = $record->uuid;
+        }
+        if (!empty($record->file_uuid)) {
+          $file_uuids[$record->file_uuid] = $record->file_uuid;
+        }
+        if (!empty($record->preview_uuid)) {
+          $file_uuids[$record->preview_uuid] = $record->preview_uuid;
+        }
+      }
+    }
+
+    // Delete the remote files.
+    if ($this->getDocstoreConfig()->get('local') === TRUE && !empty($uuids)) {
+      foreach ($uuids as $uuid) {
+        $this->getDocstoreClient()->deleteFile($uuid);
+      }
+    }
+
+    // Load the field item and preview files.
+    $files = $this->getEntityTypeStorage($entity_type_id)
+      ->loadByProperties(['uuid' => $file_uuids]);
+
+    // Delete the files.
+    foreach ($files as $file) {
+      $uri = $file->getFileUri();
+      if (!empty($uri) && file_exists($uri)) {
+        $this->getFileSystem()->unlink($uri);
+      }
+      $file->delete();
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function deleteRevision() {
+    $entity = $this->getEntity();
+    $entity_type_id = $entity->getEntityTypeId();
+    $revision_id = $entity->getRevisionId();
+    $field_name = $this->definition->getName();
+
+    // Map of the field items keyed by file UUID.
+    $items = [];
+    foreach ($this->list as $item) {
+      $file_uuid = $item->getFileUuid();
+      if (!empty($file_uuid)) {
+        $items[$file_uuid] = $item;
+      }
+    }
+
+    $table = $this->getFieldRevisionTableName($entity_type_id, $field_name);
+    $field = $this->getFieldColumnName($entity_type_id, $field_name, 'file_uuid');
+
+    // Get the other revision records that have the same file UUIDs than the
+    // current revision to be deleted.
+    $records = $this->getDatabase()
+      ->select($table, $table)
+      ->fields($table, [$field])
+      ->condition($table . '.entity_id', $entity->id(), '=')
+      ->condition($table . '.revision_id', $revision_id, '<>')
+      ->condition($table . '.' . $field, array_keys($items), 'IN')
+      ->execute();
+
+    // Filter the items for which there are other revisions using the same
+    // file UUID.
+    if (!empty($records)) {
+      foreach ($records as $record) {
+        unset($items[$record->{$field}]);
+      }
+    }
+
+    // Delete the items.
+    foreach ($items as $item) {
+      $item->deleteRevision();
+    }
+  }
+
+  /**
+   * Get the docstore client service.
+   *
+   * @return \Drupal\reliefweb_docstore\Services\DocstoreClient
+   *   The docstore client service.
+   */
+  protected function getDocstoreClient() {
+    if (!isset($this->docstoreClient)) {
+      $this->docstoreClient = \Drupal::service('reliefweb_docstore.client');
+    }
+    return $this->docstoreClient;
+  }
+
+  /**
+   * Get the reliefweb docstore config.
+   *
+   * @return \Drupal\Core\Config\ImmutableConfig
+   *   Docstore config.
+   */
+  protected function getDocstoreConfig() {
+    if (!isset($this->docstoreConfig)) {
+      $this->docstoreConfig = \Drupal::config('reliefweb_docstore.settings');
+    }
+    return $this->docstoreConfig;
+  }
+
+  /**
+   * Get the file system serice.
+   *
+   * @return \Drupal\Core\File\FileSystemInterface
+   *   The file system service.
+   */
+  protected function getFileSystem() {
+    if (!isset($this->fileSystem)) {
+      $this->fileSystem = \Drupal::service('file_system');
     }
+    return $this->fileSystem;
   }
 
 }

From f719e47b9b5d5ebdbc414af9a2816e5af4a15473 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 24 Nov 2021 15:18:42 +0900
Subject: [PATCH 138/720] [RW-25] Temporary use of Drupal to handle attachment
 routes

---
 docker/etc/nginx/custom/01_file_redirections.conf | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 docker/etc/nginx/custom/01_file_redirections.conf

diff --git a/docker/etc/nginx/custom/01_file_redirections.conf b/docker/etc/nginx/custom/01_file_redirections.conf
new file mode 100644
index 000000000..f2a73ef9a
--- /dev/null
+++ b/docker/etc/nginx/custom/01_file_redirections.conf
@@ -0,0 +1,8 @@
+location /attachments/ {
+  include apps/drupal/fastcgi_drupal.conf;
+  fastcgi_pass phpcgi;
+}
+location /private/attachments/ {
+  include apps/drupal/fastcgi_drupal.conf;
+  fastcgi_pass phpcgi;
+}

From e243aaec9964102991467c468cda7520bb62367e Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Wed, 24 Nov 2021 09:54:24 +0100
Subject: [PATCH 139/720] Add short link

---
 ...eline.field_guideline.field_short_link.yml | 19 +++++++++++++++++
 ...eld.storage.guideline.field_short_link.yml | 21 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 config/field.field.guideline.field_guideline.field_short_link.yml
 create mode 100644 config/field.storage.guideline.field_short_link.yml

diff --git a/config/field.field.guideline.field_guideline.field_short_link.yml b/config/field.field.guideline.field_guideline.field_short_link.yml
new file mode 100644
index 000000000..d51f2d853
--- /dev/null
+++ b/config/field.field.guideline.field_guideline.field_short_link.yml
@@ -0,0 +1,19 @@
+uuid: 527338d6-8ce9-489d-961a-6fbaa4a95f29
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.guideline.field_short_link
+    - guidelines.guideline_type.field_guideline
+id: guideline.field_guideline.field_short_link
+field_name: field_short_link
+entity_type: guideline
+bundle: field_guideline
+label: 'Short link'
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string
diff --git a/config/field.storage.guideline.field_short_link.yml b/config/field.storage.guideline.field_short_link.yml
new file mode 100644
index 000000000..9fb0edc86
--- /dev/null
+++ b/config/field.storage.guideline.field_short_link.yml
@@ -0,0 +1,21 @@
+uuid: 91e38021-e309-4761-be98-4a9b12d4fd1c
+langcode: en
+status: true
+dependencies:
+  module:
+    - guidelines
+id: guideline.field_short_link
+field_name: field_short_link
+entity_type: guideline
+type: string
+settings:
+  max_length: 255
+  is_ascii: false
+  case_sensitive: false
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

From 0740cabc80939131e220e186ea63d7a9a5732870 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Wed, 24 Nov 2021 10:28:42 +0100
Subject: [PATCH 140/720] Hide title and images

---
 ...play.guideline.field_guideline.default.yml |  9 ++++++
 ...play.guideline.field_guideline.default.yml | 29 ++++---------------
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/config/core.entity_form_display.guideline.field_guideline.default.yml b/config/core.entity_form_display.guideline.field_guideline.default.yml
index d82163722..ea6922a3c 100644
--- a/config/core.entity_form_display.guideline.field_guideline.default.yml
+++ b/config/core.entity_form_display.guideline.field_guideline.default.yml
@@ -6,6 +6,7 @@ dependencies:
     - field.field.guideline.field_guideline.field_description
     - field.field.guideline.field_guideline.field_field
     - field.field.guideline.field_guideline.field_images
+    - field.field.guideline.field_guideline.field_short_link
     - field.field.guideline.field_guideline.field_title
     - guidelines.guideline_type.field_guideline
     - image.style.thumbnail
@@ -49,6 +50,14 @@ content:
     third_party_settings: {  }
     type: image_image
     region: content
+  field_short_link:
+    weight: 26
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+    type: string_textfield
+    region: content
   field_title:
     weight: 2
     settings:
diff --git a/config/core.entity_view_display.guideline.field_guideline.default.yml b/config/core.entity_view_display.guideline.field_guideline.default.yml
index 9a7b5ffb5..f21f07bdb 100644
--- a/config/core.entity_view_display.guideline.field_guideline.default.yml
+++ b/config/core.entity_view_display.guideline.field_guideline.default.yml
@@ -6,11 +6,10 @@ dependencies:
     - field.field.guideline.field_guideline.field_description
     - field.field.guideline.field_guideline.field_field
     - field.field.guideline.field_guideline.field_images
+    - field.field.guideline.field_guideline.field_short_link
     - field.field.guideline.field_guideline.field_title
     - guidelines.guideline_type.field_guideline
-    - image.style.guideline_thumbnail
   module:
-    - svg_image
     - text
 id: guideline.field_guideline.default
 targetEntityType: guideline
@@ -18,35 +17,17 @@ bundle: field_guideline
 mode: default
 content:
   field_description:
-    weight: 1
+    weight: 0
     label: hidden
     settings: {  }
     third_party_settings: {  }
     type: text_default
     region: content
-  field_images:
-    weight: 2
-    label: hidden
-    settings:
-      image_style: guideline_thumbnail
-      image_link: file
-      svg_render_as_image: true
-      svg_attributes:
-        width: null
-        height: null
-    third_party_settings: {  }
-    type: image
-    region: content
-  field_title:
-    weight: 0
-    label: hidden
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    type: string
-    region: content
 hidden:
   field_field: true
+  field_images: true
+  field_short_link: true
+  field_title: true
   langcode: true
   name: true
   user_id: true

From 03b23ff8cf3ee5887b183f15b3dda8997b11291c Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Wed, 24 Nov 2021 10:29:15 +0100
Subject: [PATCH 141/720] Remove alters of description

---
 .../custom/reliefweb_entities/src/Services/JobFormAlter.php   | 4 ----
 .../reliefweb_entities/src/Services/TrainingFormAlter.php     | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/html/modules/custom/reliefweb_entities/src/Services/JobFormAlter.php b/html/modules/custom/reliefweb_entities/src/Services/JobFormAlter.php
index 3e28e99e1..f0c4f0ee3 100644
--- a/html/modules/custom/reliefweb_entities/src/Services/JobFormAlter.php
+++ b/html/modules/custom/reliefweb_entities/src/Services/JobFormAlter.php
@@ -17,10 +17,6 @@ class JobFormAlter extends EntityFormAlterServiceBase {
    * {@inheritdoc}
    */
   protected function addBundleFormAlterations(array &$form, FormStateInterface $form_state) {
-    // Add a guide on how to populate the field as description to the title
-    // field.
-    $form['title']['widget'][0]['value']['#description'] = $this->t('The best job titles are brief and specific. Please refrain from indicating location, salary and other details in the title, if possible.');
-
     // Force shorter titles.
     $form['title']['widget'][0]['value']['#maxlength'] = 150;
 
diff --git a/html/modules/custom/reliefweb_entities/src/Services/TrainingFormAlter.php b/html/modules/custom/reliefweb_entities/src/Services/TrainingFormAlter.php
index 8b4dbd823..d172b81ff 100644
--- a/html/modules/custom/reliefweb_entities/src/Services/TrainingFormAlter.php
+++ b/html/modules/custom/reliefweb_entities/src/Services/TrainingFormAlter.php
@@ -19,10 +19,6 @@ class TrainingFormAlter extends EntityFormAlterServiceBase {
    * {@inheritdoc}
    */
   protected function addBundleFormAlterations(array &$form, FormStateInterface $form_state) {
-    // Add a guide on how to populate the field as description to the title
-    // field.
-    $form['title']['widget'][0]['value']['#description'] = $this->t('Should contain only the title of the training. Other information such as location, date and Organization should not be included in this field.');
-
     // Force shorter titles.
     $form['title']['widget'][0]['value']['#maxlength'] = 150;
 

From f919469af05f3e495e6f5f9c44d3cb5fcde2af2a Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Wed, 24 Nov 2021 10:31:21 +0100
Subject: [PATCH 142/720] Add link field

---
 ...play.guideline.field_guideline.default.yml | 20 ++++++++++++----
 ...play.guideline.field_guideline.default.yml | 14 +++++++++++
 ....guideline.field_guideline.field_links.yml | 23 +++++++++++++++++++
 .../field.storage.guideline.field_links.yml   | 19 +++++++++++++++
 4 files changed, 71 insertions(+), 5 deletions(-)
 create mode 100644 config/field.field.guideline.field_guideline.field_links.yml
 create mode 100644 config/field.storage.guideline.field_links.yml

diff --git a/config/core.entity_form_display.guideline.field_guideline.default.yml b/config/core.entity_form_display.guideline.field_guideline.default.yml
index ea6922a3c..7d0f4be8a 100644
--- a/config/core.entity_form_display.guideline.field_guideline.default.yml
+++ b/config/core.entity_form_display.guideline.field_guideline.default.yml
@@ -6,12 +6,14 @@ dependencies:
     - field.field.guideline.field_guideline.field_description
     - field.field.guideline.field_guideline.field_field
     - field.field.guideline.field_guideline.field_images
+    - field.field.guideline.field_guideline.field_links
     - field.field.guideline.field_guideline.field_short_link
     - field.field.guideline.field_guideline.field_title
     - guidelines.guideline_type.field_guideline
     - image.style.thumbnail
   module:
     - guidelines
+    - link
     - svg_image
     - text
 id: guideline.field_guideline.default
@@ -20,7 +22,7 @@ bundle: field_guideline
 mode: default
 content:
   field_description:
-    weight: 3
+    weight: 4
     settings:
       rows: 5
       placeholder: ''
@@ -43,15 +45,23 @@ content:
     type: guideline_field_target_widget
     region: content
   field_images:
-    weight: 4
+    weight: 5
     settings:
       progress_indicator: throbber
       preview_image_style: thumbnail
     third_party_settings: {  }
     type: image_image
     region: content
+  field_links:
+    weight: 6
+    settings:
+      placeholder_url: ''
+      placeholder_title: ''
+    third_party_settings: {  }
+    type: link_default
+    region: content
   field_short_link:
-    weight: 26
+    weight: 3
     settings:
       size: 60
       placeholder: ''
@@ -68,7 +78,7 @@ content:
     region: content
   langcode:
     type: language_select
-    weight: 5
+    weight: 7
     region: content
     settings:
       include_locked: true
@@ -83,7 +93,7 @@ content:
     third_party_settings: {  }
   user_id:
     type: entity_reference_autocomplete
-    weight: 6
+    weight: 8
     settings:
       match_operator: CONTAINS
       size: 60
diff --git a/config/core.entity_view_display.guideline.field_guideline.default.yml b/config/core.entity_view_display.guideline.field_guideline.default.yml
index f21f07bdb..bfc2d75e0 100644
--- a/config/core.entity_view_display.guideline.field_guideline.default.yml
+++ b/config/core.entity_view_display.guideline.field_guideline.default.yml
@@ -6,10 +6,12 @@ dependencies:
     - field.field.guideline.field_guideline.field_description
     - field.field.guideline.field_guideline.field_field
     - field.field.guideline.field_guideline.field_images
+    - field.field.guideline.field_guideline.field_links
     - field.field.guideline.field_guideline.field_short_link
     - field.field.guideline.field_guideline.field_title
     - guidelines.guideline_type.field_guideline
   module:
+    - link
     - text
 id: guideline.field_guideline.default
 targetEntityType: guideline
@@ -23,6 +25,18 @@ content:
     third_party_settings: {  }
     type: text_default
     region: content
+  field_links:
+    weight: 1
+    label: above
+    settings:
+      trim_length: 80
+      url_only: false
+      url_plain: false
+      rel: ''
+      target: ''
+    third_party_settings: {  }
+    type: link
+    region: content
 hidden:
   field_field: true
   field_images: true
diff --git a/config/field.field.guideline.field_guideline.field_links.yml b/config/field.field.guideline.field_guideline.field_links.yml
new file mode 100644
index 000000000..6ddc1cb4f
--- /dev/null
+++ b/config/field.field.guideline.field_guideline.field_links.yml
@@ -0,0 +1,23 @@
+uuid: 6d17b759-639c-4985-99a7-e3d8bc9c2ccd
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.guideline.field_links
+    - guidelines.guideline_type.field_guideline
+  module:
+    - link
+id: guideline.field_guideline.field_links
+field_name: field_links
+entity_type: guideline
+bundle: field_guideline
+label: Links
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  link_type: 17
+  title: 1
+field_type: link
diff --git a/config/field.storage.guideline.field_links.yml b/config/field.storage.guideline.field_links.yml
new file mode 100644
index 000000000..efdeb43c8
--- /dev/null
+++ b/config/field.storage.guideline.field_links.yml
@@ -0,0 +1,19 @@
+uuid: 7ab220ff-6984-48f3-a45e-fcfc3c2472ab
+langcode: en
+status: true
+dependencies:
+  module:
+    - guidelines
+    - link
+id: guideline.field_links
+field_name: field_links
+entity_type: guideline
+type: link
+settings: {  }
+module: link
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

From 93a67d551f720860440414ac61785078d41590d4 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Wed, 24 Nov 2021 10:40:53 +0100
Subject: [PATCH 143/720] Map bundle and fields

---
 .../custom/guidelines/guidelines.module       | 119 ++++++++++++++++--
 1 file changed, 107 insertions(+), 12 deletions(-)

diff --git a/html/modules/custom/guidelines/guidelines.module b/html/modules/custom/guidelines/guidelines.module
index 744b0b655..dc770ad1e 100644
--- a/html/modules/custom/guidelines/guidelines.module
+++ b/html/modules/custom/guidelines/guidelines.module
@@ -8,9 +8,9 @@
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Entity\ContentEntityForm;
-use Drupal\Core\Entity\EntityFieldManager;
 use Drupal\guidelines\Entity\Guideline;
-use Drupal\Core\Entity\EntityFieldManagerInterface;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\guidelines\Entity\GuidelineType;
 
 /**
  * Implements hook_help().
@@ -93,11 +93,11 @@ function guidelines_attach_to_widget(&$element, FormStateInterface &$form_state,
   $field_name = $context['items']->getName();
 
   if (!isset($descriptions[$entity_type])) {
-    /** @var Drupal\extended_field_description\Entity\DescriptionEntity[] $description_entities */
-    $description_entities = Guideline::loadByEntity($entity_type);
-    foreach ($description_entities as $description_entity) {
-      foreach ($description_entity->field_field as $field) {
-        $descriptions[$entity_type][$field->value] = $description_entity;
+    /** @var Drupal\guidelines\Entity\Guideline[] $description_entities */
+    $guidelines = Guideline::loadByEntity($entity_type);
+    foreach ($guidelines as $guideline) {
+      foreach ($guideline->field_field as $field) {
+        $descriptions[$entity_type][$field->value] = $guideline;
       }
     }
   }
@@ -118,6 +118,9 @@ function guidelines_attach_to_widget(&$element, FormStateInterface &$form_state,
   }
 }
 
+/**
+ * Migrate datas from Trello.
+ */
 function reliefweb_guidelines_migrate() {
   $config = \Drupal::config('reliefweb_trello.settings');
   $key = $config->get('key');
@@ -149,17 +152,66 @@ function reliefweb_guidelines_migrate() {
         'parent' => [],
         'weight' => $weight_card,
         'field_title' => $card['name'],
+        'field_short_link' => $card['shortLink'],
         'field_description' => [
+          // @todo extract images.
           'value' => $card['desc'],
           'format' => 'guideline',
         ],
       ];
 
       // Check labels.
-      foreach ($card['labels'] as $label) {
-        if (strpos($label['name'], 'form-') === 0) {
-          $field_name = substr($label['name'], 5);
-          $bundle = $guideline_list->label();
+      $list_name = $guideline_list->label();
+      if (strpos($list_name, 'Posting step-by-step') !== FALSE) {
+        foreach ($card['labels'] as $label) {
+          if (strpos($label['name'], 'form-') === 0) {
+            $bundle = strtolower(explode(' - ', $list_name)[0]);
+            $base_field_name = str_replace('-', '_', substr($label['name'], 5));
+
+            // Fix bundle machine names.
+            switch ($bundle) {
+              case 'jobs':
+                $bundle = 'job';
+                break;
+
+              case 'reports':
+                $bundle = 'report';
+                break;
+
+              case 'topics':
+                $bundle = 'topic';
+                break;
+
+            }
+
+            // Title is a base field, so no config.
+            if ($base_field_name === 'title') {
+              $key = 'node.' . $bundle . '.' . $base_field_name;
+              $values['field_field'] = $values['field_field'] ?? [];
+              $values['field_field'][] = [
+                'value' => $key,
+              ];
+            }
+            else {
+              $found = FALSE;
+              $field_names = guidelines_get_possible_field_names($bundle, $base_field_name);
+              foreach ($field_names as $field_name) {
+                if (FieldStorageConfig::loadByName('node', $field_name)) {
+                  $found = TRUE;
+                  $key = 'node.' . $bundle . '.' . $field_name;
+                  $values['field_field'] = $values['field_field'] ?? [];
+                  $values['field_field'][] = [
+                    'value' => $key,
+                  ];
+                }
+              }
+
+              // Log fields not found.
+              if (!$found) {
+                \Drupal::logger('guilines_trello')->notice($base_field_name . ' NOT FOUND');
+              }
+            }
+          }
         }
       }
 
@@ -171,10 +223,53 @@ function reliefweb_guidelines_migrate() {
       if ($card['badges']['attachments'] > 0) {
         $attachments = $trello->getCardAttachments($card['id']);
         foreach($attachments as $attachment) {
-          dpm($attachment);
+          // @todo Add external links, skip images.
         }
       }
     }
   }
+}
+
+/**
+ * Get possible field names.
+ */
+function guidelines_get_possible_field_names($bundle, $field_name) {
+  $candidates = [
+    $field_name,
+    'field_' . $field_name,
+    'field_' . $bundle . '_' . $field_name,
+  ];
+
+  switch ($field_name) {
+    case 'job_description':
+      $candidates[] = 'body';
+      break;
+
+    case 'job_years_of_experience':
+      $candidates[] = 'field_job_experience';
+      break;
+
+    case 'location':
+      $candidates[] = 'field_country';
+      break;
+
+  }
+
+  return $candidates;
+}
+
+/**
+ * Delete all guidelines.
+ */
+function _reliefweb_guidelines_delete_all() {
+  $guidelines = Guideline::loadMultiple();
+  foreach ($guidelines as $guideline) {
+    $guideline->delete();
+  }
+
+  $guideline_types = GuidelineType::loadMultiple();
+  foreach ($guideline_types as $guideline_type) {
+    $guideline_type->delete();
+  }
 
 }

From 5aa46f214302525d992ea2d24201d19a31947a11 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Wed, 24 Nov 2021 10:42:23 +0100
Subject: [PATCH 144/720] Update todos

---
 html/modules/custom/guidelines/README.md | 27 +++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/guidelines/README.md b/html/modules/custom/guidelines/README.md
index ae64e610b..58978d227 100644
--- a/html/modules/custom/guidelines/README.md
+++ b/html/modules/custom/guidelines/README.md
@@ -3,5 +3,30 @@
 ## Todo
 
 - [ ] Add moderation
-- [ ] Add tab for child pages
+- [x] Add tab for child pages
 - [x] Add drag and drop, https://www.drupal.org/project/drupal/issues/2989889
+- [ ] Extract images from description
+- [ ] Add attachment links
+
+## Fields left to map
+
+- [ ] attachments
+- [ ] original_published_date
+- [ ] disasters
+- [ ] new_comment
+- [ ] information
+- [ ] job_location
+- [ ] organization
+- [ ] new_comment
+- [ ] information
+- [ ] dates
+- [ ] event_url
+- [ ] organization
+- [ ] advertisement_language
+- [ ] course_event_language
+- [ ] training_description
+- [ ] attachments
+- [ ] new_comment
+- [ ] training_categories
+- [ ] category
+- [ ] professional_function

From c7d7b51b17e9bfa4c9ef438562fdf85c8b732974 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Wed, 24 Nov 2021 11:05:11 +0100
Subject: [PATCH 145/720] Attachment links

---
 html/modules/custom/guidelines/README.md      |  8 +++----
 .../custom/guidelines/guidelines.module       | 21 ++++++++++++++-----
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/html/modules/custom/guidelines/README.md b/html/modules/custom/guidelines/README.md
index 58978d227..afc1ac3f2 100644
--- a/html/modules/custom/guidelines/README.md
+++ b/html/modules/custom/guidelines/README.md
@@ -6,7 +6,7 @@
 - [x] Add tab for child pages
 - [x] Add drag and drop, https://www.drupal.org/project/drupal/issues/2989889
 - [ ] Extract images from description
-- [ ] Add attachment links
+- [x] Add attachment links
 
 ## Fields left to map
 
@@ -15,13 +15,13 @@
 - [ ] disasters
 - [ ] new_comment
 - [ ] information
-- [ ] job_location
-- [ ] organization
+- [x] job_location
+- [x] organization
 - [ ] new_comment
 - [ ] information
 - [ ] dates
 - [ ] event_url
-- [ ] organization
+- [x] organization
 - [ ] advertisement_language
 - [ ] course_event_language
 - [ ] training_description
diff --git a/html/modules/custom/guidelines/guidelines.module b/html/modules/custom/guidelines/guidelines.module
index dc770ad1e..fb053a184 100644
--- a/html/modules/custom/guidelines/guidelines.module
+++ b/html/modules/custom/guidelines/guidelines.module
@@ -215,17 +215,24 @@ function reliefweb_guidelines_migrate() {
         }
       }
 
-      $guideline = Guideline::create($values);
-      $guideline->setParents([$guideline_list]);
-      $guideline->save();
-
       // Get attachments.
       if ($card['badges']['attachments'] > 0) {
         $attachments = $trello->getCardAttachments($card['id']);
         foreach($attachments as $attachment) {
-          // @todo Add external links, skip images.
+          // Add external links, skip images.
+          if (empty($attachment['isUpload'])) {
+            $values['field_links'] = $values['field_links'] ?? [];
+            $values['field_links'][] = [
+              'uri' => $attachment['url'],
+              'title' => $attachment['name'],
+            ];
+          }
         }
       }
+
+      $guideline = Guideline::create($values);
+      $guideline->setParents([$guideline_list]);
+      $guideline->save();
     }
   }
 }
@@ -250,9 +257,13 @@ function guidelines_get_possible_field_names($bundle, $field_name) {
       break;
 
     case 'location':
+    case 'job_location':
       $candidates[] = 'field_country';
       break;
 
+    case 'organization':
+      $candidates[] = 'field_source';
+      break;
   }
 
   return $candidates;

From dfffbab64e2a4cf6148aa31dac054b0e8a0c5a77 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Wed, 24 Nov 2021 12:36:05 +0100
Subject: [PATCH 146/720] Extract images

---
 html/modules/custom/guidelines/README.md      | 23 ++++++-
 .../custom/guidelines/guidelines.module       | 62 ++++++++++++++++++-
 2 files changed, 83 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/guidelines/README.md b/html/modules/custom/guidelines/README.md
index afc1ac3f2..46e472926 100644
--- a/html/modules/custom/guidelines/README.md
+++ b/html/modules/custom/guidelines/README.md
@@ -5,8 +5,10 @@
 - [ ] Add moderation
 - [x] Add tab for child pages
 - [x] Add drag and drop, https://www.drupal.org/project/drupal/issues/2989889
-- [ ] Extract images from description
+- [x] Extract images from description
 - [x] Add attachment links
+- [ ] Parse and rewrite trello links like `https://trello.com/c/XlpG8tHh/17-country-coverage`
+      Can only be done after importing all lists and cards.
 
 ## Fields left to map
 
@@ -30,3 +32,22 @@
 - [ ] training_categories
 - [ ] category
 - [ ] professional_function
+
+## Testing snippets
+
+### Rest and import
+
+```bash
+drush eval "_reliefweb_guidelines_delete_all()" && drush cim -y && drush eval "reliefweb_guidelines_migrate()"
+```
+
+### One list only
+
+```php
+  $lists = [
+    [
+      'name' => 'test',
+      'id' => '5c740dfe91f2b20a384d3c2c',
+    ]
+  ];
+```
diff --git a/html/modules/custom/guidelines/guidelines.module b/html/modules/custom/guidelines/guidelines.module
index fb053a184..54c0afb25 100644
--- a/html/modules/custom/guidelines/guidelines.module
+++ b/html/modules/custom/guidelines/guidelines.module
@@ -8,6 +8,7 @@
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Entity\ContentEntityForm;
+use Drupal\Core\File\FileSystemInterface;
 use Drupal\guidelines\Entity\Guideline;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\guidelines\Entity\GuidelineType;
@@ -145,6 +146,9 @@ function reliefweb_guidelines_migrate() {
     // Get cards.
     $cards = $trello->getCards($list['id']);
     foreach ($cards as $weight_card => $card) {
+      // Extract and fetch images.
+      $files = guidelines_extract_images($card['desc']);
+
       // Create guideline, check labels.
       $values = [
         'type' => 'field_guideline',
@@ -154,12 +158,21 @@ function reliefweb_guidelines_migrate() {
         'field_title' => $card['name'],
         'field_short_link' => $card['shortLink'],
         'field_description' => [
-          // @todo extract images.
           'value' => $card['desc'],
           'format' => 'guideline',
         ],
       ];
 
+      // Add files.
+      if (!empty($files)) {
+        $values['field_images'] = $values['field_images'] ?? [];
+        foreach ($files as $file) {
+          $values['field_images'][] = [
+            'target_id' => $file->id(),
+          ];
+        }
+      }
+
       // Check labels.
       $list_name = $guideline_list->label();
       if (strpos($list_name, 'Posting step-by-step') !== FALSE) {
@@ -269,6 +282,53 @@ function guidelines_get_possible_field_names($bundle, $field_name) {
   return $candidates;
 }
 
+/**
+ * Extract and fetch images.
+ */
+function guidelines_extract_images(&$description) {
+  $files = [];
+  $pattern = '|(\!\[(.*?)\])(\((http.*?)\))|';
+  $description = preg_replace_callback($pattern, function($matches) use ($files) {
+    $matches[4] = guidelines_fetch_image($matches[4], $files);
+
+    // Remove non-existing images.
+    if (!$matches[4]) {
+      return '';
+    }
+
+    return $matches[1] . '(' . $matches[4] . ')';
+  }, $description);
+
+  return $files;
+}
+
+/**
+ * Fetch external image and
+ */
+function guidelines_fetch_image($url, &$files) {
+  $destination = 'public://guidelines/trello';
+  \Drupal::service('file_system')->prepareDirectory($destination, FileSystemInterface::CREATE_DIRECTORY);
+
+  try {
+    /** @var \Drupal\file\FileInterface $file */
+    $file = system_retrieve_file($url, $destination, TRUE, FileSystemInterface::EXISTS_REPLACE);
+    if (!$file) {
+      \Drupal::logger('guilines_trello')->error($url . ' not fetched');
+      return FALSE;
+    }
+  }
+  catch (\Exception $exception) {
+    \Drupal::logger('guilines_trello')->error($url . ' not accessible');
+    return FALSE;
+  }
+
+  // Add file to collection.
+  $files[] = $file;
+
+  // Return relative url.
+  return $file->createFileUrl();
+}
+
 /**
  * Delete all guidelines.
  */

From c395fedff84bfe3aae03ac97f529dddf4a0fcc49 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Wed, 24 Nov 2021 16:53:53 +0100
Subject: [PATCH 147/720] Split into reliefweb_guidelines

---
 html/modules/custom/guidelines/README.md      |  46 ----
 .../custom/guidelines/guidelines.module       | 229 ------------------
 2 files changed, 275 deletions(-)

diff --git a/html/modules/custom/guidelines/README.md b/html/modules/custom/guidelines/README.md
index 46e472926..961ade73a 100644
--- a/html/modules/custom/guidelines/README.md
+++ b/html/modules/custom/guidelines/README.md
@@ -5,49 +5,3 @@
 - [ ] Add moderation
 - [x] Add tab for child pages
 - [x] Add drag and drop, https://www.drupal.org/project/drupal/issues/2989889
-- [x] Extract images from description
-- [x] Add attachment links
-- [ ] Parse and rewrite trello links like `https://trello.com/c/XlpG8tHh/17-country-coverage`
-      Can only be done after importing all lists and cards.
-
-## Fields left to map
-
-- [ ] attachments
-- [ ] original_published_date
-- [ ] disasters
-- [ ] new_comment
-- [ ] information
-- [x] job_location
-- [x] organization
-- [ ] new_comment
-- [ ] information
-- [ ] dates
-- [ ] event_url
-- [x] organization
-- [ ] advertisement_language
-- [ ] course_event_language
-- [ ] training_description
-- [ ] attachments
-- [ ] new_comment
-- [ ] training_categories
-- [ ] category
-- [ ] professional_function
-
-## Testing snippets
-
-### Rest and import
-
-```bash
-drush eval "_reliefweb_guidelines_delete_all()" && drush cim -y && drush eval "reliefweb_guidelines_migrate()"
-```
-
-### One list only
-
-```php
-  $lists = [
-    [
-      'name' => 'test',
-      'id' => '5c740dfe91f2b20a384d3c2c',
-    ]
-  ];
-```
diff --git a/html/modules/custom/guidelines/guidelines.module b/html/modules/custom/guidelines/guidelines.module
index 54c0afb25..22a6d3854 100644
--- a/html/modules/custom/guidelines/guidelines.module
+++ b/html/modules/custom/guidelines/guidelines.module
@@ -8,10 +8,7 @@
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Entity\ContentEntityForm;
-use Drupal\Core\File\FileSystemInterface;
 use Drupal\guidelines\Entity\Guideline;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\guidelines\Entity\GuidelineType;
 
 /**
  * Implements hook_help().
@@ -118,229 +115,3 @@ function guidelines_attach_to_widget(&$element, FormStateInterface &$form_state,
     }
   }
 }
-
-/**
- * Migrate datas from Trello.
- */
-function reliefweb_guidelines_migrate() {
-  $config = \Drupal::config('reliefweb_trello.settings');
-  $key = $config->get('key');
-  $token = $config->get('token');
-
-  $trello = new \Drupal\guidelines\GuidelinesFromTrello($key, $token, \Drupal::service('config.factory'), \Drupal::service('http_client'), \Drupal::service('logger.factory'));
-
-  $lists = $trello->getLists('554c519c9b98caa2495ea5db');
-  foreach ($lists as $weight_list => $list) {
-    // Create guideline.
-    $values = [
-      'type' => 'guideline_list',
-      'name' => $list['name'],
-      'parent' => [],
-      'weight' => $weight_list,
-      'field_title' => $list['name'],
-    ];
-
-    $guideline_list = Guideline::create($values);
-    $guideline_list->save();
-
-    // Get cards.
-    $cards = $trello->getCards($list['id']);
-    foreach ($cards as $weight_card => $card) {
-      // Extract and fetch images.
-      $files = guidelines_extract_images($card['desc']);
-
-      // Create guideline, check labels.
-      $values = [
-        'type' => 'field_guideline',
-        'name' => $card['name'],
-        'parent' => [],
-        'weight' => $weight_card,
-        'field_title' => $card['name'],
-        'field_short_link' => $card['shortLink'],
-        'field_description' => [
-          'value' => $card['desc'],
-          'format' => 'guideline',
-        ],
-      ];
-
-      // Add files.
-      if (!empty($files)) {
-        $values['field_images'] = $values['field_images'] ?? [];
-        foreach ($files as $file) {
-          $values['field_images'][] = [
-            'target_id' => $file->id(),
-          ];
-        }
-      }
-
-      // Check labels.
-      $list_name = $guideline_list->label();
-      if (strpos($list_name, 'Posting step-by-step') !== FALSE) {
-        foreach ($card['labels'] as $label) {
-          if (strpos($label['name'], 'form-') === 0) {
-            $bundle = strtolower(explode(' - ', $list_name)[0]);
-            $base_field_name = str_replace('-', '_', substr($label['name'], 5));
-
-            // Fix bundle machine names.
-            switch ($bundle) {
-              case 'jobs':
-                $bundle = 'job';
-                break;
-
-              case 'reports':
-                $bundle = 'report';
-                break;
-
-              case 'topics':
-                $bundle = 'topic';
-                break;
-
-            }
-
-            // Title is a base field, so no config.
-            if ($base_field_name === 'title') {
-              $key = 'node.' . $bundle . '.' . $base_field_name;
-              $values['field_field'] = $values['field_field'] ?? [];
-              $values['field_field'][] = [
-                'value' => $key,
-              ];
-            }
-            else {
-              $found = FALSE;
-              $field_names = guidelines_get_possible_field_names($bundle, $base_field_name);
-              foreach ($field_names as $field_name) {
-                if (FieldStorageConfig::loadByName('node', $field_name)) {
-                  $found = TRUE;
-                  $key = 'node.' . $bundle . '.' . $field_name;
-                  $values['field_field'] = $values['field_field'] ?? [];
-                  $values['field_field'][] = [
-                    'value' => $key,
-                  ];
-                }
-              }
-
-              // Log fields not found.
-              if (!$found) {
-                \Drupal::logger('guilines_trello')->notice($base_field_name . ' NOT FOUND');
-              }
-            }
-          }
-        }
-      }
-
-      // Get attachments.
-      if ($card['badges']['attachments'] > 0) {
-        $attachments = $trello->getCardAttachments($card['id']);
-        foreach($attachments as $attachment) {
-          // Add external links, skip images.
-          if (empty($attachment['isUpload'])) {
-            $values['field_links'] = $values['field_links'] ?? [];
-            $values['field_links'][] = [
-              'uri' => $attachment['url'],
-              'title' => $attachment['name'],
-            ];
-          }
-        }
-      }
-
-      $guideline = Guideline::create($values);
-      $guideline->setParents([$guideline_list]);
-      $guideline->save();
-    }
-  }
-}
-
-/**
- * Get possible field names.
- */
-function guidelines_get_possible_field_names($bundle, $field_name) {
-  $candidates = [
-    $field_name,
-    'field_' . $field_name,
-    'field_' . $bundle . '_' . $field_name,
-  ];
-
-  switch ($field_name) {
-    case 'job_description':
-      $candidates[] = 'body';
-      break;
-
-    case 'job_years_of_experience':
-      $candidates[] = 'field_job_experience';
-      break;
-
-    case 'location':
-    case 'job_location':
-      $candidates[] = 'field_country';
-      break;
-
-    case 'organization':
-      $candidates[] = 'field_source';
-      break;
-  }
-
-  return $candidates;
-}
-
-/**
- * Extract and fetch images.
- */
-function guidelines_extract_images(&$description) {
-  $files = [];
-  $pattern = '|(\!\[(.*?)\])(\((http.*?)\))|';
-  $description = preg_replace_callback($pattern, function($matches) use ($files) {
-    $matches[4] = guidelines_fetch_image($matches[4], $files);
-
-    // Remove non-existing images.
-    if (!$matches[4]) {
-      return '';
-    }
-
-    return $matches[1] . '(' . $matches[4] . ')';
-  }, $description);
-
-  return $files;
-}
-
-/**
- * Fetch external image and
- */
-function guidelines_fetch_image($url, &$files) {
-  $destination = 'public://guidelines/trello';
-  \Drupal::service('file_system')->prepareDirectory($destination, FileSystemInterface::CREATE_DIRECTORY);
-
-  try {
-    /** @var \Drupal\file\FileInterface $file */
-    $file = system_retrieve_file($url, $destination, TRUE, FileSystemInterface::EXISTS_REPLACE);
-    if (!$file) {
-      \Drupal::logger('guilines_trello')->error($url . ' not fetched');
-      return FALSE;
-    }
-  }
-  catch (\Exception $exception) {
-    \Drupal::logger('guilines_trello')->error($url . ' not accessible');
-    return FALSE;
-  }
-
-  // Add file to collection.
-  $files[] = $file;
-
-  // Return relative url.
-  return $file->createFileUrl();
-}
-
-/**
- * Delete all guidelines.
- */
-function _reliefweb_guidelines_delete_all() {
-  $guidelines = Guideline::loadMultiple();
-  foreach ($guidelines as $guideline) {
-    $guideline->delete();
-  }
-
-  $guideline_types = GuidelineType::loadMultiple();
-  foreach ($guideline_types as $guideline_type) {
-    $guideline_type->delete();
-  }
-
-}

From cfe5812b4986dc9ec3e9921f136248f52aed4f05 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Wed, 24 Nov 2021 16:54:28 +0100
Subject: [PATCH 148/720] Split into reliefweb_guidelines

---
 config/core.extension.yml                     |   1 +
 .../custom/reliefweb_guidelines/README.md     |  50 +
 .../reliefweb-guidelines.css                  | 957 ++++++++++++++++++
 .../reliefweb-guidelines.js                   |   0
 .../reliefweb_guidelines.info.yml             |   7 +
 .../reliefweb_guidelines.libraries.yml        |   6 +
 .../reliefweb_guidelines.module               | 261 +++++
 .../reliefweb_guidelines.routing.yml          |   7 +
 .../GuidelineSinglePageController.php         | 429 ++++++++
 .../reliefweb-guidelines-item.html.twig       |  17 +
 .../reliefweb-guidelines-list.html.twig       |  41 +
 11 files changed, 1776 insertions(+)
 create mode 100644 html/modules/custom/reliefweb_guidelines/README.md
 create mode 100644 html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
 create mode 100644 html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.js
 create mode 100644 html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.info.yml
 create mode 100644 html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.libraries.yml
 create mode 100644 html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
 create mode 100644 html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.routing.yml
 create mode 100644 html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
 create mode 100644 html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-item.html.twig
 create mode 100644 html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-list.html.twig

diff --git a/config/core.extension.yml b/config/core.extension.yml
index 6ab2d025c..980f510c6 100644
--- a/config/core.extension.yml
+++ b/config/core.extension.yml
@@ -53,6 +53,7 @@ module:
   reliefweb_entities: 0
   reliefweb_fields: 0
   reliefweb_form: 0
+  reliefweb_guidelines: 0
   reliefweb_homepage: 0
   reliefweb_import: 0
   reliefweb_key_figures: 0
diff --git a/html/modules/custom/reliefweb_guidelines/README.md b/html/modules/custom/reliefweb_guidelines/README.md
new file mode 100644
index 000000000..360fc7bb0
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/README.md
@@ -0,0 +1,50 @@
+# Guidelines
+
+## Todo
+
+- [x] Extract images from description
+- [x] Add attachment links
+- [ ] Parse and rewrite trello links like `https://trello.com/c/XlpG8tHh/17-country-coverage`
+      Can only be done after importing all lists and cards.
+
+## Fields left to map
+
+- [ ] attachments
+- [ ] original_published_date
+- [ ] disasters
+- [ ] new_comment
+- [ ] information
+- [x] job_location
+- [x] organization
+- [ ] new_comment
+- [ ] information
+- [ ] dates
+- [ ] event_url
+- [x] organization
+- [ ] advertisement_language
+- [ ] course_event_language
+- [ ] training_description
+- [ ] attachments
+- [ ] new_comment
+- [ ] training_categories
+- [ ] category
+- [ ] professional_function
+
+## Testing snippets
+
+### Rest and import
+
+```bash
+drush eval "_reliefweb_guidelines_delete_all()" && drush cim -y && drush eval "reliefweb_guidelines_migrate_from_trello()"
+```
+
+### One list only
+
+```php
+  $lists = [
+    [
+      'name' => 'test',
+      'id' => '5c740dfe91f2b20a384d3c2c',
+    ]
+  ];
+```
diff --git a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
new file mode 100644
index 000000000..cfb04db22
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
@@ -0,0 +1,957 @@
+.rw-guidelines-list {
+  background-color: #FFFFFF;
+  color: #000;
+  font-family: Verdana, sans-serif;
+  font-size: 14px;
+  margin: 0;
+  padding: 0;
+
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+
+  display: -webkit-flex;
+  -webkit-flex-direction: row;
+  display: flex;
+  flex-direction: row;
+}
+
+.rw-guidelines-list > input {
+  display: none;
+}
+.rw-guidelines-list aside {
+  background-color: #333;
+  border-right: 1px solid #333;
+  box-shadow: 2px 0px 10px 0px rgba(0,0,0,0.6);
+  color: white;
+  width: 260px;
+  z-index: 3;
+
+  display: -webkit-flex;
+  -webkit-flex-direction: column;
+  display: flex;
+  flex-direction: column;
+}
+.rw-guidelines-list > input:checked + aside {
+  margin-left: -250px;
+}
+.rw-guidelines-list aside > nav {
+  overflow-x: hidden;
+  overflow-y: auto;
+
+  -webkit-flex: 1;
+  flex: 1;
+}
+.rw-guidelines-list aside h1 {
+  -webkit-flex: 0 0 auto;
+  flex: 0 0 auto;
+  height: 50px;
+  line-height: 50px;
+  margin: 0;
+  position: relative;
+  text-align: center;
+  text-shadow: 2px 2px 2px rgba(0, 0, 0, 1);
+  width: 100%;
+}
+.rw-guidelines-list aside h1:before {
+  background-image: url(/assets/images/logo.svg);
+  background-repeat: no-repeat;
+  content: "";
+  display: block;
+  margin: 5px;
+  position: absolute;
+  height: 40px;
+  width: 40px;
+  cursor: default;
+}
+.rw-guidelines-list aside h1 a {
+  font-size: 10px;
+  font-weight: normal;
+  color: #ccc;
+  position: absolute;
+  right: 10px;
+}
+.rw-guidelines-list aside form {
+  -webkit-flex: 0 0 auto;
+  flex: 0 0 auto;
+}
+.rw-guidelines-list aside form input {
+  border: none;
+  border-bottom: 1px solid #333;
+  box-shadow: inset 0px 1px 5px 0px rgba(0,0,0,0.5);
+  box-sizing: border-box;
+  font-size: 14px;
+  padding: 8px;
+  width: 100%;
+}
+.rw-guidelines-list aside nav label {
+  background-color: #444;
+  border-left: 5px solid #F77462;
+  box-shadow: 0px 1px 5px 0px rgba(0,0,0,0.5);
+  cursor: pointer;
+  display: block;
+  line-height: 16px;
+  padding: 10px;
+  position: relative;
+  text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.8);
+}
+.rw-guidelines-list aside nav label:before {
+  content: "";
+  border-top: 1px solid #bbb;
+  display: block;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+}
+.rw-guidelines-list aside nav label:first-child:before {
+  border-top: none;
+}
+.rw-guidelines-list aside nav input {
+  display: none;
+}
+.rw-guidelines-list aside nav input + nav {
+  background-color: #ccc;
+  display: none;
+}
+.rw-guidelines-list aside nav input:checked + nav {
+  display: block;
+}
+.rw-guidelines-list aside nav a {
+  background-color: #f8f8f8;
+  border-top: 1px solid #ccc;
+  color: #333;
+  display: block;
+  margin-left: 10px;
+  padding: 8px;
+  text-decoration: none;
+}
+.rw-guidelines-list aside nav a:first-child {
+  border-top: none;
+}
+.rw-guidelines-list aside nav a:active, aside nav a.active {
+  background-color: #94C3F0;
+  border-color: #3E7DD0;
+}
+.rw-guidelines-list aside nav a:active + a, aside nav a.active + a {
+  border-top-color: #3E7DD0;
+}
+.rw-guidelines-list aside nav a:focus {
+  outline: none;
+}
+
+.rw-guidelines-list main {
+  position: relative;
+  z-index: 1;
+
+  -webkit-flex: 1 0 0;
+  flex: 1 0 0;
+
+  display: -webkit-flex;
+  -webkit-flex-direction: column;
+  display: flex;
+  flex-direction: column;
+}
+.rw-guidelines-list main > div {
+  background-color: #fff;
+  overflow-x: hidden;
+  overflow-y: auto;
+  position: relative;
+
+  -webkit-flex: 1;
+  flex: 1;
+}
+.rw-guidelines-list main > div:before {
+  content: '';
+  background-image: url(/assets/images/logo.svg);
+  background-repeat: no-repeat;
+  width: 400px;
+  height: 400px;
+  -webkit-filter: grayscale(100%);
+  filter: grayscale(100%);
+  opacity: 0.4;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  margin-top: -200px;
+  margin-left: -200px;
+  z-index: 1;
+}
+
+.rw-guidelines-list article {
+  background-color: white;
+  /* debug display: none; */
+  padding: 10px 20px;
+  position: relative;
+  z-index: 2;
+}
+.rw-guidelines-list a:target + article,
+.rw-guidelines-list article:target {
+  box-sizing: border-box;
+  display: block;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  height: 100%;
+  overflow: visible;
+}
+.rw-guidelines-list article > h2 > a {
+  float: right;
+  font-size: 16px;
+  font-weight: normal;
+  line-height: 40px;
+  position: relative;
+  font-size: 0;
+  width: 20px;
+  height: 40px;
+  background-image: url(../images/trello.svg);
+  background-size: 20px 20px;
+  background-position: 0 10px;
+  background-repeat: no-repeat;
+}
+/*.rw-guidelines-list article > h2 > a:before {
+  content: "";
+  position: absolute;
+  top: 50%;
+  left: -15px;
+  border-width: 12px 5px 5px;
+  border-style: solid;
+  border-color: #4183c4 #4183c4 transparent;
+  margin: -8px 0 0;
+}*/
+.rw-guidelines-list article > h2 {
+  margin-top: 0 !important;
+}
+.rw-guidelines-list article > h2 > span:after {
+  content: "";
+  border-top: 5px solid #333;
+  border-right: 5px solid #333;
+  -webkit-transform: rotate(45deg);
+  transform: rotate(45deg);
+  width: 12px;
+  height: 12px;
+  display: inline-block;
+  margin-right: 5px;
+  margin-left: 5px;
+}
+.rw-guidelines-list article > div {
+  padding-bottom: 5px;
+}
+
+.rw-guidelines-list #search a {
+  display: block;
+}
+.rw-guidelines-list #search > div > a > span:after {
+  content: "";
+  border-top: 3px solid #4183c4;
+  border-right: 3px solid #4183c4;
+  -webkit-transform: rotate(45deg);
+  transform: rotate(45deg);
+  width: 8px;
+  height: 8px;
+  display: inline-block;
+  margin-right: 3px;
+  margin-left: 3px;
+}
+.rw-guidelines-list .highlight.yellow {
+  background-color: #F7D358;
+}
+.rw-guidelines-list .highlight.red {
+  background-color: #FA5858;
+}
+.rw-guidelines-list .highlight.green {
+  background-color: #82FA58;
+}
+.rw-guidelines-list .highlight.blue {
+  background-color: #58ACFA;
+}
+.rw-guidelines-list .highlight.purple {
+  background-color: #D358F7;
+}
+
+/**
+ * Scroll bar theming.
+ * Only works with webkit based browsers.
+ */
+.rw-guidelines-list .scroll::-webkit-scrollbar {
+  background-color: #F5F5F5;
+  width: 10px;
+}
+.rw-guidelines-list .scroll::-webkit-scrollbar:horizontal {
+  height: 10px;
+}
+.rw-guidelines-list .scroll::-webkit-scrollbar-track {
+  -webkit-box-shadow: inset 0 0 10px rgba(0,0,0,0.3);
+  background-color: #F5F5F5;
+}
+.rw-guidelines-list .scroll::-webkit-scrollbar-thumb {
+  -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);
+  background-color: #bbb;
+}
+
+/**
+ * Github markdown styling.
+ *
+ * From: https://github.com/sindresorhus/github-markdown-css.
+ */
+@font-face {
+  font-family: octicons-anchor;
+  src: url(data:font/woff;charset=utf-8;base64,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) format('woff');
+}
+
+.rw-guidelines-list article {
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+  color: #333;
+  overflow: hidden;
+  font-family: "Helvetica Neue", Helvetica, "Segoe UI", Arial, freesans, sans-serif;
+  font-size: 16px;
+  line-height: 1.6;
+  word-wrap: break-word;
+}
+
+.rw-guidelines-list article a {
+  background: transparent;
+}
+
+.rw-guidelines-list article a:active,
+.rw-guidelines-list article a:hover {
+  outline: 0;
+}
+
+.rw-guidelines-list article strong {
+  font-weight: bold;
+}
+
+.rw-guidelines-list article h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+
+.rw-guidelines-list article img {
+  border: 0;
+}
+
+.rw-guidelines-list article hr {
+  box-sizing: content-box;
+  height: 0;
+}
+
+.rw-guidelines-list article pre {
+  overflow: auto;
+}
+
+.rw-guidelines-list article code,
+.rw-guidelines-list article kbd,
+.rw-guidelines-list article pre {
+  font-family: monospace, monospace;
+  font-size: 1em;
+}
+
+.rw-guidelines-list article input {
+  color: inherit;
+  font: inherit;
+  margin: 0;
+}
+
+.rw-guidelines-list article html input[disabled] {
+  cursor: default;
+}
+
+.rw-guidelines-list article input {
+  line-height: normal;
+}
+
+.rw-guidelines-list article input[type="checkbox"] {
+  box-sizing: border-box;
+  padding: 0;
+}
+
+.rw-guidelines-list article table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+.rw-guidelines-list article td,
+.rw-guidelines-list article th {
+  padding: 0;
+}
+
+.rw-guidelines-list article * {
+  box-sizing: border-box;
+}
+
+.rw-guidelines-list article input {
+  font: 13px/1.4 Helvetica, arial, nimbussansl, liberationsans, freesans, clean, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol";
+}
+
+.rw-guidelines-list article a {
+  color: #4183c4;
+  text-decoration: none;
+}
+
+.rw-guidelines-list article a:hover,
+.rw-guidelines-list article a:active {
+  text-decoration: underline;
+}
+
+.rw-guidelines-list article hr {
+  height: 0;
+  margin: 15px 0;
+  overflow: hidden;
+  background: transparent;
+  border: 0;
+  border-bottom: 1px solid #ddd;
+}
+
+.rw-guidelines-list article hr:before {
+  display: table;
+  content: "";
+}
+
+.rw-guidelines-list article hr:after {
+  display: table;
+  clear: both;
+  content: "";
+}
+
+.rw-guidelines-list article h1,
+.rw-guidelines-list article h2,
+.rw-guidelines-list article h3,
+.rw-guidelines-list article h4,
+.rw-guidelines-list article h5,
+.rw-guidelines-list article h6 {
+  margin-top: 15px;
+  margin-bottom: 15px;
+  line-height: 1.1;
+}
+
+.rw-guidelines-list article h1 {
+  font-size: 30px;
+}
+
+.rw-guidelines-list article h2 {
+  font-size: 21px;
+}
+
+.rw-guidelines-list article h3 {
+  font-size: 16px;
+}
+
+.rw-guidelines-list article h4 {
+  font-size: 14px;
+}
+
+.rw-guidelines-list article h5 {
+  font-size: 12px;
+}
+
+.rw-guidelines-list article h6 {
+  font-size: 11px;
+}
+
+.rw-guidelines-list article blockquote {
+  margin: 0;
+}
+
+.rw-guidelines-list article ul,
+.rw-guidelines-list article ol {
+  padding: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+.rw-guidelines-list article ol ol,
+.rw-guidelines-list article ul ol {
+  list-style-type: lower-roman;
+}
+
+.rw-guidelines-list article ul ul ol,
+.rw-guidelines-list article ul ol ol,
+.rw-guidelines-list article ol ul ol,
+.rw-guidelines-list article ol ol ol {
+  list-style-type: lower-alpha;
+}
+
+.rw-guidelines-list article dd {
+  margin-left: 0;
+}
+
+.rw-guidelines-list article code {
+  font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
+  font-size: 12px;
+}
+
+.rw-guidelines-list article pre {
+  margin-top: 0;
+  margin-bottom: 0;
+  font: 12px Consolas, "Liberation Mono", Menlo, Courier, monospace;
+}
+
+.rw-guidelines-list article .octicon {
+  font: normal normal normal 16px/1 octicons-anchor;
+  display: inline-block;
+  text-decoration: none;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+.rw-guidelines-list article .octicon-link:before {
+  content: '\f05c';
+}
+
+.rw-guidelines-list article>*:first-child {
+  margin-top: 0 !important;
+}
+
+.rw-guidelines-list article>*:last-child {
+  margin-bottom: 0 !important;
+}
+
+.rw-guidelines-list article a:not([href]) {
+  color: inherit;
+  text-decoration: none;
+}
+
+.rw-guidelines-list article .anchor {
+  position: absolute;
+  top: 0;
+  left: 0;
+  display: block;
+  padding-right: 6px;
+  padding-left: 30px;
+  margin-left: -30px;
+}
+
+.rw-guidelines-list article .anchor:focus {
+  outline: none;
+}
+
+.rw-guidelines-list article h1,
+.rw-guidelines-list article h2,
+.rw-guidelines-list article h3,
+.rw-guidelines-list article h4,
+.rw-guidelines-list article h5,
+.rw-guidelines-list article h6 {
+  position: relative;
+  margin-top: 1em;
+  margin-bottom: 16px;
+  font-weight: bold;
+  line-height: 1.4;
+}
+
+.rw-guidelines-list article h1 .octicon-link,
+.rw-guidelines-list article h2 .octicon-link,
+.rw-guidelines-list article h3 .octicon-link,
+.rw-guidelines-list article h4 .octicon-link,
+.rw-guidelines-list article h5 .octicon-link,
+.rw-guidelines-list article h6 .octicon-link {
+  display: none;
+  color: #000;
+  vertical-align: middle;
+}
+
+.rw-guidelines-list article h1:hover .anchor,
+.rw-guidelines-list article h2:hover .anchor,
+.rw-guidelines-list article h3:hover .anchor,
+.rw-guidelines-list article h4:hover .anchor,
+.rw-guidelines-list article h5:hover .anchor,
+.rw-guidelines-list article h6:hover .anchor {
+  padding-left: 8px;
+  margin-left: -30px;
+  text-decoration: none;
+}
+
+.rw-guidelines-list article h1:hover .anchor .octicon-link,
+.rw-guidelines-list article h2:hover .anchor .octicon-link,
+.rw-guidelines-list article h3:hover .anchor .octicon-link,
+.rw-guidelines-list article h4:hover .anchor .octicon-link,
+.rw-guidelines-list article h5:hover .anchor .octicon-link,
+.rw-guidelines-list article h6:hover .anchor .octicon-link {
+  display: inline-block;
+}
+
+.rw-guidelines-list article h1 {
+  padding-bottom: 0.3em;
+  font-size: 2.25em;
+  line-height: 1.2;
+  border-bottom: 1px solid #eee;
+}
+
+.rw-guidelines-list article h1 .anchor {
+  line-height: 1;
+}
+
+.rw-guidelines-list article h2 {
+  padding-bottom: 0.3em;
+  font-size: 1.75em;
+  line-height: 1.225;
+  border-bottom: 1px solid #eee;
+}
+
+.rw-guidelines-list article h2 .anchor {
+  line-height: 1;
+}
+
+.rw-guidelines-list article h3 {
+  font-size: 1.5em;
+  line-height: 1.43;
+}
+
+.rw-guidelines-list article h3 .anchor {
+  line-height: 1.2;
+}
+
+.rw-guidelines-list article h4 {
+  font-size: 1.25em;
+}
+
+.rw-guidelines-list article h4 .anchor {
+  line-height: 1.2;
+}
+
+.rw-guidelines-list article h5 {
+  font-size: 1em;
+}
+
+.rw-guidelines-list article h5 .anchor {
+  line-height: 1.1;
+}
+
+.rw-guidelines-list article h6 {
+  font-size: 1em;
+  color: #777;
+}
+
+.rw-guidelines-list article h6 .anchor {
+  line-height: 1.1;
+}
+
+.rw-guidelines-list article p,
+.rw-guidelines-list article blockquote,
+.rw-guidelines-list article ul,
+.rw-guidelines-list article ol,
+.rw-guidelines-list article dl,
+.rw-guidelines-list article table,
+.rw-guidelines-list article pre {
+  margin-top: 0;
+  margin-bottom: 16px;
+}
+
+.rw-guidelines-list article hr {
+  height: 4px;
+  padding: 0;
+  margin: 16px 0;
+  background-color: #e7e7e7;
+  border: 0 none;
+}
+
+.rw-guidelines-list article ul,
+.rw-guidelines-list article ol {
+  padding-left: 2em;
+}
+
+.rw-guidelines-list article ul ul,
+.rw-guidelines-list article ul ol,
+.rw-guidelines-list article ol ol,
+.rw-guidelines-list article ol ul {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+.rw-guidelines-list article li>p {
+  margin-top: 16px;
+}
+
+.rw-guidelines-list article dl {
+  padding: 0;
+}
+
+.rw-guidelines-list article dl dt {
+  padding: 0;
+  margin-top: 16px;
+  font-size: 1em;
+  font-style: italic;
+  font-weight: bold;
+}
+
+.rw-guidelines-list article dl dd {
+  padding: 0 16px;
+  margin-bottom: 16px;
+}
+
+.rw-guidelines-list article blockquote {
+  padding: 0 15px;
+  color: #777;
+  border-left: 4px solid #ddd;
+}
+
+.rw-guidelines-list article blockquote>:first-child {
+  margin-top: 0;
+}
+
+.rw-guidelines-list article blockquote>:last-child {
+  margin-bottom: 0;
+}
+
+.rw-guidelines-list article table {
+  display: block;
+  width: 100%;
+  overflow: auto;
+  word-break: normal;
+  word-break: keep-all;
+}
+
+.rw-guidelines-list article table th {
+  font-weight: bold;
+}
+
+.rw-guidelines-list article table th,
+.rw-guidelines-list article table td {
+  padding: 6px 13px;
+  border: 1px solid #ddd;
+}
+
+.rw-guidelines-list article table tr {
+  background-color: #fff;
+  border-top: 1px solid #ccc;
+}
+
+.rw-guidelines-list article table tr:nth-child(2n) {
+  background-color: #f8f8f8;
+}
+
+.rw-guidelines-list article img {
+  max-width: 100%;
+  box-sizing: border-box;
+}
+
+.rw-guidelines-list article code {
+  padding: 0;
+  padding-top: 0.2em;
+  padding-bottom: 0.2em;
+  margin: 0;
+  font-size: 85%;
+  background-color: rgba(0,0,0,0.04);
+  border-radius: 3px;
+}
+
+.rw-guidelines-list article code:before,
+.rw-guidelines-list article code:after {
+  letter-spacing: -0.2em;
+  content: "\00a0";
+}
+
+.rw-guidelines-list article pre>code {
+  padding: 0;
+  margin: 0;
+  font-size: 100%;
+  word-break: normal;
+  white-space: pre;
+  background: transparent;
+  border: 0;
+}
+
+.rw-guidelines-list article .highlight {
+  margin-bottom: 16px;
+}
+
+.rw-guidelines-list article .highlight pre,
+.rw-guidelines-list article pre {
+  padding: 16px;
+  overflow: auto;
+  font-size: 85%;
+  line-height: 1.45;
+  background-color: #f7f7f7;
+  border-radius: 3px;
+}
+
+.rw-guidelines-list article .highlight pre {
+  margin-bottom: 0;
+  word-break: normal;
+}
+
+.rw-guidelines-list article pre {
+  word-wrap: normal;
+}
+
+.rw-guidelines-list article pre code {
+  display: inline;
+  max-width: initial;
+  padding: 0;
+  margin: 0;
+  overflow: initial;
+  line-height: inherit;
+  word-wrap: normal;
+  background-color: transparent;
+  border: 0;
+}
+
+.rw-guidelines-list article pre code:before,
+.rw-guidelines-list article pre code:after {
+  content: normal;
+}
+
+.rw-guidelines-list article kbd {
+  display: inline-block;
+  padding: 3px 5px;
+  font-size: 11px;
+  line-height: 10px;
+  color: #555;
+  vertical-align: middle;
+  background-color: #fcfcfc;
+  border: solid 1px #ccc;
+  border-bottom-color: #bbb;
+  border-radius: 3px;
+  box-shadow: inset 0 -1px 0 #bbb;
+}
+
+.rw-guidelines-list article .pl-c {
+  color: #969896;
+}
+
+.rw-guidelines-list article .pl-c1,
+.rw-guidelines-list article .pl-s .pl-v {
+  color: #0086b3;
+}
+
+.rw-guidelines-list article .pl-e,
+.rw-guidelines-list article .pl-en {
+  color: #795da3;
+}
+
+.rw-guidelines-list article .pl-s .pl-s1,
+.rw-guidelines-list article .pl-smi {
+  color: #333;
+}
+
+.rw-guidelines-list article .pl-ent {
+  color: #63a35c;
+}
+
+.rw-guidelines-list article .pl-k {
+  color: #a71d5d;
+}
+
+.rw-guidelines-list article .pl-pds,
+.rw-guidelines-list article .pl-s,
+.rw-guidelines-list article .pl-s .pl-pse .pl-s1,
+.rw-guidelines-list article .pl-sr,
+.rw-guidelines-list article .pl-sr .pl-cce,
+.rw-guidelines-list article .pl-sr .pl-sra,
+.rw-guidelines-list article .pl-sr .pl-sre {
+  color: #183691;
+}
+
+.rw-guidelines-list article .pl-v {
+  color: #ed6a43;
+}
+
+.rw-guidelines-list article .pl-id {
+  color: #b52a1d;
+}
+
+.rw-guidelines-list article .pl-ii {
+  background-color: #b52a1d;
+  color: #f8f8f8;
+}
+
+.rw-guidelines-list article .pl-sr .pl-cce {
+  color: #63a35c;
+  font-weight: bold;
+}
+
+.rw-guidelines-list article .pl-ml {
+  color: #693a17;
+}
+
+.rw-guidelines-list article .pl-mh,
+.rw-guidelines-list article .pl-mh .pl-en,
+.rw-guidelines-list article .pl-ms {
+  color: #1d3e81;
+  font-weight: bold;
+}
+
+.rw-guidelines-list article .pl-mq {
+  color: #008080;
+}
+
+.rw-guidelines-list article .pl-mi {
+  color: #333;
+  font-style: italic;
+}
+
+.rw-guidelines-list article .pl-mb {
+  color: #333;
+  font-weight: bold;
+}
+
+.rw-guidelines-list article .pl-md {
+  background-color: #ffecec;
+  color: #bd2c00;
+}
+
+.rw-guidelines-list article .pl-mi1 {
+  background-color: #eaffea;
+  color: #55a532;
+}
+
+.rw-guidelines-list article .pl-mdr {
+  color: #795da3;
+  font-weight: bold;
+}
+
+.rw-guidelines-list article .pl-mo {
+  color: #1d3e81;
+}
+
+.rw-guidelines-list article kbd {
+  display: inline-block;
+  padding: 3px 5px;
+  font: 11px Consolas, "Liberation Mono", Menlo, Courier, monospace;
+  line-height: 10px;
+  color: #555;
+  vertical-align: middle;
+  background-color: #fcfcfc;
+  border: solid 1px #ccc;
+  border-bottom-color: #bbb;
+  border-radius: 3px;
+  box-shadow: inset 0 -1px 0 #bbb;
+}
+
+.rw-guidelines-list article .task-list-item {
+  list-style-type: none;
+}
+
+.rw-guidelines-list article .task-list-item+.task-list-item {
+  margin-top: 3px;
+}
+
+.rw-guidelines-list article .task-list-item input {
+  margin: 0 0.35em 0.25em -1.6em;
+  vertical-align: middle;
+}
+
+.rw-guidelines-list article :checked+.radio-label {
+  z-index: 1;
+  position: relative;
+  border-color: #4183c4;
+}
+
+/** Additional rule **/
+.rw-guidelines-list article img {
+  background-color: #FFF;
+  box-sizing: border-box;
+  -moz-box-shadow: 0px 0px 5px 0px #DDD;
+  -webkit-box-shadow: 0px 0px 5px 0px #DDD;
+  box-shadow: 0px 0px 5px 0px #DDD;
+  padding: 10px;
+}
diff --git a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.js b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.info.yml b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.info.yml
new file mode 100644
index 000000000..179f4294c
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.info.yml
@@ -0,0 +1,7 @@
+name: 'Reliefweb guidelines integration'
+type: module
+description: 'Reliefweb guidelines integration'
+package: reliefweb
+core_version_requirement: ^9
+dependencies:
+  - drupal:guidelines
diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.libraries.yml b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.libraries.yml
new file mode 100644
index 000000000..9e6a13f55
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.libraries.yml
@@ -0,0 +1,6 @@
+reliefweb-guidelines:
+  css:
+    component:
+      components/reliefweb-guidelines/reliefweb-guidelines.css: {}
+  js:
+    components/reliefweb-guidelines/reliefweb-guidelines.js: {}
diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
new file mode 100644
index 000000000..b038a2c6f
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
@@ -0,0 +1,261 @@
+<?php
+
+/**
+ * @file
+ * Contains integration for guidelines.
+ */
+
+use Drupal\Core\File\FileSystemInterface;
+use Drupal\Core\Render\Element;
+use Drupal\guidelines\Entity\Guideline;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\guidelines\Entity\GuidelineType;
+
+/**
+ * Implements hook_theme().
+ */
+function reliefweb_guidelines_theme() {
+  return [
+    'reliefweb_guidelines_list' => [
+      'variables' => [
+        'title' => t('ReliefWeb guidelines'),
+        'title_attributes' => NULL,
+        'guidelines' => [],
+      ],
+    ],
+    'reliefweb_guidelines_item' => [
+      'variables' => [
+        'id' => '',
+        'title' => '',
+        'description' => '',
+        'children' => [],
+      ],
+    ],
+  ];
+}
+
+/**
+ * Migrate datas from Trello.
+ */
+function reliefweb_guidelines_migrate_from_trello() {
+  $config = \Drupal::config('reliefweb_trello.settings');
+  $key = $config->get('key');
+  $token = $config->get('token');
+
+  $trello = new \Drupal\guidelines\GuidelinesFromTrello($key, $token, \Drupal::service('config.factory'), \Drupal::service('http_client'), \Drupal::service('logger.factory'));
+
+  $lists = $trello->getLists('554c519c9b98caa2495ea5db');
+  foreach ($lists as $weight_list => $list) {
+    // Create guideline.
+    $values = [
+      'type' => 'guideline_list',
+      'name' => $list['name'],
+      'parent' => [],
+      'weight' => $weight_list,
+      'field_title' => $list['name'],
+    ];
+
+    $guideline_list = Guideline::create($values);
+    $guideline_list->save();
+
+    // Get cards.
+    $cards = $trello->getCards($list['id']);
+    foreach ($cards as $weight_card => $card) {
+      // Extract and fetch images.
+      $files = guidelines_extract_images($card['desc']);
+
+      // Create guideline, check labels.
+      $values = [
+        'type' => 'field_guideline',
+        'name' => $card['name'],
+        'parent' => [],
+        'weight' => $weight_card,
+        'field_title' => $card['name'],
+        'field_short_link' => $card['shortLink'],
+        'field_description' => [
+          'value' => $card['desc'],
+          'format' => 'guideline',
+        ],
+      ];
+
+      // Add files.
+      if (!empty($files)) {
+        $values['field_images'] = $values['field_images'] ?? [];
+        foreach ($files as $file) {
+          $values['field_images'][] = [
+            'target_id' => $file->id(),
+          ];
+        }
+      }
+
+      // Check labels.
+      $list_name = $guideline_list->label();
+      if (strpos($list_name, 'Posting step-by-step') !== FALSE) {
+        foreach ($card['labels'] as $label) {
+          if (strpos($label['name'], 'form-') === 0) {
+            $bundle = strtolower(explode(' - ', $list_name)[0]);
+            $base_field_name = str_replace('-', '_', substr($label['name'], 5));
+
+            // Fix bundle machine names.
+            switch ($bundle) {
+              case 'jobs':
+                $bundle = 'job';
+                break;
+
+              case 'reports':
+                $bundle = 'report';
+                break;
+
+              case 'topics':
+                $bundle = 'topic';
+                break;
+
+            }
+
+            // Title is a base field, so no config.
+            if ($base_field_name === 'title') {
+              $key = 'node.' . $bundle . '.' . $base_field_name;
+              $values['field_field'] = $values['field_field'] ?? [];
+              $values['field_field'][] = [
+                'value' => $key,
+              ];
+            }
+            else {
+              $found = FALSE;
+              $field_names = guidelines_get_possible_field_names($bundle, $base_field_name);
+              foreach ($field_names as $field_name) {
+                if (FieldStorageConfig::loadByName('node', $field_name)) {
+                  $found = TRUE;
+                  $key = 'node.' . $bundle . '.' . $field_name;
+                  $values['field_field'] = $values['field_field'] ?? [];
+                  $values['field_field'][] = [
+                    'value' => $key,
+                  ];
+                }
+              }
+
+              // Log fields not found.
+              if (!$found) {
+                \Drupal::logger('guilines_trello')->notice($base_field_name . ' NOT FOUND');
+              }
+            }
+          }
+        }
+      }
+
+      // Get attachments.
+      if ($card['badges']['attachments'] > 0) {
+        $attachments = $trello->getCardAttachments($card['id']);
+        foreach($attachments as $attachment) {
+          // Add external links, skip images.
+          if (empty($attachment['isUpload'])) {
+            $values['field_links'] = $values['field_links'] ?? [];
+            $values['field_links'][] = [
+              'uri' => $attachment['url'],
+              'title' => $attachment['name'],
+            ];
+          }
+        }
+      }
+
+      $guideline = Guideline::create($values);
+      $guideline->setParents([$guideline_list]);
+      $guideline->save();
+    }
+  }
+}
+
+/**
+ * Get possible field names.
+ */
+function guidelines_get_possible_field_names($bundle, $field_name) {
+  $candidates = [
+    $field_name,
+    'field_' . $field_name,
+    'field_' . $bundle . '_' . $field_name,
+  ];
+
+  switch ($field_name) {
+    case 'job_description':
+      $candidates[] = 'body';
+      break;
+
+    case 'job_years_of_experience':
+      $candidates[] = 'field_job_experience';
+      break;
+
+    case 'location':
+    case 'job_location':
+      $candidates[] = 'field_country';
+      break;
+
+    case 'organization':
+      $candidates[] = 'field_source';
+      break;
+  }
+
+  return $candidates;
+}
+
+/**
+ * Extract and fetch images.
+ */
+function guidelines_extract_images(&$description) {
+  $files = [];
+  $pattern = '|(\!\[(.*?)\])(\((http.*?)\))|';
+  $description = preg_replace_callback($pattern, function($matches) use ($files) {
+    $matches[4] = guidelines_fetch_image($matches[4], $files);
+
+    // Remove non-existing images.
+    if (!$matches[4]) {
+      return '';
+    }
+
+    return $matches[1] . '(' . $matches[4] . ')';
+  }, $description);
+
+  return $files;
+}
+
+/**
+ * Fetch external image and
+ */
+function guidelines_fetch_image($url, &$files) {
+  $destination = 'public://guidelines/trello';
+  \Drupal::service('file_system')->prepareDirectory($destination, FileSystemInterface::CREATE_DIRECTORY);
+
+  try {
+    /** @var \Drupal\file\FileInterface $file */
+    $file = system_retrieve_file($url, $destination, TRUE, FileSystemInterface::EXISTS_REPLACE);
+    if (!$file) {
+      \Drupal::logger('guilines_trello')->error($url . ' not fetched');
+      return FALSE;
+    }
+  }
+  catch (\Exception $exception) {
+    \Drupal::logger('guilines_trello')->error($url . ' not accessible');
+    return FALSE;
+  }
+
+  // Add file to collection.
+  $files[] = $file;
+
+  // Return relative url.
+  return $file->createFileUrl();
+}
+
+/**
+ * Delete all guidelines.
+ */
+function _reliefweb_guidelines_delete_all() {
+  $guidelines = Guideline::loadMultiple();
+  foreach ($guidelines as $guideline) {
+    $guideline->delete();
+  }
+
+  $guideline_types = GuidelineType::loadMultiple();
+  foreach ($guideline_types as $guideline_type) {
+    $guideline_type->delete();
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.routing.yml b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.routing.yml
new file mode 100644
index 000000000..37ce60841
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.routing.yml
@@ -0,0 +1,7 @@
+reliefweb_guidelines.guidelines:
+  path: '/guidelines'
+  defaults:
+    _title: 'ReliefWeb guidelines'
+    _controller: '\Drupal\reliefweb_guidelines\Controller\GuidelineSinglePageController::getPageContent'
+  requirements:
+    _permission: 'access content'
diff --git a/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php b/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
new file mode 100644
index 000000000..b5aa5691f
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
@@ -0,0 +1,429 @@
+<?php
+
+namespace Drupal\reliefweb_guidelines\Controller;
+
+use Drupal\Component\Utility\Html;
+use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Render\RendererInterface;
+use Drupal\Core\Session\AccountProxyInterface;
+use Drupal\Core\State\StateInterface;
+use Drupal\node\NodeInterface;
+use Drupal\reliefweb_api\Services\ReliefWebApiClient;
+use Drupal\reliefweb_rivers\RiverServiceBase;
+use Drupal\reliefweb_utility\Helpers\MediaHelper;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpFoundation\Response;
+
+/**
+ * Controller for the guidelines.
+ */
+class GuidelineSinglePageController extends ControllerBase {
+
+  /**
+   * The current user.
+   *
+   * @var \Drupal\Core\Session\AccountProxyInterface
+   */
+  protected $currentUser;
+
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * The ReliefWeb API client.
+   *
+   * @var \Drupal\reliefweb_api\Services\ReliefWebApiClient
+   */
+  protected $reliefWebApiClient;
+
+  /**
+   * The drupal renderer service.
+   *
+   * @var \Drupal\Core\Render\RendererInterface
+   */
+  protected $renderer;
+
+  /**
+   * The state service.
+   *
+   * @var \Drupal\Core\State\StateInterface
+   */
+  protected $state;
+
+  /**
+   * Constructor.
+   *
+   * @param \Drupal\Core\Session\AccountProxyInterface $current_user
+   *   The current user.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager service.
+   * @param \Drupal\reliefweb_api\Services\ReliefWebApiClient $reliefweb_api_client
+   *   The reliefweb api client service.
+   * @param \Drupal\Core\Render\RendererInterface $renderer
+   *   The renderer service.
+   * @param \Drupal\Core\State\StateInterface $state
+   *   The state service.
+   */
+  public function __construct(
+    AccountProxyInterface $current_user,
+    EntityTypeManagerInterface $entity_type_manager,
+    ReliefWebApiClient $reliefweb_api_client,
+    RendererInterface $renderer,
+    StateInterface $state
+  ) {
+    $this->currentUser = $current_user;
+    $this->entityTypeManager = $entity_type_manager;
+    $this->reliefWebApiClient = $reliefweb_api_client;
+    $this->renderer = $renderer;
+    $this->state = $state;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('current_user'),
+      $container->get('entity_type.manager'),
+      $container->get('reliefweb_api.client'),
+      $container->get('renderer'),
+      $container->get('state')
+    );
+  }
+
+  /**
+   * Get the page content.
+   *
+   * @return array
+   *   Render array for the homepage.
+   */
+  public function getPageContent() {
+    $storage = $this->entityTypeManager->getStorage('guideline');
+
+    $ids = $storage
+      ->getQuery()
+      ->sort('id', 'ASC')
+      ->execute();
+
+    /** @var \Drupal\guidelines\Entity\Guideline[] $guidelines */
+    $guidelines = $storage->loadMultiple($ids);
+
+    $items = [];
+
+    foreach ($guidelines as $guideline) {
+      if ($parents = $guideline->getParentIds()) {
+        $items[$parents[0]]['#children'][] = [
+          '#theme' => 'reliefweb_guidelines_item',
+          '#id' => $guideline->hasField('field_short_link') ? Html::getUniqueId($guideline->field_short_link->value) : Html::getUniqueId($guideline->field_title->value),
+          '#title' => $guideline->field_title->value,
+          '#description' => $guideline->hasField('field_description') ? check_markup($guideline->field_description->value, $guideline->field_description->format) : '',
+        ];
+      }
+      else {
+        $items[$guideline->id()] = [
+          '#theme' => 'reliefweb_guidelines_item',
+          '#id' => $guideline->hasField('field_short_link') ? Html::getUniqueId($guideline->field_short_link->value) : Html::getUniqueId($guideline->field_title->value),
+          '#title' => $guideline->field_title->value,
+          '#description' => $guideline->hasField('field_description') ? check_markup($guideline->field_description->value, $guideline->field_description->format) : '',
+          '#children' => [],
+        ];
+      }
+    }
+
+    $build = [
+      '#theme' => 'reliefweb_guidelines_list',
+      '#title' => $this->t('ReliefWeb guidelines'),
+      '#guidelines' => $items,
+      '#cache' => [
+        'contexts' => ['user.permissions'],
+      ],
+    ];
+
+    $build['#attached']['library'][] = 'reliefweb_guidelines/reliefweb-guidelines';
+
+    return $build;
+  }
+
+  /**
+   * Get the API payload to get the latest headlines.
+   *
+   * @param int $limit
+   *   Number of headlines to return.
+   *
+   * @return array
+   *   API Payload.
+   */
+  public function getHeadlinesApiPayload($limit = 8) {
+    $payload = RiverServiceBase::getRiverApiPayload('report', 'headlines');
+    $payload['fields']['exclude'][] = 'file';
+    $payload['fields']['include'][] = 'headline.image';
+    $payload['sort'] = ['score:desc', 'date.created:desc'];
+    $payload['limit'] = $limit;
+
+    // Get the list of manually selected headlines.
+    $selected = $this->state->get('reliefweb_headline_selection', []);
+    $selected = array_slice($selected, 0, $limit);
+
+    // Build the search query, boosting the manually selected headlines.
+    // As the headlines are ordered by position (priority) we reverse the
+    // list so that we can use the index as base for the boost (higher boost =
+    // higher priority).
+    $query = ['_exists_:headline.title'];
+    foreach (array_reverse($selected) as $index => $id) {
+      $query[] = 'id:' . $id . '^' . ($index + 1) * 10;
+    }
+    $payload['query']['value'] = implode(' OR ', $query);
+
+    return [
+      'resource' => 'reports',
+      'bundle' => 'report',
+      'payload' => $payload,
+      'exclude' => ['posted', 'published', 'format'],
+      'title' => $this->t('Latest Headlines'),
+      'callback' => [$this, 'parseHeadlinesApiData'],
+      'view' => 'headlines',
+      // Link to the headlines river for the entity.
+      'more' => [
+        'url' => RiverServiceBase::getRiverUrl('report', [
+          'view' => 'headlines',
+        ]),
+        'label' => $this->t('View all headlines'),
+      ],
+    ];
+  }
+
+  /**
+   * Get the API payload to get the most read reports.
+   *
+   * @param int $limit
+   *   Number of documents to return.
+   *
+   * @return array
+   *   API Payload.
+   *
+   * @todo This currently returns the latest updates, not the most read.
+   * Refactor after add back redording of most read content.
+   */
+  public function getMostReadApiPayload($limit = 2) {
+    $payload = RiverServiceBase::getRiverApiPayload('report');
+    $payload['fields']['exclude'][] = 'file';
+    $payload['fields']['exclude'][] = 'body-html';
+    $payload['limit'] = $limit;
+
+    return [
+      'resource' => 'reports',
+      'bundle' => 'report',
+      'payload' => $payload,
+      'title' => $this->t('Latest Updates'),
+      'callback' => [$this, 'parseMostReadApiData'],
+      // Link to the updates river for the entity.
+      'more' => [
+        'url' => RiverServiceBase::getRiverUrl('report'),
+        'label' => $this->t('View all updates'),
+      ],
+    ];
+  }
+
+  /**
+   * Get the API payload to get the latest disasters.
+   *
+   * @param int $limit
+   *   Number of disasters to return.
+   *
+   * @return array
+   *   API Payload.
+   */
+  public function getDisastersApiPayload($limit = 5) {
+    $payload = RiverServiceBase::getRiverApiPayload('disaster', 'ongoing');
+    $payload['fields']['exclude'][] = 'country';
+    $payload['fields']['exclude'][] = 'type';
+    $payload['fields']['exclude'][] = 'date';
+    $payload['sort'] = ['date.created:desc'];
+    $payload['limit'] = $limit;
+
+    return [
+      'resource' => 'disasters',
+      'bundle' => 'disaster',
+      'payload' => $payload,
+      'title' => $this->t('Recent Disasters'),
+      'callback' => [$this, 'parseDisastersApiData'],
+      // Link to the disasters river for the entity.
+      'more' => [
+        'url' => RiverServiceBase::getRiverUrl('disaster'),
+        'label' => $this->t('View all disasters'),
+      ],
+    ];
+  }
+
+  /**
+   * Get the API payload to get the latest blog post.
+   *
+   * @return array
+   *   API Payload.
+   */
+  public function getBlogPostApiPayload() {
+    $payload = RiverServiceBase::getRiverApiPayload('blog_post');
+    $payload['limit'] = 1;
+
+    return [
+      'resource' => 'blog',
+      'bundle' => 'blog_post',
+      'payload' => $payload,
+      'title' => $this->t('Latest Blog'),
+      'callback' => [$this, 'parseBlogPostApiData'],
+      // Link to the blog river for the entity.
+      'more' => [
+        'url' => RiverServiceBase::getRiverUrl('blog_post'),
+        'label' => $this->t('View all blog posts'),
+      ],
+    ];
+  }
+
+  /**
+   * Get the API payload to get the number of job or training.
+   *
+   * @param string $bundle
+   *   Entity bundle: job or training.
+   *
+   * @return array
+   *   API Payload.
+   */
+  public function getOpportuntiesTotalApiPayload($bundle) {
+    $payload = [
+      // We just want the total count.
+      'limit' => 0,
+    ];
+
+    if ($bundle === 'job') {
+      $title = $this->t('Open jobs');
+      $resource = 'jobs';
+    }
+    else {
+      $title = $this->t('Training programs');
+      $resource = 'training';
+    }
+
+    return [
+      'resource' => $resource,
+      'bundle' => $bundle,
+      'payload' => $payload,
+      'title' => $title,
+      // Link to the job/training river for the entity.
+      'url' => RiverServiceBase::getRiverUrl($bundle),
+    ];
+  }
+
+  /**
+   * Get the latest announcement to feature on the homepage.
+   *
+   * @return array
+   *   Render array for the announcement section.
+   *
+   * @todo Use a announcement node view mode for that?
+   */
+  public function getLatestAnnouncement() {
+    $storage = $this->entityTypeManager
+      ->getStorage('node');
+
+    $nids = $storage
+      ->getQuery()
+      ->condition('type', 'announcement')
+      ->condition('status', NodeInterface::PUBLISHED)
+      ->sort('created', 'DESC')
+      ->range(0, 1)
+      ->execute();
+
+    $nodes = $storage->loadMultiple($nids);
+
+    if (!empty($nodes)) {
+      $node = reset($nodes);
+
+      if ($node->hasField('field_image') && !$node->field_image->isEmpty()) {
+        $image = MediaHelper::getImage($node->field_image);
+
+        return [
+          '#theme' => 'reliefweb_homepage_announcement',
+          '#id' => 'announcement',
+          '#url' => $node->field_link->uri,
+          '#image' => [
+            'url' => $image['uri'],
+            'title' => $node->label(),
+            'alt' => $node->body->value ?? $node->label(),
+            'width' => $image['width'],
+            'height' => $image['height'],
+          ],
+          '#cache' => [
+            'tags' => ['node_list:announcement'],
+          ],
+        ];
+      }
+    }
+    return [];
+  }
+
+  /**
+   * Ajax callback to retrieve the list of selected headlines.
+   *
+   * @return \Symfony\Component\HttpFoundation\Response
+   *   Rendered headline list.
+   */
+  public function retrieveHeadlines() {
+    // Get the latest 24 headlines.
+    $query = $this->getHeadlinesApiPayload(24);
+
+    // Get the API data.
+    $results = $this->reliefWebApiClient
+      ->requestMultiple(['headlines' => $query]);
+
+    $build = [];
+    if (!empty($results['headlines']['data'])) {
+      $result = $results['headlines'];
+
+      // Sort the headlines by id DESC to have the most recent first.
+      uasort($result['data'], function ($a, $b) {
+        return $b['id'] <=> $a['id'];
+      });
+
+      $bundle = $query['bundle'];
+      $view = $query['view'] ?? '';
+      $exclude = $query['exclude'] ?? [];
+
+      $entities = RiverServiceBase::getRiverData($bundle, $result, $view, $exclude);
+      if (!empty($entities)) {
+        $build = [
+          '#theme' => 'reliefweb_rivers_river',
+          '#id' => '#headlines',
+          '#title' => $query['title'],
+          '#resource' => $query['resource'],
+          '#entities' => $entities,
+        ];
+      }
+    }
+
+    return new Response($this->renderer->render($build));
+  }
+
+  /**
+   * Ajax callback to update the list of selected headlines.
+   *
+   * @return \Symfony\Component\HttpFoundation\Response
+   *   200 if the update was successful, 500 otherwise.
+   */
+  public function updateHeadlines() {
+    $success = FALSE;
+    // Limit to 10,000 bytes (should never be reached).
+    $data = json_decode(file_get_contents('php://input', FALSE, NULL, 0, 10000) ?? '', TRUE);
+    if (!empty($data) && is_array($data)) {
+      $selection = array_slice(array_filter($data, 'is_int'), 0, 8);
+      $this->state->set('reliefweb_headline_selection', $selection);
+      $success = TRUE;
+    }
+    return new Response('', $success ? 200 : 500);
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-item.html.twig b/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-item.html.twig
new file mode 100644
index 000000000..b5f23133d
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-item.html.twig
@@ -0,0 +1,17 @@
+{#
+
+/**
+ * @file
+ * Template for the ReliefWeb Homepage.
+ *
+ * Available variables:
+ * - attributes: wrapper attributes
+ * - item: item.
+ */
+
+#}
+
+<article{{ attributes.setAttribute('id', id).addClass('rw-guidelines-item') }}>
+  <h2>{{ title }}</h2>
+  <div>{{ description }}</div>
+</article>
diff --git a/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-list.html.twig b/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-list.html.twig
new file mode 100644
index 000000000..4ad7afc00
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-list.html.twig
@@ -0,0 +1,41 @@
+{#
+
+/**
+ * @file
+ * Template for the ReliefWeb Homepage.
+ *
+ * Available variables:
+ * - attributes: wrapper attributes
+ * - guidelines: list of guidelines for the page. Each section is a render array.
+ */
+
+#}
+
+<div{{ attributes.addClass('rw-guidelines-list') }}>
+  <aside>
+    <nav class="scroll">
+      {% for guideline in guidelines %}
+        <label for="{{ guideline['#id'] }}">{{ guideline['#title'] }}</label>
+        <input id="{{ guideline['#id'] }}" type="checkbox" name="lists">
+
+        {% if guideline['#children'] %}
+          <nav>
+          {% for child in guideline['#children'] %}
+            <label for="{{ child['#id'] }}">{{ child['#title'] }}</label>
+            <input id="{{ child['#id'] }}" type="checkbox" name="lists">
+          {% endfor %}
+          </nav>
+        {% endif %}
+      {% endfor %}
+    </nav>
+  </aside>
+
+  <main>
+    <div class="scroll">
+      {% for guideline in guidelines %}
+        <a name="{{ guideline['#id'] }}"></a>
+        {{ guideline['#children'] }}
+      {% endfor %}
+    </div>
+  </main>
+</div>

From 03a0ee236fa2eb135e41bcfec67a8070428ad936 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 24 Nov 2021 08:55:39 -0700
Subject: [PATCH 149/720] RW-169 add token component, copy styles from D7 and
 adjust for D9 using details and summary element, define library

---
 .../common_design_subtheme.libraries.yml      |  5 ++++
 .../components/rw-token/rw-token.css          | 30 +++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 html/themes/custom/common_design_subtheme/components/rw-token/rw-token.css

diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
index e45215baa..ed44af032 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
@@ -332,6 +332,11 @@ rw-toc:
   dependencies:
     - common_design/cd-dropdown
 
+rw-token:
+  css:
+    theme:
+      components/rw-token/rw-token.css: {}
+
 rw-topics:
   css:
     theme:
diff --git a/html/themes/custom/common_design_subtheme/components/rw-token/rw-token.css b/html/themes/custom/common_design_subtheme/components/rw-token/rw-token.css
new file mode 100644
index 000000000..8bde74b4e
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/components/rw-token/rw-token.css
@@ -0,0 +1,30 @@
+/**
+ * Token help.
+ *
+ * Information about tokens usable in a text input or textarea.
+ */
+.token-help {
+  margin-top: 1rem;
+  font-size: 14px;
+}
+.token-help .token-iframe {
+  padding: 8px;
+  border: 1px solid #e6ecef;
+  border-bottom: 0;
+  line-height: 1.5;
+}
+.token-help summary {
+  padding: 8px;
+  border: 1px solid #e6ecef;
+  border-top: 0;
+  line-height: 1.5;
+}
+.token-help summary strong {
+  font-size: 16px;
+}
+.token-help summary p {
+  margin: 0;
+}
+.token-help table th {
+  text-align: left;
+}

From 5ae9759aa0cdb743e7794c39208a9ee7a3859cf5 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 24 Nov 2021 08:57:20 -0700
Subject: [PATCH 150/720] RW-169 add markup for detail element with token
 table, copied from D7, temporary placeholder

---
 .../form/node-edit-form--topic.html.twig      | 141 ++++++++++++++++++
 1 file changed, 141 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/templates/form/node-edit-form--topic.html.twig b/html/themes/custom/common_design_subtheme/templates/form/node-edit-form--topic.html.twig
index 46c99e45f..66920b14f 100644
--- a/html/themes/custom/common_design_subtheme/templates/form/node-edit-form--topic.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/form/node-edit-form--topic.html.twig
@@ -16,6 +16,7 @@
  */
 #}
 {{ attach_library('common_design_subtheme/rw-form') }}
+{{ attach_library('common_design_subtheme/rw-token') }}
 
 {# Table of contents. #}
 {{
@@ -55,6 +56,146 @@
 <fieldset id="overview">
   <legend>{% trans %}Overview{% endtrans %}</legend>
   {{ form.field_overview }}
+
+  {# Temp #}
+  <div class="token-help">
+    <div class="token-iframe">
+      <strong>Iframe syntax: </strong><code>[iframe:widthxheight "title"](link)</code> Ex: [iframe:1000x400 "Events map"](http://example.com/events-map/)
+    </div>
+    <details>
+      <summary>
+        <strong>Disaster type map</strong>
+        <p>Display maps of the latest disasters per type (can be combined, ex: [disaster-map:ST-SS])</p>
+      </summary>
+      <table class="token-tree">
+        <thead>
+        <tr>
+          <th>Name</th>
+          <th>Token</th>
+          <th>Description</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr id="token-disaster-map--CW">
+          <td>Cold Wave</td>
+          <td class="token-key">[disaster-map:CW]</td>
+          <td>Map of latest Cold Wave disasters</td>
+        </tr>
+        <tr id="token-disaster-map--CE">
+          <td>Complex Emergency</td>
+          <td class="token-key">[disaster-map:CE]</td>
+          <td>Map of latest Complex Emergency disasters</td>
+        </tr>
+        <tr id="token-disaster-map--ID">
+          <td>Disasters with IDs</td>
+          <td class="token-key">[disaster-map:ID]</td>
+          <td>Map of latest disasters with IDs (separated with a "-", ex: [disaster-map:123-456])</td>
+        </tr>
+        <tr id="token-disaster-map--DR">
+          <td>Drought</td>
+          <td class="token-key">[disaster-map:DR]</td>
+          <td>Map of latest Drought disasters</td>
+        </tr>
+        <tr id="token-disaster-map--EQ">
+          <td>Earthquake</td>
+          <td class="token-key">[disaster-map:EQ]</td>
+          <td>Map of latest Earthquake disasters</td>
+        </tr>
+        <tr id="token-disaster-map--EP">
+          <td>Epidemic</td>
+          <td class="token-key">[disaster-map:EP]</td>
+          <td>Map of latest Epidemic disasters</td>
+        </tr>
+        <tr id="token-disaster-map--EC">
+          <td>Extratropical Cyclone</td>
+          <td class="token-key">[disaster-map:EC]</td>
+          <td>Map of latest Extratropical Cyclone disasters</td>
+        </tr>
+        <tr id="token-disaster-map--FR">
+          <td>Fire</td>
+          <td class="token-key">[disaster-map:FR]</td>
+          <td>Map of latest Fire disasters</td>
+        </tr>
+        <tr id="token-disaster-map--FF">
+          <td>Flash Flood</td>
+          <td class="token-key">[disaster-map:FF]</td>
+          <td>Map of latest Flash Flood disasters</td>
+        </tr>
+        <tr id="token-disaster-map--FL">
+          <td>Flood</td>
+          <td class="token-key">[disaster-map:FL]</td>
+          <td>Map of latest Flood disasters</td>
+        </tr>
+        <tr id="token-disaster-map--HT">
+          <td>Heat Wave</td>
+          <td class="token-key">[disaster-map:HT]</td>
+          <td>Map of latest Heat Wave disasters</td>
+        </tr>
+        <tr id="token-disaster-map--IN">
+          <td>Insect Infestation</td>
+          <td class="token-key">[disaster-map:IN]</td>
+          <td>Map of latest Insect Infestation disasters</td>
+        </tr>
+        <tr id="token-disaster-map--LS">
+          <td>Land Slide</td>
+          <td class="token-key">[disaster-map:LS]</td>
+          <td>Map of latest Land Slide disasters</td>
+        </tr>
+        <tr id="token-disaster-map--MS">
+          <td>Mud Slide</td>
+          <td class="token-key">[disaster-map:MS]</td>
+          <td>Map of latest Mud Slide disasters</td>
+        </tr>
+        <tr id="token-disaster-map--OT">
+          <td>Other</td>
+          <td class="token-key">[disaster-map:OT]</td>
+          <td>Map of latest Other disasters</td>
+        </tr>
+        <tr id="token-disaster-map--ST">
+          <td>Severe Local Storm</td>
+          <td class="token-key">[disaster-map:ST]</td>
+          <td>Map of latest Severe Local Storm disasters</td>
+        </tr>
+        <tr id="token-disaster-map--AV">
+          <td>Snow Avalanche</td>
+          <td class="token-key">[disaster-map:AV]</td>
+          <td>Map of latest Snow Avalanche disasters</td>
+        </tr>
+        <tr id="token-disaster-map--SS">
+          <td>Storm Surge</td>
+          <td class="token-key">[disaster-map:SS]</td>
+          <td>Map of latest Storm Surge disasters</td>
+        </tr>
+        <tr id="token-disaster-map--AC">
+          <td>Technological Disaster</td>
+          <td class="token-key">[disaster-map:AC]</td>
+          <td>Map of latest Technological Disaster disasters</td>
+        </tr>
+        <tr id="token-disaster-map--TC">
+          <td>Tropical Cyclone</td>
+          <td class="token-key">[disaster-map:TC]</td>
+          <td>Map of latest Tropical Cyclone disasters</td>
+        </tr>
+        <tr id="token-disaster-map--TS">
+          <td>Tsunami</td>
+          <td class="token-key">[disaster-map:TS]</td>
+          <td>Map of latest Tsunami disasters</td>
+        </tr>
+        <tr id="token-disaster-map--VO">
+          <td>Volcano</td>
+          <td class="token-key">[disaster-map:VO]</td>
+          <td>Map of latest Volcano disasters</td>
+        </tr>
+        <tr id="token-disaster-map--WF">
+          <td>Wild Fire</td>
+          <td class="token-key">[disaster-map:WF]</td>
+          <td>Map of latest Wild Fire disasters</td>
+        </tr>
+        </tbody>
+      </table>
+    </details>
+  </div>
+
 </fieldset>
 
 <fieldset id="resources">

From ea9e25e9ac9db915fa34657d1971b664fd6f94fd Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 24 Nov 2021 08:57:54 -0700
Subject: [PATCH 151/720] RW-169 add code element style and compile css

---
 html/themes/custom/common_design_subtheme/css/styles.css    | 2 +-
 .../common_design_subtheme/sass/base/_typography.scss       | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/css/styles.css b/html/themes/custom/common_design_subtheme/css/styles.css
index b520b0987..e195b652a 100644
--- a/html/themes/custom/common_design_subtheme/css/styles.css
+++ b/html/themes/custom/common_design_subtheme/css/styles.css
@@ -1 +1 @@
-@import"https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400%3B500%3B700&display=swap";@import"https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,300%3B0,400%3B0,500%3B0,700%3B0,900%3B1,400%3B1,700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400%3B700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@400%3B700&display=swap";:root{--cd-reliefweb-brand-blue: #0988bb;--cd-reliefweb-brand-red: #f65c51;--cd-reliefweb-brand-blue--dark: #055372;--cd-reliefweb-brand-red--dark: #eb1405;--cd-reliefweb-brand-grey--dark: #2e3436;--cd-reliefweb-brand-grey--mid: #4d5254;--cd-reliefweb-brand-grey--light: #e6ecef;--cd-rgb-reliefweb-brand-blue: 9, 136, 187;--cd-rgb-reliefweb-brand-red: 246, 92, 81;--cd-rgb-reliefweb-brand-blue--dark: 4, 82, 112;--cd-rgb-reliefweb-brand-red--dark: 235, 20, 5;--cd-rgb-reliefweb-brand-grey--dark: 46, 52, 54;--cd-rgb-reliefweb-brand-grey--light: 230, 236, 239;--cd-reliefweb-grey--light: #d9d9d9;--cd-reliefweb-grey--light--bg: rgba(217, 217, 217, 0.2);--cd-reliefweb-orange: #f49e2c;--cd-reliefweb-orange--bg: rgba(244, 158, 44, 0.2);--cd-reliefweb-blue: #076d96;--cd-reliefweb-blue--bg: rgba(7, 109, 150, 0.2);--cd-reliefweb-green: #88bb09;--cd-reliefweb-green--bg: rgba(136, 187, 9, 0.2);--cd-reliefweb-red: #da190b;--cd-reliefweb-red--bg: rgba(218, 25, 11, 0.2);--cd-reliefweb-purple: #9509bb;--cd-reliefweb-purple--bg: rgba(149, 9, 187, 0.2);--cd-reliefweb-grey: #4b4b4b;--cd-reliefweb-grey--bg: rgba(75, 75, 75, 0.2);--cd-reliefweb-brown: #8f5507;--cd-reliefweb-brown--bg: rgba(143, 85, 7, 0.2);--cd-reliefweb-yellow: #f5cb2f;--cd-reliefweb-yellow--bg: rgba(245, 203, 47, 0.2);--cd-reliefweb-cyan: #56c9f7;--cd-reliefweb-cyan--bg: rgba(86, 201, 247, 0.2);--cd-reliefweb-orange--alert: #eb8705;--cd-reliefweb-pink: rgba(246, 92, 81, 0.2);--cd-reliefweb-grey--disable: rgba(230, 236, 239, 0.5);--cd-ocha-blue: #1f69b3;--cd-blue--dark: #144372;--cd-blue--bright: #82b5e9;--cd-blue--light: #d4e5f7;--cd-highlight-red: #e56a54;--cd-contrast-red: #e00000;--cd-white: #fff;--cd-grey--light: #f2f2f2;--cd-grey--mid: #595959;--cd-grey--dark: #4a4a4a;--cd-default-text-color: var(--cd-grey--dark);--cd-black: #000;--cd-blue-grey: #e6ecf1;--cd-blue-grey--dark: #d3dde5;--cd-blue-grey--light: #ebf0f4;--cd-rgb-ocha-blue: 2, 108, 182;--cd-rgb-grey--mid: 89, 89, 89;--cd-rgb-grey--dark: 74, 74, 74;--cd-rgb-highlight-red: 229, 106, 84;--cd-rgb-blue-grey--dark: 211, 221, 229;--cd-max-content-width: 820px;--cd-max-body-width: 1400px;--cd-max-width: 1220px;--cd-container-padding: 0.75rem;--cd-container-padding-tablet: 1.5rem;--cd-container-padding-xlarge: 2.5rem;--cd-flow-space: 1rem;--cd-bumper-space: 1rem;--cd-footer-row-number: 5;--cd-red: #cd3a1f;--cd-red--light: #f8d8d3;--cd-orange: #db7b18;--cd-orange--light: #fae6d1;--cd-yellow: #d5de26;--cd-yellow--light: #f7f8d3;--cd-green: #7fb92f;--cd-green--light: #e8f5d6;--cd-font-size--tiny: 0.75rem;--cd-font-size--small: 0.875rem;--cd-font-size--base: 1.125rem;--cd-font-size--medium: 1.375rem;--cd-font-size--large: 1.625rem;--cd-font-size--2xbase: 1.875rem;--cd-font-size--2xmedium: 2.375rem;--cd-font-size--2xlarge: 2.875rem;--cd-font: helvetica, arial, sans-serif;--cd-font--system: system-ui;--cd-font--noto: "Noto Sans", sans-serif;--cd-font--noto-kufi: "Noto Kufi Arabic", sans-serif;--cd-font--roboto: "Roboto", helvetica, arial, sans-serif;--cd-font--roboto-condensed: "Roboto Condensed", helvetica, arial, sans-serif;--cd-font--roboto-slab: "Roboto Slab", helvetica, arial, sans-serif}@supports(display: grid){@media(min-width: 768px){.cd-layout-container{grid-template-rows:151px auto 1fr auto}}}@media(min-width: 768px){.cd-layout-container .cd-layout-content-wrapper{display:flex;flex-wrap:wrap}}@media(min-width: 768px){.cd-layout-content{flex-basis:0;flex-grow:999}}.cd-global-header__dropdown{background:var(--cd-reliefweb-brand-blue--dark)}.cd-global-header button[aria-expanded=true]::before{border-color:transparent transparent var(--cd-reliefweb-brand-blue--dark)}@media(max-width: 767px){.cd-global-header button[aria-expanded] span[class*=__btn-label]{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}.cd-header button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header{background:var(--cd-reliefweb-brand-blue--dark);background-image:linear-gradient(-180deg, var(--cd-reliefweb-brand-blue--dark) 67%, #04415a 97%)}@supports(display: grid){.cd-site-header__inner{grid-template-columns:52px 1fr}@media(min-width: 768px){.cd-site-header__inner{grid-template-columns:186px 1fr}}}.cd-language-switcher__btn:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-user-menu__dropdown li a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-site-logo{width:52px}.cd-site-logo:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}@media(max-width: 767px){.cd-site-logo{background:url("../img/logos/rw-logo-mobile.svg") center no-repeat;background:linear-gradient(transparent, transparent),url("../img/logos/rw-logo-mobile.svg") center no-repeat}}@media(min-width: 768px){.cd-site-logo{width:140px}}.menu--main button[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red--dark)}.cd-nav__btn[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red--dark)}.cd-nav__btn[aria-expanded=true]::before{background:var(--cd-reliefweb-brand-red--dark)}@media(max-width: 1023px){.cd-site-header__nav-holder .cd-nav>ul>li>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>button.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>button.is-active::before{background:rgba(var(--cd-reliefweb-brand-red--dark), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-brand-red--dark), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-brand-red--dark), 0.6)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}}@media(min-width: 1024px){.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail button::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a:focus::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button:focus::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul a.is-active,.cd-site-header__nav-holder .cd-nav>.menu>li>ul button.is-active{border-left:3px solid var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul>li.menu-item--active-trail .is-active{border-left:3px solid var(--cd-reliefweb-brand-red--dark)}}.cd-ocha-dropdown__link a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-search__btn{color:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn svg{fill:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn:hover,.cd-search__btn:focus{color:#04415a}.cd-search__btn:hover svg,.cd-search__btn:focus svg{fill:#04415a}.cd-search__btn:focus{color:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn:focus svg{fill:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn[aria-expanded=true]{color:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn[aria-expanded=true] svg{fill:var(--cd-reliefweb-brand-red--dark)}.cd-search__submit:focus{background-color:var(--cd-reliefweb-brand-red--dark)}.cd-user-menu--no-language-switcher li:last-child a,.cd-user-menu--no-language-switcher li:last-child button{padding-right:0}.cd-user-menu--no-language-switcher li:last-child a::after,.cd-user-menu--no-language-switcher li:last-child button::after{content:none}.cd-user-menu__item:focus,.cd-global-header .menu>li a:focus,.cd-global-header .menu>li button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button{padding-right:0}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a::after,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button::after{content:none}@media(max-width: 767px){.cd-global-header__user-menu a svg+span{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}[dir=ltr] .admin-menu__btn svg+span{margin-left:10px}[dir=rtl] .admin-menu__btn svg+span{margin-right:10px}.admin-menu__btn .cd-icon:not(.cd-icon--arrow-down){display:inline-block;width:14px;height:14px;vertical-align:middle;fill:var(--cd-white)}.cd-footer{background:var(--cd-reliefweb-brand-blue--dark)}.cd-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-footer-copyright{display:block;margin-top:0;text-align:right;color:#fff;font-size:12px;font-weight:lighter}.cd-footer-copyright p{margin:0}.cd-footer-copyright a{display:inline-block;overflow:hidden;width:140px;height:60px;margin:0 0 -4px 0;padding:0 0 0 140px;background:url(../img/logos/rw-logo-sprite.png) 0 -60px no-repeat;background:rgba(0,0,0,0) url(../img/logos/rw-logo-sprite.svg) 0 -60px no-repeat}.cd-footer-copyright a:hover,.cd-footer-copyright a:active,.cd-footer-copyright a:focus{opacity:.8}@media all and (max-width: 1023px){.cd-footer-copyright{width:100%;text-align:center}}.cd-soft-footer{background:rgba(var(--cd-rgb-ocha-blue), 0.9)}.cd-soft-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}a{color:var(--cd-reliefweb-brand-blue--dark)}a:hover,a:focus{color:var(--cd-reliefweb-brand-blue--dark)}h1,h2{margin:0 0 24px 0;letter-spacing:.5px;font-size:24px;font-weight:bold;line-height:1.3}@media screen and (min-width: 480px){h1,h2{font-size:var(--cd-font-size--2xbase)}}h3{margin:0 0 16px 0;letter-spacing:.5px;font-size:20px;font-weight:bold;line-height:1.3}h4{margin:0 0 16px 0;letter-spacing:.5px;font-size:18px;font-weight:bold;line-height:1.3}h5{margin:0 0 16px 0;letter-spacing:.5px;font-size:17px;font-weight:bold;font-style:italic}h6{margin:0 0 16px 0;letter-spacing:.5px;font-size:16px;font-weight:bold}.rw-article__content *+h3,.rw-article__content *+h4,.rw-article__content *+h5,.rw-article__content *+h6{margin-top:16px}@media all and (max-width: 479px){#main h2{font-size:24px}}p{margin:1rem 0;line-height:1.6}p:first-child{margin-top:0}p:last-child{margin-bottom:0}input[type=search]{-moz-appearance:none;-webkit-appearance:none;appearance:none}input::-webkit-search-decoration{-webkit-appearance:none}input:-ms-input-placeholder{opacity:.7;color:inherit;font-style:italic}input::-moz-placeholder{opacity:.7;color:inherit;font-style:italic}input::placeholder{opacity:.7;color:inherit;font-style:italic}select{max-width:100%}select:not([multitple]){-moz-appearance:menulist-button;-webkit-appearance:menulist-button}fieldset{min-inline-size:auto}table{width:100%;border-collapse:collapse}table caption{margin:12px 0;font-weight:bold}table th,table td{padding:8px;border:1px solid var(--cd-reliefweb-brand-grey--light)}table th{border-left-color:#fff;background:var(--cd-reliefweb-brand-grey--light)}table thead th{border-left-color:#fff}th.field-label>h4.label{margin:0}table thead th:first-child{border-left-color:var(--cd-reliefweb-brand-grey--light)}table tbody th{border-top-color:#fff}table tbody th:first-child{border-top-color:var(--cd-reliefweb-brand-grey--light)}
+@import"https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400%3B500%3B700&display=swap";@import"https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,300%3B0,400%3B0,500%3B0,700%3B0,900%3B1,400%3B1,700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400%3B700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@400%3B700&display=swap";:root{--cd-reliefweb-brand-blue: #0988bb;--cd-reliefweb-brand-red: #f65c51;--cd-reliefweb-brand-blue--dark: #055372;--cd-reliefweb-brand-red--dark: #eb1405;--cd-reliefweb-brand-grey--dark: #2e3436;--cd-reliefweb-brand-grey--mid: #4d5254;--cd-reliefweb-brand-grey--light: #e6ecef;--cd-rgb-reliefweb-brand-blue: 9, 136, 187;--cd-rgb-reliefweb-brand-red: 246, 92, 81;--cd-rgb-reliefweb-brand-blue--dark: 4, 82, 112;--cd-rgb-reliefweb-brand-red--dark: 235, 20, 5;--cd-rgb-reliefweb-brand-grey--dark: 46, 52, 54;--cd-rgb-reliefweb-brand-grey--light: 230, 236, 239;--cd-reliefweb-grey--light: #d9d9d9;--cd-reliefweb-grey--light--bg: rgba(217, 217, 217, 0.2);--cd-reliefweb-orange: #f49e2c;--cd-reliefweb-orange--bg: rgba(244, 158, 44, 0.2);--cd-reliefweb-blue: #076d96;--cd-reliefweb-blue--bg: rgba(7, 109, 150, 0.2);--cd-reliefweb-green: #88bb09;--cd-reliefweb-green--bg: rgba(136, 187, 9, 0.2);--cd-reliefweb-red: #da190b;--cd-reliefweb-red--bg: rgba(218, 25, 11, 0.2);--cd-reliefweb-purple: #9509bb;--cd-reliefweb-purple--bg: rgba(149, 9, 187, 0.2);--cd-reliefweb-grey: #4b4b4b;--cd-reliefweb-grey--bg: rgba(75, 75, 75, 0.2);--cd-reliefweb-brown: #8f5507;--cd-reliefweb-brown--bg: rgba(143, 85, 7, 0.2);--cd-reliefweb-yellow: #f5cb2f;--cd-reliefweb-yellow--bg: rgba(245, 203, 47, 0.2);--cd-reliefweb-cyan: #56c9f7;--cd-reliefweb-cyan--bg: rgba(86, 201, 247, 0.2);--cd-reliefweb-orange--alert: #eb8705;--cd-reliefweb-pink: rgba(246, 92, 81, 0.2);--cd-reliefweb-grey--disable: rgba(230, 236, 239, 0.5);--cd-ocha-blue: #1f69b3;--cd-blue--dark: #144372;--cd-blue--bright: #82b5e9;--cd-blue--light: #d4e5f7;--cd-highlight-red: #e56a54;--cd-contrast-red: #e00000;--cd-white: #fff;--cd-grey--light: #f2f2f2;--cd-grey--mid: #595959;--cd-grey--dark: #4a4a4a;--cd-default-text-color: var(--cd-grey--dark);--cd-black: #000;--cd-blue-grey: #e6ecf1;--cd-blue-grey--dark: #d3dde5;--cd-blue-grey--light: #ebf0f4;--cd-rgb-ocha-blue: 2, 108, 182;--cd-rgb-grey--mid: 89, 89, 89;--cd-rgb-grey--dark: 74, 74, 74;--cd-rgb-highlight-red: 229, 106, 84;--cd-rgb-blue-grey--dark: 211, 221, 229;--cd-max-content-width: 820px;--cd-max-body-width: 1400px;--cd-max-width: 1220px;--cd-container-padding: 0.75rem;--cd-container-padding-tablet: 1.5rem;--cd-container-padding-xlarge: 2.5rem;--cd-flow-space: 1rem;--cd-bumper-space: 1rem;--cd-footer-row-number: 5;--cd-red: #cd3a1f;--cd-red--light: #f8d8d3;--cd-orange: #db7b18;--cd-orange--light: #fae6d1;--cd-yellow: #d5de26;--cd-yellow--light: #f7f8d3;--cd-green: #7fb92f;--cd-green--light: #e8f5d6;--cd-font-size--tiny: 0.75rem;--cd-font-size--small: 0.875rem;--cd-font-size--base: 1.125rem;--cd-font-size--medium: 1.375rem;--cd-font-size--large: 1.625rem;--cd-font-size--2xbase: 1.875rem;--cd-font-size--2xmedium: 2.375rem;--cd-font-size--2xlarge: 2.875rem;--cd-font: helvetica, arial, sans-serif;--cd-font--system: system-ui;--cd-font--noto: "Noto Sans", sans-serif;--cd-font--noto-kufi: "Noto Kufi Arabic", sans-serif;--cd-font--roboto: "Roboto", helvetica, arial, sans-serif;--cd-font--roboto-condensed: "Roboto Condensed", helvetica, arial, sans-serif;--cd-font--roboto-slab: "Roboto Slab", helvetica, arial, sans-serif}@supports(display: grid){@media(min-width: 768px){.cd-layout-container{grid-template-rows:151px auto 1fr auto}}}@media(min-width: 768px){.cd-layout-container .cd-layout-content-wrapper{display:flex;flex-wrap:wrap}}@media(min-width: 768px){.cd-layout-content{flex-basis:0;flex-grow:999}}.cd-global-header__dropdown{background:var(--cd-reliefweb-brand-blue--dark)}.cd-global-header button[aria-expanded=true]::before{border-color:transparent transparent var(--cd-reliefweb-brand-blue--dark)}@media(max-width: 767px){.cd-global-header button[aria-expanded] span[class*=__btn-label]{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}.cd-header button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header{background:var(--cd-reliefweb-brand-blue--dark);background-image:linear-gradient(-180deg, var(--cd-reliefweb-brand-blue--dark) 67%, #04415a 97%)}@supports(display: grid){.cd-site-header__inner{grid-template-columns:52px 1fr}@media(min-width: 768px){.cd-site-header__inner{grid-template-columns:186px 1fr}}}.cd-language-switcher__btn:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-user-menu__dropdown li a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-site-logo{width:52px}.cd-site-logo:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}@media(max-width: 767px){.cd-site-logo{background:url("../img/logos/rw-logo-mobile.svg") center no-repeat;background:linear-gradient(transparent, transparent),url("../img/logos/rw-logo-mobile.svg") center no-repeat}}@media(min-width: 768px){.cd-site-logo{width:140px}}.menu--main button[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red--dark)}.cd-nav__btn[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red--dark)}.cd-nav__btn[aria-expanded=true]::before{background:var(--cd-reliefweb-brand-red--dark)}@media(max-width: 1023px){.cd-site-header__nav-holder .cd-nav>ul>li>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>button.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>button.is-active::before{background:rgba(var(--cd-reliefweb-brand-red--dark), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-brand-red--dark), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-brand-red--dark), 0.6)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}}@media(min-width: 1024px){.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail button::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a:focus::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button:focus::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul a.is-active,.cd-site-header__nav-holder .cd-nav>.menu>li>ul button.is-active{border-left:3px solid var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul>li.menu-item--active-trail .is-active{border-left:3px solid var(--cd-reliefweb-brand-red--dark)}}.cd-ocha-dropdown__link a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-search__btn{color:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn svg{fill:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn:hover,.cd-search__btn:focus{color:#04415a}.cd-search__btn:hover svg,.cd-search__btn:focus svg{fill:#04415a}.cd-search__btn:focus{color:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn:focus svg{fill:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn[aria-expanded=true]{color:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn[aria-expanded=true] svg{fill:var(--cd-reliefweb-brand-red--dark)}.cd-search__submit:focus{background-color:var(--cd-reliefweb-brand-red--dark)}.cd-user-menu--no-language-switcher li:last-child a,.cd-user-menu--no-language-switcher li:last-child button{padding-right:0}.cd-user-menu--no-language-switcher li:last-child a::after,.cd-user-menu--no-language-switcher li:last-child button::after{content:none}.cd-user-menu__item:focus,.cd-global-header .menu>li a:focus,.cd-global-header .menu>li button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button{padding-right:0}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a::after,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button::after{content:none}@media(max-width: 767px){.cd-global-header__user-menu a svg+span{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}[dir=ltr] .admin-menu__btn svg+span{margin-left:10px}[dir=rtl] .admin-menu__btn svg+span{margin-right:10px}.admin-menu__btn .cd-icon:not(.cd-icon--arrow-down){display:inline-block;width:14px;height:14px;vertical-align:middle;fill:var(--cd-white)}.cd-footer{background:var(--cd-reliefweb-brand-blue--dark)}.cd-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-footer-copyright{display:block;margin-top:0;text-align:right;color:#fff;font-size:12px;font-weight:lighter}.cd-footer-copyright p{margin:0}.cd-footer-copyright a{display:inline-block;overflow:hidden;width:140px;height:60px;margin:0 0 -4px 0;padding:0 0 0 140px;background:url(../img/logos/rw-logo-sprite.png) 0 -60px no-repeat;background:rgba(0,0,0,0) url(../img/logos/rw-logo-sprite.svg) 0 -60px no-repeat}.cd-footer-copyright a:hover,.cd-footer-copyright a:active,.cd-footer-copyright a:focus{opacity:.8}@media all and (max-width: 1023px){.cd-footer-copyright{width:100%;text-align:center}}.cd-soft-footer{background:rgba(var(--cd-rgb-ocha-blue), 0.9)}.cd-soft-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}a{color:var(--cd-reliefweb-brand-blue--dark)}a:hover,a:focus{color:var(--cd-reliefweb-brand-blue--dark)}h1,h2{margin:0 0 24px 0;letter-spacing:.5px;font-size:24px;font-weight:bold;line-height:1.3}@media screen and (min-width: 480px){h1,h2{font-size:var(--cd-font-size--2xbase)}}h3{margin:0 0 16px 0;letter-spacing:.5px;font-size:20px;font-weight:bold;line-height:1.3}h4{margin:0 0 16px 0;letter-spacing:.5px;font-size:18px;font-weight:bold;line-height:1.3}h5{margin:0 0 16px 0;letter-spacing:.5px;font-size:17px;font-weight:bold;font-style:italic}h6{margin:0 0 16px 0;letter-spacing:.5px;font-size:16px;font-weight:bold}.rw-article__content *+h3,.rw-article__content *+h4,.rw-article__content *+h5,.rw-article__content *+h6{margin-top:16px}@media all and (max-width: 479px){#main h2{font-size:24px}}p{margin:1rem 0;line-height:1.6}p:first-child{margin-top:0}p:last-child{margin-bottom:0}input[type=search]{-moz-appearance:none;-webkit-appearance:none;appearance:none}input::-webkit-search-decoration{-webkit-appearance:none}input:-ms-input-placeholder{opacity:.7;color:inherit;font-style:italic}input::-moz-placeholder{opacity:.7;color:inherit;font-style:italic}input::placeholder{opacity:.7;color:inherit;font-style:italic}select{max-width:100%}select:not([multitple]){-moz-appearance:menulist-button;-webkit-appearance:menulist-button}fieldset{min-inline-size:auto}table{width:100%;border-collapse:collapse}table caption{margin:12px 0;font-weight:bold}table th,table td{padding:8px;border:1px solid var(--cd-reliefweb-brand-grey--light)}table th{border-left-color:#fff;background:var(--cd-reliefweb-brand-grey--light)}table thead th{border-left-color:#fff}th.field-label>h4.label{margin:0}table thead th:first-child{border-left-color:var(--cd-reliefweb-brand-grey--light)}table tbody th{border-top-color:#fff}table tbody th:first-child{border-top-color:var(--cd-reliefweb-brand-grey--light)}code{padding:2px;background:var(--cd-reliefweb-brand-grey--light);font-family:monospace}
diff --git a/html/themes/custom/common_design_subtheme/sass/base/_typography.scss b/html/themes/custom/common_design_subtheme/sass/base/_typography.scss
index c7dc13f72..03ebf90d6 100644
--- a/html/themes/custom/common_design_subtheme/sass/base/_typography.scss
+++ b/html/themes/custom/common_design_subtheme/sass/base/_typography.scss
@@ -175,3 +175,9 @@ table tbody th {
 table tbody th:first-child {
   border-top-color: $cd-reliefweb-brand-grey--light;
 }
+
+code {
+  padding: 2px;
+  background: $cd-reliefweb-brand-grey--light;
+  font-family: monospace;
+}

From 948e47858cdcf62dda3c72c786d1a5e971636c4a Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 25 Nov 2021 13:55:13 +0900
Subject: [PATCH 152/720] [RW-174] Remove unused template

---
 .../reliefweb_user_posts.module               | 28 -------------------
 .../reliefweb-user-posts-page.html.twig       | 20 -------------
 2 files changed, 48 deletions(-)
 delete mode 100644 html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.module
 delete mode 100644 html/modules/custom/reliefweb_user_posts/templates/reliefweb-user-posts-page.html.twig

diff --git a/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.module b/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.module
deleted file mode 100644
index 8ddd2c4fc..000000000
--- a/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.module
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * @file
- * Theme declaration etc. for the reliefweb_user_posts module.
- */
-
-/**
- * Implements hook_theme().
- */
-function reliefweb_user_posts_theme() {
-  $themes = [
-    'reliefweb_user_posts_page' => [
-      'variables' => [
-        // Entity list filters.
-        'filters' => NULL,
-        // Attributes for the filters.
-        'filters_attributes' => NULL,
-        // List of entities. @see reliefweb_moderation_table below.
-        'list' => NULL,
-        // Attributes for the list.
-        'list_attributes' => NULL,
-      ],
-    ],
-  ];
-
-  return $themes;
-}
diff --git a/html/modules/custom/reliefweb_user_posts/templates/reliefweb-user-posts-page.html.twig b/html/modules/custom/reliefweb_user_posts/templates/reliefweb-user-posts-page.html.twig
deleted file mode 100644
index 5d968a22a..000000000
--- a/html/modules/custom/reliefweb_user_posts/templates/reliefweb-user-posts-page.html.twig
+++ /dev/null
@@ -1,20 +0,0 @@
-{#
-
-/**
- * @file
- * Template for the content moderation pages.
- */
-
-#}
-
-{{ attach_library('reliefweb_moderation/moderation') }}
-
-<section{{ filters_attributes.addClass('rw-moderation-filters') }}>
-  <h2 class="visually-hidden">{{ 'Filters'|t }}</h2>
-  {{ filters }}
-</section>
-
-<section{{ list_attributes.addClass('rw-moderation-list') }}>
-  <h2 class="visually-hidden">{{ 'List'|t }}</h2>
-  {{ list }}
-</section>

From 9f90b485c26c46088ff851202a545a7a3b3baf4f Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 25 Nov 2021 13:57:28 +0900
Subject: [PATCH 153/720] [RW-174] Add autocomplete route and custom access

---
 .../reliefweb_user_posts.routing.yml          | 22 ++++++++++++++--
 .../src/Controller/UserPostsPage.php          | 26 +++++++++++++++++--
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.routing.yml b/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.routing.yml
index 8fdd9a020..f8d4eeb2d 100644
--- a/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.routing.yml
+++ b/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.routing.yml
@@ -1,5 +1,4 @@
 reliefweb_user_posts.content:
-  # The parameter is the entity bundle associated to a moderation service.
   path: '/user/{user}/posts'
   defaults:
     _controller: '\Drupal\reliefweb_user_posts\Controller\UserPostsPage::getContent'
@@ -14,5 +13,24 @@ reliefweb_user_posts.content:
         type: reliefweb_moderation_service
   requirements:
     _user_is_logged_in: 'TRUE'
-    _permission: view other user posts
+    _custom_access: '\Drupal\reliefweb_user_posts\Controller\UserPostsPage::checkAccess'
     user: \d+
+
+reliefweb_user_posts.autocomplete:
+  path: '/user/{user}/posts/autocomplete/{filter}'
+  defaults:
+    _controller: '\Drupal\reliefweb_user_posts\Controller\UserPostsPage::autocomplete'
+    _title_callback: '\Drupal\reliefweb_user_posts\Controller\UserPostsPage::getPageTitle'
+    service: 'user_posts'
+  options:
+    _admin_route: TRUE
+    parameters:
+      user:
+        type: entity:user
+      service:
+        type: reliefweb_moderation_service
+  requirements:
+    _user_is_logged_in: 'TRUE'
+    _custom_access: '\Drupal\reliefweb_user_posts\Controller\UserPostsPage::checkAccess'
+    user: \d+
+    filter: "[a-z0-9_]+"
diff --git a/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php b/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php
index b311b75f0..dd9f64790 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php
@@ -3,8 +3,10 @@
 namespace Drupal\reliefweb_user_posts\Controller;
 
 use Drupal\reliefweb_moderation\Controller\ModerationPage;
+use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Form\FormBuilderInterface;
 use Drupal\Core\Form\FormState;
+use Drupal\Core\Session\AccountInterface;
 use Drupal\reliefweb_moderation\ModerationServiceInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -75,7 +77,7 @@ public function getContent(UserInterface $user, ModerationServiceInterface $serv
     // We want the editors to be able to bookmark a moderation page with
     // a selection of filters so we set the method as GET.
     $form_state = new FormState();
-    $form_state->addBuildInfo('args', [$service]);
+    $form_state->addBuildInfo('args', [$service, $user]);
     $form_state->setMethod('GET');
     $form_state->setProgrammed(TRUE);
     $form_state->setProcessInput(TRUE);
@@ -134,13 +136,33 @@ public function getContent(UserInterface $user, ModerationServiceInterface $serv
    *   Moderation service.
    * @param string $filter
    *   Filter name.
+   * @param \Drupal\user\UserInterface|null $user
+   *   User account for the user posts page.
    *
    * @return \Symfony\Component\HttpFoundation\JsonResponse
    *   JSON response with the list of suggestions if any.
    */
-  public function autocomplete(ModerationServiceInterface $service, $filter) {
+  public function autocomplete(ModerationServiceInterface $service, $filter, UserInterface $user = NULL) {
     $suggestions = $service->getAutocompleteSuggestions($filter);
     return new JsonResponse($suggestions);
   }
 
+  /**
+   * Check the access to the page.
+   *
+   * @param \Drupal\Core\Session\AccountInterface $account
+   *   User account to check access for.
+   * @param \Drupal\user\UserInterface $user
+   *   User account for the user posts page.
+   *
+   * @return \Drupal\Core\Access\AccessResultInterface
+   *   The access result.
+   */
+  public function checkAccess(AccountInterface $account, UserInterface $user) {
+    if ($account->id() == $user->id()) {
+      return AccessResult::allowedIf($account->hasPermission('view own posts'));
+    }
+    return AccessResult::allowedIf($account->hasPermission('view other user posts'));
+  }
+
 }

From 377290f1b2899e1462dcbd48872bfccc310c47f7 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 25 Nov 2021 13:59:23 +0900
Subject: [PATCH 154/720] [RW-174] Make changing the autocomplete URL on
 moderation forms easier

---
 .../reliefweb_moderation/js/moderation.js     |  2 +-
 .../src/Form/ModerationPageFilterForm.php     | 29 +++++++++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/html/modules/custom/reliefweb_moderation/js/moderation.js b/html/modules/custom/reliefweb_moderation/js/moderation.js
index a278c9fba..526551562 100644
--- a/html/modules/custom/reliefweb_moderation/js/moderation.js
+++ b/html/modules/custom/reliefweb_moderation/js/moderation.js
@@ -276,7 +276,7 @@
        * Create the autocomplete widget.
        */
       function createAutocompletWidget(omnibox, select, selection) {
-        var url = '/moderation/content/' + omnibox.getAttribute('data-bundle') + '/autocomplete/';
+        var url = omnibox.getAttribute('data-autocomplete-url');
         var removeDiacritics = SimpleAutocomplete.removeDiacritics;
 
         var parent = omnibox.parentNode;
diff --git a/html/modules/custom/reliefweb_moderation/src/Form/ModerationPageFilterForm.php b/html/modules/custom/reliefweb_moderation/src/Form/ModerationPageFilterForm.php
index bec3b3344..8eba9fc9d 100644
--- a/html/modules/custom/reliefweb_moderation/src/Form/ModerationPageFilterForm.php
+++ b/html/modules/custom/reliefweb_moderation/src/Form/ModerationPageFilterForm.php
@@ -36,8 +36,9 @@ public function buildForm(array $form, FormStateInterface $form_state, Moderatio
     $form['filters'] = [
       '#type' => 'fieldset',
       '#title' => $this->t('Filters'),
+      '#title_display' => 'invisible',
       '#attributes' => [
-        'class' => ['rw-moderation-filters'],
+        'class' => ['rw-moderation-filters__content'],
       ],
       '#tree' => TRUE,
     ];
@@ -85,6 +86,11 @@ public function buildForm(array $form, FormStateInterface $form_state, Moderatio
                 '#parents' => ['omnibox'],
                 '#weight' => 2,
                 '#optional' => FALSE,
+                '#attributes' => [
+                  'class' => [
+                    'rw-moderation-filter-omnibox',
+                  ],
+                ],
               ];
               $form['filters']['omnibox']['select'] = [
                 '#type' => 'select',
@@ -96,7 +102,7 @@ public function buildForm(array $form, FormStateInterface $form_state, Moderatio
                 '#type' => 'textfield',
                 '#attributes' => [
                   'autocomplete' => 'off',
-                  'data-bundle' => $service->getBundle(),
+                  'data-autocomplete-url' => $this->getAutocompleteUrl($form_state, $service),
                 ],
                 // @todo review if that shouldn't be added by the autocomplete
                 // instead or even if that's necessary at all.
@@ -281,4 +287,23 @@ public function resetForm(array $form, FormStateInterface $form_state) {
     $form_state->setRedirect('<current>');
   }
 
+  /**
+   * Get the autocomplete URL for the omnibox.
+   *
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   Form state.
+   * @param \Drupal\reliefweb_moderation\ModerationServiceInterface $service
+   *   The moderation service associated with this form.
+   *
+   * @return string
+   *   Autocomplete URL.
+   */
+  protected function getAutocompleteUrl(FormStateInterface $form_state, ModerationServiceInterface $service) {
+    $bundle = $service->getBundle();
+    if (is_array($bundle)) {
+      $bundle = reset($bundle);
+    }
+    return '/moderation/content/' . $bundle . '/autocomplete/';
+  }
+
 }

From 78d1db9c4804330b06b88535d6212cc401245e4d Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 25 Nov 2021 14:00:31 +0900
Subject: [PATCH 155/720] [RW-174] Update user posts page filter form

---
 .../src/Form/UserPostsPageFilterForm.php      | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/html/modules/custom/reliefweb_user_posts/src/Form/UserPostsPageFilterForm.php b/html/modules/custom/reliefweb_user_posts/src/Form/UserPostsPageFilterForm.php
index 93f3e7945..1b69eba75 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Form/UserPostsPageFilterForm.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Form/UserPostsPageFilterForm.php
@@ -7,6 +7,7 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
 use Drupal\reliefweb_moderation\ModerationServiceInterface;
+use Drupal\user\UserInterface;
 
 /**
  * Content moderation page filter form handler.
@@ -23,7 +24,7 @@ public function getFormId() {
   /**
    * {@inheritdoc}
    */
-  public function buildForm(array $form, FormStateInterface $form_state, ModerationServiceInterface $service = NULL) {
+  public function buildForm(array $form, FormStateInterface $form_state, ModerationServiceInterface $service = NULL, UserInterface $user = NULL) {
     $form = parent::buildForm($form, $form_state, $service);
 
     // Link to create a new entity.
@@ -44,11 +45,6 @@ public function buildForm(array $form, FormStateInterface $form_state, Moderatio
       '#markup' => new FormattableMarkup('<div class="rw-moderation-intro">' . $links . '</div>', []),
     ];
 
-    // Fix data bundle.
-    if (isset($form['filters']['omnibox']['input']['#attributes']['data-bundle'])) {
-      $form['filters']['omnibox']['input']['#attributes']['data-bundle'] = 'user_posts';
-    }
-
     // Add the filter labels to the properties.
     $definitions = $service->getFilterDefinitions();
     foreach ($definitions as $name => $filter) {
@@ -56,9 +52,15 @@ public function buildForm(array $form, FormStateInterface $form_state, Moderatio
         $form['filters']['other'][$name]['#title'] = $filter['label'];
       }
     }
-    // Hide the properties label.
+    // Hide the properties label and move the other filter to the top.
     if (isset($form['filters']['other'])) {
       $form['filters']['other']['#title_display'] = 'invisible';
+      $form['filters']['other']['#weight'] = -1;
+    }
+
+    // Change the omnibox label.
+    if (isset($form['filters']['omnibox'])) {
+      $form['filters']['omnibox']['#title'] = $this->t('Filter');
     }
 
     // Make js work.
@@ -67,4 +69,15 @@ public function buildForm(array $form, FormStateInterface $form_state, Moderatio
     return $form;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function getAutocompleteUrl(FormStateInterface $form_state, ModerationServiceInterface $service) {
+    $build_info = $form_state->getBuildInfo();
+    if (isset($build_info['args'][1]) && $build_info['args'][1] instanceof UserInterface) {
+      return '/user/' . $build_info['args'][1]->id() . '/posts/autocomplete/';
+    }
+    return '/moderation/content/user_posts/autocomplete/';
+  }
+
 }

From ec9bdcb52d8d68b4e3616f64921186aacb3496de Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 25 Nov 2021 14:45:22 +0900
Subject: [PATCH 156/720] [RW-174] Fix query and poster/deadline filtering for
 the user posts

---
 .../src/Services/UserPostsService.php         | 286 ++++++++++++++----
 1 file changed, 229 insertions(+), 57 deletions(-)

diff --git a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
index 1d7956b77..8443c43b0 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
@@ -4,6 +4,7 @@
 
 use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Core\Database\Connection;
+use Drupal\Core\Database\Query\Condition;
 use Drupal\Core\Database\Query\Select;
 use Drupal\Core\Datetime\DateFormatterInterface;
 use Drupal\Core\Entity\EntityFieldManagerInterface;
@@ -177,8 +178,7 @@ public function getRows(array $results) {
     }
 
     // Retrieve the user for this page.
-    $user = $this->routeMatch->getParameter('user');
-    $user_id = !empty($user) ? $user->id() : NULL;
+    $user_id = $this->getUserId();
 
     /** @var \Drupal\reliefweb_moderation\EntityModeratedInterface[] $entities */
     $entities = $results['entities'];
@@ -248,7 +248,6 @@ protected function initFilterDefinitions(array $filters = []) {
       'status',
       'created',
       'source',
-      'author',
     ]);
 
     // Filter by node id.
@@ -268,6 +267,7 @@ protected function initFilterDefinitions(array $filters = []) {
       'label' => $this->t('Type'),
       'shortcut' => 'ty',
       'form' => 'other',
+      'operator' => 'OR',
       'values' => [
         'job' => $this->t('Job'),
         'training' => $this->t('Training'),
@@ -289,6 +289,7 @@ protected function initFilterDefinitions(array $filters = []) {
       'operator' => 'AND',
     ];
 
+    // Filter the author of the nodes.
     $definitions['poster'] = [
       'type' => 'property',
       'field' => 'uid',
@@ -300,8 +301,9 @@ protected function initFilterDefinitions(array $filters = []) {
         'me' => $this->t('Me'),
         'other' => $this->t('Other'),
       ],
+      // This is handled in ::filterQuery().
       'join_callback' => '',
-      'condition_callback' => 'conditionPoster',
+      'condition_callback' => '',
     ];
 
     return $definitions;
@@ -327,6 +329,11 @@ protected function initFilterDefinitions(array $filters = []) {
    *   and optional abbreviation (abbr).
    */
   protected function getSourcesTheUserHasPostedFor($filter, $term, $conditions, array $replacements) {
+    $user = $this->getUser();
+    if (empty($user)) {
+      return [];
+    }
+
     $all_sources = parent::getTaxonomyTermAutocompleteSuggestions($filter, $term, $conditions, $replacements);
 
     // Filter sources.
@@ -335,15 +342,18 @@ protected function getSourcesTheUserHasPostedFor($filter, $term, $conditions, ar
       $sources[] = $source->value;
     }
 
-    $rights = UserPostingRightsHelper::getUserPostingRights($this->currentUser, $sources);
+    $rights = UserPostingRightsHelper::getUserPostingRights($user, $sources);
+
+    // For editors, we allow returning sources that are blocked for the user.
+    $min_right = $this->currentUser->hasPermission('edit any job content') ? 0 : 1;
 
     $allowed_sources = [];
     foreach ($all_sources as $source) {
       if (isset($rights[$source->value])) {
-        if (isset($rights[$source->value]['job']) && $rights[$source->value]['job'] > 1) {
+        if (isset($rights[$source->value]['job']) && $rights[$source->value]['job'] > $min_right) {
           $allowed_sources[] = $source;
         }
-        elseif (isset($rights[$source->value]['training']) && $rights[$source->value]['training'] > 1) {
+        elseif (isset($rights[$source->value]['training']) && $rights[$source->value]['training'] > $min_right) {
           $allowed_sources[] = $source;
         }
       }
@@ -353,82 +363,223 @@ protected function getSourcesTheUserHasPostedFor($filter, $term, $conditions, ar
   }
 
   /**
-   * Poster join.
+   * Deadline join callback.
+   *
+   * @see ::joinField()
    */
-  protected function joinPoster(Select $query) {
-    // Join to current user.
-    $conditions = $query->orConditionGroup();
-    $conditions->condition('node_field_data.uid', $this->currentUser->id());
+  protected function joinDeadline(Select $query, array $definition, $entity_type_id, $entity_base_table, $entity_id_field, $or = FALSE, $values = []) {
+    $table_job = $this->getFieldTableName('node', 'field_job_closing_date');
+    $field_name_job = $this->getFieldColumnName('node', 'field_job_closing_date', 'value');
 
-    // Join sources.
-    $rights = UserPostingRightsHelper::getUserPostingRights($this->currentUser, []);
+    $table_training = $this->getFieldTableName('node', 'field_registration_deadline');
+    $field_name_training = $this->getFieldColumnName('node', 'field_registration_deadline', 'value');
 
-    $allowed_sources = [];
-    foreach ($rights as $right) {
-      if (isset($right['job']) && $right['job'] > 1) {
-        $allowed_sources[$right['tid']] = $right;
-      }
-      elseif (isset($right['training']) && $right['training'] > 1) {
-        $allowed_sources[$right['tid']] = $right;
-      }
-    }
+    // Join the job and training deadline tables.
+    $table_alias_job = $query->leftJoin($table_job, $table_job, "%alias.entity_id = {$entity_base_table}.{$entity_id_field}");
+    $table_alias_training = $query->leftJoin($table_training, $table_training, "%alias.entity_id = {$entity_base_table}.{$entity_id_field}");
 
-    // Join the source field table.
-    $join_table = $this->getFieldTableName('node', 'field_source');
-    $query->leftJoin($join_table, 'user_sources', "user_sources.entity_id = node_field_data.nid");
+    // Expression to get the deadline value.
+    $expression = "COALESCE({$table_alias_job}.{$field_name_job}, {$table_alias_training}.{$field_name_training})";
 
-    $conditions->condition('user_sources.field_source_target_id', array_keys($allowed_sources), 'IN');
+    // Add deadline field.
+    $query->addExpression($expression, 'deadline');
 
-    $query->condition($conditions);
+    // We have to return the expression instead of its alias for the condition
+    // in ::conditionDeadline() to work.
+    return $expression;
   }
 
   /**
-   * Poster condition.
+   * Condition callback for the deadline.
+   *
+   * @see \Drupal\reliefweb_moderation\ModerationServiceBase::addFilterCondition()
    */
-  protected function conditionPoster($definition, $base, $fields, $value, $operator) {
-    if ($value === 'me') {
-      $base->where("node_field_data.uid = {$this->currentUser->id()}");
+  protected function conditionDeadline(array $definition, Condition $condition, $fields, $value, $operator) {
+    if (!is_array($value)) {
+      if ($operator === '>=') {
+        $start = intval($value);
+        $end = NULL;
+      }
+      else {
+        $start = NULL;
+        $end = intval($value);
+      }
+    }
+    else {
+      $start = isset($value[0]) ? intval($value[0]) : NULL;
+      $end = isset($value[1]) ? intval($value[1]) : NULL;
+    }
+
+    // Should not happen.
+    if (empty($start) && empty($end)) {
+      return;
+    }
+    // The $fields variable is the expression from ::joinDeadline() so we
+    // need to use Condition::where() to add the condition to avoid Drupal
+    // from stripping characters from the expression.
+    elseif (empty($start)) {
+      $end += 86399;
+      $condition->where("UNIX_TIMESTAMP({$fields}) <= {$end}");
+    }
+    elseif (empty($end)) {
+      $condition->where("UNIX_TIMESTAMP({$fields}) >= {$start}");
     }
-    elseif ($value === 'other') {
-      $base->where("node_field_data.uid <> {$this->currentUser->id()}");
+    else {
+      $end += 86399;
+      $condition->where("UNIX_TIMESTAMP({$fields}) BETWEEN {$start} AND {$end}");
     }
   }
 
   /**
-   * Deadline join callback.
-   *
-   * @see ::joinField()
+   * {@inheritdoc}
    */
-  protected function joinDeadline(Select $query, array $definition, $entity_type_id, $entity_base_table, $entity_id_field, $or = FALSE, $values = []) {
-    $table_job = $this->getFieldTableName('node', 'field_job_closing_date');
-    $field_name_job = $this->getFieldColumnName('node', 'field_job_closing_date', 'value');
+  protected function filterQuery(Select $query, array $filters = []) {
+    $user = $this->getUser();
+
+    // This should never happen, but just in case make sure we don't return
+    // any restults if there is no user.
+    if (empty($user)) {
+      $query->alwaysFalse();
+      return;
+    }
 
-    $table_training = $this->getFieldTableName('node', 'field_registration_deadline');
-    $field_name_training = $this->getFieldColumnName('node', 'field_registration_deadline', 'value');
+    // Extract the poster filter, we'll handle it below.
+    $filters['poster'] = array_filter($filters['poster'] ?? []);
+    $posted_by_me = empty($filters['poster']) || !empty($filters['poster']['me']);
+    $posted_by_other = empty($filters['poster']) || !empty($filters['poster']['other']);
+    unset($filters['poster']);
+
+    // Apply any other filtering.
+    parent::filterQuery($query, $filters);
+
+    // Retrieve any filtering on the bundles so that we can limit the conditions
+    // on the allowed and blocked sources.
+    $types = [];
+    $filters['bundle'] = array_filter($filters['bundle'] ?? []);
+    if (empty($filters['bundle']) || !empty($filters['bundle']['job'])) {
+      $types[] = 'job';
+    }
+    if (empty($filters['bundle']) || !empty($filters['bundle']['training'])) {
+      $types[] = 'training';
+    }
 
-    // Add joins.
-    $table_alias_job = $query->leftJoin($table_job, $table_job, "%alias.entity_id = {$entity_base_table}.{$entity_id_field}");
-    $table_alias_training = $query->leftJoin($table_training, $table_training, "%alias.entity_id = {$entity_base_table}.{$entity_id_field}");
+    // Get the user rights keyed by source ids and store the ones
+    // for which the user is allowed to post.
+    $allowed = [];
+    $blocked = [];
+    foreach (UserPostingRightsHelper::getUserPostingRights($user, []) as $tid => $rights) {
+      foreach ($types as $type) {
+        if (isset($rights[$type])) {
+          if ($rights[$type] > 1) {
+            $allowed[$type][$tid] = $tid;
+          }
+          elseif ($rights[$type] == 1) {
+            $blocked[$type][$tid] = $tid;
+          }
+        }
+      }
+    }
 
-    // Add deadline field.
-    $query->addExpression("COALESCE({$table_alias_job}.{$field_name_job}, {$table_alias_training}.{$field_name_training})", 'deadline');
-    return "COALESCE({$table_alias_job}.{$field_name_job}, {$table_alias_training}.{$field_name_training})";
-  }
+    // We cannot retrieve any content if the user is not allowed for any source
+    // and "other" is selected as filter so bail out.
+    if (!$posted_by_me && empty($allowed)) {
+      $query->alwaysFalse();
+      return;
+    }
 
-  /**
-   * Condition callback.
-   */
-  protected function conditionDeadline($definition, $base, $fields, $value, $operator) {
-    $base->where("UNIX_TIMESTAMP({$fields}) {$operator} {$value[0]} AND {$value[1]}");
+    $node_table = $this->getEntityTypeDataTable('node');
+    $node_id_field = $this->getEntityTypeIdField('node');
+    $source_table = $this->getFieldTableName('node', 'field_source');
+    $source_field = $this->getFieldColumnName('node', 'field_source', 'target_id');
+
+    // Retrieve the entity table (node) and the source field table if joined
+    // already.
+    $node_table_alias = '';
+    $source_table_alias = '';
+    foreach ($query->getTables() as $alias => $info) {
+      if (isset($info['table'])) {
+        if (empty($node_table_alias) && $info['table'] === $node_table) {
+          $node_table_alias = $alias;
+        }
+        elseif (empty($source_table_alias) && $info['table'] === $source_table) {
+          $source_table_alias = $alias;
+        }
+      }
+    }
+
+    // Join the node table if it was not already.
+    if (empty($node_table_alias)) {
+      // The base table alias for the query is the content moderation table.
+      $base_table_alias = $this->getQueryBaseTableAlias($query);
+      $node_table_alias = $query->innerJoin($node_table, $node_table, "%alias.{$node_id_field} = {$base_table_alias}.content_entity_id");
+    }
+
+    // Join the source table if it was not already.
+    if (empty($source_table_alias)) {
+      // Left join because to be able to retrieve posts without a source.
+      $source_table_alias = $query->leftJoin($source_table, $source_table, "%alias.entity_id = {$node_table}.{$node_id_field}");
+    }
+
+    if ($posted_by_me and !$posted_by_other) {
+      $query->condition($node_table_alias . '.uid', $user->id(), '=');
+    }
+    elseif ($posted_by_other and !$posted_by_me) {
+      $query->condition($node_table_alias . '.uid', $user->id(), '<>');
+    }
+
+    $poster_condition = NULL;
+
+    // Posted by me only.
+    if ($posted_by_me && !$posted_by_other) {
+      $query->condition($node_table_alias . '.uid', $user->id(), '=');
+    }
+    // Posted by me or other.
+    elseif ($posted_by_me && $posted_by_other) {
+      $poster_condition = $query->orConditionGroup();
+      $poster_condition->condition($node_table_alias . '.uid', $user->id(), '=');
+    }
+    // Poster by other.
+    else {
+      $poster_condition = $query->andConditionGroup();
+      $poster_condition->condition($node_table_alias . '.uid', $user->id(), '<>');
+    }
+
+    // Posts from the organizations the user is allowed to post for.
+    if (!empty($poster_condition)) {
+      $allowed_condition = $query->orConditionGroup();
+      foreach ($types as $type) {
+        if (!empty($allowed[$type])) {
+          // Ex: "(type = 'training' AND source_id IN (...))".
+          $condition = $query->andConditionGroup()
+            ->condition($source_table_alias . '.bundle', $type, '=')
+            ->condition($source_table_alias . '.' . $source_field, array_keys($allowed[$type]), 'IN');
+          $allowed_condition->condition($condition);
+        }
+      }
+      if ($allowed_condition->count() > 0) {
+        $poster_condition->condition($allowed_condition);
+      }
+      $query->condition($poster_condition);
+    }
+
+    // Filter out docs with sources the user is blocked for, except if the
+    // current user is an Editor so that the user can see all the posts.
+    if (!empty($blocked) && !$this->currentUser->hasPermission('edit any job content')) {
+      foreach ($types as $type) {
+        if (!empty($blocked[$type])) {
+          $condition = $query->andConditionGroup()
+            ->condition($source_table_alias . '.bundle', $type, '=')
+            ->condition($source_table_alias . '.' . $source_field, array_keys($allowed[$type]), 'IN');
+          $query->condition($query->conditionGroupFactory('AND NOT')->condition($condition));
+        }
+      }
+    }
   }
 
   /**
    * {@inheritdoc}
    */
   protected function wrapQuery(Select $query, $limit = 30) {
-    // Join poster.
-    $this->joinPoster($query);
-
     // Get the order information.
     $info = $this->getOrderInformation();
     $sort_direction = $info['sort'] ?? 'desc';
@@ -476,4 +627,25 @@ protected function wrapQuery(Select $query, $limit = 30) {
     return $wrapper;
   }
 
+  /**
+   * Get the user ID for this my posts page.
+   *
+   * @return int|null
+   *   User ID or NULL if the user couldn't be retrieved.
+   */
+  protected function getUserId() {
+    $user = $this->getUser();
+    return !empty($user) ? $user->id() : NULL;
+  }
+
+  /**
+   * Get the user entity for this my posts page.
+   *
+   * @return \Drupal\Core\Session\AccountInterface|null
+   *   User entity or NULL if the user couldn't be retrieved.
+   */
+  protected function getUser() {
+    return $this->routeMatch->getParameter('user');
+  }
+
 }

From 4555286f80c2834ddf66dde3a5013090fc2027b1 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 25 Nov 2021 14:47:06 +0900
Subject: [PATCH 157/720] [RW-174] Adjust styling of user posts page

---
 .../rw-moderation/rw-moderation.css           | 58 +++++++++++--------
 ...fweb-moderation-page--user-posts.html.twig |  4 +-
 2 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
index 2b33d1881..d3045568b 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
@@ -7,24 +7,11 @@
 .rw-moderation-content-filters {
   padding: 24px 0 0 0;
 }
-/* Hide visually the filters title to reduce scrolling. */
-.rw-moderation-filters > legend {
-  position: absolute;
-  overflow: hidden;
-  clip: rect(0, 0, 0, 0);
-  width: 1px;
-  height: 1px;
-  margin: -1px;
-  padding: 0;
-  white-space: nowrap;
-  border: none;
-  clip-path: inset(100%);
-}
-.rw-moderation-filters #edit-filters {
+.rw-moderation-filters .rw-moderation-filters__content {
   padding-bottom: 0;
   border-bottom: none;
 }
-.rw-moderation-filters #edit-filters-status [class*="form-item-filters-status-"] {
+.rw-moderation-filters .rw-moderation-filter-status [class*="form-item-filters-status-"] {
   width: 100%;
   margin-bottom: 12px;
   padding: 2px 8px;
@@ -32,42 +19,44 @@
   text-transform: none;
   border-left-width: 8px;
   border-left-style: solid;
-  background: none;
   font-size: 16px;
   line-height: 16px;
 }
-.rw-moderation-filters #edit-filters-status.form-checkboxes {
+.rw-moderation-filters:not(.rw-moderation-filters--user-posts) .rw-moderation-filter-status [class*="form-item-filters-status-"] {
+  background: none;
+}
+.rw-moderation-filters .rw-moderation-filter-status .form-checkboxes {
   display: grid;
   grid-template-columns: repeat(auto-fill, minmax(140px, 1fr));
   grid-gap: 0 24px;
   margin-bottom: -12px;
 }
-.path-moderation-content-disaster .rw-moderation-filters #edit-filters-status .form-checkboxes {
+.path-moderation-content-disaster .rw-moderation-filters .rw-moderation-filter-status .form-checkboxes {
   grid-template-columns: repeat(auto-fill, minmax(170px, 1fr));
 }
-.rw-moderation-filters #edit-filters-other .fieldset-wrapper > * {
+.rw-moderation-filters .rw-moderation-filter-other .fieldset-wrapper > * {
   display: inline-block;
   margin-top: 0;
   vertical-align: middle;
 }
-.rw-moderation-filters #edit-omnibox .fieldset-wrapper {
+.rw-moderation-filters .rw-moderation-filter-omnibox .fieldset-wrapper {
   display: table;
 }
-.rw-moderation-filters #edit-omnibox .fieldset-wrapper > * {
+.rw-moderation-filters .rw-moderation-filter-omnibox .fieldset-wrapper > * {
   display: table-cell;
   height: 32px;
   margin: 0;
   padding: 0;
   vertical-align: middle;
 }
-.rw-moderation-filters #edit-omnibox .fieldset-wrapper > :first-child {
+.rw-moderation-filters .rw-moderation-filter-omnibox .fieldset-wrapper > :first-child {
   padding-right: 8px;
 }
-.rw-moderation-filters #edit-omnibox .fieldset-wrapper select {
+.rw-moderation-filters .rw-moderation-filter-omnibox .fieldset-wrapper select {
   width: auto;
   /* height: 100%; */
 }
-.rw-moderation-filters #edit-omnibox div[data-autocomplete] > input {
+.rw-moderation-filters .rw-moderation-filter-omnibox div[data-autocomplete] > input {
   border-right: 2px solid var(--cd-reliefweb-brand-grey--light);
 }
 .rw-moderation-filters [data-selection] > span span + span {
@@ -209,11 +198,32 @@
   border-top: none;
 }
 
+.rw-moderation-filters--user-posts .rw-moderation-intro {
+  padding-bottom: 24px;
+  text-align: center;
+  border-bottom: 1px solid var(--cd-reliefweb-brand-grey--light);
+}
+
+/* Display "other" filters on separate lines. */
+.rw-moderation-filters--user-posts .rw-moderation-filter-other .fieldset-wrapper > fieldset + fieldset {
+  display: block;
+  margin-top: 24px;
+}
 /* User posts type column */
 .rw-moderation-list--user-posts .rw-moderation-table tr td:nth-child(2) {
   width: auto;
   word-break: unset;
 }
+/* User posts source list */
+.rw-moderation-list--user-posts .rw-moderation-table ul {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+}
+/* User posts status column */
+.rw-moderation-list--user-posts td .rw-moderation-status[data-moderation-status] {
+  margin: 0;
+}
 /* User posts posted and deadline date columns */
 .rw-moderation-list--user-posts .rw-moderation-table .rw-moderation-table__cell__date,
 .rw-moderation-list--user-posts .rw-moderation-table tr td:last-child {
diff --git a/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_moderation/reliefweb-moderation-page--user-posts.html.twig b/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_moderation/reliefweb-moderation-page--user-posts.html.twig
index 481a877b8..c0eebe7d4 100644
--- a/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_moderation/reliefweb-moderation-page--user-posts.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_moderation/reliefweb-moderation-page--user-posts.html.twig
@@ -10,12 +10,12 @@
 {{ attach_library('reliefweb_moderation/moderation') }}
 {{ attach_library('common_design_subtheme/rw-moderation') }}
 
-<section{{ filters_attributes.addClass('rw-moderation-filters') }}>
+<section{{ filters_attributes.addClass('rw-moderation-filters', 'rw-moderation-filters--user-posts') }}>
   <h2 class="visually-hidden">{{ 'Filters'|t }}</h2>
   {{ filters }}
 </section>
 
-<section{{ list_attributes.addClass('rw-moderation-list rw-moderation-list--user-posts') }}>
+<section{{ list_attributes.addClass('rw-moderation-list', 'rw-moderation-list--user-posts') }}>
   <h2 class="visually-hidden">{{ 'List'|t }}</h2>
   {{ list }}
 </section>

From 511c0fbdfe4594ebb45dabb1a5e6249a2856b8a3 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 25 Nov 2021 14:49:21 +0900
Subject: [PATCH 158/720] [RW-174] Add permssions to authenticated users and
 editors

---
 config/user.role.authenticated.yml | 1 +
 config/user.role.editor.yml        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/config/user.role.authenticated.yml b/config/user.role.authenticated.yml
index 9278ea964..32239e646 100644
--- a/config/user.role.authenticated.yml
+++ b/config/user.role.authenticated.yml
@@ -26,4 +26,5 @@ permissions:
   - 'use training transition pending'
   - 'use training transition published'
   - 'view media'
+  - 'view own posts'
   - 'view own unpublished content'
diff --git a/config/user.role.editor.yml b/config/user.role.editor.yml
index 0942fd9b9..fc3ce2e87 100644
--- a/config/user.role.editor.yml
+++ b/config/user.role.editor.yml
@@ -165,6 +165,7 @@ permissions:
   - 'view entity history'
   - 'view job revisions'
   - 'view latest version'
+  - 'view other user posts'
   - 'view own unpublished content'
   - 'view own unpublished media'
   - 'view report revisions'

From 199115d560a7972691b1e1ae50f40ce5085601b7 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 25 Nov 2021 16:25:30 +0900
Subject: [PATCH 159/720] [RW-169] Add code to generate the disaster map token
 help

---
 .../src/Services/TopicFormAlter.php           | 55 ++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_entities/src/Services/TopicFormAlter.php b/html/modules/custom/reliefweb_entities/src/Services/TopicFormAlter.php
index fc1a389f8..20b49f864 100644
--- a/html/modules/custom/reliefweb_entities/src/Services/TopicFormAlter.php
+++ b/html/modules/custom/reliefweb_entities/src/Services/TopicFormAlter.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\reliefweb_entities\Services;
 
+use Drupal\Component\render\FormattableMarkup;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\reliefweb_entities\EntityFormAlterServiceBase;
 
@@ -14,7 +15,59 @@ class TopicFormAlter extends EntityFormAlterServiceBase {
    * {@inheritdoc}
    */
   protected function addBundleFormAlterations(array &$form, FormStateInterface $form_state) {
-    // No customizations.
+    // Add the disaster map token help to the overview field.
+    $form['field_overview']['token-help'] = static::getDisasterMapTokenHelp();
+  }
+
+  /**
+   * Get the help to use the disaster map tokens.
+   *
+   * @return array
+   *   Render array with the token help.
+   */
+  protected static function getDisasterMapTokenHelp() {
+    $info = reliefweb_disaster_map_token_info();
+    if (!isset($info['types']['disaster-map']) || !isset($info['tokens']['disaster-map'])) {
+      return [];
+    }
+
+    $rows = [];
+    foreach ($info['tokens']['disaster-map'] as $token => $data) {
+      $rows[] = [
+        $data['name'] ?? $token,
+        '[disaster-map:' . $token . ']',
+        $data['description'] ?? '',
+      ];
+    }
+
+    $table = [
+      '#theme' => 'table',
+      '#header' => [
+        t('Name'),
+        t('Token'),
+        t('Description'),
+      ],
+      '#rows' => $rows,
+      '#attributes' => [
+        'class' => [
+          'rw-token-help__table',
+        ],
+      ],
+    ];
+
+    return [
+      '#type' => 'details',
+      '#title' => new FormattableMarkup('<strong>@label</strong><p>@description</p>', [
+        '@label' => t('Disaster map tokens'),
+        '@description' => $info['types']['disaster-map']['description'] ?? '',
+      ]),
+      '#attributes' => [
+        'class' => [
+          'rw-token-help',
+        ],
+      ],
+      'table' => $table,
+    ];
   }
 
 }

From 391a1670da8759506e23f94561c10f7b87d4cd12 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 25 Nov 2021 16:26:01 +0900
Subject: [PATCH 160/720] [RW-169] Update disaster map token help styling

---
 .../components/rw-token/rw-token.css          | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-token/rw-token.css b/html/themes/custom/common_design_subtheme/components/rw-token/rw-token.css
index 8bde74b4e..4e6753daf 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-token/rw-token.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-token/rw-token.css
@@ -3,28 +3,26 @@
  *
  * Information about tokens usable in a text input or textarea.
  */
-.token-help {
-  margin-top: 1rem;
+.rw-token-help {
   font-size: 14px;
 }
-.token-help .token-iframe {
-  padding: 8px;
-  border: 1px solid #e6ecef;
-  border-bottom: 0;
-  line-height: 1.5;
+.rw-token-help.form-wrapper {
+  margin-top: 8px;
 }
-.token-help summary {
+.rw-token-help summary {
   padding: 8px;
   border: 1px solid #e6ecef;
-  border-top: 0;
   line-height: 1.5;
 }
-.token-help summary strong {
+.rw-token-help[open] summary {
+  border-bottom: 0;
+}
+.rw-token-help summary strong {
   font-size: 16px;
 }
-.token-help summary p {
+.rw-token-help summary p {
   margin: 0;
 }
-.token-help table th {
+.rw-token-help table th {
   text-align: left;
 }

From c4d115e861399797194c408095f123c4a06accbc Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 25 Nov 2021 16:26:39 +0900
Subject: [PATCH 161/720] [RW-169] Remove hardcoded disaster map token help
 from template

---
 .../form/node-edit-form--topic.html.twig      | 140 ------------------
 1 file changed, 140 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/templates/form/node-edit-form--topic.html.twig b/html/themes/custom/common_design_subtheme/templates/form/node-edit-form--topic.html.twig
index 66920b14f..03414ebbb 100644
--- a/html/themes/custom/common_design_subtheme/templates/form/node-edit-form--topic.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/form/node-edit-form--topic.html.twig
@@ -56,146 +56,6 @@
 <fieldset id="overview">
   <legend>{% trans %}Overview{% endtrans %}</legend>
   {{ form.field_overview }}
-
-  {# Temp #}
-  <div class="token-help">
-    <div class="token-iframe">
-      <strong>Iframe syntax: </strong><code>[iframe:widthxheight "title"](link)</code> Ex: [iframe:1000x400 "Events map"](http://example.com/events-map/)
-    </div>
-    <details>
-      <summary>
-        <strong>Disaster type map</strong>
-        <p>Display maps of the latest disasters per type (can be combined, ex: [disaster-map:ST-SS])</p>
-      </summary>
-      <table class="token-tree">
-        <thead>
-        <tr>
-          <th>Name</th>
-          <th>Token</th>
-          <th>Description</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr id="token-disaster-map--CW">
-          <td>Cold Wave</td>
-          <td class="token-key">[disaster-map:CW]</td>
-          <td>Map of latest Cold Wave disasters</td>
-        </tr>
-        <tr id="token-disaster-map--CE">
-          <td>Complex Emergency</td>
-          <td class="token-key">[disaster-map:CE]</td>
-          <td>Map of latest Complex Emergency disasters</td>
-        </tr>
-        <tr id="token-disaster-map--ID">
-          <td>Disasters with IDs</td>
-          <td class="token-key">[disaster-map:ID]</td>
-          <td>Map of latest disasters with IDs (separated with a "-", ex: [disaster-map:123-456])</td>
-        </tr>
-        <tr id="token-disaster-map--DR">
-          <td>Drought</td>
-          <td class="token-key">[disaster-map:DR]</td>
-          <td>Map of latest Drought disasters</td>
-        </tr>
-        <tr id="token-disaster-map--EQ">
-          <td>Earthquake</td>
-          <td class="token-key">[disaster-map:EQ]</td>
-          <td>Map of latest Earthquake disasters</td>
-        </tr>
-        <tr id="token-disaster-map--EP">
-          <td>Epidemic</td>
-          <td class="token-key">[disaster-map:EP]</td>
-          <td>Map of latest Epidemic disasters</td>
-        </tr>
-        <tr id="token-disaster-map--EC">
-          <td>Extratropical Cyclone</td>
-          <td class="token-key">[disaster-map:EC]</td>
-          <td>Map of latest Extratropical Cyclone disasters</td>
-        </tr>
-        <tr id="token-disaster-map--FR">
-          <td>Fire</td>
-          <td class="token-key">[disaster-map:FR]</td>
-          <td>Map of latest Fire disasters</td>
-        </tr>
-        <tr id="token-disaster-map--FF">
-          <td>Flash Flood</td>
-          <td class="token-key">[disaster-map:FF]</td>
-          <td>Map of latest Flash Flood disasters</td>
-        </tr>
-        <tr id="token-disaster-map--FL">
-          <td>Flood</td>
-          <td class="token-key">[disaster-map:FL]</td>
-          <td>Map of latest Flood disasters</td>
-        </tr>
-        <tr id="token-disaster-map--HT">
-          <td>Heat Wave</td>
-          <td class="token-key">[disaster-map:HT]</td>
-          <td>Map of latest Heat Wave disasters</td>
-        </tr>
-        <tr id="token-disaster-map--IN">
-          <td>Insect Infestation</td>
-          <td class="token-key">[disaster-map:IN]</td>
-          <td>Map of latest Insect Infestation disasters</td>
-        </tr>
-        <tr id="token-disaster-map--LS">
-          <td>Land Slide</td>
-          <td class="token-key">[disaster-map:LS]</td>
-          <td>Map of latest Land Slide disasters</td>
-        </tr>
-        <tr id="token-disaster-map--MS">
-          <td>Mud Slide</td>
-          <td class="token-key">[disaster-map:MS]</td>
-          <td>Map of latest Mud Slide disasters</td>
-        </tr>
-        <tr id="token-disaster-map--OT">
-          <td>Other</td>
-          <td class="token-key">[disaster-map:OT]</td>
-          <td>Map of latest Other disasters</td>
-        </tr>
-        <tr id="token-disaster-map--ST">
-          <td>Severe Local Storm</td>
-          <td class="token-key">[disaster-map:ST]</td>
-          <td>Map of latest Severe Local Storm disasters</td>
-        </tr>
-        <tr id="token-disaster-map--AV">
-          <td>Snow Avalanche</td>
-          <td class="token-key">[disaster-map:AV]</td>
-          <td>Map of latest Snow Avalanche disasters</td>
-        </tr>
-        <tr id="token-disaster-map--SS">
-          <td>Storm Surge</td>
-          <td class="token-key">[disaster-map:SS]</td>
-          <td>Map of latest Storm Surge disasters</td>
-        </tr>
-        <tr id="token-disaster-map--AC">
-          <td>Technological Disaster</td>
-          <td class="token-key">[disaster-map:AC]</td>
-          <td>Map of latest Technological Disaster disasters</td>
-        </tr>
-        <tr id="token-disaster-map--TC">
-          <td>Tropical Cyclone</td>
-          <td class="token-key">[disaster-map:TC]</td>
-          <td>Map of latest Tropical Cyclone disasters</td>
-        </tr>
-        <tr id="token-disaster-map--TS">
-          <td>Tsunami</td>
-          <td class="token-key">[disaster-map:TS]</td>
-          <td>Map of latest Tsunami disasters</td>
-        </tr>
-        <tr id="token-disaster-map--VO">
-          <td>Volcano</td>
-          <td class="token-key">[disaster-map:VO]</td>
-          <td>Map of latest Volcano disasters</td>
-        </tr>
-        <tr id="token-disaster-map--WF">
-          <td>Wild Fire</td>
-          <td class="token-key">[disaster-map:WF]</td>
-          <td>Map of latest Wild Fire disasters</td>
-        </tr>
-        </tbody>
-      </table>
-    </details>
-  </div>
-
 </fieldset>
 
 <fieldset id="resources">

From 10e4056a536eb62e10f009b7c642a7ccd1b4e725 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Thu, 25 Nov 2021 08:59:40 +0100
Subject: [PATCH 162/720] Page template, search

---
 .../reliefweb-guidelines-search.js            | 172 ++++++++++++++++++
 .../reliefweb-guidelines.css                  |   5 +-
 .../reliefweb-guidelines.js                   | 117 ++++++++++++
 .../reliefweb_guidelines.libraries.yml        |   1 +
 .../reliefweb-guidelines-list.html.twig       |   6 +-
 .../layout/page--guidelines.html.twig         |   1 +
 6 files changed, 299 insertions(+), 3 deletions(-)
 create mode 100644 html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines-search.js
 create mode 100644 html/themes/custom/common_design_subtheme/templates/layout/page--guidelines.html.twig

diff --git a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines-search.js b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines-search.js
new file mode 100644
index 000000000..efe96d452
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines-search.js
@@ -0,0 +1,172 @@
+(function () {
+  'use strict';
+
+  window.Searcher = function() {
+    var matchRegexps = [];
+    var highlightRegexp = null;
+    var matchedColors = {};
+    var colors = ['yellow', 'red', 'green', 'blue', 'purple'];
+    var colorIndex = 0;
+
+    var diacriticsMap = {
+      '\u00E0': 'a',  // à => a
+      '\u00E1': 'a',  // á => a
+      '\u00E2': 'a',  // â => a
+      '\u00E3': 'a',  // ã => a
+      '\u00E4': 'a',  // ä => a
+      '\u00E5': 'a',  // å => a
+      '\u00E6': 'a',  // æ => a
+      '\u00E7': 'c',  // ç => c
+      '\u00E8': 'e',  // è => e
+      '\u00E9': 'e',  // é => e
+      '\u00EA': 'e',  // ê => e
+      '\u00EB': 'e',  // ë => e
+      '\u00EC': 'i',  // ì => i
+      '\u00ED': 'i',  // í => i
+      '\u00EE': 'i',  // î => i
+      '\u00EF': 'i',  // ï => i
+      '\u0133': 'i',  // ij => ij
+      '\u00F0': 'd',  // ð => d
+      '\u00F1': 'n',  // ñ => n
+      '\u00F2': 'o',  // ò => o
+      '\u00F3': 'o',  // ó => o
+      '\u00F4': 'o',  // ô => o
+      '\u00F5': 'o',  // õ => o
+      '\u00F6': 'o',  // ö => o
+      '\u00F8': 'o',  // ø => o
+      '\u0153': 'o',  // œ => o
+      '\u00DF': 's',  // ß => ss
+      '\u00FE': 't',  // þ => th
+      '\u00F9': 'u',  // ù => u
+      '\u00FA': 'u',  // ú => u
+      '\u00FB': 'u',  // û => u
+      '\u00FC': 'u',  // ü => u
+      '\u00FD': 'y',  // ý => y
+      '\u00FF': 'y'   // ÿ => y
+    };
+    function removeDiacritics(text) {
+      return text.replace(/[^\u0000-\u007E]/g, function(a) {
+        return diacriticsMap[a] || a;
+      });
+    }
+    function removeQuotes(text) {
+      return text.replace(/([a-z])([^a-z \t\r\n_-])([a-z])/g, '$1-$3');
+    }
+    function escapeRegexp(text) {
+      return text.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+    }
+    function cleanText(text) {
+      return removeQuotes(removeDiacritics(text.toLowerCase()));
+    }
+    function cleanInput(input) {
+      input = input.replace(/(^\*(AND|OR)\s+)|(\s+(OR|AND)\*$)/, '');
+      input = input.replace(/\s+(AND|OR)\s+/, ' #$1# ');
+      input = cleanText(input);
+      return escapeRegexp(input);
+    }
+
+    // Highlight the keywords.
+    function highlight(node) {
+      if (!node || node.className === 'highlight') {
+        return;
+      }
+      // Process all the children first.
+      if (node.hasChildNodes()) {
+        // The node's childNodes will change when hilighting text (new children).
+        for (var i = 0, l = node.childNodes.length; i < l; i++) {
+          highlight(node.childNodes[i]);
+        }
+      }
+      // Text node, highlight the keywords.
+      if (node.nodeType === 3 && node.nodeValue) {
+        // First match.
+        var result = highlightRegexp.exec(cleanText(node.nodeValue));
+        if (result) {
+          var matched = result[0];
+          var index = result.index;
+          var color = matchedColors[matched];
+
+          if (!color) {
+            color = matchedColors[matched] = colors[colorIndex++ % colors.length];
+          }
+
+          // Create a new tag with for the hilighted keyword.
+          var content = document.createTextNode(node.nodeValue.substr(index, matched.length));
+          var tag = document.createElement('em');
+          tag.appendChild(content);
+          tag.className = 'highlight ' + color;
+
+          // Split the text and insert the higlighted text as a new child node.
+          var after = node.splitText(index);
+          after.nodeValue = after.nodeValue.substr(matched.length);
+          node.parentNode.insertBefore(tag, after);
+          highlight(after);
+        }
+      }
+    }
+
+    // Search for the keywords.
+    this.search = function(node) {
+      var text = cleanText(node.textContent || node.innerText);
+
+      // Skip if there is no text.
+      if (!text || /^\s+$/.test(text)) {
+        return false;
+      }
+
+      // Skip if not all keywords can be found.
+      for (var i = 0, l = matchRegexps.length; i < l; i++) {
+        if (!matchRegexps[i].test(text)) {
+          return false;
+        }
+      }
+
+      // Hightlight keywords.
+      highlight(node);
+
+      return true;
+    };
+
+    // Remove higlighted text.
+    this.remove = function() {
+      var tags = document.getElementsByClassName('highlight');
+      for (var i = tags.length - 1; i >= 0; i--) {
+        var tag = tags[i];
+        var parent = tag.parentNode;
+        var textNode = document.createTextNode(tag.textContent || tag.innerText);
+        parent.replaceChild(textNode, tag);
+        parent.normalize();
+      }
+    };
+
+    // Set the the search keywords.
+    this.apply = function(input) {
+      input = cleanInput(input);
+
+      // Remove the previous highlighs.
+      this.remove();
+
+      // Reset.
+      matchedColors = {};
+      matchRegexps = [];
+      colorIndex = 0;
+
+      // Prepare the search regexps.
+      if (input !== '') {
+        // Remove the previous hilighting.
+        this.remove();
+
+        // Explode AND groups.
+        var parts = input.split(' #and# ');
+        for (var i = 0, l = parts.length; i < l; i++) {
+          matchRegexps.push(new RegExp('(' + parts[i].replace(' #or# ', '|') + ')'));
+        }
+        // Higlight all keywords.
+        highlightRegexp = new RegExp(input.replace(/ #(or|and)# /g, '|'));
+
+        return true;
+      }
+      return false;
+    };
+  };
+})();
diff --git a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
index cfb04db22..cb0c0e596 100644
--- a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
+++ b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
@@ -182,7 +182,7 @@
 
 .rw-guidelines-list article {
   background-color: white;
-  /* debug display: none; */
+  display: none;
   padding: 10px 20px;
   position: relative;
   z-index: 2;
@@ -241,6 +241,9 @@
   padding-bottom: 5px;
 }
 
+.rw-guidelines-list #search {
+  color: #333;
+}
 .rw-guidelines-list #search a {
   display: block;
 }
diff --git a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.js b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.js
index e69de29bb..debc83f6f 100644
--- a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.js
+++ b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.js
@@ -0,0 +1,117 @@
+(function () {
+  'use strict';
+
+  // Update the mnenu.
+  document.addEventListener('DOMContentLoaded', function() {
+    var sidebar = document.getElementsByTagName('aside')[0];
+    var main = document.getElementsByTagName('main')[0];
+    var menuLinks = sidebar.querySelectorAll('nav a');
+
+    function setActiveLink(href) {
+      for (var i = 0, l = menuLinks.length; i < l; i++) {
+        var link = menuLinks[i];
+        if (link.className !== 'active' && link.href === href) {
+          link.parentNode.previousElementSibling.checked = true;
+          link.className = 'active';
+          link.focus();
+        }
+        else if (link.className === 'active' && link.href !== href) {
+          link.className = '';
+        }
+      }
+      lazyLoadImages(href.substr(href.indexOf('#') + 1));
+    }
+
+    // Lazy load a picture.
+    function lazyLoadImages(id) {
+      var article = document.getElementById(id);
+      if (article) {
+        var images = article.getElementsByTagName('IMG');
+        for (var i = 0, l = images.length; i < l; i++) {
+          var image = images[i];
+          if (image.src.indexOf("blank.gif") !== -1) {
+            image.src = image.getAttribute('data-src');
+          }
+        }
+      }
+    }
+
+    // Sidebar, card link clicks.
+    sidebar.addEventListener('mousedown', function (event) {
+      if (event.target.tagName === 'A') {
+        setActiveLink(event.target.href);
+      }
+    });
+
+    // Article, card link clicks.
+    main.addEventListener('mousedown', function (event) {
+      if (event.target.tagName === 'A' && event.target.getAttribute('href').indexOf('#') === 0) {
+        setActiveLink(event.target.href);
+      }
+    });
+
+    // Set the active link when the page is loaded.
+    setActiveLink(window.location.href);
+
+    // Ensure external links open in a new tab/window.
+    var links = main.getElementsByTagName('a');
+    for (var i = 0, l = links.length; i < l; i++) {
+      var link = links[i];
+      var href = link.getAttribute('href');
+      if (href && href.indexOf('http') === 0) {
+        link.setAttribute('target', '_blank');
+      }
+    }
+
+    // Search handling.
+    var searchForm = sidebar.querySelector('form');
+    var searchInput = searchForm.querySelector('input');
+    var search = document.getElementById('search');
+    var searcher = new window.Searcher();
+    var previousInput = '';
+
+    searchForm.addEventListener('submit', function (event) {
+      var input = searchInput.value;
+
+      // Check if there is something to do with the search query.
+      if (input !== previousInput) {
+        var content = document.createElement('div');
+        previousInput = input;
+
+        // Search the articles.
+        if (searcher.apply(input)) {
+          var articles = document.getElementsByTagName('article');
+
+          for (var i = 0, l = articles.length; i < l; i++) {
+            var article = articles[i];
+            if (article.id !== 'search' && searcher.search(article)) {
+              var link = document.createElement('a');
+              link.href = '#' + article.id;
+              link.innerHTML = article.querySelector('h2').innerHTML;
+              link.addEventListener('click', function (event) {
+                setActiveLink(this.href);
+              });
+              content.appendChild(link);
+            }
+          }
+        }
+
+        // Number of articles with the keywords.
+        var titleText = 'Found ' + content.childNodes.length + ' entries containing "' + input + '"';
+        var title = document.createElement('h2');
+        title.appendChild(document.createTextNode(titleText));
+
+        // Clear the search and display the new results.
+        while (search.lastChild) {
+          search.removeChild(search.lastChild);
+        }
+        search.appendChild(title);
+        search.appendChild(content);
+      }
+
+      // Display the search results page.
+      window.location.href = '#search';
+      event.preventDefault();
+    });
+  });
+})();
diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.libraries.yml b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.libraries.yml
index 9e6a13f55..6e653f47f 100644
--- a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.libraries.yml
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.libraries.yml
@@ -3,4 +3,5 @@ reliefweb-guidelines:
     component:
       components/reliefweb-guidelines/reliefweb-guidelines.css: {}
   js:
+    components/reliefweb-guidelines/reliefweb-guidelines-search.js: {}
     components/reliefweb-guidelines/reliefweb-guidelines.js: {}
diff --git a/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-list.html.twig b/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-list.html.twig
index 4ad7afc00..a44756500 100644
--- a/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-list.html.twig
+++ b/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-list.html.twig
@@ -13,6 +13,9 @@
 
 <div{{ attributes.addClass('rw-guidelines-list') }}>
   <aside>
+    <form action="#search">
+      <input id="search" type="text" placeholder="Search">
+    </form>
     <nav class="scroll">
       {% for guideline in guidelines %}
         <label for="{{ guideline['#id'] }}">{{ guideline['#title'] }}</label>
@@ -21,8 +24,7 @@
         {% if guideline['#children'] %}
           <nav>
           {% for child in guideline['#children'] %}
-            <label for="{{ child['#id'] }}">{{ child['#title'] }}</label>
-            <input id="{{ child['#id'] }}" type="checkbox" name="lists">
+            <a href="#{{ child['#id'] }}" tabindex="7" class="">{{ child['#title'] }}</a>
           {% endfor %}
           </nav>
         {% endif %}
diff --git a/html/themes/custom/common_design_subtheme/templates/layout/page--guidelines.html.twig b/html/themes/custom/common_design_subtheme/templates/layout/page--guidelines.html.twig
new file mode 100644
index 000000000..95b3301d9
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/templates/layout/page--guidelines.html.twig
@@ -0,0 +1 @@
+{{ page.content }}

From 87e45091af0f848a87c2bc0515d37ed1e057a0f6 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Thu, 25 Nov 2021 13:05:10 +0100
Subject: [PATCH 163/720] CS

---
 .../custom/guidelines/guideline.page.inc      |  3 --
 .../custom/guidelines/guidelines.module       |  9 -----
 .../src/Form/GuidelineRevisionDeleteForm.php  | 20 +++++++++--
 .../src/Form/GuidelineRevisionRevertForm.php  | 10 ++++--
 .../src/Form/GuidelineSettingsForm.php        |  2 +-
 .../guidelines/src/Form/GuidelineTypeForm.php |  2 +-
 .../src/GuidelineAccessControlHandler.php     |  5 ++-
 .../guidelines/src/GuidelinePermissions.php   |  8 ++---
 .../guidelines/src/GuidelinesFromTrello.php   | 36 +++++++++++++++++--
 .../GuidelineFieldTargetFormatter.php         |  1 -
 .../FieldType/GuidelineFieldTargetType.php    | 10 +++---
 .../GuidelineFieldTargetWidget.php            |  5 +--
 12 files changed, 76 insertions(+), 35 deletions(-)

diff --git a/html/modules/custom/guidelines/guideline.page.inc b/html/modules/custom/guidelines/guideline.page.inc
index 61fcd3c84..25d4c71d5 100644
--- a/html/modules/custom/guidelines/guideline.page.inc
+++ b/html/modules/custom/guidelines/guideline.page.inc
@@ -20,9 +20,6 @@ use Drupal\Core\Render\Element;
  *   - attributes: HTML attributes for the containing element.
  */
 function template_preprocess_guideline(array &$variables) {
-  // Fetch Guideline Entity Object.
-  $guideline = $variables['elements']['#guideline'];
-
   // Helpful $content variable for templates.
   foreach (Element::children($variables['elements']) as $key) {
     $variables['content'][$key] = $variables['elements'][$key];
diff --git a/html/modules/custom/guidelines/guidelines.module b/html/modules/custom/guidelines/guidelines.module
index 22a6d3854..0330d35b9 100644
--- a/html/modules/custom/guidelines/guidelines.module
+++ b/html/modules/custom/guidelines/guidelines.module
@@ -26,15 +26,6 @@ function guidelines_help($route_name, RouteMatchInterface $route_match) {
   }
 }
 
-/*
-- old id from trello
-- grouping
-  - terms
-  - book
-- moderation
-- use nodes
-*/
-
 /**
  * Implements hook_theme().
  */
diff --git a/html/modules/custom/guidelines/src/Form/GuidelineRevisionDeleteForm.php b/html/modules/custom/guidelines/src/Form/GuidelineRevisionDeleteForm.php
index 6950df3e5..df99ca7e6 100644
--- a/html/modules/custom/guidelines/src/Form/GuidelineRevisionDeleteForm.php
+++ b/html/modules/custom/guidelines/src/Form/GuidelineRevisionDeleteForm.php
@@ -35,6 +35,13 @@ class GuidelineRevisionDeleteForm extends ConfirmFormBase {
    */
   protected $connection;
 
+  /**
+   * The date formatter service.
+   *
+   * @var \Drupal\Core\Datetime\DateFormatterInterface
+   */
+  protected $dateFormatter;
+
   /**
    * {@inheritdoc}
    */
@@ -42,6 +49,7 @@ public static function create(ContainerInterface $container) {
     $instance = parent::create($container);
     $instance->guidelineStorage = $container->get('entity_type.manager')->getStorage('guideline');
     $instance->connection = $container->get('database');
+    $instance->dateFormatter = $container->get('date.formatter');
     return $instance;
   }
 
@@ -57,7 +65,7 @@ public function getFormId() {
    */
   public function getQuestion() {
     return $this->t('Are you sure you want to delete the revision from %revision-date?', [
-      '%revision-date' => format_date($this->revision->getRevisionCreationTime()),
+      '%revision-date' => $this->dateFormatter->format($this->revision->getRevisionCreationTime()),
     ]);
   }
 
@@ -91,8 +99,14 @@ public function buildForm(array $form, FormStateInterface $form_state, $guidelin
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $this->GuidelineStorage->deleteRevision($this->revision->getRevisionId());
 
-    $this->logger('content')->notice('Guideline: deleted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
-    $this->messenger()->addMessage(t('Revision from %revision-date of Guideline %title has been deleted.', ['%revision-date' => format_date($this->revision->getRevisionCreationTime()), '%title' => $this->revision->label()]));
+    $this->logger('content')->notice('Guideline: deleted %title revision %revision.', [
+      '%title' => $this->revision->label(),
+      '%revision' => $this->revision->getRevisionId(),
+    ]);
+    $this->messenger()->addMessage($this->t('Revision from %revision-date of Guideline %title has been deleted.', [
+      '%revision-date' => $this->dateFormatter->format($this->revision->getRevisionCreationTime()),
+      '%title' => $this->revision->label(),
+    ]));
     $form_state->setRedirect(
       'entity.guideline.canonical',
        ['guideline' => $this->revision->id()]
diff --git a/html/modules/custom/guidelines/src/Form/GuidelineRevisionRevertForm.php b/html/modules/custom/guidelines/src/Form/GuidelineRevisionRevertForm.php
index 28a4d637c..0830421f6 100644
--- a/html/modules/custom/guidelines/src/Form/GuidelineRevisionRevertForm.php
+++ b/html/modules/custom/guidelines/src/Form/GuidelineRevisionRevertForm.php
@@ -107,8 +107,14 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
     ]);
     $this->revision->save();
 
-    $this->logger('content')->notice('Guideline: reverted %title revision %revision.', ['%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
-    $this->messenger()->addMessage(t('Guideline %title has been reverted to the revision from %revision-date.', ['%title' => $this->revision->label(), '%revision-date' => $this->dateFormatter->format($original_revision_timestamp)]));
+    $this->logger('content')->notice('Guideline: reverted %title revision %revision.', [
+      '%title' => $this->revision->label(),
+      '%revision' => $this->revision->getRevisionId(),
+    ]);
+    $this->messenger()->addMessage($this->t('Guideline %title has been reverted to the revision from %revision-date.', [
+      '%title' => $this->revision->label(),
+      '%revision-date' => $this->dateFormatter->format($original_revision_timestamp),
+    ]));
     $form_state->setRedirect(
       'entity.guideline.version_history',
       ['guideline' => $this->revision->id()]
diff --git a/html/modules/custom/guidelines/src/Form/GuidelineSettingsForm.php b/html/modules/custom/guidelines/src/Form/GuidelineSettingsForm.php
index c2be7ddc6..25cc12a8a 100644
--- a/html/modules/custom/guidelines/src/Form/GuidelineSettingsForm.php
+++ b/html/modules/custom/guidelines/src/Form/GuidelineSettingsForm.php
@@ -6,7 +6,7 @@
 use Drupal\Core\Form\FormStateInterface;
 
 /**
- * Class GuidelineSettingsForm.
+ * Guideline settings.
  *
  * @ingroup guidelines
  */
diff --git a/html/modules/custom/guidelines/src/Form/GuidelineTypeForm.php b/html/modules/custom/guidelines/src/Form/GuidelineTypeForm.php
index 987a13c03..0cffbdc6a 100644
--- a/html/modules/custom/guidelines/src/Form/GuidelineTypeForm.php
+++ b/html/modules/custom/guidelines/src/Form/GuidelineTypeForm.php
@@ -6,7 +6,7 @@
 use Drupal\Core\Form\FormStateInterface;
 
 /**
- * Class GuidelineTypeForm.
+ * Guideline type form.
  */
 class GuidelineTypeForm extends EntityForm {
 
diff --git a/html/modules/custom/guidelines/src/GuidelineAccessControlHandler.php b/html/modules/custom/guidelines/src/GuidelineAccessControlHandler.php
index 7867403c4..2c4e66ad5 100644
--- a/html/modules/custom/guidelines/src/GuidelineAccessControlHandler.php
+++ b/html/modules/custom/guidelines/src/GuidelineAccessControlHandler.php
@@ -72,8 +72,11 @@ protected function checkCreateAccess(AccountInterface $account, array $context,
    * Test for given 'own' permission.
    *
    * @param \Drupal\Core\Entity\EntityInterface $entity
-   * @param $operation
+   *   Guideline.
+   * @param string $operation
+   *   Operation.
    * @param \Drupal\Core\Session\AccountInterface $account
+   *   Account.
    *
    * @return string|null
    *   The permission string indicating it's allowed.
diff --git a/html/modules/custom/guidelines/src/GuidelinePermissions.php b/html/modules/custom/guidelines/src/GuidelinePermissions.php
index 25ff2d3aa..86df0e5df 100644
--- a/html/modules/custom/guidelines/src/GuidelinePermissions.php
+++ b/html/modules/custom/guidelines/src/GuidelinePermissions.php
@@ -5,14 +5,12 @@
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\guidelines\Entity\Guideline;
 
-
 /**
  * Provides dynamic permissions for Guideline of different types.
  *
  * @ingroup guidelines
- *
  */
-class GuidelinePermissions{
+class GuidelinePermissions {
 
   use StringTranslationTrait;
 
@@ -64,11 +62,11 @@ protected function buildPermissions(Guideline $type) {
       ],
       "$type_id view revisions" => [
         'title' => $this->t('View %type_name revisions', $type_params),
-        'description' => t('To view a revision, you also need permission to view the entity item.'),
+        'description' => $this->t('To view a revision, you also need permission to view the entity item.'),
       ],
       "$type_id revert revisions" => [
         'title' => $this->t('Revert %type_name revisions', $type_params),
-        'description' => t('To revert a revision, you also need permission to edit the entity item.'),
+        'description' => $this->t('To revert a revision, you also need permission to edit the entity item.'),
       ],
       "$type_id delete revisions" => [
         'title' => $this->t('Delete %type_name revisions', $type_params),
diff --git a/html/modules/custom/guidelines/src/GuidelinesFromTrello.php b/html/modules/custom/guidelines/src/GuidelinesFromTrello.php
index 0dc24c4f1..7b41ce721 100644
--- a/html/modules/custom/guidelines/src/GuidelinesFromTrello.php
+++ b/html/modules/custom/guidelines/src/GuidelinesFromTrello.php
@@ -8,8 +8,22 @@
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\ClientException;
 
+/**
+ * Import trello as guidelines.
+ */
 class GuidelinesFromTrello {
+  /**
+   * API Key.
+   *
+   * @var string
+   */
   protected $key = '';
+
+  /**
+   * API Token.
+   *
+   * @var string
+   */
   protected $token = '';
 
   /**
@@ -24,7 +38,7 @@ class GuidelinesFromTrello {
    *
    * @param string $key
    *   Trello key.
-   * @param string $key
+   * @param string $token
    *   Trello token.
    * @param Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The config factory service.
@@ -41,6 +55,9 @@ public function __construct($key, $token, ConfigFactoryInterface $config_factory
     $this->logger = $logger_factory->get('reliefweb_guidelines');
   }
 
+  /**
+   * Get all boards.
+   */
   public function getBoards() {
     $url = 'https://api.trello.com/1/members/me/boards';
     $parmeters = [
@@ -50,6 +67,9 @@ public function getBoards() {
     return $this->fetchData($url, $parmeters);
   }
 
+  /**
+   * Get all lists of a board.
+   */
   public function getLists($board_id, $status = 'open') {
     $url = strtr('https://api.trello.com/1/boards/@id/lists/@status', [
       '@id' => $board_id,
@@ -62,6 +82,9 @@ public function getLists($board_id, $status = 'open') {
     return $this->fetchData($url, $parmeters);
   }
 
+  /**
+   * Get all cards from a list.
+   */
   public function getCards($list_id) {
     $url = strtr('https://api.trello.com/1/lists/@id/cards', [
       '@id' => $list_id,
@@ -73,6 +96,9 @@ public function getCards($list_id) {
     return $this->fetchData($url, $parmeters);
   }
 
+  /**
+   * Get a card.
+   */
   public function getCard($card_id) {
     $url = strtr('https://api.trello.com/1/cards/@id', [
       '@id' => $card_id,
@@ -84,6 +110,9 @@ public function getCard($card_id) {
     return $this->fetchData($url, $parmeters);
   }
 
+  /**
+   * Get attachments of a card.
+   */
   public function getCardAttachments($card_id) {
     $url = strtr('https://api.trello.com/1/cards/@id/attachments', [
       '@id' => $card_id,
@@ -95,6 +124,9 @@ public function getCardAttachments($card_id) {
     return $this->fetchData($url, $parmeters);
   }
 
+  /**
+   * Fetch data from API.
+   */
   protected function fetchData($url, $parameters = []) {
     $parameters += [
       'key' => $this->key,
@@ -104,7 +136,7 @@ protected function fetchData($url, $parameters = []) {
     $url = Url::fromUri($url, [
       'query' => $parameters,
     ])->toUriString();
-dpm($url);
+
     try {
       $response = $this->httpClient->request('GET', $url);
     }
diff --git a/html/modules/custom/guidelines/src/Plugin/Field/FieldFormatter/GuidelineFieldTargetFormatter.php b/html/modules/custom/guidelines/src/Plugin/Field/FieldFormatter/GuidelineFieldTargetFormatter.php
index 18b5b8254..ee446af81 100644
--- a/html/modules/custom/guidelines/src/Plugin/Field/FieldFormatter/GuidelineFieldTargetFormatter.php
+++ b/html/modules/custom/guidelines/src/Plugin/Field/FieldFormatter/GuidelineFieldTargetFormatter.php
@@ -44,7 +44,6 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
    */
   public function settingsSummary() {
     $summary = [];
-    // Implement settings summary.
 
     return $summary;
   }
diff --git a/html/modules/custom/guidelines/src/Plugin/Field/FieldType/GuidelineFieldTargetType.php b/html/modules/custom/guidelines/src/Plugin/Field/FieldType/GuidelineFieldTargetType.php
index 8494ca626..b3d7fcee3 100644
--- a/html/modules/custom/guidelines/src/Plugin/Field/FieldType/GuidelineFieldTargetType.php
+++ b/html/modules/custom/guidelines/src/Plugin/Field/FieldType/GuidelineFieldTargetType.php
@@ -78,15 +78,15 @@ public function storageSettingsForm(array &$form, FormStateInterface $form_state
 
     $elements['enabled_entities'] = [
       '#type' => 'checkboxes',
-      '#title' => t('Allowed entities'),
+      '#title' => $this->t('Allowed entities'),
       '#default_value' => $this->getSetting('enabled_entities'),
       '#required' => FALSE,
-      '#description' => t('The entities that are allowed.'),
+      '#description' => $this->t('The entities that are allowed.'),
       '#disabled' => $has_data,
       '#options' => [
-        'node' => t('Node'),
-        'terms' => t('Terms'),
-      ]
+        'node' => $this->t('Node'),
+        'terms' => $this->t('Terms'),
+      ],
     ];
 
     return $elements;
diff --git a/html/modules/custom/guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetWidget.php b/html/modules/custom/guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetWidget.php
index 34fc3469b..c51ca68bd 100644
--- a/html/modules/custom/guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetWidget.php
+++ b/html/modules/custom/guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetWidget.php
@@ -55,7 +55,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
 
     $elements['enabled_entities'] = [
       '#type' => 'select',
-      '#title' => t('Enabled entities'),
+      '#title' => $this->t('Enabled entities'),
       '#default_value' => $this->getSetting('enabled_entities'),
       '#required' => FALSE,
       '#multiple' => TRUE,
@@ -71,7 +71,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
   public function settingsSummary() {
     $summary = [];
 
-    $summary[] = t('Enabled entities: @enabled_entities', [
+    $summary[] = $this->t('Enabled entities: @enabled_entities', [
       '@enabled_entities' => implode(', ', array_filter($this->getSetting('enabled_entities'))),
     ]);
 
@@ -135,4 +135,5 @@ protected function getOptions(FieldableEntityInterface $entity) {
 
     return $this->options;
   }
+
 }

From b62c429923d5c0c84509098b812e01fa04d9686e Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Thu, 25 Nov 2021 13:08:30 +0100
Subject: [PATCH 164/720] Move trello class

---
 .../reliefweb_guidelines/reliefweb_guidelines.module | 12 ++++++------
 .../src/GuidelinesFromTrello.php                     |  2 +-
 .../templates/reliefweb-guidelines-list.html.twig    |  1 +
 3 files changed, 8 insertions(+), 7 deletions(-)
 rename html/modules/custom/{guidelines => reliefweb_guidelines}/src/GuidelinesFromTrello.php (99%)

diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
index b038a2c6f..e016d7527 100644
--- a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
@@ -6,10 +6,10 @@
  */
 
 use Drupal\Core\File\FileSystemInterface;
-use Drupal\Core\Render\Element;
-use Drupal\guidelines\Entity\Guideline;
 use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\guidelines\Entity\Guideline;
 use Drupal\guidelines\Entity\GuidelineType;
+use Drupal\reliefweb_guidelines\GuidelinesFromTrello;
 
 /**
  * Implements hook_theme().
@@ -42,7 +42,7 @@ function reliefweb_guidelines_migrate_from_trello() {
   $key = $config->get('key');
   $token = $config->get('token');
 
-  $trello = new \Drupal\guidelines\GuidelinesFromTrello($key, $token, \Drupal::service('config.factory'), \Drupal::service('http_client'), \Drupal::service('logger.factory'));
+  $trello = new GuidelinesFromTrello($key, $token, \Drupal::service('config.factory'), \Drupal::service('http_client'), \Drupal::service('logger.factory'));
 
   $lists = $trello->getLists('554c519c9b98caa2495ea5db');
   foreach ($lists as $weight_list => $list) {
@@ -146,7 +146,7 @@ function reliefweb_guidelines_migrate_from_trello() {
       // Get attachments.
       if ($card['badges']['attachments'] > 0) {
         $attachments = $trello->getCardAttachments($card['id']);
-        foreach($attachments as $attachment) {
+        foreach ($attachments as $attachment) {
           // Add external links, skip images.
           if (empty($attachment['isUpload'])) {
             $values['field_links'] = $values['field_links'] ?? [];
@@ -203,7 +203,7 @@ function guidelines_get_possible_field_names($bundle, $field_name) {
 function guidelines_extract_images(&$description) {
   $files = [];
   $pattern = '|(\!\[(.*?)\])(\((http.*?)\))|';
-  $description = preg_replace_callback($pattern, function($matches) use ($files) {
+  $description = preg_replace_callback($pattern, function ($matches) use ($files) {
     $matches[4] = guidelines_fetch_image($matches[4], $files);
 
     // Remove non-existing images.
@@ -218,7 +218,7 @@ function guidelines_extract_images(&$description) {
 }
 
 /**
- * Fetch external image and
+ * Fetch external image and save locally.
  */
 function guidelines_fetch_image($url, &$files) {
   $destination = 'public://guidelines/trello';
diff --git a/html/modules/custom/guidelines/src/GuidelinesFromTrello.php b/html/modules/custom/reliefweb_guidelines/src/GuidelinesFromTrello.php
similarity index 99%
rename from html/modules/custom/guidelines/src/GuidelinesFromTrello.php
rename to html/modules/custom/reliefweb_guidelines/src/GuidelinesFromTrello.php
index 7b41ce721..39601d603 100644
--- a/html/modules/custom/guidelines/src/GuidelinesFromTrello.php
+++ b/html/modules/custom/reliefweb_guidelines/src/GuidelinesFromTrello.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\guidelines;
+namespace Drupal\reliefweb_guidelines;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Logger\LoggerChannelFactoryInterface;
diff --git a/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-list.html.twig b/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-list.html.twig
index a44756500..e3f3dc129 100644
--- a/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-list.html.twig
+++ b/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-list.html.twig
@@ -13,6 +13,7 @@
 
 <div{{ attributes.addClass('rw-guidelines-list') }}>
   <aside>
+    <h1>Guidelines</h1>
     <form action="#search">
       <input id="search" type="text" placeholder="Search">
     </form>

From 337e3731b3a6d38b189f079d25ef8afe1e35d3f2 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Thu, 25 Nov 2021 14:10:29 +0100
Subject: [PATCH 165/720] Add logo

---
 .../components/reliefweb-guidelines/assets/logo.svg           | 1 +
 .../components/reliefweb-guidelines/reliefweb-guidelines.css  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/assets/logo.svg

diff --git a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/assets/logo.svg b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/assets/logo.svg
new file mode 100644
index 000000000..ceb69de23
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/assets/logo.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 200 200" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-miterlimit:1.41421;"><g id="g2829"><path id="path3704" d="M3.125,25l0,159.375l193.75,0l0,-159.375l-193.75,0l0,-4.54747e-13Z" style="fill:#737373;fill-rule:nonzero;"/><path id="path3702" d="M100,28.125l0,153.125l93.75,0l0,-153.125l-93.75,0l0,-4.54747e-13Z" style="fill:#f2f2f2;fill-rule:nonzero;"/><path id="path3714" d="M156.25,25l0,43.75l12.5,-12.5l12.5,12.5l0,-43.75l-25,0Z" style="fill:#f77462;fill-rule:nonzero;"/><path id="path3709" d="M6.25,28.125l0,153.125l93.4094,0l0,-153.125l-93.4094,0l0,-4.54747e-13Z" style="fill:#6dc5dd;fill-rule:nonzero;"/><path id="path3783" d="M9.375,25l0,153.287l90.625,2.96344l0,-153.287l-90.625,-2.96334l0,-9.375e-05Z" style="fill:#f2f2f2;fill-rule:nonzero;"/><path id="path3756" d="M12.5,21.875l0,153.287l87.5,6.08844l0,-153.287l-87.5,-6.08844Z" style="fill:#ddd;fill-rule:nonzero;"/><path id="path3785" d="M181.25,28.125l12.5,0l0,28.125l-12.5,12.5l0,-40.625Z" style="fill:#ddd;fill-rule:nonzero;"/><path id="path3250" d="M100.161,84.7814c-3.32393,0 -5.70825,1.95159 -5.70825,5.363l0,23.8458l4.09705,0l0,-17.1248l8.79255,0l5.33998,17.1248l3.63671,0l4.39628,-14.5699l4.44231,14.5699l3.63671,0l6.49084,-20.8305l-4.44231,0l-3.86688,14.4548l-4.67248,-14.4548l-3.13033,0l-4.5574,14.4548l-4.05102,-14.4548l-12.015,0c-2.20965e-05,-0.743509 0,-1.4201 0,-2.16361c-2.20965e-05,-1.79317 0.439484,-2.23266 2.23266,-2.23266l3.82085,0l0,-3.98197l-4.44231,0ZM57.9939,84.8044l0,29.1858l4.18912,0l0,-29.1858l-4.18912,0ZM66.9706,84.8044l0,4.21214l4.18912,0l0,-4.21214l-4.18912,0ZM155.011,84.8044l0,29.1858l4.21214,0l0,-2.37077c1.3121,1.66196 3.312,2.62396 5.45507,2.62396c4.54855,0 6.99721,-3.35558 6.99721,-7.6417l0,-6.39877c7.36549e-06,-3.93624 -2.97351,-7.29644 -6.99721,-7.29644c-2.1868,7.36549e-06 -4.01178,0.959694 -5.45507,2.57792l0,-10.68l-4.21214,0ZM34.6776,92.9064c-2.1868,7.36549e-06 -4.00948,0.959694 -5.40903,2.57792l0,-2.32473l-4.21214,0l0,20.8305l4.21214,0l0,-12.5904c7.36549e-06,-2.44922 1.7422,-4.35024 4.23516,-4.35024c1.18087,0 1.84361,0.359009 2.76206,1.05879l2.87714,-3.63671c-1.26834,-1.04966 -2.84709,-1.56517 -4.46533,-1.56517ZM46.8767,92.9064c-4.67974,7.36549e-06 -8.60842,3.76985 -8.60842,8.49333l0,3.65973c7.36549e-06,5.33578 3.66622,9.18384 9.04574,9.18384c2.88657,0 5.69199,-1.17371 7.57264,-3.3605l-3.10732,-2.76206c-1.18086,1.26834 -2.62382,1.97948 -4.37326,1.97948c-3.06152,0 -4.99472,-1.88718 -4.99472,-4.94869l12.9817,0l0,-3.19938c-7.36549e-06,-4.98589 -3.3555,-9.04574 -8.51635,-9.04574ZM82.5763,92.9064c-4.67974,7.36549e-06 -8.60842,3.76985 -8.60842,8.49333l0,3.65973c-7.36549e-06,5.33578 3.66621,9.18384 9.04574,9.18384c2.88656,0 5.69199,-1.17371 7.57264,-3.3605l-3.10732,-2.76206c-1.18087,1.26834 -2.62382,1.97948 -4.37326,1.97948c-3.06151,0 -4.99472,-1.88718 -4.99472,-4.94869l13.0047,0l0,-3.19938c0,-4.98589 -3.37852,-9.04574 -8.53936,-9.04574ZM143.917,92.9064c-4.67976,7.36549e-06 -8.60842,3.76985 -8.60842,8.49333l0,3.65973c-7.36549e-06,5.33578 3.66622,9.18384 9.04574,9.18384c2.88656,0 5.692,-1.17371 7.57264,-3.3605l-3.10732,-2.76206c-1.18086,1.26834 -2.62382,1.97948 -4.37326,1.97948c-3.06153,0 -4.99472,-1.88718 -4.99472,-4.94869l12.9817,0l0,-3.19938c0,-4.98589 -3.35551,-9.04574 -8.51635,-9.04574ZM66.9706,93.1596l0,20.8305l4.18912,0l0,-20.8305l-4.18912,0ZM46.8306,97.0495c2.5367,0 4.37557,1.92635 4.41929,4.41929l-8.83859,0c0.174938,-2.49295 1.83888,-4.41929 4.41929,-4.41929ZM82.5302,97.0495c2.53669,0 4.37557,1.92635 4.41929,4.41929l-8.83859,0c0.174938,-2.49295 1.83887,-4.41929 4.41929,-4.41929ZM143.871,97.0495c2.53668,0 4.37556,1.92635 4.41929,4.41929l-8.83859,0c0.174945,-2.49295 1.83887,-4.41929 4.41929,-4.41929ZM163.413,97.0495c2.40546,0 4.12007,1.94246 4.12007,4.30421l0,4.37326c-7.36549e-06,2.49295 -1.58568,4.37326 -4.1661,4.37326c-2.75537,0 -4.14309,-2.11508 -4.14309,-4.6955l0,-4.05102c7.36549e-06,-2.44922 1.7399,-4.30421 4.18912,-4.30421Z" style="fill:#e0e0e0;"/><g id="g6112"><path id="path5836" d="M172.227,97.1826c3.38298,1.41056 5.5365,3.39766 5.98808,5.84611c1.34479,7.29178 -12.931,16.0149 -31.9051,19.5028c-18.9742,3.48796 -35.4598,0.404262 -36.8045,-6.88753c-0.373504,-2.0253 0.466972,-4.16886 2.27218,-6.27215l-1.15984,-2.31951c-5.40273,3.72667 -8.33478,7.8203 -7.64485,11.5739c1.53025,8.3255 20.277,11.8404 41.8695,7.85794c21.5925,-3.98243 37.8378,-13.9466 36.3075,-22.272c-0.18237,-0.99236 -0.607358,-1.91854 -1.25442,-2.76921c-0.122856,-0.161466 -0.263905,-0.31721 -0.402377,-0.473373c-0.00736549,-0.00780742 -0.0169406,-0.0158358 -0.0235696,-0.0236432c-0.149372,-0.160347 -0.304342,-0.334806 -0.47338,-0.497038c-0.354648,-0.340286 -0.753784,-0.664897 -1.20713,-0.994083c-0.146058,-0.106048 -0.292263,-0.228257 -0.449663,-0.331359c-0.0824198,-0.05421 -0.175667,-0.112361 -0.26037,-0.165679c-0.0581874,-0.0359436 -0.129485,-0.0591449 -0.189367,-0.0946686c-1.20993,-0.716949 -2.72575,-1.34379 -4.66266,-1.68047l-7.36549e-05,-2.20965e-05Z" style="fill:#e0e0e0;"/><path id="path5265" d="M172.227,95.7095c3.38297,1.41056 5.53649,3.39766 5.98807,5.84611c1.34479,7.29178 -12.931,16.0149 -31.9051,19.5028c-18.9742,3.48796 -35.4598,0.404262 -36.8045,-6.88753c-0.373504,-2.0253 0.466972,-4.16886 2.27218,-6.27215l-1.15984,-2.31951c-5.40273,3.72667 -8.33479,7.8203 -7.64486,11.5739c1.53025,8.3255 20.277,11.8404 41.8695,7.85794c21.5925,-3.98243 37.8378,-13.9466 36.3075,-22.272c-0.18237,-0.99236 -0.607358,-1.91854 -1.25442,-2.76921c-0.122856,-0.161466 -0.263905,-0.31721 -0.402377,-0.473373c-0.00736549,-0.00780742 -0.0169406,-0.0158358 -0.0235696,-0.0236432c-0.149372,-0.160347 -0.304342,-0.334806 -0.47338,-0.497038c-0.354648,-0.340286 -0.753784,-0.664897 -1.20713,-0.994083c-0.146058,-0.106048 -0.292263,-0.228257 -0.449663,-0.331359c-0.0824198,-0.05421 -0.175667,-0.112361 -0.26037,-0.165679c-0.0581874,-0.0359436 -0.129485,-0.0591449 -0.189367,-0.0946686c-1.20993,-0.716949 -2.72575,-1.34379 -4.66265,-1.68047l-7.36549e-05,-2.20965e-05Z" style="fill:#fff;stroke-width:1.47px;stroke:#fff;"/><path id="path4933-0-6" d="M172.227,95.7095c3.38297,1.41056 5.53649,3.39766 5.98807,5.84611c1.34479,7.29178 -12.931,16.0149 -31.9051,19.5028c-18.9742,3.48796 -35.4598,0.404262 -36.8045,-6.88753c-0.373504,-2.0253 0.466972,-4.16886 2.27218,-6.27215l-1.15984,-2.31951c-5.40273,3.72667 -8.33479,7.8203 -7.64486,11.5739c1.53025,8.3255 20.277,11.8404 41.8695,7.85794c21.5925,-3.98243 37.8378,-13.9466 36.3075,-22.272c-0.18237,-0.99236 -0.607358,-1.91854 -1.25442,-2.76921c-0.122856,-0.161466 -0.263905,-0.31721 -0.402377,-0.473373c-0.00736549,-0.00780742 -0.0169406,-0.0158358 -0.0235696,-0.0236432c-0.149372,-0.160347 -0.304342,-0.334806 -0.47338,-0.497038c-0.354648,-0.340286 -0.753784,-0.664897 -1.20713,-0.994083c-0.146058,-0.106048 -0.292263,-0.228257 -0.449663,-0.331359c-0.0824198,-0.05421 -0.175667,-0.112361 -0.26037,-0.165679c-0.0581874,-0.0359436 -0.129485,-0.0591449 -0.189367,-0.0946686c-1.20993,-0.716949 -2.72575,-1.34379 -4.66265,-1.68047l-7.36549e-05,-2.20965e-05Z" style="fill:url(#tag1);"/></g><path id="path3266" d="M100.161,83.3083c-3.32393,0 -5.70825,1.95159 -5.70825,5.363l0,23.8458l4.09705,0l0,-17.1248l8.79255,0l5.33998,17.1248l3.63671,0l4.39628,-14.5699l4.44231,14.5699l3.63671,0l6.49084,-20.8305l-4.44231,0l-3.86688,14.4548l-4.67248,-14.4548l-3.13033,0l-4.5574,14.4548l-4.05102,-14.4548l-12.015,0c-2.20965e-05,-0.743509 0,-1.4201 0,-2.16361c-2.20965e-05,-1.79317 0.439484,-2.23266 2.23266,-2.23266l3.82085,0l0,-3.98197l-4.44231,0ZM57.9939,83.3313l0,29.1858l4.18912,0l0,-29.1858l-4.18912,0ZM66.9706,83.3313l0,4.21214l4.18912,0l0,-4.21214l-4.18912,0ZM155.011,83.3313l0,29.1858l4.21214,0l0,-2.37077c1.3121,1.66196 3.312,2.62396 5.45507,2.62396c4.54855,0 6.99721,-3.35558 6.99721,-7.6417l0,-6.39877c7.36549e-06,-3.93624 -2.97351,-7.29644 -6.99721,-7.29644c-2.1868,7.36549e-06 -4.01178,0.959694 -5.45507,2.57792l0,-10.68l-4.21214,0ZM34.6776,91.4333c-2.1868,7.36549e-06 -4.00948,0.959694 -5.40903,2.57792l0,-2.32473l-4.21214,0l0,20.8305l4.21214,0l0,-12.5904c7.36549e-06,-2.44922 1.7422,-4.35024 4.23516,-4.35024c1.18087,0 1.84361,0.359009 2.76206,1.05879l2.87714,-3.63671c-1.26834,-1.04966 -2.84709,-1.56517 -4.46533,-1.56517ZM46.8767,91.4333c-4.67974,7.36549e-06 -8.60842,3.76985 -8.60842,8.49333l0,3.65973c7.36549e-06,5.33578 3.66622,9.18384 9.04574,9.18384c2.88657,0 5.69199,-1.17371 7.57264,-3.3605l-3.10732,-2.76206c-1.18086,1.26834 -2.62382,1.97948 -4.37326,1.97948c-3.06152,0 -4.99472,-1.88718 -4.99472,-4.94869l12.9817,0l0,-3.19938c-7.36549e-06,-4.98589 -3.3555,-9.04574 -8.51635,-9.04574ZM82.5763,91.4333c-4.67974,7.36549e-06 -8.60842,3.76985 -8.60842,8.49333l0,3.65973c-7.36549e-06,5.33578 3.66621,9.18384 9.04574,9.18384c2.88656,0 5.69199,-1.17371 7.57264,-3.3605l-3.10732,-2.76206c-1.18087,1.26834 -2.62382,1.97948 -4.37326,1.97948c-3.06151,0 -4.99472,-1.88718 -4.99472,-4.94869l13.0047,0l0,-3.19938c0,-4.98589 -3.37852,-9.04574 -8.53936,-9.04574ZM143.917,91.4333c-4.67976,7.36549e-06 -8.60842,3.76985 -8.60842,8.49333l0,3.65973c-7.36549e-06,5.33578 3.66622,9.18384 9.04574,9.18384c2.88656,0 5.692,-1.17371 7.57264,-3.3605l-3.10732,-2.76206c-1.18086,1.26834 -2.62382,1.97948 -4.37326,1.97948c-3.06153,0 -4.99472,-1.88718 -4.99472,-4.94869l12.9817,0l0,-3.19938c0,-4.98589 -3.35551,-9.04574 -8.51635,-9.04574ZM66.9706,91.6865l0,20.8305l4.18912,0l0,-20.8305l-4.18912,0ZM46.8306,95.5764c2.5367,0 4.37557,1.92635 4.41929,4.41929l-8.83859,0c0.174938,-2.49295 1.83888,-4.41929 4.41929,-4.41929ZM82.5302,95.5764c2.53669,0 4.37557,1.92635 4.41929,4.41929l-8.83859,0c0.174938,-2.49295 1.83887,-4.41929 4.41929,-4.41929ZM143.871,95.5764c2.53668,0 4.37556,1.92635 4.41929,4.41929l-8.83859,0c0.174945,-2.49295 1.83887,-4.41929 4.41929,-4.41929ZM163.413,95.5764c2.40546,0 4.12007,1.94246 4.12007,4.30421l0,4.37326c-7.36549e-06,2.49295 -1.58568,4.37326 -4.1661,4.37326c-2.75537,0 -4.14309,-2.11508 -4.14309,-4.6955l0,-4.05102c7.36549e-06,-2.44922 1.7399,-4.30421 4.18912,-4.30421Z" style="fill:#404040;stroke-width:1.47px;stroke:#fff;"/><path id="path3216-7-2" d="M100.105,83.502c-3.32397,0 -5.70825,1.95159 -5.70825,5.363l0,23.8458l4.09705,0l0,-17.1248l8.79255,0l5.33998,17.1248l3.63671,0l4.39624,-14.5699l4.44235,14.5699l3.63671,0l6.49084,-20.8305l-4.44235,0l-3.86688,14.4548l-4.67245,-14.4548l-3.13033,0l-4.5574,14.4548l-4.05102,-14.4548l-12.015,0c-7.36549e-05,-0.743509 0,-1.4201 0,-2.16361c-7.36549e-05,-1.79317 0.439425,-2.23266 2.23263,-2.23266l3.82085,0l0,-3.98197l-4.44227,0ZM57.9376,83.5249l0,29.1858l4.18912,0l0,-29.1858l-4.18912,0ZM66.9143,83.5249l0,4.21214l4.18912,0l0,-4.21214l-4.18912,0ZM154.955,83.5249l0,29.1858l4.21218,0l0,-2.37077c1.31209,1.66196 3.31197,2.62396 5.45503,2.62396c4.54856,0 6.99721,-3.35558 6.99721,-7.6417l0,-6.39877c0,-3.93624 -2.97352,-7.29644 -6.99721,-7.29644c-2.18681,7.36549e-06 -4.01176,0.959694 -5.45503,2.57792l0,-10.68l-4.21218,0ZM34.6212,91.627c-2.18681,7.36549e-06 -4.00948,0.959694 -5.40899,2.57792l0,-2.32473l-4.21218,0l0,20.8305l4.21218,0l0,-12.5904c0,-2.44922 1.74216,-4.35024 4.23516,-4.35024c1.18084,0 1.84358,0.359009 2.76206,1.05879l2.87711,-3.63671c-1.26834,-1.04966 -2.84706,-1.56517 -4.46533,-1.56517ZM46.8203,91.627c-4.67974,7.36549e-06 -8.60842,3.76985 -8.60842,8.49333l0,3.65973c0,5.33578 3.66625,9.18384 9.04578,9.18384c2.88654,0 5.69198,-1.17371 7.57261,-3.3605l-3.10728,-2.76206c-1.18091,1.26834 -2.62388,1.97948 -4.37326,1.97948c-3.06154,0 -4.99476,-1.88718 -4.99476,-4.94869l12.9817,0l0,-3.19938c0,-4.98589 -3.3555,-9.04574 -8.51635,-9.04574ZM82.5199,91.627c-4.67981,7.36549e-06 -8.60842,3.76985 -8.60842,8.49333l0,3.65973c-7.36549e-05,5.33578 3.66617,9.18384 9.0457,9.18384c2.88654,0 5.69198,-1.17371 7.57268,-3.3605l-3.10735,-2.76206c-1.18091,1.26834 -2.62381,1.97948 -4.37326,1.97948c-3.06154,0 -4.99469,-1.88718 -4.99469,-4.94869l13.0047,0l0,-3.19938c0,-4.98589 -3.37855,-9.04574 -8.53933,-9.04574ZM143.861,91.627c-4.67974,7.36549e-06 -8.60842,3.76985 -8.60842,8.49333l0,3.65973c0,5.33578 3.66625,9.18384 9.04578,9.18384c2.88654,0 5.69198,-1.17371 7.57261,-3.3605l-3.10728,-2.76206c-1.18091,1.26834 -2.62388,1.97948 -4.37326,1.97948c-3.06154,0 -4.99476,-1.88718 -4.99476,-4.94869l12.9817,0l0,-3.19938c0,-4.98589 -3.3555,-9.04574 -8.51635,-9.04574ZM66.9143,91.8802l0,20.8305l4.18912,0l0,-20.8305l-4.18912,0ZM46.7742,95.7701c2.53667,0 4.37554,1.92635 4.41929,4.41929l-8.83859,0c0.17493,-2.49295 1.83887,-4.41929 4.41929,-4.41929ZM82.4739,95.7701c2.53667,0 4.37554,1.92635 4.41929,4.41929l-8.83859,0c0.17493,-2.49295 1.83887,-4.41929 4.41929,-4.41929ZM143.815,95.7701c2.53667,0 4.37554,1.92635 4.41929,4.41929l-8.83859,0c0.17493,-2.49295 1.83887,-4.41929 4.41929,-4.41929ZM163.356,95.7701c2.40542,0 4.12003,1.94246 4.12003,4.30421l0,4.37326c0,2.49295 -1.58564,4.37326 -4.16607,4.37326c-2.75543,0 -4.14309,-2.11508 -4.14309,-4.6955l0,-4.05102c0,-2.44922 1.73988,-4.30421 4.18912,-4.30421Z" style="fill:#404040;"/></g><defs><linearGradient id="tag1" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-72.6276,19.5557,-19.5557,-72.6276,181.615,105.439)"><stop offset="0%" style="stop-color:#3b9df9;stop-opacity:1"/><stop offset="33%" style="stop-color:#b9a7e4;stop-opacity:1"/><stop offset="66%" style="stop-color:#f284bb;stop-opacity:1"/><stop offset="100%" style="stop-color:#f15050;stop-opacity:1"/></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
index cb0c0e596..ad8079f22 100644
--- a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
+++ b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
@@ -56,7 +56,7 @@
   width: 100%;
 }
 .rw-guidelines-list aside h1:before {
-  background-image: url(/assets/images/logo.svg);
+  background-image: url(./assets/logo.svg);
   background-repeat: no-repeat;
   content: "";
   display: block;
@@ -165,7 +165,7 @@
 }
 .rw-guidelines-list main > div:before {
   content: '';
-  background-image: url(/assets/images/logo.svg);
+  background-image: url(./assets/logo.svg);
   background-repeat: no-repeat;
   width: 400px;
   height: 400px;

From 92e000c04404333c0838429a788aff860724b8a9 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 25 Nov 2021 11:54:56 -0700
Subject: [PATCH 166/720] RW-169 add rw-icons as dependency for rw-token
 component

---
 .../common_design_subtheme/common_design_subtheme.libraries.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
index ed44af032..5a6560915 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
@@ -336,6 +336,8 @@ rw-token:
   css:
     theme:
       components/rw-token/rw-token.css: {}
+  dependencies:
+    - common_design_subtheme/rw-icons
 
 rw-topics:
   css:

From 4fbc96ccafed5bccfa2a104f369cdf83f6576de5 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 25 Nov 2021 11:59:28 -0700
Subject: [PATCH 167/720] add rules to display custom icon instead of native
 summary icon which does not work in chrome

---
 .../components/rw-token/rw-token.css            | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-token/rw-token.css b/html/themes/custom/common_design_subtheme/components/rw-token/rw-token.css
index 8bde74b4e..9100ec0bd 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-token/rw-token.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-token/rw-token.css
@@ -15,10 +15,27 @@
 }
 .token-help summary {
   padding: 8px;
+  list-style-type: none;
+  cursor: pointer;
   border: 1px solid #e6ecef;
   border-top: 0;
   line-height: 1.5;
 }
+.token-help summary::-webkit-details-marker {
+  display: none;
+}
+/* Custom icon */
+.token-help details summary::before {
+  display: inline-block;
+  overflow: hidden;
+  width: 12px;
+  height: 12px;
+  content: "";
+  background: var(--rw-icons--toggle--down--12--dark-blue);
+}
+.token-help details[open] > summary::before {
+  background: var(--rw-icons--toggle--up--12--dark-blue);
+}
 .token-help summary strong {
   font-size: 16px;
 }

From 7fd6d569406574bc1896e0cf87c53cce4b19cf1a Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 25 Nov 2021 12:11:35 -0700
Subject: [PATCH 168/720] RW-169 remove rule in favour of cd-table base rule

---
 .../common_design_subtheme/components/rw-token/rw-token.css    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-token/rw-token.css b/html/themes/custom/common_design_subtheme/components/rw-token/rw-token.css
index e889490a0..0b29c1d49 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-token/rw-token.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-token/rw-token.css
@@ -41,6 +41,3 @@
 .rw-token-help summary p {
   margin: 0;
 }
-.rw-token-help table th {
-  text-align: left;
-}

From 9181c3f99c9a9dca926ae0cfe86835c98e687bd2 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 26 Nov 2021 10:21:27 +0900
Subject: [PATCH 169/720] [RW-262] Allow different status when saving job or
 training with a potential new source

---
 .../src/EntityFormAlterServiceBase.php                   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php b/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
index 9abdaf1fc..e559d202b 100644
--- a/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
+++ b/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
@@ -580,10 +580,9 @@ public function validatePotentialNewSourceFields(array $form, FormStateInterface
    *   Form state.
    */
   public function handlePotentialNewSourceSubmission(array $form, FormStateInterface $form_state) {
-    $entity_type = $form_state
-      ?->getFormObject()
-      ?->getEntity()
-      ?->getEntityType();
+    $entity = $form_state?->getFormObject()?->getEntity();
+    $entity_type = $entity?->getEntityType();
+    $bundle = $entity?->bundle();
 
     if (!empty($entity_type) && $entity_type instanceof ContentEntityTypeInterface) {
       $revision_log_field = $entity_type->getRevisionMetadataKey('revision_log_message');
@@ -604,7 +603,7 @@ public function handlePotentialNewSourceSubmission(array $form, FormStateInterfa
 
         // If the status is "published" or "pending", change as appropriate.
         if ($status === 'published' || $status === 'pending') {
-          $status = $this->state->get('reliefweb_no_source_status', 'pending');
+          $status = $this->state->get('reliefweb_no_source_status_' . $bundle, 'pending');
           $form_state->setValue(['moderation_state', 0, 'value'], $status);
         }
       }

From 30271be62ecaceddc37fc50354a1f0005ba3a37b Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Mon, 29 Nov 2021 16:40:07 -0700
Subject: [PATCH 170/720] RW-263 remove specific rules in favour of template
 override with generic class

---
 .../components/rw-form/rw-form.css                 | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index b79f8f7c3..5cf224069 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -410,20 +410,6 @@ form > #actions legend + .form-type-checkbox.form-item-notifications-content-dis
   margin: 0;
 }
 
-/* Field with text that is not wrapped in description div */
-.field--name-body .text-full,
-.field--name-field-how-to-apply .text-full,
-.field--type-text-long .text-full, /* Generic selector? */
-.field--name-field-how-to-register .text-full {
-  font-size: 15px;
-  font-style: italic;
-  line-height: 24px;
-}
-.field--name-body .text-full,
-.field--type-text-long .text-full {
-  padding-top: 6px;
-}
-
 /* Text format wrapper */
 .form-type-textarea + .filter-wrapper.form-wrapper {
   margin-top: 0;

From 726eab77ac72a9166ab87df1ee17b383e16564a5 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Mon, 29 Nov 2021 16:41:44 -0700
Subject: [PATCH 171/720] RW-263 template override to add class to field
 description

---
 .../form/text-format-wrapper.html.twig        | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 html/themes/custom/common_design_subtheme/templates/form/text-format-wrapper.html.twig

diff --git a/html/themes/custom/common_design_subtheme/templates/form/text-format-wrapper.html.twig b/html/themes/custom/common_design_subtheme/templates/form/text-format-wrapper.html.twig
new file mode 100644
index 000000000..d44d5ce1d
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/templates/form/text-format-wrapper.html.twig
@@ -0,0 +1,21 @@
+{#
+/**
+ * @file
+ * Theme override for a text format-enabled form element.
+ *
+ * Available variables:
+ * - children: Text format element children.
+ * - description: Text format element description.
+ * - attributes: HTML attributes for the containing element.
+ * - aria_description: Flag for whether or not an ARIA description has been
+ *   added to the description container.
+ *
+ * @see template_preprocess_text_format_wrapper()
+ */
+#}
+<div class="js-text-format-wrapper js-form-item form-item">
+  {{ children }}
+  {% if description %}
+    <div{{ attributes.addClass('description') }}>{{ description }}</div>
+  {% endif %}
+</div>

From d8c8160aba812cc903ee4d247c33c421d2198a01 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 30 Nov 2021 12:00:14 +0100
Subject: [PATCH 172/720] Load guidelines from json

---
 .../guidelines-json/guidelines-json.css       |  66 ++++++
 .../guidelines-json/guidelines-json.js        | 215 ++++++++++++++++++
 .../guidelines/guidelines.libraries.yml       |   6 +
 .../custom/guidelines/guidelines.module       |  22 +-
 .../custom/guidelines/guidelines.routing.yml  |  13 ++
 .../Controller/GuidelineJsonController.php    |  51 +++++
 6 files changed, 372 insertions(+), 1 deletion(-)
 create mode 100644 html/modules/custom/guidelines/components/guidelines-json/guidelines-json.css
 create mode 100644 html/modules/custom/guidelines/components/guidelines-json/guidelines-json.js
 create mode 100644 html/modules/custom/guidelines/guidelines.libraries.yml
 create mode 100644 html/modules/custom/guidelines/guidelines.routing.yml
 create mode 100644 html/modules/custom/guidelines/src/Controller/GuidelineJsonController.php

diff --git a/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.css b/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.css
new file mode 100644
index 000000000..ae7c659b2
--- /dev/null
+++ b/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.css
@@ -0,0 +1,66 @@
+#main-content form[data-with-guidelines] button[data-guideline] {
+  display: inline-block;
+  vertical-align: middle;
+  position: absolute;
+  top: 0;
+  right: 0;
+  padding: 4px 10px;
+}
+#main-content form[data-with-guidelines] button[data-guideline]:hover {
+  background-position-x: -96px;
+}
+#main-content form[data-with-guidelines] .guideline:before {
+  content: "";
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  margin: 0;
+  padding: 0;
+  background: rgba(1, 1, 1, 0.3);
+  z-index: 10000;
+}
+#main-content form[data-with-guidelines] .guideline {
+  position: fixed;
+  top: 10vh;
+  left: 25vw;
+  width: 50vw;
+  height: 80vh;
+  border: 10px solid black;
+  border: 10px solid rgba(0, 0, 0, 0.1);
+  z-index: 1;
+}
+#main-content form[data-with-guidelines] .guideline > button[value="close"] {
+  position: absolute;
+  top: -50px;
+  left: -50px;
+  border: 2px solid #2e3436;
+  padding: 4px 10px;
+  z-index: 10002;
+}
+#main-content form[data-with-guidelines] .guideline > button[value="close"]:hover {
+  border-color: #eb1405;
+}
+#main-content form[data-with-guidelines] .guideline > button[value="close"]:hover:after {
+  background-position-x: -96px;
+}
+#main-content form[data-with-guidelines] .guideline > div {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  padding: 16px;
+  background-color: white;
+  overflow-y: auto;
+  overflow-x: hidden;
+  z-index: 10001;
+}
+#main-content form[data-with-guidelines] .guideline > div > h3 {
+  text-align: center;
+}
+#main-content form[data-with-guidelines] .guideline > div > .content {
+  padding-top: 0;
+}
+#main-content form[data-with-guidelines] .guideline > div > .content img {
+  border: 4px solid #e6ecef;
+}
diff --git a/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.js b/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.js
new file mode 100644
index 000000000..179662f53
--- /dev/null
+++ b/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.js
@@ -0,0 +1,215 @@
+/**
+ * Guidelines tooltip handling.
+ */
+(function ($) {
+
+  'use strict';
+
+  Drupal.behaviors.Guidelines = {
+    attach: function (context, settings) {
+      // Skip for IE8 and lower.
+      if (!document.addEventListener || !window.XMLHttpRequest) {
+        return;
+      }
+
+      var t = Drupal.t;
+
+      /**
+       * Helpers.
+       */
+
+      // Trim a string.
+      function trim(string) {
+        if (typeof string.trim === 'function') {
+          return string.trim();
+        }
+        return string.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '');
+      }
+
+      /**
+       * Main logic.
+       */
+
+      // Get the list of label/legend elements.
+      function getLabelElements(form) {
+        var labels = {};
+
+        // Search for field labels to which attach the guideline toggler.
+        var elements = form.querySelectorAll('fieldset[data-drupal-selector], div[data-drupal-selector]');
+        for (var i = 0, l = elements.length; i < l; i++) {
+          var element = elements[i];
+          if (!element.querySelector('[name]')) {
+            continue;
+          }
+
+          var fieldName = element.querySelector('[name]').name;
+          if (fieldName.indexOf('[')) {
+            fieldName = fieldName.substring(0, fieldName.indexOf('['));
+          }
+
+          var label = '';
+          var labelElement = element.querySelector('label, legend');
+          if (labelElement) {
+            label = trim(labelElement.textContent || labelElement.innerText);
+          }
+
+          labels[fieldName] = {
+            element: element,
+            label: label
+          };
+        }
+        return labels;
+      }
+
+      // Remove guidelines elements from the form.
+      function cleanGuidelines(form, popupOnly) {
+        var selector = '.guideline';
+        if (!popupOnly) {
+          selector += ', [data-guideline]';
+        }
+        var elements = form.querySelectorAll(selector);
+        for (var i = elements.length - 1; i >= 0; i--) {
+          var element = elements[i];
+          element.parentNode.removeChild(element);
+        }
+      }
+
+      // Hide the guideline popup.
+      function hideGuideline(form) {
+        cleanGuidelines(form, true);
+      }
+
+      // Show the guideline popup.
+      function showGuideline(form, card) {
+        hideGuideline(form);
+
+        var close = document.createElement('button');
+        close.setAttribute('type', 'button');
+        close.setAttribute('value', 'close');
+        close.appendChild(document.createTextNode(t('Close')));
+        close.addEventListener('click', function (event) {
+          hideGuideline(form);
+        });
+
+        form.addEventListener('keydown', function(event) {
+          const key = event.key;
+          if (key === "Escape") {
+            hideGuideline(form);
+          }
+        });
+
+        var link = document.createElement('a');
+        link.setAttribute('href', card.link);
+        link.appendChild(document.createTextNode(card.name));
+
+        var heading = document.createElement('h3');
+        heading.appendChild(link);
+
+        var content = document.createElement('div');
+        content.className = 'content';
+        content.innerHTML = card.content;
+
+        var container = document.createElement('div');
+        container.appendChild(heading);
+        container.appendChild(content);
+
+        var popup = document.createElement('div');
+        popup.className = 'guideline';
+        popup.appendChild(close);
+        popup.appendChild(container);
+
+        form.appendChild(popup);
+
+        // Update the links in the popup to open in new pages/tabs.
+        var links = popup.querySelectorAll('a');
+        for (var i = 0, l = links.length; i < l; i++) {
+          var link = links[i];
+          link.setAttribute('target', '_blank');
+          link.setAttribute('rel', 'noopener');
+        }
+      }
+
+      // Prepare the guidelines card.
+      function prepareGuidelines(data) {
+        console.log('prepareGuidelines');
+        var guidelines = {};
+
+        // Parse the guideline cards.
+        if (Array.isArray(data)) {
+          var cards = data;
+          for (var i = 0, l = cards.length; i < l; i++) {
+            var card = cards[i];
+            // Remove blank image used for lazy laoding.
+            card.content = card.content.replace(/src="\/assets\/images\/blank\.gif"/g, '');
+            // Add the card as guideline for each of the target fields.
+            guidelines[card.label] = card;
+          }
+        }
+
+        return guidelines;
+      }
+
+      // Add the guidelines to the page with a question mark icon to trigger the display.
+      function setGuidelines(form, guidelines) {
+        console.log('setGuidelines');
+        // Remove the existing guidelines from the page if any.
+        cleanGuidelines(form);
+
+        // Add a guideline toggler to each label element.
+        var list = getLabelElements(form);
+        for (var field in list) {
+          if (list.hasOwnProperty(field) && guidelines.hasOwnProperty(field)) {
+            var item = list[field];
+            var element = item.element;
+            var label = item.label;
+
+            var button = document.createElement('button');
+            button.setAttribute('type', 'button');
+            button.setAttribute('data-guideline', field);
+            button.appendChild(document.createTextNode(t('View guidelines for ' + label)));
+
+            button.addEventListener('click', function (event) {
+              showGuideline(form, guidelines[event.target.getAttribute('data-guideline')]);
+            });
+
+            if (element.nodeName === 'LABEL') {
+              element.parentNode.insertBefore(button, element.nextSibling);
+            }
+            else {
+              element.appendChild(button);
+            }
+          }
+        }
+      }
+
+      // Either load the guidelines from the guidelines site or use the cache.
+      function loadGuidelines(form) {
+        var entityId = form.getAttribute('data-guidelines-entity-type');
+        var bundle = form.getAttribute('data-guidelines-entity-bundle');
+        var url = '/guidelines/json/' + entityId + '/' + bundle;
+
+        // Load the guidelines.
+        var xhr = new XMLHttpRequest();
+        // 10 seconds timeout.
+        xhr.timeout = 10000;
+        xhr.onreadystatechange = function () {
+          if (xhr.readyState === 4 && xhr.status === 200) {
+            try {
+              setGuidelines(form, prepareGuidelines(JSON.parse(xhr.responseText)));
+            }
+            catch (error) {
+              // Do nothing.
+            }
+          }
+        };
+        xhr.open('GET', url, true);
+        xhr.send(null);
+      }
+
+      // Load the guidelines for the form.
+      $('form[data-with-guidelines]', context).once('guidelines').each(function () {
+        loadGuidelines(this);
+      });
+    }
+  };
+})(jQuery);
diff --git a/html/modules/custom/guidelines/guidelines.libraries.yml b/html/modules/custom/guidelines/guidelines.libraries.yml
new file mode 100644
index 000000000..c231c16c2
--- /dev/null
+++ b/html/modules/custom/guidelines/guidelines.libraries.yml
@@ -0,0 +1,6 @@
+guidelines-json:
+  css:
+    component:
+      components/guidelines-json/guidelines-json.css: {}
+  js:
+    components/guidelines-json/guidelines-json.js: {}
diff --git a/html/modules/custom/guidelines/guidelines.module b/html/modules/custom/guidelines/guidelines.module
index 0330d35b9..fc2a5593f 100644
--- a/html/modules/custom/guidelines/guidelines.module
+++ b/html/modules/custom/guidelines/guidelines.module
@@ -60,11 +60,31 @@ function guidelines_theme_suggestions_guideline(array $variables) {
   return $suggestions;
 }
 
+/**
+ * Implements hook_form_HOOK_alter().
+ */
+function guidelines_form_node_form_alter(array &$form, FormStateInterface $form_state) {
+  $bundle = '';
+  $form_object = $form_state->getFormObject();
+  $entity_type = $form_object->getEntity()->getEntityType()->id();
+  if ($form_object instanceof ContentEntityForm) {
+    $bundle = $form_object->getEntity()->bundle();
+  }
+
+  $form['#attributes']['data-guidelines-entity-type'] = $entity_type;
+  $form['#attributes']['data-guidelines-entity-bundle'] = $bundle;
+  $form['#attached']['library'][] = 'guidelines/guidelines-json';
+}
+
 /**
  * Implements hook_field_widget_form_alter().
  */
 function guidelines_field_widget_form_alter(&$element, FormStateInterface &$form_state, $context) {
-  guidelines_attach_to_widget($element, $form_state, $context);
+  // @todo add setting.
+  $display_inline = FALSE;
+  if ($display_inline) {
+    guidelines_attach_to_widget($element, $form_state, $context);
+  }
 }
 
 /**
diff --git a/html/modules/custom/guidelines/guidelines.routing.yml b/html/modules/custom/guidelines/guidelines.routing.yml
new file mode 100644
index 000000000..38d7b868a
--- /dev/null
+++ b/html/modules/custom/guidelines/guidelines.routing.yml
@@ -0,0 +1,13 @@
+guidelines.form.json:
+  path: '/guidelines/json/{entity_type}/{bundle}'
+  defaults:
+    _title: 'Guidelines'
+    _controller: '\Drupal\guidelines\Controller\GuidelineJsonController::getFormGuidelines'
+  options:
+    parameters:
+      entity_type:
+        type: string
+      bundle:
+        type: string
+  requirements:
+    _permission: 'access content'
diff --git a/html/modules/custom/guidelines/src/Controller/GuidelineJsonController.php b/html/modules/custom/guidelines/src/Controller/GuidelineJsonController.php
new file mode 100644
index 000000000..3a821c23b
--- /dev/null
+++ b/html/modules/custom/guidelines/src/Controller/GuidelineJsonController.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Drupal\guidelines\Controller;
+
+use Drupal\Core\Controller\ControllerBase;
+use Drupal\guidelines\Entity\Guideline;
+use Symfony\Component\HttpFoundation\JsonResponse;
+
+/**
+ * Class GuidelineJsonController.
+ *
+ *  Returns responses for Guideline routes.
+ */
+class GuidelineJsonController extends ControllerBase {
+
+  /**
+   * Return guidelines for a form.
+   *
+   * @param string $entity_type
+   *   The entity type.
+   *
+   * @param string $bundle
+   *   The entity bundle.
+   *
+   * @return array
+   *   An array suitable for drupal_render().
+   */
+  public function getFormGuidelines($entity_type, $bundle) {
+    /** @var Drupal\guidelines\Entity\Guideline[] $guidelines */
+    $guidelines = Guideline::loadByEntity($entity_type);
+    foreach ($guidelines as $guideline) {
+      foreach ($guideline->field_field as $field) {
+        list($e, $b, $f) = explode('.', $field->value);
+        if (!empty($bundle) && $bundle === $b) {
+          $view_builder = \Drupal::entityTypeManager()->getViewBuilder('guideline');
+          $pre_render = $view_builder->view($guideline, 'default');
+          $render_output = render($pre_render);
+
+          $descriptions[] = [
+            'label' => $f,
+            'content' => $render_output,
+            'link' => $guideline->toUrl()->toString(),
+          ];
+        }
+      }
+    }
+
+    return new JsonResponse($descriptions);
+  }
+
+}

From 97d710662f80059195ac51df5c1413d49b47cd5c Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 30 Nov 2021 12:12:39 +0100
Subject: [PATCH 173/720] Load guidelines from json

---
 .../components/guidelines-json/guidelines-json.css           | 5 +++++
 .../guidelines/components/guidelines-json/guidelines-json.js | 4 +---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.css b/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.css
index ae7c659b2..9a6046104 100644
--- a/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.css
+++ b/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.css
@@ -1,3 +1,7 @@
+#main-content form[data-with-guidelines] > * .form-wrapper {
+  position: relative;
+}
+
 #main-content form[data-with-guidelines] button[data-guideline] {
   display: inline-block;
   vertical-align: middle;
@@ -5,6 +9,7 @@
   top: 0;
   right: 0;
   padding: 4px 10px;
+  margin-top: 0;
 }
 #main-content form[data-with-guidelines] button[data-guideline]:hover {
   background-position-x: -96px;
diff --git a/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.js b/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.js
index 179662f53..683f09222 100644
--- a/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.js
+++ b/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.js
@@ -43,7 +43,7 @@
           }
 
           var fieldName = element.querySelector('[name]').name;
-          if (fieldName.indexOf('[')) {
+          if (fieldName.indexOf('[') > 0) {
             fieldName = fieldName.substring(0, fieldName.indexOf('['));
           }
 
@@ -131,7 +131,6 @@
 
       // Prepare the guidelines card.
       function prepareGuidelines(data) {
-        console.log('prepareGuidelines');
         var guidelines = {};
 
         // Parse the guideline cards.
@@ -151,7 +150,6 @@
 
       // Add the guidelines to the page with a question mark icon to trigger the display.
       function setGuidelines(form, guidelines) {
-        console.log('setGuidelines');
         // Remove the existing guidelines from the page if any.
         cleanGuidelines(form);
 

From a27f1aa84bc3cf7ea4c7304b37e4ade7702fd044 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 30 Nov 2021 12:57:44 +0100
Subject: [PATCH 174/720] Add global settings

---
 .../config/install/guidelines.settings.yml    |  2 +
 ..._type.schema.yml => guidelines.schema.yml} | 12 ++--
 .../custom/guidelines/guidelines.module       | 26 +++----
 .../custom/guidelines/guidelines.routing.yml  |  7 ++
 .../src/Form/GuidelineGlobalSettingsForm.php  | 70 +++++++++++++++++++
 5 files changed, 98 insertions(+), 19 deletions(-)
 create mode 100644 html/modules/custom/guidelines/config/install/guidelines.settings.yml
 rename html/modules/custom/guidelines/config/schema/{guideline_type.schema.yml => guidelines.schema.yml} (51%)
 create mode 100644 html/modules/custom/guidelines/src/Form/GuidelineGlobalSettingsForm.php

diff --git a/html/modules/custom/guidelines/config/install/guidelines.settings.yml b/html/modules/custom/guidelines/config/install/guidelines.settings.yml
new file mode 100644
index 000000000..964ac4e31
--- /dev/null
+++ b/html/modules/custom/guidelines/config/install/guidelines.settings.yml
@@ -0,0 +1,2 @@
+overwrite_description: true
+use_json_loading: false
diff --git a/html/modules/custom/guidelines/config/schema/guideline_type.schema.yml b/html/modules/custom/guidelines/config/schema/guidelines.schema.yml
similarity index 51%
rename from html/modules/custom/guidelines/config/schema/guideline_type.schema.yml
rename to html/modules/custom/guidelines/config/schema/guidelines.schema.yml
index 37c49bcd5..ff7b2c773 100644
--- a/html/modules/custom/guidelines/config/schema/guideline_type.schema.yml
+++ b/html/modules/custom/guidelines/config/schema/guidelines.schema.yml
@@ -2,11 +2,9 @@ guidelines.guideline_type.*:
   type: config_entity
   label: 'Guideline type config'
   mapping:
-    id:
-      type: string
+    overwrite_description:
+      type: boolean
+      label: 'ID'
+    use_json_loading:
+      type: boolean
       label: 'ID'
-    label:
-      type: label
-      label: 'Label'
-    uuid:
-      type: string
diff --git a/html/modules/custom/guidelines/guidelines.module b/html/modules/custom/guidelines/guidelines.module
index fc2a5593f..32c47ca9e 100644
--- a/html/modules/custom/guidelines/guidelines.module
+++ b/html/modules/custom/guidelines/guidelines.module
@@ -64,25 +64,27 @@ function guidelines_theme_suggestions_guideline(array $variables) {
  * Implements hook_form_HOOK_alter().
  */
 function guidelines_form_node_form_alter(array &$form, FormStateInterface $form_state) {
-  $bundle = '';
-  $form_object = $form_state->getFormObject();
-  $entity_type = $form_object->getEntity()->getEntityType()->id();
-  if ($form_object instanceof ContentEntityForm) {
-    $bundle = $form_object->getEntity()->bundle();
-  }
+  $config = \Drupal::config('guidelines.settings');
+  if ($config->get('use_json_loading')) {
+    $bundle = '';
+    $form_object = $form_state->getFormObject();
+    $entity_type = $form_object->getEntity()->getEntityType()->id();
+    if ($form_object instanceof ContentEntityForm) {
+      $bundle = $form_object->getEntity()->bundle();
+    }
 
-  $form['#attributes']['data-guidelines-entity-type'] = $entity_type;
-  $form['#attributes']['data-guidelines-entity-bundle'] = $bundle;
-  $form['#attached']['library'][] = 'guidelines/guidelines-json';
+    $form['#attributes']['data-guidelines-entity-type'] = $entity_type;
+    $form['#attributes']['data-guidelines-entity-bundle'] = $bundle;
+    $form['#attached']['library'][] = 'guidelines/guidelines-json';
+  }
 }
 
 /**
  * Implements hook_field_widget_form_alter().
  */
 function guidelines_field_widget_form_alter(&$element, FormStateInterface &$form_state, $context) {
-  // @todo add setting.
-  $display_inline = FALSE;
-  if ($display_inline) {
+  $config = \Drupal::config('guidelines.settings');
+  if ($config->get('overwrite_description')) {
     guidelines_attach_to_widget($element, $form_state, $context);
   }
 }
diff --git a/html/modules/custom/guidelines/guidelines.routing.yml b/html/modules/custom/guidelines/guidelines.routing.yml
index 38d7b868a..864de7d92 100644
--- a/html/modules/custom/guidelines/guidelines.routing.yml
+++ b/html/modules/custom/guidelines/guidelines.routing.yml
@@ -11,3 +11,10 @@ guidelines.form.json:
         type: string
   requirements:
     _permission: 'access content'
+guidelines.settings:
+  path: '/admin/structure/guideline_type/settings'
+  defaults:
+    _form: '\Drupal\guidelines\Form\GuidelineGlobalSettingsForm'
+    _title: 'Global guideline settings'
+  requirements:
+    _permission: 'administer site configuration'
diff --git a/html/modules/custom/guidelines/src/Form/GuidelineGlobalSettingsForm.php b/html/modules/custom/guidelines/src/Form/GuidelineGlobalSettingsForm.php
new file mode 100644
index 000000000..86e225c4c
--- /dev/null
+++ b/html/modules/custom/guidelines/src/Form/GuidelineGlobalSettingsForm.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Drupal\guidelines\Form;
+
+use Drupal\Core\Form\ConfigFormBase;
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * Configure example settings for this site.
+ */
+class GuidelineGlobalSettingsForm extends ConfigFormBase {
+
+  /**
+   * Config settings.
+   *
+   * @var string
+   */
+  const SETTINGS = 'guidelines.settings';
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'guidelines_global_settings';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEditableConfigNames() {
+    return [
+      static::SETTINGS,
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    $config = $this->config(static::SETTINGS);
+
+    $form['overwrite_description'] = [
+      '#type' => 'checkbox',
+      '#title' => $this->t('Overwrite description'),
+      '#default_value' => $config->get('overwrite_description'),
+    ];
+
+    $form['use_json_loading'] = [
+      '#type' => 'checkbox',
+      '#title' => $this->t('Use Json to load guidelines'),
+      '#default_value' => $config->get('use_json_loading'),
+    ];
+
+    return parent::buildForm($form, $form_state);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    // Retrieve the configuration.
+    $this->configFactory->getEditable(static::SETTINGS)
+      ->set('overwrite_description', $form_state->getValue('overwrite_description'))
+      ->set('use_json_loading', $form_state->getValue('use_json_loading'))
+      ->save();
+
+    parent::submitForm($form, $form_state);
+  }
+
+}

From ab75977f13d1c51ba915909bded139d8fd91498d Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 30 Nov 2021 12:58:22 +0100
Subject: [PATCH 175/720] Use Json callback

---
 config/guidelines.settings.yml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 config/guidelines.settings.yml

diff --git a/config/guidelines.settings.yml b/config/guidelines.settings.yml
new file mode 100644
index 000000000..5f832cc7f
--- /dev/null
+++ b/config/guidelines.settings.yml
@@ -0,0 +1,2 @@
+overwrite_description: 0
+use_json_loading: 1

From c672b9c32726911cebeb8621200288e84a0be792 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 30 Nov 2021 15:04:01 +0100
Subject: [PATCH 176/720] Add default config for guidelines

---
 ...play.guideline.field_guideline.default.yml | 72 +++++++++++++++++++
 ...splay.guideline.guideline_list.default.yml | 39 ++++++++++
 ...play.guideline.field_guideline.default.yml | 49 +++++++++++++
 ...splay.guideline.guideline_list.default.yml | 23 ++++++
 ...line.field_guideline.field_description.yml | 23 ++++++
 ....guideline.field_guideline.field_field.yml | 23 ++++++
 ...guideline.field_guideline.field_images.yml | 40 +++++++++++
 ....guideline.field_guideline.field_title.yml | 21 ++++++
 ...d.guideline.guideline_list.field_title.yml | 21 ++++++
 ...ld.storage.guideline.field_description.yml | 21 ++++++
 .../field.storage.guideline.field_field.yml   | 23 ++++++
 .../field.storage.guideline.field_images.yml  | 32 +++++++++
 .../field.storage.guideline.field_title.yml   | 23 ++++++
 .../optional/filter.format.guideline.yml      | 10 +++
 ...delines.guideline_type.field_guideline.yml |  8 +++
 ...idelines.guideline_type.guideline_list.yml |  8 +++
 .../config/optional/guidelines.settings.yml   |  4 ++
 .../image.style.guideline_thumbnail.yml       | 17 +++++
 18 files changed, 457 insertions(+)
 create mode 100644 html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.field_guideline.default.yml
 create mode 100644 html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.guideline_list.default.yml
 create mode 100644 html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.field_guideline.default.yml
 create mode 100644 html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.guideline_list.default.yml
 create mode 100644 html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_description.yml
 create mode 100644 html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_field.yml
 create mode 100644 html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_images.yml
 create mode 100644 html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_title.yml
 create mode 100644 html/modules/custom/guidelines/config/optional/field.field.guideline.guideline_list.field_title.yml
 create mode 100644 html/modules/custom/guidelines/config/optional/field.storage.guideline.field_description.yml
 create mode 100644 html/modules/custom/guidelines/config/optional/field.storage.guideline.field_field.yml
 create mode 100644 html/modules/custom/guidelines/config/optional/field.storage.guideline.field_images.yml
 create mode 100644 html/modules/custom/guidelines/config/optional/field.storage.guideline.field_title.yml
 create mode 100644 html/modules/custom/guidelines/config/optional/filter.format.guideline.yml
 create mode 100644 html/modules/custom/guidelines/config/optional/guidelines.guideline_type.field_guideline.yml
 create mode 100644 html/modules/custom/guidelines/config/optional/guidelines.guideline_type.guideline_list.yml
 create mode 100644 html/modules/custom/guidelines/config/optional/guidelines.settings.yml
 create mode 100644 html/modules/custom/guidelines/config/optional/image.style.guideline_thumbnail.yml

diff --git a/html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.field_guideline.default.yml b/html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.field_guideline.default.yml
new file mode 100644
index 000000000..22a03c206
--- /dev/null
+++ b/html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.field_guideline.default.yml
@@ -0,0 +1,72 @@
+uuid: db8b3fae-ba53-44db-b43f-a6ae4d615c19
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.guideline.field_guideline.field_description
+    - field.field.guideline.field_guideline.field_field
+    - field.field.guideline.field_guideline.field_images
+    - field.field.guideline.field_guideline.field_title
+    - guidelines.guideline_type.field_guideline
+    - image.style.thumbnail
+  module:
+    - guidelines
+    - image
+    - text
+_core:
+  default_config_hash: XXlsTcAlLRRtvJj174jQGx2nmslAFjmjE_0E9kaoer4
+id: guideline.field_guideline.default
+targetEntityType: guideline
+bundle: field_guideline
+mode: default
+content:
+  field_description:
+    weight: 3
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
+    type: text_textarea
+    region: content
+  field_field:
+    type: guideline_field_target_widget
+    weight: 1
+    region: content
+    settings:
+      enabled_entities: {  }
+    third_party_settings: {  }
+  field_images:
+    type: image_image
+    weight: 4
+    region: content
+    settings:
+      progress_indicator: throbber
+      preview_image_style: thumbnail
+    third_party_settings: {  }
+  field_title:
+    type: string_textfield
+    weight: 2
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: 0
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  user_id:
+    type: entity_reference_autocomplete
+    weight: 5
+    settings:
+      match_operator: CONTAINS
+      size: 60
+      placeholder: ''
+      match_limit: 10
+    region: content
+    third_party_settings: {  }
+hidden: {  }
diff --git a/html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.guideline_list.default.yml b/html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.guideline_list.default.yml
new file mode 100644
index 000000000..1a91721d4
--- /dev/null
+++ b/html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.guideline_list.default.yml
@@ -0,0 +1,39 @@
+uuid: 411a138e-0931-4ea2-ae71-1ac2e6088677
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.guideline.guideline_list.field_title
+    - guidelines.guideline_type.guideline_list
+id: guideline.guideline_list.default
+targetEntityType: guideline
+bundle: guideline_list
+mode: default
+content:
+  field_title:
+    type: string_textfield
+    weight: 1
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: 0
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  user_id:
+    type: entity_reference_autocomplete
+    weight: 2
+    settings:
+      match_operator: CONTAINS
+      size: 60
+      placeholder: ''
+      match_limit: 10
+    region: content
+    third_party_settings: {  }
+hidden: {  }
diff --git a/html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.field_guideline.default.yml b/html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.field_guideline.default.yml
new file mode 100644
index 000000000..198e84e5e
--- /dev/null
+++ b/html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.field_guideline.default.yml
@@ -0,0 +1,49 @@
+uuid: 0b647595-f800-436c-886b-86b9cdddddf3
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.guideline.field_guideline.field_description
+    - field.field.guideline.field_guideline.field_field
+    - field.field.guideline.field_guideline.field_images
+    - field.field.guideline.field_guideline.field_title
+    - guidelines.guideline_type.field_guideline
+    - image.style.guideline_thumbnail
+  module:
+    - image
+    - text
+_core:
+  default_config_hash: JBK1yTRF_13cr3EO-TqKmATMudfSZ0rseazvXXvFwXE
+id: guideline.field_guideline.default
+targetEntityType: guideline
+bundle: field_guideline
+mode: default
+content:
+  field_description:
+    weight: 1
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    type: text_default
+    region: content
+  field_images:
+    type: image
+    weight: 2
+    region: content
+    label: hidden
+    settings:
+      image_style: guideline_thumbnail
+      image_link: file
+    third_party_settings: {  }
+  field_title:
+    type: string
+    weight: 0
+    region: content
+    label: hidden
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+hidden:
+  field_field: true
+  name: true
+  user_id: true
diff --git a/html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.guideline_list.default.yml b/html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.guideline_list.default.yml
new file mode 100644
index 000000000..14bedf32c
--- /dev/null
+++ b/html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.guideline_list.default.yml
@@ -0,0 +1,23 @@
+uuid: 0f37fbb4-2654-420c-8388-353ed6924d10
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.guideline.guideline_list.field_title
+    - guidelines.guideline_type.guideline_list
+id: guideline.guideline_list.default
+targetEntityType: guideline
+bundle: guideline_list
+mode: default
+content:
+  field_title:
+    type: string
+    weight: 0
+    region: content
+    label: hidden
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+hidden:
+  name: true
+  user_id: true
diff --git a/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_description.yml b/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_description.yml
new file mode 100644
index 000000000..b6eece468
--- /dev/null
+++ b/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_description.yml
@@ -0,0 +1,23 @@
+uuid: 28764320-180a-41cd-9f64-ee6af4e22ca6
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.guideline.field_description
+    - guidelines.guideline_type.field_guideline
+  module:
+    - text
+_core:
+  default_config_hash: BPCv5oHSMuhnU1679DNYNiksCq19tzBWM5Iy0UDck3o
+id: guideline.field_guideline.field_description
+field_name: field_description
+entity_type: guideline
+bundle: field_guideline
+label: Description
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: text_long
diff --git a/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_field.yml b/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_field.yml
new file mode 100644
index 000000000..8212289c1
--- /dev/null
+++ b/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_field.yml
@@ -0,0 +1,23 @@
+uuid: 6f2c048f-a870-4564-bcd0-bbb99bdb2230
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.guideline.field_field
+    - guidelines.guideline_type.field_guideline
+  module:
+    - guidelines
+_core:
+  default_config_hash: L9ZNWFfxj20i_jdiWKadKxcW6h_tf2k6fy6kWxFvSwE
+id: guideline.field_guideline.field_field
+field_name: field_field
+entity_type: guideline
+bundle: field_guideline
+label: Field
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: guideline_field_target_type
diff --git a/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_images.yml b/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_images.yml
new file mode 100644
index 000000000..2e4ca0dc6
--- /dev/null
+++ b/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_images.yml
@@ -0,0 +1,40 @@
+uuid: 009da1be-68e9-4c4b-af3b-b7f16a914aad
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.guideline.field_images
+    - guidelines.guideline_type.field_guideline
+  module:
+    - image
+_core:
+  default_config_hash: cc_Jy64zAs-J8RvisXtUAJLKRORM6CF7_mcDyygEKEM
+id: guideline.field_guideline.field_images
+field_name: field_images
+entity_type: guideline
+bundle: field_guideline
+label: Images
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  file_directory: 'guidelines/[date:custom:Y]-[date:custom:m]'
+  file_extensions: 'png gif jpg jpeg'
+  max_filesize: ''
+  max_resolution: ''
+  min_resolution: ''
+  alt_field: true
+  alt_field_required: false
+  title_field: false
+  title_field_required: false
+  default_image:
+    uuid: ''
+    alt: ''
+    title: ''
+    width: null
+    height: null
+  handler: 'default:file'
+  handler_settings: {  }
+field_type: image
diff --git a/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_title.yml b/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_title.yml
new file mode 100644
index 000000000..ad86a2330
--- /dev/null
+++ b/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_title.yml
@@ -0,0 +1,21 @@
+uuid: 940acb12-d9cd-4884-a950-ca03f6fedcba
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.guideline.field_title
+    - guidelines.guideline_type.field_guideline
+_core:
+  default_config_hash: kDwwr4SEaRr5x9keQF2MIn7yD0XYIvSlzOmVQ6osytQ
+id: guideline.field_guideline.field_title
+field_name: field_title
+entity_type: guideline
+bundle: field_guideline
+label: Title
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string
diff --git a/html/modules/custom/guidelines/config/optional/field.field.guideline.guideline_list.field_title.yml b/html/modules/custom/guidelines/config/optional/field.field.guideline.guideline_list.field_title.yml
new file mode 100644
index 000000000..c462f27d9
--- /dev/null
+++ b/html/modules/custom/guidelines/config/optional/field.field.guideline.guideline_list.field_title.yml
@@ -0,0 +1,21 @@
+uuid: dd89ed7c-df45-45d7-aa35-8f9793c28755
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.guideline.field_title
+    - guidelines.guideline_type.guideline_list
+_core:
+  default_config_hash: uAdEVEW9C6BUJdvGJoYS1ScnGh1nIkJOjVLthE8_VhY
+id: guideline.guideline_list.field_title
+field_name: field_title
+entity_type: guideline
+bundle: guideline_list
+label: Title
+description: ''
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: string
diff --git a/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_description.yml b/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_description.yml
new file mode 100644
index 000000000..96feb58c2
--- /dev/null
+++ b/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_description.yml
@@ -0,0 +1,21 @@
+uuid: 63011e49-3133-4297-abc7-3fb47eab242f
+langcode: en
+status: true
+dependencies:
+  module:
+    - guidelines
+    - text
+_core:
+  default_config_hash: z1oaNAyU3Y_eNTHnd-B9A4axfADTVcLsIJVqWqoYzQo
+id: guideline.field_description
+field_name: field_description
+entity_type: guideline
+type: text_long
+settings: {  }
+module: text
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_field.yml b/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_field.yml
new file mode 100644
index 000000000..3c5c638f2
--- /dev/null
+++ b/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_field.yml
@@ -0,0 +1,23 @@
+uuid: bd31610f-d04b-4819-b2e8-182079b7c500
+langcode: en
+status: true
+dependencies:
+  module:
+    - guidelines
+_core:
+  default_config_hash: QpchgOdA3NjTwwHuwZVG8c_nHPlPLNXtKM3JkLLxmqY
+id: guideline.field_field
+field_name: field_field
+entity_type: guideline
+type: guideline_field_target_type
+settings:
+  enabled_entities:
+    node: node
+    terms: 0
+module: guidelines
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_images.yml b/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_images.yml
new file mode 100644
index 000000000..00ea86083
--- /dev/null
+++ b/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_images.yml
@@ -0,0 +1,32 @@
+uuid: 000df8e9-190f-4ca7-9c1f-d6f3e7da5e6c
+langcode: en
+status: true
+dependencies:
+  module:
+    - file
+    - guidelines
+    - image
+_core:
+  default_config_hash: IjqQw0WM7J--ozV4mZK_zoqWGdSieXNmjqxMYX7k7QY
+id: guideline.field_images
+field_name: field_images
+entity_type: guideline
+type: image
+settings:
+  uri_scheme: public
+  default_image:
+    uuid: ''
+    alt: ''
+    title: ''
+    width: null
+    height: null
+  target_type: file
+  display_field: false
+  display_default: false
+module: image
+locked: false
+cardinality: -1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_title.yml b/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_title.yml
new file mode 100644
index 000000000..b10e6fee1
--- /dev/null
+++ b/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_title.yml
@@ -0,0 +1,23 @@
+uuid: f3a5baf7-f41f-4d83-b691-23f3eb58d165
+langcode: en
+status: true
+dependencies:
+  module:
+    - guidelines
+_core:
+  default_config_hash: jXJwBrtuJBH5XA9ali94dBdN3dcCfQnzasBqYlR2XEo
+id: guideline.field_title
+field_name: field_title
+entity_type: guideline
+type: string
+settings:
+  max_length: 255
+  is_ascii: false
+  case_sensitive: false
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/html/modules/custom/guidelines/config/optional/filter.format.guideline.yml b/html/modules/custom/guidelines/config/optional/filter.format.guideline.yml
new file mode 100644
index 000000000..ac8017428
--- /dev/null
+++ b/html/modules/custom/guidelines/config/optional/filter.format.guideline.yml
@@ -0,0 +1,10 @@
+uuid: f94d05b1-32d4-4a37-a31f-113224793bf4
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: ZDQxGl6Vm9OSrSNM35su0ET2Vw7Jiih-ebEsHStrO9A
+name: Guideline
+format: guideline
+weight: 0
+filters: {  }
diff --git a/html/modules/custom/guidelines/config/optional/guidelines.guideline_type.field_guideline.yml b/html/modules/custom/guidelines/config/optional/guidelines.guideline_type.field_guideline.yml
new file mode 100644
index 000000000..a39fe4738
--- /dev/null
+++ b/html/modules/custom/guidelines/config/optional/guidelines.guideline_type.field_guideline.yml
@@ -0,0 +1,8 @@
+uuid: 33cf67f7-6536-4f60-99be-13b52a3a7124
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: 7Oaeq96v71gW-62FuTmu6EDF1-4UvfQ74XEw_6UfaxQ
+id: field_guideline
+label: 'Field guideline'
diff --git a/html/modules/custom/guidelines/config/optional/guidelines.guideline_type.guideline_list.yml b/html/modules/custom/guidelines/config/optional/guidelines.guideline_type.guideline_list.yml
new file mode 100644
index 000000000..a5389186d
--- /dev/null
+++ b/html/modules/custom/guidelines/config/optional/guidelines.guideline_type.guideline_list.yml
@@ -0,0 +1,8 @@
+uuid: a5377093-5dee-404b-ad55-e416b117c166
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: gkK7dqqndcFEd0aPHuYH7Fcq8kt9YOSsP102UhiDYmM
+id: guideline_list
+label: 'Guideline list'
diff --git a/html/modules/custom/guidelines/config/optional/guidelines.settings.yml b/html/modules/custom/guidelines/config/optional/guidelines.settings.yml
new file mode 100644
index 000000000..34bfe6325
--- /dev/null
+++ b/html/modules/custom/guidelines/config/optional/guidelines.settings.yml
@@ -0,0 +1,4 @@
+overwrite_description: true
+use_json_loading: false
+_core:
+  default_config_hash: v8p95xMj6CaApQM12ImT_9hDONKce32ZXfvTTJ7v0hM
diff --git a/html/modules/custom/guidelines/config/optional/image.style.guideline_thumbnail.yml b/html/modules/custom/guidelines/config/optional/image.style.guideline_thumbnail.yml
new file mode 100644
index 000000000..14d87b175
--- /dev/null
+++ b/html/modules/custom/guidelines/config/optional/image.style.guideline_thumbnail.yml
@@ -0,0 +1,17 @@
+uuid: 3153f7d4-05a0-4a0f-964c-e1ccc3a8bfdd
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: HEdSZipodL-YVJ73x_Z3m3asKdPOP4K1iZsbz1MiM3E
+name: guideline_thumbnail
+label: 'Guideline thumbnail'
+effects:
+  9788b5f9-ff16-47a9-92a0-1c66b68753cb:
+    uuid: 9788b5f9-ff16-47a9-92a0-1c66b68753cb
+    id: image_scale
+    weight: 1
+    data:
+      width: null
+      height: 200
+      upscale: false

From d1e1969299b49c0e39fb344b56e1234b4eec7569 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 30 Nov 2021 15:24:11 +0100
Subject: [PATCH 177/720] Add default config for guidelines

---
 ...ntity_form_display.guideline.field_guideline.default.yml | 6 ++++--
 ...entity_form_display.guideline.guideline_list.default.yml | 2 ++
 ...ntity_view_display.guideline.field_guideline.default.yml | 2 +-
 ...entity_view_display.guideline.guideline_list.default.yml | 2 ++
 ...ld.field.guideline.field_guideline.field_description.yml | 2 +-
 .../field.field.guideline.field_guideline.field_field.yml   | 2 +-
 .../field.field.guideline.field_guideline.field_images.yml  | 2 +-
 .../field.field.guideline.field_guideline.field_title.yml   | 2 +-
 .../field.field.guideline.guideline_list.field_title.yml    | 2 +-
 .../optional/field.storage.guideline.field_description.yml  | 2 +-
 .../config/optional/field.storage.guideline.field_field.yml | 2 +-
 .../optional/field.storage.guideline.field_images.yml       | 2 +-
 .../config/optional/field.storage.guideline.field_title.yml | 2 +-
 .../guidelines/config/optional/filter.format.guideline.yml  | 2 +-
 .../optional/guidelines.guideline_type.field_guideline.yml  | 2 +-
 .../optional/guidelines.guideline_type.guideline_list.yml   | 2 +-
 .../guidelines/config/optional/guidelines.settings.yml      | 4 ++--
 .../config/optional/image.style.guideline_thumbnail.yml     | 4 ++--
 html/modules/custom/guidelines/guidelines.info.yml          | 1 +
 html/modules/custom/guidelines/guidelines.module            | 1 +
 20 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.field_guideline.default.yml b/html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.field_guideline.default.yml
index 22a03c206..35ddf3b45 100644
--- a/html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.field_guideline.default.yml
+++ b/html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.field_guideline.default.yml
@@ -14,7 +14,7 @@ dependencies:
     - image
     - text
 _core:
-  default_config_hash: XXlsTcAlLRRtvJj174jQGx2nmslAFjmjE_0E9kaoer4
+  default_config_hash: Ab3vpnYyoRCDZyMztb7uQVb3QEDHedeavdQyjSnH9o0
 id: guideline.field_guideline.default
 targetEntityType: guideline
 bundle: field_guideline
@@ -33,7 +33,9 @@ content:
     weight: 1
     region: content
     settings:
-      enabled_entities: {  }
+      enabled_entities:
+        - node.article
+        - node.page
     third_party_settings: {  }
   field_images:
     type: image_image
diff --git a/html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.guideline_list.default.yml b/html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.guideline_list.default.yml
index 1a91721d4..620560e80 100644
--- a/html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.guideline_list.default.yml
+++ b/html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.guideline_list.default.yml
@@ -5,6 +5,8 @@ dependencies:
   config:
     - field.field.guideline.guideline_list.field_title
     - guidelines.guideline_type.guideline_list
+_core:
+  default_config_hash: cOLkuh7YgdD87onZdwnChMrJfJZHPB0xUcPEBg69kIg
 id: guideline.guideline_list.default
 targetEntityType: guideline
 bundle: guideline_list
diff --git a/html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.field_guideline.default.yml b/html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.field_guideline.default.yml
index 198e84e5e..ee009100c 100644
--- a/html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.field_guideline.default.yml
+++ b/html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.field_guideline.default.yml
@@ -13,7 +13,7 @@ dependencies:
     - image
     - text
 _core:
-  default_config_hash: JBK1yTRF_13cr3EO-TqKmATMudfSZ0rseazvXXvFwXE
+  default_config_hash: z8Ooy8lqwORX8fFn5ruQGyemnJ34dCvhTM1IsH0yBX0
 id: guideline.field_guideline.default
 targetEntityType: guideline
 bundle: field_guideline
diff --git a/html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.guideline_list.default.yml b/html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.guideline_list.default.yml
index 14bedf32c..9cc0fbf7a 100644
--- a/html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.guideline_list.default.yml
+++ b/html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.guideline_list.default.yml
@@ -5,6 +5,8 @@ dependencies:
   config:
     - field.field.guideline.guideline_list.field_title
     - guidelines.guideline_type.guideline_list
+_core:
+  default_config_hash: l7evZXfALoTXsWTb55YC72niCmLTIgBcZpLUYZ1Mha0
 id: guideline.guideline_list.default
 targetEntityType: guideline
 bundle: guideline_list
diff --git a/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_description.yml b/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_description.yml
index b6eece468..dc3c9236d 100644
--- a/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_description.yml
+++ b/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_description.yml
@@ -8,7 +8,7 @@ dependencies:
   module:
     - text
 _core:
-  default_config_hash: BPCv5oHSMuhnU1679DNYNiksCq19tzBWM5Iy0UDck3o
+  default_config_hash: xRG7EyzEYPUsfPwbPUvSSnTyqvhncuO7Cu1HZa2v0L8
 id: guideline.field_guideline.field_description
 field_name: field_description
 entity_type: guideline
diff --git a/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_field.yml b/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_field.yml
index 8212289c1..20fdda9e7 100644
--- a/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_field.yml
+++ b/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_field.yml
@@ -8,7 +8,7 @@ dependencies:
   module:
     - guidelines
 _core:
-  default_config_hash: L9ZNWFfxj20i_jdiWKadKxcW6h_tf2k6fy6kWxFvSwE
+  default_config_hash: xDe-me9dIKGdeZ2uvP3eFdmLa-uF3kxPV_KrPAxp_p0
 id: guideline.field_guideline.field_field
 field_name: field_field
 entity_type: guideline
diff --git a/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_images.yml b/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_images.yml
index 2e4ca0dc6..fe6683acc 100644
--- a/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_images.yml
+++ b/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_images.yml
@@ -8,7 +8,7 @@ dependencies:
   module:
     - image
 _core:
-  default_config_hash: cc_Jy64zAs-J8RvisXtUAJLKRORM6CF7_mcDyygEKEM
+  default_config_hash: 0i3UZEOfLqHYUULM5Bgmug8PhP1LAUA9z-JL-zpVIgM
 id: guideline.field_guideline.field_images
 field_name: field_images
 entity_type: guideline
diff --git a/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_title.yml b/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_title.yml
index ad86a2330..564a1f6fc 100644
--- a/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_title.yml
+++ b/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_title.yml
@@ -6,7 +6,7 @@ dependencies:
     - field.storage.guideline.field_title
     - guidelines.guideline_type.field_guideline
 _core:
-  default_config_hash: kDwwr4SEaRr5x9keQF2MIn7yD0XYIvSlzOmVQ6osytQ
+  default_config_hash: 3n2TNCY9_hvLT5RM_J2obSPOlkfsBPfXfxuzIUwEoDc
 id: guideline.field_guideline.field_title
 field_name: field_title
 entity_type: guideline
diff --git a/html/modules/custom/guidelines/config/optional/field.field.guideline.guideline_list.field_title.yml b/html/modules/custom/guidelines/config/optional/field.field.guideline.guideline_list.field_title.yml
index c462f27d9..57827bd01 100644
--- a/html/modules/custom/guidelines/config/optional/field.field.guideline.guideline_list.field_title.yml
+++ b/html/modules/custom/guidelines/config/optional/field.field.guideline.guideline_list.field_title.yml
@@ -6,7 +6,7 @@ dependencies:
     - field.storage.guideline.field_title
     - guidelines.guideline_type.guideline_list
 _core:
-  default_config_hash: uAdEVEW9C6BUJdvGJoYS1ScnGh1nIkJOjVLthE8_VhY
+  default_config_hash: 9z_l0Nq-uhCN_q33_nH8Ar35ywMMIJUhYHSsUo1Do9A
 id: guideline.guideline_list.field_title
 field_name: field_title
 entity_type: guideline
diff --git a/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_description.yml b/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_description.yml
index 96feb58c2..956c49fe5 100644
--- a/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_description.yml
+++ b/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_description.yml
@@ -6,7 +6,7 @@ dependencies:
     - guidelines
     - text
 _core:
-  default_config_hash: z1oaNAyU3Y_eNTHnd-B9A4axfADTVcLsIJVqWqoYzQo
+  default_config_hash: iMlQKG6EJKUKjUFeoIRGJlo2JgV3Z3gba0tHkrMmAvc
 id: guideline.field_description
 field_name: field_description
 entity_type: guideline
diff --git a/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_field.yml b/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_field.yml
index 3c5c638f2..62e14dc65 100644
--- a/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_field.yml
+++ b/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_field.yml
@@ -5,7 +5,7 @@ dependencies:
   module:
     - guidelines
 _core:
-  default_config_hash: QpchgOdA3NjTwwHuwZVG8c_nHPlPLNXtKM3JkLLxmqY
+  default_config_hash: hQaVczFbTCv4rS6s7basyYMTBR1NRvtaLtOzLw6h1BE
 id: guideline.field_field
 field_name: field_field
 entity_type: guideline
diff --git a/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_images.yml b/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_images.yml
index 00ea86083..16979c909 100644
--- a/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_images.yml
+++ b/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_images.yml
@@ -7,7 +7,7 @@ dependencies:
     - guidelines
     - image
 _core:
-  default_config_hash: IjqQw0WM7J--ozV4mZK_zoqWGdSieXNmjqxMYX7k7QY
+  default_config_hash: pvXiKgM_7Agsup9HOmse5agx_hnDSbNWsqmO8asKZ1Y
 id: guideline.field_images
 field_name: field_images
 entity_type: guideline
diff --git a/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_title.yml b/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_title.yml
index b10e6fee1..14b8da7fc 100644
--- a/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_title.yml
+++ b/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_title.yml
@@ -5,7 +5,7 @@ dependencies:
   module:
     - guidelines
 _core:
-  default_config_hash: jXJwBrtuJBH5XA9ali94dBdN3dcCfQnzasBqYlR2XEo
+  default_config_hash: HySCsfFydHzl8n5Y-TWktQujS7iuuTYvOq2VE1PGlvY
 id: guideline.field_title
 field_name: field_title
 entity_type: guideline
diff --git a/html/modules/custom/guidelines/config/optional/filter.format.guideline.yml b/html/modules/custom/guidelines/config/optional/filter.format.guideline.yml
index ac8017428..eae3be966 100644
--- a/html/modules/custom/guidelines/config/optional/filter.format.guideline.yml
+++ b/html/modules/custom/guidelines/config/optional/filter.format.guideline.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: ZDQxGl6Vm9OSrSNM35su0ET2Vw7Jiih-ebEsHStrO9A
+  default_config_hash: AMomRKjCCWxw0wg5sH5AlA2QSlMHxASrQKF9bCZ6Dco
 name: Guideline
 format: guideline
 weight: 0
diff --git a/html/modules/custom/guidelines/config/optional/guidelines.guideline_type.field_guideline.yml b/html/modules/custom/guidelines/config/optional/guidelines.guideline_type.field_guideline.yml
index a39fe4738..43ee87992 100644
--- a/html/modules/custom/guidelines/config/optional/guidelines.guideline_type.field_guideline.yml
+++ b/html/modules/custom/guidelines/config/optional/guidelines.guideline_type.field_guideline.yml
@@ -3,6 +3,6 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: 7Oaeq96v71gW-62FuTmu6EDF1-4UvfQ74XEw_6UfaxQ
+  default_config_hash: VVuZUFGpR3L9jO6wuOYE5djohQ6t6mF_nz15-d9Nn0s
 id: field_guideline
 label: 'Field guideline'
diff --git a/html/modules/custom/guidelines/config/optional/guidelines.guideline_type.guideline_list.yml b/html/modules/custom/guidelines/config/optional/guidelines.guideline_type.guideline_list.yml
index a5389186d..addb96c32 100644
--- a/html/modules/custom/guidelines/config/optional/guidelines.guideline_type.guideline_list.yml
+++ b/html/modules/custom/guidelines/config/optional/guidelines.guideline_type.guideline_list.yml
@@ -3,6 +3,6 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: gkK7dqqndcFEd0aPHuYH7Fcq8kt9YOSsP102UhiDYmM
+  default_config_hash: MHSuQUF_j_Rd0mpCRXV7VOAjzmkLtOgoahXLYPoK15A
 id: guideline_list
 label: 'Guideline list'
diff --git a/html/modules/custom/guidelines/config/optional/guidelines.settings.yml b/html/modules/custom/guidelines/config/optional/guidelines.settings.yml
index 34bfe6325..915e2f57c 100644
--- a/html/modules/custom/guidelines/config/optional/guidelines.settings.yml
+++ b/html/modules/custom/guidelines/config/optional/guidelines.settings.yml
@@ -1,4 +1,4 @@
-overwrite_description: true
-use_json_loading: false
+overwrite_description: 0
+use_json_loading: 1
 _core:
   default_config_hash: v8p95xMj6CaApQM12ImT_9hDONKce32ZXfvTTJ7v0hM
diff --git a/html/modules/custom/guidelines/config/optional/image.style.guideline_thumbnail.yml b/html/modules/custom/guidelines/config/optional/image.style.guideline_thumbnail.yml
index 14d87b175..17b9e0476 100644
--- a/html/modules/custom/guidelines/config/optional/image.style.guideline_thumbnail.yml
+++ b/html/modules/custom/guidelines/config/optional/image.style.guideline_thumbnail.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: HEdSZipodL-YVJ73x_Z3m3asKdPOP4K1iZsbz1MiM3E
+  default_config_hash: uIYuiQq2lP6-hInQhAMut9cHLLNhUs7bp4DAY7aWbYo
 name: guideline_thumbnail
 label: 'Guideline thumbnail'
 effects:
@@ -12,6 +12,6 @@ effects:
     id: image_scale
     weight: 1
     data:
-      width: null
+      width: 200
       height: 200
       upscale: false
diff --git a/html/modules/custom/guidelines/guidelines.info.yml b/html/modules/custom/guidelines/guidelines.info.yml
index 9366642c9..f115a231b 100644
--- a/html/modules/custom/guidelines/guidelines.info.yml
+++ b/html/modules/custom/guidelines/guidelines.info.yml
@@ -3,3 +3,4 @@ type: module
 description: 'Add guidelines to entities and fields'
 core_version_requirement: ^9
 package: 'Custom'
+configure: guidelines.settings
diff --git a/html/modules/custom/guidelines/guidelines.module b/html/modules/custom/guidelines/guidelines.module
index 32c47ca9e..aed5c3c67 100644
--- a/html/modules/custom/guidelines/guidelines.module
+++ b/html/modules/custom/guidelines/guidelines.module
@@ -73,6 +73,7 @@ function guidelines_form_node_form_alter(array &$form, FormStateInterface $form_
       $bundle = $form_object->getEntity()->bundle();
     }
 
+    $form['#attributes']['data-with-guidelines'] = $entity_type;
     $form['#attributes']['data-guidelines-entity-type'] = $entity_type;
     $form['#attributes']['data-guidelines-entity-bundle'] = $bundle;
     $form['#attached']['library'][] = 'guidelines/guidelines-json';

From 3ef851e574a8898503bb4de8197a175598092f4f Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 30 Nov 2021 15:24:40 +0100
Subject: [PATCH 178/720] Add default config for guidelines

---
 html/modules/custom/guidelines/guidelines.module | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/modules/custom/guidelines/guidelines.module b/html/modules/custom/guidelines/guidelines.module
index aed5c3c67..09db5d394 100644
--- a/html/modules/custom/guidelines/guidelines.module
+++ b/html/modules/custom/guidelines/guidelines.module
@@ -73,7 +73,7 @@ function guidelines_form_node_form_alter(array &$form, FormStateInterface $form_
       $bundle = $form_object->getEntity()->bundle();
     }
 
-    $form['#attributes']['data-with-guidelines'] = $entity_type;
+    $form['#attributes']['data-with-guidelines'] = '';
     $form['#attributes']['data-guidelines-entity-type'] = $entity_type;
     $form['#attributes']['data-guidelines-entity-bundle'] = $bundle;
     $form['#attached']['library'][] = 'guidelines/guidelines-json';

From b667af4aaccd52fa5487b5124491ff6ae57af036 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 30 Nov 2021 15:41:46 +0100
Subject: [PATCH 179/720] Add default config for guidelines

---
 ...e.entity_form_display.guideline.field_guideline.default.yml | 3 ---
 ...re.entity_form_display.guideline.guideline_list.default.yml | 3 ---
 ...e.entity_view_display.guideline.field_guideline.default.yml | 3 ---
 ...re.entity_view_display.guideline.guideline_list.default.yml | 3 ---
 ...field.field.guideline.field_guideline.field_description.yml | 3 ---
 .../field.field.guideline.field_guideline.field_field.yml      | 3 ---
 .../field.field.guideline.field_guideline.field_images.yml     | 3 ---
 .../field.field.guideline.field_guideline.field_title.yml      | 3 ---
 .../field.field.guideline.guideline_list.field_title.yml       | 3 ---
 .../optional/field.storage.guideline.field_description.yml     | 3 ---
 .../config/optional/field.storage.guideline.field_field.yml    | 3 ---
 .../config/optional/field.storage.guideline.field_images.yml   | 3 ---
 .../config/optional/field.storage.guideline.field_title.yml    | 3 ---
 .../guidelines/config/optional/filter.format.guideline.yml     | 3 ---
 .../optional/guidelines.guideline_type.field_guideline.yml     | 3 ---
 .../optional/guidelines.guideline_type.guideline_list.yml      | 3 ---
 .../custom/guidelines/config/optional/guidelines.settings.yml  | 2 --
 .../config/optional/image.style.guideline_thumbnail.yml        | 3 ---
 18 files changed, 53 deletions(-)

diff --git a/html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.field_guideline.default.yml b/html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.field_guideline.default.yml
index 35ddf3b45..f5c65403e 100644
--- a/html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.field_guideline.default.yml
+++ b/html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.field_guideline.default.yml
@@ -1,4 +1,3 @@
-uuid: db8b3fae-ba53-44db-b43f-a6ae4d615c19
 langcode: en
 status: true
 dependencies:
@@ -13,8 +12,6 @@ dependencies:
     - guidelines
     - image
     - text
-_core:
-  default_config_hash: Ab3vpnYyoRCDZyMztb7uQVb3QEDHedeavdQyjSnH9o0
 id: guideline.field_guideline.default
 targetEntityType: guideline
 bundle: field_guideline
diff --git a/html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.guideline_list.default.yml b/html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.guideline_list.default.yml
index 620560e80..e1c324ada 100644
--- a/html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.guideline_list.default.yml
+++ b/html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.guideline_list.default.yml
@@ -1,12 +1,9 @@
-uuid: 411a138e-0931-4ea2-ae71-1ac2e6088677
 langcode: en
 status: true
 dependencies:
   config:
     - field.field.guideline.guideline_list.field_title
     - guidelines.guideline_type.guideline_list
-_core:
-  default_config_hash: cOLkuh7YgdD87onZdwnChMrJfJZHPB0xUcPEBg69kIg
 id: guideline.guideline_list.default
 targetEntityType: guideline
 bundle: guideline_list
diff --git a/html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.field_guideline.default.yml b/html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.field_guideline.default.yml
index ee009100c..0deaf8f7c 100644
--- a/html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.field_guideline.default.yml
+++ b/html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.field_guideline.default.yml
@@ -1,4 +1,3 @@
-uuid: 0b647595-f800-436c-886b-86b9cdddddf3
 langcode: en
 status: true
 dependencies:
@@ -12,8 +11,6 @@ dependencies:
   module:
     - image
     - text
-_core:
-  default_config_hash: z8Ooy8lqwORX8fFn5ruQGyemnJ34dCvhTM1IsH0yBX0
 id: guideline.field_guideline.default
 targetEntityType: guideline
 bundle: field_guideline
diff --git a/html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.guideline_list.default.yml b/html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.guideline_list.default.yml
index 9cc0fbf7a..da3711c9c 100644
--- a/html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.guideline_list.default.yml
+++ b/html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.guideline_list.default.yml
@@ -1,12 +1,9 @@
-uuid: 0f37fbb4-2654-420c-8388-353ed6924d10
 langcode: en
 status: true
 dependencies:
   config:
     - field.field.guideline.guideline_list.field_title
     - guidelines.guideline_type.guideline_list
-_core:
-  default_config_hash: l7evZXfALoTXsWTb55YC72niCmLTIgBcZpLUYZ1Mha0
 id: guideline.guideline_list.default
 targetEntityType: guideline
 bundle: guideline_list
diff --git a/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_description.yml b/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_description.yml
index dc3c9236d..48dd55401 100644
--- a/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_description.yml
+++ b/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_description.yml
@@ -1,4 +1,3 @@
-uuid: 28764320-180a-41cd-9f64-ee6af4e22ca6
 langcode: en
 status: true
 dependencies:
@@ -7,8 +6,6 @@ dependencies:
     - guidelines.guideline_type.field_guideline
   module:
     - text
-_core:
-  default_config_hash: xRG7EyzEYPUsfPwbPUvSSnTyqvhncuO7Cu1HZa2v0L8
 id: guideline.field_guideline.field_description
 field_name: field_description
 entity_type: guideline
diff --git a/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_field.yml b/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_field.yml
index 20fdda9e7..2e2f5f659 100644
--- a/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_field.yml
+++ b/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_field.yml
@@ -1,4 +1,3 @@
-uuid: 6f2c048f-a870-4564-bcd0-bbb99bdb2230
 langcode: en
 status: true
 dependencies:
@@ -7,8 +6,6 @@ dependencies:
     - guidelines.guideline_type.field_guideline
   module:
     - guidelines
-_core:
-  default_config_hash: xDe-me9dIKGdeZ2uvP3eFdmLa-uF3kxPV_KrPAxp_p0
 id: guideline.field_guideline.field_field
 field_name: field_field
 entity_type: guideline
diff --git a/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_images.yml b/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_images.yml
index fe6683acc..9255f1886 100644
--- a/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_images.yml
+++ b/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_images.yml
@@ -1,4 +1,3 @@
-uuid: 009da1be-68e9-4c4b-af3b-b7f16a914aad
 langcode: en
 status: true
 dependencies:
@@ -7,8 +6,6 @@ dependencies:
     - guidelines.guideline_type.field_guideline
   module:
     - image
-_core:
-  default_config_hash: 0i3UZEOfLqHYUULM5Bgmug8PhP1LAUA9z-JL-zpVIgM
 id: guideline.field_guideline.field_images
 field_name: field_images
 entity_type: guideline
diff --git a/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_title.yml b/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_title.yml
index 564a1f6fc..459952303 100644
--- a/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_title.yml
+++ b/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_title.yml
@@ -1,12 +1,9 @@
-uuid: 940acb12-d9cd-4884-a950-ca03f6fedcba
 langcode: en
 status: true
 dependencies:
   config:
     - field.storage.guideline.field_title
     - guidelines.guideline_type.field_guideline
-_core:
-  default_config_hash: 3n2TNCY9_hvLT5RM_J2obSPOlkfsBPfXfxuzIUwEoDc
 id: guideline.field_guideline.field_title
 field_name: field_title
 entity_type: guideline
diff --git a/html/modules/custom/guidelines/config/optional/field.field.guideline.guideline_list.field_title.yml b/html/modules/custom/guidelines/config/optional/field.field.guideline.guideline_list.field_title.yml
index 57827bd01..655034e28 100644
--- a/html/modules/custom/guidelines/config/optional/field.field.guideline.guideline_list.field_title.yml
+++ b/html/modules/custom/guidelines/config/optional/field.field.guideline.guideline_list.field_title.yml
@@ -1,12 +1,9 @@
-uuid: dd89ed7c-df45-45d7-aa35-8f9793c28755
 langcode: en
 status: true
 dependencies:
   config:
     - field.storage.guideline.field_title
     - guidelines.guideline_type.guideline_list
-_core:
-  default_config_hash: 9z_l0Nq-uhCN_q33_nH8Ar35ywMMIJUhYHSsUo1Do9A
 id: guideline.guideline_list.field_title
 field_name: field_title
 entity_type: guideline
diff --git a/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_description.yml b/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_description.yml
index 956c49fe5..149589160 100644
--- a/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_description.yml
+++ b/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_description.yml
@@ -1,12 +1,9 @@
-uuid: 63011e49-3133-4297-abc7-3fb47eab242f
 langcode: en
 status: true
 dependencies:
   module:
     - guidelines
     - text
-_core:
-  default_config_hash: iMlQKG6EJKUKjUFeoIRGJlo2JgV3Z3gba0tHkrMmAvc
 id: guideline.field_description
 field_name: field_description
 entity_type: guideline
diff --git a/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_field.yml b/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_field.yml
index 62e14dc65..be50d24b0 100644
--- a/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_field.yml
+++ b/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_field.yml
@@ -1,11 +1,8 @@
-uuid: bd31610f-d04b-4819-b2e8-182079b7c500
 langcode: en
 status: true
 dependencies:
   module:
     - guidelines
-_core:
-  default_config_hash: hQaVczFbTCv4rS6s7basyYMTBR1NRvtaLtOzLw6h1BE
 id: guideline.field_field
 field_name: field_field
 entity_type: guideline
diff --git a/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_images.yml b/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_images.yml
index 16979c909..1f94d064c 100644
--- a/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_images.yml
+++ b/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_images.yml
@@ -1,4 +1,3 @@
-uuid: 000df8e9-190f-4ca7-9c1f-d6f3e7da5e6c
 langcode: en
 status: true
 dependencies:
@@ -6,8 +5,6 @@ dependencies:
     - file
     - guidelines
     - image
-_core:
-  default_config_hash: pvXiKgM_7Agsup9HOmse5agx_hnDSbNWsqmO8asKZ1Y
 id: guideline.field_images
 field_name: field_images
 entity_type: guideline
diff --git a/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_title.yml b/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_title.yml
index 14b8da7fc..b2d205a3e 100644
--- a/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_title.yml
+++ b/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_title.yml
@@ -1,11 +1,8 @@
-uuid: f3a5baf7-f41f-4d83-b691-23f3eb58d165
 langcode: en
 status: true
 dependencies:
   module:
     - guidelines
-_core:
-  default_config_hash: HySCsfFydHzl8n5Y-TWktQujS7iuuTYvOq2VE1PGlvY
 id: guideline.field_title
 field_name: field_title
 entity_type: guideline
diff --git a/html/modules/custom/guidelines/config/optional/filter.format.guideline.yml b/html/modules/custom/guidelines/config/optional/filter.format.guideline.yml
index eae3be966..b9c911e76 100644
--- a/html/modules/custom/guidelines/config/optional/filter.format.guideline.yml
+++ b/html/modules/custom/guidelines/config/optional/filter.format.guideline.yml
@@ -1,9 +1,6 @@
-uuid: f94d05b1-32d4-4a37-a31f-113224793bf4
 langcode: en
 status: true
 dependencies: {  }
-_core:
-  default_config_hash: AMomRKjCCWxw0wg5sH5AlA2QSlMHxASrQKF9bCZ6Dco
 name: Guideline
 format: guideline
 weight: 0
diff --git a/html/modules/custom/guidelines/config/optional/guidelines.guideline_type.field_guideline.yml b/html/modules/custom/guidelines/config/optional/guidelines.guideline_type.field_guideline.yml
index 43ee87992..253320f53 100644
--- a/html/modules/custom/guidelines/config/optional/guidelines.guideline_type.field_guideline.yml
+++ b/html/modules/custom/guidelines/config/optional/guidelines.guideline_type.field_guideline.yml
@@ -1,8 +1,5 @@
-uuid: 33cf67f7-6536-4f60-99be-13b52a3a7124
 langcode: en
 status: true
 dependencies: {  }
-_core:
-  default_config_hash: VVuZUFGpR3L9jO6wuOYE5djohQ6t6mF_nz15-d9Nn0s
 id: field_guideline
 label: 'Field guideline'
diff --git a/html/modules/custom/guidelines/config/optional/guidelines.guideline_type.guideline_list.yml b/html/modules/custom/guidelines/config/optional/guidelines.guideline_type.guideline_list.yml
index addb96c32..eaad8174a 100644
--- a/html/modules/custom/guidelines/config/optional/guidelines.guideline_type.guideline_list.yml
+++ b/html/modules/custom/guidelines/config/optional/guidelines.guideline_type.guideline_list.yml
@@ -1,8 +1,5 @@
-uuid: a5377093-5dee-404b-ad55-e416b117c166
 langcode: en
 status: true
 dependencies: {  }
-_core:
-  default_config_hash: MHSuQUF_j_Rd0mpCRXV7VOAjzmkLtOgoahXLYPoK15A
 id: guideline_list
 label: 'Guideline list'
diff --git a/html/modules/custom/guidelines/config/optional/guidelines.settings.yml b/html/modules/custom/guidelines/config/optional/guidelines.settings.yml
index 915e2f57c..5f832cc7f 100644
--- a/html/modules/custom/guidelines/config/optional/guidelines.settings.yml
+++ b/html/modules/custom/guidelines/config/optional/guidelines.settings.yml
@@ -1,4 +1,2 @@
 overwrite_description: 0
 use_json_loading: 1
-_core:
-  default_config_hash: v8p95xMj6CaApQM12ImT_9hDONKce32ZXfvTTJ7v0hM
diff --git a/html/modules/custom/guidelines/config/optional/image.style.guideline_thumbnail.yml b/html/modules/custom/guidelines/config/optional/image.style.guideline_thumbnail.yml
index 17b9e0476..e9b65f500 100644
--- a/html/modules/custom/guidelines/config/optional/image.style.guideline_thumbnail.yml
+++ b/html/modules/custom/guidelines/config/optional/image.style.guideline_thumbnail.yml
@@ -1,9 +1,6 @@
-uuid: 3153f7d4-05a0-4a0f-964c-e1ccc3a8bfdd
 langcode: en
 status: true
 dependencies: {  }
-_core:
-  default_config_hash: uIYuiQq2lP6-hInQhAMut9cHLLNhUs7bp4DAY7aWbYo
 name: guideline_thumbnail
 label: 'Guideline thumbnail'
 effects:

From 10646b6082e2eb39f10ddcb6098f2827c6b1c9cf Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 30 Nov 2021 15:42:24 +0100
Subject: [PATCH 180/720] Add default config for guidelines

---
 .../custom/guidelines/config/optional/guidelines.settings.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/guidelines/config/optional/guidelines.settings.yml b/html/modules/custom/guidelines/config/optional/guidelines.settings.yml
index 5f832cc7f..5e041d9a0 100644
--- a/html/modules/custom/guidelines/config/optional/guidelines.settings.yml
+++ b/html/modules/custom/guidelines/config/optional/guidelines.settings.yml
@@ -1,2 +1,2 @@
-overwrite_description: 0
-use_json_loading: 1
+overwrite_description: 1
+use_json_loading: 0

From c521827fb84fc8a69bee4c14d344b0b73c19ffd5 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 1 Dec 2021 15:13:58 +0900
Subject: [PATCH 181/720] [RW-264] Update package.json and lock file from base
 theme.

---
 .../common_design_subtheme/package-lock.json  | 6369 +++++++----------
 .../common_design_subtheme/package.json       |   32 +-
 2 files changed, 2583 insertions(+), 3818 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/package-lock.json b/html/themes/custom/common_design_subtheme/package-lock.json
index 5626e9aa0..b61f30c60 100644
--- a/html/themes/custom/common_design_subtheme/package-lock.json
+++ b/html/themes/custom/common_design_subtheme/package-lock.json
@@ -1,39 +1,36 @@
 {
   "name": "common-design",
-  "version": "4.0.0",
+  "version": "5.0.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
     "@babel/code-frame": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
-      "integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
-      "dev": true,
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
+      "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
       "requires": {
-        "@babel/highlight": "^7.12.13"
+        "@babel/highlight": "^7.14.5"
       }
     },
     "@babel/compat-data": {
-      "version": "7.13.15",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.15.tgz",
-      "integrity": "sha512-ltnibHKR1VnrU4ymHyQ/CXtNXI6yZC0oJThyW78Hft8XndANwi+9H+UIklBDraIjFEJzw8wmcM427oDd9KS5wA==",
-      "dev": true
+      "version": "7.15.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz",
+      "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA=="
     },
     "@babel/core": {
-      "version": "7.13.15",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.13.15.tgz",
-      "integrity": "sha512-6GXmNYeNjS2Uz+uls5jalOemgIhnTMeaXo+yBUA72kC2uX/8VW6XyhVIo2L8/q0goKQA3EVKx0KOQpVKSeWadQ==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/generator": "^7.13.9",
-        "@babel/helper-compilation-targets": "^7.13.13",
-        "@babel/helper-module-transforms": "^7.13.14",
-        "@babel/helpers": "^7.13.10",
-        "@babel/parser": "^7.13.15",
-        "@babel/template": "^7.12.13",
-        "@babel/traverse": "^7.13.15",
-        "@babel/types": "^7.13.14",
+      "version": "7.15.5",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.5.tgz",
+      "integrity": "sha512-pYgXxiwAgQpgM1bNkZsDEq85f0ggXMA5L7c+o3tskGMh2BunCI9QUwB9Z4jpvXUOuMdyGKiGKQiRe11VS6Jzvg==",
+      "requires": {
+        "@babel/code-frame": "^7.14.5",
+        "@babel/generator": "^7.15.4",
+        "@babel/helper-compilation-targets": "^7.15.4",
+        "@babel/helper-module-transforms": "^7.15.4",
+        "@babel/helpers": "^7.15.4",
+        "@babel/parser": "^7.15.5",
+        "@babel/template": "^7.15.4",
+        "@babel/traverse": "^7.15.4",
+        "@babel/types": "^7.15.4",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -43,74 +40,73 @@
       }
     },
     "@babel/generator": {
-      "version": "7.13.9",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz",
-      "integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==",
-      "dev": true,
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.4.tgz",
+      "integrity": "sha512-d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw==",
       "requires": {
-        "@babel/types": "^7.13.0",
+        "@babel/types": "^7.15.4",
         "jsesc": "^2.5.1",
         "source-map": "^0.5.0"
       }
     },
     "@babel/helper-annotate-as-pure": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz",
-      "integrity": "sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==",
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz",
+      "integrity": "sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.12.13"
+        "@babel/types": "^7.15.4"
       }
     },
     "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz",
-      "integrity": "sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA==",
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz",
+      "integrity": "sha512-P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.12.13",
-        "@babel/types": "^7.12.13"
+        "@babel/helper-explode-assignable-expression": "^7.15.4",
+        "@babel/types": "^7.15.4"
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.13.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.13.tgz",
-      "integrity": "sha512-q1kcdHNZehBwD9jYPh3WyXcsFERi39X4I59I3NadciWtNDyZ6x+GboOxncFK0kXlKIv6BJm5acncehXWUjWQMQ==",
-      "dev": true,
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz",
+      "integrity": "sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==",
       "requires": {
-        "@babel/compat-data": "^7.13.12",
-        "@babel/helper-validator-option": "^7.12.17",
-        "browserslist": "^4.14.5",
+        "@babel/compat-data": "^7.15.0",
+        "@babel/helper-validator-option": "^7.14.5",
+        "browserslist": "^4.16.6",
         "semver": "^6.3.0"
       }
     },
     "@babel/helper-create-class-features-plugin": {
-      "version": "7.13.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.11.tgz",
-      "integrity": "sha512-ays0I7XYq9xbjCSvT+EvysLgfc3tOkwCULHjrnscGT3A9qD4sk3wXnJ3of0MAWsWGjdinFvajHU2smYuqXKMrw==",
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz",
+      "integrity": "sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-member-expression-to-functions": "^7.13.0",
-        "@babel/helper-optimise-call-expression": "^7.12.13",
-        "@babel/helper-replace-supers": "^7.13.0",
-        "@babel/helper-split-export-declaration": "^7.12.13"
+        "@babel/helper-annotate-as-pure": "^7.15.4",
+        "@babel/helper-function-name": "^7.15.4",
+        "@babel/helper-member-expression-to-functions": "^7.15.4",
+        "@babel/helper-optimise-call-expression": "^7.15.4",
+        "@babel/helper-replace-supers": "^7.15.4",
+        "@babel/helper-split-export-declaration": "^7.15.4"
       }
     },
     "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.12.17",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz",
-      "integrity": "sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz",
+      "integrity": "sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.12.13",
+        "@babel/helper-annotate-as-pure": "^7.14.5",
         "regexpu-core": "^4.7.1"
       }
     },
     "@babel/helper-define-polyfill-provider": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.0.tgz",
-      "integrity": "sha512-JT8tHuFjKBo8NnaUbblz7mIu1nnvUDiHVjXXkulZULyidvo/7P6TY7+YqpV37IfF+KUFxmlK04elKtGKXaiVgw==",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz",
+      "integrity": "sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==",
       "dev": true,
       "requires": {
         "@babel/helper-compilation-targets": "^7.13.0",
@@ -124,339 +120,392 @@
       }
     },
     "@babel/helper-explode-assignable-expression": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz",
-      "integrity": "sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA==",
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz",
+      "integrity": "sha512-J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.13.0"
+        "@babel/types": "^7.15.4"
       }
     },
     "@babel/helper-function-name": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
-      "integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
-      "dev": true,
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz",
+      "integrity": "sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==",
       "requires": {
-        "@babel/helper-get-function-arity": "^7.12.13",
-        "@babel/template": "^7.12.13",
-        "@babel/types": "^7.12.13"
+        "@babel/helper-get-function-arity": "^7.15.4",
+        "@babel/template": "^7.15.4",
+        "@babel/types": "^7.15.4"
       }
     },
     "@babel/helper-get-function-arity": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
-      "integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
-      "dev": true,
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz",
+      "integrity": "sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==",
       "requires": {
-        "@babel/types": "^7.12.13"
+        "@babel/types": "^7.15.4"
       }
     },
     "@babel/helper-hoist-variables": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.0.tgz",
-      "integrity": "sha512-0kBzvXiIKfsCA0y6cFEIJf4OdzfpRuNk4+YTeHZpGGc666SATFKTz6sRncwFnQk7/ugJ4dSrCj6iJuvW4Qwr2g==",
-      "dev": true,
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz",
+      "integrity": "sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==",
       "requires": {
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.0"
+        "@babel/types": "^7.15.4"
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.13.12",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz",
-      "integrity": "sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==",
-      "dev": true,
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz",
+      "integrity": "sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==",
       "requires": {
-        "@babel/types": "^7.13.12"
+        "@babel/types": "^7.15.4"
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.13.12",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz",
-      "integrity": "sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==",
-      "dev": true,
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz",
+      "integrity": "sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==",
       "requires": {
-        "@babel/types": "^7.13.12"
+        "@babel/types": "^7.15.4"
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.13.14",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.14.tgz",
-      "integrity": "sha512-QuU/OJ0iAOSIatyVZmfqB0lbkVP0kDRiKj34xy+QNsnVZi/PA6BoSoreeqnxxa9EHFAIL0R9XOaAR/G9WlIy5g==",
-      "dev": true,
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.4.tgz",
+      "integrity": "sha512-9fHHSGE9zTC++KuXLZcB5FKgvlV83Ox+NLUmQTawovwlJ85+QMhk1CnVk406CQVj97LaWod6KVjl2Sfgw9Aktw==",
       "requires": {
-        "@babel/helper-module-imports": "^7.13.12",
-        "@babel/helper-replace-supers": "^7.13.12",
-        "@babel/helper-simple-access": "^7.13.12",
-        "@babel/helper-split-export-declaration": "^7.12.13",
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "@babel/template": "^7.12.13",
-        "@babel/traverse": "^7.13.13",
-        "@babel/types": "^7.13.14"
+        "@babel/helper-module-imports": "^7.15.4",
+        "@babel/helper-replace-supers": "^7.15.4",
+        "@babel/helper-simple-access": "^7.15.4",
+        "@babel/helper-split-export-declaration": "^7.15.4",
+        "@babel/helper-validator-identifier": "^7.14.9",
+        "@babel/template": "^7.15.4",
+        "@babel/traverse": "^7.15.4",
+        "@babel/types": "^7.15.4"
       }
     },
     "@babel/helper-optimise-call-expression": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz",
-      "integrity": "sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==",
-      "dev": true,
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz",
+      "integrity": "sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==",
       "requires": {
-        "@babel/types": "^7.12.13"
+        "@babel/types": "^7.15.4"
       }
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
-      "integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz",
+      "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==",
       "dev": true
     },
     "@babel/helper-remap-async-to-generator": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz",
-      "integrity": "sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg==",
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz",
+      "integrity": "sha512-v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.12.13",
-        "@babel/helper-wrap-function": "^7.13.0",
-        "@babel/types": "^7.13.0"
+        "@babel/helper-annotate-as-pure": "^7.15.4",
+        "@babel/helper-wrap-function": "^7.15.4",
+        "@babel/types": "^7.15.4"
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.13.12",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz",
-      "integrity": "sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==",
-      "dev": true,
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz",
+      "integrity": "sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==",
       "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.13.12",
-        "@babel/helper-optimise-call-expression": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.12"
+        "@babel/helper-member-expression-to-functions": "^7.15.4",
+        "@babel/helper-optimise-call-expression": "^7.15.4",
+        "@babel/traverse": "^7.15.4",
+        "@babel/types": "^7.15.4"
       }
     },
     "@babel/helper-simple-access": {
-      "version": "7.13.12",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz",
-      "integrity": "sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==",
-      "dev": true,
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz",
+      "integrity": "sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==",
       "requires": {
-        "@babel/types": "^7.13.12"
+        "@babel/types": "^7.15.4"
       }
     },
     "@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz",
-      "integrity": "sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==",
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz",
+      "integrity": "sha512-BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.12.1"
+        "@babel/types": "^7.15.4"
       }
     },
     "@babel/helper-split-export-declaration": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
-      "integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
-      "dev": true,
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz",
+      "integrity": "sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==",
       "requires": {
-        "@babel/types": "^7.12.13"
+        "@babel/types": "^7.15.4"
       }
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.12.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
-      "integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
-      "dev": true
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz",
+      "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g=="
     },
     "@babel/helper-validator-option": {
-      "version": "7.12.17",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz",
-      "integrity": "sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==",
-      "dev": true
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz",
+      "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow=="
     },
     "@babel/helper-wrap-function": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz",
-      "integrity": "sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA==",
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz",
+      "integrity": "sha512-Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/template": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.0"
+        "@babel/helper-function-name": "^7.15.4",
+        "@babel/template": "^7.15.4",
+        "@babel/traverse": "^7.15.4",
+        "@babel/types": "^7.15.4"
       }
     },
     "@babel/helpers": {
-      "version": "7.13.10",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.10.tgz",
-      "integrity": "sha512-4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ==",
-      "dev": true,
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz",
+      "integrity": "sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==",
       "requires": {
-        "@babel/template": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.0"
+        "@babel/template": "^7.15.4",
+        "@babel/traverse": "^7.15.4",
+        "@babel/types": "^7.15.4"
       }
     },
     "@babel/highlight": {
-      "version": "7.13.10",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz",
-      "integrity": "sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==",
-      "dev": true,
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
+      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
       "requires": {
-        "@babel/helper-validator-identifier": "^7.12.11",
+        "@babel/helper-validator-identifier": "^7.14.5",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
     "@babel/parser": {
-      "version": "7.13.15",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.15.tgz",
-      "integrity": "sha512-b9COtcAlVEQljy/9fbcMHpG+UIW9ReF+gpaxDHTlZd0c6/UU9ng8zdySAW9sRTzpvcdCHn6bUcbuYUgGzLAWVQ==",
-      "dev": true
+      "version": "7.15.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.5.tgz",
+      "integrity": "sha512-2hQstc6I7T6tQsWzlboMh3SgMRPaS4H6H7cPQsJkdzTzEGqQrpLDsE2BGASU5sBPoEQyHzeqU6C8uKbFeEk6sg=="
     },
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.13.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz",
-      "integrity": "sha512-d0u3zWKcoZf379fOeJdr1a5WPDny4aOFZ6hlfKivgK0LY7ZxNfoaHL2fWwdGtHyVvra38FC+HVYkO+byfSA8AQ==",
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4.tgz",
+      "integrity": "sha512-eBnpsl9tlhPhpI10kU06JHnrYXwg3+V6CaP2idsCXNef0aeslpqyITXQ74Vfk5uHgY7IG7XP0yIH8b42KSzHog==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1",
-        "@babel/plugin-proposal-optional-chaining": "^7.13.12"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.15.4",
+        "@babel/plugin-proposal-optional-chaining": "^7.14.5"
       }
     },
     "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.13.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.15.tgz",
-      "integrity": "sha512-VapibkWzFeoa6ubXy/NgV5U2U4MVnUlvnx6wo1XhlsaTrLYWE0UFpDQsVrmn22q5CzeloqJ8gEMHSKxuee6ZdA==",
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.4.tgz",
+      "integrity": "sha512-2zt2g5vTXpMC3OmK6uyjvdXptbhBXfA77XGrd3gh93zwG8lZYBLOBImiGBEG0RANu3JqKEACCz5CGk73OJROBw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-remap-async-to-generator": "^7.13.0",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-remap-async-to-generator": "^7.15.4",
         "@babel/plugin-syntax-async-generators": "^7.8.4"
       }
     },
     "@babel/plugin-proposal-class-properties": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz",
-      "integrity": "sha512-KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz",
+      "integrity": "sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-proposal-class-static-block": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.15.4.tgz",
+      "integrity": "sha512-M682XWrrLNk3chXCjoPUQWOyYsB93B9z3mRyjtqqYJWDf2mfCdIYgDrA11cgNVhAQieaq6F2fn2f3wI0U4aTjA==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.13.0",
-        "@babel/helper-plugin-utils": "^7.13.0"
+        "@babel/helper-create-class-features-plugin": "^7.15.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
       }
     },
     "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz",
-      "integrity": "sha512-ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz",
+      "integrity": "sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-plugin-utils": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz",
-      "integrity": "sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz",
+      "integrity": "sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.14.5",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-json-strings": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz",
-      "integrity": "sha512-w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz",
+      "integrity": "sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-plugin-utils": "^7.14.5",
         "@babel/plugin-syntax-json-strings": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz",
-      "integrity": "sha512-aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz",
+      "integrity": "sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-plugin-utils": "^7.14.5",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
       }
     },
     "@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz",
-      "integrity": "sha512-iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz",
+      "integrity": "sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-plugin-utils": "^7.14.5",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-numeric-separator": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz",
-      "integrity": "sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz",
+      "integrity": "sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.14.5",
         "@babel/plugin-syntax-numeric-separator": "^7.10.4"
       }
     },
     "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz",
-      "integrity": "sha512-DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g==",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz",
+      "integrity": "sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.13.8",
-        "@babel/helper-compilation-targets": "^7.13.8",
-        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/compat-data": "^7.14.7",
+        "@babel/helper-compilation-targets": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.13.0"
+        "@babel/plugin-transform-parameters": "^7.14.5"
       }
     },
     "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz",
-      "integrity": "sha512-0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz",
+      "integrity": "sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-plugin-utils": "^7.14.5",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.13.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz",
-      "integrity": "sha512-fcEdKOkIB7Tf4IxrgEVeFC4zeJSTr78no9wTdBuZZbqF64kzllU0ybo2zrzm7gUQfxGhBgq4E39oRs8Zx/RMYQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz",
+      "integrity": "sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
         "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       }
     },
     "@babel/plugin-proposal-private-methods": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz",
-      "integrity": "sha512-MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz",
+      "integrity": "sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.13.0",
-        "@babel/helper-plugin-utils": "^7.13.0"
+        "@babel/helper-create-class-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
+    "@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.15.4.tgz",
+      "integrity": "sha512-X0UTixkLf0PCCffxgu5/1RQyGGbgZuKoI+vXP4iSbJSYwPb7hu06omsFGBvQ9lJEvwgrxHdS8B5nbfcd8GyUNA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.15.4",
+        "@babel/helper-create-class-features-plugin": "^7.15.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       }
     },
     "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz",
-      "integrity": "sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz",
+      "integrity": "sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-syntax-async-generators": {
@@ -486,6 +535,15 @@
         "@babel/helper-plugin-utils": "^7.12.13"
       }
     },
+    "@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
     "@babel/plugin-syntax-dynamic-import": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
@@ -576,353 +634,365 @@
         "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
+    "@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      }
+    },
     "@babel/plugin-syntax-top-level-await": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz",
-      "integrity": "sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-arrow-functions": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz",
-      "integrity": "sha512-96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz",
+      "integrity": "sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-async-to-generator": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz",
-      "integrity": "sha512-3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz",
+      "integrity": "sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-remap-async-to-generator": "^7.13.0"
+        "@babel/helper-module-imports": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-remap-async-to-generator": "^7.14.5"
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz",
-      "integrity": "sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz",
+      "integrity": "sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz",
-      "integrity": "sha512-Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ==",
+      "version": "7.15.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz",
+      "integrity": "sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz",
-      "integrity": "sha512-9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g==",
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz",
+      "integrity": "sha512-Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.12.13",
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-optimise-call-expression": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-replace-supers": "^7.13.0",
-        "@babel/helper-split-export-declaration": "^7.12.13",
+        "@babel/helper-annotate-as-pure": "^7.15.4",
+        "@babel/helper-function-name": "^7.15.4",
+        "@babel/helper-optimise-call-expression": "^7.15.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-replace-supers": "^7.15.4",
+        "@babel/helper-split-export-declaration": "^7.15.4",
         "globals": "^11.1.0"
       }
     },
     "@babel/plugin-transform-computed-properties": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz",
-      "integrity": "sha512-RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz",
+      "integrity": "sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.0.tgz",
-      "integrity": "sha512-zym5em7tePoNT9s964c0/KU3JPPnuq7VhIxPRefJ4/s82cD+q1mgKfuGRDMCPL0HTyKz4dISuQlCusfgCJ86HA==",
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz",
+      "integrity": "sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-dotall-regex": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz",
-      "integrity": "sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz",
+      "integrity": "sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz",
-      "integrity": "sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz",
+      "integrity": "sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz",
-      "integrity": "sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz",
+      "integrity": "sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==",
       "dev": true,
       "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-for-of": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz",
-      "integrity": "sha512-IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg==",
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz",
+      "integrity": "sha512-DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-function-name": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz",
-      "integrity": "sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz",
+      "integrity": "sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-function-name": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-literals": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz",
-      "integrity": "sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz",
+      "integrity": "sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz",
-      "integrity": "sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz",
+      "integrity": "sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-modules-amd": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz",
-      "integrity": "sha512-EKy/E2NHhY/6Vw5d1k3rgoobftcNUmp9fGjb9XZwQLtTctsRBOTRO7RHHxfIky1ogMN5BxN7p9uMA3SzPfotMQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz",
+      "integrity": "sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.13.0",
-        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/helper-module-transforms": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz",
-      "integrity": "sha512-9QiOx4MEGglfYZ4XOnU79OHr6vIWUakIj9b4mioN8eQIoEh+pf5p/zEB36JpDFWA12nNMiRf7bfoRvl9Rn79Bw==",
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz",
+      "integrity": "sha512-qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.13.0",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-simple-access": "^7.12.13",
+        "@babel/helper-module-transforms": "^7.15.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-simple-access": "^7.15.4",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.13.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz",
-      "integrity": "sha512-hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A==",
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.15.4.tgz",
+      "integrity": "sha512-fJUnlQrl/mezMneR72CKCgtOoahqGJNVKpompKwzv3BrEXdlPspTcyxrZ1XmDTIr9PpULrgEQo3qNKp6dW7ssw==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "^7.13.0",
-        "@babel/helper-module-transforms": "^7.13.0",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-validator-identifier": "^7.12.11",
+        "@babel/helper-hoist-variables": "^7.15.4",
+        "@babel/helper-module-transforms": "^7.15.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-validator-identifier": "^7.14.9",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       }
     },
     "@babel/plugin-transform-modules-umd": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz",
-      "integrity": "sha512-D/ILzAh6uyvkWjKKyFE/W0FzWwasv6vPTSqPcjxFqn6QpX3u8DjRVliq4F2BamO2Wee/om06Vyy+vPkNrd4wxw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz",
+      "integrity": "sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.13.0",
-        "@babel/helper-plugin-utils": "^7.13.0"
+        "@babel/helper-module-transforms": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz",
-      "integrity": "sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA==",
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz",
+      "integrity": "sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.12.13"
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5"
       }
     },
     "@babel/plugin-transform-new-target": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz",
-      "integrity": "sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz",
+      "integrity": "sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-object-super": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz",
-      "integrity": "sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz",
+      "integrity": "sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13",
-        "@babel/helper-replace-supers": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-replace-supers": "^7.14.5"
       }
     },
     "@babel/plugin-transform-parameters": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz",
-      "integrity": "sha512-Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw==",
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz",
+      "integrity": "sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-property-literals": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz",
-      "integrity": "sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz",
+      "integrity": "sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-regenerator": {
-      "version": "7.13.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz",
-      "integrity": "sha512-Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz",
+      "integrity": "sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==",
       "dev": true,
       "requires": {
         "regenerator-transform": "^0.14.2"
       }
     },
     "@babel/plugin-transform-reserved-words": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz",
-      "integrity": "sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz",
+      "integrity": "sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz",
-      "integrity": "sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz",
+      "integrity": "sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz",
-      "integrity": "sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg==",
+      "version": "7.14.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz",
+      "integrity": "sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1"
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5"
       }
     },
     "@babel/plugin-transform-sticky-regex": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz",
-      "integrity": "sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz",
+      "integrity": "sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-template-literals": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz",
-      "integrity": "sha512-d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz",
+      "integrity": "sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.13.0"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz",
-      "integrity": "sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz",
+      "integrity": "sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-unicode-escapes": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz",
-      "integrity": "sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz",
+      "integrity": "sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/plugin-transform-unicode-regex": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz",
-      "integrity": "sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA==",
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz",
+      "integrity": "sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.12.13"
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
     "@babel/preset-env": {
-      "version": "7.13.15",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.13.15.tgz",
-      "integrity": "sha512-D4JAPMXcxk69PKe81jRJ21/fP/uYdcTZ3hJDF5QX2HSI9bBxxYw/dumdR6dGumhjxlprHPE4XWoPaqzZUVy2MA==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.13.15",
-        "@babel/helper-compilation-targets": "^7.13.13",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/helper-validator-option": "^7.12.17",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.13.12",
-        "@babel/plugin-proposal-async-generator-functions": "^7.13.15",
-        "@babel/plugin-proposal-class-properties": "^7.13.0",
-        "@babel/plugin-proposal-dynamic-import": "^7.13.8",
-        "@babel/plugin-proposal-export-namespace-from": "^7.12.13",
-        "@babel/plugin-proposal-json-strings": "^7.13.8",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.13.8",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
-        "@babel/plugin-proposal-numeric-separator": "^7.12.13",
-        "@babel/plugin-proposal-object-rest-spread": "^7.13.8",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.13.8",
-        "@babel/plugin-proposal-optional-chaining": "^7.13.12",
-        "@babel/plugin-proposal-private-methods": "^7.13.0",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.12.13",
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.4.tgz",
+      "integrity": "sha512-4f2nLw+q6ht8gl3sHCmNhmA5W6b1ItLzbH3UrKuJxACHr2eCpk96jwjrAfCAaXaaVwTQGnyUYHY2EWXJGt7TUQ==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.15.0",
+        "@babel/helper-compilation-targets": "^7.15.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-validator-option": "^7.14.5",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.15.4",
+        "@babel/plugin-proposal-async-generator-functions": "^7.15.4",
+        "@babel/plugin-proposal-class-properties": "^7.14.5",
+        "@babel/plugin-proposal-class-static-block": "^7.15.4",
+        "@babel/plugin-proposal-dynamic-import": "^7.14.5",
+        "@babel/plugin-proposal-export-namespace-from": "^7.14.5",
+        "@babel/plugin-proposal-json-strings": "^7.14.5",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
+        "@babel/plugin-proposal-numeric-separator": "^7.14.5",
+        "@babel/plugin-proposal-object-rest-spread": "^7.14.7",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.14.5",
+        "@babel/plugin-proposal-optional-chaining": "^7.14.5",
+        "@babel/plugin-proposal-private-methods": "^7.14.5",
+        "@babel/plugin-proposal-private-property-in-object": "^7.15.4",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.14.5",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
@@ -932,45 +1002,46 @@
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
         "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-top-level-await": "^7.12.13",
-        "@babel/plugin-transform-arrow-functions": "^7.13.0",
-        "@babel/plugin-transform-async-to-generator": "^7.13.0",
-        "@babel/plugin-transform-block-scoped-functions": "^7.12.13",
-        "@babel/plugin-transform-block-scoping": "^7.12.13",
-        "@babel/plugin-transform-classes": "^7.13.0",
-        "@babel/plugin-transform-computed-properties": "^7.13.0",
-        "@babel/plugin-transform-destructuring": "^7.13.0",
-        "@babel/plugin-transform-dotall-regex": "^7.12.13",
-        "@babel/plugin-transform-duplicate-keys": "^7.12.13",
-        "@babel/plugin-transform-exponentiation-operator": "^7.12.13",
-        "@babel/plugin-transform-for-of": "^7.13.0",
-        "@babel/plugin-transform-function-name": "^7.12.13",
-        "@babel/plugin-transform-literals": "^7.12.13",
-        "@babel/plugin-transform-member-expression-literals": "^7.12.13",
-        "@babel/plugin-transform-modules-amd": "^7.13.0",
-        "@babel/plugin-transform-modules-commonjs": "^7.13.8",
-        "@babel/plugin-transform-modules-systemjs": "^7.13.8",
-        "@babel/plugin-transform-modules-umd": "^7.13.0",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.12.13",
-        "@babel/plugin-transform-new-target": "^7.12.13",
-        "@babel/plugin-transform-object-super": "^7.12.13",
-        "@babel/plugin-transform-parameters": "^7.13.0",
-        "@babel/plugin-transform-property-literals": "^7.12.13",
-        "@babel/plugin-transform-regenerator": "^7.13.15",
-        "@babel/plugin-transform-reserved-words": "^7.12.13",
-        "@babel/plugin-transform-shorthand-properties": "^7.12.13",
-        "@babel/plugin-transform-spread": "^7.13.0",
-        "@babel/plugin-transform-sticky-regex": "^7.12.13",
-        "@babel/plugin-transform-template-literals": "^7.13.0",
-        "@babel/plugin-transform-typeof-symbol": "^7.12.13",
-        "@babel/plugin-transform-unicode-escapes": "^7.12.13",
-        "@babel/plugin-transform-unicode-regex": "^7.12.13",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-transform-arrow-functions": "^7.14.5",
+        "@babel/plugin-transform-async-to-generator": "^7.14.5",
+        "@babel/plugin-transform-block-scoped-functions": "^7.14.5",
+        "@babel/plugin-transform-block-scoping": "^7.15.3",
+        "@babel/plugin-transform-classes": "^7.15.4",
+        "@babel/plugin-transform-computed-properties": "^7.14.5",
+        "@babel/plugin-transform-destructuring": "^7.14.7",
+        "@babel/plugin-transform-dotall-regex": "^7.14.5",
+        "@babel/plugin-transform-duplicate-keys": "^7.14.5",
+        "@babel/plugin-transform-exponentiation-operator": "^7.14.5",
+        "@babel/plugin-transform-for-of": "^7.15.4",
+        "@babel/plugin-transform-function-name": "^7.14.5",
+        "@babel/plugin-transform-literals": "^7.14.5",
+        "@babel/plugin-transform-member-expression-literals": "^7.14.5",
+        "@babel/plugin-transform-modules-amd": "^7.14.5",
+        "@babel/plugin-transform-modules-commonjs": "^7.15.4",
+        "@babel/plugin-transform-modules-systemjs": "^7.15.4",
+        "@babel/plugin-transform-modules-umd": "^7.14.5",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.9",
+        "@babel/plugin-transform-new-target": "^7.14.5",
+        "@babel/plugin-transform-object-super": "^7.14.5",
+        "@babel/plugin-transform-parameters": "^7.15.4",
+        "@babel/plugin-transform-property-literals": "^7.14.5",
+        "@babel/plugin-transform-regenerator": "^7.14.5",
+        "@babel/plugin-transform-reserved-words": "^7.14.5",
+        "@babel/plugin-transform-shorthand-properties": "^7.14.5",
+        "@babel/plugin-transform-spread": "^7.14.6",
+        "@babel/plugin-transform-sticky-regex": "^7.14.5",
+        "@babel/plugin-transform-template-literals": "^7.14.5",
+        "@babel/plugin-transform-typeof-symbol": "^7.14.5",
+        "@babel/plugin-transform-unicode-escapes": "^7.14.5",
+        "@babel/plugin-transform-unicode-regex": "^7.14.5",
         "@babel/preset-modules": "^0.1.4",
-        "@babel/types": "^7.13.14",
-        "babel-plugin-polyfill-corejs2": "^0.2.0",
-        "babel-plugin-polyfill-corejs3": "^0.2.0",
-        "babel-plugin-polyfill-regenerator": "^0.2.0",
-        "core-js-compat": "^3.9.0",
+        "@babel/types": "^7.15.4",
+        "babel-plugin-polyfill-corejs2": "^0.2.2",
+        "babel-plugin-polyfill-corejs3": "^0.2.2",
+        "babel-plugin-polyfill-regenerator": "^0.2.2",
+        "core-js-compat": "^3.16.0",
         "semver": "^6.3.0"
       }
     },
@@ -988,49 +1059,46 @@
       }
     },
     "@babel/runtime": {
-      "version": "7.13.10",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.10.tgz",
-      "integrity": "sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw==",
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+      "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
       "dev": true,
       "requires": {
         "regenerator-runtime": "^0.13.4"
       }
     },
     "@babel/template": {
-      "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
-      "integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
-      "dev": true,
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz",
+      "integrity": "sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==",
       "requires": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/parser": "^7.12.13",
-        "@babel/types": "^7.12.13"
+        "@babel/code-frame": "^7.14.5",
+        "@babel/parser": "^7.15.4",
+        "@babel/types": "^7.15.4"
       }
     },
     "@babel/traverse": {
-      "version": "7.13.15",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.15.tgz",
-      "integrity": "sha512-/mpZMNvj6bce59Qzl09fHEs8Bt8NnpEDQYleHUPZQ3wXUMvXi+HJPLars68oAbmp839fGoOkv2pSL2z9ajCIaQ==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.12.13",
-        "@babel/generator": "^7.13.9",
-        "@babel/helper-function-name": "^7.12.13",
-        "@babel/helper-split-export-declaration": "^7.12.13",
-        "@babel/parser": "^7.13.15",
-        "@babel/types": "^7.13.14",
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz",
+      "integrity": "sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==",
+      "requires": {
+        "@babel/code-frame": "^7.14.5",
+        "@babel/generator": "^7.15.4",
+        "@babel/helper-function-name": "^7.15.4",
+        "@babel/helper-hoist-variables": "^7.15.4",
+        "@babel/helper-split-export-declaration": "^7.15.4",
+        "@babel/parser": "^7.15.4",
+        "@babel/types": "^7.15.4",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.13.14",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.14.tgz",
-      "integrity": "sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ==",
-      "dev": true,
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.4.tgz",
+      "integrity": "sha512-0f1HJFuGmmbrKTCZtbm3cU+b/AqdEYk5toj5iQur58xkVMlS0JWaKxTBSmCXd47uiN7vbcozAupm6Mvs80GNhw==",
       "requires": {
-        "@babel/helper-validator-identifier": "^7.12.11",
-        "lodash": "^4.17.19",
+        "@babel/helper-validator-identifier": "^7.14.9",
         "to-fast-properties": "^2.0.0"
       }
     },
@@ -1062,15 +1130,15 @@
       }
     },
     "@eslint/eslintrc": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.0.tgz",
-      "integrity": "sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog==",
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
+      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
         "debug": "^4.1.1",
         "espree": "^7.3.0",
-        "globals": "^12.1.0",
+        "globals": "^13.9.0",
         "ignore": "^4.0.6",
         "import-fresh": "^3.2.1",
         "js-yaml": "^3.13.1",
@@ -1078,56 +1146,79 @@
         "strip-json-comments": "^3.1.1"
       },
       "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
         "globals": {
-          "version": "12.4.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
-          "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+          "version": "13.11.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
+          "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
           "dev": true,
           "requires": {
-            "type-fest": "^0.8.1"
+            "type-fest": "^0.20.2"
           }
+        },
+        "ignore": {
+          "version": "4.0.6",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+          "dev": true
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        },
+        "type-fest": {
+          "version": "0.20.2",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+          "dev": true
         }
       }
     },
-    "@hapi/address": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@hapi/address/-/address-2.1.4.tgz",
-      "integrity": "sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ==",
-      "dev": true
-    },
-    "@hapi/bourne": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz",
-      "integrity": "sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==",
-      "dev": true
-    },
     "@hapi/hoek": {
-      "version": "8.5.1",
-      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz",
-      "integrity": "sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow==",
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.2.0.tgz",
+      "integrity": "sha512-sqKVVVOe5ivCaXDWivIJYVSaEgdQK9ul7a4Kity5Iw7u9+wBAPbX1RMSnLLmp7O4Vzj0WOWwMAJsTL00xwaNug==",
       "dev": true
     },
-    "@hapi/joi": {
-      "version": "15.1.1",
-      "resolved": "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz",
-      "integrity": "sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==",
+    "@hapi/topo": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
+      "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==",
       "dev": true,
       "requires": {
-        "@hapi/address": "2.x.x",
-        "@hapi/bourne": "1.x.x",
-        "@hapi/hoek": "8.x.x",
-        "@hapi/topo": "3.x.x"
+        "@hapi/hoek": "^9.0.0"
       }
     },
-    "@hapi/topo": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz",
-      "integrity": "sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==",
+    "@humanwhocodes/config-array": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
+      "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
       "dev": true,
       "requires": {
-        "@hapi/hoek": "^8.3.0"
+        "@humanwhocodes/object-schema": "^1.2.0",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
       }
     },
+    "@humanwhocodes/object-schema": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz",
+      "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==",
+      "dev": true
+    },
     "@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -1159,57 +1250,6 @@
         "jest-message-util": "^26.6.2",
         "jest-util": "^26.6.2",
         "slash": "^3.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "@jest/core": {
@@ -1246,57 +1286,6 @@
         "rimraf": "^3.0.0",
         "slash": "^3.0.0",
         "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "@jest/environment": {
@@ -1369,60 +1358,11 @@
         "v8-to-istanbul": "^7.0.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
         }
       }
     },
@@ -1493,60 +1433,11 @@
         "write-file-atomic": "^3.0.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
         }
       }
     },
@@ -1561,85 +1452,52 @@
         "@types/node": "*",
         "@types/yargs": "^15.0.0",
         "chalk": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "@nodelib/fs.scandir": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz",
-      "integrity": "sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==",
-      "dev": true,
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "requires": {
-        "@nodelib/fs.stat": "2.0.4",
+        "@nodelib/fs.stat": "2.0.5",
         "run-parallel": "^1.1.9"
       }
     },
     "@nodelib/fs.stat": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz",
-      "integrity": "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==",
-      "dev": true
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="
     },
     "@nodelib/fs.walk": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz",
-      "integrity": "sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==",
-      "dev": true,
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "requires": {
-        "@nodelib/fs.scandir": "2.1.4",
+        "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
       }
     },
+    "@sideway/address": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.2.tgz",
+      "integrity": "sha512-idTz8ibqWFrPU8kMirL0CoPH/A29XOzzAzpyN3zQ4kAWnzmNfFmRaoMNN6VI8ske5M73HZyhIaW4OuSFIdM4oA==",
+      "dev": true,
+      "requires": {
+        "@hapi/hoek": "^9.0.0"
+      }
+    },
+    "@sideway/formula": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.0.tgz",
+      "integrity": "sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg==",
+      "dev": true
+    },
+    "@sideway/pinpoint": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
+      "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==",
+      "dev": true
+    },
     "@sinonjs/commons": {
       "version": "1.8.3",
       "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
@@ -1662,7 +1520,6 @@
       "version": "0.37.2",
       "resolved": "https://registry.npmjs.org/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz",
       "integrity": "sha512-nEhsFoJurt8oUmieT8qy4nk81WRHmJynmVwn/Vts08PL9fhgIsMhk1GId5yAN643OzqEEb5S/6At2TZW7pqPDA==",
-      "dev": true,
       "requires": {
         "@babel/core": ">=7.9.0"
       }
@@ -1671,16 +1528,21 @@
       "version": "0.36.2",
       "resolved": "https://registry.npmjs.org/@stylelint/postcss-markdown/-/postcss-markdown-0.36.2.tgz",
       "integrity": "sha512-2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ==",
-      "dev": true,
       "requires": {
         "remark": "^13.0.0",
         "unist-util-find-all-after": "^3.0.2"
       }
     },
+    "@tootallnate/once": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+      "dev": true
+    },
     "@types/babel__core": {
-      "version": "7.1.14",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.14.tgz",
-      "integrity": "sha512-zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g==",
+      "version": "7.1.16",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.16.tgz",
+      "integrity": "sha512-EAEHtisTMM+KaKwfWdC3oyllIqswlznXCIVCt7/oRNrh+DhgT4UEBNC/jlADNjvw7UnfbcdkGQcPVZ1xYiLcrQ==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.1.0",
@@ -1691,18 +1553,18 @@
       }
     },
     "@types/babel__generator": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz",
-      "integrity": "sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==",
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.3.tgz",
+      "integrity": "sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.0.0"
       }
     },
     "@types/babel__template": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.0.tgz",
-      "integrity": "sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==",
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
+      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.1.0",
@@ -1710,9 +1572,9 @@
       }
     },
     "@types/babel__traverse": {
-      "version": "7.11.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.11.1.tgz",
-      "integrity": "sha512-Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw==",
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.2.tgz",
+      "integrity": "sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.3.0"
@@ -1743,94 +1605,97 @@
       }
     },
     "@types/istanbul-reports": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-      "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
+      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
       "dev": true,
       "requires": {
         "@types/istanbul-lib-report": "*"
       }
     },
     "@types/mdast": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.3.tgz",
-      "integrity": "sha512-SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw==",
-      "dev": true,
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz",
+      "integrity": "sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==",
       "requires": {
         "@types/unist": "*"
       }
     },
     "@types/minimist": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz",
-      "integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==",
-      "dev": true
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
+      "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="
     },
     "@types/node": {
-      "version": "14.14.39",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.39.tgz",
-      "integrity": "sha512-Qipn7rfTxGEDqZiezH+wxqWYR8vcXq5LRpZrETD19Gs4o8LbklbmqotSUsMU+s5G3PJwMRDfNEYoxrcBwIxOuw=="
+      "version": "16.9.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.9.0.tgz",
+      "integrity": "sha512-nmP+VR4oT0pJUPFbKE4SXj3Yb4Q/kz3M9dSAO1GGMebRKWHQxLfDNmU/yh3xxCJha3N60nQ/JwXWwOE/ZSEVag==",
+      "dev": true
     },
     "@types/normalize-package-data": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
-      "dev": true
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
+      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw=="
     },
     "@types/parse-json": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
-      "dev": true
+      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
     },
     "@types/prettier": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.2.3.tgz",
-      "integrity": "sha512-PijRCG/K3s3w1We6ynUKdxEc5AcuuH3NBmMDP8uvKVp6X43UY7NQlTzczakXP3DJR0F4dfNQIGjU2cUeRYs2AA==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.3.2.tgz",
+      "integrity": "sha512-eI5Yrz3Qv4KPUa/nSIAi0h+qX0XyewOliug5F2QAtuRg6Kjg6jfmxe1GIwoIRhZspD1A0RP8ANrPwvEXXtRFog==",
       "dev": true
     },
     "@types/q": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz",
-      "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz",
+      "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==",
       "dev": true
     },
     "@types/stack-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz",
-      "integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
+      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
       "dev": true
     },
     "@types/unist": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz",
-      "integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==",
-      "dev": true
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz",
+      "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ=="
     },
     "@types/yargs": {
-      "version": "15.0.13",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.13.tgz",
-      "integrity": "sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ==",
+      "version": "15.0.14",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz",
+      "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==",
       "dev": true,
       "requires": {
         "@types/yargs-parser": "*"
       }
     },
     "@types/yargs-parser": {
-      "version": "20.2.0",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz",
-      "integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==",
+      "version": "20.2.1",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz",
+      "integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==",
       "dev": true
     },
     "@types/yauzl": {
-      "version": "2.9.1",
-      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.1.tgz",
-      "integrity": "sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA==",
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz",
+      "integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==",
+      "dev": true,
       "optional": true,
       "requires": {
         "@types/node": "*"
       }
     },
+    "@xmldom/xmldom": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.4.tgz",
+      "integrity": "sha512-wdxC79cvO7PjSM34jATd/RYZuYWQ8y/R7MidZl1NYYlbpFn1+spfjkiR3ZsJfcaTs2IyslBN7VwBBJwrYKM+zw==",
+      "dev": true
+    },
     "abab": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
@@ -1854,9 +1719,9 @@
       }
     },
     "acorn-jsx": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
-      "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "dev": true
     },
     "acorn-walk": {
@@ -1869,19 +1734,19 @@
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
       "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
       "requires": {
         "debug": "4"
       }
     },
     "ajv": {
-      "version": "6.12.6",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
-      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
+      "version": "8.6.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz",
+      "integrity": "sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==",
       "requires": {
         "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
         "uri-js": "^4.2.2"
       }
     },
@@ -1909,18 +1774,16 @@
       }
     },
     "ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "dev": true
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
     },
     "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "requires": {
-        "color-convert": "^1.9.0"
+        "color-convert": "^2.0.1"
       }
     },
     "anymatch": {
@@ -1962,8 +1825,7 @@
     "array-union": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="
     },
     "array-unique": {
       "version": "0.3.2",
@@ -1974,8 +1836,7 @@
     "arrify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
-      "dev": true
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
     },
     "asn1": {
       "version": "0.2.4",
@@ -2001,17 +1862,13 @@
     "astral-regex": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "dev": true
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="
     },
     "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.14"
-      }
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.1.tgz",
+      "integrity": "sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg==",
+      "dev": true
     },
     "asynckit": {
       "version": "0.4.0",
@@ -2022,8 +1879,7 @@
     "at-least-node": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
-      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
-      "dev": true
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="
     },
     "atob": {
       "version": "2.1.2",
@@ -2032,14 +1888,14 @@
       "dev": true
     },
     "autoprefixer": {
-      "version": "10.2.5",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.2.5.tgz",
-      "integrity": "sha512-7H4AJZXvSsn62SqZyJCP+1AWwOuoYpUfK6ot9vm0e87XD6mT8lDywc9D9OTJPMULyGcvmIxzTAMeG2Cc+YX+fA==",
+      "version": "10.3.4",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.3.4.tgz",
+      "integrity": "sha512-EKjKDXOq7ug+jagLzmnoTRpTT0q1KVzEJqrJd0hCBa7FiG0WbFOBCcJCy2QkW1OckpO3qgttA1aWjVbeIPAecw==",
       "requires": {
-        "browserslist": "^4.16.3",
-        "caniuse-lite": "^1.0.30001196",
-        "colorette": "^1.2.2",
-        "fraction.js": "^4.0.13",
+        "browserslist": "^4.16.8",
+        "caniuse-lite": "^1.0.30001252",
+        "colorette": "^1.3.0",
+        "fraction.js": "^4.1.1",
         "normalize-range": "^0.1.2",
         "postcss-value-parser": "^4.1.0"
       }
@@ -2056,6 +1912,15 @@
       "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
       "dev": true
     },
+    "axios": {
+      "version": "0.21.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
+      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
+      "dev": true,
+      "requires": {
+        "follow-redirects": "^1.14.0"
+      }
+    },
     "babel-jest": {
       "version": "26.6.3",
       "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.3.tgz",
@@ -2070,57 +1935,6 @@
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "slash": "^3.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "babel-plugin-dynamic-import-node": {
@@ -2158,33 +1972,33 @@
       }
     },
     "babel-plugin-polyfill-corejs2": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.0.tgz",
-      "integrity": "sha512-9bNwiR0dS881c5SHnzCmmGlMkJLl0OUZvxrxHo9w/iNoRuqaPjqlvBf4HrovXtQs/au5yKkpcdgfT1cC5PAZwg==",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz",
+      "integrity": "sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==",
       "dev": true,
       "requires": {
         "@babel/compat-data": "^7.13.11",
-        "@babel/helper-define-polyfill-provider": "^0.2.0",
+        "@babel/helper-define-polyfill-provider": "^0.2.2",
         "semver": "^6.1.1"
       }
     },
     "babel-plugin-polyfill-corejs3": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.0.tgz",
-      "integrity": "sha512-zZyi7p3BCUyzNxLx8KV61zTINkkV65zVkDAFNZmrTCRVhjo1jAS+YLvDJ9Jgd/w2tsAviCwFHReYfxO3Iql8Yg==",
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.4.tgz",
+      "integrity": "sha512-z3HnJE5TY/j4EFEa/qpQMSbcUJZ5JQi+3UFjXzn6pQCmIKc5Ug5j98SuYyH+m4xQnvKlMDIW4plLfgyVnd0IcQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.2.0",
-        "core-js-compat": "^3.9.1"
+        "@babel/helper-define-polyfill-provider": "^0.2.2",
+        "core-js-compat": "^3.14.0"
       }
     },
     "babel-plugin-polyfill-regenerator": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.0.tgz",
-      "integrity": "sha512-J7vKbCuD2Xi/eEHxquHN14bXAW9CXtecwuLrOIDJtcZzTaPzV1VdEfoUf9AzcRBMolKUQKM9/GVojeh0hFiqMg==",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz",
+      "integrity": "sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==",
       "dev": true,
       "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.2.0"
+        "@babel/helper-define-polyfill-provider": "^0.2.2"
       }
     },
     "babel-preset-current-node-syntax": {
@@ -2220,13 +2034,12 @@
     "bail": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz",
-      "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==",
-      "dev": true
+      "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ=="
     },
     "balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
+      "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA=="
     },
     "base": {
       "version": "0.11.2",
@@ -2286,7 +2099,8 @@
     "base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true
     },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
@@ -2306,6 +2120,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
       "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "dev": true,
       "requires": {
         "buffer": "^5.5.0",
         "inherits": "^2.0.4",
@@ -2325,6 +2140,13 @@
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
+      },
+      "dependencies": {
+        "balanced-match": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+          "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+        }
       }
     },
     "braces": {
@@ -2341,44 +2163,16 @@
       "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
       "dev": true
     },
-    "browser-stdout": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz",
-      "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
-      "dev": true
-    },
     "browserslist": {
-      "version": "4.16.8",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.8.tgz",
-      "integrity": "sha512-sc2m9ohR/49sWEbPj14ZSSZqp+kbi16aLao42Hmn3Z8FpjuMaq2xCA2l4zl9ITfyzvnvyE0hcg62YkIGKxgaNQ==",
+      "version": "4.17.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.0.tgz",
+      "integrity": "sha512-g2BJ2a0nEYvEFQC208q8mVAhfNwpZ5Mu8BwgtCdZKO3qx98HChmeg448fPdUzld8aFmfLgVh7yymqV+q1lJZ5g==",
       "requires": {
-        "caniuse-lite": "^1.0.30001251",
+        "caniuse-lite": "^1.0.30001254",
         "colorette": "^1.3.0",
-        "electron-to-chromium": "^1.3.811",
+        "electron-to-chromium": "^1.3.830",
         "escalade": "^3.1.1",
         "node-releases": "^1.1.75"
-      },
-      "dependencies": {
-        "caniuse-lite": {
-          "version": "1.0.30001252",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001252.tgz",
-          "integrity": "sha512-I56jhWDGMtdILQORdusxBOH+Nl/KgQSdDmpJezYddnAkVOmnoU8zwjTV9xAjMIYxr0iPreEAVylCGcmHCjfaOw=="
-        },
-        "colorette": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz",
-          "integrity": "sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w=="
-        },
-        "electron-to-chromium": {
-          "version": "1.3.822",
-          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.822.tgz",
-          "integrity": "sha512-k7jG5oYYHxF4jx6PcqwHX3JVME/OjzolqOZiIogi9xtsfsmTjTdie4x88OakYFPEa8euciTgCCzvVNwvmjHb1Q=="
-        },
-        "node-releases": {
-          "version": "1.1.75",
-          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.75.tgz",
-          "integrity": "sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw=="
-        }
       }
     },
     "bser": {
@@ -2394,6 +2188,7 @@
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
       "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "dev": true,
       "requires": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.1.13"
@@ -2402,12 +2197,13 @@
     "buffer-crc32": {
       "version": "0.2.13",
       "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "dev": true
     },
     "buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
       "dev": true
     },
     "cache-base": {
@@ -2425,6 +2221,29 @@
         "to-object-path": "^0.3.0",
         "union-value": "^1.0.0",
         "unset-value": "^1.0.0"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "set-value": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+          "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-extendable": "^0.1.1",
+            "is-plain-object": "^2.0.3",
+            "split-string": "^3.0.1"
+          }
+        }
       }
     },
     "call-bind": {
@@ -2440,20 +2259,17 @@
     "callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
     },
     "camelcase": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-      "dev": true
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="
     },
     "camelcase-keys": {
       "version": "6.2.2",
       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
       "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
-      "dev": true,
       "requires": {
         "camelcase": "^5.3.1",
         "map-obj": "^4.0.0",
@@ -2461,9 +2277,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001208",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001208.tgz",
-      "integrity": "sha512-OE5UE4+nBOro8Dyvv0lfx+SRtfVIOM9uhKqFmJeUbGriqhhStgp1A0OyBpgy3OUF8AhYCT+PVwPC1gMl2ZcQMA=="
+      "version": "1.0.30001255",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001255.tgz",
+      "integrity": "sha512-F+A3N9jTZL882f/fg/WWVnKSu6IOo3ueLz4zwaOPbPYHNmM/ZaDUyzyJwS1mZhX7Ex5jqTyW599Gdelh5PDYLQ=="
     },
     "capture-exit": {
       "version": "2.0.0",
@@ -2481,14 +2297,12 @@
       "dev": true
     },
     "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       }
     },
     "char-regex": {
@@ -2500,40 +2314,38 @@
     "character-entities": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz",
-      "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==",
-      "dev": true
+      "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw=="
     },
     "character-entities-legacy": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz",
-      "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==",
-      "dev": true
+      "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA=="
     },
     "character-reference-invalid": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz",
-      "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==",
-      "dev": true
+      "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg=="
     },
     "chokidar": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
-      "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
+      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
       "requires": {
-        "anymatch": "~3.1.1",
+        "anymatch": "~3.1.2",
         "braces": "~3.0.2",
-        "fsevents": "~2.3.1",
-        "glob-parent": "~5.1.0",
+        "fsevents": "~2.3.2",
+        "glob-parent": "~5.1.2",
         "is-binary-path": "~2.1.0",
         "is-glob": "~4.0.1",
         "normalize-path": "~3.0.0",
-        "readdirp": "~3.5.0"
+        "readdirp": "~3.6.0"
       }
     },
     "chownr": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true
     },
     "ci-info": {
       "version": "2.0.0",
@@ -2571,14 +2383,13 @@
       }
     },
     "cliui": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-      "dev": true,
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
       "requires": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
+        "wrap-ansi": "^7.0.0"
       }
     },
     "clone": {
@@ -2606,6 +2417,12 @@
         "shallow-clone": "^0.1.2"
       },
       "dependencies": {
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -2621,7 +2438,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz",
       "integrity": "sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==",
-      "dev": true,
       "requires": {
         "is-regexp": "^2.0.0"
       }
@@ -2658,12 +2474,6 @@
             "util-deprecate": "~1.0.1"
           }
         },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        },
         "string_decoder": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -2690,59 +2500,120 @@
         "@types/q": "^1.5.1",
         "chalk": "^2.4.1",
         "q": "^1.1.2"
-      }
-    },
-    "code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "dev": true
-    },
-    "collect-v8-coverage": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
-      "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
-      "dev": true
-    },
-    "collection-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
-      "dev": true,
-      "requires": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
-      }
-    },
-    "color": {
-      "version": "3.0.0",
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
+      }
+    },
+    "collect-v8-coverage": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
+      "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
+      "dev": true
+    },
+    "collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "dev": true,
+      "requires": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      }
+    },
+    "color": {
+      "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz",
       "integrity": "sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==",
       "dev": true,
       "requires": {
         "color-convert": "^1.9.1",
         "color-string": "^1.5.2"
+      },
+      "dependencies": {
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        }
       }
     },
     "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "requires": {
-        "color-name": "1.1.3"
+        "color-name": "~1.1.4"
       }
     },
     "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "dev": true
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "color-string": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.5.tgz",
-      "integrity": "sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.6.0.tgz",
+      "integrity": "sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA==",
       "dev": true,
       "requires": {
         "color-name": "^1.0.0",
@@ -2750,9 +2621,9 @@
       }
     },
     "colorette": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w=="
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
+      "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g=="
     },
     "colors": {
       "version": "1.4.0",
@@ -2823,12 +2694,6 @@
             "util-deprecate": "~1.0.1"
           }
         },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        },
         "string_decoder": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -2841,20 +2706,11 @@
       }
     },
     "convert-source-map": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
-      "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
-      "dev": true,
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
       "requires": {
         "safe-buffer": "~5.1.1"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        }
       }
     },
     "copy-descriptor": {
@@ -2870,12 +2726,12 @@
       "dev": true
     },
     "core-js-compat": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.10.1.tgz",
-      "integrity": "sha512-ZHQTdTPkqvw2CeHiZC970NNJcnwzT6YIueDMASKt+p3WbZsLXOcoD392SkcWhkC0wBBHhlfhqGKKsNCQUozYtg==",
+      "version": "3.17.2",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.17.2.tgz",
+      "integrity": "sha512-lHnt7A1Oqplebl5i0MrQyFv/yyEzr9p29OjlkcsFRDDgHwwQyVckfRGJ790qzXhkwM8ba4SFHHa2sO+T5f1zGg==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.16.3",
+        "browserslist": "^4.16.8",
         "semver": "7.0.0"
       },
       "dependencies": {
@@ -2888,16 +2744,15 @@
       }
     },
     "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
       "dev": true
     },
     "cosmiconfig": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz",
-      "integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
-      "dev": true,
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
+      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
       "requires": {
         "@types/parse-json": "^4.0.0",
         "import-fresh": "^3.2.1",
@@ -2937,6 +2792,23 @@
         "css-what": "^3.2.1",
         "domutils": "^1.7.0",
         "nth-check": "^1.0.2"
+      },
+      "dependencies": {
+        "css-what": {
+          "version": "3.4.2",
+          "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
+          "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==",
+          "dev": true
+        },
+        "nth-check": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
+          "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
+          "dev": true,
+          "requires": {
+            "boolbase": "~1.0.0"
+          }
+        }
       }
     },
     "css-select-base-adapter": {
@@ -2970,16 +2842,15 @@
       }
     },
     "css-what": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
-      "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.0.1.tgz",
+      "integrity": "sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==",
       "dev": true
     },
     "cssesc": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "dev": true
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="
     },
     "cssmin": {
       "version": "0.4.3",
@@ -3073,16 +2944,10 @@
         "whatwg-url": "^8.0.0"
       }
     },
-    "dateformat": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz",
-      "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
-      "dev": true
-    },
     "debug": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
-      "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
       "requires": {
         "ms": "2.1.2"
       }
@@ -3090,14 +2955,12 @@
     "decamelize": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA="
     },
     "decamelize-keys": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
       "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
-      "dev": true,
       "requires": {
         "decamelize": "^1.1.0",
         "map-obj": "^1.0.0"
@@ -3106,15 +2969,14 @@
         "map-obj": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-          "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-          "dev": true
+          "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0="
         }
       }
     },
     "decimal.js": {
-      "version": "10.2.1",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz",
-      "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==",
+      "version": "10.3.1",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
+      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
       "dev": true
     },
     "decode-uri-component": {
@@ -3124,9 +2986,9 @@
       "dev": true
     },
     "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
     "deepmerge": {
@@ -3194,8 +3056,7 @@
     "dependency-graph": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.9.0.tgz",
-      "integrity": "sha512-9YLIBURXj4DJMFALxXw9K3Y3rwb5Fk0X5/8ipCzaN84+gKxoHK43tVKRNakCQbiEx07E8Uwhuq21BpUagFhZ8w==",
-      "dev": true
+      "integrity": "sha512-9YLIBURXj4DJMFALxXw9K3Y3rwb5Fk0X5/8ipCzaN84+gKxoHK43tVKRNakCQbiEx07E8Uwhuq21BpUagFhZ8w=="
     },
     "detect-newline": {
       "version": "3.1.0",
@@ -3204,14 +3065,9 @@
       "dev": true
     },
     "devtools-protocol": {
-      "version": "0.0.854822",
-      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.854822.tgz",
-      "integrity": "sha512-xd4D8kHQtB0KtWW0c9xBZD5LVtm9chkMOfs/3Yn01RhT/sFIsVtzTtypfKoFfWBaL+7xCYLxjOLkhwPXaX/Kcg=="
-    },
-    "diff": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
-      "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
+      "version": "0.0.869402",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
+      "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
       "dev": true
     },
     "diff-sequences": {
@@ -3224,7 +3080,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
       "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
       "requires": {
         "path-type": "^4.0.0"
       }
@@ -3242,7 +3097,6 @@
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
       "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
-      "dev": true,
       "requires": {
         "domelementtype": "^2.0.1",
         "entities": "^2.0.0"
@@ -3251,22 +3105,19 @@
         "domelementtype": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
-          "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
-          "dev": true
+          "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="
         },
         "entities": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-          "dev": true
+          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="
         }
       }
     },
     "domelementtype": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
-      "dev": true
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
     },
     "domexception": {
       "version": "2.0.1",
@@ -3289,7 +3140,6 @@
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
       "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
-      "dev": true,
       "requires": {
         "domelementtype": "1"
       }
@@ -3298,7 +3148,6 @@
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
       "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
-      "dev": true,
       "requires": {
         "dom-serializer": "0",
         "domelementtype": "1"
@@ -3314,6 +3163,11 @@
         "safer-buffer": "^2.1.0"
       }
     },
+    "electron-to-chromium": {
+      "version": "1.3.833",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.833.tgz",
+      "integrity": "sha512-h+9aVaUHjyunLqtCjJF2jrJ73tYcJqo2cCGKtVAXH9WmnBsb8hiChRQ0P1uXjdxR6Wcfxibephy41c1YlZA/pA=="
+    },
     "emittery": {
       "version": "0.7.2",
       "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz",
@@ -3323,8 +3177,7 @@
     "emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
     },
     "enabled": {
       "version": "2.0.0",
@@ -3336,6 +3189,7 @@
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
       "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
       "requires": {
         "once": "^1.4.0"
       }
@@ -3352,40 +3206,40 @@
     "entities": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
-      "dev": true
+      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
     },
     "error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
       "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
       "requires": {
         "is-arrayish": "^0.2.1"
       }
     },
     "es-abstract": {
-      "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz",
-      "integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==",
+      "version": "1.18.6",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.6.tgz",
+      "integrity": "sha512-kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
         "get-intrinsic": "^1.1.1",
+        "get-symbol-description": "^1.0.0",
         "has": "^1.0.3",
         "has-symbols": "^1.0.2",
-        "is-callable": "^1.2.3",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.4",
         "is-negative-zero": "^2.0.1",
-        "is-regex": "^1.1.2",
-        "is-string": "^1.0.5",
-        "object-inspect": "^1.9.0",
+        "is-regex": "^1.1.4",
+        "is-string": "^1.0.7",
+        "object-inspect": "^1.11.0",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.2",
         "string.prototype.trimend": "^1.0.4",
         "string.prototype.trimstart": "^1.0.4",
-        "unbox-primitive": "^1.0.0"
+        "unbox-primitive": "^1.0.1"
       }
     },
     "es-to-primitive": {
@@ -3413,8 +3267,7 @@
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
     },
     "escodegen": {
       "version": "2.0.0",
@@ -3484,28 +3337,31 @@
       }
     },
     "eslint": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.24.0.tgz",
-      "integrity": "sha512-k9gaHeHiFmGCDQ2rEfvULlSLruz6tgfA8DEn+rY9/oYPFFTlz55mM/Q/Rij1b2Y42jwZiK3lXvNTw6w6TXzcKQ==",
+      "version": "7.32.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
+      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "7.12.11",
-        "@eslint/eslintrc": "^0.4.0",
+        "@eslint/eslintrc": "^0.4.3",
+        "@humanwhocodes/config-array": "^0.5.0",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
         "debug": "^4.0.1",
         "doctrine": "^3.0.0",
         "enquirer": "^2.3.5",
+        "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^2.1.0",
         "eslint-visitor-keys": "^2.0.0",
         "espree": "^7.3.1",
         "esquery": "^1.4.0",
         "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
         "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.0.0",
+        "glob-parent": "^5.1.2",
         "globals": "^13.6.0",
         "ignore": "^4.0.6",
         "import-fresh": "^3.0.0",
@@ -3514,7 +3370,7 @@
         "js-yaml": "^3.13.1",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
-        "lodash": "^4.17.21",
+        "lodash.merge": "^4.6.2",
         "minimatch": "^3.0.4",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.1",
@@ -3523,7 +3379,7 @@
         "semver": "^7.2.1",
         "strip-ansi": "^6.0.0",
         "strip-json-comments": "^3.1.0",
-        "table": "^6.0.4",
+        "table": "^6.0.9",
         "text-table": "^0.2.0",
         "v8-compile-cache": "^2.0.3"
       },
@@ -3537,40 +3393,18 @@
             "@babel/highlight": "^7.10.4"
           }
         },
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
           }
         },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
         "cross-spawn": {
           "version": "7.0.3",
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -3582,19 +3416,31 @@
             "which": "^2.0.1"
           }
         },
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+          "dev": true
+        },
         "globals": {
-          "version": "13.8.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-13.8.0.tgz",
-          "integrity": "sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q==",
+          "version": "13.11.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
+          "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
           "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
           }
         },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+        "ignore": {
+          "version": "4.0.6",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+          "dev": true
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
           "dev": true
         },
         "path-key": {
@@ -3627,15 +3473,6 @@
           "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
           "dev": true
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
         "type-fest": {
           "version": "0.20.2",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
@@ -3681,9 +3518,9 @@
       }
     },
     "eslint-visitor-keys": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
-      "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
       "dev": true
     },
     "espree": {
@@ -3776,24 +3613,12 @@
         "p-finally": "^1.0.0",
         "signal-exit": "^3.0.0",
         "strip-eof": "^1.0.0"
-      },
-      "dependencies": {
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "dev": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        }
       }
     },
     "execall": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz",
       "integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==",
-      "dev": true,
       "requires": {
         "clone-regexp": "^2.1.0"
       }
@@ -3875,45 +3700,18 @@
         "jest-matcher-utils": "^26.6.2",
         "jest-message-util": "^26.6.2",
         "jest-regex-util": "^26.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        }
       }
     },
     "expect-puppeteer": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/expect-puppeteer/-/expect-puppeteer-4.4.0.tgz",
-      "integrity": "sha512-6Ey4Xy2xvmuQu7z7YQtMsaMV0EHJRpVxIDOd5GRrm04/I3nkTKIutELfECsLp6le+b3SSa3cXhPiw6PgqzxYWA==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/expect-puppeteer/-/expect-puppeteer-5.0.4.tgz",
+      "integrity": "sha512-NV7jSiKhK+byocxg9A+0av+Q2RSCP9bcLVRz7zhHaESeCOkuomMvl9oD+uo1K+NdqRCXhNkQlUGWlmtbrpR1qw==",
       "dev": true
     },
     "extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
     },
     "extend-shallow": {
       "version": "3.0.2",
@@ -4005,11 +3803,23 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
       "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
+      "dev": true,
       "requires": {
         "@types/yauzl": "^2.9.1",
         "debug": "^4.1.1",
         "get-stream": "^5.1.0",
         "yauzl": "^2.10.0"
+      },
+      "dependencies": {
+        "get-stream": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        }
       }
     },
     "extsprintf": {
@@ -4021,21 +3831,18 @@
     "fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
     "fast-glob": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz",
-      "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==",
-      "dev": true,
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
+      "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.0",
+        "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.2",
-        "picomatch": "^2.2.1"
+        "micromatch": "^4.0.4"
       }
     },
     "fast-json-stable-stringify": {
@@ -4051,22 +3858,20 @@
       "dev": true
     },
     "fast-safe-stringify": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz",
-      "integrity": "sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
       "dev": true
     },
     "fastest-levenshtein": {
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
-      "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
-      "dev": true
+      "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow=="
     },
     "fastq": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
-      "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==",
-      "dev": true,
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.12.0.tgz",
+      "integrity": "sha512-VNX0QkHK3RsXVKr9KrlUv/FoTa0NdbYoHHl7uXHv2rzyHSlxjdNAKug2twd9luJxpcyNeAgf5iPPMutJO67Dfg==",
       "requires": {
         "reusify": "^1.0.4"
       }
@@ -4084,6 +3889,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
       "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+      "dev": true,
       "requires": {
         "pend": "~1.2.0"
       }
@@ -4098,7 +3904,6 @@
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
       "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
-      "dev": true,
       "requires": {
         "flat-cache": "^3.0.4"
       }
@@ -4139,57 +3944,6 @@
         "chalk": "^4.0.0",
         "commander": "^5.1.0",
         "debug": "^4.1.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "find-up": {
@@ -4205,17 +3959,15 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
       "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
-      "dev": true,
       "requires": {
         "flatted": "^3.1.0",
         "rimraf": "^3.0.2"
       }
     },
     "flatted": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz",
-      "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==",
-      "dev": true
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
+      "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA=="
     },
     "fn.name": {
       "version": "1.1.0",
@@ -4223,6 +3975,12 @@
       "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==",
       "dev": true
     },
+    "follow-redirects": {
+      "version": "1.14.3",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.3.tgz",
+      "integrity": "sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw==",
+      "dev": true
+    },
     "for-in": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -4245,20 +4003,20 @@
       "dev": true
     },
     "form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
       "dev": true,
       "requires": {
         "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
+        "combined-stream": "^1.0.8",
         "mime-types": "^2.1.12"
       }
     },
     "fraction.js": {
-      "version": "4.0.13",
-      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.0.13.tgz",
-      "integrity": "sha512-E1fz2Xs9ltlUp+qbiyx9wmt2n9dRzPsS11Jtdb8D2o+cC7wr9xkkKsVKJuBX0ST+LVS+LhLO+SbLJNtfWcJvXA=="
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.1.tgz",
+      "integrity": "sha512-MHOhvvxHTfRFpF1geTK9czMIZ6xclsEor2wkIGYYq+PxcQqT7vStJqjhe6S1TenZrMZzo+wlqOufBDVepUEgPg=="
     },
     "fragment-cache": {
       "version": "0.2.1",
@@ -4272,7 +4030,8 @@
     "fs-constants": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "dev": true
     },
     "fs-exists-sync": {
       "version": "0.1.0",
@@ -4284,20 +4043,11 @@
       "version": "9.1.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
       "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-      "dev": true,
       "requires": {
         "at-least-node": "^1.0.0",
         "graceful-fs": "^4.2.0",
         "jsonfile": "^6.0.1",
         "universalify": "^2.0.0"
-      },
-      "dependencies": {
-        "universalify": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-          "dev": true
-        }
       }
     },
     "fs.realpath": {
@@ -4314,8 +4064,7 @@
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
     "functional-red-black-tree": {
       "version": "1.0.1",
@@ -4326,14 +4075,12 @@
     "gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "dev": true
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
     },
     "get-caller-file": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "dev": true
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
     },
     "get-intrinsic": {
       "version": "1.1.1",
@@ -4355,17 +4102,27 @@
     "get-stdin": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
-      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
-      "dev": true
+      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg=="
     },
     "get-stream": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
       "requires": {
         "pump": "^3.0.0"
       }
     },
+    "get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "dev": true,
+      "requires": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      }
+    },
     "get-value": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
@@ -4382,9 +4139,9 @@
       }
     },
     "glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "version": "7.1.7",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -4403,54 +4160,32 @@
       }
     },
     "global-modules": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz",
-      "integrity": "sha1-6lo77ULG1s6ZWk+KEmm12uIjgo0=",
-      "dev": true,
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
+      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
       "requires": {
-        "global-prefix": "^0.1.4",
-        "is-windows": "^0.2.0"
-      },
-      "dependencies": {
-        "is-windows": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
-          "integrity": "sha1-3hqm1j6indJIc3tp8f+LgALSEIw=",
-          "dev": true
-        }
+        "global-prefix": "^3.0.0"
       }
     },
     "global-prefix": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz",
-      "integrity": "sha1-jTvGuNo8qBEqFg2NSW/wRiv+948=",
-      "dev": true,
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
+      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
       "requires": {
-        "homedir-polyfill": "^1.0.0",
-        "ini": "^1.3.4",
-        "is-windows": "^0.2.0",
-        "which": "^1.2.12"
-      },
-      "dependencies": {
-        "is-windows": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
-          "integrity": "sha1-3hqm1j6indJIc3tp8f+LgALSEIw=",
-          "dev": true
-        }
+        "ini": "^1.3.5",
+        "kind-of": "^6.0.2",
+        "which": "^1.3.1"
       }
     },
     "globals": {
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
     },
     "globby": {
-      "version": "11.0.3",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz",
-      "integrity": "sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==",
-      "dev": true,
+      "version": "11.0.4",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
+      "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
       "requires": {
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
@@ -4458,42 +4193,25 @@
         "ignore": "^5.1.4",
         "merge2": "^1.3.0",
         "slash": "^3.0.0"
-      },
-      "dependencies": {
-        "ignore": {
-          "version": "5.1.8",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-          "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
-          "dev": true
-        }
       }
     },
     "globjoin": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
-      "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=",
-      "dev": true
+      "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM="
     },
     "gonzales-pe": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.3.0.tgz",
       "integrity": "sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==",
-      "dev": true,
       "requires": {
         "minimist": "^1.2.5"
       }
     },
     "graceful-fs": {
-      "version": "4.2.6",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
-      "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==",
-      "dev": true
-    },
-    "growl": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
-      "dev": true
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
+      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="
     },
     "growly": {
       "version": "1.3.0",
@@ -4516,19 +4234,37 @@
       "requires": {
         "ajv": "^6.12.3",
         "har-schema": "^2.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "6.12.6",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+          "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "fast-json-stable-stringify": "^2.0.0",
+            "json-schema-traverse": "^0.4.1",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
+        }
       }
     },
     "hard-rejection": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
-      "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
-      "dev": true
+      "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA=="
     },
     "has": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
       "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
       "requires": {
         "function-bind": "^1.1.1"
       }
@@ -4540,10 +4276,9 @@
       "dev": true
     },
     "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
     },
     "has-symbols": {
       "version": "1.0.2",
@@ -4551,6 +4286,15 @@
       "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
       "dev": true
     },
+    "has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dev": true,
+      "requires": {
+        "has-symbols": "^1.0.2"
+      }
+    },
     "has-value": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
@@ -4572,6 +4316,12 @@
         "kind-of": "^4.0.0"
       },
       "dependencies": {
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -4613,12 +4363,6 @@
         "pinkie-promise": "^2.0.0"
       }
     },
-    "he": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
-      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
-      "dev": true
-    },
     "homedir-polyfill": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
@@ -4629,10 +4373,12 @@
       }
     },
     "hosted-git-info": {
-      "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
-      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
-      "dev": true
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
+      "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
+      "requires": {
+        "lru-cache": "^6.0.0"
+      }
     },
     "html-encoding-sniffer": {
       "version": "2.0.1",
@@ -4652,14 +4398,12 @@
     "html-tags": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.1.0.tgz",
-      "integrity": "sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==",
-      "dev": true
+      "integrity": "sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg=="
     },
     "htmlparser2": {
       "version": "3.10.1",
       "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
       "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
-      "dev": true,
       "requires": {
         "domelementtype": "^1.3.1",
         "domhandler": "^2.3.0",
@@ -4669,6 +4413,17 @@
         "readable-stream": "^3.1.1"
       }
     },
+    "http-proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "dev": true,
+      "requires": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
+      }
+    },
     "http-signature": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
@@ -4684,6 +4439,7 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
       "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "dev": true,
       "requires": {
         "agent-base": "6",
         "debug": "4"
@@ -4707,19 +4463,18 @@
     "ieee754": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true
     },
     "ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-      "dev": true
+      "version": "5.1.8",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw=="
     },
     "import-cwd": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-3.0.0.tgz",
       "integrity": "sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg==",
-      "dev": true,
       "requires": {
         "import-from": "^3.0.0"
       }
@@ -4728,7 +4483,6 @@
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
       "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
       "requires": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -4737,8 +4491,7 @@
         "resolve-from": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-          "dev": true
+          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
         }
       }
     },
@@ -4746,7 +4499,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/import-from/-/import-from-3.0.0.tgz",
       "integrity": "sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==",
-      "dev": true,
       "requires": {
         "resolve-from": "^5.0.0"
       }
@@ -4754,8 +4506,7 @@
     "import-lazy": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
-      "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
-      "dev": true
+      "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw=="
     },
     "import-local": {
       "version": "3.0.2",
@@ -4770,20 +4521,12 @@
     "imurmurhash": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o="
     },
     "indent-string": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "dev": true
-    },
-    "indexes-of": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
-      "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
-      "dev": true
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="
     },
     "inflight": {
       "version": "1.0.6",
@@ -4802,14 +4545,18 @@
     "ini": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
     },
-    "invert-kv": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
-      "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
-      "dev": true
+    "internal-slot": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.1.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      }
     },
     "is-accessor-descriptor": {
       "version": "0.1.6",
@@ -4820,6 +4567,12 @@
         "kind-of": "^3.0.2"
       },
       "dependencies": {
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -4834,14 +4587,12 @@
     "is-alphabetical": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
-      "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
-      "dev": true
+      "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg=="
     },
     "is-alphanumerical": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
       "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
-      "dev": true,
       "requires": {
         "is-alphabetical": "^1.0.0",
         "is-decimal": "^1.0.0"
@@ -4850,14 +4601,16 @@
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
     },
     "is-bigint": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.1.tgz",
-      "integrity": "sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==",
-      "dev": true
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "requires": {
+        "has-bigints": "^1.0.1"
+      }
     },
     "is-binary-path": {
       "version": "2.1.0",
@@ -4868,24 +4621,24 @@
       }
     },
     "is-boolean-object": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz",
-      "integrity": "sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.0"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       }
     },
     "is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
+      "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="
     },
     "is-callable": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
-      "integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
       "dev": true
     },
     "is-ci": {
@@ -4898,10 +4651,9 @@
       }
     },
     "is-core-module": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
-      "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==",
-      "dev": true,
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz",
+      "integrity": "sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==",
       "requires": {
         "has": "^1.0.3"
       }
@@ -4915,6 +4667,12 @@
         "kind-of": "^3.0.2"
       },
       "dependencies": {
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -4927,16 +4685,18 @@
       }
     },
     "is-date-object": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz",
-      "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
-      "dev": true
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
     },
     "is-decimal": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
-      "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==",
-      "dev": true
+      "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw=="
     },
     "is-descriptor": {
       "version": "0.1.6",
@@ -4978,8 +4738,7 @@
     "is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
     },
     "is-generator-fn": {
       "version": "2.1.0",
@@ -4998,8 +4757,7 @@
     "is-hexadecimal": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz",
-      "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==",
-      "dev": true
+      "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw=="
     },
     "is-negative-zero": {
       "version": "2.0.1",
@@ -5013,16 +4771,18 @@
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
     },
     "is-number-object": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz",
-      "integrity": "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==",
-      "dev": true
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
+      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
     },
     "is-plain-obj": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
-      "dev": true
+      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA=="
     },
     "is-plain-object": {
       "version": "2.0.4",
@@ -5039,21 +4799,26 @@
       "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
       "dev": true
     },
+    "is-primitive": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-3.0.1.tgz",
+      "integrity": "sha512-GljRxhWvlCNRfZyORiH77FwdFwGcMO620o37EOYC0ORWdq+WYNVqW0w2Juzew4M+L81l6/QS3t5gkkihyRqv9w==",
+      "dev": true
+    },
     "is-regex": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
-      "integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
-        "has-symbols": "^1.0.1"
+        "has-tostringtag": "^1.0.0"
       }
     },
     "is-regexp": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz",
-      "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==",
-      "dev": true
+      "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA=="
     },
     "is-stream": {
       "version": "1.1.0",
@@ -5062,31 +4827,32 @@
       "dev": true
     },
     "is-string": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
-      "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
-      "dev": true
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "requires": {
+        "has-tostringtag": "^1.0.0"
+      }
     },
     "is-symbol": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
-      "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
       "dev": true,
       "requires": {
-        "has-symbols": "^1.0.1"
+        "has-symbols": "^1.0.2"
       }
     },
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
     },
     "is-unicode-supported": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-      "dev": true
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="
     },
     "is-windows": {
       "version": "1.0.2",
@@ -5113,8 +4879,7 @@
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
     },
     "isobject": {
       "version": "3.0.1",
@@ -5155,23 +4920,6 @@
         "istanbul-lib-coverage": "^3.0.0",
         "make-dir": "^3.0.0",
         "supports-color": "^7.1.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "istanbul-lib-source-maps": {
@@ -5214,46 +4962,17 @@
         "jest-cli": "^26.6.3"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+        "cliui": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+          "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^6.2.0"
           }
         },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
         "jest-cli": {
           "version": "26.6.3",
           "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.3.tgz",
@@ -5275,13 +4994,40 @@
             "yargs": "^15.4.1"
           }
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+        "wrap-ansi": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
+          }
+        },
+        "y18n": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+          "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+          "dev": true
+        },
+        "yargs": {
+          "version": "15.4.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+          "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "cliui": "^6.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^4.1.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^4.2.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^18.1.2"
           }
         }
       }
@@ -5325,10 +5071,19 @@
             "strip-final-newline": "^2.0.0"
           }
         },
+        "get-stream": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+          "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+          "dev": true,
+          "requires": {
+            "pump": "^3.0.0"
+          }
+        },
         "is-stream": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-          "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+          "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
           "dev": true
         },
         "npm-run-path": {
@@ -5396,123 +5151,21 @@
         "jest-validate": "^26.6.2",
         "micromatch": "^4.0.2",
         "pretty-format": "^26.6.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "jest-dev-server": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/jest-dev-server/-/jest-dev-server-4.4.0.tgz",
-      "integrity": "sha512-STEHJ3iPSC8HbrQ3TME0ozGX2KT28lbT4XopPxUm2WimsX3fcB3YOptRh12YphQisMhfqNSNTZUmWyT3HEXS2A==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/jest-dev-server/-/jest-dev-server-5.0.3.tgz",
+      "integrity": "sha512-aJR3a5KdY18Lsz+VbREKwx2HM3iukiui+J9rlv9o6iYTwZCSsJazSTStcD9K1q0AIF3oA+FqLOKDyo/sc7+fJw==",
       "dev": true,
       "requires": {
-        "chalk": "^3.0.0",
+        "chalk": "^4.1.1",
         "cwd": "^0.10.0",
-        "find-process": "^1.4.3",
-        "prompts": "^2.3.0",
-        "spawnd": "^4.4.0",
+        "find-process": "^1.4.4",
+        "prompts": "^2.4.1",
+        "spawnd": "^5.0.0",
         "tree-kill": "^1.2.2",
-        "wait-on": "^3.3.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
+        "wait-on": "^5.3.0"
       }
     },
     "jest-diff": {
@@ -5525,57 +5178,6 @@
         "diff-sequences": "^26.6.2",
         "jest-get-type": "^26.3.0",
         "pretty-format": "^26.6.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "jest-docblock": {
@@ -5598,57 +5200,6 @@
         "jest-get-type": "^26.3.0",
         "jest-util": "^26.6.2",
         "pretty-format": "^26.6.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "jest-environment-jsdom": {
@@ -5681,64 +5232,161 @@
       }
     },
     "jest-environment-puppeteer": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-puppeteer/-/jest-environment-puppeteer-4.4.0.tgz",
-      "integrity": "sha512-iV8S8+6qkdTM6OBR/M9gKywEk8GDSOe05hspCs5D8qKSwtmlUfdtHfB4cakdc68lC6YfK3AUsLirpfgodCHjzQ==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/jest-environment-puppeteer/-/jest-environment-puppeteer-5.0.4.tgz",
+      "integrity": "sha512-wd4EDOD4QRi11QZ1IV8WsL1wlnnMUtcqtU0BNm+REzRtg78K2XHn3jS6YxGeXIOnsgrJeHxsD7DlRZ/GkFteLg==",
       "dev": true,
       "requires": {
-        "chalk": "^3.0.0",
+        "chalk": "^4.1.1",
         "cwd": "^0.10.0",
-        "jest-dev-server": "^4.4.0",
-        "merge-deep": "^3.0.2"
+        "jest-dev-server": "^5.0.3",
+        "jest-environment-node": "^27.0.1",
+        "merge-deep": "^3.0.3"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+        "@jest/environment": {
+          "version": "27.1.1",
+          "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.1.1.tgz",
+          "integrity": "sha512-+y882/ZdxhyqF5RzxIrNIANjHj991WH7jifdcplzMDosDUOyCACFYUyVTBGbSTocbU+s1cesroRzkwi8hZ9SHg==",
           "dev": true,
           "requires": {
-            "color-convert": "^2.0.1"
+            "@jest/fake-timers": "^27.1.1",
+            "@jest/types": "^27.1.1",
+            "@types/node": "*",
+            "jest-mock": "^27.1.1"
           }
         },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+        "@jest/fake-timers": {
+          "version": "27.1.1",
+          "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.1.1.tgz",
+          "integrity": "sha512-u8TJ5VlsVYTsGFatoyIae2l25pku4Bu15QCPTx2Gs5z+R//Ee3tHN85462Vc9yGVcdDvgADbqNkhOLxbEwPjMQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
+            "@jest/types": "^27.1.1",
+            "@sinonjs/fake-timers": "^7.0.2",
+            "@types/node": "*",
+            "jest-message-util": "^27.1.1",
+            "jest-mock": "^27.1.1",
+            "jest-util": "^27.1.1"
           }
         },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+        "@jest/types": {
+          "version": "27.1.1",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.1.1.tgz",
+          "integrity": "sha512-yqJPDDseb0mXgKqmNqypCsb85C22K1aY5+LUxh7syIM9n/b0AsaltxNy+o6tt29VcfGDpYEve175bm3uOhcehA==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "@types/istanbul-lib-coverage": "^2.0.0",
+            "@types/istanbul-reports": "^3.0.0",
+            "@types/node": "*",
+            "@types/yargs": "^16.0.0",
+            "chalk": "^4.0.0"
           }
         },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+        "@sinonjs/fake-timers": {
+          "version": "7.1.2",
+          "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz",
+          "integrity": "sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==",
+          "dev": true,
+          "requires": {
+            "@sinonjs/commons": "^1.7.0"
+          }
+        },
+        "@types/yargs": {
+          "version": "16.0.4",
+          "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+          "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+          "dev": true,
+          "requires": {
+            "@types/yargs-parser": "*"
+          }
+        },
+        "ansi-styles": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+          "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
           "dev": true
         },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+        "ci-info": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
+          "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
           "dev": true
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+        "is-ci": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz",
+          "integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "ci-info": "^3.1.1"
+          }
+        },
+        "jest-environment-node": {
+          "version": "27.1.1",
+          "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.1.1.tgz",
+          "integrity": "sha512-OEGeZh0PwzngNIYWYgWrvTcLygopV8OJbC9HNb0j70VBKgEIsdZkYhwcFnaURX83OHACMqf1pa9Tv5Pw5jemrg==",
+          "dev": true,
+          "requires": {
+            "@jest/environment": "^27.1.1",
+            "@jest/fake-timers": "^27.1.1",
+            "@jest/types": "^27.1.1",
+            "@types/node": "*",
+            "jest-mock": "^27.1.1",
+            "jest-util": "^27.1.1"
+          }
+        },
+        "jest-message-util": {
+          "version": "27.1.1",
+          "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.1.1.tgz",
+          "integrity": "sha512-b697BOJV93+AVGvzLRtVZ0cTVRbd59OaWnbB2D75GRaIMc4I+Z9W0wHxbfjW01JWO+TqqW4yevT0aN7Fd0XWng==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.12.13",
+            "@jest/types": "^27.1.1",
+            "@types/stack-utils": "^2.0.0",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.4",
+            "micromatch": "^4.0.4",
+            "pretty-format": "^27.1.1",
+            "slash": "^3.0.0",
+            "stack-utils": "^2.0.3"
+          }
+        },
+        "jest-mock": {
+          "version": "27.1.1",
+          "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.1.1.tgz",
+          "integrity": "sha512-SClsFKuYBf+6SSi8jtAYOuPw8DDMsTElUWEae3zq7vDhH01ayVSIHUSIa8UgbDOUalCFp6gNsaikN0rbxN4dbw==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.1.1",
+            "@types/node": "*"
+          }
+        },
+        "jest-util": {
+          "version": "27.1.1",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.1.1.tgz",
+          "integrity": "sha512-zf9nEbrASWn2mC/L91nNb0K+GkhFvi4MP6XJG2HqnHzHvLYcs7ou/In68xYU1i1dSkJlrWcYfWXQE8nVR+nbOA==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.1.1",
+            "@types/node": "*",
+            "chalk": "^4.0.0",
+            "graceful-fs": "^4.2.4",
+            "is-ci": "^3.0.0",
+            "picomatch": "^2.2.3"
+          }
+        },
+        "pretty-format": {
+          "version": "27.1.1",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.1.1.tgz",
+          "integrity": "sha512-zdBi/xlstKJL42UH7goQti5Hip/B415w1Mfj+WWWYMBylAYtKESnXGUtVVcMVid9ReVjypCotUV6CEevYPHv2g==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^27.1.1",
+            "ansi-regex": "^5.0.0",
+            "ansi-styles": "^5.0.0",
+            "react-is": "^17.0.1"
           }
         }
       }
@@ -5795,57 +5443,6 @@
         "jest-util": "^26.6.2",
         "pretty-format": "^26.6.2",
         "throat": "^5.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "jest-leak-detector": {
@@ -5868,57 +5465,6 @@
         "jest-diff": "^26.6.2",
         "jest-get-type": "^26.3.0",
         "pretty-format": "^26.6.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "jest-message-util": {
@@ -5936,57 +5482,6 @@
         "pretty-format": "^26.6.2",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "jest-mock": {
@@ -6006,13 +5501,13 @@
       "dev": true
     },
     "jest-puppeteer": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/jest-puppeteer/-/jest-puppeteer-4.4.0.tgz",
-      "integrity": "sha512-ZaiCTlPZ07B9HW0erAWNX6cyzBqbXMM7d2ugai4epBDKpKvRDpItlRQC6XjERoJELKZsPziFGS0OhhUvTvQAXA==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/jest-puppeteer/-/jest-puppeteer-5.0.4.tgz",
+      "integrity": "sha512-IUOVKgHEaKsLqahZy/J/DvXB59SQx4AVpZKTRDvJzCdkvdGc3NVsNwUhovr6SK+HOK1TOiqAiXPTAPiIq3mkrg==",
       "dev": true,
       "requires": {
-        "expect-puppeteer": "^4.4.0",
-        "jest-environment-puppeteer": "^4.4.0"
+        "expect-puppeteer": "^5.0.4",
+        "jest-environment-puppeteer": "^5.0.4"
       }
     },
     "jest-regex-util": {
@@ -6035,57 +5530,6 @@
         "read-pkg-up": "^7.0.1",
         "resolve": "^1.18.1",
         "slash": "^3.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "jest-resolve-dependencies": {
@@ -6125,57 +5569,6 @@
         "jest-worker": "^26.6.2",
         "source-map-support": "^0.5.6",
         "throat": "^5.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "jest-runtime": {
@@ -6213,53 +5606,51 @@
         "yargs": "^15.4.1"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+        "cliui": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+          "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^6.2.0"
           }
         },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+        "wrap-ansi": {
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
           "dev": true,
           "requires": {
-            "color-name": "~1.1.4"
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
           }
         },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+        "y18n": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+          "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
           "dev": true
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+        "yargs": {
+          "version": "15.4.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+          "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
           "dev": true,
           "requires": {
-            "has-flag": "^4.0.0"
+            "cliui": "^6.0.0",
+            "decamelize": "^1.2.0",
+            "find-up": "^4.1.0",
+            "get-caller-file": "^2.0.1",
+            "require-directory": "^2.1.1",
+            "require-main-filename": "^2.0.0",
+            "set-blocking": "^2.0.0",
+            "string-width": "^4.2.0",
+            "which-module": "^2.0.0",
+            "y18n": "^4.0.0",
+            "yargs-parser": "^18.1.2"
           }
         }
       }
@@ -6292,52 +5683,12 @@
         "jest-haste-map": "^26.6.2",
         "jest-matcher-utils": "^26.6.2",
         "jest-message-util": "^26.6.2",
-        "jest-resolve": "^26.6.2",
-        "natural-compare": "^1.4.0",
-        "pretty-format": "^26.6.2",
-        "semver": "^7.3.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
+        "jest-resolve": "^26.6.2",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^26.6.2",
+        "semver": "^7.3.2"
+      },
+      "dependencies": {
         "semver": {
           "version": "7.3.5",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@@ -6346,15 +5697,6 @@
           "requires": {
             "lru-cache": "^6.0.0"
           }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
         }
       }
     },
@@ -6370,57 +5712,6 @@
         "graceful-fs": "^4.2.4",
         "is-ci": "^2.0.0",
         "micromatch": "^4.0.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "jest-validate": {
@@ -6437,60 +5728,11 @@
         "pretty-format": "^26.6.2"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
         "camelcase": {
           "version": "6.2.0",
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
           "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
           "dev": true
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
         }
       }
     },
@@ -6507,57 +5749,6 @@
         "chalk": "^4.0.0",
         "jest-util": "^26.6.2",
         "string-length": "^4.0.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "jest-worker": {
@@ -6569,30 +5760,25 @@
         "@types/node": "*",
         "merge-stream": "^2.0.0",
         "supports-color": "^7.0.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
+      }
+    },
+    "joi": {
+      "version": "17.4.2",
+      "resolved": "https://registry.npmjs.org/joi/-/joi-17.4.2.tgz",
+      "integrity": "sha512-Lm56PP+n0+Z2A2rfRvsfWVDXGEWjXxatPopkQ8qQ5mxCEhwHG+Ettgg5o98FFaxilOxozoa14cFhrE/hOzh/Nw==",
+      "dev": true,
+      "requires": {
+        "@hapi/hoek": "^9.0.0",
+        "@hapi/topo": "^5.0.0",
+        "@sideway/address": "^4.1.0",
+        "@sideway/formula": "^3.0.0",
+        "@sideway/pinpoint": "^2.0.0"
       }
     },
     "js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
     "js-yaml": {
       "version": "3.14.1",
@@ -6611,13 +5797,13 @@
       "dev": true
     },
     "jsdom": {
-      "version": "16.5.3",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.5.3.tgz",
-      "integrity": "sha512-Qj1H+PEvUsOtdPJ056ewXM4UJPCi4hhLA8wpiz9F2YvsRBhuFsXxtrIFAgGBDynQA9isAMGE91PfUYbdMPXuTA==",
+      "version": "16.7.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
+      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
       "dev": true,
       "requires": {
         "abab": "^2.0.5",
-        "acorn": "^8.1.0",
+        "acorn": "^8.2.4",
         "acorn-globals": "^6.0.0",
         "cssom": "^0.4.4",
         "cssstyle": "^2.3.0",
@@ -6625,12 +5811,13 @@
         "decimal.js": "^10.2.1",
         "domexception": "^2.0.1",
         "escodegen": "^2.0.0",
+        "form-data": "^3.0.0",
         "html-encoding-sniffer": "^2.0.1",
-        "is-potential-custom-element-name": "^1.0.0",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-potential-custom-element-name": "^1.0.1",
         "nwsapi": "^2.2.0",
         "parse5": "6.0.1",
-        "request": "^2.88.2",
-        "request-promise-native": "^1.0.9",
         "saxes": "^5.0.1",
         "symbol-tree": "^3.2.4",
         "tough-cookie": "^4.0.0",
@@ -6640,14 +5827,14 @@
         "whatwg-encoding": "^1.0.5",
         "whatwg-mimetype": "^2.3.0",
         "whatwg-url": "^8.5.0",
-        "ws": "^7.4.4",
+        "ws": "^7.4.6",
         "xml-name-validator": "^3.0.0"
       },
       "dependencies": {
         "acorn": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.1.1.tgz",
-          "integrity": "sha512-xYiIVjNuqtKXMxlRMDc6mZUhXehod4a3gbZ1qRlM7icK4EbxUFNLhWoPblCvFtB2Y9CIqHP3CF/rdxLItaQv8g==",
+          "version": "8.5.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz",
+          "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==",
           "dev": true
         }
       }
@@ -6655,14 +5842,12 @@
     "jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
     },
     "json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
     },
     "json-schema": {
       "version": "0.2.3",
@@ -6671,10 +5856,9 @@
       "dev": true
     },
     "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
@@ -6692,7 +5876,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
       "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-      "dev": true,
       "requires": {
         "minimist": "^1.2.5"
       }
@@ -6701,18 +5884,9 @@
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
       "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
       "requires": {
         "graceful-fs": "^4.1.6",
         "universalify": "^2.0.0"
-      },
-      "dependencies": {
-        "universalify": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-          "dev": true
-        }
       }
     },
     "jsprim": {
@@ -6736,8 +5910,7 @@
     "kind-of": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
     },
     "klaw": {
       "version": "1.3.1",
@@ -6757,8 +5930,7 @@
     "known-css-properties": {
       "version": "0.21.0",
       "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.21.0.tgz",
-      "integrity": "sha512-sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw==",
-      "dev": true
+      "integrity": "sha512-sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw=="
     },
     "kuler": {
       "version": "2.0.0",
@@ -6772,15 +5944,6 @@
       "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
       "dev": true
     },
-    "lcid": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-      "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
-      "dev": true,
-      "requires": {
-        "invert-kv": "^2.0.0"
-      }
-    },
     "leven": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
@@ -6797,11 +5960,15 @@
         "type-check": "~0.4.0"
       }
     },
+    "lilconfig": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.3.tgz",
+      "integrity": "sha512-EHKqr/+ZvdKCifpNrJCKxBTgk5XupZA3y/aCPY9mxfgBzmgh93Mt/WqjjQ38oMxXuvDokaKiM3lAgvSH2sjtHg=="
+    },
     "lines-and-columns": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
-      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=",
-      "dev": true
+      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
     },
     "locate-path": {
       "version": "5.0.0",
@@ -6814,79 +5981,12 @@
     "lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "lodash._arraymap": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._arraymap/-/lodash._arraymap-3.0.0.tgz",
-      "integrity": "sha1-Go/Q9MDfS2HeoHbXF83Jfwo8PmY=",
-      "dev": true
-    },
-    "lodash._basecallback": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/lodash._basecallback/-/lodash._basecallback-3.3.1.tgz",
-      "integrity": "sha1-t7K7Q9whYEJKIczybFfkQ3cqjic=",
-      "dev": true,
-      "requires": {
-        "lodash._baseisequal": "^3.0.0",
-        "lodash._bindcallback": "^3.0.0",
-        "lodash.isarray": "^3.0.0",
-        "lodash.pairs": "^3.0.0"
-      }
-    },
-    "lodash._baseeach": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/lodash._baseeach/-/lodash._baseeach-3.0.4.tgz",
-      "integrity": "sha1-z4cGVyyhROjZ11InyZDamC+TKvM=",
-      "dev": true,
-      "requires": {
-        "lodash.keys": "^3.0.0"
-      }
-    },
-    "lodash._baseget": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/lodash._baseget/-/lodash._baseget-3.7.2.tgz",
-      "integrity": "sha1-G2rh1frPPCVTI1ChPBGXy4u2dPQ=",
-      "dev": true
-    },
-    "lodash._baseisequal": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/lodash._baseisequal/-/lodash._baseisequal-3.0.7.tgz",
-      "integrity": "sha1-2AJfdjOdKTQnZ9zIh85cuVpbUfE=",
-      "dev": true,
-      "requires": {
-        "lodash.isarray": "^3.0.0",
-        "lodash.istypedarray": "^3.0.0",
-        "lodash.keys": "^3.0.0"
-      }
-    },
-    "lodash._bindcallback": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
-      "integrity": "sha1-5THCdkTPi1epnhftlbNcdIeJOS4=",
-      "dev": true
-    },
-    "lodash._getnative": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
-      "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=",
-      "dev": true
-    },
-    "lodash._topath": {
-      "version": "3.8.1",
-      "resolved": "https://registry.npmjs.org/lodash._topath/-/lodash._topath-3.8.1.tgz",
-      "integrity": "sha1-PsXiYGAU9MuX91X+aRTt2L/ADqw=",
-      "dev": true,
-      "requires": {
-        "lodash.isarray": "^3.0.0"
-      }
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "lodash.clonedeep": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-      "dev": true
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
     },
     "lodash.debounce": {
       "version": "4.0.8",
@@ -6897,167 +5997,46 @@
     "lodash.difference": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz",
-      "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=",
-      "dev": true
-    },
-    "lodash.flatten": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz",
-      "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=",
-      "dev": true
+      "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw="
     },
     "lodash.forown": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.forown/-/lodash.forown-4.4.0.tgz",
-      "integrity": "sha1-hRFc8E9z75ZuztUlEdOJPMRmg68=",
-      "dev": true
+      "integrity": "sha1-hRFc8E9z75ZuztUlEdOJPMRmg68="
     },
     "lodash.get": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
-      "dev": true
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
     },
     "lodash.groupby": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz",
-      "integrity": "sha1-Cwih3PaDl8OXhVwyOXg4Mt90A9E=",
-      "dev": true
-    },
-    "lodash.isarguments": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
-      "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=",
-      "dev": true
-    },
-    "lodash.isarray": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
-      "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=",
-      "dev": true
+      "integrity": "sha1-Cwih3PaDl8OXhVwyOXg4Mt90A9E="
     },
-    "lodash.istypedarray": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz",
-      "integrity": "sha1-yaR3SYYHUB2OhJTSg7h8OSgc72I=",
+    "lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
       "dev": true
     },
-    "lodash.keys": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
-      "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
-      "dev": true,
-      "requires": {
-        "lodash._getnative": "^3.0.0",
-        "lodash.isarguments": "^3.0.0",
-        "lodash.isarray": "^3.0.0"
-      }
-    },
-    "lodash.map": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-3.1.4.tgz",
-      "integrity": "sha1-tIOs0beGxce0ksSV97UmYim8AMI=",
-      "dev": true,
-      "requires": {
-        "lodash._arraymap": "^3.0.0",
-        "lodash._basecallback": "^3.0.0",
-        "lodash._baseeach": "^3.0.0",
-        "lodash.isarray": "^3.0.0",
-        "lodash.keys": "^3.0.0"
-      }
-    },
-    "lodash.pairs": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.pairs/-/lodash.pairs-3.0.1.tgz",
-      "integrity": "sha1-u+CNV4bu6qCaFckevw3LfSvjJqk=",
-      "dev": true,
-      "requires": {
-        "lodash.keys": "^3.0.0"
-      }
-    },
-    "lodash.pluck": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.pluck/-/lodash.pluck-3.1.2.tgz",
-      "integrity": "sha1-s0fwN0wBafDusE1nLYnOyGMsIjE=",
-      "dev": true,
-      "requires": {
-        "lodash._baseget": "^3.0.0",
-        "lodash._topath": "^3.0.0",
-        "lodash.isarray": "^3.0.0",
-        "lodash.map": "^3.0.0"
-      }
-    },
     "lodash.sortby": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
-      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
-      "dev": true
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
     },
     "lodash.truncate": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
-      "dev": true
+      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM="
     },
     "log-symbols": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
       "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-      "dev": true,
       "requires": {
         "chalk": "^4.1.0",
         "is-unicode-supported": "^0.1.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "logform": {
@@ -7076,14 +6055,12 @@
     "longest-streak": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz",
-      "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==",
-      "dev": true
+      "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg=="
     },
     "lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
       "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
       "requires": {
         "yallist": "^4.0.0"
       }
@@ -7106,15 +6083,6 @@
         "tmpl": "1.0.x"
       }
     },
-    "map-age-cleaner": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
-      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-      "dev": true,
-      "requires": {
-        "p-defer": "^1.0.0"
-      }
-    },
     "map-cache": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
@@ -7124,8 +6092,7 @@
     "map-obj": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz",
-      "integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==",
-      "dev": true
+      "integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ=="
     },
     "map-visit": {
       "version": "1.0.0",
@@ -7139,14 +6106,12 @@
     "mathml-tag-names": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
-      "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
-      "dev": true
+      "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg=="
     },
     "mdast-util-from-markdown": {
       "version": "0.8.5",
       "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz",
       "integrity": "sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==",
-      "dev": true,
       "requires": {
         "@types/mdast": "^3.0.0",
         "mdast-util-to-string": "^2.0.0",
@@ -7159,7 +6124,6 @@
       "version": "0.6.5",
       "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz",
       "integrity": "sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==",
-      "dev": true,
       "requires": {
         "@types/unist": "^2.0.0",
         "longest-streak": "^2.0.0",
@@ -7172,8 +6136,7 @@
     "mdast-util-to-string": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz",
-      "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==",
-      "dev": true
+      "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w=="
     },
     "mdn-data": {
       "version": "2.0.4",
@@ -7181,22 +6144,10 @@
       "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
       "dev": true
     },
-    "mem": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
-      "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
-      "dev": true,
-      "requires": {
-        "map-age-cleaner": "^0.1.1",
-        "mimic-fn": "^2.0.0",
-        "p-is-promise": "^2.0.0"
-      }
-    },
     "meow": {
       "version": "9.0.0",
       "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
       "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
-      "dev": true,
       "requires": {
         "@types/minimist": "^1.2.0",
         "camelcase-keys": "^6.2.2",
@@ -7212,47 +6163,10 @@
         "yargs-parser": "^20.2.3"
       },
       "dependencies": {
-        "hosted-git-info": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
-          "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "normalize-package-data": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz",
-          "integrity": "sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==",
-          "dev": true,
-          "requires": {
-            "hosted-git-info": "^4.0.1",
-            "resolve": "^1.20.0",
-            "semver": "^7.3.4",
-            "validate-npm-package-license": "^3.0.1"
-          }
-        },
-        "semver": {
-          "version": "7.3.5",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
-          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "dev": true,
-          "requires": {
-            "lru-cache": "^6.0.0"
-          }
-        },
-        "type-fest": {
-          "version": "0.18.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
-          "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
-          "dev": true
-        },
         "yargs-parser": {
-          "version": "20.2.7",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
-          "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
-          "dev": true
+          "version": "20.2.9",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+          "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="
         }
       }
     },
@@ -7267,6 +6181,12 @@
         "kind-of": "^3.0.2"
       },
       "dependencies": {
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -7287,14 +6207,12 @@
     "merge2": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="
     },
     "micromark": {
       "version": "2.11.4",
       "resolved": "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz",
       "integrity": "sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==",
-      "dev": true,
       "requires": {
         "debug": "^4.0.0",
         "parse-entities": "^2.0.0"
@@ -7304,25 +6222,24 @@
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
       "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
-      "dev": true,
       "requires": {
         "braces": "^3.0.1",
         "picomatch": "^2.2.3"
       }
     },
     "mime-db": {
-      "version": "1.47.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.47.0.tgz",
-      "integrity": "sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==",
+      "version": "1.49.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz",
+      "integrity": "sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==",
       "dev": true
     },
     "mime-types": {
-      "version": "2.1.30",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.30.tgz",
-      "integrity": "sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==",
+      "version": "2.1.32",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz",
+      "integrity": "sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==",
       "dev": true,
       "requires": {
-        "mime-db": "1.47.0"
+        "mime-db": "1.49.0"
       }
     },
     "mimic-fn": {
@@ -7334,8 +6251,7 @@
     "min-indent": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-      "dev": true
+      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg=="
     },
     "minimatch": {
       "version": "3.0.4",
@@ -7348,14 +6264,12 @@
     "minimist": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-      "dev": true
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
     },
     "minimist-options": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
       "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
-      "dev": true,
       "requires": {
         "arrify": "^1.0.1",
         "is-plain-obj": "^1.1.0",
@@ -7365,8 +6279,7 @@
         "is-plain-obj": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-          "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
-          "dev": true
+          "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4="
         }
       }
     },
@@ -7421,87 +6334,8 @@
     "mkdirp-classic": {
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
-    },
-    "mocha": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz",
-      "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==",
-      "dev": true,
-      "requires": {
-        "browser-stdout": "1.3.1",
-        "commander": "2.15.1",
-        "debug": "3.1.0",
-        "diff": "3.5.0",
-        "escape-string-regexp": "1.0.5",
-        "glob": "7.1.2",
-        "growl": "1.10.5",
-        "he": "1.1.1",
-        "minimatch": "3.0.4",
-        "mkdirp": "0.5.1",
-        "supports-color": "5.4.0"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.15.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
-          "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
-          "dev": true
-        },
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "glob": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-          "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-          "dev": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "5.4.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
-          "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+      "dev": true
     },
     "ms": {
       "version": "2.1.2",
@@ -7509,16 +6343,15 @@
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "mustache": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/mustache/-/mustache-3.2.1.tgz",
-      "integrity": "sha512-RERvMFdLpaFfSRIEe632yDm5nsd0SDKn8hGmcUwswnyiE5mtdZLDybtHAz6hjJhawokF0hXvGLtx9mrQfm6FkA==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz",
+      "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==",
       "dev": true
     },
     "nanoid": {
-      "version": "3.1.22",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.22.tgz",
-      "integrity": "sha512-/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ==",
-      "dev": true
+      "version": "3.1.25",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz",
+      "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q=="
     },
     "nanomatch": {
       "version": "1.2.13",
@@ -7552,9 +6385,10 @@
       "dev": true
     },
     "node-fetch": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
-      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz",
+      "integrity": "sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA==",
+      "dev": true
     },
     "node-int64": {
       "version": "0.4.0",
@@ -7605,23 +6439,29 @@
         }
       }
     },
+    "node-releases": {
+      "version": "1.1.75",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.75.tgz",
+      "integrity": "sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw=="
+    },
     "normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
+      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
       "requires": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
+        "hosted-git-info": "^4.0.1",
+        "is-core-module": "^2.5.0",
+        "semver": "^7.3.4",
         "validate-npm-package-license": "^3.0.1"
       },
       "dependencies": {
         "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-          "dev": true
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
         }
       }
     },
@@ -7638,8 +6478,7 @@
     "normalize-selector": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz",
-      "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
-      "dev": true
+      "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM="
     },
     "npm-run-path": {
       "version": "2.0.2",
@@ -7651,25 +6490,18 @@
       }
     },
     "nth-check": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
-      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
+      "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
       "dev": true,
       "requires": {
-        "boolbase": "~1.0.0"
+        "boolbase": "^1.0.0"
       }
     },
     "num2fraction": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
-      "dev": true
-    },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true
+      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4="
     },
     "nwsapi": {
       "version": "2.2.0",
@@ -7703,6 +6535,12 @@
             "is-descriptor": "^0.1.0"
           }
         },
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -7715,9 +6553,9 @@
       }
     },
     "object-inspect": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz",
-      "integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
+      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==",
       "dev": true
     },
     "object-keys": {
@@ -7768,15 +6606,14 @@
       }
     },
     "object.values": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.3.tgz",
-      "integrity": "sha512-nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz",
+      "integrity": "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==",
       "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
-        "es-abstract": "^1.18.0-next.2",
-        "has": "^1.0.3"
+        "es-abstract": "^1.18.2"
       }
     },
     "once": {
@@ -7825,23 +6662,6 @@
       "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
       "dev": true
     },
-    "os-locale": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
-      "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
-      "dev": true,
-      "requires": {
-        "execa": "^1.0.0",
-        "lcid": "^2.0.0",
-        "mem": "^4.0.0"
-      }
-    },
-    "p-defer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
-      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
-      "dev": true
-    },
     "p-each-series": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
@@ -7854,12 +6674,6 @@
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
       "dev": true
     },
-    "p-is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
-      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
-      "dev": true
-    },
     "p-limit": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
@@ -7885,7 +6699,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
       "requires": {
         "callsites": "^3.0.0"
       }
@@ -7894,7 +6707,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
       "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
-      "dev": true,
       "requires": {
         "character-entities": "^1.0.0",
         "character-entities-legacy": "^1.0.0",
@@ -7908,7 +6720,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
       "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
         "error-ex": "^1.3.1",
@@ -7953,19 +6764,18 @@
     "path-parse": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "dev": true
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
     "path-type": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
     },
     "pend": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
+      "dev": true
     },
     "performance-now": {
       "version": "2.1.0",
@@ -8046,15 +6856,14 @@
       }
     },
     "picomatch": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
-      "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg=="
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
+      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="
     },
     "pify": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
     },
     "pinkie": {
       "version": "2.0.4",
@@ -8084,6 +6893,7 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
       "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
       "requires": {
         "find-up": "^4.0.0"
       }
@@ -8095,29 +6905,19 @@
       "dev": true
     },
     "postcss": {
-      "version": "8.2.10",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.2.10.tgz",
-      "integrity": "sha512-b/h7CPV7QEdrqIxtAf2j31U5ef05uBDuvoXv6L51Q4rcS1jdlXAVKJv+atCFdUXYl9dyTHGyoMzIepwowRJjFw==",
-      "dev": true,
+      "version": "8.3.6",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz",
+      "integrity": "sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A==",
       "requires": {
         "colorette": "^1.2.2",
-        "nanoid": "^3.1.22",
-        "source-map": "^0.6.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        }
+        "nanoid": "^3.1.23",
+        "source-map-js": "^0.6.2"
       }
     },
     "postcss-cli": {
       "version": "8.3.1",
       "resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-8.3.1.tgz",
       "integrity": "sha512-leHXsQRq89S3JC9zw/tKyiVV2jAhnfQe0J8VI4eQQbUjwIe0XxVqLrR+7UsahF1s9wi4GlqP6SJ8ydf44cgF2Q==",
-      "dev": true,
       "requires": {
         "chalk": "^4.0.0",
         "chokidar": "^3.3.0",
@@ -8131,113 +6931,12 @@
         "read-cache": "^1.0.0",
         "slash": "^3.0.0",
         "yargs": "^16.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "cliui": {
-          "version": "7.0.4",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
-          "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
-          "dev": true,
-          "requires": {
-            "string-width": "^4.2.0",
-            "strip-ansi": "^6.0.0",
-            "wrap-ansi": "^7.0.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
-        "wrap-ansi": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-          "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.0.0",
-            "string-width": "^4.1.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "y18n": {
-          "version": "5.0.8",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-          "dev": true
-        },
-        "yargs": {
-          "version": "16.2.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
-          "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
-          "dev": true,
-          "requires": {
-            "cliui": "^7.0.2",
-            "escalade": "^3.1.1",
-            "get-caller-file": "^2.0.5",
-            "require-directory": "^2.1.1",
-            "string-width": "^4.2.0",
-            "y18n": "^5.0.5",
-            "yargs-parser": "^20.2.2"
-          }
-        },
-        "yargs-parser": {
-          "version": "20.2.7",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
-          "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
-          "dev": true
-        }
       }
     },
     "postcss-html": {
       "version": "0.36.0",
       "resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-0.36.0.tgz",
       "integrity": "sha512-HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==",
-      "dev": true,
       "requires": {
         "htmlparser2": "^3.10.0"
       }
@@ -8246,16 +6945,60 @@
       "version": "3.1.4",
       "resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-3.1.4.tgz",
       "integrity": "sha512-7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==",
-      "dev": true,
       "requires": {
         "postcss": "^7.0.14"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+        },
         "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-          "dev": true,
+          "version": "7.0.36",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
+          "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
           "requires": {
             "chalk": "^2.4.2",
             "source-map": "^0.6.1",
@@ -8265,14 +7008,12 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         },
         "supports-color": {
           "version": "6.1.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
           "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
           "requires": {
             "has-flag": "^3.0.0"
           }
@@ -8280,26 +7021,24 @@
       }
     },
     "postcss-load-config": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.0.1.tgz",
-      "integrity": "sha512-/pDHe30UYZUD11IeG8GWx9lNtu1ToyTsZHnyy45B4Mrwr/Kb6NgYl7k753+05CJNKnjbwh4975amoPJ+TEjHNQ==",
-      "dev": true,
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.0.tgz",
+      "integrity": "sha512-ipM8Ds01ZUophjDTQYSVP70slFSYg3T0/zyfII5vzhN6V57YSxMgG5syXuwi5VtS8wSf3iL30v0uBdoIVx4Q0g==",
       "requires": {
-        "cosmiconfig": "^7.0.0",
-        "import-cwd": "^3.0.0"
+        "import-cwd": "^3.0.0",
+        "lilconfig": "^2.0.3",
+        "yaml": "^1.10.2"
       }
     },
     "postcss-media-query-parser": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
-      "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=",
-      "dev": true
+      "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ="
     },
     "postcss-reporter": {
       "version": "7.0.2",
       "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.0.2.tgz",
       "integrity": "sha512-JyQ96NTQQsso42y6L1H1RqHfWH1C3Jr0pt91mVv5IdYddZAE9DUZxuferNgk6q0o6vBVOrfVJb10X1FgDzjmDw==",
-      "dev": true,
       "requires": {
         "colorette": "^1.2.1",
         "lodash.difference": "^4.5.0",
@@ -8312,23 +7051,66 @@
     "postcss-resolve-nested-selector": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
-      "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=",
-      "dev": true
+      "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4="
     },
     "postcss-safe-parser": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz",
       "integrity": "sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==",
-      "dev": true,
       "requires": {
         "postcss": "^7.0.26"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+        },
         "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-          "dev": true,
+          "version": "7.0.36",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
+          "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
           "requires": {
             "chalk": "^2.4.2",
             "source-map": "^0.6.1",
@@ -8338,14 +7120,12 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         },
         "supports-color": {
           "version": "6.1.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
           "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
           "requires": {
             "has-flag": "^3.0.0"
           }
@@ -8356,17 +7136,61 @@
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.4.4.tgz",
       "integrity": "sha512-BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg==",
-      "dev": true,
       "requires": {
         "gonzales-pe": "^4.3.0",
         "postcss": "^7.0.21"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+        },
         "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-          "dev": true,
+          "version": "7.0.36",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
+          "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
           "requires": {
             "chalk": "^2.4.2",
             "source-map": "^0.6.1",
@@ -8376,14 +7200,12 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         },
         "supports-color": {
           "version": "6.1.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
           "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
           "requires": {
             "has-flag": "^3.0.0"
           }
@@ -8394,16 +7216,60 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-2.1.1.tgz",
       "integrity": "sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==",
-      "dev": true,
       "requires": {
         "postcss": "^7.0.6"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+        },
         "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-          "dev": true,
+          "version": "7.0.36",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
+          "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
           "requires": {
             "chalk": "^2.4.2",
             "source-map": "^0.6.1",
@@ -8413,14 +7279,12 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         },
         "supports-color": {
           "version": "6.1.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
           "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
           "requires": {
             "has-flag": "^3.0.0"
           }
@@ -8428,14 +7292,11 @@
       }
     },
     "postcss-selector-parser": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz",
-      "integrity": "sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==",
-      "dev": true,
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
+      "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
       "requires": {
         "cssesc": "^3.0.0",
-        "indexes-of": "^1.0.1",
-        "uniq": "^1.0.1",
         "util-deprecate": "^1.0.2"
       }
     },
@@ -8443,17 +7304,61 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-5.0.1.tgz",
       "integrity": "sha512-Y9fUFkIhfrm6i0Ta3n+89j56EFqaNRdUKqXyRp6kvTcSXnmgEjaVowCXH+JBe9+YKWqd4nc28r2sgwnzJalccA==",
-      "dev": true,
       "requires": {
         "lodash": "^4.17.14",
         "postcss": "^7.0.17"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+        },
         "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-          "dev": true,
+          "version": "7.0.36",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
+          "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
           "requires": {
             "chalk": "^2.4.2",
             "source-map": "^0.6.1",
@@ -8463,14 +7368,12 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         },
         "supports-color": {
           "version": "6.1.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
           "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
           "requires": {
             "has-flag": "^3.0.0"
           }
@@ -8480,8 +7383,7 @@
     "postcss-syntax": {
       "version": "0.36.2",
       "resolved": "https://registry.npmjs.org/postcss-syntax/-/postcss-syntax-0.36.2.tgz",
-      "integrity": "sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==",
-      "dev": true
+      "integrity": "sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w=="
     },
     "postcss-value-parser": {
       "version": "4.1.0",
@@ -8504,44 +7406,17 @@
         "ansi-regex": "^5.0.0",
         "ansi-styles": "^4.0.0",
         "react-is": "^17.0.1"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        }
       }
     },
     "pretty-hrtime": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
-      "dev": true
+      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE="
     },
     "prettysize": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/prettysize/-/prettysize-1.1.0.tgz",
-      "integrity": "sha512-U5Noa+FYV1dGkICyLJz8IWlDUehPF4Bk9tZRO8YqPhLA9EoiHuFqtnpWY2mvMjHh5eOLo82HipeLn4RIiSsGqQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/prettysize/-/prettysize-2.0.0.tgz",
+      "integrity": "sha512-VVtxR7sOh0VsG8o06Ttq5TrI1aiZKmC+ClSn4eBPaNf4SHr5lzbYW+kYGX3HocBL/MfpVrRfFZ9V3vCbLaiplg==",
       "dev": true
     },
     "process-nextick-args": {
@@ -8553,7 +7428,8 @@
     "progress": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true
     },
     "prompts": {
       "version": "2.4.1",
@@ -8568,7 +7444,8 @@
     "proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "dev": true
     },
     "psl": {
       "version": "1.8.0",
@@ -8580,6 +7457,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
       "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
       "requires": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -8588,16 +7466,16 @@
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
     },
     "puppeteer": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-8.0.0.tgz",
-      "integrity": "sha512-D0RzSWlepeWkxPPdK3xhTcefj8rjah1791GE82Pdjsri49sy11ci/JQsAO8K2NRukqvwEtcI+ImP5F4ZiMvtIQ==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-9.1.1.tgz",
+      "integrity": "sha512-W+nOulP2tYd/ZG99WuZC/I5ljjQQ7EUw/jQGcIb9eu8mDlZxNY2SgcJXTLG9h5gRvqA3uJOe4hZXYsd3EqioMw==",
+      "dev": true,
       "requires": {
         "debug": "^4.1.0",
-        "devtools-protocol": "0.0.854822",
+        "devtools-protocol": "0.0.869402",
         "extract-zip": "^2.0.0",
         "https-proxy-agent": "^5.0.0",
         "node-fetch": "^2.6.1",
@@ -8625,14 +7503,12 @@
     "queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="
     },
     "quick-lru": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
-      "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
-      "dev": true
+      "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g=="
     },
     "react-is": {
       "version": "17.0.2",
@@ -8644,7 +7520,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
       "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
-      "dev": true,
       "requires": {
         "pify": "^2.3.0"
       }
@@ -8653,7 +7528,6 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
       "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
-      "dev": true,
       "requires": {
         "@types/normalize-package-data": "^2.4.0",
         "normalize-package-data": "^2.5.0",
@@ -8661,11 +7535,31 @@
         "type-fest": "^0.6.0"
       },
       "dependencies": {
+        "hosted-git-info": {
+          "version": "2.8.9",
+          "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+          "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
+        },
+        "normalize-package-data": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+          "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+          "requires": {
+            "hosted-git-info": "^2.1.4",
+            "resolve": "^1.10.0",
+            "semver": "2 || 3 || 4 || 5",
+            "validate-npm-package-license": "^3.0.1"
+          }
+        },
+        "semver": {
+          "version": "5.7.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+        },
         "type-fest": {
           "version": "0.6.0",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-          "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-          "dev": true
+          "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="
         }
       }
     },
@@ -8673,11 +7567,17 @@
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
       "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
-      "dev": true,
       "requires": {
         "find-up": "^4.1.0",
         "read-pkg": "^5.2.0",
         "type-fest": "^0.8.1"
+      },
+      "dependencies": {
+        "type-fest": {
+          "version": "0.8.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="
+        }
       }
     },
     "readable-stream": {
@@ -8691,9 +7591,9 @@
       }
     },
     "readdirp": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
-      "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "requires": {
         "picomatch": "^2.2.1"
       }
@@ -8702,7 +7602,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
       "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
-      "dev": true,
       "requires": {
         "indent-string": "^4.0.0",
         "strip-indent": "^3.0.0"
@@ -8724,9 +7623,9 @@
       }
     },
     "regenerator-runtime": {
-      "version": "0.13.7",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
-      "integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==",
+      "version": "0.13.9",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
       "dev": true
     },
     "regenerator-transform": {
@@ -8749,9 +7648,9 @@
       }
     },
     "regexpp": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
-      "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
       "dev": true
     },
     "regexpu-core": {
@@ -8795,7 +7694,6 @@
       "version": "13.0.0",
       "resolved": "https://registry.npmjs.org/remark/-/remark-13.0.0.tgz",
       "integrity": "sha512-HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA==",
-      "dev": true,
       "requires": {
         "remark-parse": "^9.0.0",
         "remark-stringify": "^9.0.0",
@@ -8806,7 +7704,6 @@
       "version": "9.0.0",
       "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz",
       "integrity": "sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==",
-      "dev": true,
       "requires": {
         "mdast-util-from-markdown": "^0.8.0"
       }
@@ -8815,7 +7712,6 @@
       "version": "9.0.1",
       "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-9.0.1.tgz",
       "integrity": "sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg==",
-      "dev": true,
       "requires": {
         "mdast-util-to-markdown": "^0.6.0"
       }
@@ -8835,13 +7731,12 @@
     "repeat-string": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-      "dev": true
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
     },
     "replace-ext": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
-      "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+      "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
       "dev": true
     },
     "request": {
@@ -8872,6 +7767,17 @@
         "uuid": "^3.3.2"
       },
       "dependencies": {
+        "form-data": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+          "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+          "dev": true,
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.6",
+            "mime-types": "^2.1.12"
+          }
+        },
         "tough-cookie": {
           "version": "2.5.0",
           "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
@@ -8899,49 +7805,15 @@
         "throttleit": "^1.0.0"
       }
     },
-    "request-promise-core": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
-      "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.19"
-      }
-    },
-    "request-promise-native": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz",
-      "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==",
-      "dev": true,
-      "requires": {
-        "request-promise-core": "1.1.4",
-        "stealthy-require": "^1.1.1",
-        "tough-cookie": "^2.3.3"
-      },
-      "dependencies": {
-        "tough-cookie": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-          "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
-          "dev": true,
-          "requires": {
-            "psl": "^1.1.28",
-            "punycode": "^2.1.1"
-          }
-        }
-      }
-    },
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
     },
     "require-from-string": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="
     },
     "require-main-filename": {
       "version": "2.0.0",
@@ -8953,7 +7825,6 @@
       "version": "1.20.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
       "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
-      "dev": true,
       "requires": {
         "is-core-module": "^2.2.0",
         "path-parse": "^1.0.6"
@@ -8976,13 +7847,42 @@
       "requires": {
         "expand-tilde": "^1.2.2",
         "global-modules": "^0.2.3"
+      },
+      "dependencies": {
+        "global-modules": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz",
+          "integrity": "sha1-6lo77ULG1s6ZWk+KEmm12uIjgo0=",
+          "dev": true,
+          "requires": {
+            "global-prefix": "^0.1.4",
+            "is-windows": "^0.2.0"
+          }
+        },
+        "global-prefix": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz",
+          "integrity": "sha1-jTvGuNo8qBEqFg2NSW/wRiv+948=",
+          "dev": true,
+          "requires": {
+            "homedir-polyfill": "^1.0.0",
+            "ini": "^1.3.4",
+            "is-windows": "^0.2.0",
+            "which": "^1.2.12"
+          }
+        },
+        "is-windows": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
+          "integrity": "sha1-3hqm1j6indJIc3tp8f+LgALSEIw=",
+          "dev": true
+        }
       }
     },
     "resolve-from": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="
     },
     "resolve-url": {
       "version": "0.2.1",
@@ -8999,8 +7899,7 @@
     "reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="
     },
     "rimraf": {
       "version": "3.0.2",
@@ -9020,21 +7919,23 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
       "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
       "requires": {
         "queue-microtask": "^1.2.2"
       }
     },
-    "rx": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz",
-      "integrity": "sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=",
-      "dev": true
+    "rxjs": {
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "dev": true,
+      "requires": {
+        "tslib": "^1.9.0"
+      }
     },
     "safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "safe-regex": {
       "version": "1.1.0",
@@ -9130,6 +8031,12 @@
             }
           }
         },
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -9193,11 +8100,11 @@
       }
     },
     "sass": {
-      "version": "1.32.8",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.8.tgz",
-      "integrity": "sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ==",
+      "version": "1.39.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.39.0.tgz",
+      "integrity": "sha512-F4o+RhJkNOIG0b6QudYU8c78ZADKZjKDk5cyrf8XTKWfrgbtyVVXImFstJrc+1pkQDCggyidIOytq6gS4gCCZg==",
       "requires": {
-        "chokidar": ">=2.0.0 <4.0.0"
+        "chokidar": ">=3.0.0 <4.0.0"
       }
     },
     "sax": {
@@ -9218,8 +8125,7 @@
     "semver": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
     },
     "set-blocking": {
       "version": "2.0.0",
@@ -9228,26 +8134,13 @@
       "dev": true
     },
     "set-value": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-4.1.0.tgz",
+      "integrity": "sha512-zTEg4HL0RwVrqcWs3ztF+x1vkxfm0lP+MQQFPiMJTKVceBwEV0A569Ou8l9IYQG8jOZdMVI1hGsc0tmeD2o/Lw==",
       "dev": true,
       "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
+        "is-plain-object": "^2.0.4",
+        "is-primitive": "^3.0.1"
       }
     },
     "shallow-clone": {
@@ -9262,6 +8155,12 @@
         "mixin-object": "^2.0.1"
       },
       "dependencies": {
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
         "kind-of": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
@@ -9288,78 +8187,34 @@
         "shebang-regex": "^1.0.0"
       }
     },
-    "shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-      "dev": true
-    },
-    "shellwords": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
-      "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
-      "dev": true,
-      "optional": true
-    },
-    "should": {
-      "version": "13.2.3",
-      "resolved": "https://registry.npmjs.org/should/-/should-13.2.3.tgz",
-      "integrity": "sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ==",
-      "dev": true,
-      "requires": {
-        "should-equal": "^2.0.0",
-        "should-format": "^3.0.3",
-        "should-type": "^1.4.0",
-        "should-type-adaptors": "^1.0.1",
-        "should-util": "^1.0.0"
-      }
-    },
-    "should-equal": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/should-equal/-/should-equal-2.0.0.tgz",
-      "integrity": "sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==",
-      "dev": true,
-      "requires": {
-        "should-type": "^1.4.0"
-      }
-    },
-    "should-format": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz",
-      "integrity": "sha1-m/yPdPo5IFxT04w01xcwPidxJPE=",
-      "dev": true,
-      "requires": {
-        "should-type": "^1.3.0",
-        "should-type-adaptors": "^1.0.1"
-      }
-    },
-    "should-type": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/should-type/-/should-type-1.4.0.tgz",
-      "integrity": "sha1-B1bYzoRt/QmEOmlHcZ36DUz/XPM=",
+    "shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
       "dev": true
     },
-    "should-type-adaptors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz",
-      "integrity": "sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==",
+    "shellwords": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
+      "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
+      "dev": true,
+      "optional": true
+    },
+    "side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
       "dev": true,
       "requires": {
-        "should-type": "^1.3.0",
-        "should-util": "^1.0.0"
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
       }
     },
-    "should-util": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/should-util/-/should-util-1.0.1.tgz",
-      "integrity": "sha512-oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g==",
-      "dev": true
-    },
     "signal-exit": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
-      "dev": true
+      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
     },
     "simple-swizzle": {
       "version": "0.2.2",
@@ -9387,44 +8242,16 @@
     "slash": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="
     },
     "slice-ansi": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
       "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-      "dev": true,
       "requires": {
         "ansi-styles": "^4.0.0",
         "astral-regex": "^2.0.0",
         "is-fullwidth-code-point": "^3.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        }
       }
     },
     "snapdragon": {
@@ -9538,6 +8365,12 @@
         "kind-of": "^3.2.0"
       },
       "dependencies": {
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -9552,8 +8385,12 @@
     "source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-      "dev": true
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+    },
+    "source-map-js": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz",
+      "integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug=="
     },
     "source-map-resolve": {
       "version": "0.5.3",
@@ -9593,22 +8430,21 @@
       "dev": true
     },
     "spawnd": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/spawnd/-/spawnd-4.4.0.tgz",
-      "integrity": "sha512-jLPOfB6QOEgMOQY15Z6+lwZEhH3F5ncXxIaZ7WHPIapwNNLyjrs61okj3VJ3K6tmP5TZ6cO0VAu9rEY4MD4YQg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/spawnd/-/spawnd-5.0.0.tgz",
+      "integrity": "sha512-28+AJr82moMVWolQvlAIv3JcYDkjkFTEmfDc503wxrF5l2rQ3dFz6DpbXp3kD4zmgGGldfM4xM4v1sFj/ZaIOA==",
       "dev": true,
       "requires": {
         "exit": "^0.1.2",
-        "signal-exit": "^3.0.2",
+        "signal-exit": "^3.0.3",
         "tree-kill": "^1.2.2",
-        "wait-port": "^0.2.7"
+        "wait-port": "^0.2.9"
       }
     },
     "spdx-correct": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
       "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
-      "dev": true,
       "requires": {
         "spdx-expression-parse": "^3.0.0",
         "spdx-license-ids": "^3.0.0"
@@ -9617,30 +8453,26 @@
     "spdx-exceptions": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-      "dev": true
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
     },
     "spdx-expression-parse": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
       "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-      "dev": true,
       "requires": {
         "spdx-exceptions": "^2.1.0",
         "spdx-license-ids": "^3.0.0"
       }
     },
     "spdx-license-ids": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz",
-      "integrity": "sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==",
-      "dev": true
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz",
+      "integrity": "sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA=="
     },
     "specificity": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz",
-      "integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==",
-      "dev": true
+      "integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg=="
     },
     "split-string": {
       "version": "3.1.0",
@@ -9724,12 +8556,6 @@
         }
       }
     },
-    "stealthy-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
-      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
-      "dev": true
-    },
     "string-length": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
@@ -9744,7 +8570,6 @@
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
       "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
-      "dev": true,
       "requires": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -9777,13 +8602,19 @@
       "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
       "requires": {
         "safe-buffer": "~5.2.0"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+        }
       }
     },
     "strip-ansi": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
       "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dev": true,
       "requires": {
         "ansi-regex": "^5.0.0"
       }
@@ -9810,7 +8641,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
       "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
-      "dev": true,
       "requires": {
         "min-indent": "^1.0.0"
       }
@@ -9824,20 +8654,18 @@
     "style-search": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
-      "integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=",
-      "dev": true
+      "integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI="
     },
     "stylelint": {
-      "version": "13.12.0",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.12.0.tgz",
-      "integrity": "sha512-P8O1xDy41B7O7iXaSlW+UuFbE5+ZWQDb61ndGDxKIt36fMH50DtlQTbwLpFLf8DikceTAb3r6nPrRv30wBlzXw==",
-      "dev": true,
+      "version": "13.13.1",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.13.1.tgz",
+      "integrity": "sha512-Mv+BQr5XTUrKqAXmpqm6Ddli6Ief+AiPZkRsIrAoUKFuq/ElkUh9ZMYxXD0iQNZ5ADghZKLOWz1h7hTClB7zgQ==",
       "requires": {
         "@stylelint/postcss-css-in-js": "^0.37.2",
         "@stylelint/postcss-markdown": "^0.36.2",
         "autoprefixer": "^9.8.6",
-        "balanced-match": "^1.0.0",
-        "chalk": "^4.1.0",
+        "balanced-match": "^2.0.0",
+        "chalk": "^4.1.1",
         "cosmiconfig": "^7.0.0",
         "debug": "^4.3.1",
         "execall": "^2.0.0",
@@ -9846,7 +8674,7 @@
         "file-entry-cache": "^6.0.1",
         "get-stdin": "^8.0.0",
         "global-modules": "^2.0.0",
-        "globby": "^11.0.2",
+        "globby": "^11.0.3",
         "globjoin": "^0.1.4",
         "html-tags": "^3.1.0",
         "ignore": "^5.1.8",
@@ -9854,10 +8682,10 @@
         "imurmurhash": "^0.1.4",
         "known-css-properties": "^0.21.0",
         "lodash": "^4.17.21",
-        "log-symbols": "^4.0.0",
+        "log-symbols": "^4.1.0",
         "mathml-tag-names": "^2.1.3",
         "meow": "^9.0.0",
-        "micromatch": "^4.0.2",
+        "micromatch": "^4.0.4",
         "normalize-selector": "^0.2.0",
         "postcss": "^7.0.35",
         "postcss-html": "^0.36.0",
@@ -9867,7 +8695,7 @@
         "postcss-safe-parser": "^4.0.2",
         "postcss-sass": "^0.4.4",
         "postcss-scss": "^2.1.1",
-        "postcss-selector-parser": "^6.0.4",
+        "postcss-selector-parser": "^6.0.5",
         "postcss-syntax": "^0.36.2",
         "postcss-value-parser": "^4.1.0",
         "resolve-from": "^5.0.0",
@@ -9878,16 +8706,23 @@
         "style-search": "^0.1.0",
         "sugarss": "^2.0.0",
         "svg-tags": "^1.0.0",
-        "table": "^6.0.7",
-        "v8-compile-cache": "^2.2.0",
+        "table": "^6.6.0",
+        "v8-compile-cache": "^2.3.0",
         "write-file-atomic": "^3.0.3"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
         "autoprefixer": {
           "version": "9.8.6",
           "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz",
           "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==",
-          "dev": true,
           "requires": {
             "browserslist": "^4.12.0",
             "caniuse-lite": "^1.0.30001109",
@@ -9898,88 +8733,28 @@
             "postcss-value-parser": "^4.1.0"
           }
         },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          },
-          "dependencies": {
-            "ansi-styles": {
-              "version": "4.3.0",
-              "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-              "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-              "dev": true,
-              "requires": {
-                "color-convert": "^2.0.1"
-              }
-            },
-            "has-flag": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-              "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-              "dev": true
-            },
-            "supports-color": {
-              "version": "7.2.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-              "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-              "dev": true,
-              "requires": {
-                "has-flag": "^4.0.0"
-              }
-            }
-          }
-        },
         "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
           "requires": {
-            "color-name": "~1.1.4"
+            "color-name": "1.1.3"
           }
         },
         "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "global-modules": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-          "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-          "dev": true,
-          "requires": {
-            "global-prefix": "^3.0.0"
-          }
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
         },
-        "global-prefix": {
+        "has-flag": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-          "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-          "dev": true,
-          "requires": {
-            "ini": "^1.3.5",
-            "kind-of": "^6.0.2",
-            "which": "^1.3.1"
-          }
-        },
-        "ignore": {
-          "version": "5.1.8",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
-          "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
-          "dev": true
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
         },
         "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-          "dev": true,
+          "version": "7.0.36",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
+          "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
           "requires": {
             "chalk": "^2.4.2",
             "source-map": "^0.6.1",
@@ -9990,7 +8765,6 @@
               "version": "2.4.2",
               "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
               "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-              "dev": true,
               "requires": {
                 "ansi-styles": "^3.2.1",
                 "escape-string-regexp": "^1.0.5",
@@ -10001,7 +8775,6 @@
                   "version": "5.5.0",
                   "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
                   "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-                  "dev": true,
                   "requires": {
                     "has-flag": "^3.0.0"
                   }
@@ -10013,14 +8786,12 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         },
         "supports-color": {
           "version": "6.1.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
           "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
           "requires": {
             "has-flag": "^3.0.0"
           }
@@ -10028,25 +8799,22 @@
       }
     },
     "stylelint-config-recommended": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-3.0.0.tgz",
-      "integrity": "sha512-F6yTRuc06xr1h5Qw/ykb2LuFynJ2IxkKfCMf+1xqPffkxh0S09Zc902XCffcsw/XMFq/OzQ1w54fLIDtmRNHnQ==",
-      "dev": true
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-5.0.0.tgz",
+      "integrity": "sha512-c8aubuARSu5A3vEHLBeOSJt1udOdS+1iue7BmJDTSXoCBmfEQmmWX+59vYIj3NQdJBY6a/QRv1ozVFpaB9jaqA=="
     },
     "stylelint-config-recommended-scss": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-4.2.0.tgz",
-      "integrity": "sha512-4bI5BYbabo/GCQ6LbRZx/ZlVkK65a1jivNNsD+ix/Lw0U3iAch+jQcvliGnnAX8SUPaZ0UqzNVNNAF3urswa7g==",
-      "dev": true,
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-4.3.0.tgz",
+      "integrity": "sha512-/noGjXlO8pJTr/Z3qGMoaRFK8n1BFfOqmAbX1RjTIcl4Yalr+LUb1zb9iQ7pRx1GsEBXOAm4g2z5/jou/pfMPg==",
       "requires": {
-        "stylelint-config-recommended": "^3.0.0"
+        "stylelint-config-recommended": "^5.0.0"
       }
     },
     "stylelint-config-standard": {
       "version": "21.0.0",
       "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-21.0.0.tgz",
       "integrity": "sha512-Yf6mx5oYEbQQJxWuW7X3t1gcxqbUx52qC9SMS3saC2ruOVYEyqmr5zSW6k3wXflDjjFrPhar3kp68ugRopmlzg==",
-      "dev": true,
       "requires": {
         "stylelint-config-recommended": "^4.0.0"
       },
@@ -10054,8 +8822,7 @@
         "stylelint-config-recommended": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-4.0.0.tgz",
-          "integrity": "sha512-sgna89Ng+25Hr9kmmaIxpGWt2LStVm1xf1807PdcWasiPDaOTkOHRL61sINw0twky7QMzafCGToGDnHT/kTHtQ==",
-          "dev": true
+          "integrity": "sha512-sgna89Ng+25Hr9kmmaIxpGWt2LStVm1xf1807PdcWasiPDaOTkOHRL61sINw0twky7QMzafCGToGDnHT/kTHtQ=="
         }
       }
     },
@@ -10063,18 +8830,62 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-4.1.0.tgz",
       "integrity": "sha512-sVTikaDvMqg2aJjh4r48jsdfmqLT+nqB1MOsaBnvM3OwLx4S+WXcsxsgk5w18h/OZoxZCxuyXMh61iBHcj9Qiw==",
-      "dev": true,
       "requires": {
         "lodash": "^4.17.15",
         "postcss": "^7.0.31",
         "postcss-sorting": "^5.0.1"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+        },
         "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-          "dev": true,
+          "version": "7.0.36",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
+          "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
           "requires": {
             "chalk": "^2.4.2",
             "source-map": "^0.6.1",
@@ -10084,14 +8895,12 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         },
         "supports-color": {
           "version": "6.1.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
           "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
           "requires": {
             "has-flag": "^3.0.0"
           }
@@ -10099,10 +8908,9 @@
       }
     },
     "stylelint-scss": {
-      "version": "3.19.0",
-      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.19.0.tgz",
-      "integrity": "sha512-Ic5bsmpS4wVucOw44doC1Yi9f5qbeVL4wPFiEOaUElgsOuLEN6Ofn/krKI8BeNL2gAn53Zu+IcVV4E345r6rBw==",
-      "dev": true,
+      "version": "3.20.1",
+      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.20.1.tgz",
+      "integrity": "sha512-OTd55O1TTAC5nGKkVmUDLpz53LlK39R3MImv1CfuvsK7/qugktqiZAeQLuuC4UBhzxCnsc7fp9u/gfRZwFAIkA==",
       "requires": {
         "lodash": "^4.17.15",
         "postcss-media-query-parser": "^0.2.3",
@@ -10115,279 +8923,169 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-2.0.0.tgz",
       "integrity": "sha512-WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ==",
-      "dev": true,
       "requires": {
         "postcss": "^7.0.2"
       },
       "dependencies": {
-        "postcss": {
-          "version": "7.0.35",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
-          "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
-          "dev": true,
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "requires": {
-        "has-flag": "^3.0.0"
-      }
-    },
-    "supports-hyperlinks": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
-      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
-      "dev": true,
-      "requires": {
-        "has-flag": "^4.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
           "requires": {
-            "has-flag": "^4.0.0"
+            "color-convert": "^1.9.0"
           }
-        }
-      }
-    },
-    "svg-sprite": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/svg-sprite/-/svg-sprite-1.5.0.tgz",
-      "integrity": "sha512-0mE5BLY3K8wg3+HrYfzpiKbIM44IGcg8uINED8ri22EdQbLvGecOHjRtkrNAlphbiU5kyGyqoBlIaukL45fs2Q==",
-      "dev": true,
-      "requires": {
-        "async": "^2.6.1",
-        "css-selector-parser": "^1.3.0",
-        "cssmin": "^0.4.3",
-        "cssom": "^0.3.4",
-        "dateformat": "^3.0.3",
-        "glob": "^7.1.3",
-        "js-yaml": "^3.12.0",
-        "lodash": "^4.17.11",
-        "lodash.pluck": "^3.1.2",
-        "mkdirp": "^0.5.1",
-        "mocha": "^5.2.0",
-        "mustache": "^3.0.0",
-        "phantomjs-prebuilt": "^2.1.16",
-        "prettysize": "^1.1.0",
-        "should": "^13.2.3",
-        "svgo": "^1.1.1",
-        "vinyl": "^2.2.0",
-        "winston": "^3.1.0",
-        "xmldom": "0.1.27",
-        "xpath": "^0.0.27",
-        "yargs": "^12.0.2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-          "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-          "dev": true
         },
-        "cliui": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
-          "dev": true,
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
           "requires": {
-            "string-width": "^2.1.1",
-            "strip-ansi": "^4.0.0",
-            "wrap-ansi": "^2.0.0"
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
           }
         },
-        "cssom": {
-          "version": "0.3.8",
-          "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-          "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
-          "dev": true
-        },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
           "requires": {
-            "locate-path": "^3.0.0"
+            "color-name": "1.1.3"
           }
         },
-        "get-caller-file": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-          "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-          "dev": true
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
         },
-        "locate-path": {
+        "has-flag": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^3.0.0",
-            "path-exists": "^3.0.0"
-          }
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
         },
-        "p-locate": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-          "dev": true,
+        "postcss": {
+          "version": "7.0.36",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
+          "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
           "requires": {
-            "p-limit": "^2.0.0"
+            "chalk": "^2.4.2",
+            "source-map": "^0.6.1",
+            "supports-color": "^6.1.0"
           }
         },
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true
-        },
-        "require-main-filename": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-          "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
-          "dev": true
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
         },
-        "string-width": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-          "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-          "dev": true,
+        "supports-color": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
           "requires": {
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^4.0.0"
+            "has-flag": "^3.0.0"
           }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-          "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+        }
+      }
+    },
+    "supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "requires": {
+        "has-flag": "^4.0.0"
+      }
+    },
+    "supports-hyperlinks": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
+      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
+      "dev": true,
+      "requires": {
+        "has-flag": "^4.0.0",
+        "supports-color": "^7.0.0"
+      }
+    },
+    "svg-sprite": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/svg-sprite/-/svg-sprite-1.5.2.tgz",
+      "integrity": "sha512-ifDmjrhdV0OdKJp2tSssBT2m97e7gNpwWCMaapEBqe3wHTOsv1UFolQKBzC1wdVUUXdCa62tijVYPmuVSDCTmA==",
+      "dev": true,
+      "requires": {
+        "@xmldom/xmldom": "^0.7.2",
+        "async": "^3.2.1",
+        "css-selector-parser": "^1.4.1",
+        "cssmin": "^0.4.3",
+        "cssom": "^0.4.4",
+        "glob": "^7.1.7",
+        "js-yaml": "^3.14.1",
+        "lodash": "^4.17.21",
+        "mkdirp": "^0.5.5",
+        "mustache": "^4.2.0",
+        "phantomjs-prebuilt": "^2.1.16",
+        "prettysize": "^2.0.0",
+        "svgo": "^1.3.2",
+        "vinyl": "^2.2.1",
+        "winston": "^3.3.3",
+        "xpath": "^0.0.32",
+        "yargs": "^15.4.1"
+      },
+      "dependencies": {
+        "cliui": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+          "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^3.0.0"
+            "string-width": "^4.2.0",
+            "strip-ansi": "^6.0.0",
+            "wrap-ansi": "^6.2.0"
           }
         },
         "wrap-ansi": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-          "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
           "dev": true,
           "requires": {
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "2.1.1",
-              "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-              "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-              "dev": true
-            },
-            "is-fullwidth-code-point": {
-              "version": "1.0.0",
-              "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-              "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-              "dev": true,
-              "requires": {
-                "number-is-nan": "^1.0.0"
-              }
-            },
-            "string-width": {
-              "version": "1.0.2",
-              "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-              "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-              "dev": true,
-              "requires": {
-                "code-point-at": "^1.0.0",
-                "is-fullwidth-code-point": "^1.0.0",
-                "strip-ansi": "^3.0.0"
-              }
-            },
-            "strip-ansi": {
-              "version": "3.0.1",
-              "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-              "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^2.0.0"
-              }
-            }
+            "ansi-styles": "^4.0.0",
+            "string-width": "^4.1.0",
+            "strip-ansi": "^6.0.0"
           }
         },
-        "xmldom": {
-          "version": "0.1.27",
-          "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
-          "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=",
+        "y18n": {
+          "version": "4.0.3",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+          "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
           "dev": true
         },
         "yargs": {
-          "version": "12.0.5",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
-          "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
+          "version": "15.4.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+          "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
           "dev": true,
           "requires": {
-            "cliui": "^4.0.0",
+            "cliui": "^6.0.0",
             "decamelize": "^1.2.0",
-            "find-up": "^3.0.0",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^3.0.0",
+            "find-up": "^4.1.0",
+            "get-caller-file": "^2.0.1",
             "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
+            "require-main-filename": "^2.0.0",
             "set-blocking": "^2.0.0",
-            "string-width": "^2.0.0",
+            "string-width": "^4.2.0",
             "which-module": "^2.0.0",
-            "y18n": "^3.2.1 || ^4.0.0",
-            "yargs-parser": "^11.1.1"
-          }
-        },
-        "yargs-parser": {
-          "version": "11.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
-          "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
+            "y18n": "^4.0.0",
+            "yargs-parser": "^18.1.2"
           }
         }
       }
@@ -10395,8 +9093,7 @@
     "svg-tags": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
-      "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=",
-      "dev": true
+      "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q="
     },
     "svgo": {
       "version": "1.3.2",
@@ -10417,6 +9114,58 @@
         "stable": "^0.1.8",
         "unquote": "~1.1.1",
         "util.promisify": "~1.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
     "symbol-tree": {
@@ -10426,46 +9175,23 @@
       "dev": true
     },
     "table": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.1.0.tgz",
-      "integrity": "sha512-T4G5KMmqIk6X87gLKWyU5exPpTjLjY5KyrFWaIjv3SvgaIUGXV7UEzGEnZJdTA38/yUS6f9PlKezQ0bYXG3iIQ==",
-      "dev": true,
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
+      "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
       "requires": {
         "ajv": "^8.0.1",
-        "is-boolean-object": "^1.1.0",
-        "is-number-object": "^1.0.4",
-        "is-string": "^1.0.5",
         "lodash.clonedeep": "^4.5.0",
-        "lodash.flatten": "^4.4.0",
         "lodash.truncate": "^4.4.2",
         "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "8.1.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.1.0.tgz",
-          "integrity": "sha512-B/Sk2Ix7A36fs/ZkuGLIR86EdjbgR6fsAcbx9lOP/QBSXujDNbVmIS/U4Itz5k8fPFDeVZl/zQ/gJW4Jrq6XjQ==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-          "dev": true
-        }
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0"
       }
     },
     "tar-fs": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
       "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "dev": true,
       "requires": {
         "chownr": "^1.1.1",
         "mkdirp-classic": "^0.5.2",
@@ -10477,6 +9203,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
       "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "dev": true,
       "requires": {
         "bl": "^4.0.3",
         "end-of-stream": "^1.4.1",
@@ -10533,7 +9260,8 @@
     "through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
     },
     "tmpl": {
       "version": "1.0.5",
@@ -10544,8 +9272,7 @@
     "to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
-      "dev": true
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
     },
     "to-object-path": {
       "version": "0.3.0",
@@ -10556,6 +9283,12 @@
         "kind-of": "^3.0.2"
       },
       "dependencies": {
+        "is-buffer": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+          "dev": true
+        },
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -10596,12 +9329,20 @@
         "psl": "^1.1.33",
         "punycode": "^2.1.1",
         "universalify": "^0.1.2"
+      },
+      "dependencies": {
+        "universalify": {
+          "version": "0.1.2",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+          "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+          "dev": true
+        }
       }
     },
     "tr46": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz",
-      "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
+      "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
       "dev": true,
       "requires": {
         "punycode": "^2.1.1"
@@ -10613,11 +9354,16 @@
       "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
       "dev": true
     },
+    "trim": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim/-/trim-1.0.1.tgz",
+      "integrity": "sha512-3JVP2YVqITUisXblCDq/Bi4P9457G/sdEamInkyvCsjbTcXLXIiG7XCb4kGMFWh6JGXesS3TKxOPtrncN/xe8w==",
+      "dev": true
+    },
     "trim-newlines": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
-      "dev": true
+      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw=="
     },
     "triple-beam": {
       "version": "1.3.0",
@@ -10628,7 +9374,12 @@
     "trough": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz",
-      "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==",
+      "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA=="
+    },
+    "tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
       "dev": true
     },
     "tunnel-agent": {
@@ -10662,10 +9413,9 @@
       "dev": true
     },
     "type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "dev": true
+      "version": "0.18.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
+      "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw=="
     },
     "typedarray": {
       "version": "0.0.6",
@@ -10677,7 +9427,6 @@
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
       "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
-      "dev": true,
       "requires": {
         "is-typedarray": "^1.0.0"
       }
@@ -10698,6 +9447,7 @@
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
       "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
+      "dev": true,
       "requires": {
         "buffer": "^5.2.1",
         "through": "^2.3.8"
@@ -10732,10 +9482,9 @@
       "dev": true
     },
     "unified": {
-      "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.1.tgz",
-      "integrity": "sha512-juWjuI8Z4xFg8pJbnEZ41b5xjGUWGHqXALmBZ3FC3WX0PIx1CZBIIJ6mXbYMcf6Yw4Fi0rFUTA1cdz/BglbOhA==",
-      "dev": true,
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz",
+      "integrity": "sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==",
       "requires": {
         "bail": "^1.0.0",
         "extend": "^3.0.0",
@@ -10743,14 +9492,6 @@
         "is-plain-obj": "^2.0.0",
         "trough": "^1.0.0",
         "vfile": "^4.0.0"
-      },
-      "dependencies": {
-        "is-buffer": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
-          "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
-          "dev": true
-        }
       }
     },
     "union-value": {
@@ -10763,19 +9504,35 @@
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
         "set-value": "^2.0.1"
+      },
+      "dependencies": {
+        "extend-shallow": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
+          "requires": {
+            "is-extendable": "^0.1.0"
+          }
+        },
+        "set-value": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+          "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+          "dev": true,
+          "requires": {
+            "extend-shallow": "^2.0.1",
+            "is-extendable": "^0.1.1",
+            "is-plain-object": "^2.0.3",
+            "split-string": "^3.0.1"
+          }
+        }
       }
     },
-    "uniq": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
-      "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
-      "dev": true
-    },
     "unist-util-find-all-after": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz",
       "integrity": "sha512-xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ==",
-      "dev": true,
       "requires": {
         "unist-util-is": "^4.0.0"
       }
@@ -10783,23 +9540,20 @@
     "unist-util-is": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz",
-      "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==",
-      "dev": true
+      "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg=="
     },
     "unist-util-stringify-position": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz",
       "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==",
-      "dev": true,
       "requires": {
         "@types/unist": "^2.0.2"
       }
     },
     "universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-      "dev": true
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="
     },
     "unquote": {
       "version": "1.1.1",
@@ -10851,7 +9605,6 @@
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
       "requires": {
         "punycode": "^2.1.0"
       }
@@ -10895,13 +9648,12 @@
     "v8-compile-cache": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
-      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
-      "dev": true
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="
     },
     "v8-to-istanbul": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.1.tgz",
-      "integrity": "sha512-p0BB09E5FRjx0ELN6RgusIPsSPhtgexSRcKETybEs6IGOTXJSZqfwxp7r//55nnu0f1AxltY5VvdVqy2vZf9AA==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz",
+      "integrity": "sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==",
       "dev": true,
       "requires": {
         "@types/istanbul-lib-coverage": "^2.0.1",
@@ -10921,7 +9673,6 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
       "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
       "requires": {
         "spdx-correct": "^3.0.0",
         "spdx-expression-parse": "^3.0.0"
@@ -10936,33 +9687,31 @@
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
         "extsprintf": "^1.2.0"
+      },
+      "dependencies": {
+        "core-util-is": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+          "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+          "dev": true
+        }
       }
     },
     "vfile": {
       "version": "4.2.1",
       "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz",
       "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==",
-      "dev": true,
       "requires": {
         "@types/unist": "^2.0.0",
         "is-buffer": "^2.0.0",
         "unist-util-stringify-position": "^2.0.0",
         "vfile-message": "^2.0.0"
-      },
-      "dependencies": {
-        "is-buffer": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
-          "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
-          "dev": true
-        }
       }
     },
     "vfile-message": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz",
       "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==",
-      "dev": true,
       "requires": {
         "@types/unist": "^2.0.0",
         "unist-util-stringify-position": "^2.0.0"
@@ -11001,16 +9750,16 @@
       }
     },
     "wait-on": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-3.3.0.tgz",
-      "integrity": "sha512-97dEuUapx4+Y12aknWZn7D25kkjMk16PbWoYzpSdA8bYpVfS6hpl2a2pOWZ3c+Tyt3/i4/pglyZctG3J4V1hWQ==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-5.3.0.tgz",
+      "integrity": "sha512-DwrHrnTK+/0QFaB9a8Ol5Lna3k7WvUR4jzSKmz0YaPBpuN2sACyiPVKVfj6ejnjcajAcvn3wlbTyMIn9AZouOg==",
       "dev": true,
       "requires": {
-        "@hapi/joi": "^15.0.3",
-        "core-js": "^2.6.5",
-        "minimist": "^1.2.0",
-        "request": "^2.88.0",
-        "rx": "^4.1.0"
+        "axios": "^0.21.1",
+        "joi": "^17.3.0",
+        "lodash": "^4.17.21",
+        "minimist": "^1.2.5",
+        "rxjs": "^6.6.3"
       }
     },
     "wait-port": {
@@ -11024,11 +9773,61 @@
         "debug": "^4.1.1"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
         "commander": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz",
           "integrity": "sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==",
           "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
@@ -11063,13 +9862,13 @@
       "dev": true
     },
     "whatwg-url": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.5.0.tgz",
-      "integrity": "sha512-fy+R77xWv0AiqfLl4nuGUlQ3/6b5uNfQ4WAbGQVMYshCTCCPK9psC1nWh3XHuxGVCtlcDDQPQW1csmmIQo+fwg==",
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
+      "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
       "dev": true,
       "requires": {
         "lodash": "^4.7.0",
-        "tr46": "^2.0.2",
+        "tr46": "^2.1.0",
         "webidl-conversions": "^6.1.0"
       }
     },
@@ -11077,7 +9876,6 @@
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
       "requires": {
         "isexe": "^2.0.0"
       }
@@ -11118,16 +9916,10 @@
         "winston-transport": "^4.4.0"
       },
       "dependencies": {
-        "async": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz",
-          "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==",
-          "dev": true
-        },
         "is-stream": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-          "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+          "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
           "dev": true
         }
       }
@@ -11157,12 +9949,6 @@
             "util-deprecate": "~1.0.1"
           }
         },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        },
         "string_decoder": {
           "version": "1.1.1",
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -11181,40 +9967,13 @@
       "dev": true
     },
     "wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-      "dev": true,
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "requires": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
         "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        }
       }
     },
     "wrappy": {
@@ -11226,7 +9985,6 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
       "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-      "dev": true,
       "requires": {
         "imurmurhash": "^0.1.4",
         "is-typedarray": "^1.0.0",
@@ -11235,9 +9993,10 @@
       }
     },
     "ws": {
-      "version": "7.4.6",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz",
-      "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A=="
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
+      "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==",
+      "dev": true
     },
     "xml-name-validator": {
       "version": "3.0.0",
@@ -11252,52 +10011,50 @@
       "dev": true
     },
     "xmldom": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz",
-      "integrity": "sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA==",
+      "version": "github:xmldom/xmldom#c568938641cc1f121cef5b4df80fcfda1e489b6e",
+      "from": "github:xmldom/xmldom#0.7.0",
       "dev": true
     },
     "xpath": {
-      "version": "0.0.27",
-      "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.27.tgz",
-      "integrity": "sha512-fg03WRxtkCV6ohClePNAECYsmpKKTv5L8y/X3Dn1hQrec3POx2jHZ/0P2qQ6HvsrU1BmeqXcof3NGGueG6LxwQ==",
+      "version": "0.0.32",
+      "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.32.tgz",
+      "integrity": "sha512-rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw==",
       "dev": true
     },
     "y18n": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
-      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
-      "dev": true
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
     },
     "yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
     "yaml": {
       "version": "1.10.2",
       "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-      "dev": true
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="
     },
     "yargs": {
-      "version": "15.4.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
-      "dev": true,
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
       "requires": {
-        "cliui": "^6.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^4.1.0",
-        "get-caller-file": "^2.0.1",
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
         "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
         "string-width": "^4.2.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^18.1.2"
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "dependencies": {
+        "yargs-parser": {
+          "version": "20.2.9",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+          "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="
+        }
       }
     },
     "yargs-parser": {
@@ -11314,6 +10071,7 @@
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
       "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+      "dev": true,
       "requires": {
         "buffer-crc32": "~0.2.3",
         "fd-slicer": "~1.1.0"
@@ -11322,8 +10080,7 @@
     "zwitch": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz",
-      "integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==",
-      "dev": true
+      "integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw=="
     }
   }
 }
diff --git a/html/themes/custom/common_design_subtheme/package.json b/html/themes/custom/common_design_subtheme/package.json
index 0d434da1e..9ea7f88eb 100644
--- a/html/themes/custom/common_design_subtheme/package.json
+++ b/html/themes/custom/common_design_subtheme/package.json
@@ -1,6 +1,6 @@
 {
   "name": "common-design",
-  "version": "4.0.0",
+  "version": "5.0.1",
   "description": "OCHA Common Design base theme for Drupal 8",
   "repository": "git@github.com:UN-OCHA/common_design.git",
   "author": "UN OCHA",
@@ -16,6 +16,7 @@
     "js:lint": "eslint js/*.js",
     "svg:sprite": "svg-sprite --svg-xmldecl=false --svg-doctype=false --svg-rootattrs=_config/svg-sprite.config.json --log=info --symbol --symbol-prefix='%s' --symbol-example=true --shape-id-generator='cd-icon--' --symbol-dest=img/icons --symbol-sprite=cd-icons-sprite.svg img/icons/*.svg",
     "e2e": "jest _tests/*.test.js",
+    "ci": "jest --maxWorkers=2 _tests/*.test.js",
     "test": "jest _tests/*.test.js"
   },
   "engines": {
@@ -24,25 +25,32 @@
   },
   "dependencies": {
     "autoprefixer": "^10.2.5",
-    "puppeteer": "^8.0.0",
-    "sass": "^1.32.8"
+    "postcss": "^8.2.9",
+    "postcss-cli": "^8.3.1",
+    "sass": "^1.32.8",
+    "stylelint": "^13.12.0",
+    "stylelint-config-recommended-scss": "^4.2.0",
+    "stylelint-config-standard": "^21.0.0",
+    "stylelint-order": "^4.1.0",
+    "stylelint-scss": "^3.19.0"
   },
   "devDependencies": {
+    "axios": ">=0.21.2",
     "@babel/preset-env": "^7.13.10",
     "babel-jest": "^26.6.3",
+    "core-js": "^2.6.12",
+    "css-what": ">=5.0.1",
     "eslint": "^7.23.0",
     "jest": "^26.6.3",
-    "jest-puppeteer": "^4.4.0",
+    "jest-puppeteer": "^5.0.3",
+    "nth-check": ">=2.0.1",
     "minimist": "^1.2.5",
-    "postcss": "^8.2.9",
-    "postcss-cli": "^8.3.1",
-    "stylelint": "^13.12.0",
-    "stylelint-config-recommended-scss": "^4.2.0",
-    "stylelint-config-standard": "^21.0.0",
-    "stylelint-order": "^4.1.0",
-    "stylelint-scss": "^3.19.0",
+    "puppeteer": "^9.1.1",
+    "set-value": ">=4.0.1",
     "svg-sprite": "^1.5.0",
-    "xmldom": ">=0.5.0",
+    "trim": ">=0.0.3",
+    "trim-newlines": ">=3.0.1",
+    "xmldom": "github:xmldom/xmldom#0.7.0",
     "yargs-parser": "^18.1.3"
   }
 }

From 087c0638f1b571795123d50a7f32f11d3413cd23 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 1 Dec 2021 15:15:33 +0900
Subject: [PATCH 182/720] [RW-264] Move eslint to dependencies instead of dev
 depencies to be able to lint code without having to install heavier
 dependencies

---
 html/themes/custom/common_design_subtheme/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/package.json b/html/themes/custom/common_design_subtheme/package.json
index 9ea7f88eb..3ac515544 100644
--- a/html/themes/custom/common_design_subtheme/package.json
+++ b/html/themes/custom/common_design_subtheme/package.json
@@ -25,6 +25,7 @@
   },
   "dependencies": {
     "autoprefixer": "^10.2.5",
+    "eslint": "^7.23.0",
     "postcss": "^8.2.9",
     "postcss-cli": "^8.3.1",
     "sass": "^1.32.8",
@@ -40,7 +41,6 @@
     "babel-jest": "^26.6.3",
     "core-js": "^2.6.12",
     "css-what": ">=5.0.1",
-    "eslint": "^7.23.0",
     "jest": "^26.6.3",
     "jest-puppeteer": "^5.0.3",
     "nth-check": ">=2.0.1",

From ce1206956ea6313490bea4dfc977078de076f332 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 1 Dec 2021 15:17:34 +0900
Subject: [PATCH 183/720] [RW-264] Stylelint pre commit compatibility with
 docksal (may require stylelint ^14.1.x)

---
 git-hooks/scripts/pre-commit/lint-sass | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/git-hooks/scripts/pre-commit/lint-sass b/git-hooks/scripts/pre-commit/lint-sass
index 79000a1f9..dcd12a95d 100755
--- a/git-hooks/scripts/pre-commit/lint-sass
+++ b/git-hooks/scripts/pre-commit/lint-sass
@@ -14,5 +14,13 @@ message='Linting subtheme CSS/SCSS files...'
 # We need to change to the linter's directory to load its dependencies.
 changedir=1
 
+# Docksal compatibility.
+# @todo remove and use the changedir and options below as defaults after
+# upgrading stylelint to ^14.1.x.
+if [ -x "$(command -v fin)" ]; then
+  changedir=0
+  options="--config-basedir html/themes/custom/common_design_subtheme/ --config html/themes/custom/common_design_subtheme/.stylelintrc.json"
+fi
+
 # Load and execute the linting code.
 . "$(dirname "$0")/lint-common"

From 74d7e021c71a5369c0e4603d3601142b9d3f76a5 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 1 Dec 2021 12:58:57 -0700
Subject: [PATCH 184/720] remove parent selector, not needed and messes with
 specificity when extending component from sub theme

---
 .../guidelines-json/guidelines-json.css       | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.css b/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.css
index 9a6046104..bed901821 100644
--- a/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.css
+++ b/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.css
@@ -1,8 +1,8 @@
-#main-content form[data-with-guidelines] > * .form-wrapper {
+form[data-with-guidelines] > * .form-wrapper {
   position: relative;
 }
 
-#main-content form[data-with-guidelines] button[data-guideline] {
+form[data-with-guidelines] button[data-guideline] {
   display: inline-block;
   vertical-align: middle;
   position: absolute;
@@ -11,10 +11,10 @@
   padding: 4px 10px;
   margin-top: 0;
 }
-#main-content form[data-with-guidelines] button[data-guideline]:hover {
+form[data-with-guidelines] button[data-guideline]:hover {
   background-position-x: -96px;
 }
-#main-content form[data-with-guidelines] .guideline:before {
+form[data-with-guidelines] .guideline:before {
   content: "";
   position: fixed;
   top: 0;
@@ -26,7 +26,7 @@
   background: rgba(1, 1, 1, 0.3);
   z-index: 10000;
 }
-#main-content form[data-with-guidelines] .guideline {
+form[data-with-guidelines] .guideline {
   position: fixed;
   top: 10vh;
   left: 25vw;
@@ -36,7 +36,7 @@
   border: 10px solid rgba(0, 0, 0, 0.1);
   z-index: 1;
 }
-#main-content form[data-with-guidelines] .guideline > button[value="close"] {
+form[data-with-guidelines] .guideline > button[value="close"] {
   position: absolute;
   top: -50px;
   left: -50px;
@@ -44,13 +44,13 @@
   padding: 4px 10px;
   z-index: 10002;
 }
-#main-content form[data-with-guidelines] .guideline > button[value="close"]:hover {
+form[data-with-guidelines] .guideline > button[value="close"]:hover {
   border-color: #eb1405;
 }
-#main-content form[data-with-guidelines] .guideline > button[value="close"]:hover:after {
+form[data-with-guidelines] .guideline > button[value="close"]:hover:after {
   background-position-x: -96px;
 }
-#main-content form[data-with-guidelines] .guideline > div {
+form[data-with-guidelines] .guideline > div {
   position: relative;
   width: 100%;
   height: 100%;
@@ -60,12 +60,12 @@
   overflow-x: hidden;
   z-index: 10001;
 }
-#main-content form[data-with-guidelines] .guideline > div > h3 {
+form[data-with-guidelines] .guideline > div > h3 {
   text-align: center;
 }
-#main-content form[data-with-guidelines] .guideline > div > .content {
+form[data-with-guidelines] .guideline > div > .content {
   padding-top: 0;
 }
-#main-content form[data-with-guidelines] .guideline > div > .content img {
+form[data-with-guidelines] .guideline > div > .content img {
   border: 4px solid #e6ecef;
 }

From 80ae394d48bf0fccdbf16acdbc46a88666ee08d6 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 1 Dec 2021 12:59:22 -0700
Subject: [PATCH 185/720] white h1, like D7

---
 .../components/reliefweb-guidelines/reliefweb-guidelines.css     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
index ad8079f22..5ea7b948d 100644
--- a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
+++ b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
@@ -53,6 +53,7 @@
   position: relative;
   text-align: center;
   text-shadow: 2px 2px 2px rgba(0, 0, 0, 1);
+  color: white;
   width: 100%;
 }
 .rw-guidelines-list aside h1:before {

From 9033ac29602f005507da9958d657a2c36b66810c Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 1 Dec 2021 13:02:06 -0700
Subject: [PATCH 186/720] remove wrapper div in favour of adding it via js

---
 .../custom/guidelines/templates/guideline.html.twig       | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/html/modules/custom/guidelines/templates/guideline.html.twig b/html/modules/custom/guidelines/templates/guideline.html.twig
index b60b6bfe4..74e27cb45 100644
--- a/html/modules/custom/guidelines/templates/guideline.html.twig
+++ b/html/modules/custom/guidelines/templates/guideline.html.twig
@@ -15,8 +15,6 @@
  * @ingroup themeable
  */
 #}
-<div{{ attributes.addClass('guideline') }}>
-  {% if content %}
-    {{- content -}}
-  {% endif %}
-</div>
+{% if content %}
+  {{- content -}}
+{% endif %}

From 8487ba02cf49c0fe5c7e3ed5e97a5869ae748be1 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 1 Dec 2021 13:02:59 -0700
Subject: [PATCH 187/720] extend custom module libraries, not sure which is
 needed

---
 .../common_design_subtheme/common_design_subtheme.info.yml  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.info.yml b/html/themes/custom/common_design_subtheme/common_design_subtheme.info.yml
index c08f6bcd5..7ed3694a7 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.info.yml
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.info.yml
@@ -50,7 +50,11 @@ libraries-extend:
     - common_design_subtheme/rw-datepicker
 
   # Guidelines.
-  reliefweb_form/form.guidelines:
+#  reliefweb_form/form.guidelines:
+#    - common_design_subtheme/rw-guidelines
+  guidelines/guidelines-json:
+    - common_design_subtheme/rw-guidelines
+  reliefweb-guidelines/reliefweb-guidelines:
     - common_design_subtheme/rw-guidelines
 
 

From a72f10e8222b097aa57c7541d9a4a92ff99cb8ec Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 1 Dec 2021 13:07:08 -0700
Subject: [PATCH 188/720] adjust selectors to reflect better BEM naming

---
 .../components/guidelines-json/guidelines-json.js        | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.js b/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.js
index 683f09222..a37f75016 100644
--- a/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.js
+++ b/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.js
@@ -63,7 +63,7 @@
 
       // Remove guidelines elements from the form.
       function cleanGuidelines(form, popupOnly) {
-        var selector = '.guideline';
+        var selector = '.rw-guideline';
         if (!popupOnly) {
           selector += ', [data-guideline]';
         }
@@ -106,7 +106,7 @@
         heading.appendChild(link);
 
         var content = document.createElement('div');
-        content.className = 'content';
+        content.className = 'rw-guideline__content';
         content.innerHTML = card.content;
 
         var container = document.createElement('div');
@@ -114,7 +114,7 @@
         container.appendChild(content);
 
         var popup = document.createElement('div');
-        popup.className = 'guideline';
+        popup.className = 'rw-guideline';
         popup.appendChild(close);
         popup.appendChild(container);
 
@@ -131,6 +131,7 @@
 
       // Prepare the guidelines card.
       function prepareGuidelines(data) {
+
         var guidelines = {};
 
         // Parse the guideline cards.
@@ -138,7 +139,7 @@
           var cards = data;
           for (var i = 0, l = cards.length; i < l; i++) {
             var card = cards[i];
-            // Remove blank image used for lazy laoding.
+            // Remove blank image used for lazy loading.
             card.content = card.content.replace(/src="\/assets\/images\/blank\.gif"/g, '');
             // Add the card as guideline for each of the target fields.
             guidelines[card.label] = card;

From be0df90cc44047d0ef4b1c04cf58fa033ae53bb7 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 1 Dec 2021 13:32:32 -0700
Subject: [PATCH 189/720] update selectors for more BEM-like

---
 .../guidelines-json/guidelines-json.css        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.css b/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.css
index bed901821..2484c9aba 100644
--- a/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.css
+++ b/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.css
@@ -14,7 +14,7 @@ form[data-with-guidelines] button[data-guideline] {
 form[data-with-guidelines] button[data-guideline]:hover {
   background-position-x: -96px;
 }
-form[data-with-guidelines] .guideline:before {
+form[data-with-guidelines] .rw-guideline:before {
   content: "";
   position: fixed;
   top: 0;
@@ -26,7 +26,7 @@ form[data-with-guidelines] .guideline:before {
   background: rgba(1, 1, 1, 0.3);
   z-index: 10000;
 }
-form[data-with-guidelines] .guideline {
+form[data-with-guidelines] .rw-guideline {
   position: fixed;
   top: 10vh;
   left: 25vw;
@@ -36,7 +36,7 @@ form[data-with-guidelines] .guideline {
   border: 10px solid rgba(0, 0, 0, 0.1);
   z-index: 1;
 }
-form[data-with-guidelines] .guideline > button[value="close"] {
+form[data-with-guidelines] .rw-guideline > button[value="close"] {
   position: absolute;
   top: -50px;
   left: -50px;
@@ -44,13 +44,13 @@ form[data-with-guidelines] .guideline > button[value="close"] {
   padding: 4px 10px;
   z-index: 10002;
 }
-form[data-with-guidelines] .guideline > button[value="close"]:hover {
+form[data-with-guidelines] .rw-guideline > button[value="close"]:hover {
   border-color: #eb1405;
 }
-form[data-with-guidelines] .guideline > button[value="close"]:hover:after {
+form[data-with-guidelines] .rw-guideline > button[value="close"]:hover:after {
   background-position-x: -96px;
 }
-form[data-with-guidelines] .guideline > div {
+form[data-with-guidelines] .rw-guideline > div {
   position: relative;
   width: 100%;
   height: 100%;
@@ -60,12 +60,12 @@ form[data-with-guidelines] .guideline > div {
   overflow-x: hidden;
   z-index: 10001;
 }
-form[data-with-guidelines] .guideline > div > h3 {
+form[data-with-guidelines] .rw-guideline > div > h3 {
   text-align: center;
 }
-form[data-with-guidelines] .guideline > div > .content {
+form[data-with-guidelines] .rw-guideline > div > .content {
   padding-top: 0;
 }
-form[data-with-guidelines] .guideline > div > .content img {
+form[data-with-guidelines] .rw-guideline > div > .content img {
   border: 4px solid #e6ecef;
 }

From d20fd1e69755e57a657aa28bcffb79568840e535 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 1 Dec 2021 13:33:53 -0700
Subject: [PATCH 190/720] remove rules and declarations that are duplicated in
 custom module

---
 .../rw-guidelines/rw-guidelines.css           | 40 -------------------
 1 file changed, 40 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
index 45403b55b..0f8000b77 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
@@ -15,31 +15,7 @@ form[data-with-guidelines] button[data-guideline]:hover {
   background: var(--rw-icons--common--help--12--dark-red);
   background-color: var(--cd-reliefweb-brand-grey--light);
 }
-form[data-with-guidelines] .rw-guideline:before {
-  position: fixed;
-  z-index: 10000;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  margin: 0;
-  padding: 0;
-  content: "";
-  background: rgba(1, 1, 1, 0.3);
-}
-form[data-with-guidelines] .rw-guideline {
-  position: fixed;
-  z-index: 1;
-  top: 10vh;
-  left: 25vw;
-  width: 50vw;
-  height: 80vh;
-  border: 10px solid black;
-  border: 10px solid rgba(0, 0, 0, 0.1);
-}
 form[data-with-guidelines] .rw-guideline > button[value="close"] {
-  position: absolute;
-  z-index: 10002;
   top: -16px;
   left: -16px;
   overflow: hidden;
@@ -66,22 +42,6 @@ form[data-with-guidelines] .rw-guideline > button[value="close"]:hover {
 form[data-with-guidelines] .rw-guideline > button[value="close"]:hover:after {
   background: var(--rw-icons--common--close--12--dark-red);
 }
-form[data-with-guidelines] .rw-guideline > div {
-  position: relative;
-  z-index: 10001;
-  overflow-x: hidden;
-  overflow-y: auto;
-  width: 100%;
-  height: 100%;
-  padding: 16px;
-  background-color: white;
-}
-form[data-with-guidelines] .rw-guideline > div > h3 {
-  text-align: center;
-}
-form[data-with-guidelines] .rw-guideline > div > .rw-guideline__content {
-  padding-top: 0;
-}
 form[data-with-guidelines] .rw-guideline > div > .rw-guideline__content img {
   border: 4px solid var(--cd-reliefweb-brand-grey--light);
 }

From 470d920880c0e6820d7213df5e1e99f54a0aff8f Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 2 Dec 2021 14:52:59 +0900
Subject: [PATCH 191/720] [RW-256] Fix source presave to set user posting
 rights to blocked

---
 .../reliefweb_moderation/src/Services/SourceModeration.php  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/html/modules/custom/reliefweb_moderation/src/Services/SourceModeration.php b/html/modules/custom/reliefweb_moderation/src/Services/SourceModeration.php
index 7b37d0b84..026f6bce1 100644
--- a/html/modules/custom/reliefweb_moderation/src/Services/SourceModeration.php
+++ b/html/modules/custom/reliefweb_moderation/src/Services/SourceModeration.php
@@ -216,9 +216,9 @@ public function entityPresave(EntityModeratedInterface $entity) {
       // Update the posting rights field, setting everything as blocked.
       if (!$entity->get('field_user_posting_rights')->isEmpty()) {
         foreach ($entity->get('field_user_posting_rights') as $item) {
-          if ($item->job->getValue() != 1 || $item->training->getValue() != 1) {
-            $item->job->setValue(1);
-            $item->training->setValue(1);
+          if ($item->get('job')->getValue() != 1 || $item->get('training')->getValue() != 1) {
+            $item->get('job')->setValue(1);
+            $item->get('training')->setValue(1);
             $changed = TRUE;
           }
         }

From d492996e8f1deeb1075bf0320572b13f9c15f88c Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 2 Dec 2021 15:12:47 +0900
Subject: [PATCH 192/720] [RW-209] Fix report field_origin field type for
 compatibility with D7 data

---
 config/field.field.node.report.field_origin.yml |  4 ++--
 config/field.storage.node.field_origin.yml      | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/config/field.field.node.report.field_origin.yml b/config/field.field.node.report.field_origin.yml
index 7b80b62c0..d5e2cbb61 100644
--- a/config/field.field.node.report.field_origin.yml
+++ b/config/field.field.node.report.field_origin.yml
@@ -1,4 +1,4 @@
-uuid: 2e14cbe1-5a85-4274-9405-7b2c5434e240
+uuid: 8eda6012-82e5-4b7b-8522-cc6d46e035f0
 langcode: en
 status: true
 dependencies:
@@ -18,4 +18,4 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings: {  }
-field_type: list_string
+field_type: list_integer
diff --git a/config/field.storage.node.field_origin.yml b/config/field.storage.node.field_origin.yml
index a3a46a7a5..5fbbbd0d1 100644
--- a/config/field.storage.node.field_origin.yml
+++ b/config/field.storage.node.field_origin.yml
@@ -1,4 +1,4 @@
-uuid: 689ecb45-ba0e-4c6d-b167-215de04dddec
+uuid: eff5127e-e198-4808-911a-6f294ad84846
 langcode: en
 status: true
 dependencies:
@@ -8,17 +8,17 @@ dependencies:
 id: node.field_origin
 field_name: field_origin
 entity_type: node
-type: list_string
+type: list_integer
 settings:
   allowed_values:
     -
-      value: '0'
+      value: 0
       label: URL
     -
-      value: '1'
+      value: 1
       label: 'Submit mailbox'
     -
-      value: '2'
+      value: 2
       label: 'Reliefweb product'
   allowed_values_function: ''
 module: options

From 1371972c70fecda56b4d36ff2d0526092fecd380 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 2 Dec 2021 15:44:39 -0700
Subject: [PATCH 193/720] change h4 to label element to reduce variables when
 adding the guidelines button

---
 .../templates/form/datetime-wrapper.html.twig                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/templates/form/datetime-wrapper.html.twig b/html/themes/custom/common_design_subtheme/templates/form/datetime-wrapper.html.twig
index b7a108c8a..e87d88e37 100644
--- a/html/themes/custom/common_design_subtheme/templates/form/datetime-wrapper.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/form/datetime-wrapper.html.twig
@@ -23,7 +23,7 @@
   ]
 %}
 {% if title %}
-  <h4{{ title_attributes.addClass(title_classes) }}>{{ title }}</h4>
+  <label{{ title_attributes.addClass(title_classes) }}>{{ title }}</label>
 {% endif %}
 {{ content }}
 {% if errors %}

From f626246bc5c3b9bbec975a0f6adc8c4eda1b48e7 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 2 Dec 2021 15:45:30 -0700
Subject: [PATCH 194/720] add rules for the various icon placements depending
 on drupal field markup

---
 .../rw-guidelines/rw-guidelines.css           | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
index 0f8000b77..365f51c4f 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
@@ -1,9 +1,16 @@
+form[data-with-guidelines] .form-item label,
+form[data-with-guidelines] .form-wrapper label {
+  float: left;
+}
+form[data-with-guidelines] .fieldset-wrapper label {
+  float: none;
+}
 form[data-with-guidelines] button[data-guideline] {
   display: inline-block;
   overflow: hidden;
   width: 20px;
   height: 20px;
-  margin: -3px 0 0 8px;
+  margin: -0.5rem 0 0 0.5rem;
   padding: 0 0 0 12px;
   vertical-align: middle;
   border: 4px solid var(--cd-reliefweb-brand-grey--light);
@@ -11,6 +18,23 @@ form[data-with-guidelines] button[data-guideline] {
   background: var(--rw-icons--common--help--12--dark-blue);
   background-color: var(--cd-reliefweb-brand-grey--light);
 }
+/* Legend with child button */
+form[data-with-guidelines] legend button[data-guideline] {
+  margin: -0.5rem 0 0 0.5rem;
+}
+form[data-with-guidelines] .form-required button[data-guideline] {
+  margin: 0 0 0 0.5rem;
+}
+form[data-with-guidelines] legend .form-required button[data-guideline] {
+  order: 1;
+}
+/* Label followed by button */
+form[data-with-guidelines] .form-required + button[data-guideline] {
+  margin: -0.5rem 0 0;
+}
+form[data-with-guidelines] .visually-hidden + button[data-guideline] {
+  margin: -0.5rem 0 0 0.5rem;
+}
 form[data-with-guidelines] button[data-guideline]:hover {
   background: var(--rw-icons--common--help--12--dark-red);
   background-color: var(--cd-reliefweb-brand-grey--light);

From c6384fe326476a88d276219fa9238db9a43a5c91 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 2 Dec 2021 15:46:05 -0700
Subject: [PATCH 195/720] comment out positioning rules for icon

---
 .../components/guidelines-json/guidelines-json.css          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.css b/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.css
index 2484c9aba..d0e13b4e3 100644
--- a/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.css
+++ b/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.css
@@ -5,9 +5,9 @@ form[data-with-guidelines] > * .form-wrapper {
 form[data-with-guidelines] button[data-guideline] {
   display: inline-block;
   vertical-align: middle;
-  position: absolute;
-  top: 0;
-  right: 0;
+  /*position: absolute;*/
+  /*top: 0;*/
+  /*right: 0;*/
   padding: 4px 10px;
   margin-top: 0;
 }

From 840e37b1eddd7fb2e29906d7ed51907c078c5c95 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 2 Dec 2021 15:49:28 -0700
Subject: [PATCH 196/720] add buttons inside legend span element and after
 label depending on the specific Drupal field selectors, comment out previous
 conditional

---
 .../guidelines-json/guidelines-json.js         | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.js b/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.js
index a37f75016..d1ee709b8 100644
--- a/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.js
+++ b/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.js
@@ -171,12 +171,18 @@
               showGuideline(form, guidelines[event.target.getAttribute('data-guideline')]);
             });
 
-            if (element.nodeName === 'LABEL') {
-              element.parentNode.insertBefore(button, element.nextSibling);
-            }
-            else {
-              element.appendChild(button);
-            }
+            /* Drupal fields with either Legend or Label element ancestors */
+            const labels = element.querySelectorAll('.form-wrapper .form-item > label');
+            labels.forEach(item => item.parentNode.insertBefore(button, item.nextSibling));
+            const legends = element.querySelectorAll('[data-drupal-selector] > legend > span');
+            legends.forEach(item =>  item.appendChild(button));
+
+            // if (element.nodeName === 'LABEL') {
+            //   element.parentNode.insertBefore(button, element.nextSibling);
+            // }
+            // else {
+            //   element.appendChild(button);
+            // }
           }
         }
       }

From a474c370587a9d1c5857cbedec8571685660f6ce Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 2 Dec 2021 15:49:52 -0700
Subject: [PATCH 197/720] set legend font size for consistency

---
 .../custom/common_design_subtheme/components/rw-form/rw-form.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 5cf224069..76651eccc 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -86,6 +86,7 @@ form fieldset fieldset legend {
   display: inline-block;
   margin: 0 0 6px 0;
   font-weight: bold;
+  font-size: 16px;
 }
 form label:first-letter {
   /* Try to have some consistency. */

From ee669247db2e32b03222b57296766b9aa236aead Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 2 Dec 2021 15:52:43 -0700
Subject: [PATCH 198/720] IE flexbox fix for TOC section

---
 .../common_design_subtheme/components/rw-toc/rw-toc.css    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css b/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
index aaa6167c9..9f4d22480 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
@@ -263,4 +263,11 @@
   .rw-toc[data-cd-hidden="true"] {
     display: block;
   }
+
+  /* Flexbox layout fix */
+  .user-logged-in.path-taxonomy .rw-page--sectioned .region-content,
+  .user-logged-in.path-node .rw-page--sectioned .region-content,
+  .rw-page--sectioned {
+    display: block;
+  }
 }

From 911cb31ed22d79b07109620f849fed99d19e62ab Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sat, 4 Dec 2021 10:14:58 +0000
Subject: [PATCH 199/720] [RW-120] Add switch to prevent running some hooks
 during the migration

---
 .../reliefweb_bookmarks.module                   |  8 ++++++++
 .../reliefweb_fields/reliefweb_fields.module     | 16 ++++++++++++++++
 .../migrate_plus.migration.reliefweb_book.yml    |  4 ++++
 .../migrate_plus.migration.reliefweb_image.yml   |  4 ++++
 .../migrate_plus.migration.reliefweb_user.yml    |  4 ++++
 ...te_plus.migration.reliefweb_user__default.yml |  4 ++++
 ...rate_plus.migration_group.reliefweb_media.yml |  4 ++++
 ...grate_plus.migration_group.reliefweb_node.yml |  4 ++++
 ...s.migration_group.reliefweb_node_revision.yml |  4 ++++
 ...grate_plus.migration_group.reliefweb_term.yml |  4 ++++
 ...s.migration_group.reliefweb_term_revision.yml |  4 ++++
 .../reliefweb_subscriptions.module               | 12 ++++++++++++
 12 files changed, 72 insertions(+)

diff --git a/html/modules/custom/reliefweb_bookmarks/reliefweb_bookmarks.module b/html/modules/custom/reliefweb_bookmarks/reliefweb_bookmarks.module
index 154223a4d..f74028ef3 100644
--- a/html/modules/custom/reliefweb_bookmarks/reliefweb_bookmarks.module
+++ b/html/modules/custom/reliefweb_bookmarks/reliefweb_bookmarks.module
@@ -286,6 +286,10 @@ function reliefweb_bookmarks_theme() {
  * Implements hook_entity_update().
  */
 function reliefweb_bookmarks_entity_update(EntityInterface $entity) {
+  // @todo remove when removing `reliefweb_migrate`.
+  if (!empty($entity->_is_migrating)) {
+    return;
+  }
   // Remove any bookmarks to that entity if it's not published.
   if ($entity instanceof EntityPublishedInterface && !$entity->isPublished()) {
     reliefweb_bookmarks_remove_bookmark($entity->getEntityTypeId(), $entity->id());
@@ -296,6 +300,10 @@ function reliefweb_bookmarks_entity_update(EntityInterface $entity) {
  * Implements hook_entity_delete().
  */
 function reliefweb_bookmarks_entity_delete(EntityInterface $entity) {
+  // @todo remove when removing `reliefweb_migrate`.
+  if (!empty($entity->_is_migrating)) {
+    return;
+  }
   // Remove any bookmarks to that entity.
   reliefweb_bookmarks_remove_bookmark($entity->getEntityTypeId(), $entity->id());
 }
diff --git a/html/modules/custom/reliefweb_fields/reliefweb_fields.module b/html/modules/custom/reliefweb_fields/reliefweb_fields.module
index 6605414b8..b56ef194d 100644
--- a/html/modules/custom/reliefweb_fields/reliefweb_fields.module
+++ b/html/modules/custom/reliefweb_fields/reliefweb_fields.module
@@ -21,6 +21,10 @@ function reliefweb_fields_entity_type_build(array &$entity_types) {
  * Implements hook_ENTITY_TYPE_update() for nodes.
  */
 function reliefweb_fields_node_update(EntityInterface $entity) {
+  // @todo remove when removing `reliefweb_migrate`.
+  if (!empty($entity->_is_migrating)) {
+    return;
+  }
   ReliefWebLinks::updateFields('update', $entity);
 }
 
@@ -28,6 +32,10 @@ function reliefweb_fields_node_update(EntityInterface $entity) {
  * Implements hook_ENTITY_TYPE_delete() for nodes.
  */
 function reliefweb_fields_node_delete(EntityInterface $entity) {
+  // @todo remove when removing `reliefweb_migrate`.
+  if (!empty($entity->_is_migrating)) {
+    return;
+  }
   ReliefWebLinks::updateFields('delete', $entity);
 }
 
@@ -35,6 +43,10 @@ function reliefweb_fields_node_delete(EntityInterface $entity) {
  * Implements hook_ENTITY_TYPE_update() for users.
  */
 function reliefweb_fields_user_update(EntityInterface $entity) {
+  // @todo remove when removing `reliefweb_migrate`.
+  if (!empty($entity->_is_migrating)) {
+    return;
+  }
   ReliefWebUserPostingRights::updateFields('update', $entity);
 }
 
@@ -42,5 +54,9 @@ function reliefweb_fields_user_update(EntityInterface $entity) {
  * Implements hook_ENTITY_TYPE_delete() for nodes.
  */
 function reliefweb_fields_user_delete(EntityInterface $entity) {
+  // @todo remove when removing `reliefweb_migrate`.
+  if (!empty($entity->_is_migrating)) {
+    return;
+  }
   ReliefWebUserPostingRights::updateFields('delete', $entity);
 }
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_book.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_book.yml
index 6b442752f..fb016ec9d 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_book.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_book.yml
@@ -19,6 +19,10 @@ process:
     -
       plugin: migration_lookup
       migration: reliefweb_book
+  # Flag the entity as being migrated.
+  _is_migrating:
+    plugin: default_value
+    default_value: 1
 migration_dependencies:
   required:
     - reliefweb_node__book
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_image.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_image.yml
index 08bc359ad..3028777bd 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_image.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_image.yml
@@ -36,3 +36,7 @@ process:
   changed: timestamp
   # Store the original URI.
   old_uri: old_uri
+  # Flag the entity as being migrated.
+  _is_migrating:
+    plugin: default_value
+    default_value: 1
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_user.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_user.yml
index 0142d70f7..63f001a38 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_user.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_user.yml
@@ -56,6 +56,10 @@ process:
     -
       plugin: skip_on_empty
       method: process
+  # Flag the entity as being migrated.
+  _is_migrating:
+    plugin: default_value
+    default_value: 1
 migration_dependencies:
   required:
     - reliefweb_user__default
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_user__default.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_user__default.yml
index f9c64b776..516742b68 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_user__default.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_user__default.yml
@@ -65,6 +65,10 @@ process:
     -
       plugin: skip_on_empty
       method: process
+  # Flag the entity as being migrated.
+  _is_migrating:
+    plugin: default_value
+    default_value: 1
 migration_dependencies:
   optional:
     - language
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_media.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_media.yml
index a7173becf..161c8b6cd 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_media.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_media.yml
@@ -40,6 +40,10 @@ shared_configuration:
     field_media_image/target_id: fid
     field_media_image/width: width
     field_media_image/height: height
+    # Flag the entity as being migrated.
+    _is_migrating:
+      plugin: default_value
+      default_value: 1
   migration_dependencies:
     required:
       - reliefweb_image
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_node.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_node.yml
index e9598dd41..7fbf61715 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_node.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_node.yml
@@ -105,6 +105,10 @@ shared_configuration:
     notifications_content_disable:
       plugin: default_value
       default_value: 1
+    # Flag the entity as being migrated.
+    _is_migrating:
+      plugin: default_value
+      default_value: 1
   migration_dependencies:
     required:
       - reliefweb_user
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_node_revision.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_node_revision.yml
index 4059e799c..0667b84e1 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_node_revision.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_node_revision.yml
@@ -94,6 +94,10 @@ shared_configuration:
     notifications_content_disable:
       plugin: default_value
       default_value: 1
+    # Flag the entity as being migrated.
+    _is_migrating:
+      plugin: default_value
+      default_value: 1
 dependencies:
   enforced:
     module:
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_term.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_term.yml
index 6f035169c..fece3cbd7 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_term.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_term.yml
@@ -94,6 +94,10 @@ shared_configuration:
     notifications_content_disable:
       plugin: default_value
       default_value: 1
+    # Flag the entity as being migrated.
+    _is_migrating:
+      plugin: default_value
+      default_value: 1
   migration_dependencies:
     required:
       - reliefweb_user
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_term_revision.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_term_revision.yml
index 11d2f0073..d860fe468 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_term_revision.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_term_revision.yml
@@ -95,6 +95,10 @@ shared_configuration:
     notifications_content_disable:
       plugin: default_value
       default_value: 1
+    # Flag the entity as being migrated.
+    _is_migrating:
+      plugin: default_value
+      default_value: 1
 dependencies:
   enforced:
     module:
diff --git a/html/modules/custom/reliefweb_subscriptions/reliefweb_subscriptions.module b/html/modules/custom/reliefweb_subscriptions/reliefweb_subscriptions.module
index b60535a43..313fad406 100644
--- a/html/modules/custom/reliefweb_subscriptions/reliefweb_subscriptions.module
+++ b/html/modules/custom/reliefweb_subscriptions/reliefweb_subscriptions.module
@@ -417,6 +417,10 @@ function reliefweb_subscriptions_cron() {
  * Queue notifications for the entity.
  */
 function reliefweb_subscriptions_entity_insert(EntityInterface $entity) {
+  // @todo remove when removing `reliefweb_migrate`.
+  if (!empty($entity->_is_migrating)) {
+    return;
+  }
   if (in_array($entity->getEntityTypeId(), ['node', 'taxonomy_term'])) {
     \Drupal::service('reliefweb_subscriptions.mailer')->queueTriggered($entity);
   }
@@ -428,6 +432,10 @@ function reliefweb_subscriptions_entity_insert(EntityInterface $entity) {
  * Queue notifications for the entity.
  */
 function reliefweb_subscriptions_entity_update(EntityInterface $entity) {
+  // @todo remove when removing `reliefweb_migrate`.
+  if (!empty($entity->_is_migrating)) {
+    return;
+  }
   if (in_array($entity->getEntityTypeId(), ['node', 'taxonomy_term'])) {
     \Drupal::service('reliefweb_subscriptions.mailer')->queueTriggered($entity);
   }
@@ -441,6 +449,10 @@ function reliefweb_subscriptions_entity_update(EntityInterface $entity) {
  * Remove queued subscriptions for the entity.
  */
 function reliefweb_subscriptions_entity_delete(EntityInterface $entity) {
+  // @todo remove when removing `reliefweb_migrate`.
+  if (!empty($entity->_is_migrating)) {
+    return;
+  }
   if ($entity->bundle() === 'country') {
     $sid = 'country_updates_' . $entity->id();
     $database = \Drupal::database();

From 51ea710aa8ad7e05bb68436cc07628df7fb84a50 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sat, 4 Dec 2021 10:15:49 +0000
Subject: [PATCH 200/720] [RW-120] Update migration configuration with flag to
 disable some hooks

---
 config/migrate_plus.migration.reliefweb_book.yml           | 7 +++++--
 config/migrate_plus.migration.reliefweb_bookmarks.yml      | 2 +-
 config/migrate_plus.migration.reliefweb_image.yml          | 7 +++++--
 ..._plus.migration.reliefweb_media__image_announcement.yml | 2 +-
 ...efweb_media__image_blog_post__field_attached_images.yml | 2 +-
 ...ation.reliefweb_media__image_blog_post__field_image.yml | 2 +-
 ...reliefweb_media__image_report__field_headline_image.yml | 2 +-
 ...igration.reliefweb_media__image_report__field_image.yml | 2 +-
 ...migrate_plus.migration.reliefweb_media__image_topic.yml | 2 +-
 .../migrate_plus.migration.reliefweb_menu_link__footer.yml | 2 +-
 .../migrate_plus.migration.reliefweb_menu_link__main.yml   | 2 +-
 ...migrate_plus.migration.reliefweb_node__announcement.yml | 2 +-
 .../migrate_plus.migration.reliefweb_node__blog_post.yml   | 2 +-
 config/migrate_plus.migration.reliefweb_node__book.yml     | 2 +-
 config/migrate_plus.migration.reliefweb_node__job.yml      | 2 +-
 config/migrate_plus.migration.reliefweb_node__report.yml   | 2 +-
 config/migrate_plus.migration.reliefweb_node__topic.yml    | 2 +-
 config/migrate_plus.migration.reliefweb_node__training.yml | 2 +-
 ...lus.migration.reliefweb_node_revision__announcement.yml | 2 +-
 ...e_plus.migration.reliefweb_node_revision__blog_post.yml | 2 +-
 ...igrate_plus.migration.reliefweb_node_revision__book.yml | 2 +-
 ...migrate_plus.migration.reliefweb_node_revision__job.yml | 2 +-
 ...rate_plus.migration.reliefweb_node_revision__report.yml | 2 +-
 ...grate_plus.migration.reliefweb_node_revision__topic.yml | 2 +-
 ...te_plus.migration.reliefweb_node_revision__training.yml | 2 +-
 config/migrate_plus.migration.reliefweb_subscriptions.yml  | 2 +-
 config/migrate_plus.migration.reliefweb_taxonomy_term.yml  | 2 +-
 ...ate_plus.migration.reliefweb_taxonomy_term__country.yml | 2 +-
 ...te_plus.migration.reliefweb_taxonomy_term__disaster.yml | 2 +-
 ...rate_plus.migration.reliefweb_taxonomy_term__source.yml | 2 +-
 ...ate_plus.migration.reliefweb_taxonomy_term_revision.yml | 2 +-
 ...migration.reliefweb_taxonomy_term_revision__country.yml | 2 +-
 ...igration.reliefweb_taxonomy_term_revision__disaster.yml | 2 +-
 ....migration.reliefweb_taxonomy_term_revision__source.yml | 2 +-
 config/migrate_plus.migration.reliefweb_url_alias.yml      | 2 +-
 config/migrate_plus.migration.reliefweb_user.yml           | 7 +++++--
 config/migrate_plus.migration.reliefweb_user__default.yml  | 7 +++++--
 config/migrate_plus.migration_group.reliefweb_base.yml     | 2 +-
 config/migrate_plus.migration_group.reliefweb_extra.yml    | 2 +-
 config/migrate_plus.migration_group.reliefweb_image.yml    | 2 +-
 config/migrate_plus.migration_group.reliefweb_media.yml    | 7 +++++--
 config/migrate_plus.migration_group.reliefweb_node.yml     | 7 +++++--
 ...igrate_plus.migration_group.reliefweb_node_revision.yml | 7 +++++--
 config/migrate_plus.migration_group.reliefweb_term.yml     | 7 +++++--
 ...igrate_plus.migration_group.reliefweb_term_revision.yml | 7 +++++--
 45 files changed, 81 insertions(+), 54 deletions(-)

diff --git a/config/migrate_plus.migration.reliefweb_book.yml b/config/migrate_plus.migration.reliefweb_book.yml
index 9d05ffd6f..f46f6fd83 100644
--- a/config/migrate_plus.migration.reliefweb_book.yml
+++ b/config/migrate_plus.migration.reliefweb_book.yml
@@ -1,9 +1,9 @@
-uuid: 71db9865-3e48-4564-9898-8d50dd553fee
+uuid: 1646cd3e-f46d-43bd-b774-7f40e1e23964
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: j5sxLfym_LtC-n8qqM66M_8S1tbpepCLVN1Qial8FY8
+  default_config_hash: 7G6aoPHopmiA75w1-6a7F-CF5QTtZtf-gU2V6XHhND8
 id: reliefweb_book
 class: null
 field_plugin_method: null
@@ -26,6 +26,9 @@ process:
     -
       plugin: migration_lookup
       migration: reliefweb_book
+  _is_migrating:
+    plugin: default_value
+    default_value: 1
 destination:
   plugin: reliefweb_book
 migration_dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_bookmarks.yml b/config/migrate_plus.migration.reliefweb_bookmarks.yml
index 0d6125864..6c58f4625 100644
--- a/config/migrate_plus.migration.reliefweb_bookmarks.yml
+++ b/config/migrate_plus.migration.reliefweb_bookmarks.yml
@@ -1,4 +1,4 @@
-uuid: faa96efa-d630-47e5-9776-211de8246e0d
+uuid: 4094dbbe-bb82-4fff-b801-e1335ddc84a2
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_image.yml b/config/migrate_plus.migration.reliefweb_image.yml
index 70d4a805d..52c16523f 100644
--- a/config/migrate_plus.migration.reliefweb_image.yml
+++ b/config/migrate_plus.migration.reliefweb_image.yml
@@ -1,4 +1,4 @@
-uuid: 34ebac59-b10b-4c16-a7e8-a14c599fad41
+uuid: 3d7f4bff-488f-46fb-b8b4-bf9bc79e8d7c
 langcode: en
 status: true
 dependencies:
@@ -6,7 +6,7 @@ dependencies:
     module:
       - reliefweb_migrate
 _core:
-  default_config_hash: vwnok_YDj5R9SBpchzqoTtruVPXKZop2oXoSmWNE_3M
+  default_config_hash: twvBZjEDiO5BANdmbjQ6BxoLL5VFbllmhVgdCCg1-jQ
 id: reliefweb_image
 class: null
 field_plugin_method: null
@@ -34,6 +34,9 @@ process:
   created: timestamp
   changed: timestamp
   old_uri: old_uri
+  _is_migrating:
+    plugin: default_value
+    default_value: 1
 destination:
   plugin: reliefweb_image
 migration_dependencies: null
diff --git a/config/migrate_plus.migration.reliefweb_media__image_announcement.yml b/config/migrate_plus.migration.reliefweb_media__image_announcement.yml
index 339afcafb..ba22fa6fb 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_announcement.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_announcement.yml
@@ -1,4 +1,4 @@
-uuid: 489aa1ff-5862-4b96-aed7-7704408b56de
+uuid: bdb3efda-43ac-4c3f-9aba-473770f2b931
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_attached_images.yml b/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_attached_images.yml
index d0dd73868..f9c40f160 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_attached_images.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_attached_images.yml
@@ -1,4 +1,4 @@
-uuid: 2b72bb9e-1d59-4fa3-83f4-e185bd5e04a7
+uuid: 874de9ee-66bf-4061-8689-1fee00185364
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_image.yml b/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_image.yml
index ea6e74241..f86dd6f5e 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_image.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_image.yml
@@ -1,4 +1,4 @@
-uuid: 79ec617a-7320-42e3-a444-f1939db31379
+uuid: 90f625db-3f7a-4192-b71c-743d08db840e
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_media__image_report__field_headline_image.yml b/config/migrate_plus.migration.reliefweb_media__image_report__field_headline_image.yml
index d3546777d..4bbc4688e 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_report__field_headline_image.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_report__field_headline_image.yml
@@ -1,4 +1,4 @@
-uuid: d1f036d5-c332-40bb-9cb8-5735e7acb432
+uuid: f50ef71d-b326-4386-9a49-0e9479afa6fc
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_media__image_report__field_image.yml b/config/migrate_plus.migration.reliefweb_media__image_report__field_image.yml
index f8d26d370..63b07e996 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_report__field_image.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_report__field_image.yml
@@ -1,4 +1,4 @@
-uuid: 4d9939da-0ce8-46fc-9857-3db45a217737
+uuid: 5c116de4-7c04-4cdc-8022-bff825a11531
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_media__image_topic.yml b/config/migrate_plus.migration.reliefweb_media__image_topic.yml
index 647a98886..e93b29240 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_topic.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_topic.yml
@@ -1,4 +1,4 @@
-uuid: d532ab6f-33fc-4ec6-be86-28556da2dffa
+uuid: ddbd8ee7-0d99-4e0f-87c6-ba2cd1b0167a
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_menu_link__footer.yml b/config/migrate_plus.migration.reliefweb_menu_link__footer.yml
index 0822e1175..0569f298b 100644
--- a/config/migrate_plus.migration.reliefweb_menu_link__footer.yml
+++ b/config/migrate_plus.migration.reliefweb_menu_link__footer.yml
@@ -1,4 +1,4 @@
-uuid: 76061f94-d164-40b8-8688-31a14b47fca2
+uuid: 1ac4d375-50bc-4cc1-a8c4-17e20a722a32
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_menu_link__main.yml b/config/migrate_plus.migration.reliefweb_menu_link__main.yml
index a5ba06e44..8ee0b17c8 100644
--- a/config/migrate_plus.migration.reliefweb_menu_link__main.yml
+++ b/config/migrate_plus.migration.reliefweb_menu_link__main.yml
@@ -1,4 +1,4 @@
-uuid: 6f6b15bf-3e8d-49af-8272-2e4be83f9e67
+uuid: 4e12188e-2b57-4a0e-8c26-239e6b51f2e1
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_node__announcement.yml b/config/migrate_plus.migration.reliefweb_node__announcement.yml
index 5163a3b92..f862e4969 100644
--- a/config/migrate_plus.migration.reliefweb_node__announcement.yml
+++ b/config/migrate_plus.migration.reliefweb_node__announcement.yml
@@ -1,4 +1,4 @@
-uuid: 016b8ab5-8ee4-4e70-944f-e69dfdda6982
+uuid: 64e2a05f-55bf-437f-b089-ff813dbde7ec
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node__blog_post.yml b/config/migrate_plus.migration.reliefweb_node__blog_post.yml
index 2d3e4934a..3f8836d15 100644
--- a/config/migrate_plus.migration.reliefweb_node__blog_post.yml
+++ b/config/migrate_plus.migration.reliefweb_node__blog_post.yml
@@ -1,4 +1,4 @@
-uuid: 5e264994-ae9c-4274-bcb9-a2098ff65836
+uuid: 2578e934-9f1c-44c8-83be-a3ac0c6c35f1
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node__book.yml b/config/migrate_plus.migration.reliefweb_node__book.yml
index 9e3b25230..35515c681 100644
--- a/config/migrate_plus.migration.reliefweb_node__book.yml
+++ b/config/migrate_plus.migration.reliefweb_node__book.yml
@@ -1,4 +1,4 @@
-uuid: 7da0e0c4-c2c3-4a53-ac10-f07729714f3a
+uuid: b54658f1-01ea-4f3f-9433-e869e7e33452
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node__job.yml b/config/migrate_plus.migration.reliefweb_node__job.yml
index dcbff2cb1..f88a15efa 100644
--- a/config/migrate_plus.migration.reliefweb_node__job.yml
+++ b/config/migrate_plus.migration.reliefweb_node__job.yml
@@ -1,4 +1,4 @@
-uuid: f6cd1c3e-b264-4389-80a1-9e9b1725b1ad
+uuid: d8a3be85-0e17-469c-affa-38b124f1783e
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node__report.yml b/config/migrate_plus.migration.reliefweb_node__report.yml
index 357f7f1bd..2a7f6e824 100644
--- a/config/migrate_plus.migration.reliefweb_node__report.yml
+++ b/config/migrate_plus.migration.reliefweb_node__report.yml
@@ -1,4 +1,4 @@
-uuid: b61cd0ec-3b98-4717-9953-aaaf298c3d7e
+uuid: 1d92446b-fd19-43d5-8cbd-a19851d9bd06
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node__topic.yml b/config/migrate_plus.migration.reliefweb_node__topic.yml
index d138fd7ee..77245323a 100644
--- a/config/migrate_plus.migration.reliefweb_node__topic.yml
+++ b/config/migrate_plus.migration.reliefweb_node__topic.yml
@@ -1,4 +1,4 @@
-uuid: 39978a53-e5b6-463f-b6b0-509f0278d335
+uuid: 12cbb75f-cedb-482d-a6d7-fb668bc32a71
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node__training.yml b/config/migrate_plus.migration.reliefweb_node__training.yml
index 95aaadf7f..c27a2198a 100644
--- a/config/migrate_plus.migration.reliefweb_node__training.yml
+++ b/config/migrate_plus.migration.reliefweb_node__training.yml
@@ -1,4 +1,4 @@
-uuid: 209709cb-bce9-41a5-8ef9-d40f894d7134
+uuid: 252f9efd-d153-4f47-8df7-6a823a6dd8ac
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__announcement.yml b/config/migrate_plus.migration.reliefweb_node_revision__announcement.yml
index 13947b32a..ec444436f 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__announcement.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__announcement.yml
@@ -1,4 +1,4 @@
-uuid: 7ea37354-efee-43a2-820d-8bdc90a31128
+uuid: b89d82da-f439-4b14-aa4f-dfc75ba10033
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__blog_post.yml b/config/migrate_plus.migration.reliefweb_node_revision__blog_post.yml
index de404bf35..c6ae17484 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__blog_post.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__blog_post.yml
@@ -1,4 +1,4 @@
-uuid: 230530fd-7f77-424f-9582-02243d2e578e
+uuid: b300de40-028d-45d5-b20c-7f77700494a1
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__book.yml b/config/migrate_plus.migration.reliefweb_node_revision__book.yml
index c807798ac..65bfb1ce6 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__book.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__book.yml
@@ -1,4 +1,4 @@
-uuid: 6d755fa4-f2fe-40c3-a23e-ddb36cfc2717
+uuid: cecdefc6-16a2-497e-8aa1-34a36b7aaf66
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__job.yml b/config/migrate_plus.migration.reliefweb_node_revision__job.yml
index d3edded2c..d83431b31 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__job.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__job.yml
@@ -1,4 +1,4 @@
-uuid: e8ea6547-3b63-4b0e-b920-acb886fc6702
+uuid: 048e3d6f-cfd6-4c86-b00f-634e761f47d8
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__report.yml b/config/migrate_plus.migration.reliefweb_node_revision__report.yml
index 4564fa8f6..6409ee23e 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__report.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__report.yml
@@ -1,4 +1,4 @@
-uuid: a3634a7f-5275-4e41-a089-d28cd7801951
+uuid: 0ea59b66-e569-4e5d-bbff-75903d18b480
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__topic.yml b/config/migrate_plus.migration.reliefweb_node_revision__topic.yml
index 3b6fdd46b..e53261a67 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__topic.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__topic.yml
@@ -1,4 +1,4 @@
-uuid: 29b16107-d8cb-422e-981b-99937cf95836
+uuid: fcf08fa7-fc1d-49a9-8eae-64c9f39448fe
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__training.yml b/config/migrate_plus.migration.reliefweb_node_revision__training.yml
index 1eb0f1b25..bc22eb681 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__training.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__training.yml
@@ -1,4 +1,4 @@
-uuid: e1a602bf-ec25-4b05-8db1-6250d4eefdbb
+uuid: 10cada7c-aef8-4415-80f1-9dbba6aeecdd
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_subscriptions.yml b/config/migrate_plus.migration.reliefweb_subscriptions.yml
index dfa34b645..5eeaa0e5d 100644
--- a/config/migrate_plus.migration.reliefweb_subscriptions.yml
+++ b/config/migrate_plus.migration.reliefweb_subscriptions.yml
@@ -1,4 +1,4 @@
-uuid: deb8f5b1-6b51-4d7f-9b11-ea3baad1ac22
+uuid: 1b93fdfe-478a-494a-8104-9d9578dfad20
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term.yml
index 7d5083401..d830e56bc 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term.yml
@@ -1,4 +1,4 @@
-uuid: 5e722a4d-c9b1-4f37-95fd-ab5e70e9d080
+uuid: 098a6293-f0fd-42a9-b8cc-fff80c758058
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term__country.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term__country.yml
index fdc7d826b..4edc260cc 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term__country.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term__country.yml
@@ -1,4 +1,4 @@
-uuid: d5aed4b8-5a0b-4c6e-9193-cd1601f68cd9
+uuid: 59f8539a-ba85-4636-bec6-72b86c2124de
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term__disaster.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term__disaster.yml
index 05c2941a3..4fab26199 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term__disaster.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term__disaster.yml
@@ -1,4 +1,4 @@
-uuid: 8bcf6795-c990-4203-9f77-296a5ae1e425
+uuid: d8a24712-b455-480a-b935-458986ba8068
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term__source.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
index 7f19b2458..6f9c273ba 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
@@ -1,4 +1,4 @@
-uuid: fa35fab6-e05f-4456-bfc5-f7d8204867ca
+uuid: e0f70e41-5967-44fa-96f1-0913b7a55860
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision.yml
index fd39da821..31c457dd0 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision.yml
@@ -1,4 +1,4 @@
-uuid: c24092f2-c024-4e88-9198-f18c4751012f
+uuid: 1af6f14e-1788-4dd6-89be-dccf27861fdc
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__country.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__country.yml
index be6ef247a..8f521994c 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__country.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__country.yml
@@ -1,4 +1,4 @@
-uuid: 63724339-0404-4ae4-b351-68fcad92f461
+uuid: 5bcd0285-7dc0-4004-ac8d-d6f3ddfc9c1e
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__disaster.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__disaster.yml
index 2230b1125..8e837ff0e 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__disaster.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__disaster.yml
@@ -1,4 +1,4 @@
-uuid: ffb046dd-1934-4d1c-8ee4-2599e4fd8ea7
+uuid: a918d492-3e58-430c-b022-da6c8c6a5a4c
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
index 69a19e386..017df8742 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
@@ -1,4 +1,4 @@
-uuid: 766f63a5-9637-4d3c-83e0-8eb086c07fcc
+uuid: 6490d4b1-0b1f-4454-81e6-73be2cf07c09
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_url_alias.yml b/config/migrate_plus.migration.reliefweb_url_alias.yml
index 057836280..2155bc5da 100644
--- a/config/migrate_plus.migration.reliefweb_url_alias.yml
+++ b/config/migrate_plus.migration.reliefweb_url_alias.yml
@@ -1,4 +1,4 @@
-uuid: 5e191c17-bff2-4d77-9871-d030c32e43b3
+uuid: de2982fa-3ab6-4b7e-82f1-657457ae3a77
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_user.yml b/config/migrate_plus.migration.reliefweb_user.yml
index c6c70a4ab..3ff7b3a27 100644
--- a/config/migrate_plus.migration.reliefweb_user.yml
+++ b/config/migrate_plus.migration.reliefweb_user.yml
@@ -1,9 +1,9 @@
-uuid: 1b313b14-1c38-47b0-8e37-d90bc2def4c3
+uuid: 926aff0a-4c9e-4938-940c-659f5d26e0e2
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: 5jnsZCBO-J00kSk-6w6JOLq72gUOcjTIfKiKtc7PWIc
+  default_config_hash: rk6D_FRAxYaKHhr232_MMhbhu-P6w8zRyzS8hlUVVIE
 id: reliefweb_user
 class: null
 field_plugin_method: null
@@ -62,6 +62,9 @@ process:
     -
       plugin: skip_on_empty
       method: process
+  _is_migrating:
+    plugin: default_value
+    default_value: 1
 destination:
   plugin: 'entity:user'
 migration_dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_user__default.yml b/config/migrate_plus.migration.reliefweb_user__default.yml
index 1ec56e402..3e766f596 100644
--- a/config/migrate_plus.migration.reliefweb_user__default.yml
+++ b/config/migrate_plus.migration.reliefweb_user__default.yml
@@ -1,9 +1,9 @@
-uuid: 2e5cee67-215e-40d6-9c67-8afd0f63a23d
+uuid: 03005d77-0e66-4896-a5a9-255101da3cd1
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: aFtgeNR343G7qeSNlMn5h_xZ3eh0amZ0CpK9e5VwK4g
+  default_config_hash: pZ7qJ6cbQfCCSZP7EOGTse1bg6aRM2UU0dYmWH3TOgY
 id: reliefweb_user__default
 class: null
 field_plugin_method: null
@@ -68,6 +68,9 @@ process:
     -
       plugin: skip_on_empty
       method: process
+  _is_migrating:
+    plugin: default_value
+    default_value: 1
 destination:
   plugin: 'entity:user'
 migration_dependencies:
diff --git a/config/migrate_plus.migration_group.reliefweb_base.yml b/config/migrate_plus.migration_group.reliefweb_base.yml
index 3a7ca1ce3..e280f7bdc 100644
--- a/config/migrate_plus.migration_group.reliefweb_base.yml
+++ b/config/migrate_plus.migration_group.reliefweb_base.yml
@@ -1,4 +1,4 @@
-uuid: 20ec076f-b4ce-4707-a6df-e0dc6be1bbe1
+uuid: 02f55b0d-2072-47dc-ba18-992a9d088ecf
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration_group.reliefweb_extra.yml b/config/migrate_plus.migration_group.reliefweb_extra.yml
index bd44978ae..d8080ae94 100644
--- a/config/migrate_plus.migration_group.reliefweb_extra.yml
+++ b/config/migrate_plus.migration_group.reliefweb_extra.yml
@@ -1,4 +1,4 @@
-uuid: b17b7be1-b1d3-4f39-a53f-01d954a131f3
+uuid: 14d16946-ace1-42d5-9676-2ea6b5023eed
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration_group.reliefweb_image.yml b/config/migrate_plus.migration_group.reliefweb_image.yml
index 00a59b04d..c497296c2 100644
--- a/config/migrate_plus.migration_group.reliefweb_image.yml
+++ b/config/migrate_plus.migration_group.reliefweb_image.yml
@@ -1,4 +1,4 @@
-uuid: 0076693b-0556-4364-9781-cf34f7804bf2
+uuid: 536ba631-2080-44f0-8d82-de6c0329772e
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration_group.reliefweb_media.yml b/config/migrate_plus.migration_group.reliefweb_media.yml
index 9f26959a7..dca844fbf 100644
--- a/config/migrate_plus.migration_group.reliefweb_media.yml
+++ b/config/migrate_plus.migration_group.reliefweb_media.yml
@@ -1,4 +1,4 @@
-uuid: 1ef07031-1f8b-4362-956e-b925826e5a27
+uuid: 72c0270d-548c-488d-8720-83e5423ae7ee
 langcode: en
 status: true
 dependencies:
@@ -6,7 +6,7 @@ dependencies:
     module:
       - reliefweb_migrate
 _core:
-  default_config_hash: q7Lr9SKi4uTlAtGiwlQs7RILSocVlK4D-wKfN4V6sPQ
+  default_config_hash: L6_sg27m91gBcxKOGkqOiwdIyFPLTojsv65mEGO7k_E
 id: reliefweb_media
 label: 'ReliefWeb Migration - Media'
 description: 'Migrate ReliefWeb media from Drupal 7 to Drupal 9.'
@@ -40,6 +40,9 @@ shared_configuration:
     field_media_image/target_id: fid
     field_media_image/width: width
     field_media_image/height: height
+    _is_migrating:
+      plugin: default_value
+      default_value: 1
   migration_dependencies:
     required:
       - reliefweb_image
diff --git a/config/migrate_plus.migration_group.reliefweb_node.yml b/config/migrate_plus.migration_group.reliefweb_node.yml
index 28a9789b8..8d0ef8e0b 100644
--- a/config/migrate_plus.migration_group.reliefweb_node.yml
+++ b/config/migrate_plus.migration_group.reliefweb_node.yml
@@ -1,4 +1,4 @@
-uuid: 10d45c3d-f46e-4fb9-9c51-42d491c09568
+uuid: 349a350e-3b52-4bae-9017-ae0457963267
 langcode: en
 status: true
 dependencies:
@@ -6,7 +6,7 @@ dependencies:
     module:
       - reliefweb_migrate
 _core:
-  default_config_hash: vOF0IpmCact_JnxvJP_245wKdlaKS4Ft87fmzqSPPKs
+  default_config_hash: t-QfEMMoEpg5sxIwXCODzkJWRIdu_QEhE2KSMAFgcWM
 id: reliefweb_node
 label: 'ReliefWeb Migration - Nodes'
 description: 'Migrate ReliefWeb nodes from Drupal 7 to Drupal 9.'
@@ -101,6 +101,9 @@ shared_configuration:
     notifications_content_disable:
       plugin: default_value
       default_value: 1
+    _is_migrating:
+      plugin: default_value
+      default_value: 1
   migration_dependencies:
     required:
       - reliefweb_user
diff --git a/config/migrate_plus.migration_group.reliefweb_node_revision.yml b/config/migrate_plus.migration_group.reliefweb_node_revision.yml
index 03160d461..0efd5030c 100644
--- a/config/migrate_plus.migration_group.reliefweb_node_revision.yml
+++ b/config/migrate_plus.migration_group.reliefweb_node_revision.yml
@@ -1,4 +1,4 @@
-uuid: c88a86b7-37ec-405b-bc36-7bcb0156dace
+uuid: 875c6b64-5775-4c4e-8a32-0ad217700cd8
 langcode: en
 status: true
 dependencies:
@@ -6,7 +6,7 @@ dependencies:
     module:
       - reliefweb_migrate
 _core:
-  default_config_hash: mYGSM6bDYqInTJ1lUHkQlaylpeLfM2Wq1KkQZD2Z2Qw
+  default_config_hash: IwIiajH_CASgynt3y6aKz3SU5V9u3lewcFnYmx4Holc
 id: reliefweb_node_revision
 label: 'ReliefWeb Migration - Node revisions'
 description: 'Migrate ReliefWeb node revisions from Drupal 7 to Drupal 9.'
@@ -90,3 +90,6 @@ shared_configuration:
     notifications_content_disable:
       plugin: default_value
       default_value: 1
+    _is_migrating:
+      plugin: default_value
+      default_value: 1
diff --git a/config/migrate_plus.migration_group.reliefweb_term.yml b/config/migrate_plus.migration_group.reliefweb_term.yml
index 582f5c6c1..2b10b02f1 100644
--- a/config/migrate_plus.migration_group.reliefweb_term.yml
+++ b/config/migrate_plus.migration_group.reliefweb_term.yml
@@ -1,4 +1,4 @@
-uuid: ea2434e4-dbf2-4f53-bcaf-da4cc391ac27
+uuid: 6c99bc54-fbd5-48f4-a760-b4513c6dfae6
 langcode: en
 status: true
 dependencies:
@@ -6,7 +6,7 @@ dependencies:
     module:
       - reliefweb_migrate
 _core:
-  default_config_hash: WIBKXl-kxgaIkIX_T_Jq7CEuYCIK6bGOncGk0DoJC-M
+  default_config_hash: wZ1IaGKvr9y87bD8zGnu6Tr2fvpHu7VF2IDZnp7BJA8
 id: reliefweb_term
 label: 'ReliefWeb Migration - Terms'
 description: 'Migrate ReliefWeb terms from Drupal 7 to Drupal 9.'
@@ -99,6 +99,9 @@ shared_configuration:
     notifications_content_disable:
       plugin: default_value
       default_value: 1
+    _is_migrating:
+      plugin: default_value
+      default_value: 1
   migration_dependencies:
     required:
       - reliefweb_user
diff --git a/config/migrate_plus.migration_group.reliefweb_term_revision.yml b/config/migrate_plus.migration_group.reliefweb_term_revision.yml
index 2d36845f0..d11a708ff 100644
--- a/config/migrate_plus.migration_group.reliefweb_term_revision.yml
+++ b/config/migrate_plus.migration_group.reliefweb_term_revision.yml
@@ -1,4 +1,4 @@
-uuid: 057f4246-bbcc-4dc7-b49b-92dde0c790a9
+uuid: a0fe1416-f8b8-4a80-901a-c05e98db44d0
 langcode: en
 status: true
 dependencies:
@@ -6,7 +6,7 @@ dependencies:
     module:
       - reliefweb_migrate
 _core:
-  default_config_hash: 8RS6DLKJJ1Y28tCOFuwPACyq5oD1qILjUJ81BvNOSZo
+  default_config_hash: U0W5uKe8dAmeukdwCwGA-8GQN-Ki4rbq6tRGEAWHqeI
 id: reliefweb_term_revision
 label: 'ReliefWeb Migration - Term revisions'
 description: 'Migrate ReliefWeb term revisions from Drupal 7 to Drupal 9.'
@@ -100,3 +100,6 @@ shared_configuration:
     notifications_content_disable:
       plugin: default_value
       default_value: 1
+    _is_migrating:
+      plugin: default_value
+      default_value: 1

From ced75e0969bc5958c65cb3ebfabecbba07dd76e9 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sat, 4 Dec 2021 10:56:33 +0000
Subject: [PATCH 201/720] [RW-25] Add helper to get file and document uuids
 from legacy urls

---
 .../src/Helpers/LegacyHelper.php              | 107 ++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100644 html/modules/custom/reliefweb_utility/src/Helpers/LegacyHelper.php

diff --git a/html/modules/custom/reliefweb_utility/src/Helpers/LegacyHelper.php b/html/modules/custom/reliefweb_utility/src/Helpers/LegacyHelper.php
new file mode 100644
index 000000000..b76a2108b
--- /dev/null
+++ b/html/modules/custom/reliefweb_utility/src/Helpers/LegacyHelper.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace Drupal\reliefweb_utility\Helpers;
+
+use Symfony\Component\Uid\Uuid;
+
+/**
+ * Helper class for the migration of files.
+ */
+class LegacyHelper {
+
+  /**
+   * Generate an attachment's UUID from it's old URI on reliefwen.int.
+   *
+   * @param string $uri
+   *   File URI (ex: public://resources/my.pdf).
+   *
+   * @return string
+   *   The attachment UUID.
+   */
+  public static function generateAttachmentUuid($uri) {
+    // Replace the public scheme with the actual reliefweb.int base public file
+    // URI so that it's unique.
+    $uuid_uri = str_replace('public://', 'https://reliefweb.int/sites/reliefweb.int/files/', $uri);
+
+    // Generate the UUID based on the URI.
+    return Uuid::v3(Uuid::fromString(Uuid::NAMESPACE_URL), $uuid_uri)->toRfc4122();
+  }
+
+  /**
+   * Generate a UUID from the attachment UUID and the file ID.
+   *
+   * @param string $uuid
+   *   The attachment UUID.
+   * @param string $fid
+   *   The file ID.
+   */
+  public static function generateAttachmentFileUuid($uuid, $fid) {
+    return Uuid::v3(Uuid::fromString($uuid), $fid)->toRfc4122();
+  }
+
+  /**
+   * Generate a UUID from the attachment UUID and the file UUID.
+   *
+   * @param string $uuid
+   *   The attachment UUID.
+   * @param string $file_uuid
+   *   The file UUID.
+   */
+  public static function generateAttachmentPreviewUuid($uuid, $file_uuid) {
+    return Uuid::v3(Uuid::fromString($uuid), $file_uuid)->toRfc4122();
+  }
+
+  /**
+   * Generate the UUID of a document resource from a node id.
+   *
+   * @param int $nid
+   *   Node ID.
+   *
+   * @return string
+   *   Document UUID.
+   */
+  public static function generateDocumentUuid($nid) {
+    // Permanent URI for the node. This will be used to create a document
+    // resource in the docstore with the same UUID.
+    $uuid_uri = 'https://reliefweb.int/node/' . $nid;
+
+    // Generate the UUID based on the URI.
+    return Uuid::v3(Uuid::fromString(Uuid::NAMESPACE_URL), $uuid_uri)->toRfc4122();
+  }
+
+  /**
+   * Get a file legacy URL from it's legacy URI.
+   *
+   * @param string $uri
+   *   File URI.
+   *
+   * @return string
+   *   File URL.
+   */
+  public static function getFileLegacyUrl($uri) {
+    $filename = UrlHelper::encodePath(basename($uri));
+    return 'https://reliefweb.int/sites/reliefweb.int/files/resources/' . $filename;
+  }
+
+  /**
+   * Generate an attachment's UUID from it's old URL on reliefweb.int.
+   *
+   * @param string $url
+   *   File URL.
+   *
+   * @return string
+   *   The attachment UUID.
+   */
+  public static function generateAttachmentUuidFromLegacyUrl($url) {
+    $pattern = '#^https?://([^/]+)/sites/(reliefweb\.int|default)/files/resources/(?<filename>.+)$#';
+
+    // Convert to its URI.
+    $uri = preg_replace_callback($pattern, function ($matches) {
+      return 'public://resources/' . rawurldecode($matches['filename']);
+    }, $url);
+
+    // Generate the UUID based on the URI.
+    return static::generateAttachmentUuid($uri);
+  }
+
+}

From 209c3474f571d54027411d7899e5c7147ab240c2 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sat, 4 Dec 2021 10:57:25 +0000
Subject: [PATCH 202/720] [RW-25] Add guzzle response wrapper to ease working
 with results from APIs

---
 .../src/Response/JsonResponse.php             | 217 ++++++++++++++++++
 1 file changed, 217 insertions(+)
 create mode 100644 html/modules/custom/reliefweb_utility/src/Response/JsonResponse.php

diff --git a/html/modules/custom/reliefweb_utility/src/Response/JsonResponse.php b/html/modules/custom/reliefweb_utility/src/Response/JsonResponse.php
new file mode 100644
index 000000000..3efc9fa33
--- /dev/null
+++ b/html/modules/custom/reliefweb_utility/src/Response/JsonResponse.php
@@ -0,0 +1,217 @@
+<?php
+
+namespace Drupal\reliefweb_utility\Response;
+
+use GuzzleHttp\Psr7\Response;
+
+/**
+ * Wrapper for a response that is supposed to return JSON encoded data.
+ */
+class JsonResponse {
+
+  /**
+   * Wrapped response.
+   *
+   * @var \Psr\Http\Message\ResponseInterface
+   */
+  protected $response;
+
+  /**
+   * Response status code.
+   *
+   * @var int
+   */
+  protected $statusCode = 0;
+
+  /**
+   * Construct the response from the guzzle response.
+   *
+   * @param ?\GuzzleHttp\Psr7\Response $response
+   *   Guzzle response.
+   */
+  public function __construct(?Response $response) {
+    $this->response = $response;
+    if (!empty($response)) {
+      $this->statusCode = $response->getStatusCode();
+    }
+  }
+
+  /**
+   * Get the response content.
+   *
+   * If the response's content is JSON encoded, this returns the decoded version
+   * if instructed so.
+   *
+   * @param bool $decode
+   *   TRUE to try to decode the response's content if it's JSON encoded.
+   *
+   * @return mixed
+   *   Response content or NULL if it couldn't be decoded or the response is
+   *   not sucessful.
+   */
+  public function getContent($decode = TRUE) {
+    $content = NULL;
+    if ($this->isSuccessful() && !empty($this->response->getBody())) {
+      $content = (string) $this->response->getBody();
+      if ($this->getContentType() === 'application/json' && $decode) {
+        $content = json_decode($content, TRUE);
+      }
+    }
+    return $content;
+  }
+
+  /**
+   * Get the original response's body.
+   *
+   * @return \Psr\Http\Message\StreamInterface|null
+   *   The origin response's body.
+   */
+  public function getBody() {
+    return !empty($this->response) ? $this->response->getBody() : NULL;
+  }
+
+  /**
+   * Get the original response's headers.
+   *
+   * @return array
+   *   The origin response's headers.
+   */
+  public function getHeaders() {
+    return !empty($this->response) ? $this->response->getHeaders() : NULL;
+  }
+
+  /**
+   * Return the type of the response's content.
+   *
+   * @return string
+   *   Content type as indicated in the Content-Type header or empty string if
+   *   the header was not found or empty.
+   */
+  public function getContentType() {
+    if (!empty($this->response)) {
+      return $this->response->getHeaderLine('Content-Type');
+    }
+    return '';
+  }
+
+  /**
+   * Get the status code.
+   *
+   * @return int
+   *   Response status code.
+   */
+  public function getStatusCode() {
+    return $this->statusCode;
+  }
+
+  /**
+   * Get the status code.
+   *
+   * @return string
+   *   The reason phrase accompanying the response status code.
+   */
+  public function getReasonPhrase() {
+    return !empty($this->response) ? $this->response->getReasonPhrase() : 'Invalid response';
+  }
+
+  /**
+   * Is response invalid?
+   *
+   * @return bool
+   *   TRUE if invalid.
+   */
+  public function isInvalid() {
+    return $this->statusCode < 100 || $this->statusCode >= 600;
+  }
+
+  /**
+   * Is response informational?
+   *
+   * @return bool
+   *   TRUE if invalid.
+   */
+  public function isInformational() {
+    return $this->statusCode >= 100 && $this->statusCode < 200;
+  }
+
+  /**
+   * Is response successful?
+   *
+   * @return bool
+   *   TRUE if successful.
+   */
+  public function isSuccessful() {
+    return $this->statusCode >= 200 && $this->statusCode < 300;
+  }
+
+  /**
+   * Is the response a redirection?
+   *
+   * @return bool
+   *   TRUE if the response is a redirection.
+   */
+  public function isRedirection() {
+    return $this->statusCode >= 300 && $this->statusCode < 400;
+  }
+
+  /**
+   * Is there a client error?
+   *
+   * @return bool
+   *   TRUE if the response is a client error.
+   */
+  public function isClientError() {
+    return $this->statusCode >= 400 && $this->statusCode < 500;
+  }
+
+  /**
+   * Was there a server side error?
+   *
+   * @return bool
+   *   TRUE if the response is a server error.
+   */
+  public function isServerError() {
+    return $this->statusCode >= 500 && $this->statusCode < 600;
+  }
+
+  /**
+   * Is the response OK?
+   *
+   * @return bool
+   *   TRUE if the response is OK.
+   */
+  public function isOk() {
+    return 200 === $this->statusCode;
+  }
+
+  /**
+   * Is the response a forbidden error?
+   *
+   * @return bool
+   *   TRUE if the response is a forbidden error.
+   */
+  public function isForbidden() {
+    return 403 === $this->statusCode;
+  }
+
+  /**
+   * Is the response a not found error?
+   *
+   * @return bool
+   *   TRUE if the response is not found error.
+   */
+  public function isNotFound() {
+    return 404 === $this->statusCode;
+  }
+
+  /**
+   * Return the original response.
+   *
+   * @return \GuzzleHttp\Psr7\Response
+   *   Original response.
+   */
+  public function getOriginalResponse() {
+    return $this->response;
+  }
+
+}

From d0df2abbb0c29659f982f94d98931c7e8b086f40 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sat, 4 Dec 2021 11:03:47 +0000
Subject: [PATCH 203/720] [RW-25] Fix attachment styling

---
 html/modules/custom/reliefweb_entities/src/Entity/Report.php  | 4 ++--
 .../reliefweb-file-list--interactive.html.twig                | 3 +++
 .../reliefweb_docstore/reliefweb-file-list.html.twig          | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_docstore/reliefweb-file-list--interactive.html.twig
 create mode 100644 html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_docstore/reliefweb-file-list.html.twig

diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Report.php b/html/modules/custom/reliefweb_entities/src/Entity/Report.php
index 51715b3cf..8af079b0e 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Report.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Report.php
@@ -158,7 +158,7 @@ public function getAttachments() {
     // The report is a map or an infographic.
     elseif (isset($formats[12]) || isset($formats[12570])) {
       $label = isset($formats[12]) ? $this->t('Download Map') : $this->t('Download Infographic');
-      $build['#attributes']['class'][] = 'rw-file-list--map';
+      $build['#attributes']['class'][] = 'rw-attachment--map';
       foreach ($build['#list'] as &$item) {
         if (isset($item['preview'])) {
           $item['preview']['#style_name'] = 'large';
@@ -168,7 +168,7 @@ public function getAttachments() {
     }
     else {
       $label = $this->t('Download Report');
-      $build['#attributes']['class'][] = 'rw-file-list--report';
+      $build['#attributes']['class'][] = 'rw-attachment--report';
       foreach ($build['#list'] as &$item) {
         $item['label'] = $label;
       }
diff --git a/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_docstore/reliefweb-file-list--interactive.html.twig b/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_docstore/reliefweb-file-list--interactive.html.twig
new file mode 100644
index 000000000..f5f9da9b7
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_docstore/reliefweb-file-list--interactive.html.twig
@@ -0,0 +1,3 @@
+{% set attributes = attributes.addClass('rw-attachment', 'rw-attachment--interactive') %}
+
+{% include '@reliefweb_docstore/reliefweb-file-list--interactive.html.twig' %}
diff --git a/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_docstore/reliefweb-file-list.html.twig b/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_docstore/reliefweb-file-list.html.twig
new file mode 100644
index 000000000..10d81895c
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_docstore/reliefweb-file-list.html.twig
@@ -0,0 +1,3 @@
+{% set attributes = attributes.addClass('rw-attachment') %}
+
+{% include '@reliefweb_docstore/reliefweb-file-list.html.twig' %}

From 4835b386beceb110272ebf47290dcf53705be2d4 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sat, 4 Dec 2021 11:06:56 +0000
Subject: [PATCH 204/720] [RW-25] Fix handling of deletion and handling of
 remote files

---
 .../reliefweb_docstore.module                 |  27 ++
 .../src/Controller/FileDownloadController.php |   4 +-
 .../Plugin/Field/FieldType/ReliefWebFile.php  |  60 ++--
 .../Field/FieldType/ReliefWebFileList.php     | 291 +++++++++++++++++-
 .../src/Services/DocstoreClient.php           | 285 ++++++++++++-----
 5 files changed, 552 insertions(+), 115 deletions(-)

diff --git a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
index d063d8920..817ab3463 100644
--- a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
+++ b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
@@ -5,7 +5,9 @@
  * ReliefWeb Docstore module file.
  */
 
+use Drupal\Core\Entity\EntityInterface;
 use Drupal\file\Entity\File;
+use Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFileList;
 
 /**
  * Implements hook_theme().
@@ -176,3 +178,28 @@ function reliefweb_docstore_reliefweb_utility_file_update_alter(File $file, &$ap
   // Do not apply the file URI transformation for files managed by this module.
   $apply = $apply && preg_match($pattern, $file->getFileUri()) !== 1;
 }
+
+/**
+ * Implements hook_entity_revision_delete().
+ */
+function reliefweb_docstore_entity_revision_delete(EntityInterface $entity) {
+  // @todo remove when removing `reliefweb_migrate`.
+  if (!empty($entity->_is_migrating)) {
+    return;
+  }
+  // Drupal doesn't invoke any postRevisionDelete on the field items so this is
+  // the only way to perform post revision deletion tasks.
+  //
+  // Check if the entity has any reliefweb_file field, in which case we
+  // invoke ::updateRemoteDocumentFileReferences() to update remote file
+  // references in the remote document resource associated with the resource.
+  foreach ($entity as $field) {
+    if ($field instanceof ReliefWebFileList) {
+      $field->updateRemoteDocumentFileReferences();
+      // No need to continue as calling the above method on one of the
+      // reliefweb_file field of the entity is enough to update the remote
+      // file references.
+      break;
+    }
+  }
+}
diff --git a/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php b/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php
index 22dfe7783..02e213c07 100644
--- a/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php
+++ b/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php
@@ -313,7 +313,7 @@ protected function downloadRemoteFile($uuid, $filename) {
     }
 
     // Stream the response content.
-    if ($client->isResponseSuccessful($response)) {
+    if ($response->isSuccessful()) {
       return new StreamedResponse(function () use ($response) {
         $input = StreamWrapper::getResource($response->getBody());
         $output = fopen('php://output', 'wb');
@@ -322,7 +322,7 @@ protected function downloadRemoteFile($uuid, $filename) {
     }
     // If the response was not successful nor a 404, throw an exception with the
     // status code and reason so we can log it.
-    elseif ($response->getStatusCode() !== 404) {
+    elseif (!$response->isNotFound()) {
       throw new \Exception($response->getStatusCode(), $response->getReasonPhrase());
     }
 
diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
index be5c9901c..5d77abd1e 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
@@ -382,7 +382,8 @@ public static function schema(FieldStorageDefinitionInterface $field_definition)
         // @todo change to int(10) unsigned.
         'revision_id' => [
           'type' => 'int',
-          'size' => 'medium',
+          'size' => '10',
+          'unsigned' => TRUE,
           'not null' => TRUE,
         ],
         'file_uuid' => [
@@ -822,10 +823,13 @@ public function getFileUrl() {
   /**
    * Create a managed file for the preview.
    *
+   * @param string $new_uuid
+   *   Whether to create a new UUID or re-use the existing one if any.
+   *
    * @return \Drupal\file\Entity\File
    *   Managed file.
    */
-  protected function createPreviewFile() {
+  protected function createPreviewFile($new_uuid = TRUE) {
     if ($this->isEmpty()) {
       return NULL;
     }
@@ -837,7 +841,10 @@ protected function createPreviewFile() {
 
     // Generate a UUID for the preview. We'll store it in this field item only
     // if the preview generation worked.
-    $preview_uuid = $this->generateUuid();
+    $preview_uuid = $this->getPreviewUuid();
+    if ($new_uuid || empty($preview_uuid)) {
+      $preview_uuid = $this->generateUuid();
+    }
 
     // Generate the preview URI as private initially. We'll move it to public
     // if the docstore file is made public.
@@ -1327,7 +1334,7 @@ public function delete() {
     $this->updateFileStatus(TRUE);
 
     // Try to delete the remote file. If it's used by another provider, then
-    // the request will fail.
+    // the request will fail but that's the expected behavior.
     if (!$this->storeLocally() && !empty($uuid)) {
       $this->getDocstoreClient()->deleteFile($uuid);
     }
@@ -1345,7 +1352,7 @@ public function deleteRevision() {
     $revision_id = $this->getRevisionId();
 
     // Try to delete the remote revision. If it's used by another provider, then
-    // the request will fail.
+    // the request will fail but that's the expected behavior.
     if (!$this->storeLocally() && !empty($uuid) && !empty($revision_id)) {
       $this->getDocstoreClient()->deleteFileRevision($uuid, $revision_id);
     }
@@ -1426,6 +1433,7 @@ public function preSave(?ReliefWebFile $original_item = NULL) {
     }
     // @todo log the error and see what to tell the user.
     catch (\Exception $exception) {
+      // @todo inject the messenger service to display the message.
       throw $exception;
     }
   }
@@ -1442,6 +1450,7 @@ public function postSave($updated) {
     }
 
     // Mark the file revision as active for us.
+    // @todo do something if that fails?
     if (!$this->storeLocally()) {
       $this->getDocstoreClient()->selectFileRevision($this->getUuid(), $this->getRevisionId());
     }
@@ -1478,7 +1487,7 @@ protected function updateRemoteFile() {
     $file = $this->loadFile();
     // @todo better error message.
     if (empty($file)) {
-      throw \Exception('Unable to load the local file.');
+      throw new \Exception('Unable to load the local file.');
     }
 
     $client = $this->getDocstoreClient();
@@ -1488,21 +1497,24 @@ protected function updateRemoteFile() {
     // If that's the case, then we don't have anything special to do.
     $revision_id = $this->getRevisionId();
     if (!empty($revision_id)) {
-      $result = $client->getFileRevision($uuid, $revision_id);
+      $response = $client->getFileRevision($uuid, $revision_id);
 
-      // We cannot revert if the file doesn't exist in the docstore anymore.
-      if (empty($result)) {
-        throw \Exception('The remote file revision doesn\'t exist anymore.');
+      // We cannot revert if the file doesn't exist in the docstore anymore or
+      // something went wrong like denied access.
+      if (!$response->isSuccessful()) {
+        throw new \Exception('The remote file revision doesn\'t exist anymore.');
       }
     }
     // Check if the remote file exists and create one if it doesn't then
     // update its content.
     else {
       // Check if the remote file exists.
-      $result = $client->getFile($uuid);
-      if (empty($result)) {
+      $response = $client->getFile($uuid);
+
+      // Create it if necessary.
+      if ($response->isNotFound()) {
         // Create the file resource in the docstore.
-        $result = $client->createFile([
+        $response = $client->createFile([
           'uuid' => $uuid,
           'filename' => $this->getFileName(),
           'mimetype' => $this->getFileMime(),
@@ -1511,21 +1523,29 @@ protected function updateRemoteFile() {
           'private' => TRUE,
         ]);
 
-        if (empty($result)) {
-          throw \Exception('Unable to create remote file resource');
+        if (!$response->isSuccessful()) {
+          throw new \Exception('Unable to create remote file resource');
         }
       }
+      // Abort if the file couldn't be retrieved as we cannot update it.
+      elseif (!$response->isSuccessful()) {
+        throw new \Exception('Unable to retrieve remote file resource');
+      }
 
       // Upload the file content.
-      $result = $client->updateFileContentFromFilePath($uuid, $file->getFileUri());
-
-      // @todo better error message.
-      if (!isset($result['revision_id'])) {
+      $response = $client->updateFileContentFromFilePath($uuid, $file->getFileUri());
+      if (!$response->isSuccessful()) {
         throw new \Exception('Unable to update remote file content');
       }
 
+      // Get the new file revision id.
+      $content = $response->getContent();
+      if (empty($content) || !isset($content['revision_id'])) {
+        throw new \Exception('Invalid revison id after updating file content');
+      }
+
       // Store the new revision returned by the docstore.
-      $this->get('revision_id')->setValue($result['revision_id']);
+      $this->get('revision_id')->setValue($content['revision_id']);
     }
 
     // Delete the local file if any.
diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php
index 9a963e843..adf1c5668 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php
@@ -37,6 +37,40 @@ class ReliefWebFileList extends FieldItemList {
    * {@inheritdoc}
    */
   public function preSave() {
+    // Files migration is handled separately.
+    // @todo remove when removing `reliefweb_migrate`.
+    if (!empty($entity->_is_migrating)) {
+      // Create the field item and preview files with the permanent public URIs.
+      foreach ($this->list as $item) {
+        $file = $item->createFile();
+        if (empty($file)) {
+          continue;
+        }
+        $file->setFileUri($item->getPermanentUri(FALSE, FALSE));
+        $file->setPermanent();
+        $file->save();
+        $item->get('file_uuid')->setValue($file->uuid());
+
+        if (!$item->canHavePreview() || empty($this->getPreviewPage())) {
+          continue;
+        }
+        $preview_file = $this->createPreviewFile(FALSE);
+        if (emtpy($preview_file)) {
+          continue;
+        }
+        $preview_file->setFileUri($item->getPermanentUri(FALSE, TRUE));
+        $preview_file->setPermanent();
+        $preview_file->save();
+        $item->get('preview_uuid')->setValue($preview_file->uuid());
+      }
+      return;
+    }
+
+    // Remove references to any files from the remote document associated with
+    // the entity this field is attached to so that we can perform update and
+    // deletion of the remote file resources.
+    $this->deleteRemoteDocumentFileReferences();
+
     // Filter out empty items.
     $this->filterEmptyItems();
 
@@ -84,26 +118,59 @@ public function preSave() {
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function postSave($updated) {
+    // Files migration is handled separately.
+    // @todo remove when removing `reliefweb_migrate`.
+    if (!empty($entity->_is_migrating)) {
+      return;
+    }
+    parent::postSave($updated);
+
+    // Update the references to the remote file resources in the remote document
+    // associated with the entity this field is attached.
+    $this->updateRemoteDocumentFileReferences();
+  }
+
   /**
    * {@inheritdoc}
    */
   public function delete() {
     $entity = $this->getEntity();
+
+    // Remove references to any files from the remote document associated with
+    // the entity this field is attached to so that we can perform update and
+    // deletion of the remote file resources.
+    //
+    // If we are deleting a translation, we'll update the document with the
+    // references to the files from the other translations.
+    //
+    // Otherwise, we delete the document directly.
+    if (!$entity->isDefaultTranslation()) {
+      $this->deleteRemoteDocumentFileReferences();
+    }
+    else {
+      $this->getDocstoreClient()->deleteDocument($entity->uuid());
+    }
+
     $entity_type_id = $entity->getEntityTypeId();
     $field_name = $this->definition->getName();
 
     $table = $this->getFieldRevisionTableName($entity_type_id, $field_name);
-    $fields = [
-      $this->getFieldColumnName($entity_type_id, $field_name, 'uuid') => 'uuid',
-      $this->getFieldColumnName($entity_type_id, $field_name, 'file_uuid') => 'file_uid',
-      $this->getFieldColumnName($entity_type_id, $field_name, 'preview_uuid') => 'preview_uuid',
-    ];
 
+    // Query the field revision table to retrieve all the file entity UUIds
+    // (file and preview) and the file resource UUIDs.
     $query = $this->getDatabase()
       ->select($table, $table)
-      ->fields($table, $fields)
       ->condition($table . '.entity_id', $entity->id(), '=');
 
+    foreach (['uuid', 'file_uuid', 'preview_uuid'] as $field) {
+      $column = $this->getFieldColumnName($entity_type_id, $field_name, $field);
+      $query->addField($table, $column, $field);
+    }
+
     // If we are deleting a translation, limit to the translation language.
     if (!$entity->isDefaultTranslation()) {
       $query->condition($table . '.langcode', $this->getLangcode());
@@ -112,6 +179,9 @@ public function delete() {
     // Retrieve the item and file UUIDs from the field revisions.
     $records = $query->distinct()->execute();
 
+    // Store the resource UUIDs and the file UUIDs so we can first
+    // delete the remote resource (if stored remotelly) then delete the
+    // file entities.
     $uuids = [];
     $file_uuids = [];
     if (!empty($records)) {
@@ -128,18 +198,20 @@ public function delete() {
       }
     }
 
-    // Delete the remote files.
-    if ($this->getDocstoreConfig()->get('local') === TRUE && !empty($uuids)) {
+    // Delete all the remote files.
+    if (!$this->storeLocally() && !empty($uuids)) {
+      $client = $this->getDocstoreClient();
       foreach ($uuids as $uuid) {
-        $this->getDocstoreClient()->deleteFile($uuid);
+        $client->deleteFile($uuid);
       }
     }
 
-    // Load the field item and preview files.
-    $files = $this->getEntityTypeStorage($entity_type_id)
+    // We load the file entities for the field item and preview files.
+    /** @var \Drupal\file\Entity\File[] $files */
+    $files = $this->getEntityTypeStorage('file')
       ->loadByProperties(['uuid' => $file_uuids]);
 
-    // Delete the files.
+    // Delete the file entities and the file on disk if any.
     foreach ($files as $file) {
       $uri = $file->getFileUri();
       if (!empty($uri) && file_exists($uri)) {
@@ -147,12 +219,88 @@ public function delete() {
       }
       $file->delete();
     }
+
+    // If we just deleted a translation, we need to update the file references
+    // for the remaining translations.
+    if (!$entity->isDefaultTranslation()) {
+      $this->updateRemoteDocumentFileReferences();
+    }
   }
 
   /**
    * {@inheritdoc}
    */
   public function deleteRevision() {
+    // Remove references to any files from the remote document associated with
+    // the entity this field is attached to so that we can perform update and
+    // deletion of the remote file resources.
+    //
+    // The references will be updated after all the calls to ::deleteRevision(),
+    // in reliefweb_docstore_entity_revision_delete().
+    $this->deleteRemoteDocumentFileReferences();
+
+    // First remove all the files that are not used anymore, then remove
+    // the revision of the files thare are still referenced.
+    $this->deleteUnusedFiles();
+    $this->deleteUnusedFileRevisions();
+  }
+
+  /**
+   * Delete the files associated with the revision to be deleted.
+   *
+   * This will completely delete field item files that are not referenced in
+   * other revisions.
+   */
+  protected function deleteUnusedFiles() {
+    $entity = $this->getEntity();
+    $entity_type_id = $entity->getEntityTypeId();
+    $revision_id = $entity->getRevisionId();
+    $field_name = $this->definition->getName();
+
+    // Map of the field items keyed by file resource UUID.
+    $items = [];
+    foreach ($this->list as $item) {
+      $uuid = $item->getUuid();
+      if (!empty($uuid)) {
+        $items[$uuid] = $item;
+      }
+    }
+
+    $table = $this->getFieldRevisionTableName($entity_type_id, $field_name);
+    $field = $this->getFieldColumnName($entity_type_id, $field_name, 'uuid');
+
+    // Get the other revision records that have the same UUIDs than the
+    // current revision to be deleted.
+    $records = $this->getDatabase()
+      ->select($table, $table)
+      ->fields($table, [$field])
+      ->condition($table . '.entity_id', $entity->id(), '=')
+      ->condition($table . '.revision_id', $revision_id, '<>')
+      ->condition($table . '.' . $field, array_keys($items), 'IN')
+      ->execute();
+
+    // Filter the items for which there are other revisions using the same UUID.
+    if (!empty($records)) {
+      foreach ($records as $record) {
+        unset($items[$record->{$field}]);
+      }
+    }
+
+    // Delete the items.
+    foreach ($items as $item) {
+      $item->delete();
+      // Flag to indicate the field item and its files are already deleted.
+      $item->_deleted = TRUE;
+    }
+  }
+
+  /**
+   * Delete the file revisions associated with the revision to be deleted.
+   *
+   * This will delete the file revisions that are not referenced by other
+   * entity revisions.
+   */
+  protected function deleteUnusedFileRevisions() {
     $entity = $this->getEntity();
     $entity_type_id = $entity->getEntityTypeId();
     $revision_id = $entity->getRevisionId();
@@ -162,7 +310,9 @@ public function deleteRevision() {
     $items = [];
     foreach ($this->list as $item) {
       $file_uuid = $item->getFileUuid();
-      if (!empty($file_uuid)) {
+      // Skip invalid field items or items that were already processed in
+      // ::deleteUnusedFiles().
+      if (!empty($file_uuid) && empty($item->_deleted)) {
         $items[$file_uuid] = $item;
       }
     }
@@ -194,6 +344,121 @@ public function deleteRevision() {
     }
   }
 
+  /**
+   * Get all the field resource UUIDs for the field.
+   *
+   * @param string $field_name
+   *   Field name.
+   *
+   * @return array
+   *   List of file resource UUIDs.
+   */
+  protected function getFileResourceUuidsFromField($field_name) {
+    $entity = $this->getEntity();
+    if (empty($entity->id())) {
+      return [];
+    }
+
+    $entity_type_id = $entity->getEntityTypeId();
+    $table = $this->getFieldRevisionTableName($entity_type_id, $field_name);
+    $field = $this->getFieldColumnName($entity_type_id, $field_name, 'uuid');
+
+    return $this->getDatabase()
+      ->select($table, $table)
+      ->fields($table, [$field])
+      ->condition($table . '.entity_id', $entity->id(), '=')
+      ->distinct()
+      ->execute()
+      ?->fetchCol() ?? [];
+  }
+
+  /**
+   * Delete all the file references from a remote document.
+   *
+   * Drupal doesn't provide a "preDeleteRevision" hook for revisionable entities
+   * so we do that here and flag the entity so that if the the entity has
+   * several reliefweb_file fields, then we don't run that again.
+   *
+   * This is needed because the remote document has a single "files" field
+   * with references to all the files from the reliefweb_file fields on the
+   * entity.
+   */
+  protected function deleteRemoteDocumentFileReferences() {
+    if ($this->storeLocally()) {
+      return;
+    }
+
+    $entity = $this->getEntity();
+
+    // Skip if the entity has already been processed.
+    if (!empty($entity->_references_deleted) || empty($entity->uuid())) {
+      return;
+    }
+    $entity->_references_deleted = TRUE;
+
+    // Note: it doesn't matter if the document exists or not.
+    $this->getDocstoreClient()->updateDocument($entity->uuid(), [
+      'files' => [],
+    ]);
+  }
+
+  /**
+   * Update the document resource with all the references remote files.
+   */
+  protected function updateRemoteDocumentFileReferences() {
+    if ($this->storeLocally()) {
+      return;
+    }
+
+    $entity = $this->getEntity();
+    $entity_uuid = $entity->uuid();
+    $client = $this->getDocstoreClient();
+
+    // Skip if the entity has already been processed.
+    if (!empty($entity->_references_updated) || empty($entity->uuid())) {
+      return;
+    }
+    $entity->_references_updated = TRUE;
+
+    // Get all the file resource UUIDs referenced by the entity.
+    $uuids = [];
+    /** @var \Drupal\Core\Field\FieldItemListInterface $field_item_list */
+    foreach ($entity as $field_name => $field_item_list) {
+      if ($field_item_list instanceof ReliefWebFileList) {
+        $uuids = array_merge($uuids, $this->getFileResourceUuidsFromField($field_name));
+      }
+    }
+
+    // Retrieve the document.
+    $response = $client->getDocument($entity_uuid);
+
+    // Update the document.
+    if ($response->isSuccessful()) {
+      $this->getDocstoreClient()->updateDocument($entity->uuid(), [
+        'files' => $uuids,
+      ]);
+    }
+    // Try to create it if it doesn't exist and there are files.
+    elseif ($response->isNotFound() && !empty($uuids)) {
+      $response = $client->createDocument([
+        'uuid' => $entity_uuid,
+        'title' => $entity->label(),
+        'private' => TRUE,
+        'files' => $uuids,
+      ]);
+    }
+  }
+
+  /**
+   * Check if we are storing the files locally or remotely.
+   *
+   * @return bool
+   *   TRUE if the files are stored locally.
+   */
+  public function storeLocally() {
+    return $this->getDocstoreConfig()->get('local') === TRUE;
+  }
+
   /**
    * Get the docstore client service.
    *
diff --git a/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php b/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php
index d397f169a..447091387 100644
--- a/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php
+++ b/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php
@@ -5,8 +5,9 @@
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Logger\LoggerChannelFactoryInterface;
 use GuzzleHttp\ClientInterface;
+use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Psr7\Utils;
-use Psr\Http\Message\ResponseInterface;
+use Drupal\reliefweb_utility\Response\JsonResponse;
 
 /**
  * ReliefWeb API client service class.
@@ -62,13 +63,11 @@ public function __construct(
    * @param int $timeout
    *   Request timeout.
    *
-   * @return array|null
-   *   The data from the API response or NULL in case of error.
+   * @return \Drupal\reliefweb_utility\Response\JsonResponse
+   *   Response.
    */
   public function getFile($uuid, $timeout = 5) {
-    $response = $this->request('GET', '/api/v1/files/' . $uuid, [], $timeout);
-
-    return $this->decodeResponseBody($response);
+    return $this->request('GET', '/api/v1/files/' . $uuid, [], $timeout);
   }
 
   /**
@@ -81,13 +80,11 @@ public function getFile($uuid, $timeout = 5) {
    * @param int $timeout
    *   Request timeout.
    *
-   * @return array|null
-   *   The data from the API response or NULL in case of error.
+   * @return Drupal\reliefweb_utility\Response\JsonResponse
+   *   Response.
    */
   public function getFileRevision($uuid, $revision_id, $timeout = 5) {
-    $response = $this->request('GET', '/api/v1/files/' . $uuid . '/revisions/' . $revision_id, [], $timeout);
-
-    return $this->decodeResponseBody($response);
+    return $this->request('GET', '/api/v1/files/' . $uuid . '/revisions/' . $revision_id, [], $timeout);
   }
 
   /**
@@ -98,15 +95,13 @@ public function getFileRevision($uuid, $revision_id, $timeout = 5) {
    * @param int $timeout
    *   Request timeout.
    *
-   * @return array|null
-   *   The data from the API response or NULL in case of error.
+   * @return \Drupal\reliefweb_utility\Response\JsonResponse
+   *   Response.
    */
   public function createFile(array $payload, $timeout = 5) {
-    $response = $this->request('POST', '/api/v1/files', [
+    return $this->request('POST', '/api/v1/files', [
       'json' => $payload,
     ], $timeout);
-
-    return $this->decodeResponseBody($response);
   }
 
   /**
@@ -119,25 +114,23 @@ public function createFile(array $payload, $timeout = 5) {
    * @param int $timeout
    *   Request timeout.
    *
-   * @return array|null
-   *   The data from the API response or NULL in case of error.
+   * @return \Drupal\reliefweb_utility\Response\JsonResponse
+   *   Response.
    */
   public function updateFileContentFromFilePath($uuid, $path, $timeout = 300) {
     try {
       $resource = Utils::TryFopen($path, 'r');
     }
-    catch (\RuntimeExecption $exception) {
+    catch (\RuntimeException $exception) {
       $this->logger->error('Unable to read file @path', [
         '@path' => $path,
       ]);
-      return NULL;
+      return new JsonResponse();
     }
 
-    $response = $this->request('POST', '/api/v1/files/' . $uuid . '/content', [
+    return $this->request('POST', '/api/v1/files/' . $uuid . '/content', [
       'body' => $resource,
     ], $timeout);
-
-    return $this->decodeResponseBody($response);
   }
 
   /**
@@ -159,11 +152,11 @@ public function downloadFileContentToFilePath($uuid, $path, $revision_id = 0, $t
     try {
       $resource = Utils::TryFopen($path, 'w');
     }
-    catch (\RuntimeExecption $exception) {
+    catch (\RuntimeException $exception) {
       $this->logger->error('Unable to open file @path for writing', [
         '@path' => $path,
       ]);
-      return NULL;
+      return FALSE;
     }
 
     // Assume we want to get the latest revision in which case we can do
@@ -182,7 +175,7 @@ public function downloadFileContentToFilePath($uuid, $path, $revision_id = 0, $t
       'sink' => $resource,
     ], $timeout);
 
-    return $this->isResponseSuccessful($response);
+    return $response->isSuccessful();
   }
 
   /**
@@ -195,17 +188,15 @@ public function downloadFileContentToFilePath($uuid, $path, $revision_id = 0, $t
    * @param int $timeout
    *   Request timeout.
    *
-   * @return array|null
-   *   The data from the API response or NULL in case of error.
+   * @return \Drupal\reliefweb_utility\Response\JsonResponse
+   *   Response.
    */
   public function updateFileStatus($uuid, $private, $timeout = 5) {
-    $response = $this->request('PATCH', '/api/v1/files/' . $uuid, [
+    return $this->request('PATCH', '/api/v1/files/' . $uuid, [
       'json' => [
         'private' => $private,
       ],
     ], $timeout);
-
-    return $this->decodeResponseBody($response);
   }
 
   /**
@@ -228,7 +219,7 @@ public function selectFileRevision($uuid, $revision_id, $timeout = 5) {
       ],
     ], $timeout);
 
-    return $this->isResponseSuccessful($response);
+    return $response->isSuccessful();
   }
 
   /**
@@ -245,7 +236,7 @@ public function selectFileRevision($uuid, $revision_id, $timeout = 5) {
   public function deleteFile($uuid, $timeout = 30) {
     $response = $this->request('DELETE', '/api/v1/files/' . $uuid, [], $timeout);
 
-    return $this->isResponseSuccessful($response);
+    return $response->isSuccessful();
   }
 
   /**
@@ -264,7 +255,131 @@ public function deleteFile($uuid, $timeout = 30) {
   public function deleteFileRevision($uuid, $revision_id, $timeout = 10) {
     $response = $this->request('DELETE', '/api/v1/files/' . $uuid . '/revisions/' . $revision_id, [], $timeout);
 
-    return $this->isResponseSuccessful($response);
+    return $response->isSuccessful();
+  }
+
+  /**
+   * Get a document resource in the docstore.
+   *
+   * @param string $uuid
+   *   The document resource UUID.
+   * @param int $timeout
+   *   Request timeout.
+   *
+   * @return \Drupal\reliefweb_utility\Response\JsonResponse
+   *   Response.
+   */
+  public function getDocument($uuid, $timeout = 5) {
+    return $this->request('GET', $this->getDocumentEndpoint($uuid), [], $timeout);
+  }
+
+  /**
+   * Create a document in the docstore.
+   *
+   * @param array $payload
+   *   API request payload (with fields, filters, sort etc.)
+   * @param int $timeout
+   *   Request timeout.
+   *
+   * @return \Drupal\reliefweb_utility\Response\JsonResponse
+   *   Response.
+   */
+  public function createDocument(array $payload, $timeout = 5) {
+    // Check if the document type exists.
+    $response = $this->getDocumentType();
+    // Or try to create it.
+    if ($response->isNotFound()) {
+      $response = $this->createDocumentType();
+      if (!$response->isSuccessful()) {
+        return $response;
+      }
+    }
+
+    // Create the document.
+    return $this->request('POST', $this->getDocumentEndpoint(), [
+      'json' => $payload + [
+        'author' => 'reliefweb',
+      ],
+    ], $timeout);
+  }
+
+  /**
+   * Update a document in the docstore.
+   *
+   * @param string $uuid
+   *   The document resource UUID.
+   * @param array $payload
+   *   API request payload (with fields, filters, sort etc.)
+   * @param int $timeout
+   *   Request timeout.
+   *
+   * @return \Drupal\reliefweb_utility\Response\JsonResponse
+   *   Response.
+   */
+  public function updateDocument($uuid, array $payload, $timeout = 5) {
+    return $this->request('PATCH', $this->getDocumentEndpoint($uuid), [
+      'json' => $payload,
+    ], $timeout);
+  }
+
+  /**
+   * Delete a document.
+   *
+   * @param string $uuid
+   *   The document resource UUID.
+   * @param int $timeout
+   *   Request timeout.
+   *
+   * @return bool
+   *   TRUE on success.
+   */
+  public function deleteDocument($uuid, $timeout = 30) {
+    $response = $this->request('DELETE', $this->getDocumentEndpoint($uuid), [], $timeout);
+
+    return $response->isSuccessful();
+  }
+
+  /**
+   * Create the ReliefWeb document type in the docstore.
+   *
+   * @param int $timeout
+   *   Request timeout.
+   *
+   * @return \Drupal\reliefweb_utility\Response\JsonResponse
+   *   Response.
+   */
+  public function getDocumentType($timeout = 5) {
+    $endpoint = '/api/v1/types/' . $this->getDocstoreDocumentType();
+    return $this->request('GET', $endpoint, [], $timeout);
+  }
+
+  /**
+   * Create the ReliefWeb document type in the docstore.
+   *
+   * @param int $timeout
+   *   Request timeout.
+   *
+   * @return \Drupal\reliefweb_utility\Response\JsonResponse
+   *   Response.
+   */
+  public function createDocumentType($timeout = 5) {
+    $document_type = $this->getDocstoreDocumentType();
+
+    $payload = [
+      'machine_name' => $document_type,
+      'endpoint' => $this->getDocstoreDocumentTypeEndpoint(),
+      'label' => $document_type,
+      'shared' => FALSE,
+      'content_allowed' => FALSE,
+      'fields_allowed' => FALSE,
+      'author' => 'reliefweb',
+      'allow_duplicates' => TRUE,
+      'use_revisions' => FALSE,
+    ];
+
+    return $this->request('POST', '/api/v1/types', [
+      'json' => $payload,
+    ], $timeout);
   }
 
   /**
@@ -279,7 +394,7 @@ public function deleteFileRevision($uuid, $revision_id, $timeout = 10) {
    * @param int $timeout
    *   Request timeout.
    *
-   * @return \Psr\Http\Message\ResponseInterface|null
+   * @return \Symfony\Component\HttpFoundation\Response
    *   Response.
    */
   public function request($method, $endpoint, array $options, $timeout = 5) {
@@ -292,77 +407,87 @@ public function request($method, $endpoint, array $options, $timeout = 5) {
         unset($options['headers']);
       }
 
-      return $this->httpClient->request($method, $url, [
+      $response = $this->httpClient->request($method, $url, [
         'timeout' => $timeout,
         'headers' => $headers,
       ] + $options);
+      return new JsonResponse($response);
     }
     catch (\Exception $exception) {
-      $this->logger->error('Unable to perform the @method request to the @endpoint endpoint with the options: @options: @error', [
-        '@method' => $method,
-        '@endpoint' => $endpoint,
-        '@options' => print_r($options, TRUE),
-        '@error' => $exception->getMessage(),
-      ]);
-      return NULL;
+      if ($exception->getCode() == 404) {
+        $this->logger->notice('@endpoint not found', [
+          '@endpoint' => $endpoint,
+        ]);
+      }
+      else {
+        $this->logger->error('Unable to perform the @method request to the @endpoint endpoint with the options: @options: @error', [
+          '@method' => $method,
+          '@endpoint' => $endpoint,
+          '@options' => print_r($options, TRUE),
+          '@code' => $exception->getCode(),
+          '@error' => $exception->getMessage(),
+        ]);
+      }
+      $response = NULL;
+      if ($exception instanceof RequestException) {
+        $response = $exception->getResponse();
+      }
+      return new JsonResponse($response);
     }
   }
 
   /**
-   * Decode the response body.
-   *
-   * Note: this assumes the body is JSON encoded data.
+   * Create a URL to the docstore for the given endpoint.
    *
-   * @param \Psr\Http\Message\ResponseInterface|null $response
-   *   The request's response.
+   * @param string $endpoint
+   *   Docstore endpoint (ex: API endpoint).
    *
-   * @return mixed
-   *   NULL if the response body couldn't be decoded otherwise whatever the
-   *   was in the body.
+   * @return string
+   *   Full docstore URL for the endpoint.
    */
-  public function decodeResponseBody(?ResponseInterface $response) {
-    if ($response !== NULL) {
-      $body = $response->getBody();
-      return !empty($body) ? json_decode($body, TRUE) : NULL;
+  protected function createDocstoreUrl($endpoint = '') {
+    $docstore_url = $this->config->get('docstore_url');
+    if (empty($docstore_url)) {
+      throw  new \Exception('The docstore URL is not defined');
+    }
+    if (!empty($endpoint)) {
+      return rtrim($docstore_url, '/') . '/' . ltrim($endpoint, '/');
     }
-    return NULL;
+    return $docstore_url;
   }
 
   /**
-   * Check if a response is sucessful.
+   * Get the docstore document type of the reliefweb document resources.
    *
-   * @param \Psr\Http\Message\ResponseInterface|null $response
-   *   The request's response.
+   * @return string
+   *   Document type.
+   */
+  protected function getDocstoreDocumentType() {
+    return $this->config->get('docstore_document_type') ?? 'reliefweb_document';
+  }
+
+  /**
+   * Get the docstore document type endpoint.
    *
-   * @return bool
-   *   TRUE if the response is successful.
+   * @return string
+   *   Document type endpoint.
    */
-  public function isResponseSuccessful(?ResponseInterface $response) {
-    if ($response !== NULL) {
-      $code = $response->getStatusCode();
-      return $code >= 200 && $code < 300;
-    }
-    return FALSE;
+  protected function getDocstoreDocumentTypeEndpoint() {
+    return str_replace('_', '-', $this->getDocstoreDocumentType());
   }
 
   /**
-   * Create a URL to the docstore for the given endpoint.
+   * Get the document endpoint.
    *
-   * @param string $endpoint
-   *   Docstore endpoint (ex: API endpoint).
+   * @param string $uuid
+   *   Optional document UUID.
    *
    * @return string
-   *   Full docstore URL for the endpoint.
+   *   Document endpoint.
    */
-  protected function createDocstoreUrl($endpoint = '') {
-    $docstore_url = $this->config->get('docstore_url');
-    if (empty($docstore_url)) {
-      throw  new \Execption('The docstore URL is not defined');
-    }
-    if (!empty($endpoint)) {
-      return rtrim($docstore_url, '/') . '/' . ltrim($endpoint, '/');
-    }
-    return $docstore_url;
+  protected function getDocumentEndpoint($uuid = '') {
+    $base = '/api/v1/documents/' . $this->getDocstoreDocumentTypeEndpoint();
+    return !empty($uuid) ? $base . '/' . $uuid : $base;
   }
 
   /**

From b873fd8e43c7d91f5a697f755c55fc2f26e7f6cd Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sat, 4 Dec 2021 11:19:53 +0000
Subject: [PATCH 205/720] [RW-25] Update file widget to handle file types for
 which a preview cannot be generated

---
 .../src/Plugin/Field/FieldWidget/ReliefWebFile.php        | 2 +-
 .../templates/reliefweb-file-widget-item.html.twig        | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
index a315e527c..b68b64c82 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
@@ -410,7 +410,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
     // interactions.
     $element['operations'] = [
       '#type' => 'details',
-      '#title' => $this->t('Edit'),
+      '#title' => $this->t('Actions'),
     ];
 
     // Add a button to delete the file.
diff --git a/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget-item.html.twig b/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget-item.html.twig
index 81b7cc53b..ae93f5d8a 100644
--- a/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget-item.html.twig
+++ b/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget-item.html.twig
@@ -22,7 +22,11 @@
   ]
 %}
 <tr{{ attributes.addClass(['rw-file-widget-item', 'draggable']) }}>
-  <td class="rw-file-widget-item__information">
+  {% if element.preview_page is empty %}
+  <td class="rw-file-widget-item__information" colspan="2">
+  {% else %}
+  <td class="rw-file-widget-item__information" colspan="2">
+  {% endif %}
     {{ element.link }}
     {{ element.description }}
     {{ element.language }}
@@ -31,11 +35,13 @@
       {{ child }}
     {% endfor %}
   </td>
+  {% if element.preview_page is not empty %}
   <td class="rw-file-widget-item__preview">
     {{ element.preview }}
     {{ element.preview_page }}
     {{ element.preview_rotation }}
   </td>
+  {% endif %}
   <td class="rw-file-widget-item__operations">
     {{ element.operations }}
   </td>

From 01e072c40353aad60799dd16dc72b7c03083194e Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sat, 4 Dec 2021 12:45:03 +0000
Subject: [PATCH 206/720] [RW-25] Fix file widget

---
 .../templates/reliefweb-file-widget-item.html.twig              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget-item.html.twig b/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget-item.html.twig
index ae93f5d8a..22c0edf18 100644
--- a/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget-item.html.twig
+++ b/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget-item.html.twig
@@ -25,7 +25,7 @@
   {% if element.preview_page is empty %}
   <td class="rw-file-widget-item__information" colspan="2">
   {% else %}
-  <td class="rw-file-widget-item__information" colspan="2">
+  <td class="rw-file-widget-item__information">
   {% endif %}
     {{ element.link }}
     {{ element.description }}

From fc667d6d66d41cba537fb49f6c1ec1decbd90aa7 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sat, 4 Dec 2021 12:45:43 +0000
Subject: [PATCH 207/720] [RW-25] Fix file download controller

---
 .../src/Controller/FileDownloadController.php        | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php b/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php
index 02e213c07..b5922a509 100644
--- a/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php
+++ b/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php
@@ -306,12 +306,6 @@ protected function downloadRemoteFile($uuid, $filename) {
       'stream' => TRUE,
     ], 1200);
 
-    // Skip if something went wrong with the request. The error is already
-    // logged in DocstoreClient::request().
-    if (empty($response)) {
-      throw new \Exception();
-    }
-
     // Stream the response content.
     if ($response->isSuccessful()) {
       return new StreamedResponse(function () use ($response) {
@@ -320,12 +314,8 @@ protected function downloadRemoteFile($uuid, $filename) {
         stream_copy_to_stream($input, $output);
       }, 200, $headers + $response->getHeaders());
     }
-    // If the response was not successful nor a 404, throw an exception with the
-    // status code and reason so we can log it.
-    elseif (!$response->isNotFound()) {
-      throw new \Exception($response->getStatusCode(), $response->getReasonPhrase());
-    }
 
+    // The error is already logged by the docstore client.
     return NULL;
   }
 

From 2a580bda0dd6c1abf066a1d0df417964232742f2 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sun, 5 Dec 2021 10:07:59 +0000
Subject: [PATCH 208/720] [RW-25] Add index on file uuid

---
 .../src/Plugin/Field/FieldType/ReliefWebFile.php                 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
index 5d77abd1e..a2df28be4 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
@@ -439,6 +439,7 @@ public static function schema(FieldStorageDefinitionInterface $field_definition)
       ],
       'indexes' => [
         'uuid' => ['uuid'],
+        'file_uuid' => ['file_uuid'],
       ],
     ];
   }

From ff7862e5780af8a430e8c5adb5f2054542b7ec0c Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sun, 5 Dec 2021 10:13:55 +0000
Subject: [PATCH 209/720] [RW-25] Fix ReliefWebFileList field item list

---
 .../Field/FieldType/ReliefWebFileList.php     | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php
index adf1c5668..3b224ce25 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php
@@ -254,7 +254,6 @@ public function deleteRevision() {
   protected function deleteUnusedFiles() {
     $entity = $this->getEntity();
     $entity_type_id = $entity->getEntityTypeId();
-    $revision_id = $entity->getRevisionId();
     $field_name = $this->definition->getName();
 
     // Map of the field items keyed by file resource UUID.
@@ -266,6 +265,10 @@ protected function deleteUnusedFiles() {
       }
     }
 
+    if (empty($items)) {
+      return;
+    }
+
     $table = $this->getFieldRevisionTableName($entity_type_id, $field_name);
     $field = $this->getFieldColumnName($entity_type_id, $field_name, 'uuid');
 
@@ -275,18 +278,19 @@ protected function deleteUnusedFiles() {
       ->select($table, $table)
       ->fields($table, [$field])
       ->condition($table . '.entity_id', $entity->id(), '=')
-      ->condition($table . '.revision_id', $revision_id, '<>')
+      ->condition($table . '.revision_id', $entity->getRevisionId(), '<>')
       ->condition($table . '.' . $field, array_keys($items), 'IN')
+      ->distinct()
       ->execute();
 
-    // Filter the items for which there are other revisions using the same UUID.
+    // Remove the items for which there are other revisions using the same UUID.
     if (!empty($records)) {
       foreach ($records as $record) {
         unset($items[$record->{$field}]);
       }
     }
 
-    // Delete the items.
+    // Delete the items that are not referenced anywhere else.
     foreach ($items as $item) {
       $item->delete();
       // Flag to indicate the field item and its files are already deleted.
@@ -303,7 +307,6 @@ protected function deleteUnusedFiles() {
   protected function deleteUnusedFileRevisions() {
     $entity = $this->getEntity();
     $entity_type_id = $entity->getEntityTypeId();
-    $revision_id = $entity->getRevisionId();
     $field_name = $this->definition->getName();
 
     // Map of the field items keyed by file UUID.
@@ -317,6 +320,10 @@ protected function deleteUnusedFileRevisions() {
       }
     }
 
+    if (empty($items)) {
+      return;
+    }
+
     $table = $this->getFieldRevisionTableName($entity_type_id, $field_name);
     $field = $this->getFieldColumnName($entity_type_id, $field_name, 'file_uuid');
 
@@ -326,11 +333,12 @@ protected function deleteUnusedFileRevisions() {
       ->select($table, $table)
       ->fields($table, [$field])
       ->condition($table . '.entity_id', $entity->id(), '=')
-      ->condition($table . '.revision_id', $revision_id, '<>')
+      ->condition($table . '.revision_id', $entity->getRevisionId(), '<>')
       ->condition($table . '.' . $field, array_keys($items), 'IN')
+      ->distinct()
       ->execute();
 
-    // Filter the items for which there are other revisions using the same
+    // Remove the items for which there are other revisions using the same
     // file UUID.
     if (!empty($records)) {
       foreach ($records as $record) {
@@ -338,7 +346,8 @@ protected function deleteUnusedFileRevisions() {
       }
     }
 
-    // Delete the items.
+    // Delete the revision of the file if it's not referenced by other
+    // revisions.
     foreach ($items as $item) {
       $item->deleteRevision();
     }
@@ -403,9 +412,9 @@ protected function deleteRemoteDocumentFileReferences() {
   }
 
   /**
-   * Update the document resource with all the references remote files.
+   * Update the document resource with all the referenced remote files.
    */
-  protected function updateRemoteDocumentFileReferences() {
+  public function updateRemoteDocumentFileReferences() {
     if ($this->storeLocally()) {
       return;
     }

From a003dc724bc3a48aaf60b0c86c54a904c10a8f9b Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sun, 5 Dec 2021 10:17:02 +0000
Subject: [PATCH 210/720] [RW-25] Log not found message

---
 .../custom/reliefweb_docstore/src/Services/DocstoreClient.php  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php b/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php
index 447091387..5257678b3 100644
--- a/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php
+++ b/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php
@@ -415,8 +415,9 @@ public function request($method, $endpoint, array $options, $timeout = 5) {
     }
     catch (\Exception $exception) {
       if ($exception->getCode() == 404) {
-        $this->logger->notice('@endpoint not found', [
+        $this->logger->notice('@endpoint not found: @message', [
           '@endpoint' => $endpoint,
+          '@message' => $exception->getMessage(),
         ]);
       }
       else {

From bd79896f0301af7288f8bbe791538a9578daabfe Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 6 Dec 2021 07:07:24 +0000
Subject: [PATCH 211/720] [RW-25] Allow to indicate the base url for the legacy
 url

---
 .../custom/reliefweb_utility/src/Helpers/LegacyHelper.php   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/reliefweb_utility/src/Helpers/LegacyHelper.php b/html/modules/custom/reliefweb_utility/src/Helpers/LegacyHelper.php
index b76a2108b..5b2367c1f 100644
--- a/html/modules/custom/reliefweb_utility/src/Helpers/LegacyHelper.php
+++ b/html/modules/custom/reliefweb_utility/src/Helpers/LegacyHelper.php
@@ -74,13 +74,15 @@ public static function generateDocumentUuid($nid) {
    *
    * @param string $uri
    *   File URI.
+   * @param string $base_url
+   *   The base url of the legacy URL in the form http(s)://example.test.
    *
    * @return string
    *   File URL.
    */
-  public static function getFileLegacyUrl($uri) {
+  public static function getFileLegacyUrl($uri, $base_url = 'https://reliefweb.int') {
     $filename = UrlHelper::encodePath(basename($uri));
-    return 'https://reliefweb.int/sites/reliefweb.int/files/resources/' . $filename;
+    return $base_url . '/sites/reliefweb.int/files/resources/' . $filename;
   }
 
   /**

From 6a58c6adb163d91cdc7fda2ffbfb8d105298acfe Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 6 Dec 2021 07:10:29 +0000
Subject: [PATCH 212/720] [RW-25] Fix attachment display

---
 .../Field/FieldFormatter/ReliefWebFile.php    |  6 ++--
 .../Field/FieldWidget/ReliefWebFile.php       |  2 +-
 .../reliefweb_entities/src/Entity/Report.php  | 35 +++++++++++++------
 .../content/node--report--full.html.twig      |  2 +-
 4 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldFormatter/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldFormatter/ReliefWebFile.php
index 18d8f8f6a..521cc469e 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldFormatter/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldFormatter/ReliefWebFile.php
@@ -26,18 +26,20 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
     foreach ($items as $item) {
       $url = $item->getFileUrl();
       if (!empty($url)) {
+        $languages = reliefweb_docstore_get_languages();
+
         $list[] = [
           'item' => $item,
           'url' => $url->toString(),
           'name' => $item->getFileName(),
-          'preview' => $item->renderPreview('small'),
+          'preview' => $item->renderPreview('small', TRUE),
           'label' => $item->getFileName(),
           'description' => '(' . implode(' | ', array_filter([
             mb_strtoupper($item->getFileExtension()),
             format_size($item->getFileSize()),
             implode(' - ', array_filter([
               $item->getFileDescription(),
-              $item->getFileLanguage(),
+              $languages[$item->getFileLanguage()] ?? '',
             ])),
           ])) . ')',
         ];
diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
index b68b64c82..59eae24b6 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
@@ -343,7 +343,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
         // Only regenerated the preview if the page or rotation changed.
         $regenerate = $original_preview_page != $preview_page || $original_preview_rotation != $preview_rotation;
 
-        // For the createion of new file if there is already one to prevent
+        // For the creation of new file if there is already one to prevent
         // changing the existing preview that is displayed to the end users
         // while the form is being edited.
         $new_preview_file = $regenerate && $original_preview_uuid === $preview_uuid;
diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Report.php b/html/modules/custom/reliefweb_entities/src/Entity/Report.php
index 8af079b0e..7aaee1d3a 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Report.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Report.php
@@ -100,15 +100,13 @@ public function getSourceDisclaimers() {
   /**
    * Get the report attachments.
    *
+   * @param array|null $build
+   *   The render array for the attachment field.
+   *
    * @return array
    *   Render array with the list of attachments.
    */
-  public function getAttachments() {
-    if (!$this->hasField('field_file') || $this->field_file->isEmpty()) {
-      return [];
-    }
-
-    $build = $this->field_file->view();
+  public function getAttachments(?array $build = NULL) {
     if (empty($build)) {
       return [];
     }
@@ -126,15 +124,22 @@ public function getAttachments() {
         '@date' => DateHelper::format($this->getCreatedTime(), 'custom', 'j m Y'),
       ]);
 
-      $build['#footer'] = Link::fromTextAndUrl(
-        $this->t('View the interactive content page'),
-        Url::fromUri($this->origin_notes->value, [
+      $url = NULL;
+      if (!$this->get('field_origin_notes')->isEmpty()) {
+        $url = Url::fromUri($this->field_origin_notes->value, [
           'attributes' => [
             'target' => '_blank',
             'rel' => 'noopener',
           ],
-        ])
-      );
+        ]);
+      }
+
+      if (!empty($url)) {
+        $build['#footer'] = Link::fromTextAndUrl(
+          $this->t('View the interactive content page'),
+          $url
+        );
+      }
 
       foreach ($build['#list'] as $index => &$item) {
         $description = $item['item']->getFileDescription();
@@ -153,6 +158,14 @@ public function getAttachments() {
           $item['preview']['#style_name'] = 'large';
           $item['preview']['#alt'] = $item['label'];
         }
+
+        // Have the screenshots link to the original content.
+        if (!empty($url)) {
+          $item['url'] = $url->toString();
+        }
+        else {
+          unset($item['url']);
+        }
       }
     }
     // The report is a map or an infographic.
diff --git a/html/themes/custom/common_design_subtheme/templates/content/node--report--full.html.twig b/html/themes/custom/common_design_subtheme/templates/content/node--report--full.html.twig
index 3e0a28d87..838a8fbe4 100644
--- a/html/themes/custom/common_design_subtheme/templates/content/node--report--full.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/content/node--report--full.html.twig
@@ -160,7 +160,7 @@
 
     <div class="rw-report__content">
 
-      {{ node.getAttachments() }}
+      {{ node.getAttachments(content.field_file) }}
 
       {{ content.body.0|render|sanitize_html(false, 2) }}
 

From 5550743abba58612be8cd02183c2ddf536b8e846 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 6 Dec 2021 07:11:21 +0000
Subject: [PATCH 213/720] [RW-25] Fix download of remote file

---
 .../src/Services/DocstoreClient.php           | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php b/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php
index 5257678b3..43eaa9131 100644
--- a/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php
+++ b/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php
@@ -7,6 +7,7 @@
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Psr7\Utils;
+use GuzzleHttp\Psr7\StreamWrapper;
 use Drupal\reliefweb_utility\Response\JsonResponse;
 
 /**
@@ -149,33 +150,33 @@ public function updateFileContentFromFilePath($uuid, $path, $timeout = 300) {
    *   TRUE if the request was successful.
    */
   public function downloadFileContentToFilePath($uuid, $path, $revision_id = 0, $timeout = 300) {
-    try {
-      $resource = Utils::TryFopen($path, 'w');
-    }
-    catch (\RuntimeException $exception) {
-      $this->logger->error('Unable to open file @path for writing', [
-        '@path' => $path,
-      ]);
-      return FALSE;
-    }
-
-    // Assume we want to get the latest revision in which case we can do
-    // a direct call the https://docstore/files/uuid endpoint which is much
-    // faster if the file is public.
-    // @todo this doesn't take into account the fact that the file may be
-    // hidden for the provider in that case we need to use the API endpoint.
+    // Assume we want to get the latest revision if revision id is empty.
     if (empty($revision_id)) {
-      $endpoint = '/files/' . $uuid . '/' . basename($path);
+      $endpoint = '/api/v1/files/' . $uuid . '/content';
     }
     else {
       $endpoint = '/api/v1/files/' . $uuid . '/revisions/' . $revision_id . '/content';
     }
 
     $response = $this->request('GET', $endpoint, [
-      'sink' => $resource,
+      'stream' => TRUE,
     ], $timeout);
 
-    return $response->isSuccessful();
+    if ($response->isSuccessful()) {
+      try {
+        $output = Utils::TryFopen($path, 'w');
+      }
+      catch (\RuntimeException $exception) {
+        $this->logger->error('Unable to open file @path for writing', [
+          '@path' => $path,
+        ]);
+        return FALSE;
+      }
+
+      $input = StreamWrapper::getResource($response->getBody());
+      return stream_copy_to_stream($input, $output) !== FALSE;
+    }
+    return FALSE;
   }
 
   /**

From 093bb58c32ec79431607839b9180df71df243b9d Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 6 Dec 2021 09:08:24 +0000
Subject: [PATCH 214/720] [RW-25] Handle preview generation of migrated content

---
 .../Plugin/Field/FieldType/ReliefWebFile.php  | 224 ++++++++++++++----
 1 file changed, 175 insertions(+), 49 deletions(-)

diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
index a2df28be4..4e57c6bdf 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
@@ -5,6 +5,7 @@
 use Drupal\Component\Utility\Bytes;
 use Drupal\Component\Utility\Environment;
 use Drupal\Component\Utility\Random;
+use Drupal\Core\Cache\Cache;
 use Drupal\Core\Entity\EntityPublishedInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FieldItemBase;
@@ -17,6 +18,7 @@
 use Drupal\Core\TypedData\DataDefinition;
 use Drupal\Core\Url;
 use Drupal\file\Entity\File;
+use Drupal\reliefweb_utility\Traits\EntityDatabaseInfoTrait;
 
 /**
  * Plugin implementation of the 'reliefweb_file' field type.
@@ -34,6 +36,8 @@
  */
 class ReliefWebFile extends FieldItemBase {
 
+  use EntityDatabaseInfoTrait;
+
   /**
    * The current user.
    *
@@ -555,10 +559,27 @@ public function renderPreview($style = 'small', $generate = FALSE) {
    *   be generated.
    */
   public function getPreview($generate = FALSE) {
+    if (!$this->canHavePreview()) {
+      return NULL;
+    }
+
+    $page = $this->getPreviewPage();
+    $rotation = $this->getPreviewRotation();
+
+    // Skip if the file is not supposed to have a preview.
+    if ($page < 1) {
+      return NULL;
+    }
+
+    // Migrated content don't have a page count initially. We can use that to
+    // detect if the preview should be regenerated.
+    if (!$this->hasPageCount()) {
+      return $this->generatePreview($page, $rotation, TRUE);
+    }
+
+    // Load the existing preview file or generate it if instructed so.
     $file = $this->loadPreviewFile();
-    if (empty($file) && $generate && $this->canHavePreview()) {
-      $page = $this->getPreviewPage();
-      $rotation = $this->getPreviewRotation();
+    if (empty($file) && $generate) {
       return $this->generatePreview($page, $rotation);
     }
     return $file;
@@ -584,16 +605,15 @@ public function generatePreview($page = 0, $rotation = 0, $regenerate = FALSE, $
       return NULL;
     }
 
-    // Ensure the page is a valid value.
-    $page = $page > $this->getPageCount() ? 1 : $page;
-
-    // Ensure the rotation is a valid value.
-    $rotation = in_array($rotation, [0, 90, -90]) ? $rotation : 0;
-
     $preview_uuid = $this->getPreviewUuid();
     $current_page = $this->getPreviewPage();
     $current_rotation = $this->getPreviewRotation();
 
+    // Migrated content don't have a page count. We can use that to detect if
+    // we should regenerate the preview.
+    $no_page_count = !$this->hasPageCount();
+    $regenerate = $regenerate || $no_page_count;
+
     // Skip if the preview already exists for the given page and rotation and
     // the preview file exists.
     if (!$regenerate && !empty($preview_uuid) && $page == $current_page && $rotation == $current_rotation) {
@@ -605,6 +625,7 @@ public function generatePreview($page = 0, $rotation = 0, $regenerate = FALSE, $
 
     // Load or create a file associated with the field item.
     $file = $this->loadFile();
+    $downloaded = FALSE;
     if (empty($file) || !file_exists($file->getFileUri())) {
       // For local files, we cannot generate the preview if there is no file
       // associated with the field item.
@@ -618,36 +639,54 @@ public function generatePreview($page = 0, $rotation = 0, $regenerate = FALSE, $
         if (!$this->updateFileFromRemote($file)) {
           return NULL;
         }
+        $downloaded = TRUE;
       }
     }
 
+    // Update the page count if it's not set (i.e. for migrated content).
+    if ($no_page_count) {
+      $this->updatePageCount($file);
+    }
+
     // Retrieve or create the preview file.
     $preview_file = $new ? NULL : $this->loadPreviewFile();
     if (empty($preview_file)) {
       $preview_file = $this->createPreviewFile();
     }
 
+    // Ensure the page is a valid value.
+    $page = $page > $this->getPageCount() ? 1 : $page;
+
+    // Ensure the rotation is a valid value.
+    $rotation = in_array($rotation, [0, 90, -90]) ? $rotation : 0;
+
     // Create the preview.
-    if (!$this->extractPreview($file->getFileUri(), $preview_file->getFileUri(), $page, $rotation)) {
-      return NULL;
-    }
+    $success = $this->extractPreview($file->getFileUri(), $preview_file->getFileUri(), $page, $rotation);
+    if ($success) {
+      // Save the preview. We mark it as temporary so that it can be garbage
+      // collected if the form, for example, is not submitted. It will be saved
+      // as permanent in ::preSave() when the form is submitted.
+      if ($preview_file->isNew()) {
+        $preview_file->setTemporary();
+        $preview_file->save();
+      }
 
-    // Save the preview. We mark it as temporary so that it can be garbage
-    // collected if the form, for example, is not submitted. It will be saved
-    // as permanent in ::preSave() when the form is submitted.
-    $preview_file->setTemporary();
-    $preview_file->save();
+      // Update the field item preview uuid as it may be a new file.
+      $this->get('preview_uuid')->setValue($preview_file->uuid());
+      $this->get('preview_page')->setValue($page);
+      $this->get('preview_rotation')->setValue($rotation);
 
-    // Update the field item preview uuid as it may be a new file.
-    $this->get('preview_uuid')->setValue($preview_file->uuid());
-    $this->get('preview_page')->setValue($page);
-    $this->get('preview_rotation')->setValue($rotation);
+      // Delete the preview derivatives to ensure they correspond to the updated
+      // preview image.
+      $this->deletePreviewDerivatives($preview_file->getFileUri());
+    }
 
-    // Delete the preview derivatives to ensure they correspond to the updated
-    // preview image.
-    $this->deletePreviewDerivatives($preview_file->getFileUri());
+    // Make sure we don't leave a local file if stored remotely.
+    if ($downloaded) {
+      $this->deleteFileOnDisk($file->getFileUri());
+    }
 
-    return $preview_file;
+    return $success ? $preview_file : NULL;
   }
 
   /**
@@ -805,8 +844,9 @@ public function getFileUrl() {
       return NULL;
     }
     // New or replaced files have an empty revision id and there should be a
-    // file on disk for them.
-    elseif (empty($this->getRevisionId())) {
+    // file on disk for them. However we need to check for the page count to
+    // distinguish between those and initially migrated content.
+    elseif (empty($this->getRevisionId()) && $this->hasPageCount()) {
       return Url::fromUri(file_create_url($uri));
     }
     // For existing files, they should be accessible via the permanent URL.
@@ -830,7 +870,7 @@ public function getFileUrl() {
    * @return \Drupal\file\Entity\File
    *   Managed file.
    */
-  protected function createPreviewFile($new_uuid = TRUE) {
+  public function createPreviewFile($new_uuid = TRUE) {
     if ($this->isEmpty()) {
       return NULL;
     }
@@ -861,7 +901,7 @@ protected function createPreviewFile($new_uuid = TRUE) {
    * @return \Drupal\file\Entity\File
    *   Managed file.
    */
-  protected function createFile() {
+  public function createFile() {
     if ($this->isEmpty()) {
       return NULL;
     }
@@ -904,19 +944,8 @@ protected function updateFileFromRemote(File $file) {
     }
 
     // Save the docstore file content.
-    $success = $this->getDocstoreClient()
+    return $this->getDocstoreClient()
       ->downloadFileContentToFilePath($uuid, $uri, $revision_id);
-
-    // Update the file entity.
-    if ($success) {
-      // Update the file entity and save it so that we don't have to
-      // re-download the file to generate the preview. Its status being
-      // temporary it will be garbage collected as some point by the system.
-      $file->setMimeType(static::guessFileMimeType($uri));
-      $file->setTemporary();
-      $file->save();
-    }
-    return $success;
   }
 
   /**
@@ -1150,7 +1179,7 @@ public static function fileCanHavePreview(?File $file) {
    */
   public static function getFilePageCount(File $file) {
     if (!static::fileCanHavePreview($file)) {
-      return 1;
+      return 0;
     }
 
     $uri = $file->getFileUri();
@@ -1324,6 +1353,82 @@ public function getPageCount() {
     return 0;
   }
 
+  /**
+   * Check if there is a page count for the field item.
+   *
+   * Note: during the initial migration of the content, the page count is set
+   * to NULL. This allow us to distinguish them from items created via the
+   * form that should have a page count of 0.
+   *
+   * @return bool
+   *   TRUE if the field item has a page count.
+   */
+  public function hasPageCount() {
+    return !is_null($this->get('page_count')->getValue());
+  }
+
+  /**
+   * Update the page count for the field item.
+   *
+   * Note: this is normally only called once to update migrated file records
+   * with the page count when the preview (if any) is regenerated.
+   *
+   * @param \Drupal\file\Entity\File $file
+   *   File.
+   */
+  protected function updatePageCount(File $file) {
+    if ($this->hasPageCount()) {
+      return;
+    }
+    $page_count = static::getFilePageCount($file);
+    $this->get('page_count')->setValue($page_count);
+
+    $entity = $this->getEntity();
+    $entity_id = $entity->id();
+    $revision_id = $entity->getRevisionId();
+    $entity_type_id = $entity->getEntityTypeId();
+    $uuid = $this->getUuid();
+    $file_uuid = $this->getFileUuid();
+
+    if (empty($entity_id) || empty($revision_id) || empty($uuid) || empty($file_uuid)) {
+      return;
+    }
+
+    $field_name = $this->getFieldDefinition()->getName();
+    $table = $this->getFieldTableName($entity_type_id, $field_name);
+    $revision_table = $this->getFieldRevisionTableName($entity_type_id, $field_name);
+    $uuid_field = $this->getFieldColumnName($entity_type_id, $field_name, 'uuid');
+    $file_uuid_field = $this->getFieldColumnName($entity_type_id, $field_name, 'file_uuid');
+    $page_count_field = $this->getFieldColumnName($entity_type_id, $field_name, 'page_count');
+
+    // Try to update the DB records.
+    try {
+      $this->getDatabase()
+        ->update($table)
+        ->fields([$page_count_field => $page_count])
+        ->condition('entity_id', $entity_id, '=')
+        ->condition('revision_id', $revision_id, '=')
+        ->condition($uuid_field, $uuid, '=')
+        ->condition($file_uuid_field, $file_uuid, '=')
+        ->execute();
+
+      $this->getDatabase()
+        ->update($revision_table)
+        ->fields([$page_count_field => $page_count])
+        ->condition('entity_id', $entity_id, '=')
+        ->condition('revision_id', $revision_id, '=')
+        ->condition($uuid_field, $uuid, '=')
+        ->condition($file_uuid_field, $file_uuid, '=')
+        ->execute();
+
+      // We need to clear the cache so that the page count change is reflected.
+      Cache::invalidateTags($entity->getCacheTagsToInvalidate());
+      $this->getEntityTypeStorage($entity_type_id)->resetCache([$entity_id]);
+    }
+    catch (\Exception $exception) {
+    }
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -1424,13 +1529,8 @@ public function preSave(?ReliefWebFile $original_item = NULL) {
         $this->updatePreviewFile();
       }
 
-      // Ensure there is no local file left if we are storing remotely.
-      if (!$this->storeLocally()) {
-        $file = $this->loadFile();
-        if (!empty($file)) {
-          $this->deleteFileOnDisk($file->getFileUri());
-        }
-      }
+      // Ensure that the file is saved as permanent.
+      $this->ensureFilesArePermanent();
     }
     // @todo log the error and see what to tell the user.
     catch (\Exception $exception) {
@@ -1579,6 +1679,32 @@ protected function updatePreviewFile() {
     $this->changeFileLocation($file, $this->getPermanentUri(TRUE, TRUE));
   }
 
+  /**
+   * Make sure the files are permanent.
+   */
+  protected function ensureFilesArePermanent() {
+    $file = $this->loadFile();
+    if (!empty($file)) {
+      if ($file->isTemporary()) {
+        $file->setPermanent();
+        $file->save();
+      }
+
+      // Ensure there is no local file left if we are storing remotely.
+      if (!$this->storeLocally()) {
+        $this->deleteFileOnDisk($file->getFileUri());
+      }
+    }
+
+    $preview_file = $this->loadPreviewFile();
+    if (!empty($preview_file)) {
+      if ($preview_file->isTemporary()) {
+        $preview_file->setPermanent();
+        $preview_file->save();
+      }
+    }
+  }
+
   /**
    * Update the status of the file associated with this field item.
    *

From 1db3d22b9e07a51263ea35d2729a7eba2414a103 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 6 Dec 2021 09:09:20 +0000
Subject: [PATCH 215/720] [RW-25] Fix reliefweb_file field item list logic when
 migrating

---
 .../Field/FieldType/ReliefWebFileList.php     | 38 ++++++++++++-------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php
index 3b224ce25..2ea69dca8 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php
@@ -37,11 +37,17 @@ class ReliefWebFileList extends FieldItemList {
    * {@inheritdoc}
    */
   public function preSave() {
+    $entity = $this->getEntity();
+
     // Files migration is handled separately.
     // @todo remove when removing `reliefweb_migrate`.
     if (!empty($entity->_is_migrating)) {
       // Create the field item and preview files with the permanent public URIs.
       foreach ($this->list as $item) {
+        if ($item->isEmpty()) {
+          continue;
+        }
+
         $file = $item->createFile();
         if (empty($file)) {
           continue;
@@ -51,11 +57,11 @@ public function preSave() {
         $file->save();
         $item->get('file_uuid')->setValue($file->uuid());
 
-        if (!$item->canHavePreview() || empty($this->getPreviewPage())) {
+        if (!$item->canHavePreview() || empty($item->getPreviewPage())) {
           continue;
         }
-        $preview_file = $this->createPreviewFile(FALSE);
-        if (emtpy($preview_file)) {
+        $preview_file = $item->createPreviewFile(FALSE);
+        if (empty($preview_file)) {
           continue;
         }
         $preview_file->setFileUri($item->getPermanentUri(FALSE, TRUE));
@@ -77,7 +83,7 @@ public function preSave() {
     // Extract the original items so that we can process replaced files,
     // create revisions for old ones etc.
     $original_items = [];
-    $original = $this->getEntity()->original;
+    $original = $entity->original;
     if (isset($original)) {
       foreach ($original->get($this->definition->getName()) as $item) {
         if (!$item->isEmpty()) {
@@ -122,6 +128,8 @@ public function preSave() {
    * {@inheritdoc}
    */
   public function postSave($updated) {
+    $entity = $this->getEntity();
+
     // Files migration is handled separately.
     // @todo remove when removing `reliefweb_migrate`.
     if (!empty($entity->_is_migrating)) {
@@ -207,17 +215,19 @@ public function delete() {
     }
 
     // We load the file entities for the field item and preview files.
-    /** @var \Drupal\file\Entity\File[] $files */
-    $files = $this->getEntityTypeStorage('file')
-      ->loadByProperties(['uuid' => $file_uuids]);
-
-    // Delete the file entities and the file on disk if any.
-    foreach ($files as $file) {
-      $uri = $file->getFileUri();
-      if (!empty($uri) && file_exists($uri)) {
-        $this->getFileSystem()->unlink($uri);
+    if (!empty($file_uuids)) {
+      /** @var \Drupal\file\Entity\File[] $files */
+      $files = $this->getEntityTypeStorage('file')
+        ->loadByProperties(['uuid' => $file_uuids]);
+
+      // Delete the file entities and the file on disk if any.
+      foreach ($files as $file) {
+        $uri = $file->getFileUri();
+        if (!empty($uri) && file_exists($uri)) {
+          $this->getFileSystem()->unlink($uri);
+        }
+        $file->delete();
       }
-      $file->delete();
     }
 
     // If we just deleted a translation, we need to update the file references

From b031d561c10c42a51512567f743adba01cec9180 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 6 Dec 2021 09:10:05 +0000
Subject: [PATCH 216/720] [RW-25] Fix interactive file list template

---
 .../templates/reliefweb-file-list--interactive.html.twig      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-list--interactive.html.twig b/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-list--interactive.html.twig
index d3eb466dd..7d876845c 100644
--- a/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-list--interactive.html.twig
+++ b/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-list--interactive.html.twig
@@ -12,7 +12,11 @@
   <div{{ list_attributes }}>
     {% for item in list %}
     <figure>
+      {% if item.url is not empty %}
       <a href="{{ item.url }}" target="_blank" rel="noopener">{{ item.preview }}</a>
+      {% else %}
+      {{ item.preview }}
+      {% endif %}
       <figcaption>{{ item.label }}</figcaption>
     </figure>
     {% endfor %}

From 571213eb76f28d4494fd054ac4624b4493f13ff4 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 6 Dec 2021 09:11:34 +0000
Subject: [PATCH 217/720] [RW-25] Handle attachment migration

---
 .../reliefweb_docstore/drush.services.yml     |   6 +
 .../Commands/ReliefWebDocstoreCommands.php    | 421 ++++++++++++++++++
 .../src/Plugin/migrate/source/Node.php        | 137 ++++++
 3 files changed, 564 insertions(+)
 create mode 100644 html/modules/custom/reliefweb_docstore/drush.services.yml
 create mode 100644 html/modules/custom/reliefweb_docstore/src/Commands/ReliefWebDocstoreCommands.php

diff --git a/html/modules/custom/reliefweb_docstore/drush.services.yml b/html/modules/custom/reliefweb_docstore/drush.services.yml
new file mode 100644
index 000000000..6818efa13
--- /dev/null
+++ b/html/modules/custom/reliefweb_docstore/drush.services.yml
@@ -0,0 +1,6 @@
+services:
+  reliefweb_docstore.commands:
+    class: \Drupal\reliefweb_docstore\Commands\ReliefWebDocstoreCommands
+    arguments: ['@database', '@entity_field.manager', '@entity_type.manager', '@reliefweb_docstore.client']
+    tags:
+      - { name: drush.command }
diff --git a/html/modules/custom/reliefweb_docstore/src/Commands/ReliefWebDocstoreCommands.php b/html/modules/custom/reliefweb_docstore/src/Commands/ReliefWebDocstoreCommands.php
new file mode 100644
index 000000000..e080ac106
--- /dev/null
+++ b/html/modules/custom/reliefweb_docstore/src/Commands/ReliefWebDocstoreCommands.php
@@ -0,0 +1,421 @@
+<?php
+
+namespace Drupal\reliefweb_docstore\Commands;
+
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Database\Connection;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Entity\EntityFieldManagerInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\reliefweb_docstore\Services\DocstoreClient;
+use Drupal\reliefweb_utility\Helpers\LegacyHelper;
+use Drupal\reliefweb_utility\Traits\EntityDatabaseInfoTrait;
+use Drush\Commands\DrushCommands;
+
+/**
+ * ReliefWeb migration Drush commandfile.
+ *
+ * @todo remove after the migration from D7 to D9.
+ */
+class ReliefWebDocstoreCommands extends DrushCommands {
+
+  use EntityDatabaseInfoTrait;
+
+  /**
+   * The database connection.
+   *
+   * @var \Drupal\Core\Database\Connection
+   */
+  protected $database;
+
+  /**
+   * The entity field manager service.
+   *
+   * @var \Drupal\Core\Entity\EntityFieldManagerInterface
+   */
+  protected $entityFieldManager;
+
+  /**
+   * The entity type manager service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * The docstore client service.
+   *
+   * @var \Drupal\reliefweb_docstore\Services\DocstoreClient
+   */
+  protected $docstoreClient;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(
+    Connection $database,
+    EntityFieldManagerInterface $entity_field_manager,
+    EntityTypeManagerInterface $entity_type_manager,
+    DocstoreClient $docstore_client
+  ) {
+    $this->database = $database;
+    $this->entityFieldManager = $entity_field_manager;
+    $this->entityTypeManager = $entity_type_manager;
+    $this->docstoreClient = $docstore_client;
+  }
+
+  /**
+   * Migrate the report attachments to the docstore.
+   *
+   * @command rw-docstore:migrate-attachments
+   *
+   * @option base_url The base url of the site from which to retrieve the files.
+   * @option batch_size Number of reports with attachments to process at once.
+   * @option limit Maximum number of reports with non migrated files to process,
+   * 0 means process everything.
+   *
+   * @default options [
+   *   'base_url' => 'https://reliefweb.int',
+   *   'batch_size' => 1000,
+   *   'limit' => 0,
+   * ]
+   *
+   * @aliases rw-dma,rw-docstore-migrate-attachments
+   *
+   * @usage rw-docstore:migrate-attachments
+   *   Migrate the attachments to the docstore
+   *
+   * @validate-module-enabled reliefweb_docstore
+   */
+  public function migrateAttachments($options = [
+    'base_url' => 'https://reliefweb.int',
+    'batch_size' => 1000,
+    'limit' => 0,
+  ]) {
+    $base_url = $options['base_url'];
+    $batch_size = (int) $options['batch_size'];
+    $limit = (int) $options['limit'];
+
+    if (preg_match('#^https?://[^/]+$#', $base_url) !== 1) {
+      $this->logger()->error(dt('The base url must be in the form http(s)://example.test.'));
+      return FALSE;
+    }
+    if ($batch_size < 1 || $batch_size > 1000) {
+      $this->logger()->error(dt('The batch size must be within 1 and 1000.'));
+      return FALSE;
+    }
+    if ($limit < 0) {
+      $this->logger()->error(dt('The limit must be equal or superior to 0.'));
+      return FALSE;
+    }
+
+    // Get the attachment field table.
+    $table = $this->getFieldTableName('node', 'field_file');
+    $revision_id_field = $this->getFieldColumnName('node', 'field_file', 'revision_id');
+
+    // Retrieve the most recent report node with attachments.
+    $query = $this->getDatabase()->select($table, $table);
+    $query->condition($table . '.bundle', 'report');
+    $query->addExpression('MAX(' . $table . '.entity_id)');
+    $last = $query->execute()?->fetchField();
+
+    if (empty($last)) {
+      $this->logger()->info(dt('No report with attachments found.'));
+      return TRUE;
+    }
+
+    $last = $last + 1;
+    $count_ids = 0;
+    $count_files = 0;
+
+    while ($last !== NULL) {
+      $ids = $this->getDatabase()
+        ->select($table, $table)
+        ->fields($table, ['entity_id'])
+        ->condition($table . '.bundle', 'report')
+        ->condition($table . '.entity_id', $last, '<')
+        ->condition($table . '.' . $revision_id_field, 0, '=')
+        ->groupBy($table . '.entity_id')
+        ->orderBy($table . '.entity_id', 'DESC')
+        ->range(0, $limit > 0 ? min($limit - $count_ids, $batch_size) : $batch_size)
+        ->execute()
+        ?->fetchCol() ?? [];
+
+      if (!empty($ids)) {
+        $last = min($ids);
+        $count_ids += count($ids);
+        $count_files += $this->migrateFiles($ids, $base_url);
+
+        static::clearEntityCache('node', $ids);
+      }
+      else {
+        $last = NULL;
+        break;
+      }
+
+      if ($limit > 0 && $count_ids >= $limit) {
+        break;
+      }
+    }
+
+    $this->logger()->info(dt('Migrated @count_files attachments for @count_ids reports.', [
+      '@count_files' => $count_files,
+      '@count_ids' => $count_ids,
+    ]));
+    return TRUE;
+  }
+
+  /**
+   * Migrate the file attached to the given entity ids.
+   *
+   * @param array $ids
+   *   Entity ids.
+   * @param string $base_url
+   *   The base url of the site from which to retrieve the files.
+   *
+   * @return int
+   *   The number of migrated files.
+   */
+  protected function migrateFiles(array $ids, $base_url) {
+    $query = Database::getConnection('default', 'rwint7')
+      ->select('field_data_field_file', 'f')
+      ->fields('f', ['entity_id'])
+      ->condition('f.entity_type', 'node', '=')
+      ->condition('f.entity_id', $ids, 'IN');
+
+    $query->innerJoin('file_managed', 'fm', 'fm.fid = f.field_file_fid');
+    $query->fields('fm', ['fid', 'uri', 'filename', 'filemime']);
+
+    $records = $query->execute()?->fetchAll(\PDO::FETCH_ASSOC) ?? [];
+
+    // Group the files per entity.
+    $entities = [];
+    foreach ($records as $record) {
+      $entities[$record['entity_id']][] = $record;
+    }
+
+    // Migrate the files and create/update the remote document resources.
+    // @todo we need to find a way to identify if the file has been replaced.
+    // Maybe we can generate the file_uuid based on the file ID.
+    $count = 0;
+    foreach ($entities as $entity_id => $files) {
+      $uuids = [];
+      foreach ($files as $file) {
+        $uuid = $this->createOrUpdateRemoteFile($file, $base_url);
+        if ($uuid !== FALSE) {
+          $uuids[] = $uuid;
+        }
+      }
+      $this->updateOrCreateRemoteDocument($entity_id, $uuids);
+      $count += count($uuids);
+    }
+    return $count;
+  }
+
+  /**
+   * Create or update a remote file with the database file data.
+   *
+   * @param array $file
+   *   Legacy file data.
+   * @param string $base_url
+   *   The base url of the site from which to retrieve the files.
+   *
+   * @return string|false
+   *   The UUID of the file resource on success or FALSE.
+   */
+  protected function createOrUpdateRemoteFile(array $file, $base_url) {
+    $uuid = LegacyHelper::generateAttachmentUuid($file['uri']);
+
+    // First, try to get the file resource.
+    $response = $this->docstoreClient->getFile($uuid);
+
+    // If the file doesn't exist, try to create it.
+    if ($response->isNotFound()) {
+      $response = $this->docstoreClient->createFile([
+        'uuid' => $uuid,
+        'filename' => $file['filename'],
+        'mimetype' => $file['filemime'],
+        // The docstore will fetch the file content from this URL.
+        'uri' => LegacyHelper::getFileLegacyUrl($file['uri'], $base_url),
+      ]);
+
+      if (!$response->isSuccessful()) {
+        $this->logger()->info(dt('Unable to create remote file for @url.', [
+          '@url' => $file['url'],
+        ]));
+        return FALSE;
+      }
+    }
+    // Abort if something went wrong.
+    elseif (!$response->isSuccessful()) {
+      $this->logger()->info(dt('Unable to retrieve the remote file for @url.', [
+        '@url' => $file['url'],
+      ]));
+      return FALSE;
+    }
+
+    $content = $response->getContent();
+
+    // If there is no revision id then it means no content was uploaded, try.
+    if (empty($content['revision_id'])) {
+      $url = LegacyHelper::getFileLegacyUrl($file['uri']);
+      $response = $this->docstoreClient->updateFileContentFromFilePath($uuid, $url);
+
+      if (!$response->isSuccessful()) {
+        $this->logger()->info(dt('Unable to update remote file for @url.', [
+          '@url' => $file['url'],
+        ]));
+        return FALSE;
+      }
+
+      $content = $response->getContent();
+    }
+
+    // Get the revision ID.
+    if (empty($content['revision_id'])) {
+      $this->logger()->info(dt('Missing file revision id for @url.', [
+        '@url' => $file['url'],
+      ]));
+      return FALSE;
+    }
+    $revision_id = $content['revision_id'];
+
+    // Update the file record with the revision id.
+    $this->updateFileFieldRecord($uuid, $revision_id);
+
+    // Select the revision ID as the active one.
+    $this->docstoreClient->selectFileRevision($uuid, $revision_id);
+
+    return $uuid;
+  }
+
+  /**
+   * Update the file field record with the remote resource revision_id.
+   *
+   * @param string $uuid
+   *   File resource UUID.
+   * @param int $revision_id
+   *   File resource revision id.
+   */
+  protected function updateFileFieldRecord($uuid, $revision_id) {
+    $database = $this->getDatabase();
+    $table = $this->getFieldTableName('node', 'field_file');
+    $revision_table = $this->getFieldRevisionTableName('node', 'field_file');
+    $uuid_field = $this->getFieldColumnName('node', 'field_file', 'uuid');
+    $revision_id_field = $this->getFieldColumnName('node', 'field_file', 'revision_id');
+
+    // Update field table.
+    $database->update($table)
+      ->fields([$revision_id_field => $revision_id])
+      ->condition($uuid_field, $uuid)
+      ->execute();
+
+    // Update revision field table.
+    $database->update($revision_table)
+      ->fields([$revision_id_field => $revision_id])
+      ->condition($uuid_field, $uuid)
+      ->execute();
+  }
+
+  /**
+   * Update or create a remote document resource.
+   *
+   * @param int $entity_id
+   *   The entity id associated with the resource.
+   * @param array $uuids
+   *   The file uuids referenced by the document.
+   *
+   * @return string|false
+   *   The UUID of the document resource on success or FALSE.
+   */
+  protected function updateOrCreateRemoteDocument($entity_id, array $uuids) {
+    $uuid = LegacyHelper::generateDocumentUuid($entity_id);
+
+    // First, try to get the document resource.
+    $response = $this->docstoreClient->getDocument($uuid);
+
+    // If the document doesn't exist, create it.
+    if ($response->isNotFound()) {
+      $response = $this->docstoreClient->createDocument([
+        'uuid' => $uuid,
+        'title' => $this->getNodeTitle($entity_id),
+        'private' => TRUE,
+        'files' => $uuids,
+      ]);
+
+      if (!$response->isSuccessful()) {
+        $this->logger()->info(dt('Unable to create remote document @uuid.', [
+          '@uuid' => $uuid,
+        ]));
+        return FALSE;
+      }
+    }
+    // Abort if something went wrong.
+    elseif (!$response->isSuccessful()) {
+      $this->logger()->info(dt('Unable to retrieve the remote document @uuid.', [
+        '@uuid' => $uuid,
+      ]));
+      return FALSE;
+    }
+    // Update the remote document.
+    else {
+      $response = $this->docstoreClient->updateDocument($uuid, [
+        'files' => $uuids,
+      ]);
+
+      if (!$response->isSuccessful()) {
+        $this->logger()->info(dt('Unable to update remote document for @uuid.', [
+          '@uuid' => $uuid,
+        ]));
+        return FALSE;
+      }
+    }
+
+    return $uuid;
+  }
+
+  /**
+   * Get a node's title.
+   *
+   * @param int $id
+   *   The node id.
+   *
+   * @return string
+   *   The node title.
+   */
+  protected function getNodeTitle($id) {
+    $table = $this->getEntityTypeDataTable('node');
+    $id_field = $this->getEntityTypeIdField('node');
+    $label_field = $this->getEntityTypeLabelField('node');
+
+    return $this->getDatabase()
+      ->select($table, $table)
+      ->fields($table, [$label_field])
+      ->condition($table . '.' . $id_field, $id, '=')
+      ->execute()
+      ?->fetchField();
+  }
+
+  /**
+   * Reset the caches for the given entities.
+   *
+   * @param string $entity_type_id
+   *   Entity type ID.
+   * @param array $ids
+   *   Entity IDs.
+   */
+  public static function clearEntityCache($entity_type_id, array $ids) {
+    if (!empty($ids)) {
+      $cache_tags = [];
+      foreach ($ids as $id) {
+        $cache_tags[] = $entity_type_id . ':' . $id;
+      }
+      Cache::invalidateTags($cache_tags);
+
+      \Drupal::entityTypeManager()
+        ->getStorage($entity_type_id)
+        ?->resetCache($ids);
+    }
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Node.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Node.php
index f03479819..ab229921b 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Node.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Node.php
@@ -2,6 +2,9 @@
 
 namespace Drupal\reliefweb_migrate\Plugin\migrate\source;
 
+use Drupal\migrate\Row;
+use Drupal\reliefweb_utility\Helpers\LegacyHelper;
+
 /**
  * Retrieve nodes from the Drupal 7 database.
  *
@@ -81,9 +84,143 @@ public function query() {
       $query->orderBy('n.nid', 'DESC');
     }
 
+    $query->range(0, 1);
+    $query->orderBy('n.nid', 'DESC');
+
     return $query;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function prepareRow(Row $row) {
+    if (parent::prepareRow($row) === FALSE) {
+      return FALSE;
+    }
+
+    $bundle = $row->getSourceProperty('type');
+    if ($bundle === 'report') {
+      $nid = $row->getSourceProperty('nid');
+
+      // Generate the UUID based on the URI.
+      $uuid = LegacyHelper::generateDocumentUuid($nid);
+
+      // Set the node UUID.
+      $row->setDestinationProperty('uuid', $uuid);
+
+      // Prepare the file data to be added to the created/updated node.
+      $this->prepareAttachments($row);
+    }
+  }
+
+  /**
+   * Prepare the attachments to add to a report node.
+   *
+   * @param \Drupal\migrate\Row $row
+   *   Migration row.
+   */
+  protected function prepareAttachments(Row $row) {
+    // Skip if it's a revision as we cannot migrate file revisions because tere
+    // is no usable data anymore and in theory, the editorial workflow is to
+    // delete previous files when uploading a replacement. In that case, there
+    // is already a message in the revision log that will be migrated so we
+    // normally don't have anything to.
+    if ($this instanceof NodeRevision) {
+      return;
+    }
+
+    $field_file = $row->getSourceProperty('field_file');
+    if (empty($field_file)) {
+      return;
+    }
+
+    $items = [];
+    foreach ($field_file as $item) {
+      $items[$item['fid']] = $this->parseAttachmentDescription($item['description'] ?? '');
+    }
+    if (empty($items)) {
+      return;
+    }
+
+    // Load the data from the file_managed table.
+    $records = $this->select('file_managed', 'fm')
+      ->fields('fm', ['fid', 'uri', 'filename', 'filemime', 'filesize'])
+      ->condition('fm.status', 1, '=')
+      ->condition('fm.fid', array_keys($items), 'IN')
+      ->execute()
+      ?->fetchAll(\PDO::FETCH_OBJ) ?? [];
+
+    $attachments = [];
+    foreach ($records as $record) {
+      if (empty($record->uri)) {
+        continue;
+      }
+      $item = $items[$record->fid];
+      $item['uuid'] = LegacyHelper::generateAttachmentUuid($record->uri);
+      $item['file_uuid'] = LegacyHelper::generateAttachmentFileUuid($item['uuid'], $record->fid);
+      if (!empty($item['preview_page'])) {
+        $item['preview_uuid'] = LegacyHelper::generateAttachmentPreviewUuid($item['uuid'], $item['file_uuid']);
+      }
+      $item['file_name'] = $record->filename;
+      $item['file_mime'] = $record->filemime;
+      $item['file_size'] = $record->filesize;
+      // The revision ID will be updated when running the file migration script.
+      $item['revision_id'] = 0;
+      $attachments[$record->fid] = $item;
+    }
+
+    if (!empty($attachments)) {
+      $row->setDestinationProperty('field_file', $attachments);
+    }
+  }
+
+  /**
+   * Parse an attachment's description.
+   *
+   * @param string $description
+   *   File description.
+   *
+   * @return array
+   *   Array containing the optional description, language, preview page and
+   *   preview rotation.
+   */
+  protected function parseAttachmentDescription($description) {
+    if (empty($description)) {
+      return [];
+    }
+
+    $result = [];
+
+    // Extract the preview page and rotation from the description.
+    if (preg_match('/\|(?P<page>\d+)\|(?P<rotation>0|90|-90)$/', $description, $matches) === 1) {
+      if ($matches['page'] > 0) {
+        $result['preview_page'] = $matches['page'];
+        $result['preview_rotation'] = $matches['rotation'];
+      }
+    }
+    $description = preg_replace('/\|(\d+)\|(0|90|-90)$/', '', $description);
+
+    // Extract the language from the description.
+    if (!empty($description)) {
+      $languages = reliefweb_docstore_get_languages();
+      $versions = [];
+      $version_pattern = [];
+      foreach ($languages as $code => $label) {
+        $version_pattern[] = preg_quote($label . ' version');
+        $versions[$label . ' version'] = $code;
+      }
+      $version_pattern = implode('|', $version_pattern);
+      if (!empty($version_pattern) && preg_match('/( - )?(?P<version>' . $version_pattern . ')$/i', $description, $matches) === 1) {
+        $result['language'] = $versions[$matches['version']];
+        $description = mb_substr($description, 0, -mb_strlen($matches[0]));
+      }
+    }
+
+    $result['description'] = $description;
+
+    return $result;
+  }
+
   /**
    * {@inheritdoc}
    */

From 7485eb6d7b187b24850cd84c49a7a3407772a886 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 6 Dec 2021 09:12:07 +0000
Subject: [PATCH 218/720] [RW-25] Fix unrelated typo in README

---
 html/modules/custom/reliefweb_fields/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_fields/README.md b/html/modules/custom/reliefweb_fields/README.md
index 51d7b1543..a9ac2181f 100644
--- a/html/modules/custom/reliefweb_fields/README.md
+++ b/html/modules/custom/reliefweb_fields/README.md
@@ -3,7 +3,7 @@ ReliefWeb - Fields module
 
 This module provides custom field types, widgets and formatters:
 
-- `ReliefWebLink` field type used for the Key Content, Appeals and Reponse Plans
+- `ReliefWebLink` field type used for the Key Content, Appeals and Response Plans
   and Useful Links of country/disaster entities.
 - `ReliefWebPostingRights` field type used for the user posting rights of
   source entities.

From f2382c9a1e5b1b96d2e27972404f4d2f71b68979 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 6 Dec 2021 09:15:00 +0000
Subject: [PATCH 219/720] [RW-25] Enable reliefweb_docstore and add field_file
 on reports for the attachments

---
 ...ntity_form_display.node.report.default.yml |  8 ++++++
 ....entity_form_display.user.user.default.yml |  5 ++++
 ...ntity_view_display.node.report.default.yml |  9 +++++++
 ...tity_view_display.node.report.headline.yml |  2 ++
 ...entity_view_display.node.report.teaser.yml |  2 ++
 config/core.extension.yml                     |  1 +
 config/field.field.node.report.field_file.yml | 25 +++++++++++++++++++
 config/field.storage.node.field_file.yml      | 19 ++++++++++++++
 config/reliefweb_docstore.settings.yml        |  9 +++++++
 9 files changed, 80 insertions(+)
 create mode 100644 config/field.field.node.report.field_file.yml
 create mode 100644 config/field.storage.node.field_file.yml
 create mode 100644 config/reliefweb_docstore.settings.yml

diff --git a/config/core.entity_form_display.node.report.default.yml b/config/core.entity_form_display.node.report.default.yml
index b61aaa4d1..7a8cea540 100644
--- a/config/core.entity_form_display.node.report.default.yml
+++ b/config/core.entity_form_display.node.report.default.yml
@@ -11,6 +11,7 @@ dependencies:
     - field.field.node.report.field_disaster_type
     - field.field.node.report.field_embargo_date
     - field.field.node.report.field_feature
+    - field.field.node.report.field_file
     - field.field.node.report.field_headline
     - field.field.node.report.field_headline_image
     - field.field.node.report.field_headline_summary
@@ -33,6 +34,7 @@ dependencies:
     - datetime
     - media_library
     - path
+    - reliefweb_docstore
     - reliefweb_fields
     - text
 id: node.report.default
@@ -162,6 +164,12 @@ content:
     third_party_settings: {  }
     type: options_buttons
     region: content
+  field_file:
+    weight: 101
+    settings: {  }
+    third_party_settings: {  }
+    type: reliefweb_file
+    region: content
   field_headline:
     weight: 17
     settings:
diff --git a/config/core.entity_form_display.user.user.default.yml b/config/core.entity_form_display.user.user.default.yml
index ebd6abfd4..8f34dd3f3 100644
--- a/config/core.entity_form_display.user.user.default.yml
+++ b/config/core.entity_form_display.user.user.default.yml
@@ -16,6 +16,11 @@ content:
     settings: {  }
     third_party_settings: {  }
     region: content
+  contact:
+    weight: 5
+    settings: {  }
+    third_party_settings: {  }
+    region: content
   field_notes:
     weight: 7
     settings:
diff --git a/config/core.entity_view_display.node.report.default.yml b/config/core.entity_view_display.node.report.default.yml
index 185d3cae3..83d6a6382 100644
--- a/config/core.entity_view_display.node.report.default.yml
+++ b/config/core.entity_view_display.node.report.default.yml
@@ -11,6 +11,7 @@ dependencies:
     - field.field.node.report.field_disaster_type
     - field.field.node.report.field_embargo_date
     - field.field.node.report.field_feature
+    - field.field.node.report.field_file
     - field.field.node.report.field_headline
     - field.field.node.report.field_headline_image
     - field.field.node.report.field_headline_summary
@@ -29,6 +30,7 @@ dependencies:
     - node.type.report
   module:
     - datetime
+    - reliefweb_docstore
     - text
     - user
 id: node.report.default
@@ -80,6 +82,13 @@ content:
     third_party_settings: {  }
     type: entity_reference_label
     region: content
+  field_file:
+    weight: 13
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    type: reliefweb_file
+    region: content
   field_image:
     weight: 6
     label: hidden
diff --git a/config/core.entity_view_display.node.report.headline.yml b/config/core.entity_view_display.node.report.headline.yml
index 945c3ff09..e977d6b34 100644
--- a/config/core.entity_view_display.node.report.headline.yml
+++ b/config/core.entity_view_display.node.report.headline.yml
@@ -12,6 +12,7 @@ dependencies:
     - field.field.node.report.field_disaster_type
     - field.field.node.report.field_embargo_date
     - field.field.node.report.field_feature
+    - field.field.node.report.field_file
     - field.field.node.report.field_headline
     - field.field.node.report.field_headline_image
     - field.field.node.report.field_headline_summary
@@ -96,6 +97,7 @@ hidden:
   field_disaster_type: true
   field_embargo_date: true
   field_feature: true
+  field_file: true
   field_headline: true
   field_image: true
   field_language: true
diff --git a/config/core.entity_view_display.node.report.teaser.yml b/config/core.entity_view_display.node.report.teaser.yml
index cca7519f3..e36ab3170 100644
--- a/config/core.entity_view_display.node.report.teaser.yml
+++ b/config/core.entity_view_display.node.report.teaser.yml
@@ -12,6 +12,7 @@ dependencies:
     - field.field.node.report.field_disaster_type
     - field.field.node.report.field_embargo_date
     - field.field.node.report.field_feature
+    - field.field.node.report.field_file
     - field.field.node.report.field_headline
     - field.field.node.report.field_headline_image
     - field.field.node.report.field_headline_summary
@@ -97,6 +98,7 @@ hidden:
   field_disaster_type: true
   field_embargo_date: true
   field_feature: true
+  field_file: true
   field_headline: true
   field_headline_image: true
   field_headline_summary: true
diff --git a/config/core.extension.yml b/config/core.extension.yml
index 9b02eaaef..bd3b76227 100644
--- a/config/core.extension.yml
+++ b/config/core.extension.yml
@@ -48,6 +48,7 @@ module:
   reliefweb_bookmarks: 0
   reliefweb_contact: 0
   reliefweb_disaster_map: 0
+  reliefweb_docstore: 0
   reliefweb_dsr: 0
   reliefweb_entities: 0
   reliefweb_fields: 0
diff --git a/config/field.field.node.report.field_file.yml b/config/field.field.node.report.field_file.yml
new file mode 100644
index 000000000..3ca0f7029
--- /dev/null
+++ b/config/field.field.node.report.field_file.yml
@@ -0,0 +1,25 @@
+uuid: 6bd4bf62-1601-4f2d-b309-a598924cca2b
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_file
+    - node.type.report
+  module:
+    - reliefweb_docstore
+id: node.report.field_file
+field_name: field_file
+entity_type: node
+bundle: report
+label: Attachments
+description: ''
+required: false
+translatable: false
+default_value:
+  -
+    _original_values: {  }
+default_value_callback: ''
+settings:
+  file_extensions: 'csv doc docx jpg jpeg odp ods odt pdf png pps ppt pptx svg xls xlsx zip'
+  max_filesize: ''
+field_type: reliefweb_file
diff --git a/config/field.storage.node.field_file.yml b/config/field.storage.node.field_file.yml
new file mode 100644
index 000000000..26a9a0bc6
--- /dev/null
+++ b/config/field.storage.node.field_file.yml
@@ -0,0 +1,19 @@
+uuid: ffdd3293-cb29-471d-9a31-3d12e3eb32f2
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+    - reliefweb_docstore
+id: node.field_file
+field_name: field_file
+entity_type: node
+type: reliefweb_file
+settings: {  }
+module: reliefweb_docstore
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/reliefweb_docstore.settings.yml b/config/reliefweb_docstore.settings.yml
new file mode 100644
index 000000000..ad0839267
--- /dev/null
+++ b/config/reliefweb_docstore.settings.yml
@@ -0,0 +1,9 @@
+docstore_url: ''
+provider_uuid: ''
+api_key: ''
+prefix: reliefweb_
+local: true
+file_directory: attachments
+preview_directory: previews
+_core:
+  default_config_hash: p51VTBEaJE9L5iY3Imqr82p6ym3rNeOGMoKQ3VsimvA

From d9f51e40e9ee5ea8e25ae90c2bc5dc163bedbbfb Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 6 Dec 2021 13:46:59 +0000
Subject: [PATCH 220/720] [RW-25] Prevent display of empty origin or event
 links

---
 .../templates/content/node--report--full.html.twig              | 2 +-
 .../templates/content/node--training--full.html.twig            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/templates/content/node--report--full.html.twig b/html/themes/custom/common_design_subtheme/templates/content/node--report--full.html.twig
index 838a8fbe4..31e92df8d 100644
--- a/html/themes/custom/common_design_subtheme/templates/content/node--report--full.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/content/node--report--full.html.twig
@@ -134,7 +134,7 @@
         'origin': {
           'type': 'link',
           'label': 'Origin'|t,
-          'value': {
+          'value': meta.origin ? {
             'url': meta.origin,
             'title': 'View original'|t,
             'external': true,
diff --git a/html/themes/custom/common_design_subtheme/templates/content/node--training--full.html.twig b/html/themes/custom/common_design_subtheme/templates/content/node--training--full.html.twig
index eddbf264d..a9ac011d5 100644
--- a/html/themes/custom/common_design_subtheme/templates/content/node--training--full.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/content/node--training--full.html.twig
@@ -135,7 +135,7 @@
         },
         'event-url': {
           'type': 'link',
-          'value': {
+          'value': meta.event_url ? {
             'url': meta.event_url,
             'title': 'View event page'|t,
             'external': true,

From 03671934d1f2edc10e2d0258ac83eb9b869b226a Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 6 Dec 2021 14:35:09 +0000
Subject: [PATCH 221/720] [RW-25] Fix display of interactive screenshots title

---
 .../common_design_subtheme/components/rw-report/rw-report.css   | 2 +-
 .../reliefweb-file-list--interactive.html.twig                  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-report/rw-report.css b/html/themes/custom/common_design_subtheme/components/rw-report/rw-report.css
index 5deb544f6..395845038 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-report/rw-report.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-report/rw-report.css
@@ -59,7 +59,7 @@
   padding-top: 0;
   text-align: center;
 }
-.node--report--full .rw-attachment--interactive h3 {
+.node--report--full .rw-attachment--interactive .rw-attachment__title {
   margin: 0;
   padding: 0 0 20px 0;
   border: none;
diff --git a/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_docstore/reliefweb-file-list--interactive.html.twig b/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_docstore/reliefweb-file-list--interactive.html.twig
index f5f9da9b7..879624960 100644
--- a/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_docstore/reliefweb-file-list--interactive.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_docstore/reliefweb-file-list--interactive.html.twig
@@ -1,3 +1,4 @@
 {% set attributes = attributes.addClass('rw-attachment', 'rw-attachment--interactive') %}
+{% set title_attributes = title_attributes.addClass('rw-attachment__title') %}
 
 {% include '@reliefweb_docstore/reliefweb-file-list--interactive.html.twig' %}

From 453778f77bf6737da085dd25bbefcbf6b14a38b3 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Mon, 6 Dec 2021 08:47:09 -0700
Subject: [PATCH 222/720] adjust rules for icon placement

---
 .../components/rw-guidelines/rw-guidelines.css         | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
index 365f51c4f..e9f68b43b 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
@@ -10,7 +10,7 @@ form[data-with-guidelines] button[data-guideline] {
   overflow: hidden;
   width: 20px;
   height: 20px;
-  margin: -0.5rem 0 0 0.5rem;
+  margin: -0.75rem 0 0 0.5rem;
   padding: 0 0 0 12px;
   vertical-align: middle;
   border: 4px solid var(--cd-reliefweb-brand-grey--light);
@@ -20,7 +20,7 @@ form[data-with-guidelines] button[data-guideline] {
 }
 /* Legend with child button */
 form[data-with-guidelines] legend button[data-guideline] {
-  margin: -0.5rem 0 0 0.5rem;
+  margin: -0.75rem 0 0 0.5rem;
 }
 form[data-with-guidelines] .form-required button[data-guideline] {
   margin: 0 0 0 0.5rem;
@@ -29,11 +29,15 @@ form[data-with-guidelines] legend .form-required button[data-guideline] {
   order: 1;
 }
 /* Label followed by button */
+form[data-with-guidelines] label + button[data-guideline],
 form[data-with-guidelines] .form-required + button[data-guideline] {
+  margin: -0.75rem 0 0;
+}
+form[data-with-guidelines] label.option + button[data-guideline] {
   margin: -0.5rem 0 0;
 }
 form[data-with-guidelines] .visually-hidden + button[data-guideline] {
-  margin: -0.5rem 0 0 0.5rem;
+  margin: -0.75rem 0 0 0.5rem;
 }
 form[data-with-guidelines] button[data-guideline]:hover {
   background: var(--rw-icons--common--help--12--dark-red);

From 6195e49dba58d82ba5fa74334da67051e8648158 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 7 Dec 2021 02:12:28 +0000
Subject: [PATCH 223/720] [RW-25] Update README with the concepts, migration
 etc.

---
 .../custom/reliefweb_docstore/README.md       | 108 ++++++++++++++++++
 1 file changed, 108 insertions(+)

diff --git a/html/modules/custom/reliefweb_docstore/README.md b/html/modules/custom/reliefweb_docstore/README.md
index 16a9c3ab9..de84b1172 100644
--- a/html/modules/custom/reliefweb_docstore/README.md
+++ b/html/modules/custom/reliefweb_docstore/README.md
@@ -3,3 +3,111 @@ ReliefWeb Docstore
 
 This modules provides integration with the OCHA Document Store (docstore) to
 handle report attachments.
+
+## Concepts
+
+The docstore integration only concerns the attachments.
+
+All the report files are stored in the docstore but the preview of eligible files (i.e. PDF files) are stored on the RW site.
+
+This is because the page and rotation to use for the preview are specific to RW (another site may want to show something different) and there is currently no endpoint to generate previews in the docstore.
+
+In addition to the `file` resources, a `reliefweb_document` document resource is created for reports that have attachments to keep track of the file usages.
+
+The docstore integration is handled in the `reliefweb_docstore` module.
+
+### File field.
+
+The `reliefweb_docstore` module adds a new field type: `reliefweb_file` that handles the integration.
+
+This field type works with the revisions and allow the editorial worflow of replacing files without changing the file permanent URL.
+
+Each reliefweb_file entry contains:
+
+- `uuid`: the UUID of the file resource in the docstore (used for the permanent URL)
+- `revision_id`: the revision id of the file resource in the docstore
+- `file_uuid`: UUID of a file entity in the RW site used to keep track of the URL of the revision, its status (private/public) and to be able to regenerate the file preview. Note: there is no file on disk matching the file URI.
+- `file_name`: file name
+- `file_mime`: file mime type
+- `file_size`: file size in bytes
+- `description`: file description
+- `language`: language of the content
+- `page_count`: the number of pages in the document (only calculated for PDF files)
+- `preview_uuid`: UUID of a file entity on the RW site used for the preview. As opposed to the file entity mentioned above, there is a file on disk for the latest published revision of the report (the preview file is deleted for the old revisions as is recreated when reverting)
+- `preview_page`: the page used for the preview
+- `preview_rotation`:  the rotation to use for the preview
+
+#### File replacement:
+
+The `file_uuid` changes when replacing a file. Ex:
+
+- revision1:
+  - uuid1: uuid of the file resource in docstore
+  - revision_id1: id of file resource revision in docstore
+  - file_uuid1: uuid of the file entity in RW
+- revision2 (file is replaced):
+  - uuid1: same as revision1 because it's the same file resource
+  - revision_id2: id of the new revision in the docstore
+  - file_uuid2: uuid of the new file entity in RW corresponding to the new file resource revision.
+
+#### Preview update
+
+The `preview_uuid` changes when changing the preview page and rotation. This prevents overriding the preview accessible to the users when working on the form. Ex:
+
+- revision1:
+  - uuid1: uuid of the file resource in docstore
+  - revision_id1: id of file resource revision in docstore
+  - file_uuid1: uuid of the file entity in RW
+  - preview_uuid1: uuid of the preview file entity in RW
+  - preview_page: 1
+  - preview_rotation: 0
+- revision2 (preview page change):
+  - uuid1: same as revision1 because it's the same file resource
+  - revision_id1: same as revision1
+  - file_uuid1: same as revision1
+  - preview_uuid2: uuid of the new preview file entity in RW
+  - preview_page: 2
+  - preview_rotation: 0
+
+For files that cannot have previews, the `preview_*` fields are empty.
+
+### URIs
+
+The URI in the file entities determine the access to the files.
+
+For the latest revision of a **published** file, the URI of the file entity on RW is in the form `public://attachments/ab/cd/{uuid}.{ext}` where `{uuid}` is the UUID of the file resource in the docstore (permanent UUID).
+
+This URI is used to generate the permanent URL of the file on RW: `https//reliefweb.int/attachments/{uuid}/{file_name}` which is rewritten to get the file from the docstore `http://docstore.internal/files/{uuid}/{file_name}`.
+
+**Note**: if the report, the file is attached to, is not published, then the file URI is `private://attachments/ab/cd/{uuid}.{ext}` which translates to `https//reliefweb.int/private/attachments/{uuid}/{file_name}`. This URL is only accessible to users with the `access reliefweb private files` permission (i.e. Editors).
+
+For the other revisions, the URI of the file entities is `private://attachments/ab/cd/{file_uuid}.{ext}` where `{file_uuid}` is the UUID of the file entity.
+
+This is similar for the previews, except there is currently no particular URL pattern for those, notably because the previews are basically only shown as derivative images in the form `https//reliefweb.int/sites/default/styles/small/{scheme}/previews/ab/cd/{uuid}.png` where `{uuid}`  is the UUID of the file resource in the docstore (permanent UUID) and `{scheme}` is either "public" or "private" depending on the status of the report.
+
+### Public/private
+
+The field type manages the access to the files based on the status of the report they are attached to.
+
+If the report is published, then the files attached to the published revision are publicly accessible ortherwise they are only accessible to users with the `access reliefweb private files` permission. This allows the editors to view the nodes with their attachments as they would be shown to anonymous users once published.
+
+### Document resource
+
+A `reliefweb_document` resource is created in the docstore for reports with attachments. This is a revision less document resource that only contains references to all the files referenced by the report entity and its revisions on RW.
+
+Their purpose is to keep track of the file usage in the docstore so that another provider cannot delete files used on RW.
+
+## Migration
+
+The migration of the files is in 2 parts:
+
+1. creation of the file field and file entities when migrating the nodes (part of the classic migration in `reliefweb_migrate`)
+2. actual file migration, with file and document resource creation/update in the docstore. This is done via a drush command: `rw-docstore:migrate-attachments` from the `reliefweb_docstore` module.
+
+## Local mode
+
+The `reliefweb_docstore` has a setting to store the files locally instead of storing in the docstore: `reliefweb_docstore.settings.local`.
+
+When set to TRUE, no calls to the docstore are done and the files on disk are not removed. The rest (URIs, private/public etc.) is handled the same way.
+
+This mode is useful for testing and in case integrating with the docstore is considered a bad idea or not working for some reason a posteriori.

From 83bb9aa4d9f48b575d37daaf9cc79df55a00a3b0 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 7 Dec 2021 04:08:04 +0000
Subject: [PATCH 224/720] [RW-25] Remove debug code

---
 .../reliefweb_migrate/src/Plugin/migrate/source/Node.php       | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Node.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Node.php
index ab229921b..c62c6c019 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Node.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Node.php
@@ -84,9 +84,6 @@ public function query() {
       $query->orderBy('n.nid', 'DESC');
     }
 
-    $query->range(0, 1);
-    $query->orderBy('n.nid', 'DESC');
-
     return $query;
   }
 

From 9bb82b0aaaa22fb4b13d09a4ca78fd4dd71996b8 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 7 Dec 2021 04:08:29 +0000
Subject: [PATCH 225/720] [RW-25] Fix rw docstore drush command

---
 .../src/Commands/ReliefWebDocstoreCommands.php   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/html/modules/custom/reliefweb_docstore/src/Commands/ReliefWebDocstoreCommands.php b/html/modules/custom/reliefweb_docstore/src/Commands/ReliefWebDocstoreCommands.php
index e080ac106..91dee64d6 100644
--- a/html/modules/custom/reliefweb_docstore/src/Commands/ReliefWebDocstoreCommands.php
+++ b/html/modules/custom/reliefweb_docstore/src/Commands/ReliefWebDocstoreCommands.php
@@ -240,16 +240,16 @@ protected function createOrUpdateRemoteFile(array $file, $base_url) {
       ]);
 
       if (!$response->isSuccessful()) {
-        $this->logger()->info(dt('Unable to create remote file for @url.', [
-          '@url' => $file['url'],
+        $this->logger()->info(dt('Unable to create remote file for @uri.', [
+          '@uri' => $file['uri'],
         ]));
         return FALSE;
       }
     }
     // Abort if something went wrong.
     elseif (!$response->isSuccessful()) {
-      $this->logger()->info(dt('Unable to retrieve the remote file for @url.', [
-        '@url' => $file['url'],
+      $this->logger()->info(dt('Unable to retrieve the remote file for @uri.', [
+        '@uri' => $file['uri'],
       ]));
       return FALSE;
     }
@@ -262,8 +262,8 @@ protected function createOrUpdateRemoteFile(array $file, $base_url) {
       $response = $this->docstoreClient->updateFileContentFromFilePath($uuid, $url);
 
       if (!$response->isSuccessful()) {
-        $this->logger()->info(dt('Unable to update remote file for @url.', [
-          '@url' => $file['url'],
+        $this->logger()->info(dt('Unable to update remote file for @uri.', [
+          '@uri' => $file['uri'],
         ]));
         return FALSE;
       }
@@ -273,8 +273,8 @@ protected function createOrUpdateRemoteFile(array $file, $base_url) {
 
     // Get the revision ID.
     if (empty($content['revision_id'])) {
-      $this->logger()->info(dt('Missing file revision id for @url.', [
-        '@url' => $file['url'],
+      $this->logger()->info(dt('Missing file revision id for @uri.', [
+        '@uri' => $file['uri'],
       ]));
       return FALSE;
     }

From 1de619ab7288726c2b5b8e345788b6e69cfc266f Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 7 Dec 2021 09:29:08 +0100
Subject: [PATCH 226/720] Add guidelines for terms

---
 .../custom/guidelines/guidelines.module       | 20 +++++++++++++++++++
 .../Controller/GuidelineJsonController.php    |  3 +++
 .../GuidelineFieldTargetWidget.php            |  4 ++--
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/guidelines/guidelines.module b/html/modules/custom/guidelines/guidelines.module
index 09db5d394..707fc3b77 100644
--- a/html/modules/custom/guidelines/guidelines.module
+++ b/html/modules/custom/guidelines/guidelines.module
@@ -80,6 +80,26 @@ function guidelines_form_node_form_alter(array &$form, FormStateInterface $form_
   }
 }
 
+/**
+ * Implements hook_form_HOOK_alter().
+ */
+function guidelines_form_taxonomy_term_form_alter(array &$form, FormStateInterface $form_state) {
+  $config = \Drupal::config('guidelines.settings');
+  if ($config->get('use_json_loading')) {
+    $bundle = '';
+    $form_object = $form_state->getFormObject();
+    $entity_type = $form_object->getEntity()->getEntityType()->id();
+    if ($form_object instanceof ContentEntityForm) {
+      $bundle = $form_object->getEntity()->bundle();
+    }
+
+    $form['#attributes']['data-with-guidelines'] = '';
+    $form['#attributes']['data-guidelines-entity-type'] = $entity_type;
+    $form['#attributes']['data-guidelines-entity-bundle'] = $bundle;
+    $form['#attached']['library'][] = 'guidelines/guidelines-json';
+  }
+}
+
 /**
  * Implements hook_field_widget_form_alter().
  */
diff --git a/html/modules/custom/guidelines/src/Controller/GuidelineJsonController.php b/html/modules/custom/guidelines/src/Controller/GuidelineJsonController.php
index 3a821c23b..bb1511074 100644
--- a/html/modules/custom/guidelines/src/Controller/GuidelineJsonController.php
+++ b/html/modules/custom/guidelines/src/Controller/GuidelineJsonController.php
@@ -26,8 +26,11 @@ class GuidelineJsonController extends ControllerBase {
    *   An array suitable for drupal_render().
    */
   public function getFormGuidelines($entity_type, $bundle) {
+    $descriptions = [];
+
     /** @var Drupal\guidelines\Entity\Guideline[] $guidelines */
     $guidelines = Guideline::loadByEntity($entity_type);
+
     foreach ($guidelines as $guideline) {
       foreach ($guideline->field_field as $field) {
         list($e, $b, $f) = explode('.', $field->value);
diff --git a/html/modules/custom/guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetWidget.php b/html/modules/custom/guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetWidget.php
index c51ca68bd..ca5a4b2ca 100644
--- a/html/modules/custom/guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetWidget.php
+++ b/html/modules/custom/guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetWidget.php
@@ -119,12 +119,12 @@ protected function getOptions(FieldableEntityInterface $entity) {
             }
 
             /** @var \Drupal\Core\Field\BaseFieldDefinition $field_definition */
-            $key = 'node.' . $bundle . '.' . $field_name;
+            $key = $entity_type . '.' . $bundle . '.' . $field_name;
             $options[$key] = $bundle . ' > ' . $field_definition->getLabel() . ' (' . $field_name . ')';
           }
           elseif ($field_definition instanceof FieldConfig) {
             /** @var \Drupal\field\Entity\FieldConfig $field_definition */
-            $key = 'node.' . $bundle . '.' . $field_name;
+            $key = $entity_type . '.' . $bundle . '.' . $field_name;
             $options[$key] = $bundle . ' > ' . $field_definition->getLabel() . ' (' . $field_name . ')';
           }
         }

From a60da1d29a898f5bfdbda0f9310f436a0b45d589 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 7 Dec 2021 09:50:08 +0100
Subject: [PATCH 227/720] Check if there are guidelines

---
 .../custom/guidelines/guidelines.module       | 20 +++++++++++--------
 .../guidelines/src/Entity/Guideline.php       | 20 +++++++++++++++++++
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/html/modules/custom/guidelines/guidelines.module b/html/modules/custom/guidelines/guidelines.module
index 707fc3b77..ecfff7bbf 100644
--- a/html/modules/custom/guidelines/guidelines.module
+++ b/html/modules/custom/guidelines/guidelines.module
@@ -73,10 +73,12 @@ function guidelines_form_node_form_alter(array &$form, FormStateInterface $form_
       $bundle = $form_object->getEntity()->bundle();
     }
 
-    $form['#attributes']['data-with-guidelines'] = '';
-    $form['#attributes']['data-guidelines-entity-type'] = $entity_type;
-    $form['#attributes']['data-guidelines-entity-bundle'] = $bundle;
-    $form['#attached']['library'][] = 'guidelines/guidelines-json';
+    if (Guideline::entityBundleHasGuidelines($entity_type, $bundle)) {
+      $form['#attributes']['data-with-guidelines'] = '';
+      $form['#attributes']['data-guidelines-entity-type'] = $entity_type;
+      $form['#attributes']['data-guidelines-entity-bundle'] = $bundle;
+      $form['#attached']['library'][] = 'guidelines/guidelines-json';
+    }
   }
 }
 
@@ -93,10 +95,12 @@ function guidelines_form_taxonomy_term_form_alter(array &$form, FormStateInterfa
       $bundle = $form_object->getEntity()->bundle();
     }
 
-    $form['#attributes']['data-with-guidelines'] = '';
-    $form['#attributes']['data-guidelines-entity-type'] = $entity_type;
-    $form['#attributes']['data-guidelines-entity-bundle'] = $bundle;
-    $form['#attached']['library'][] = 'guidelines/guidelines-json';
+    if (Guideline::entityBundleHasGuidelines($entity_type, $bundle)) {
+      $form['#attributes']['data-with-guidelines'] = '';
+      $form['#attributes']['data-guidelines-entity-type'] = $entity_type;
+      $form['#attributes']['data-guidelines-entity-bundle'] = $bundle;
+      $form['#attached']['library'][] = 'guidelines/guidelines-json';
+    }
   }
 }
 
diff --git a/html/modules/custom/guidelines/src/Entity/Guideline.php b/html/modules/custom/guidelines/src/Entity/Guideline.php
index e7e457282..df0ff8606 100644
--- a/html/modules/custom/guidelines/src/Entity/Guideline.php
+++ b/html/modules/custom/guidelines/src/Entity/Guideline.php
@@ -357,4 +357,24 @@ public static function loadByEntity($entity) {
     return $result ? $storage->loadMultiple($result) : [];
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public static function entityBundleHasGuidelines($entity, $bundle) {
+    $entity_type_repository = \Drupal::service('entity_type.repository');
+    $entity_type_manager = \Drupal::entityTypeManager();
+    $storage = $entity_type_manager->getStorage($entity_type_repository->getEntityTypeFromClass(static::class));
+
+    $query = $storage->getQuery();
+    if (empty($bundle)) {
+      $query->condition('field_field', $entity . '.', 'STARTS_WITH');
+    }
+    else {
+      $query->condition('field_field', $entity . '.' . $bundle . '.', 'STARTS_WITH');
+    }
+
+    $count = $query->count()->execute();
+    return $count > 0;
+  }
+
 }

From 1007cec9a18f69e5338f0a5b4222e9f56f591579 Mon Sep 17 00:00:00 2001
From: Peter Droogmans <peter@attiks.com>
Date: Tue, 7 Dec 2021 09:50:56 +0100
Subject: [PATCH 228/720] Update
 html/modules/custom/guidelines/src/Controller/GuidelineController.php

Co-authored-by: orakili <github@orakili.net>
---
 .../custom/guidelines/src/Controller/GuidelineController.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/guidelines/src/Controller/GuidelineController.php b/html/modules/custom/guidelines/src/Controller/GuidelineController.php
index 8ae96dcd5..847bb97b2 100644
--- a/html/modules/custom/guidelines/src/Controller/GuidelineController.php
+++ b/html/modules/custom/guidelines/src/Controller/GuidelineController.php
@@ -100,8 +100,8 @@ public function revisionOverview(GuidelineInterface $guideline) {
     ]);
 
     $header = [$this->t('Revision'), $this->t('Operations')];
-    $revert_permission = (($account->hasPermission("revert all guideline revisions") || $account->hasPermission('administer guideline entities')));
-    $delete_permission = (($account->hasPermission("delete all guideline revisions") || $account->hasPermission('administer guideline entities')));
+    $revert_permission = $account->hasPermission("revert all guideline revisions") || $account->hasPermission('administer guideline entities');
+    $delete_permission = $account->hasPermission("delete all guideline revisions") || $account->hasPermission('administer guideline entities');
 
     $rows = [];
 

From 293f4d0f4d867c894f8da62a58b3f2bd4b6a14a5 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 7 Dec 2021 09:55:10 +0100
Subject: [PATCH 229/720] Make sure revision exists

---
 .../src/Controller/GuidelineController.php    | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/html/modules/custom/guidelines/src/Controller/GuidelineController.php b/html/modules/custom/guidelines/src/Controller/GuidelineController.php
index 847bb97b2..3650001a0 100644
--- a/html/modules/custom/guidelines/src/Controller/GuidelineController.php
+++ b/html/modules/custom/guidelines/src/Controller/GuidelineController.php
@@ -54,7 +54,11 @@ public function revisionShow($guideline_revision) {
       ->loadRevision($guideline_revision);
     $view_builder = $this->entityTypeManager()->getViewBuilder('guideline');
 
-    return $view_builder->view($guideline);
+    if ($guideline) {
+      return $view_builder->view($guideline);
+    }
+
+    return [];
   }
 
   /**
@@ -69,10 +73,15 @@ public function revisionShow($guideline_revision) {
   public function revisionPageTitle($guideline_revision) {
     $guideline = $this->entityTypeManager()->getStorage('guideline')
       ->loadRevision($guideline_revision);
-    return $this->t('Revision of %title from %date', [
-      '%title' => $guideline->label(),
-      '%date' => $this->dateFormatter->format($guideline->getRevisionCreationTime()),
-    ]);
+
+    if ($guideline) {
+      return $this->t('Revision of %title from %date', [
+        '%title' => $guideline->label(),
+        '%date' => $this->dateFormatter->format($guideline->getRevisionCreationTime()),
+      ]);
+    }
+
+    return $this->t('Non existing revision');
   }
 
   /**

From 1fc3e43f37f3a8fe18f858da6666ad4b13f39f7b Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 7 Dec 2021 09:59:53 +0100
Subject: [PATCH 230/720] Use entity and bundle label

---
 .../GuidelineFieldTargetWidget.php            | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetWidget.php b/html/modules/custom/guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetWidget.php
index ca5a4b2ca..7ecd42ddf 100644
--- a/html/modules/custom/guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetWidget.php
+++ b/html/modules/custom/guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetWidget.php
@@ -120,12 +120,12 @@ protected function getOptions(FieldableEntityInterface $entity) {
 
             /** @var \Drupal\Core\Field\BaseFieldDefinition $field_definition */
             $key = $entity_type . '.' . $bundle . '.' . $field_name;
-            $options[$key] = $bundle . ' > ' . $field_definition->getLabel() . ' (' . $field_name . ')';
+            $options[$key] = $this->getBundleLabel($entity_type, $bundle) . ' > ' . $field_definition->getLabel() . ' (' . $field_name . ')';
           }
           elseif ($field_definition instanceof FieldConfig) {
             /** @var \Drupal\field\Entity\FieldConfig $field_definition */
             $key = $entity_type . '.' . $bundle . '.' . $field_name;
-            $options[$key] = $bundle . ' > ' . $field_definition->getLabel() . ' (' . $field_name . ')';
+            $options[$key] = $this->getBundleLabel($entity_type, $bundle) . ' > ' . $field_definition->getLabel() . ' (' . $field_name . ')';
           }
         }
       }
@@ -136,4 +136,20 @@ protected function getOptions(FieldableEntityInterface $entity) {
     return $this->options;
   }
 
+  /**
+   * Get bundle label.
+   */
+  protected function getBundleLabel($entity_type_id, $bundle) {
+    $entity_type_manager = \Drupal::entityTypeManager();
+    $entity_type = $entity_type_manager
+      ->getStorage($entity_type_id)
+      ->getEntityType();
+    $bundle_label = $entity_type_manager
+      ->getStorage($entity_type->getBundleEntityType())
+      ->load($bundle)
+      ->label();
+
+    return $entity_type->getLabel() . ' > ' . $bundle_label;
+  }
+
 }

From 9eab4c8ed9e448bad7278d445a632dfe22296fb3 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 7 Dec 2021 10:05:25 +0100
Subject: [PATCH 231/720] Skip computed, internal and read-only fields.

---
 .../Plugin/Field/FieldWidget/GuidelineFieldTargetWidget.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/html/modules/custom/guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetWidget.php b/html/modules/custom/guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetWidget.php
index 7ecd42ddf..94681ef1b 100644
--- a/html/modules/custom/guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetWidget.php
+++ b/html/modules/custom/guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetWidget.php
@@ -112,7 +112,13 @@ protected function getOptions(FieldableEntityInterface $entity) {
       foreach ($enabled_entities as $enabled_entity) {
         list($entity_type, $bundle) = explode('.', $enabled_entity);
         $field_definitions = $entity_field_manager->getFieldDefinitions($entity_type, $bundle);
+
         foreach ($field_definitions as $field_name => $field_definition) {
+          // Skip computed, internal and read-only fields.
+          if ($field_definition->isComputed() || $field_definition->isInternal() || $field_definition->isReadOnly()) {
+            continue;
+          }
+
           if ($field_definition instanceof BaseFieldDefinition) {
             if (in_array($field_name, $hidden_base_fields)) {
               continue;

From 8a03563a91b1188551d4f18c3d7df35fbc4d8803 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 7 Dec 2021 10:07:09 +0100
Subject: [PATCH 232/720] Revert "Remove alters of description"

This reverts commit 03b23ff8cf3ee5887b183f15b3dda8997b11291c.
---
 .../custom/reliefweb_entities/src/Services/JobFormAlter.php   | 4 ++++
 .../reliefweb_entities/src/Services/TrainingFormAlter.php     | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/html/modules/custom/reliefweb_entities/src/Services/JobFormAlter.php b/html/modules/custom/reliefweb_entities/src/Services/JobFormAlter.php
index f0c4f0ee3..3e28e99e1 100644
--- a/html/modules/custom/reliefweb_entities/src/Services/JobFormAlter.php
+++ b/html/modules/custom/reliefweb_entities/src/Services/JobFormAlter.php
@@ -17,6 +17,10 @@ class JobFormAlter extends EntityFormAlterServiceBase {
    * {@inheritdoc}
    */
   protected function addBundleFormAlterations(array &$form, FormStateInterface $form_state) {
+    // Add a guide on how to populate the field as description to the title
+    // field.
+    $form['title']['widget'][0]['value']['#description'] = $this->t('The best job titles are brief and specific. Please refrain from indicating location, salary and other details in the title, if possible.');
+
     // Force shorter titles.
     $form['title']['widget'][0]['value']['#maxlength'] = 150;
 
diff --git a/html/modules/custom/reliefweb_entities/src/Services/TrainingFormAlter.php b/html/modules/custom/reliefweb_entities/src/Services/TrainingFormAlter.php
index 32dab9143..e080fc218 100644
--- a/html/modules/custom/reliefweb_entities/src/Services/TrainingFormAlter.php
+++ b/html/modules/custom/reliefweb_entities/src/Services/TrainingFormAlter.php
@@ -19,6 +19,10 @@ class TrainingFormAlter extends EntityFormAlterServiceBase {
    * {@inheritdoc}
    */
   protected function addBundleFormAlterations(array &$form, FormStateInterface $form_state) {
+    // Add a guide on how to populate the field as description to the title
+    // field.
+    $form['title']['widget'][0]['value']['#description'] = $this->t('Should contain only the title of the training. Other information such as location, date and Organization should not be included in this field.');
+
     // Force shorter titles.
     $form['title']['widget'][0]['value']['#maxlength'] = 150;
 

From 38a84d514af5327bd22bdb08b6238623ac29ecd3 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 7 Dec 2021 10:11:26 +0100
Subject: [PATCH 233/720] Remove copy-paste

---
 .../GuidelineSinglePageController.php         | 281 ------------------
 1 file changed, 281 deletions(-)

diff --git a/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php b/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
index b5aa5691f..3d9d97046 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
@@ -8,12 +8,8 @@
 use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\Session\AccountProxyInterface;
 use Drupal\Core\State\StateInterface;
-use Drupal\node\NodeInterface;
 use Drupal\reliefweb_api\Services\ReliefWebApiClient;
-use Drupal\reliefweb_rivers\RiverServiceBase;
-use Drupal\reliefweb_utility\Helpers\MediaHelper;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\Response;
 
 /**
  * Controller for the guidelines.
@@ -149,281 +145,4 @@ public function getPageContent() {
     return $build;
   }
 
-  /**
-   * Get the API payload to get the latest headlines.
-   *
-   * @param int $limit
-   *   Number of headlines to return.
-   *
-   * @return array
-   *   API Payload.
-   */
-  public function getHeadlinesApiPayload($limit = 8) {
-    $payload = RiverServiceBase::getRiverApiPayload('report', 'headlines');
-    $payload['fields']['exclude'][] = 'file';
-    $payload['fields']['include'][] = 'headline.image';
-    $payload['sort'] = ['score:desc', 'date.created:desc'];
-    $payload['limit'] = $limit;
-
-    // Get the list of manually selected headlines.
-    $selected = $this->state->get('reliefweb_headline_selection', []);
-    $selected = array_slice($selected, 0, $limit);
-
-    // Build the search query, boosting the manually selected headlines.
-    // As the headlines are ordered by position (priority) we reverse the
-    // list so that we can use the index as base for the boost (higher boost =
-    // higher priority).
-    $query = ['_exists_:headline.title'];
-    foreach (array_reverse($selected) as $index => $id) {
-      $query[] = 'id:' . $id . '^' . ($index + 1) * 10;
-    }
-    $payload['query']['value'] = implode(' OR ', $query);
-
-    return [
-      'resource' => 'reports',
-      'bundle' => 'report',
-      'payload' => $payload,
-      'exclude' => ['posted', 'published', 'format'],
-      'title' => $this->t('Latest Headlines'),
-      'callback' => [$this, 'parseHeadlinesApiData'],
-      'view' => 'headlines',
-      // Link to the headlines river for the entity.
-      'more' => [
-        'url' => RiverServiceBase::getRiverUrl('report', [
-          'view' => 'headlines',
-        ]),
-        'label' => $this->t('View all headlines'),
-      ],
-    ];
-  }
-
-  /**
-   * Get the API payload to get the most read reports.
-   *
-   * @param int $limit
-   *   Number of documents to return.
-   *
-   * @return array
-   *   API Payload.
-   *
-   * @todo This currently returns the latest updates, not the most read.
-   * Refactor after add back redording of most read content.
-   */
-  public function getMostReadApiPayload($limit = 2) {
-    $payload = RiverServiceBase::getRiverApiPayload('report');
-    $payload['fields']['exclude'][] = 'file';
-    $payload['fields']['exclude'][] = 'body-html';
-    $payload['limit'] = $limit;
-
-    return [
-      'resource' => 'reports',
-      'bundle' => 'report',
-      'payload' => $payload,
-      'title' => $this->t('Latest Updates'),
-      'callback' => [$this, 'parseMostReadApiData'],
-      // Link to the updates river for the entity.
-      'more' => [
-        'url' => RiverServiceBase::getRiverUrl('report'),
-        'label' => $this->t('View all updates'),
-      ],
-    ];
-  }
-
-  /**
-   * Get the API payload to get the latest disasters.
-   *
-   * @param int $limit
-   *   Number of disasters to return.
-   *
-   * @return array
-   *   API Payload.
-   */
-  public function getDisastersApiPayload($limit = 5) {
-    $payload = RiverServiceBase::getRiverApiPayload('disaster', 'ongoing');
-    $payload['fields']['exclude'][] = 'country';
-    $payload['fields']['exclude'][] = 'type';
-    $payload['fields']['exclude'][] = 'date';
-    $payload['sort'] = ['date.created:desc'];
-    $payload['limit'] = $limit;
-
-    return [
-      'resource' => 'disasters',
-      'bundle' => 'disaster',
-      'payload' => $payload,
-      'title' => $this->t('Recent Disasters'),
-      'callback' => [$this, 'parseDisastersApiData'],
-      // Link to the disasters river for the entity.
-      'more' => [
-        'url' => RiverServiceBase::getRiverUrl('disaster'),
-        'label' => $this->t('View all disasters'),
-      ],
-    ];
-  }
-
-  /**
-   * Get the API payload to get the latest blog post.
-   *
-   * @return array
-   *   API Payload.
-   */
-  public function getBlogPostApiPayload() {
-    $payload = RiverServiceBase::getRiverApiPayload('blog_post');
-    $payload['limit'] = 1;
-
-    return [
-      'resource' => 'blog',
-      'bundle' => 'blog_post',
-      'payload' => $payload,
-      'title' => $this->t('Latest Blog'),
-      'callback' => [$this, 'parseBlogPostApiData'],
-      // Link to the blog river for the entity.
-      'more' => [
-        'url' => RiverServiceBase::getRiverUrl('blog_post'),
-        'label' => $this->t('View all blog posts'),
-      ],
-    ];
-  }
-
-  /**
-   * Get the API payload to get the number of job or training.
-   *
-   * @param string $bundle
-   *   Entity bundle: job or training.
-   *
-   * @return array
-   *   API Payload.
-   */
-  public function getOpportuntiesTotalApiPayload($bundle) {
-    $payload = [
-      // We just want the total count.
-      'limit' => 0,
-    ];
-
-    if ($bundle === 'job') {
-      $title = $this->t('Open jobs');
-      $resource = 'jobs';
-    }
-    else {
-      $title = $this->t('Training programs');
-      $resource = 'training';
-    }
-
-    return [
-      'resource' => $resource,
-      'bundle' => $bundle,
-      'payload' => $payload,
-      'title' => $title,
-      // Link to the job/training river for the entity.
-      'url' => RiverServiceBase::getRiverUrl($bundle),
-    ];
-  }
-
-  /**
-   * Get the latest announcement to feature on the homepage.
-   *
-   * @return array
-   *   Render array for the announcement section.
-   *
-   * @todo Use a announcement node view mode for that?
-   */
-  public function getLatestAnnouncement() {
-    $storage = $this->entityTypeManager
-      ->getStorage('node');
-
-    $nids = $storage
-      ->getQuery()
-      ->condition('type', 'announcement')
-      ->condition('status', NodeInterface::PUBLISHED)
-      ->sort('created', 'DESC')
-      ->range(0, 1)
-      ->execute();
-
-    $nodes = $storage->loadMultiple($nids);
-
-    if (!empty($nodes)) {
-      $node = reset($nodes);
-
-      if ($node->hasField('field_image') && !$node->field_image->isEmpty()) {
-        $image = MediaHelper::getImage($node->field_image);
-
-        return [
-          '#theme' => 'reliefweb_homepage_announcement',
-          '#id' => 'announcement',
-          '#url' => $node->field_link->uri,
-          '#image' => [
-            'url' => $image['uri'],
-            'title' => $node->label(),
-            'alt' => $node->body->value ?? $node->label(),
-            'width' => $image['width'],
-            'height' => $image['height'],
-          ],
-          '#cache' => [
-            'tags' => ['node_list:announcement'],
-          ],
-        ];
-      }
-    }
-    return [];
-  }
-
-  /**
-   * Ajax callback to retrieve the list of selected headlines.
-   *
-   * @return \Symfony\Component\HttpFoundation\Response
-   *   Rendered headline list.
-   */
-  public function retrieveHeadlines() {
-    // Get the latest 24 headlines.
-    $query = $this->getHeadlinesApiPayload(24);
-
-    // Get the API data.
-    $results = $this->reliefWebApiClient
-      ->requestMultiple(['headlines' => $query]);
-
-    $build = [];
-    if (!empty($results['headlines']['data'])) {
-      $result = $results['headlines'];
-
-      // Sort the headlines by id DESC to have the most recent first.
-      uasort($result['data'], function ($a, $b) {
-        return $b['id'] <=> $a['id'];
-      });
-
-      $bundle = $query['bundle'];
-      $view = $query['view'] ?? '';
-      $exclude = $query['exclude'] ?? [];
-
-      $entities = RiverServiceBase::getRiverData($bundle, $result, $view, $exclude);
-      if (!empty($entities)) {
-        $build = [
-          '#theme' => 'reliefweb_rivers_river',
-          '#id' => '#headlines',
-          '#title' => $query['title'],
-          '#resource' => $query['resource'],
-          '#entities' => $entities,
-        ];
-      }
-    }
-
-    return new Response($this->renderer->render($build));
-  }
-
-  /**
-   * Ajax callback to update the list of selected headlines.
-   *
-   * @return \Symfony\Component\HttpFoundation\Response
-   *   200 if the update was successful, 500 otherwise.
-   */
-  public function updateHeadlines() {
-    $success = FALSE;
-    // Limit to 10,000 bytes (should never be reached).
-    $data = json_decode(file_get_contents('php://input', FALSE, NULL, 0, 10000) ?? '', TRUE);
-    if (!empty($data) && is_array($data)) {
-      $selection = array_slice(array_filter($data, 'is_int'), 0, 8);
-      $this->state->set('reliefweb_headline_selection', $selection);
-      $success = TRUE;
-    }
-    return new Response('', $success ? 200 : 500);
-  }
-
 }

From e498b5ce62a56f9509175059efb552df1b88c65b Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 7 Dec 2021 11:00:31 +0100
Subject: [PATCH 234/720] Add parent title

---
 .../src/Controller/GuidelineSinglePageController.php            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php b/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
index 3d9d97046..5a4641c26 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
@@ -116,7 +116,7 @@ public function getPageContent() {
         $items[$parents[0]]['#children'][] = [
           '#theme' => 'reliefweb_guidelines_item',
           '#id' => $guideline->hasField('field_short_link') ? Html::getUniqueId($guideline->field_short_link->value) : Html::getUniqueId($guideline->field_title->value),
-          '#title' => $guideline->field_title->value,
+          '#title' => $guidelines[$parents[0]]->field_title->value . ' > ' . $guideline->field_title->value,
           '#description' => $guideline->hasField('field_description') ? check_markup($guideline->field_description->value, $guideline->field_description->format) : '',
         ];
       }

From bb551e0d2e985d30e211c2c48eff0f138263a9fd Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 7 Dec 2021 11:49:18 +0100
Subject: [PATCH 235/720] Fix on page links

---
 .../reliefweb_guidelines.module               |  8 ++++++
 .../GuidelineSinglePageController.php         | 25 +++++++++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
index e016d7527..9d0f7d132 100644
--- a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
@@ -132,6 +132,14 @@ function reliefweb_guidelines_migrate_from_trello() {
                     'value' => $key,
                   ];
                 }
+                elseif (FieldStorageConfig::loadByName('taxonomy_term', $field_name)) {
+                  $found = TRUE;
+                  $key = 'taxonomy_term.' . $bundle . '.' . $field_name;
+                  $values['field_field'] = $values['field_field'] ?? [];
+                  $values['field_field'][] = [
+                    'value' => $key,
+                  ];
+                }
               }
 
               // Log fields not found.
diff --git a/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php b/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
index 5a4641c26..bb28301e5 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
@@ -117,7 +117,7 @@ public function getPageContent() {
           '#theme' => 'reliefweb_guidelines_item',
           '#id' => $guideline->hasField('field_short_link') ? Html::getUniqueId($guideline->field_short_link->value) : Html::getUniqueId($guideline->field_title->value),
           '#title' => $guidelines[$parents[0]]->field_title->value . ' > ' . $guideline->field_title->value,
-          '#description' => $guideline->hasField('field_description') ? check_markup($guideline->field_description->value, $guideline->field_description->format) : '',
+          '#description' => $this->cleanAtags($guideline->hasField('field_description') ? check_markup($guideline->field_description->value, $guideline->field_description->format) : ''),
         ];
       }
       else {
@@ -125,7 +125,7 @@ public function getPageContent() {
           '#theme' => 'reliefweb_guidelines_item',
           '#id' => $guideline->hasField('field_short_link') ? Html::getUniqueId($guideline->field_short_link->value) : Html::getUniqueId($guideline->field_title->value),
           '#title' => $guideline->field_title->value,
-          '#description' => $guideline->hasField('field_description') ? check_markup($guideline->field_description->value, $guideline->field_description->format) : '',
+          '#description' => $this->cleanAtags($guideline->hasField('field_description') ? check_markup($guideline->field_description->value, $guideline->field_description->format) : ''),
           '#children' => [],
         ];
       }
@@ -145,4 +145,25 @@ public function getPageContent() {
     return $build;
   }
 
+  /**
+   * Clean A-tags.
+   */
+  protected function cleanAtags($text) {
+    if (empty($text)) {
+      return $text;
+    }
+
+    $pattern = '/\<a.+href="https:\/\/trello.com\/c\/([0-9A-Z]+)"/i';
+    $text = preg_replace_callback($pattern, function ($matches) {
+      return '<a class="xyzzy1" href="#' . strtolower($matches[1]) . '"';
+    }, $text);
+
+    $pattern = '/\<a.+href="https:\/\/guidelines.rwdev.org\/#([0-9A-Z]+)"/i';
+    $text = preg_replace_callback($pattern, function ($matches) {
+      return '<a class="xyzzy2" href="#' . strtolower($matches[1]) . '"';
+    }, $text);
+
+    return $text;
+  }
+
 }

From d7cbb4b9ede2981160bc415c57ce41f805a9caac Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 7 Dec 2021 11:53:05 +0100
Subject: [PATCH 236/720] Convert url to links

---
 config/filter.format.guideline.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/config/filter.format.guideline.yml b/config/filter.format.guideline.yml
index e9ca53070..535293692 100644
--- a/config/filter.format.guideline.yml
+++ b/config/filter.format.guideline.yml
@@ -31,3 +31,10 @@ filters:
     status: true
     weight: -20
     settings: {  }
+  filter_url:
+    id: filter_url
+    provider: filter
+    status: true
+    weight: 0
+    settings:
+      filter_url_length: 72

From 1b32ea2308a0fd48f957f81a1ad1499973582827 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 7 Dec 2021 14:31:43 +0000
Subject: [PATCH 237/720] [RW-25] Use the legacy helper for the image migration

---
 .../src/Plugin/migrate/source/Image.php       |  8 ++---
 .../src/Helpers/LegacyHelper.php              | 35 ++++++++++++++++---
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Image.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Image.php
index ecc4be137..7e1323546 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Image.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Image.php
@@ -4,7 +4,7 @@
 
 use Drupal\migrate\Plugin\migrate\source\SqlBase;
 use Drupal\migrate\Row;
-use Symfony\Component\Uid\Uuid;
+use Drupal\reliefweb_utility\Helpers\LegacyHelper;
 
 /**
  * Retrieve images from the Drupal 7 database.
@@ -115,12 +115,8 @@ public function prepareRow(Row $row) {
     // Ex: public://report-images/example.png.
     $uri = $row->getSourceProperty('uri');
 
-    // Replace the public scheme with the actual reliefweb.int base public file
-    // uri so that it's unique.
-    $uuid_uri = str_replace('public://', 'https://reliefweb.int/sites/reliefweb.int/files/', $uri);
-
     // Generate the UUID based on the URI.
-    $uuid = Uuid::v3(Uuid::fromString(Uuid::NAMESPACE_URL), $uuid_uri)->toRfc4122();
+    $uuid = LegacyHelper::generateImageUuid($uri);
 
     // Note: the locale is assumed to be UTF-8.
     $info = pathinfo($uri);
diff --git a/html/modules/custom/reliefweb_utility/src/Helpers/LegacyHelper.php b/html/modules/custom/reliefweb_utility/src/Helpers/LegacyHelper.php
index 5b2367c1f..9c88a11ef 100644
--- a/html/modules/custom/reliefweb_utility/src/Helpers/LegacyHelper.php
+++ b/html/modules/custom/reliefweb_utility/src/Helpers/LegacyHelper.php
@@ -10,15 +10,15 @@
 class LegacyHelper {
 
   /**
-   * Generate an attachment's UUID from it's old URI on reliefwen.int.
+   * Generate a file's UUID from it's old URI on reliefweb.int.
    *
    * @param string $uri
-   *   File URI (ex: public://resources/my.pdf).
+   *   File URI (ex: public://directory/filename.ext).
    *
    * @return string
-   *   The attachment UUID.
+   *   The file UUID.
    */
-  public static function generateAttachmentUuid($uri) {
+  public static function generateFileUuid($uri) {
     // Replace the public scheme with the actual reliefweb.int base public file
     // URI so that it's unique.
     $uuid_uri = str_replace('public://', 'https://reliefweb.int/sites/reliefweb.int/files/', $uri);
@@ -27,6 +27,33 @@ public static function generateAttachmentUuid($uri) {
     return Uuid::v3(Uuid::fromString(Uuid::NAMESPACE_URL), $uuid_uri)->toRfc4122();
   }
 
+  /**
+   * Generate an image's UUID from it's old URI on reliefweb.int.
+   *
+   * @param string $uri
+   *   File URI (ex: public://image-dir/my.jpg).
+   *
+   * @return string
+   *   The image UUID.
+   */
+  public static function generateImageUuid($uri) {
+    return static::generateFileUuid($uri);
+  }
+
+  /**
+   * Generate an attachment's UUID from it's old URI on reliefweb.int.
+   *
+   * @param string $uri
+   *   File URI (ex: public://resources/my.pdf).
+   *
+   * @return string
+   *   The attachment UUID.
+   */
+  public static function generateAttachmentUuid($uri) {
+    // We strips the '%' characters for compatibility with the preview URLS.
+    return static::generateFileUuid(str_replace('%', '', $uri));
+  }
+
   /**
    * Generate a UUID from the attachment UUID and the file ID.
    *

From 11f198dd9953208cad6d225fba5f068d2a9c1829 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 7 Dec 2021 14:32:39 +0000
Subject: [PATCH 238/720] [RW-25] Remove the download attribute and let nginx
 force the download of attachments to prevent downloading invalid content

---
 .../reliefweb_docstore/templates/reliefweb-file-list.html.twig  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-list.html.twig b/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-list.html.twig
index 05f681e4e..b1d797318 100644
--- a/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-list.html.twig
+++ b/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-list.html.twig
@@ -12,7 +12,7 @@
   <ul{{ list_attributes }}>
     {% for item in list %}
     <li>
-      <a href="{{ item.url }}" download="{{ item.name }}">
+      <a href="{{ item.url }}">
         {{ item.preview }}
         <strong class="rw-file__label">{{ item.label }}</strong>
         <span class="rw-file__description">{{ item.description }}</span>

From b496eb43cbc94c2dfbaea4b2ab849b8d1aeae424 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 7 Dec 2021 14:35:53 +0000
Subject: [PATCH 239/720] [RW-25] Add nginx configuration to handle file and
 image redirections

---
 docker/Dockerfile                             |  12 +-
 .../custom/01_attachment_redirections.conf    |  81 +++++++++
 .../nginx/custom/01_file_redirections.conf    |   8 -
 .../custom/01_legacy_file_redirections.conf   |  92 +++++++++++
 .../lua/01_legacy_attachment_redirections.lua |  17 ++
 ...1_legacy_image_derivative_redirections.lua |  50 ++++++
 .../lua/01_legacy_image_redirections.lua      |  31 ++++
 ...legacy_preview_derivative_redirections.lua |  48 ++++++
 .../lua/01_legacy_preview_redirections.lua    |  24 +++
 docker/etc/nginx/nginx.conf                   | 156 ++++++++++++++++++
 docker/etc/nginx/sites-enabled/01_uuid.conf   |   3 +
 11 files changed, 513 insertions(+), 9 deletions(-)
 create mode 100644 docker/etc/nginx/custom/01_attachment_redirections.conf
 delete mode 100644 docker/etc/nginx/custom/01_file_redirections.conf
 create mode 100644 docker/etc/nginx/custom/01_legacy_file_redirections.conf
 create mode 100644 docker/etc/nginx/custom/lua/01_legacy_attachment_redirections.lua
 create mode 100644 docker/etc/nginx/custom/lua/01_legacy_image_derivative_redirections.lua
 create mode 100644 docker/etc/nginx/custom/lua/01_legacy_image_redirections.lua
 create mode 100644 docker/etc/nginx/custom/lua/01_legacy_preview_derivative_redirections.lua
 create mode 100644 docker/etc/nginx/custom/lua/01_legacy_preview_redirections.lua
 create mode 100644 docker/etc/nginx/nginx.conf
 create mode 100644 docker/etc/nginx/sites-enabled/01_uuid.conf

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5d0e5a5bd..fe0051d08 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -21,7 +21,7 @@ RUN rm -rf ./vendor && \
 # to running `composer sass` but without hitting the PHP timeout from composer.
 RUN cd html/themes/custom/common_design_subtheme && \
     rm -rf ./node_modules && \
-    npm install && \
+    npm install --omit=dev -f && \
     ./node_modules/.bin/sass sass:build && \
     rm -rf ./node_modules
 
@@ -54,6 +54,13 @@ LABEL info.humanitarianresponse.build.date=$BUILD_DATE \
       info.humanitarianresponse.build.vcs-url=$VCS_URL \
       info.humanitarianresponse.build.vcs-ref=$VCS_REF
 
+RUN mkdir -p /etc/nginx/custom && \
+    # Install lua resty library to generate UUIDs.
+    cd /tmp && \
+    git clone --branch=0.0.7 https://github.com/thibaultcha/lua-resty-jit-uuid.git && \
+    cp lua-resty-jit-uuid/lib/resty/jit-uuid.lua /usr/share/lua/common/resty/ && \
+    rm -rf /tmp/lua-resty-jit-uuid
+
 COPY --from=builder /srv/www/config /srv/www/config/
 COPY --from=builder /srv/www/html /srv/www/html/
 COPY --from=builder /srv/www/vendor /srv/www/vendor/
@@ -63,5 +70,8 @@ COPY --from=builder /srv/www/composer.lock /srv/www/composer.lock
 COPY --from=builder /srv/www/symfony.lock /srv/www/symfony.lock
 COPY --from=builder /srv/www/patches /srv/www/patches
 COPY --from=builder /srv/www/scripts /srv/www/scripts
+COPY --from=builder /srv/www/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf
 COPY --from=builder /srv/www/docker/etc/nginx/apps/drupal/fastcgi_drupal.conf /etc/nginx/apps/drupal/fastcgi_drupal.conf
 COPY --from=builder /srv/www/docker/etc/nginx/apps/drupal/drupal.conf /etc/nginx/apps/drupal/drupal.conf
+COPY --from=builder /srv/www/docker/etc/nginx/custom /etc/nginx/custom/
+COPY --from=builder /srv/www/docker/etc/nginx/sites-enabled/01_uuid.conf /etc/nginx/sites-enabled/01_uuid.conf
diff --git a/docker/etc/nginx/custom/01_attachment_redirections.conf b/docker/etc/nginx/custom/01_attachment_redirections.conf
new file mode 100644
index 000000000..cba66e052
--- /dev/null
+++ b/docker/etc/nginx/custom/01_attachment_redirections.conf
@@ -0,0 +1,81 @@
+## Public attachments
+location /attachments/ {
+  ## Use our custom 404 handler so we can set the content disposition
+  ## to inline to prevent the browser from downloading a file with the
+  ## "404 Not Found" message.
+  error_page 404 @attachment-404;
+
+  ## If the file matches the attachment pattern, check if there is a local file
+  ## otherwise pass the request to the docstore.
+  location ~ "^/attachments/([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})/(?<file_name>[^/]+)(?<file_ext>\.[0-9a-zA-Z]+)$" {
+    ## Force download of the file.
+    add_header Content-Disposition 'attachment; filename="$file_name$file_ext"';
+
+    ## Try the local file first then the remote one.
+    try_files "$document_root/sites/default/files/attachments/$1/$2/$1$2$3$5" @docstore-file;
+  }
+
+  return 404;
+}
+
+## Private attachments
+location /private/attachments/ {
+  ## Use our custom 404 handler so we can set the content disposition
+  ## to inline to prevent the browser from downloading a file with the
+  ## "404 Not Found" message.
+  error_page 404 @attachment-404;
+
+  ## If the file matches the attachment pattern, pass the request to Drupal
+  ## so that it can check access to the file.
+  location ~ "^/attachments/([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})/(?<file_name>[^/]+)(?<file_ext>\.[0-9a-zA-Z]+)$" {
+    ## Force download of the file.
+    add_header Content-Disposition 'attachment; filename="$file_name$file_ext"';
+
+    ## Try drupal.
+    try_files @drupal =404;
+  }
+
+  return 404;
+}
+
+## Request to the docstore.
+location @docstore-file {
+  ## Use our custom 404 handler so we can set the content disposition
+  ## to inline to prevent the browser from downloading a file with the
+  ## "404 Not Found" message.
+  error_page 404 @attachment-404;
+
+  ## Make sure we can catch the 404 error to be able to use our handler.
+  proxy_intercept_errors on;
+
+  ## Remove the content disposition header to avoid unwanted encoding of the
+  ## filename (ex: "My%20file.pdf" instead of "My file.pdf"). See DOC-72.
+  proxy_hide_header Content-Disposition;
+
+  ## Force download of the file.
+  add_header Content-Disposition 'attachment; filename="$file_name$file_ext"';
+
+  ## Set the docstore provider UUID header so that we can get the proper
+  ## version of the file for the provider.
+  set_by_lua $x_docstore_provider_uuid_from_env 'return os.getenv("X_DOCSTORE_PROVIDER_UUID") or "latest"';
+  proxy_set_header X-Docstore-Provider-Uuid "$x_docstore_provider_uuid_from_env";
+
+  ## Rewrite the url to what the docstore wants.
+  rewrite /attachments/(.+)$ /files/$1 break;
+  proxy_pass http://docstore.ahconu.org.internal;
+
+  ## Override connection and buffer vars: do not attempt to buffer, just throw
+  ## the data out right away and close the docstore connection when done.
+  proxy_set_header Connection '';
+  proxy_buffering off;
+  tcp_nodelay on;
+  tcp_nopush off;
+}
+
+## 404 handler for attachments that prevent browsers from downloading a file
+## with the attachment file name but containing a "404 Not Found" message.
+location @attachment-404 {
+  add_header Content-Type 'text/plain' always;
+  add_header Content-Disposition 'inline' always;
+  return 404 "404 Not Found";
+}
diff --git a/docker/etc/nginx/custom/01_file_redirections.conf b/docker/etc/nginx/custom/01_file_redirections.conf
deleted file mode 100644
index f2a73ef9a..000000000
--- a/docker/etc/nginx/custom/01_file_redirections.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-location /attachments/ {
-  include apps/drupal/fastcgi_drupal.conf;
-  fastcgi_pass phpcgi;
-}
-location /private/attachments/ {
-  include apps/drupal/fastcgi_drupal.conf;
-  fastcgi_pass phpcgi;
-}
diff --git a/docker/etc/nginx/custom/01_legacy_file_redirections.conf b/docker/etc/nginx/custom/01_legacy_file_redirections.conf
new file mode 100644
index 000000000..bfd691be7
--- /dev/null
+++ b/docker/etc/nginx/custom/01_legacy_file_redirections.conf
@@ -0,0 +1,92 @@
+# Rewrite the file path.
+location /sites/reliefweb.int/files/ {
+  rewrite ^/sites/reliefweb.int/files/(.+)$ /sites/default/files/$1 last;
+}
+
+# Handle files.
+location /sites/default/files/ {
+  # Handle attachment redirections.
+  location ~ "^/sites/default/files/resources/(?<attachment_file>[^/]+)$" {
+    rewrite_by_lua_file /etc/nginx/custom/lua/01_legacy_attachment_redirections.lua;
+  }
+
+  # Handle preview redirections.
+  location ~ "^/sites/default/files/resources-pdf-previews/[0-9]+-(?<image_file>[^/]+).png$" {
+    rewrite_by_lua_file /etc/nginx/custom/lua/01_legacy_preview_redirections.lua;
+  }
+
+  # Handle preview derivative redirections.
+  location ~ "^/sites/default/files/styles/(?<image_style>[^/]+)/public/resources-pdf-previews/[0-9]+-(?<image_file>[^/]+).png$" {
+    rewrite_by_lua_file /etc/nginx/custom/lua/01_legacy_preview_derivative_redirections.lua;
+  }
+
+  # Handle image redirections.
+  location ~ "^/sites/default/files/(?<image_dir>[^/]+)/(?<image_file>[^/]+)$" {
+    rewrite_by_lua_file /etc/nginx/custom/lua/01_legacy_image_redirections.lua;
+  }
+
+  # Handle image derivative redirections.
+  location ~ "^/sites/default/files/styles/(?<image_style>[^/]+)/public/(?<image_dir>[^/]+)/(?<image_file>[^/]+)$" {
+    rewrite_by_lua_file /etc/nginx/custom/lua/01_legacy_image_derivative_redirections.lua;
+  }
+
+  # This notably handles the new URLs using a UUID as file names.
+  # @todo is the `@drupal-legacy-files` necessary?
+  try_files $uri @drupal-legacy-files;
+}
+
+## This is similar to the fastcgi_drupal.conf but using the rewritten $uri
+## instead of the $request_uri. It uses to handle file redirections.
+##
+## Restrict access to the strictly necessary PHP files. Reducing the
+## scope for exploits. Handling of PHP code and the Drupal event loop.
+location @drupal-legacy-files {
+  #-*- mode: nginx; mode: flyspell-prog; ispell-local-dictionary: "american" -*-
+  ### fastcgi configuration for serving private files.
+  ## 1. Parameters.
+  fastcgi_param QUERY_STRING $args;
+  fastcgi_param REQUEST_METHOD $request_method;
+  fastcgi_param CONTENT_TYPE $content_type;
+  fastcgi_param CONTENT_LENGTH $content_length;
+
+  fastcgi_param SCRIPT_NAME /index.php;
+  ## Use the rewritten URI.
+  fastcgi_param REQUEST_URI $uri;
+  fastcgi_param DOCUMENT_URI $document_uri;
+  fastcgi_param DOCUMENT_ROOT $document_root;
+  fastcgi_param SERVER_PROTOCOL $server_protocol;
+
+  fastcgi_param GATEWAY_INTERFACE CGI/1.1;
+  fastcgi_param SERVER_SOFTWARE nginx/$nginx_version;
+
+  fastcgi_param REMOTE_ADDR $remote_addr;
+  fastcgi_param REMOTE_PORT $remote_port;
+  fastcgi_param SERVER_ADDR $server_addr;
+  fastcgi_param SERVER_PORT $server_port;
+  fastcgi_param SERVER_NAME $server_name;
+  ## PHP only, required if PHP was built with --enable-force-cgi-redirect
+  fastcgi_param REDIRECT_STATUS 200;
+  fastcgi_param SCRIPT_FILENAME $document_root/index.php;
+  ## HTTPS 'on' parameter.  This requires Nginx version 1.1.11 or
+  ## later. The if_not_empty flag was introduced in 1.1.11.  See:
+  ## http://nginx.org/en/CHANGES. If using a version that doesn't
+  ## support this comment out the line below.
+  fastcgi_param HTTPS $fastcgi_https if_not_empty;
+  ## For Nginx versions below 1.1.11 uncomment the line below after commenting out the above.
+  #fastcgi_param HTTPS $fastcgi_https;
+
+  ## 2. Nginx FCGI specific directives.
+  fastcgi_buffers 256 4k;
+  fastcgi_intercept_errors on;
+  ## Allow 4 hrs - pass timeout responsibility to upstream.
+  fastcgi_read_timeout 14400;
+  fastcgi_index index.php;
+  ## Hide the Drupal cache headers.
+  fastcgi_hide_header 'X-Drupal-Cache';
+  fastcgi_hide_header 'X-Drupal-Dynamic-Cache';
+  ## Hide the Drupal header X-Generator.
+  fastcgi_hide_header 'X-Generator';
+
+  ## Pass the request.
+  fastcgi_pass phpcgi;
+}
diff --git a/docker/etc/nginx/custom/lua/01_legacy_attachment_redirections.lua b/docker/etc/nginx/custom/lua/01_legacy_attachment_redirections.lua
new file mode 100644
index 000000000..e82fae506
--- /dev/null
+++ b/docker/etc/nginx/custom/lua/01_legacy_attachment_redirections.lua
@@ -0,0 +1,17 @@
+local attachment_file = ngx.var.attachment_file
+
+-- The generation of the UUID from the legacy URL is similar to what is done
+-- in \Drupal\reliefeb_utility\Helpers\LegacyHelper::getAttachmentUuid().
+
+-- Strip the % characters.
+attachment_file = string.gsub(attachment_file, "%%", "")
+
+-- Consolidate the URL.
+local legacy_url = 'https://reliefweb.int/sites/reliefweb.int/files/resources/' .. attachment_file
+
+-- Generate the UUID corresponding to the URL.
+local jit_uuid = require 'resty.jit-uuid'
+local uuid = jit_uuid.generate_v3('6ba7b811-9dad-11d1-80b4-00c04fd430c8', legacy_url)
+
+-- Redirect to the new URL.
+return ngx.redirect('/attachments/' .. uuid .. '/' .. attachment_file, 301)
diff --git a/docker/etc/nginx/custom/lua/01_legacy_image_derivative_redirections.lua b/docker/etc/nginx/custom/lua/01_legacy_image_derivative_redirections.lua
new file mode 100644
index 000000000..d94fd587c
--- /dev/null
+++ b/docker/etc/nginx/custom/lua/01_legacy_image_derivative_redirections.lua
@@ -0,0 +1,50 @@
+local directory_mapping = {
+  ['announcements'] = 'images/announcements',
+  ['attached-images'] = 'images/blog-posts',
+  ['blog-post-images'] = 'images/blog-posts',
+  ['headline-images'] = 'images/reports',
+  ['report-images'] = 'images/reports',
+  ['topic-icons'] = 'images/topics',
+}
+
+local style_mapping = {
+  ['announcement-homepage'] = 'announcement',
+  ['attachment-large'] = 'large',
+  ['attachment-small'] = 'small',
+  ['report-large'] = 'large',
+  ['report-medium'] = 'medium',
+  ['report-small'] = 'small',
+  ['home-large'] = 'large',
+  ['home-small'] = 'small',
+  ['large'] = 'large',
+  ['medium'] = 'medium',
+  ['small'] = 'small',
+  ['thumbnail'] = 'thumbnail',
+  ['icon'] = 'icon',
+  ['m'] = 'thumbnail',
+  ['s'] = 'icon',
+}
+
+local image_style = ngx.var.image_style
+local image_dir = ngx.var.image_dir
+local image_file = ngx.var.image_file
+local image_ext = image_file:match('[^.]+$')
+
+-- Throw a 404 if the directory or the image style is not recognized.
+if directory_mapping[image_dir] == nil or style_mapping[image_style] == nil then
+  ngx.status = 404
+  ngx.exit(404)
+end
+
+-- The generation of the UUID from the legacy URL is similar to what is done
+-- in \Drupal\reliefeb_utility\Helpers\LegacyHelper::getImageUuid().
+
+-- Consolidate the URL of the original image.
+local legacy_url = 'https://reliefweb.int/sites/reliefweb.int/files/' .. image_dir .. '/' .. image_file
+
+-- Generate the UUID corresponding to the URL of the original image.
+local jit_uuid = require 'resty.jit-uuid'
+local uuid = jit_uuid.generate_v3('6ba7b811-9dad-11d1-80b4-00c04fd430c8', legacy_url)
+
+-- Redirect to the new URL.
+return ngx.redirect('/sites/default/files/styles/' .. style_mapping[image_style] .. '/public/' .. directory_mapping[image_dir] .. '/' .. uuid:sub(1, 2) .. '/' .. uuid:sub(3, 4) .. '/' .. uuid .. '.' .. image_ext, 301)
diff --git a/docker/etc/nginx/custom/lua/01_legacy_image_redirections.lua b/docker/etc/nginx/custom/lua/01_legacy_image_redirections.lua
new file mode 100644
index 000000000..1cec302fd
--- /dev/null
+++ b/docker/etc/nginx/custom/lua/01_legacy_image_redirections.lua
@@ -0,0 +1,31 @@
+local directory_mapping = {
+  ['announcements'] = 'images/announcements',
+  ['attached-images'] = 'images/blog-posts',
+  ['blog-post-images'] = 'images/blog-posts',
+  ['headline-images'] = 'images/reports',
+  ['report-images'] = 'images/reports',
+  ['topic-icons'] = 'images/topics',
+}
+
+local image_dir = ngx.var.image_dir
+local image_file = ngx.var.image_file
+local image_ext = image_file:match('[^.]+$')
+
+-- Throw a 404 if the directory is not recognized.
+if directory_mapping[image_dir] == nil then
+  ngx.status = 404
+  ngx.exit(404)
+end
+
+-- The generation of the UUID from the legacy URL is similar to what is done
+-- in \Drupal\reliefeb_utility\Helpers\LegacyHelper::getImageUuid().
+
+-- Consolidate the URL.
+local legacy_url = 'https://reliefweb.int/sites/reliefweb.int/files/' .. image_dir .. '/' .. image_file
+
+-- Generate the UUID corresponding to the URL.
+local jit_uuid = require 'resty.jit-uuid'
+local uuid = jit_uuid.generate_v3('6ba7b811-9dad-11d1-80b4-00c04fd430c8', legacy_url)
+
+-- Redirect to the new URL.
+return ngx.redirect('/sites/default/files/' .. directory_mapping[image_dir] .. '/' .. uuid:sub(1, 2) .. '/' .. uuid:sub(3, 4) .. '/' .. uuid .. '.' .. image_ext, 301)
diff --git a/docker/etc/nginx/custom/lua/01_legacy_preview_derivative_redirections.lua b/docker/etc/nginx/custom/lua/01_legacy_preview_derivative_redirections.lua
new file mode 100644
index 000000000..5b9d28e2c
--- /dev/null
+++ b/docker/etc/nginx/custom/lua/01_legacy_preview_derivative_redirections.lua
@@ -0,0 +1,48 @@
+local style_mapping = {
+  ['announcement-homepage'] = 'announcement',
+  ['attachment-large'] = 'large',
+  ['attachment-small'] = 'small',
+  ['report-large'] = 'large',
+  ['report-medium'] = 'medium',
+  ['report-small'] = 'small',
+  ['home-large'] = 'large',
+  ['home-small'] = 'small',
+  ['large'] = 'large',
+  ['medium'] = 'medium',
+  ['small'] = 'small',
+  ['thumbnail'] = 'thumbnail',
+  ['icon'] = 'icon',
+  ['m'] = 'thumbnail',
+  ['s'] = 'icon',
+}
+
+local image_file = ngx.var.image_file
+local image_style = ngx.var.image_style
+local image_ext = 'png'
+
+-- Throw a 404 if the image style is not recognized.
+if style_mapping[image_style] == nil then
+  ngx.status = 404
+  ngx.exit(404)
+end
+
+-- The generation of the UUID from the legacy URL is similar to what is done
+-- in \Drupal\reliefeb_utility\Helpers\LegacyHelper::getAttachmentUuid().
+
+-- Strip the % characters.
+image_file = string.gsub(image_file, "%%", "")
+
+-- Handle cases where the orginal file's extension is "PDF" instead of "pdf".
+if string.sub(image_file, -4) ~= ".PDF" then
+  image_file = image_file .. '.pdf'
+end
+
+-- Generate the legacy URL of the PDF file associated with the preview.
+local legacy_url = 'https://reliefweb.int/sites/reliefweb.int/files/resources/' .. image_file
+
+-- Generate the UUID corresponding to the URL of the original image.
+local jit_uuid = require 'resty.jit-uuid'
+local uuid = jit_uuid.generate_v3('6ba7b811-9dad-11d1-80b4-00c04fd430c8', legacy_url)
+
+-- Redirect to the new URL.
+return ngx.redirect('/sites/default/files/styles/' .. style_mapping[image_style] .. '/public/previews/' .. uuid:sub(1, 2) .. '/' .. uuid:sub(3, 4) .. '/' .. uuid .. '.' .. image_ext, 301)
diff --git a/docker/etc/nginx/custom/lua/01_legacy_preview_redirections.lua b/docker/etc/nginx/custom/lua/01_legacy_preview_redirections.lua
new file mode 100644
index 000000000..bd59fa0f0
--- /dev/null
+++ b/docker/etc/nginx/custom/lua/01_legacy_preview_redirections.lua
@@ -0,0 +1,24 @@
+local image_file = ngx.var.image_file
+local image_ext = 'png'
+
+-- The generation of the UUID from the legacy URL is similar to what is done
+-- in \Drupal\reliefeb_utility\Helpers\LegacyHelper::getAttachmentUuid().
+
+-- Strip the % characters.
+image_file = string.gsub(image_file, "%%", "")
+
+-- Handle cases where the orginal file's extension is "PDF" instead of "pdf".
+-- When that's the case, the extension is preserved in the filename
+if string.sub(image_file, -4) ~= ".PDF" then
+  image_file = image_file .. '.pdf'
+end
+
+-- Generate the legacy URL of the PDF file associated with the preview.
+local legacy_url = 'https://reliefweb.int/sites/reliefweb.int/files/resources/' .. image_file
+
+-- Generate the UUID corresponding to the URL of the original image.
+local jit_uuid = require 'resty.jit-uuid'
+local uuid = jit_uuid.generate_v3('6ba7b811-9dad-11d1-80b4-00c04fd430c8', legacy_url)
+
+-- Redirect to the new URL.
+return ngx.redirect('/sites/default/files/previews/' .. uuid:sub(1, 2) .. '/' .. uuid:sub(3, 4) .. '/' .. uuid .. '.' .. image_ext, 301)
diff --git a/docker/etc/nginx/nginx.conf b/docker/etc/nginx/nginx.conf
new file mode 100644
index 000000000..fb86919c4
--- /dev/null
+++ b/docker/etc/nginx/nginx.conf
@@ -0,0 +1,156 @@
+# -*- mode: nginx; mode: flyspell-prog;  ispell-local-dictionary: "american" -*-
+#
+# This is a "standard" nginx php-fpm config for UN-OCHA sites. It serves the site that lives
+# in /srv/www/html on port 80.
+#
+# This config is based on the Perusio nginx config, but excludes all SSL and microcache config.
+
+user appuser;
+
+worker_processes 1;
+worker_rlimit_nofile 8192;
+
+error_log   /var/log/nginx/error.log warn;
+pid         /var/run/nginx.pid;
+
+# specified in the run script
+# daemon off;
+
+## Enforce the canonical hostname passed as env var.
+## This is used in the default virtual host definition.
+env NGINX_SERVERNAME;
+
+## Allow protocol redirect bypass.
+env NGINX_OVERRIDE_PROTOCOL;
+
+## Allow retrieving a particular file version from the docstore.
+env X_DOCSTORE_PROVIDER_UUID;
+
+## Need LUA to determine the correct server_name.
+load_module /var/lib/nginx/modules/ndk_http_module.so;
+load_module /var/lib/nginx/modules/ngx_http_lua_module.so;
+
+events {
+  worker_connections 1024;
+  multi_accept on;
+}
+
+
+http {
+  include /etc/nginx/mime.types;
+  default_type application/octet-stream;
+
+  log_format main '$remote_addr - $remote_user [$time_local] "$request" '
+    '$status $body_bytes_sent "$http_referer" '
+    '"$http_user_agent" "$http_x_forwarded_for"';
+
+  log_format logstash '$remote_addr - $remote_user [$time_local] "$request" '
+    '$status $body_bytes_sent "$http_referer" "$http_user_agent" $request_time '
+    '$http_host $http_x_forwarded_proto';
+
+  access_log /var/log/nginx/access.log logstash;
+  error_log   /var/log/nginx/error.log;
+
+  ## Use sendfile() syscall to speed up I/O operations and speed up
+  ## static file serving.
+  sendfile on;
+
+  ## Strip local/private IPs from requests via RealIP.
+  set_real_ip_from 127.0.0.1;
+  set_real_ip_from 10.0.0.0/8;
+  set_real_ip_from 172.16.0.0/12;
+  set_real_ip_from 192.168.0.0/16;
+  # The remote IP is forwarded from the load balancer/proxy.
+  real_ip_header X-Forwarded-For;
+  # Enable RealIP recursion.
+  real_ip_recursive on;
+
+  types_hash_max_size 1024;
+  types_hash_bucket_size 512;
+
+  server_names_hash_bucket_size 64;
+  server_names_hash_max_size 512;
+
+  ## Timeouts.
+  client_body_timeout 60;
+  client_header_timeout 60;
+  keepalive_timeout 10 10;
+  send_timeout 60;
+
+  ## Reset lingering timed out connections. Deflect DDoS.
+  reset_timedout_connection on;
+
+  ## Body size.
+  client_max_body_size 100m;
+
+  ## TCP options.
+  tcp_nodelay on;
+  ## Optimization of socket handling when using sendfile.
+  tcp_nopush on;
+
+  ## Compression.
+  gzip on;
+  gzip_buffers 16 8k;
+  gzip_comp_level 1;
+  gzip_http_version 1.1;
+  gzip_min_length 10;
+  gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript image/x-icon application/vnd.ms-fontobject font/opentype application/x-font-ttf image/svg+xml;
+  gzip_vary on;
+  gzip_proxied any; # Compression for all requests.
+  ## No need for regexps.
+  ## See http://wiki.nginx.org/NginxHttpGzipModule#gzip_disable
+  gzip_disable msie6;
+
+  ## Hide the Nginx version number.
+  server_tokens off;
+
+  ## Excluded SSL config.
+
+  ## DNS resolver.
+  ## We use the docker one, which points at the AWS one, so we get internal resolution.
+  resolver 127.0.0.11 ipv6=off;
+
+  ## Enable the builtin cross-site scripting (XSS) filter available
+  ## in modern browsers.  Usually enabled by default we just
+  ## reinstate in case it has been somehow disabled for this
+  ## particular server instance.
+  ## https://www.owasp.org/index.php/List_of_useful_HTTP_headers.
+  map $upstream_http_x_xss_protection $xssprotection {
+      default   $upstream_http_x_xss_protection;
+      ""        "1; mode=block";
+   }
+   add_header X-XSS-Protection $xssprotection;
+
+  ## Block MIME type sniffing on IE.
+  add_header X-Content-Options nosniff;
+
+  ## FastCGI.
+  include /etc/nginx/fastcgi.conf;
+
+  ## Include the upstream servers for PHP FastCGI handling
+  ## configuration. This setup uses UNIX sockets for talking with the
+  ## upstream.
+  include /etc/nginx/upstream_phpcgi_unix.conf;
+
+  ## Support the X-Forwarded-Proto header for fastcgi.
+  map $http_x_forwarded_proto $fastcgi_https {
+    default $https;
+    http '';
+    https on;
+  }
+
+  ## Include the map to block HTTP methods.
+  include /etc/nginx/map_block_http_methods.conf;
+
+  ## Include blacklist for bad bot and referer blocking.
+  include /etc/nginx/blacklist.conf;
+
+  ## Rate limiting. Limits are per remote IP address per backend.
+  include /etc/nginx/ratelimit.conf;
+
+  ## Include the caching setup. Needed for using Drupal with an external cache.
+  include apps/drupal/map_cache.conf;
+
+  ## Include all vhosts.
+  include /etc/nginx/sites-enabled/*.conf;
+}
diff --git a/docker/etc/nginx/sites-enabled/01_uuid.conf b/docker/etc/nginx/sites-enabled/01_uuid.conf
new file mode 100644
index 000000000..24eb77664
--- /dev/null
+++ b/docker/etc/nginx/sites-enabled/01_uuid.conf
@@ -0,0 +1,3 @@
+init_worker_by_lua_block {
+    local uuid = require 'resty.jit-uuid'
+}

From e0ddc40a3fb3eb408576ebdbfa464adf2d6d49b8 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 7 Dec 2021 09:12:41 -0700
Subject: [PATCH 240/720] reset js file in favour of replacing in subtheme

---
 .../guidelines-json/guidelines-json.js        | 27 +++++++------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.js b/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.js
index e245e7aea..683f09222 100644
--- a/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.js
+++ b/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.js
@@ -63,8 +63,7 @@
 
       // Remove guidelines elements from the form.
       function cleanGuidelines(form, popupOnly) {
-        var selector = '.rw-guideline';
-
+        var selector = '.guideline';
         if (!popupOnly) {
           selector += ', [data-guideline]';
         }
@@ -107,7 +106,7 @@
         heading.appendChild(link);
 
         var content = document.createElement('div');
-        content.className = 'rw-guideline__content';
+        content.className = 'content';
         content.innerHTML = card.content;
 
         var container = document.createElement('div');
@@ -115,7 +114,7 @@
         container.appendChild(content);
 
         var popup = document.createElement('div');
-        popup.className = 'rw-guideline';
+        popup.className = 'guideline';
         popup.appendChild(close);
         popup.appendChild(container);
 
@@ -139,7 +138,7 @@
           var cards = data;
           for (var i = 0, l = cards.length; i < l; i++) {
             var card = cards[i];
-            // Remove blank image used for lazy loading.
+            // Remove blank image used for lazy laoding.
             card.content = card.content.replace(/src="\/assets\/images\/blank\.gif"/g, '');
             // Add the card as guideline for each of the target fields.
             guidelines[card.label] = card;
@@ -171,18 +170,12 @@
               showGuideline(form, guidelines[event.target.getAttribute('data-guideline')]);
             });
 
-            /* Drupal fields with either Legend or Label element ancestors */
-            const labels = element.querySelectorAll('.form-wrapper .form-item > label');
-            labels.forEach(item => item.parentNode.insertBefore(button, item.nextSibling));
-            const legends = element.querySelectorAll('[data-drupal-selector] > legend > span');
-            legends.forEach(item =>  item.appendChild(button));
-
-            // if (element.nodeName === 'LABEL') {
-            //   element.parentNode.insertBefore(button, element.nextSibling);
-            // }
-            // else {
-            //   element.appendChild(button);
-            // }
+            if (element.nodeName === 'LABEL') {
+              element.parentNode.insertBefore(button, element.nextSibling);
+            }
+            else {
+              element.appendChild(button);
+            }
           }
         }
       }

From d9fd37db1edae090db0fcfd49af10a1edc63df70 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 7 Dec 2021 09:14:14 -0700
Subject: [PATCH 241/720] reset guideline css but keep parent selector removal
 changes

---
 .../guidelines-json/guidelines-json.css       | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.css b/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.css
index c679bbf99..bed901821 100644
--- a/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.css
+++ b/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.css
@@ -5,16 +5,16 @@ form[data-with-guidelines] > * .form-wrapper {
 form[data-with-guidelines] button[data-guideline] {
   display: inline-block;
   vertical-align: middle;
-  /*position: absolute;*/
-  /*top: 0;*/
-  /*right: 0;*/
+  position: absolute;
+  top: 0;
+  right: 0;
   padding: 4px 10px;
   margin-top: 0;
 }
 form[data-with-guidelines] button[data-guideline]:hover {
   background-position-x: -96px;
 }
-form[data-with-guidelines] .rw-guideline:before {
+form[data-with-guidelines] .guideline:before {
   content: "";
   position: fixed;
   top: 0;
@@ -26,7 +26,7 @@ form[data-with-guidelines] .rw-guideline:before {
   background: rgba(1, 1, 1, 0.3);
   z-index: 10000;
 }
-form[data-with-guidelines] .rw-guideline {
+form[data-with-guidelines] .guideline {
   position: fixed;
   top: 10vh;
   left: 25vw;
@@ -36,7 +36,7 @@ form[data-with-guidelines] .rw-guideline {
   border: 10px solid rgba(0, 0, 0, 0.1);
   z-index: 1;
 }
-form[data-with-guidelines] .rw-guideline > button[value="close"] {
+form[data-with-guidelines] .guideline > button[value="close"] {
   position: absolute;
   top: -50px;
   left: -50px;
@@ -44,13 +44,13 @@ form[data-with-guidelines] .rw-guideline > button[value="close"] {
   padding: 4px 10px;
   z-index: 10002;
 }
-form[data-with-guidelines] .rw-guideline > button[value="close"]:hover {
+form[data-with-guidelines] .guideline > button[value="close"]:hover {
   border-color: #eb1405;
 }
-form[data-with-guidelines] .rw-guideline > button[value="close"]:hover:after {
+form[data-with-guidelines] .guideline > button[value="close"]:hover:after {
   background-position-x: -96px;
 }
-form[data-with-guidelines] .rw-guideline > div {
+form[data-with-guidelines] .guideline > div {
   position: relative;
   width: 100%;
   height: 100%;
@@ -60,12 +60,12 @@ form[data-with-guidelines] .rw-guideline > div {
   overflow-x: hidden;
   z-index: 10001;
 }
-form[data-with-guidelines] .rw-guideline > div > h3 {
+form[data-with-guidelines] .guideline > div > h3 {
   text-align: center;
 }
-form[data-with-guidelines] .rw-guideline > div > .content {
+form[data-with-guidelines] .guideline > div > .content {
   padding-top: 0;
 }
-form[data-with-guidelines] .rw-guideline > div > .content img {
+form[data-with-guidelines] .guideline > div > .content img {
   border: 4px solid #e6ecef;
-}
\ No newline at end of file
+}

From d5fc384747faddb3df39ca32c910480ba1e60066 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 7 Dec 2021 09:14:34 -0700
Subject: [PATCH 242/720] reset template override

---
 .../custom/guidelines/templates/guideline.html.twig       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/html/modules/custom/guidelines/templates/guideline.html.twig b/html/modules/custom/guidelines/templates/guideline.html.twig
index 74e27cb45..b60b6bfe4 100644
--- a/html/modules/custom/guidelines/templates/guideline.html.twig
+++ b/html/modules/custom/guidelines/templates/guideline.html.twig
@@ -15,6 +15,8 @@
  * @ingroup themeable
  */
 #}
-{% if content %}
-  {{- content -}}
-{% endif %}
+<div{{ attributes.addClass('guideline') }}>
+  {% if content %}
+    {{- content -}}
+  {% endif %}
+</div>

From 56a43d9d9da25a6842d759d0a985d07a181d1e74 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 7 Dec 2021 09:15:29 -0700
Subject: [PATCH 243/720] add js to the library definition, add
 libraries-override to replace custom module js with sub theme component js

---
 .../common_design_subtheme.info.yml                 | 13 +++++--------
 .../common_design_subtheme.libraries.yml            |  2 ++
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.info.yml b/html/themes/custom/common_design_subtheme/common_design_subtheme.info.yml
index 7ed3694a7..13944c593 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.info.yml
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.info.yml
@@ -50,16 +50,13 @@ libraries-extend:
     - common_design_subtheme/rw-datepicker
 
   # Guidelines.
-#  reliefweb_form/form.guidelines:
-#    - common_design_subtheme/rw-guidelines
   guidelines/guidelines-json:
     - common_design_subtheme/rw-guidelines
+
   reliefweb-guidelines/reliefweb-guidelines:
     - common_design_subtheme/rw-guidelines
 
-
-# Custom namespace
-# https://www.drupal.org/docs/contributed-modules/components/understanding-twig-namespaces
-# Requires Components module
-# components:
-#   namespaces:
+libraries-override:
+  guidelines/guidelines-json:
+    js:
+      components/guidelines-json/guidelines-json.js: components/rw-guidelines/guidelines-json.js
diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
index 5a6560915..75be3d11d 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
@@ -137,6 +137,8 @@ rw-guidelines:
   css:
     theme:
       components/rw-guidelines/rw-guidelines.css: {}
+  js:
+    components/rw-guidelines/guidelines-json.js: {}
   dependencies:
     - common_design_subtheme/rw-icons
 

From cc32579c6db83f5243d09d4bd7ae8888c9f7517a Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 7 Dec 2021 09:17:07 -0700
Subject: [PATCH 244/720] add rules from custom module due to adding prefix to
 selector in the sub theme override

---
 .../components/rw-form/rw-form.css            |  2 +-
 .../rw-guidelines/rw-guidelines.css           | 47 ++++++++++++++++++-
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 76651eccc..18e6218ef 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -85,8 +85,8 @@ form label,
 form fieldset fieldset legend {
   display: inline-block;
   margin: 0 0 6px 0;
-  font-weight: bold;
   font-size: 16px;
+  font-weight: bold;
 }
 form label:first-letter {
   /* Try to have some consistency. */
diff --git a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
index e9f68b43b..cc004bb79 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
@@ -6,6 +6,7 @@ form[data-with-guidelines] .fieldset-wrapper label {
   float: none;
 }
 form[data-with-guidelines] button[data-guideline] {
+  position: relative;
   display: inline-block;
   overflow: hidden;
   width: 20px;
@@ -43,14 +44,39 @@ form[data-with-guidelines] button[data-guideline]:hover {
   background: var(--rw-icons--common--help--12--dark-red);
   background-color: var(--cd-reliefweb-brand-grey--light);
 }
+form[data-with-guidelines] .rw-guideline:before {
+  position: fixed;
+  z-index: 10000;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  margin: 0;
+  padding: 0;
+  content: "";
+  background: rgba(1, 1, 1, 0.3);
+}
+form[data-with-guidelines] .rw-guideline {
+  position: fixed;
+  z-index: 1;
+  top: 10vh;
+  left: 25vw;
+  width: 50vw;
+  height: 80vh;
+  border: 10px solid black;
+  border: 10px solid rgba(0, 0, 0, 0.1);
+}
+
 form[data-with-guidelines] .rw-guideline > button[value="close"] {
+  position: absolute;
+  z-index: 10002;
   top: -16px;
   left: -16px;
   overflow: hidden;
   width: 28px;
   height: 28px;
   padding: 0 0 0 22px;
-  border: 2px solid var(--cd-reliefweb-brand-grey--dark);
+  border: 2px solid var(--cd-reliefweb-brand-blue--dark);
   border-radius: 50%;
   background: white;
 }
@@ -73,3 +99,22 @@ form[data-with-guidelines] .rw-guideline > button[value="close"]:hover:after {
 form[data-with-guidelines] .rw-guideline > div > .rw-guideline__content img {
   border: 4px solid var(--cd-reliefweb-brand-grey--light);
 }
+form[data-with-guidelines] .rw-guideline > div {
+  position: relative;
+  z-index: 10001;
+  overflow-x: hidden;
+  overflow-y: auto;
+  width: 100%;
+  height: 100%;
+  padding: 16px;
+  background-color: white;
+}
+form[data-with-guidelines] .rw-guideline > div > h3 {
+  text-align: center;
+}
+form[data-with-guidelines] .rw-guideline > div > .content {
+  padding-top: 0;
+}
+form[data-with-guidelines] .rw-guideline > div > .content img {
+  border: 4px solid #e6ecef;
+}

From f2fd2c333d491d7b8426907284ad8e0b1f46fe77 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 7 Dec 2021 09:37:36 -0700
Subject: [PATCH 245/720] copy js from custom module, adjust selectors, replace
 arrow function expression with for loop, linting

---
 .../rw-guidelines/guidelines-json.js          | 217 ++++++++++++++++++
 1 file changed, 217 insertions(+)
 create mode 100644 html/themes/custom/common_design_subtheme/components/rw-guidelines/guidelines-json.js

diff --git a/html/themes/custom/common_design_subtheme/components/rw-guidelines/guidelines-json.js b/html/themes/custom/common_design_subtheme/components/rw-guidelines/guidelines-json.js
new file mode 100644
index 000000000..f97fd4eda
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/components/rw-guidelines/guidelines-json.js
@@ -0,0 +1,217 @@
+/**
+ * Guidelines tooltip handling.
+ */
+(function ($) {
+
+  'use strict';
+
+  Drupal.behaviors.Guidelines = {
+    attach: function (context, settings) {
+      // Skip for IE8 and lower.
+      if (!document.addEventListener || !window.XMLHttpRequest) {
+        return;
+      }
+
+      var t = Drupal.t;
+
+      /**
+       * Helpers.
+       */
+
+      // Trim a string.
+      function trim(string) {
+        if (typeof string.trim === 'function') {
+          return string.trim();
+        }
+        return string.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '');
+      }
+
+      /**
+       * Main logic.
+       */
+
+      // Get the list of label/legend elements.
+      function getLabelElements(form) {
+        var labels = {};
+
+        // Search for field labels to which attach the guideline toggler.
+        var elements = form.querySelectorAll('fieldset[data-drupal-selector], div[data-drupal-selector]');
+        for (var i = 0, l = elements.length; i < l; i++) {
+          var element = elements[i];
+          if (!element.querySelector('[name]')) {
+            continue;
+          }
+
+          var fieldName = element.querySelector('[name]').name;
+          if (fieldName.indexOf('[') > 0) {
+            fieldName = fieldName.substring(0, fieldName.indexOf('['));
+          }
+
+          var label = '';
+          var labelElement = element.querySelector('label, legend');
+          if (labelElement) {
+            label = trim(labelElement.textContent || labelElement.innerText);
+          }
+
+          labels[fieldName] = {
+            element: element,
+            label: label
+          };
+        }
+        return labels;
+      }
+
+      // Remove guidelines elements from the form.
+      function cleanGuidelines(form, popupOnly) {
+        var selector = '.rw-guideline';
+
+        if (!popupOnly) {
+          selector += ', [data-guideline]';
+        }
+        var elements = form.querySelectorAll(selector);
+        for (var i = elements.length - 1; i >= 0; i--) {
+          var element = elements[i];
+          element.parentNode.removeChild(element);
+        }
+      }
+
+      // Hide the guideline popup.
+      function hideGuideline(form) {
+        cleanGuidelines(form, true);
+      }
+
+      // Show the guideline popup.
+      function showGuideline(form, card) {
+        hideGuideline(form);
+
+        var close = document.createElement('button');
+        close.setAttribute('type', 'button');
+        close.setAttribute('value', 'close');
+        close.appendChild(document.createTextNode(t('Close')));
+        close.addEventListener('click', function (event) {
+          hideGuideline(form);
+        });
+
+        form.addEventListener('keydown', function (event) {
+          const key = event.key;
+          if (key === 'Escape') {
+            hideGuideline(form);
+          }
+        });
+
+        var link = document.createElement('a');
+        link.setAttribute('href', card.link);
+        link.appendChild(document.createTextNode(card.name));
+
+        var heading = document.createElement('h3');
+        heading.appendChild(link);
+
+        var content = document.createElement('div');
+        content.className = 'rw-guideline__content';
+        content.innerHTML = card.content;
+
+        var container = document.createElement('div');
+        container.appendChild(heading);
+        container.appendChild(content);
+
+        var popup = document.createElement('div');
+        popup.className = 'rw-guideline';
+        popup.appendChild(close);
+        popup.appendChild(container);
+
+        form.appendChild(popup);
+
+        // Update the links in the popup to open in new pages/tabs.
+        var links = popup.querySelectorAll('a');
+        for (var i = 0, l = links.length; i < l; i++) {
+          var link = links[i];
+          link.setAttribute('target', '_blank');
+          link.setAttribute('rel', 'noopener');
+        }
+      }
+
+      // Prepare the guidelines card.
+      function prepareGuidelines(data) {
+        var guidelines = {};
+
+        // Parse the guideline cards.
+        if (Array.isArray(data)) {
+          var cards = data;
+          for (var i = 0, l = cards.length; i < l; i++) {
+            var card = cards[i];
+            // Remove blank image used for lazy loading.
+            card.content = card.content.replace(/src="\/assets\/images\/blank\.gif"/g, '');
+            // Add the card as guideline for each of the target fields.
+            guidelines[card.label] = card;
+          }
+        }
+
+        return guidelines;
+      }
+
+      // Add the guidelines to the page with a question mark icon to trigger the display.
+      function setGuidelines(form, guidelines) {
+        // Remove the existing guidelines from the page if any.
+        cleanGuidelines(form);
+
+        // Add a guideline toggler to each label element.
+        var list = getLabelElements(form);
+        for (var field in list) {
+          if (list.hasOwnProperty(field) && guidelines.hasOwnProperty(field)) {
+            var item = list[field];
+            var element = item.element;
+            var label = item.label;
+
+            var button = document.createElement('button');
+            button.setAttribute('type', 'button');
+            button.setAttribute('data-guideline', field);
+            button.appendChild(document.createTextNode(t('View guidelines for ' + label)));
+
+            button.addEventListener('click', function (event) {
+              showGuideline(form, guidelines[event.target.getAttribute('data-guideline')]);
+            });
+
+            // Drupal fields with either Legend or Label element ancestors.
+            const labels = element.querySelectorAll('.form-wrapper .form-item > label');
+            for (let i = 0; i < labels.length; i++) {
+              labels[i].parentNode.insertBefore(button, labels[i].nextSibling);
+            }
+            const legends = element.querySelectorAll('[data-drupal-selector] > legend > span');
+            for (let j = 0; j < legends.length; j++) {
+              legends[j].appendChild(button);
+            }
+          }
+        }
+      }
+
+      // Either load the guidelines from the guidelines site or use the cache.
+      function loadGuidelines(form) {
+        var entityId = form.getAttribute('data-guidelines-entity-type');
+        var bundle = form.getAttribute('data-guidelines-entity-bundle');
+        var url = '/guidelines/json/' + entityId + '/' + bundle;
+
+        // Load the guidelines.
+        var xhr = new XMLHttpRequest();
+        // 10 seconds timeout.
+        xhr.timeout = 10000;
+        xhr.onreadystatechange = function () {
+          if (xhr.readyState === 4 && xhr.status === 200) {
+            try {
+              setGuidelines(form, prepareGuidelines(JSON.parse(xhr.responseText)));
+            }
+            catch (error) {
+              // Do nothing.
+            }
+          }
+        };
+        xhr.open('GET', url, true);
+        xhr.send(null);
+      }
+
+      // Load the guidelines for the form.
+      $('form[data-with-guidelines]', context).once('guidelines').each(function () {
+        loadGuidelines(this);
+      });
+    }
+  };
+})(jQuery);

From 003454bdded348a2ee611cb3995cf6de3877872c Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 7 Dec 2021 09:38:55 -0700
Subject: [PATCH 246/720] template override to remove wrapper class in favour
 of that added via JS

---
 .../rw-modules/guideline/guideline.html.twig  | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 html/themes/custom/common_design_subtheme/templates/rw-modules/guideline/guideline.html.twig

diff --git a/html/themes/custom/common_design_subtheme/templates/rw-modules/guideline/guideline.html.twig b/html/themes/custom/common_design_subtheme/templates/rw-modules/guideline/guideline.html.twig
new file mode 100644
index 000000000..74e27cb45
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/templates/rw-modules/guideline/guideline.html.twig
@@ -0,0 +1,20 @@
+{#
+/**
+ * @file guideline.html.twig
+ * Default theme implementation to present Guideline data.
+ *
+ * This template is used when viewing Guideline pages.
+ *
+ *
+ * Available variables:
+ * - content: A list of content items. Use 'content' to print all content, or
+ * - attributes: HTML attributes for the container element.
+ *
+ * @see template_preprocess_guideline()
+ *
+ * @ingroup themeable
+ */
+#}
+{% if content %}
+  {{- content -}}
+{% endif %}

From f157d2a5ec9474684b6f8fb949ac59684cb3dc43 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 7 Dec 2021 09:55:28 -0700
Subject: [PATCH 247/720] remove duplicate rule

---
 .../components/rw-guidelines/rw-guidelines.css             | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
index cc004bb79..2b0b13987 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
@@ -96,9 +96,6 @@ form[data-with-guidelines] .rw-guideline > button[value="close"]:hover {
 form[data-with-guidelines] .rw-guideline > button[value="close"]:hover:after {
   background: var(--rw-icons--common--close--12--dark-red);
 }
-form[data-with-guidelines] .rw-guideline > div > .rw-guideline__content img {
-  border: 4px solid var(--cd-reliefweb-brand-grey--light);
-}
 form[data-with-guidelines] .rw-guideline > div {
   position: relative;
   z-index: 10001;
@@ -115,6 +112,6 @@ form[data-with-guidelines] .rw-guideline > div > h3 {
 form[data-with-guidelines] .rw-guideline > div > .content {
   padding-top: 0;
 }
-form[data-with-guidelines] .rw-guideline > div > .content img {
-  border: 4px solid #e6ecef;
+form[data-with-guidelines] .rw-guideline > div > .rw-guideline__content img {
+  border: 4px solid var(--cd-reliefweb-brand-grey--light);
 }

From 8475ff63537ff16af2dbd879208a14b98ce36477 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 8 Dec 2021 00:59:18 +0000
Subject: [PATCH 248/720] [RW-25] Prevent nginx from failing to start due to
 missing docstore when running tests

---
 tests/docker-compose.yml                      |  5 ++++
 .../custom/01_attachment_redirections.conf    | 29 +++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 tests/etc/nginx/custom/01_attachment_redirections.conf

diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
index 692108d94..257da5084 100644
--- a/tests/docker-compose.yml
+++ b/tests/docker-compose.yml
@@ -38,6 +38,8 @@ services:
       - mysql
     volumes:
       - "./settings:/srv/www/shared/settings:ro"
+      # Mount the attachment redirections to pass the requests to Drupal.
+      - "./etc/nginx/custom/01_attachment_redirections.conf:/etc/nginx/custom/01_attachment_redirections.conf:ro"
       # Mount volumes for the private and public files.
       - "rwint9-test-site-public:/srv/www/html/sites/default/files:rw"
       - "rwint9-test-site-private:/srv/www/html/sites/default/private:rw"
@@ -45,6 +47,9 @@ services:
       - "../phpcs.xml:/srv/www/phpcs.xml:ro"
       - "../phpunit.xml:/srv/www/phpunit.xml:ro"
       - "../.coveralls.yml:/srv/www/.coveralls.yml:ro"
+      # Mount local custom code.
+      - "../html/modules/custom:/srv/www/html/modules/custom:ro"
+      - "../html/themes/custom:/srv/www/html/themes/custom:ro"
     environment:
       - TERM=xterm
       - ENVIRONMENT=dev
diff --git a/tests/etc/nginx/custom/01_attachment_redirections.conf b/tests/etc/nginx/custom/01_attachment_redirections.conf
new file mode 100644
index 000000000..b75d4b721
--- /dev/null
+++ b/tests/etc/nginx/custom/01_attachment_redirections.conf
@@ -0,0 +1,29 @@
+## Public attachments.
+location /attachments/ {
+  ## Use our custom 404 handler so we can set the content disposition
+  ## to inline to prevent the browser from downloading a file with the
+  ## "404 Not Found" message.
+  error_page 404 @attachment-404;
+
+  ## Pass the request to drupal.
+  try_files @drupal =404;
+}
+
+## Private attachments.
+location /private/attachments/ {
+  ## Use our custom 404 handler so we can set the content disposition
+  ## to inline to prevent the browser from downloading a file with the
+  ## "404 Not Found" message.
+  error_page 404 @attachment-404;
+
+  ## Pass the request to drupal.
+  try_files @drupal =404;
+}
+
+## 404 handler for attachments that prevent browsers from downloading a file
+## with the attachment file name but containing a "404 Not Found" message.
+location @attachment-404 {
+  add_header Content-Type 'text/plain' always;
+  add_header Content-Disposition 'inline' always;
+  return 404 "404 Not Found";
+}

From 6f2e13e4493b21ff68510bb305f1fa277f019ffe Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 8 Dec 2021 09:21:53 +0000
Subject: [PATCH 249/720] [RW-25] Fix nginx rules for attachments

---
 .../custom/01_attachment_redirections.conf    | 10 ++++-----
 .../custom/01_attachment_redirections.conf    | 22 ++-----------------
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/docker/etc/nginx/custom/01_attachment_redirections.conf b/docker/etc/nginx/custom/01_attachment_redirections.conf
index cba66e052..0c1d5c3fd 100644
--- a/docker/etc/nginx/custom/01_attachment_redirections.conf
+++ b/docker/etc/nginx/custom/01_attachment_redirections.conf
@@ -1,4 +1,4 @@
-## Public attachments
+## Public attachments.
 location /attachments/ {
   ## Use our custom 404 handler so we can set the content disposition
   ## to inline to prevent the browser from downloading a file with the
@@ -12,13 +12,13 @@ location /attachments/ {
     add_header Content-Disposition 'attachment; filename="$file_name$file_ext"';
 
     ## Try the local file first then the remote one.
-    try_files "$document_root/sites/default/files/attachments/$1/$2/$1$2$3$5" @docstore-file;
+    try_files "/sites/default/files/attachments/$1/$2/$1$2$3$file_ext" @docstore-file;
   }
 
   return 404;
 }
 
-## Private attachments
+## Private attachments.
 location /private/attachments/ {
   ## Use our custom 404 handler so we can set the content disposition
   ## to inline to prevent the browser from downloading a file with the
@@ -27,12 +27,12 @@ location /private/attachments/ {
 
   ## If the file matches the attachment pattern, pass the request to Drupal
   ## so that it can check access to the file.
-  location ~ "^/attachments/([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})/(?<file_name>[^/]+)(?<file_ext>\.[0-9a-zA-Z]+)$" {
+  location ~ "^/private/attachments/([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})/(?<file_name>[^/]+)(?<file_ext>\.[0-9a-zA-Z]+)$" {
     ## Force download of the file.
     add_header Content-Disposition 'attachment; filename="$file_name$file_ext"';
 
     ## Try drupal.
-    try_files @drupal =404;
+    try_files /dev/null @drupal;
   }
 
   return 404;
diff --git a/tests/etc/nginx/custom/01_attachment_redirections.conf b/tests/etc/nginx/custom/01_attachment_redirections.conf
index b75d4b721..2a17c6f42 100644
--- a/tests/etc/nginx/custom/01_attachment_redirections.conf
+++ b/tests/etc/nginx/custom/01_attachment_redirections.conf
@@ -1,29 +1,11 @@
 ## Public attachments.
 location /attachments/ {
-  ## Use our custom 404 handler so we can set the content disposition
-  ## to inline to prevent the browser from downloading a file with the
-  ## "404 Not Found" message.
-  error_page 404 @attachment-404;
-
   ## Pass the request to drupal.
-  try_files @drupal =404;
+  try_files /dev/null @drupal;
 }
 
 ## Private attachments.
 location /private/attachments/ {
-  ## Use our custom 404 handler so we can set the content disposition
-  ## to inline to prevent the browser from downloading a file with the
-  ## "404 Not Found" message.
-  error_page 404 @attachment-404;
-
   ## Pass the request to drupal.
-  try_files @drupal =404;
-}
-
-## 404 handler for attachments that prevent browsers from downloading a file
-## with the attachment file name but containing a "404 Not Found" message.
-location @attachment-404 {
-  add_header Content-Type 'text/plain' always;
-  add_header Content-Disposition 'inline' always;
-  return 404 "404 Not Found";
+  try_files /dev/null @drupal;
 }

From 6985f698e8e9fe1881e998a00b7aebd9632cf1f5 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 8 Dec 2021 09:57:37 +0000
Subject: [PATCH 250/720] [RW-25] Handle attachment migration of unpublished
 content

---
 .../reliefweb_docstore/drush.services.yml     |   2 +-
 .../Commands/ReliefWebDocstoreCommands.php    | 205 ++++++++++++++++--
 .../Field/FieldType/ReliefWebFileList.php     |  13 +-
 3 files changed, 195 insertions(+), 25 deletions(-)

diff --git a/html/modules/custom/reliefweb_docstore/drush.services.yml b/html/modules/custom/reliefweb_docstore/drush.services.yml
index 6818efa13..ebb28a892 100644
--- a/html/modules/custom/reliefweb_docstore/drush.services.yml
+++ b/html/modules/custom/reliefweb_docstore/drush.services.yml
@@ -1,6 +1,6 @@
 services:
   reliefweb_docstore.commands:
     class: \Drupal\reliefweb_docstore\Commands\ReliefWebDocstoreCommands
-    arguments: ['@database', '@entity_field.manager', '@entity_type.manager', '@reliefweb_docstore.client']
+    arguments: ['@config.factory', '@database', '@entity_field.manager', '@entity_type.manager', '@reliefweb_docstore.client']
     tags:
       - { name: drush.command }
diff --git a/html/modules/custom/reliefweb_docstore/src/Commands/ReliefWebDocstoreCommands.php b/html/modules/custom/reliefweb_docstore/src/Commands/ReliefWebDocstoreCommands.php
index 91dee64d6..26eac2fb5 100644
--- a/html/modules/custom/reliefweb_docstore/src/Commands/ReliefWebDocstoreCommands.php
+++ b/html/modules/custom/reliefweb_docstore/src/Commands/ReliefWebDocstoreCommands.php
@@ -3,14 +3,17 @@
 namespace Drupal\reliefweb_docstore\Commands;
 
 use Drupal\Core\Cache\Cache;
+use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Database\Database;
 use Drupal\Core\Entity\EntityFieldManagerInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile;
 use Drupal\reliefweb_docstore\Services\DocstoreClient;
 use Drupal\reliefweb_utility\Helpers\LegacyHelper;
 use Drupal\reliefweb_utility\Traits\EntityDatabaseInfoTrait;
 use Drush\Commands\DrushCommands;
+use GuzzleHttp\Psr7\Utils;
 
 /**
  * ReliefWeb migration Drush commandfile.
@@ -49,19 +52,28 @@ class ReliefWebDocstoreCommands extends DrushCommands {
    */
   protected $docstoreClient;
 
+  /**
+   * ReliefWeb API config.
+   *
+   * @var \Drupal\Core\Config\ImmutableConfig
+   */
+  protected $docstoreConfig;
+
   /**
    * {@inheritdoc}
    */
   public function __construct(
+    ConfigFactoryInterface $config_factory,
     Connection $database,
     EntityFieldManagerInterface $entity_field_manager,
     EntityTypeManagerInterface $entity_type_manager,
-    DocstoreClient $docstore_client
+    DocstoreClient $docstore_client,
   ) {
     $this->database = $database;
     $this->entityFieldManager = $entity_field_manager;
     $this->entityTypeManager = $entity_type_manager;
     $this->docstoreClient = $docstore_client;
+    $this->docstoreConfig = $config_factory->get('reliefweb_docstore.settings');
   }
 
   /**
@@ -128,6 +140,8 @@ public function migrateAttachments($options = [
     $count_ids = 0;
     $count_files = 0;
 
+    $local = $this->docstoreConfig->get('local') === TRUE;
+
     while ($last !== NULL) {
       $ids = $this->getDatabase()
         ->select($table, $table)
@@ -144,7 +158,7 @@ public function migrateAttachments($options = [
       if (!empty($ids)) {
         $last = min($ids);
         $count_ids += count($ids);
-        $count_files += $this->migrateFiles($ids, $base_url);
+        $count_files += $this->migrateFiles($ids, $base_url, $local);
 
         static::clearEntityCache('node', $ids);
       }
@@ -172,11 +186,13 @@ public function migrateAttachments($options = [
    *   Entity ids.
    * @param string $base_url
    *   The base url of the site from which to retrieve the files.
+   * @param bool $local
+   *   Whether to store the files locally or in the docstore.
    *
    * @return int
    *   The number of migrated files.
    */
-  protected function migrateFiles(array $ids, $base_url) {
+  protected function migrateFiles(array $ids, $base_url, $local = FALSE) {
     $query = Database::getConnection('default', 'rwint7')
       ->select('field_data_field_file', 'f')
       ->fields('f', ['entity_id'])
@@ -191,17 +207,104 @@ protected function migrateFiles(array $ids, $base_url) {
     // Group the files per entity.
     $entities = [];
     foreach ($records as $record) {
-      $entities[$record['entity_id']][] = $record;
+      $file = $this->prepareFileData($record, $base_url);
+      if (!empty($file)) {
+        $entities[$record['entity_id']][] = $file;
+      }
+    }
+
+    if (empty($entities)) {
+      return 0;
     }
 
-    // Migrate the files and create/update the remote document resources.
+    // Migrate the files.
     // @todo we need to find a way to identify if the file has been replaced.
     // Maybe we can generate the file_uuid based on the file ID.
+    if ($local) {
+      return $this->migrateLocalFiles($entities, $base_url);
+    }
+    else {
+      return $this->migrateRemoteFiles($entities, $base_url);
+    }
+  }
+
+  /**
+   * Prepare the D9 file data from the D7 database record.
+   *
+   * @param array $record
+   *   D7 file record.
+   * @param string $base_url
+   *   The base url of the site from which to retrieve the files.
+   *
+   * @return array
+   *   D9 file data.
+   */
+  protected function prepareFileData(array $record, $base_url) {
+    $uuid = LegacyHelper::generateAttachmentUuid($record['uri']);
+    $file_uuid = LegacyHelper::generateAttachmentFileUuid($uuid, $record['fid']);
+    $url = LegacyHelper::getFileLegacyUrl($record['uri'], $base_url);
+
+    $file = $this->getDatabase()
+      ->select('file_managed', 'fm')
+      ->fields('fm', ['fid', 'uri'])
+      ->condition('fm.uuid', $file_uuid, '=')
+      ->execute()
+      ?->fetch(\PDO::FETCH_ASSOC);
+
+    if (!empty($file)) {
+      $file['filename'] = $record['filename'];
+      $file['filemime'] = $record['filemime'];
+      $file['uuid'] = $uuid;
+      $file['file_uuid'] = $file_uuid;
+      $file['url'] = $url;
+      $file['private'] = strpos($file['uri'], 'private://') === 0;
+    }
+    else {
+      $this->logger()->error(dt('No database entry found for file @uri.', [
+        '@uri' => $record['uri'],
+      ]));
+    }
+    return $file;
+  }
+
+  /**
+   * Migrate files to their local storage.
+   *
+   * @param array $entities
+   *   List of entities that have attachments, keyed by entity id and with the
+   *   list of files as values.
+   *
+   * @return int
+   *   The number of migrated files.
+   */
+  protected function migrateLocalFiles(array $entities) {
+    $count = 0;
+    foreach ($entities as $files) {
+      foreach ($files as $file) {
+        if ($this->downloadLocalFile($file)) {
+          $count++;
+        }
+      }
+    }
+    return $count;
+  }
+
+  /**
+   * Migrate files to their remote storage.
+   *
+   * @param array $entities
+   *   List of entities that have attachments, keyed by entity id and with the
+   *   list of files as values.
+   *
+   * @return int
+   *   The number of migrated files.
+   */
+  protected function migrateRemoteFiles(array $entities) {
     $count = 0;
     foreach ($entities as $entity_id => $files) {
       $uuids = [];
       foreach ($files as $file) {
-        $uuid = $this->createOrUpdateRemoteFile($file, $base_url);
+        $uuid = $this->createOrUpdateRemoteFile($file);
         if ($uuid !== FALSE) {
           $uuids[] = $uuid;
         }
@@ -212,19 +315,74 @@ protected function migrateFiles(array $ids, $base_url) {
     return $count;
   }
 
+  /**
+   * Download a file to its local location.
+   *
+   * @param array $file
+   *   Legacy file data.
+   *
+   * @return bool
+   *   TRUE if the file could be downloaded.
+   */
+  protected function downloadLocalFile(array $file) {
+    $uuid = $file['uuid'];
+    $uri = $file['uri'];
+    $url = $file['url'];
+
+    // Update the file record using the file id as revision id.
+    $this->updateFileFieldRecord($uuid, $file['fid']);
+
+    // Try to download the file.
+    $success = FALSE;
+    if (ReliefWebFile::prepareDirectory($uri)) {
+      try {
+        $input = Utils::TryFopen($url, 'r');
+        $output = Utils::TryFopen($uri, 'w');
+        $success = stream_copy_to_stream($input, $output);
+      }
+      catch (\Exception $exception) {
+        $this->logger()->error(dt('Unable to download file @url to @uri: @message.', [
+          '@url' => $url,
+          '@uri' => $uri,
+          '@message' => $exception->getMessage(),
+        ]));
+        return FALSE;
+      }
+    }
+    else {
+      $this->logger()->error(dt('Unable to create directory for @uri.', [
+        '@uri' => $uri,
+      ]));
+      return FALSE;
+    }
+
+    if (empty($success)) {
+      $this->logger()->error(dt('Unable to download file @url to @uri.', [
+        '@url' => $url,
+        '@uri' => $uri,
+      ]));
+    }
+    else {
+      $this->logger()->info(dt('Successfully downloaded file @url to @uri.', [
+        '@url' => $url,
+        '@uri' => $uri,
+      ]));
+    }
+    return $success;
+  }
+
   /**
    * Create or update a remote file with the database file data.
    *
    * @param array $file
    *   Legacy file data.
-   * @param string $base_url
-   *   The base url of the site from which to retrieve the files.
    *
    * @return string|false
    *   The UUID of the file resource on success or FALSE.
    */
-  protected function createOrUpdateRemoteFile(array $file, $base_url) {
-    $uuid = LegacyHelper::generateAttachmentUuid($file['uri']);
+  protected function createOrUpdateRemoteFile(array $file) {
+    $uuid = $file['uuid'];
+    $url = $file['url'];
 
     // First, try to get the file resource.
     $response = $this->docstoreClient->getFile($uuid);
@@ -235,21 +393,22 @@ protected function createOrUpdateRemoteFile(array $file, $base_url) {
         'uuid' => $uuid,
         'filename' => $file['filename'],
         'mimetype' => $file['filemime'],
+        'private' => $file['private'],
         // The docstore will fetch the file content from this URL.
-        'uri' => LegacyHelper::getFileLegacyUrl($file['uri'], $base_url),
-      ]);
+        'uri' => $url,
+      ], 300);
 
       if (!$response->isSuccessful()) {
-        $this->logger()->info(dt('Unable to create remote file for @uri.', [
-          '@uri' => $file['uri'],
+        $this->logger()->info(dt('Unable to create remote file for @url.', [
+          '@url' => $url,
         ]));
         return FALSE;
       }
     }
     // Abort if something went wrong.
     elseif (!$response->isSuccessful()) {
-      $this->logger()->info(dt('Unable to retrieve the remote file for @uri.', [
-        '@uri' => $file['uri'],
+      $this->logger()->info(dt('Unable to retrieve the remote file for @url.', [
+        '@url' => $url,
       ]));
       return FALSE;
     }
@@ -258,23 +417,27 @@ protected function createOrUpdateRemoteFile(array $file, $base_url) {
 
     // If there is no revision id then it means no content was uploaded, try.
     if (empty($content['revision_id'])) {
-      $url = LegacyHelper::getFileLegacyUrl($file['uri']);
       $response = $this->docstoreClient->updateFileContentFromFilePath($uuid, $url);
 
       if (!$response->isSuccessful()) {
-        $this->logger()->info(dt('Unable to update remote file for @uri.', [
-          '@uri' => $file['uri'],
+        $this->logger()->info(dt('Unable to update remote file for @url.', [
+          '@url' => $url,
         ]));
         return FALSE;
       }
 
       $content = $response->getContent();
+
+      // Update the status of the file, if different.
+      if (empty($content['private']) !== empty($file['private'])) {
+        $this->docstoreClient->updateFileStatus($uuid, $file['private']);
+      }
     }
 
     // Get the revision ID.
     if (empty($content['revision_id'])) {
-      $this->logger()->info(dt('Missing file revision id for @uri.', [
-        '@uri' => $file['uri'],
+      $this->logger()->info(dt('Missing file revision id for @url.', [
+        '@url' => $url,
       ]));
       return FALSE;
     }
diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php
index 2ea69dca8..5ef3cb9bd 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\reliefweb_docstore\Plugin\Field\FieldType;
 
+use Drupal\Core\Entity\EntityPublishedInterface;
 use Drupal\Core\Field\FieldItemList;
 use Drupal\reliefweb_utility\Traits\EntityDatabaseInfoTrait;
 
@@ -42,7 +43,13 @@ public function preSave() {
     // Files migration is handled separately.
     // @todo remove when removing `reliefweb_migrate`.
     if (!empty($entity->_is_migrating)) {
-      // Create the field item and preview files with the permanent public URIs.
+      // If the entity is not published, we'll mark the files are private.
+      $private = TRUE;
+      if ($entity instanceof EntityPublishedInterface) {
+        $private = !$entity->isPublished();
+      }
+
+      // Create the field item and preview files with the permanent URIs.
       foreach ($this->list as $item) {
         if ($item->isEmpty()) {
           continue;
@@ -52,7 +59,7 @@ public function preSave() {
         if (empty($file)) {
           continue;
         }
-        $file->setFileUri($item->getPermanentUri(FALSE, FALSE));
+        $file->setFileUri($item->getPermanentUri($private, FALSE));
         $file->setPermanent();
         $file->save();
         $item->get('file_uuid')->setValue($file->uuid());
@@ -64,7 +71,7 @@ public function preSave() {
         if (empty($preview_file)) {
           continue;
         }
-        $preview_file->setFileUri($item->getPermanentUri(FALSE, TRUE));
+        $preview_file->setFileUri($item->getPermanentUri($private, TRUE));
         $preview_file->setPermanent();
         $preview_file->save();
         $item->get('preview_uuid')->setValue($preview_file->uuid());

From 70d569651c05e18dec65eb7689eb271acbcd99ac Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 8 Dec 2021 12:48:16 +0000
Subject: [PATCH 251/720] [RW-25] Fix preview regeneration when changing page
 rotation and error message when replacing files

---
 .../src/Plugin/Field/FieldWidget/ReliefWebFile.php   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
index 59eae24b6..d56ffa5be 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
@@ -335,9 +335,9 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
       $preview_page = $item->getPreviewPage() ?? 1;
       $preview_rotation = $item->getPreviewRotation() ?? 0;
 
-      $original_preview_uuid = $item->_original_preview_uuid ?: $preview_uuid;
-      $original_preview_page = $item->_original_preview_page ?: $preview_page;
-      $original_preview_rotation = $item->_original_preview_rotation ?: $preview_rotation;
+      $original_preview_uuid = $item->_original_preview_uuid ?? $preview_uuid;
+      $original_preview_page = $item->_original_preview_page ?? $preview_page;
+      $original_preview_rotation = $item->_original_preview_rotation ?? $preview_rotation;
 
       if (!empty($preview_page)) {
         // Only regenerated the preview if the page or rotation changed.
@@ -470,7 +470,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
       // Note: this 'delta' is the FAPI #type 'weight' element's property not
       // the delta of the current element.
       '#delta' => $items->count(),
-      '#default_value' => $item->_weight ?: $delta,
+      '#default_value' => $item->_weight ?? $delta,
       '#weight' => 100,
     ];
 
@@ -575,7 +575,7 @@ public function extractFormValues(FieldItemListInterface $items, array $form, Fo
 
       // Put delta mapping in $form_state, so that flagErrors() can use it.
       foreach ($items as $delta => $item) {
-        $field_state['original_deltas'][$delta] = $item->_original_delta ?: $delta;
+        $field_state['original_deltas'][$delta] = $item->_original_delta ?? $delta;
 
         // We'll let the widget repopulate the weight with the new deltas.
         unset($item->_original_delta, $item->_weight);
@@ -674,7 +674,7 @@ protected function replaceFieldItem(array $element, FormStateInterface $form_sta
     // Create a new field item with associated managed files and replace the
     // original values with its values.
     $name = $element['operations']['file']['#name'];
-    $items = $this->processUploadedFiles($element, $form_state, $name, $validators);
+    $items = $this->processUploadedFiles($element['operations']['file'], $form_state, $name, $validators);
     if (!empty($items)) {
       $item = reset($items);
       // Copy some properties from the original field item.

From de69bd32cb817d64c97915fa5a0a46c5ae6a4084 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 8 Dec 2021 13:31:49 +0000
Subject: [PATCH 252/720] [RW-25] Allow editors to access private files

---
 config/user.role.editor.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/user.role.editor.yml b/config/user.role.editor.yml
index fc3ce2e87..523e302a1 100644
--- a/config/user.role.editor.yml
+++ b/config/user.role.editor.yml
@@ -11,6 +11,7 @@ permissions:
   - 'access content moderation features'
   - 'access media overview'
   - 'access reliefweb links field validation'
+  - 'access reliefweb private files'
   - 'access reliefweb user posting rights field validation'
   - 'access user contact forms'
   - 'access user profiles'

From 3580ecbfb9016b8025804fe3a266187e9355ebe7 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 8 Dec 2021 14:07:05 +0000
Subject: [PATCH 253/720] [RW-25] Fix issue with list of attachments when
 attachments were deleted

---
 html/modules/custom/reliefweb_entities/src/Entity/Report.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Report.php b/html/modules/custom/reliefweb_entities/src/Entity/Report.php
index 7aaee1d3a..956a165a0 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Report.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Report.php
@@ -107,7 +107,7 @@ public function getSourceDisclaimers() {
    *   Render array with the list of attachments.
    */
   public function getAttachments(?array $build = NULL) {
-    if (empty($build)) {
+    if (empty($build) || empty($build['#list'])) {
       return [];
     }
 

From 9b1dcb4607b7d32ef26159db850d0edc4b2c1ab8 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 8 Dec 2021 07:58:31 -0700
Subject: [PATCH 254/720] add selector to reset float on label for booleans and
 radio buttons

---
 .../components/rw-guidelines/rw-guidelines.css                 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
index 2b0b13987..faa18de38 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
@@ -2,7 +2,8 @@ form[data-with-guidelines] .form-item label,
 form[data-with-guidelines] .form-wrapper label {
   float: left;
 }
-form[data-with-guidelines] .fieldset-wrapper label {
+form[data-with-guidelines] .fieldset-wrapper label,
+form[data-with-guidelines] label.option {
   float: none;
 }
 form[data-with-guidelines] button[data-guideline] {

From 08311a0e1fdc60ae460154466d44b9f1a96ba49c Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 8 Dec 2021 08:09:55 -0700
Subject: [PATCH 255/720] adjust selector to work with labels instead of the
 previous markup h4

---
 .../common_design_subtheme/components/rw-form/rw-form.css    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 18e6218ef..542578f3b 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -176,12 +176,11 @@ form > * .form-wrapper,
 form > * .form-item {
   margin-top: 24px;
 }
-form > * .form-wrapper.form-item:first-child .fieldset-wrapper > h4:first-child,
+form > * .form-wrapper.form-item:first-child .fieldset-wrapper > label:first-child,
 fieldset > legend + .form-wrapper > h4 {
   margin: 0 0 6px;
 }
-form > * .form-wrapper > h4,
-form > * .form-wrapper.form-item:first-child .fieldset-wrapper > h4 {
+form > * .form-wrapper.form-item:first-child .fieldset-wrapper > label {
   margin: 24px 0 6px;
 }
 form .form-actions.form-item {

From 17e975fc91c97f4dd424c4c036736f0c73a03206 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 9 Dec 2021 08:21:11 +0900
Subject: [PATCH 256/720] [RW-25] Update revision id int size.

---
 .../src/Plugin/Field/FieldType/ReliefWebFile.php                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
index 4e57c6bdf..176ae3701 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
@@ -386,7 +386,7 @@ public static function schema(FieldStorageDefinitionInterface $field_definition)
         // @todo change to int(10) unsigned.
         'revision_id' => [
           'type' => 'int',
-          'size' => '10',
+          'size' => 'normal',
           'unsigned' => TRUE,
           'not null' => TRUE,
         ],

From 9221b641e9b05f014fa547334021032f99523366 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 9 Dec 2021 03:35:21 +0000
Subject: [PATCH 257/720] [RW-272] Fix validation constraints

---
 .../DateEndAfterStartConstraintValidator.php  | 19 +++++++------------
 .../DateNotInPastConstraintValidator.php      | 16 ++++++----------
 ...tyIfOtherFieldEmptyConstraintValidator.php | 15 ++++++---------
 .../MaxNumberOfValuesConstraintValidator.php  | 14 ++++----------
 ...xtLengthWithinRangeConstraintValidator.php | 18 +++++++-----------
 5 files changed, 30 insertions(+), 52 deletions(-)

diff --git a/html/modules/custom/reliefweb_entities/src/Plugin/Validation/Constraint/DateEndAfterStartConstraintValidator.php b/html/modules/custom/reliefweb_entities/src/Plugin/Validation/Constraint/DateEndAfterStartConstraintValidator.php
index efa12e09a..e484179ed 100644
--- a/html/modules/custom/reliefweb_entities/src/Plugin/Validation/Constraint/DateEndAfterStartConstraintValidator.php
+++ b/html/modules/custom/reliefweb_entities/src/Plugin/Validation/Constraint/DateEndAfterStartConstraintValidator.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\reliefweb_entities\Plugin\Validation\Constraint;
 
+use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\reliefweb_utility\Helpers\DateHelper;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
@@ -15,19 +16,13 @@ class DateEndAfterStartConstraintValidator extends ConstraintValidator {
    * {@inheritdoc}
    */
   public function validate($item, Constraint $constraint) {
-    $field_definition = $item->getFieldDefinition();
+    if ($item instanceof FieldItemListInterface) {
+      $label = $item->getFieldDefinition()->getLabel();
 
-    /** @var \Drupal\Core\Entity\FieldableEntityInterface $entity */
-    $entity = $this->context->getRoot()->getValue();
-    $field_name = $field_definition->getName();
-
-    if ($entity->hasField($field_name)) {
-      $label = $field_definition->getLabel();
-
-      foreach ($entity->get($field_name)->getValue() as $delta => $item) {
-        if (array_key_exists('value', $item) && array_key_exists('end_value', $item)) {
-          $start = DateHelper::getDateTimeStamp($item['value']);
-          $end = DateHelper::getDateTimeStamp($item['end_value']);
+      foreach ($item->getValue() as $delta => $field_item) {
+        if (array_key_exists('value', $field_item) && array_key_exists('end_value', $field_item)) {
+          $start = DateHelper::getDateTimeStamp($field_item['value']);
+          $end = DateHelper::getDateTimeStamp($field_item['end_value']);
 
           if (!empty($start) && !empty($end) && $end < $start) {
             $this->context
diff --git a/html/modules/custom/reliefweb_entities/src/Plugin/Validation/Constraint/DateNotInPastConstraintValidator.php b/html/modules/custom/reliefweb_entities/src/Plugin/Validation/Constraint/DateNotInPastConstraintValidator.php
index 0d7830ee7..ba6ea7902 100644
--- a/html/modules/custom/reliefweb_entities/src/Plugin/Validation/Constraint/DateNotInPastConstraintValidator.php
+++ b/html/modules/custom/reliefweb_entities/src/Plugin/Validation/Constraint/DateNotInPastConstraintValidator.php
@@ -4,6 +4,7 @@
 
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Session\AccountProxyInterface;
+use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\reliefweb_moderation\EntityModeratedInterface;
 use Drupal\reliefweb_utility\Helpers\DateHelper;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -45,24 +46,19 @@ public static function create(ContainerInterface $container) {
    * {@inheritdoc}
    */
   public function validate($item, Constraint $constraint) {
-    $field_definition = $item->getFieldDefinition();
-
-    /** @var \Drupal\reliefweb_moderation\EntityModeratedInterface $entity */
-    $entity = $this->context->getRoot()->getValue();
-    $field_name = $field_definition->getName();
-
-    if ($entity->hasField($field_name) && $entity instanceof EntityModeratedInterface) {
+    if ($item instanceof FieldItemListInterface && $item->getEntity() instanceof EntityModeratedInterface) {
       // Conditions to perform the validation.
       $check = TRUE;
       if (!empty($constraint->permission)) {
         $check = $check && !$this->currentUser->hasPermission($constraint->permission);
       }
       if (!empty($constraint->statuses)) {
-        $check = $check && in_array($entity->getModerationStatus(), $constraint->statuses);
+        $check = $check && in_array($item->getEntity()->getModerationStatus(), $constraint->statuses);
       }
 
       // Check that the date properties are in the future.
       if ($check) {
+        $field_definition = $item->getFieldDefinition();
         $label = $field_definition->getLabel();
         $storage_definition = $field_definition->getFieldStorageDefinition();
 
@@ -71,9 +67,9 @@ public function validate($item, Constraint $constraint) {
           $message = $constraint->mustNotBeInPastProperty;
         }
 
-        foreach ($entity->get($field_name)->getValue() as $delta => $item) {
+        foreach ($item->getValue() as $delta => $field_item) {
           foreach (['value', 'end_value'] as $property) {
-            if (array_key_exists($property, $item) && $this->dateIsInPast($item[$property])) {
+            if (array_key_exists($property, $field_item) && $this->dateIsInPast($field_item[$property])) {
               $property_label = $storage_definition
                 ->getPropertyDefinition($property)
                 ->getLabel();
diff --git a/html/modules/custom/reliefweb_entities/src/Plugin/Validation/Constraint/EmptyIfOtherFieldEmptyConstraintValidator.php b/html/modules/custom/reliefweb_entities/src/Plugin/Validation/Constraint/EmptyIfOtherFieldEmptyConstraintValidator.php
index 1f4e2a4c3..cb11d943d 100644
--- a/html/modules/custom/reliefweb_entities/src/Plugin/Validation/Constraint/EmptyIfOtherFieldEmptyConstraintValidator.php
+++ b/html/modules/custom/reliefweb_entities/src/Plugin/Validation/Constraint/EmptyIfOtherFieldEmptyConstraintValidator.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\reliefweb_entities\Plugin\Validation\Constraint;
 
+use Drupal\Core\Field\FieldItemListInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 
@@ -14,17 +15,13 @@ class EmptyIfOtherFieldEmptyConstraintValidator extends ConstraintValidator {
    * {@inheritdoc}
    */
   public function validate($item, Constraint $constraint) {
-    $field_definition = $item->getFieldDefinition();
-
-    /** @var \Drupal\Core\Entity\FieldableEntityInterface $entity */
-    $entity = $this->context->getRoot()->getValue();
-    $field_name = $field_definition->getName();
     $other_field_name = $constraint->otherFieldName ?? '';
 
-    if (!empty($other_field_name) && $entity->hasField($field_name) && $entity->hasField($other_field_name)) {
-      if ($entity->get($other_field_name)->isEmpty() && !$entity->get($field_name)->isEmpty()) {
-        $label = $entity
-          ->get($field_name)
+    if ($item instanceof FieldItemListInterface && !empty($other_field_name)) {
+      $entity = $item->getEntity();
+
+      if ($entity->hasField($other_field_name) && $entity->get($other_field_name)->isEmpty() && !$item->isEmpty()) {
+        $label = $item
           ->getFieldDefinition()
           ->getLabel();
 
diff --git a/html/modules/custom/reliefweb_entities/src/Plugin/Validation/Constraint/MaxNumberOfValuesConstraintValidator.php b/html/modules/custom/reliefweb_entities/src/Plugin/Validation/Constraint/MaxNumberOfValuesConstraintValidator.php
index 94e7203e9..7dddb0350 100644
--- a/html/modules/custom/reliefweb_entities/src/Plugin/Validation/Constraint/MaxNumberOfValuesConstraintValidator.php
+++ b/html/modules/custom/reliefweb_entities/src/Plugin/Validation/Constraint/MaxNumberOfValuesConstraintValidator.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\reliefweb_entities\Plugin\Validation\Constraint;
 
+use Drupal\Core\Field\FieldItemListInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 
@@ -14,18 +15,11 @@ class MaxNumberOfValuesConstraintValidator extends ConstraintValidator {
    * {@inheritdoc}
    */
   public function validate($item, Constraint $constraint) {
-    $field_definition = $item->getFieldDefinition();
-
-    /** @var \Drupal\Core\Entity\FieldableEntityInterface $entity */
-    $entity = $this->context->getRoot()->getValue();
-    $field_name = $field_definition->getName();
-
-    if ($entity->hasField($field_name) && isset($constraint->max)) {
+    if ($item instanceof FieldItemListInterface && isset($constraint->max)) {
       $max = (int) $constraint->max;
-      $label = $field_definition->getLabel();
+      $label = $item->getFieldDefinition()->getLabel();
 
-      $values = $entity->get($field_name)->getValue();
-      if (count($values) > $max) {
+      if ($item->count() > $max) {
         $this->context
           ->buildViolation($constraint->mustHaveLess)
           ->setParameter('%field', $label)
diff --git a/html/modules/custom/reliefweb_entities/src/Plugin/Validation/Constraint/TextLengthWithinRangeConstraintValidator.php b/html/modules/custom/reliefweb_entities/src/Plugin/Validation/Constraint/TextLengthWithinRangeConstraintValidator.php
index 427ad3e98..6cb11c2d7 100644
--- a/html/modules/custom/reliefweb_entities/src/Plugin/Validation/Constraint/TextLengthWithinRangeConstraintValidator.php
+++ b/html/modules/custom/reliefweb_entities/src/Plugin/Validation/Constraint/TextLengthWithinRangeConstraintValidator.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\reliefweb_entities\Plugin\Validation\Constraint;
 
+use Drupal\Core\Field\FieldItemListInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 
@@ -14,21 +15,16 @@ class TextLengthWithinRangeConstraintValidator extends ConstraintValidator {
    * {@inheritdoc}
    */
   public function validate($item, Constraint $constraint) {
-    $field_definition = $item->getFieldDefinition();
-
-    /** @var \Drupal\Core\Entity\FieldableEntityInterface $entity */
-    $entity = $this->context->getRoot()->getValue();
-    $field_name = $field_definition->getName();
-
-    if ($entity->hasField($field_name) && isset($constraint->min, $constraint->max)) {
+    if ($item instanceof FieldItemListInterface && isset($constraint->min, $constraint->max)) {
       $min = (int) $constraint->min;
       $max = (int) $constraint->max;
       $skip_if_empty = !empty($constraint->skipIfEmpty);
-      $label = $field_definition->getLabel();
+      $label = $item->getFieldDefinition()->getLabel();
 
-      foreach ($entity->get($field_name)->getValue() as $delta => $item) {
-        if (array_key_exists('value', $item)) {
-          $length = mb_strlen($item['value']);
+      foreach ($item as $delta => $field_item) {
+        $value = $field_item->value;
+        if (is_string($value)) {
+          $length = mb_strlen($value);
 
           // Skip the validation.
           if ($length === 0 && $skip_if_empty) {

From 07bb4068a8db6d3b6f454914d8a7183c7aaf886e Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Thu, 9 Dec 2021 08:42:25 +0100
Subject: [PATCH 258/720] RW-176: people page

---
 config/core.extension.yml                     |   1 +
 config/views.view.user_admin_people.yml       |   2 +-
 .../reliefweb_users/reliefweb_users.info.yml  |   7 +
 .../reliefweb_users.services.yml              |   5 +
 .../src/Controller/UserController.php         | 288 ++++++++++++++++++
 .../src/Form/UserPageFilterForm.php           | 222 ++++++++++++++
 .../src/Routing/RouteSubscriber.php           |  25 ++
 7 files changed, 549 insertions(+), 1 deletion(-)
 create mode 100644 html/modules/custom/reliefweb_users/reliefweb_users.info.yml
 create mode 100644 html/modules/custom/reliefweb_users/reliefweb_users.services.yml
 create mode 100644 html/modules/custom/reliefweb_users/src/Controller/UserController.php
 create mode 100644 html/modules/custom/reliefweb_users/src/Form/UserPageFilterForm.php
 create mode 100644 html/modules/custom/reliefweb_users/src/Routing/RouteSubscriber.php

diff --git a/config/core.extension.yml b/config/core.extension.yml
index 9b02eaaef..d098576c3 100644
--- a/config/core.extension.yml
+++ b/config/core.extension.yml
@@ -62,6 +62,7 @@ module:
   reliefweb_subscriptions: 0
   reliefweb_topics: 0
   reliefweb_user_posts: 0
+  reliefweb_users: 0
   reliefweb_utility: 0
   reliefweb_xmlsitemap: 0
   responsive_image: 0
diff --git a/config/views.view.user_admin_people.yml b/config/views.view.user_admin_people.yml
index 8d6a04f75..e037f842a 100644
--- a/config/views.view.user_admin_people.yml
+++ b/config/views.view.user_admin_people.yml
@@ -1,6 +1,6 @@
 uuid: 9cb8258a-b44c-4f99-9ebc-6410cb136d36
 langcode: en
-status: true
+status: false
 dependencies:
   module:
     - user
diff --git a/html/modules/custom/reliefweb_users/reliefweb_users.info.yml b/html/modules/custom/reliefweb_users/reliefweb_users.info.yml
new file mode 100644
index 000000000..42c7189a9
--- /dev/null
+++ b/html/modules/custom/reliefweb_users/reliefweb_users.info.yml
@@ -0,0 +1,7 @@
+name: 'Reliefweb users'
+type: module
+description: 'Reliefweb users'
+package: reliefweb
+core_version_requirement: ^9
+dependencies:
+  - drupal:user
diff --git a/html/modules/custom/reliefweb_users/reliefweb_users.services.yml b/html/modules/custom/reliefweb_users/reliefweb_users.services.yml
new file mode 100644
index 000000000..013a8268a
--- /dev/null
+++ b/html/modules/custom/reliefweb_users/reliefweb_users.services.yml
@@ -0,0 +1,5 @@
+services:
+  reliefweb_users.route_subscriber:
+    class: Drupal\reliefweb_users\Routing\RouteSubscriber
+    tags:
+      - { name: event_subscriber }
diff --git a/html/modules/custom/reliefweb_users/src/Controller/UserController.php b/html/modules/custom/reliefweb_users/src/Controller/UserController.php
new file mode 100644
index 000000000..18b940d27
--- /dev/null
+++ b/html/modules/custom/reliefweb_users/src/Controller/UserController.php
@@ -0,0 +1,288 @@
+<?php
+
+namespace Drupal\reliefweb_users\Controller;
+
+use Drupal\Component\Render\FormattableMarkup;
+use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\Database\Connection;
+use Drupal\Core\Datetime\DateFormatterInterface;
+use Drupal\Core\Form\FormBuilderInterface;
+use Drupal\Core\Form\FormState;
+use Drupal\Core\Link;
+use Drupal\Core\Pager\PagerManagerInterface;
+use Drupal\Core\Url;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * User posts controller.
+ */
+class UserController extends ControllerBase {
+
+  /**
+   * The database connection.
+   *
+   * @var \Drupal\Core\Database\Connection
+   */
+  protected $database;
+
+  /**
+   * The form builder.
+   *
+   * @var \Drupal\Core\Form\FormBuilderInterface
+   */
+  protected $formBuilder;
+
+  /**
+   * Date formatter.
+   *
+   * @var \Drupal\Core\Datetime\DateFormatterInterface
+   */
+  protected $dateFormatter;
+
+  /**
+   * The pager manager.
+   *
+   * @var \Drupal\Core\Pager\PagerManagerInterface
+   */
+  protected $pagerManager;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(Connection $database, FormBuilderInterface $form_builder, DateFormatterInterface $date_formatter, PagerManagerInterface $pager_manager) {
+    $this->database = $database;
+    $this->formBuilder = $form_builder;
+    $this->dateFormatter = $date_formatter;
+    $this->pagerManager = $pager_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('database'),
+      $container->get('form_builder'),
+      $container->get('date.formatter'),
+      $container->get('pager.manager')
+    );
+  }
+
+  /**
+   * Get the page content.
+   *
+   * @return array
+   *   Render array.
+   */
+  public function getContent(Request $request) {
+    // We want the editors to be able to bookmark a moderation page with
+    // a selection of filters so we set the method as GET.
+    $form_state = new FormState();
+    $form_state->setMethod('GET');
+    $form_state->setProgrammed(TRUE);
+    $form_state->setProcessInput(TRUE);
+    $form_state->disableCache();
+
+    // Build the filters form.
+    $form = $this->formBuilder
+      ->buildForm('\Drupal\reliefweb_users\Form\UserPageFilterForm', $form_state);
+
+    // Remove unneeded parts.
+    unset($form['op']);
+    unset($form['form_build_id']);
+    unset($form['form_id']);
+
+    // Filters.
+    $build['filters'] = $form;
+
+    // List of users.
+    $storage = $form_state->getStorage();
+    $build['list'] = $this->usersAdminList($storage, $request->query->all());
+
+    return $build;
+  }
+
+  /**
+   * Build the user table for the user admin page.
+   */
+  protected function usersAdminList($storage, $query_parameters) {
+    $items_per_page = 30;
+    $build = [];
+
+    // Get filter values and options.
+    $filters = $storage['filters'] ?? [];
+    $roles = $storage['roles'];
+    $statuses = $storage['statuses'];
+    $rights = $storage['rights'];
+
+    // Table headers.
+    $header = [
+      'uid' => ['data' => $this->t('ID'), 'field' => 'u.uid', 'sort' => 'desc'],
+      'name' => ['data' => $this->t('Name'), 'field' => 'u.name'],
+      'mail' => ['data' => $this->t('Mail'), 'field' => 'u.mail'],
+      'status' => ['data' => $this->t('Status'), 'field' => 'u.status'],
+      'role' => $this->t('Roles'),
+      'sources' => $this->t('Sources (Job, Training)'),
+      'created' => ['data' => $this->t('Member for'), 'field' => 'u.created'],
+      'access' => ['data' => $this->t('Last access'), 'field' => 'u.access'],
+      'edit' => $this->t('Edit'),
+    ];
+
+    $fields = ['uid', 'name', 'mail', 'status', 'created', 'access'];
+
+    // Get the list of users with pagination.
+    $query = $this->database->select('users_field_data', 'u');
+    $query->extend('Drupal\Core\Database\Query\PagerSelectExtender');
+
+    // Header sorting.
+    $query->extend('Drupal\Core\Database\Query\TableSortExtender')->orderByHeader($header);
+
+    // Fields to retrieve.
+    $query->fields('u', $fields);
+
+    // Exclude admin and non-authenticated users.
+    $query->condition('u.uid', 1, '>');
+
+    // Filter the query.
+    if (isset($filters['role'])) {
+      $query->innerJoin('user__roles', 'ur', 'ur.entity_id = u.uid');
+      $query->condition('ur.roles_target_id', array_keys($filters['role']));
+    }
+    if (isset($filters['status'])) {
+      $query->condition('u.status', $filters['status'] === 'active' ? 1 : 0);
+    }
+    if (!empty($filters['name'])) {
+      $query->condition('u.name', '%' . $filters['name'] . '%', 'LIKE');
+    }
+    if (!empty($filters['mail'])) {
+      $query->condition('u.mail', '%' . $filters['mail'] . '%', 'LIKE');
+    }
+    if (!empty($filters['posted'])) {
+      $subquery = $this->database->select('node_field_data', 'n')
+        ->fields('n', ['uid'])
+        ->condition('n.type', $filters['posted'], 'IN')
+        ->distinct();
+      $query->innerJoin($subquery, NULL, '%alias.uid = u.uid');
+    }
+    if (isset($filters['job_rights']) || isset($filters['training_rights'])) {
+      $query->innerJoin('taxonomy_term__field_user_posting_rights', 'fpr', '%alias.field_user_posting_rights_id = u.uid');
+      if (isset($filters['job_rights'])) {
+        $query->condition('fpr.field_user_posting_rights_job', array_search($filters['job_rights'], array_keys($rights)));
+      }
+      if (isset($filters['training_rights'])) {
+        $query->condition('fpr.field_user_posting_rights_training', array_search($filters['training_rights'], array_keys($rights)));
+      }
+    }
+
+    // Set group by.
+    $group_by = &$query->getGroupBy();
+    $group_by = $fields;
+
+    // Get the number of users for the query.
+    $count_query = $query->countQuery();
+
+    // Get the number of users for the query.
+    $count = $count_query->execute()->fetchField();
+
+    $currentPage = $this->pagerManager->createPager($count, $items_per_page)->getCurrentPage();
+    // Get the users.
+    $query->range($currentPage * $items_per_page, $items_per_page);
+    $users = $query->execute()->fetchAllAssoc('uid', \PDO::FETCH_OBJ);
+
+    // Prepare the table rows.
+    $rows = [];
+    if (!empty($users)) {
+      $users_roles = $this->database->select('user__roles', 'ur')
+        ->fields('ur', ['entity_id', 'roles_target_id'])
+        ->condition('ur.entity_id', array_keys($users), 'IN')
+        ->execute()
+        ->fetchAll(\PDO::FETCH_COLUMN | \PDO::FETCH_GROUP);
+
+      // Get the sources and posting rights.
+      $this->getUserSources($users);
+
+      foreach ($users as $user) {
+        $user_roles = [];
+        if (!empty($users_roles[$user->uid])) {
+          $user_roles = array_intersect_key($roles, array_flip($users_roles[$user->uid]));
+        }
+
+        $rows[$user->uid] = [
+          'uid' => $user->uid,
+          'name' => Link::fromTextAndUrl($user->name, URL::fromUserInput('/user/' . $user->uid)),
+          'mail' => Link::fromTextAndUrl($user->mail, URL::fromUserInput('/user/' . $user->uid)),
+          'status' => $statuses[empty($user->status) ? 'blocked' : 'active'],
+          'role' => !empty($user_roles) ? new FormattableMarkup('<ol><li>' . implode('</li><li>', $user_roles) . '</li></ol>', []) : '',
+          'sources' => isset($user->sources) ? new FormattableMarkup($user->sources, []) : '',
+          'created' => $this->dateFormatter->formatInterval(time() - $user->created),
+          'access' => !empty($user->access) ? $this->t('@time ago', [
+            '@time' => $this->dateFormatter->formatInterval(time() - $user->access),
+          ]) : $this->t('never'),
+          'edit' => Link::fromTextAndUrl($this->t('edit'), URL::fromUserInput('/user/' . $user->uid . '/edit')),
+        ];
+      }
+    }
+
+    // List of users.
+    $build['table'] = [
+      '#theme' => 'table',
+      '#header' => $header,
+      '#caption' => $this->t('@count users found.', ['@count' => number_format($count)]),
+      '#rows' => $rows,
+      '#empty' => $this->t('No users found.'),
+      '#attributes' => [
+        'class' => ['users-list'],
+      ],
+    ];
+
+    // Pager for the list of users.
+    $build['pager'] = [
+      '#theme' => 'pager',
+      '#element' => 0,
+      '#parameters' => $query_parameters,
+      '#route_name' => 'entity.user.collection',
+      '#tags' => [],
+      '#quantity' => 5,
+    ];
+
+    return $build;
+  }
+
+  /**
+   * Get the sources and posting rights records for the given users.
+   *
+   * @param array $users
+   *   List of users to be displayed in the users list. This is an associative
+   *   array keyed by the user ids and with user objects as values. The sources
+   *   will be attached to the objects as html lists.
+   */
+  public function getUserSources(array &$users) {
+    // Get the list of sources with posting rights for the given user ids.
+    $query = $this->database->select('taxonomy_term__field_user_posting_rights', 'f');
+    $query->innerJoin('taxonomy_term_field_data', 'td', 'td.tid = f.entity_id');
+    $query->leftJoin('taxonomy_term__field_shortname', 'fs', "fs.entity_id = f.entity_id");
+    $query->addField('f', 'field_user_posting_rights_id', 'uid');
+    $query->addField('f', 'field_user_posting_rights_job', 'job');
+    $query->addField('f', 'field_user_posting_rights_training', 'training');
+    $query->addField('f', 'entity_id', 'tid');
+    $query->addExpression('COALESCE(fs.field_shortname_value, td.name)', 'name');
+    $query->condition('f.field_user_posting_rights_id', array_keys($users), 'IN');
+    $query->condition('f.bundle', 'source');
+
+    $sources = [];
+    foreach ($query->execute() as $record) {
+      $job = $record->job;
+      $training = $record->training;
+      $link = Link::fromTextAndUrl($record->name, URL::fromUserInput('/taxonomy/term/' . $record->tid . '/posting-rights'));
+      $row = '<li data-job="' . $job . '" data-training="' . $training . '">' . $link->toString() . '</li>';
+      $sources[$record->uid][$record->tid] = $row;
+    }
+
+    // Add the formatted list of sources to the user objects.
+    foreach ($sources as $uid => $rows) {
+      $users[$uid]->sources = '<ol>' . implode('', $rows) . '</ol>';
+    }
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_users/src/Form/UserPageFilterForm.php b/html/modules/custom/reliefweb_users/src/Form/UserPageFilterForm.php
new file mode 100644
index 000000000..3e0cbbd56
--- /dev/null
+++ b/html/modules/custom/reliefweb_users/src/Form/UserPageFilterForm.php
@@ -0,0 +1,222 @@
+<?php
+
+namespace Drupal\reliefweb_users\Form;
+
+use Drupal\Core\Database\Connection;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Form\FormBase;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Session\AccountInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Manage subscription for user.
+ */
+class UserPageFilterForm extends FormBase {
+
+  /**
+   * The database connection.
+   *
+   * @var \Drupal\Core\Database\Connection
+   */
+  protected $database;
+
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(Connection $database, EntityTypeManagerInterface $entity_type_manager) {
+    $this->database = $database;
+    $this->entityTypeManager = $entity_type_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('database'),
+      $container->get('entity_type.manager'),
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'reliefweb_users_form';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state, AccountInterface $user = NULL) {
+    // Get filter values and options.
+    $filters = $this->getFilters($form_state);
+    $roles = $this->getRoles();
+    $statuses = $this->getStatuses();
+    $rights = $this->getRights();
+    $content_types = $this->getContentTypes();
+
+    $form_state->setStorage([
+      'filters' => $filters,
+      'roles' => $roles,
+      'statuses' => $statuses,
+      'rights' => $rights,
+      'content_types' => $content_types,
+    ]);
+
+    $form['filters'] = [
+      '#type' => 'fieldset',
+      '#title' => $this->t('Filters'),
+    ];
+
+    $form['filters']['role'] = [
+      '#type' => 'checkboxes',
+      '#title' => $this->t('Role'),
+      '#options' => $roles,
+      '#default_value' => isset($filters['role']) ? $filters['role'] : [],
+    ];
+
+    $form['filters']['status'] = [
+      '#type' => 'radios',
+      '#title' => $this->t('Status'),
+      '#options' => ['any' => 'Any'] + $statuses,
+      '#default_value' => isset($filters['status']) ? $filters['status'] : 'any',
+    ];
+
+    $form['filters']['posted'] = [
+      '#title' => $this->t('Posted'),
+      '#type' => 'checkboxes',
+      '#options' => $content_types,
+      '#default_value' => isset($filters['posted']) ? $filters['posted'] : [],
+    ];
+
+    $form['filters']['job_rights'] = [
+      '#type' => 'radios',
+      '#title' => $this->t('Job posting rights'),
+      '#options' => ['any' => 'Any'] + $rights,
+      '#default_value' => isset($filters['job_rights']) ? $filters['job_rights'] : 'any',
+    ];
+
+    $form['filters']['training_rights'] = [
+      '#type' => 'radios',
+      '#title' => $this->t('Training posting rights'),
+      '#options' => ['any' => 'Any'] + $rights,
+      '#default_value' => isset($filters['training_rights']) ? $filters['training_rights'] : 'any',
+    ];
+
+    $form['filters']['name'] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Name'),
+      '#maxlength' => 2048,
+      '#default_value' => isset($filters['name']) ? $filters['name'] : '',
+    ];
+
+    $form['filters']['mail'] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Mail'),
+      '#maxlength' => 2048,
+      '#default_value' => isset($filters['mail']) ? $filters['mail'] : '',
+    ];
+
+    $form['filters']['submit'] = [
+      '#type' => 'submit',
+      '#value' => $this->t('Filter'),
+      '#attributes' => ['class' => ['form-actions']],
+    ];
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    $form_state->setRebuild();
+  }
+
+  /**
+   * Get and cache the filters for the users admin page.
+   */
+  protected function getFilters(FormStateInterface $form_state) {
+    static $filters;
+
+    if (!isset($filters)) {
+      $inputs = $form_state->getUserInput();
+
+      $roles = $this->getRoles();
+      $statuses = $this->getStatuses();
+      $rights = $this->getRights();
+      $content_types = $this->getContentTypes();
+
+      $filters = [
+        'role' => !empty($inputs['role']) ? array_intersect_key($roles, $inputs['role']) : NULL,
+        'status' => isset($inputs['status'], $statuses[$inputs['status']]) ? $inputs['status'] : NULL,
+        'name' => !empty($inputs['name']) && is_string($inputs['name']) ? $inputs['name'] : NULL,
+        'mail' => !empty($inputs['mail']) && is_string($inputs['mail']) ? $inputs['mail'] : NULL,
+        'posted' => isset($inputs['posted']) && is_array($inputs['posted']) ? array_intersect_key($content_types, $inputs['posted']) : NULL,
+        'job_rights' => isset($inputs['job_rights'], $rights[$inputs['job_rights']]) ? $inputs['job_rights'] : NULL,
+        'training_rights' => isset($inputs['training_rights'], $rights[$inputs['training_rights']]) ? $inputs['training_rights'] : NULL,
+      ];
+    }
+
+    return $filters;
+  }
+
+  /**
+   * Get the list of user roles keyed by id.
+   */
+  protected function getRoles() {
+    static $roles;
+
+    if (!isset($roles)) {
+      $role_objects = $this->entityTypeManager->getStorage('user_role')->loadMultiple();
+      $roles = array_combine(array_keys($role_objects), array_map(function ($a) {
+        return $a->label();
+      }, $role_objects));
+    }
+
+    return $roles;
+  }
+
+  /**
+   * Get the list of content types.
+   */
+  protected function getContentTypes() {
+    return [
+      'job' => $this->t('Job'),
+      'training' => $this->t('Training'),
+      'report' => $this->t('Report'),
+    ];
+  }
+
+  /**
+   * Get the list of possible user statuses.
+   */
+  protected function getStatuses() {
+    return [
+      'blocked' => $this->t('Blocked'),
+      'active' => $this->t('Active'),
+    ];
+  }
+
+  /**
+   * Get the list of possible user statuses.
+   */
+  protected function getRights() {
+    return [
+      'unverified' => $this->t('Unverified'),
+      'blocked' => $this->t('Blocked'),
+      'allowed' => $this->t('Allowed'),
+      'trusted' => $this->t('Trusted'),
+    ];
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_users/src/Routing/RouteSubscriber.php b/html/modules/custom/reliefweb_users/src/Routing/RouteSubscriber.php
new file mode 100644
index 000000000..d97c5cd52
--- /dev/null
+++ b/html/modules/custom/reliefweb_users/src/Routing/RouteSubscriber.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Drupal\reliefweb_users\Routing;
+
+use Drupal\Core\Routing\RouteSubscriberBase;
+use Symfony\Component\Routing\RouteCollection;
+
+/**
+ * Listens to the dynamic route events.
+ */
+class RouteSubscriber extends RouteSubscriberBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function alterRoutes(RouteCollection $collection) {
+    if ($route = $collection->get('entity.user.collection')) {
+      $route->setDefaults([
+        '_controller' => '\Drupal\reliefweb_users\Controller\UserController::getContent',
+        '_title' => 'People',
+      ]);
+    }
+  }
+
+}

From 7a8bee5f037f1c7d3cea776ea17e9c9b781c49f1 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 9 Dec 2021 09:46:54 +0000
Subject: [PATCH 259/720] [RW-159] Add ckeditor and custom widget to convert
 from markdown to HTML and vice versa

---
 ...e.entity_form_display.node.job.default.yml |  7 +-
 ...ity_form_display.node.training.default.yml |  7 +-
 config/core.extension.yml                     |  2 +
 config/editor.editor.markdown_editor.yml      | 55 +++++++++++++++
 config/field.field.node.job.body.yml          |  6 +-
 ...ield.field.node.job.field_how_to_apply.yml |  6 +-
 config/field.field.node.training.body.yml     |  6 +-
 ...ld.node.training.field_how_to_register.yml |  6 +-
 config/filter.format.markdown_editor.yml      | 48 +++++++++++++
 config/user.role.authenticated.yml            |  1 +
 .../FieldWidget/ReliefWebFormattedText.php    | 70 +++++++++++++++++++
 11 files changed, 196 insertions(+), 18 deletions(-)
 create mode 100644 config/editor.editor.markdown_editor.yml
 create mode 100644 config/filter.format.markdown_editor.yml
 create mode 100644 html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebFormattedText.php

diff --git a/config/core.entity_form_display.node.job.default.yml b/config/core.entity_form_display.node.job.default.yml
index b824e0804..fe116c747 100644
--- a/config/core.entity_form_display.node.job.default.yml
+++ b/config/core.entity_form_display.node.job.default.yml
@@ -21,7 +21,6 @@ dependencies:
     - content_moderation
     - path
     - reliefweb_fields
-    - text
 id: node.job.default
 targetEntityType: node
 bundle: job
@@ -32,13 +31,11 @@ content:
     settings:
       rows: 20
       placeholder: ''
-      summary_rows: 3
-      show_summary: false
     third_party_settings:
       allowed_formats:
         hide_help: '1'
         hide_guidelines: '1'
-    type: text_textarea_with_summary
+    type: reliefweb_formatted_text
     region: content
   field_career_categories:
     weight: 7
@@ -99,7 +96,7 @@ content:
       allowed_formats:
         hide_help: '1'
         hide_guidelines: '1'
-    type: text_textarea
+    type: reliefweb_formatted_text
     region: content
   field_job_closing_date:
     weight: 4
diff --git a/config/core.entity_form_display.node.training.default.yml b/config/core.entity_form_display.node.training.default.yml
index 56a1be831..a0c5b7ea7 100644
--- a/config/core.entity_form_display.node.training.default.yml
+++ b/config/core.entity_form_display.node.training.default.yml
@@ -27,7 +27,6 @@ dependencies:
     - link
     - path
     - reliefweb_fields
-    - text
 id: node.training.default
 targetEntityType: node
 bundle: training
@@ -38,13 +37,11 @@ content:
     settings:
       rows: 20
       placeholder: ''
-      summary_rows: 3
-      show_summary: false
     third_party_settings:
       allowed_formats:
         hide_help: '1'
         hide_guidelines: '1'
-    type: text_textarea_with_summary
+    type: reliefweb_formatted_text
     region: content
   field_career_categories:
     weight: 11
@@ -119,7 +116,7 @@ content:
       allowed_formats:
         hide_help: '1'
         hide_guidelines: '1'
-    type: text_textarea
+    type: reliefweb_formatted_text
     region: content
   field_language:
     weight: 13
diff --git a/config/core.extension.yml b/config/core.extension.yml
index 9b02eaaef..4135c9a89 100644
--- a/config/core.extension.yml
+++ b/config/core.extension.yml
@@ -4,6 +4,7 @@ module:
   block: 0
   book: 0
   breakpoint: 0
+  ckeditor: 0
   components: 0
   config: 0
   config_split: 0
@@ -13,6 +14,7 @@ module:
   datetime: 0
   datetime_range: 0
   dynamic_page_cache: 0
+  editor: 0
   field: 0
   field_ui: 0
   file: 0
diff --git a/config/editor.editor.markdown_editor.yml b/config/editor.editor.markdown_editor.yml
new file mode 100644
index 000000000..e2312b568
--- /dev/null
+++ b/config/editor.editor.markdown_editor.yml
@@ -0,0 +1,55 @@
+uuid: a195e3eb-d921-4cd0-a9f7-2681c6a24ba5
+langcode: en
+status: true
+dependencies:
+  config:
+    - filter.format.markdown_editor
+  module:
+    - ckeditor
+format: markdown_editor
+editor: ckeditor
+settings:
+  toolbar:
+    rows:
+      -
+        -
+          name: Formatting
+          items:
+            - Bold
+            - Italic
+            - Format
+        -
+          name: Links
+          items:
+            - DrupalLink
+            - DrupalUnlink
+        -
+          name: Lists
+          items:
+            - BulletedList
+            - NumberedList
+        -
+          name: Tools
+          items:
+            - Undo
+            - Redo
+            - RemoveFormat
+        -
+          name: Paste
+          items:
+            - Paste
+            - PasteFromWord
+            - PasteText
+  plugins:
+    stylescombo:
+      styles: ''
+    language:
+      language_list: un
+image_upload:
+  status: false
+  scheme: public
+  directory: inline-images
+  max_size: ''
+  max_dimensions:
+    width: null
+    height: null
diff --git a/config/field.field.node.job.body.yml b/config/field.field.node.job.body.yml
index 3d29ee303..6e1e5759c 100644
--- a/config/field.field.node.job.body.yml
+++ b/config/field.field.node.job.body.yml
@@ -10,9 +10,11 @@ dependencies:
     - text
 third_party_settings:
   allowed_formats:
-    markdown: markdown
-    html: '0'
+    markdown_editor: markdown_editor
+    markdown: '0'
     plain_text: '0'
+    html: '0'
+    token_markdown: '0'
 id: node.job.body
 field_name: body
 entity_type: node
diff --git a/config/field.field.node.job.field_how_to_apply.yml b/config/field.field.node.job.field_how_to_apply.yml
index a91f1a7a8..6a63df6c1 100644
--- a/config/field.field.node.job.field_how_to_apply.yml
+++ b/config/field.field.node.job.field_how_to_apply.yml
@@ -10,9 +10,11 @@ dependencies:
     - text
 third_party_settings:
   allowed_formats:
-    markdown: markdown
-    html: '0'
+    markdown_editor: markdown_editor
+    markdown: '0'
     plain_text: '0'
+    html: '0'
+    token_markdown: '0'
 id: node.job.field_how_to_apply
 field_name: field_how_to_apply
 entity_type: node
diff --git a/config/field.field.node.training.body.yml b/config/field.field.node.training.body.yml
index 85cf48f1b..103b18eb5 100644
--- a/config/field.field.node.training.body.yml
+++ b/config/field.field.node.training.body.yml
@@ -10,9 +10,11 @@ dependencies:
     - text
 third_party_settings:
   allowed_formats:
-    markdown: markdown
-    html: '0'
+    markdown_editor: markdown_editor
+    markdown: '0'
     plain_text: '0'
+    html: '0'
+    token_markdown: '0'
 id: node.training.body
 field_name: body
 entity_type: node
diff --git a/config/field.field.node.training.field_how_to_register.yml b/config/field.field.node.training.field_how_to_register.yml
index 71223a50f..e5d5b03fd 100644
--- a/config/field.field.node.training.field_how_to_register.yml
+++ b/config/field.field.node.training.field_how_to_register.yml
@@ -10,9 +10,11 @@ dependencies:
     - text
 third_party_settings:
   allowed_formats:
-    markdown: markdown
-    html: '0'
+    markdown_editor: markdown_editor
+    markdown: '0'
     plain_text: '0'
+    html: '0'
+    token_markdown: '0'
 id: node.training.field_how_to_register
 field_name: field_how_to_register
 entity_type: node
diff --git a/config/filter.format.markdown_editor.yml b/config/filter.format.markdown_editor.yml
new file mode 100644
index 000000000..a3800c547
--- /dev/null
+++ b/config/filter.format.markdown_editor.yml
@@ -0,0 +1,48 @@
+uuid: e96f932d-fec7-4791-a862-4d99186ed41e
+langcode: en
+status: true
+dependencies:
+  module:
+    - media
+    - reliefweb_utility
+name: 'Markdown with Editor'
+format: markdown_editor
+weight: 0
+filters:
+  filter_html:
+    id: filter_html
+    provider: filter
+    status: true
+    weight: -10
+    settings:
+      allowed_html: '<p> <a href hreflang target rel> <em> <strong> <ul type> <ol start type> <li> <h2> <h3> <h4> <h5> <h6>'
+      filter_html_help: false
+      filter_html_nofollow: true
+  filter_htmlcorrector:
+    id: filter_htmlcorrector
+    provider: filter
+    status: true
+    weight: 10
+    settings: {  }
+  media_embed:
+    id: media_embed
+    provider: media
+    status: false
+    weight: 100
+    settings:
+      default_view_mode: default
+      allowed_media_types: {  }
+      allowed_view_modes: {  }
+  filter_markdown:
+    id: filter_markdown
+    provider: reliefweb_utility
+    status: true
+    weight: -20
+    settings: {  }
+  reliefweb_token_filter:
+    id: reliefweb_token_filter
+    provider: reliefweb_utility
+    status: false
+    weight: 0
+    settings:
+      replace_empty: '0'
diff --git a/config/user.role.authenticated.yml b/config/user.role.authenticated.yml
index 32239e646..27940f170 100644
--- a/config/user.role.authenticated.yml
+++ b/config/user.role.authenticated.yml
@@ -21,6 +21,7 @@ permissions:
   - 'use job transition pending'
   - 'use job transition published'
   - 'use text format markdown'
+  - 'use text format markdown_editor'
   - 'use text format token_markdown'
   - 'use training transition draft'
   - 'use training transition pending'
diff --git a/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebFormattedText.php b/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebFormattedText.php
new file mode 100644
index 000000000..137345dfb
--- /dev/null
+++ b/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebFormattedText.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Drupal\reliefweb_fields\Plugin\Field\FieldWidget;
+
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\reliefweb_utility\Helpers\HtmlSanitizer;
+use Drupal\reliefweb_utility\Helpers\TextHelper;
+use Drupal\text\Plugin\Field\FieldWidget\TextareaWidget;
+use League\HTMLToMarkdown\HtmlConverter;
+
+/**
+ * Plugin implementation of the 'reliefweb_formatted_text' widget.
+ *
+ * @FieldWidget(
+ *   id = "reliefweb_formatted_text",
+ *   label = @Translation("ReliefWeb Formatted Text"),
+ *   field_types = {
+ *     "text_long",
+ *     "text_with_summary"
+ *   }
+ * )
+ */
+class ReliefWebFormattedText extends TextareaWidget {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
+    $element = parent::formElement($items, $delta, $element, $form, $form_state);
+
+    // Convert the value to HTML to work with the editor.
+    $item = $items[$delta];
+    if ($item->format === 'markdown_editor') {
+      $element['#default_value'] = check_markup($item->value, $item->format);
+    }
+
+    return $element;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function massageFormValues(array $values, array $form, FormStateInterface $form_state) {
+    // Converted the values from HTML to markdown.
+    foreach ($values as $delta => $value) {
+      if (isset($value['format']) && $value['format'] === 'markdown_editor' && empty($value['_converted']) && !empty($value['value'])) {
+        // Sanitize the HTML string.
+        $sanitizer = new HtmlSanitizer();
+        $text = $sanitizer->sanitizeHtml($value['value']);
+
+        // Remove embedded content.
+        $text = TextHelper::stripEmbeddedContent($text);
+
+        // Convert to markdown.
+        $converter = new HtmlConverter();
+        $converter->getConfig()->setOption('strip_tags', TRUE);
+        $converter->getConfig()->setOption('use_autolinks', FALSE);
+        $converter->getConfig()->setOption('header_style', 'atx');
+        $converter->getConfig()->setOption('strip_placeholder_links', TRUE);
+
+        $value['value'] = trim($converter->convert($text));
+        $value['_converted'] = TRUE;
+        $values[$delta] = $value;
+      }
+    }
+    return $values;
+  }
+
+}

From 6a3246b7e41e50a1f108b1874243fe55005ce287 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 9 Dec 2021 09:48:05 +0000
Subject: [PATCH 260/720] [RW-159] Update default format for body and how to
 apply/register fields of migrated jobs/training

---
 .../install/migrate_plus.migration.reliefweb_node__job.yml | 7 ++++++-
 .../migrate_plus.migration.reliefweb_node__training.yml    | 7 ++++++-
 ...migrate_plus.migration.reliefweb_node_revision__job.yml | 7 ++++++-
 ...te_plus.migration.reliefweb_node_revision__training.yml | 7 ++++++-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node__job.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node__job.yml
index 0473f2aba..23bbc0dca 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node__job.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node__job.yml
@@ -5,6 +5,9 @@ source:
   bundle: job
 process:
   # Fields.
+  body/format:
+    plugin: default_value
+    default_value: "markdown_editor"
   field_career_categories/value:
     plugin: sub_process
     source: field_career_categories
@@ -23,7 +26,9 @@ process:
     plugin: skip_on_empty
     method: process
     source: field_how_to_apply/0/value
-  field_how_to_apply/format: constants/format
+  field_how_to_apply/format:
+    plugin: default_value
+    default_value: "markdown_editor"
   field_job_closing_date:
     -
       plugin: skip_on_empty
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node__training.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node__training.yml
index 7e13c818c..fa2d609e5 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node__training.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node__training.yml
@@ -5,6 +5,9 @@ source:
   bundle: training
 process:
   # Fields.
+  body/format:
+    plugin: default_value
+    default_value: "markdown_editor"
   field_career_categories/value:
     plugin: sub_process
     source: field_career_categories
@@ -31,7 +34,9 @@ process:
     plugin: skip_on_empty
     method: process
     source: field_how_to_apply/0/value
-  field_how_to_register/format: constants/format
+  field_how_to_register/format:
+    plugin: default_value
+    default_value: "markdown_editor"
   field_language:
     plugin: sub_process
     source: field_language
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__job.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__job.yml
index 5e1fa29ff..f9ed8e384 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__job.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__job.yml
@@ -5,6 +5,9 @@ source:
   bundle: job
 process:
   # Fields.
+  body/format:
+    plugin: default_value
+    default_value: "markdown_editor"
   field_career_categories/value:
     plugin: sub_process
     source: field_career_categories
@@ -23,7 +26,9 @@ process:
     plugin: skip_on_empty
     method: process
     source: field_how_to_apply/0/value
-  field_how_to_apply/format: constants/format
+  field_how_to_apply/format:
+    plugin: default_value
+    default_value: "markdown_editor"
   field_job_closing_date:
     -
       plugin: skip_on_empty
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__training.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__training.yml
index 257eeba6f..2a6367ea4 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__training.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__training.yml
@@ -5,6 +5,9 @@ source:
   bundle: training
 process:
   # Fields.
+  body/format:
+    plugin: default_value
+    default_value: "markdown_editor"
   field_career_categories/value:
     plugin: sub_process
     source: field_career_categories
@@ -31,7 +34,9 @@ process:
     plugin: skip_on_empty
     method: process
     source: field_how_to_register/0/value
-  field_how_to_register/format: constants/format
+  field_how_to_register/format:
+    plugin: default_value
+    default_value: "markdown_editor"
   field_language:
     plugin: sub_process
     source: field_language

From 2f10ac81cb7e8ca04900e785a1d5b84a444e7790 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 9 Dec 2021 09:50:36 +0000
Subject: [PATCH 261/720] [RW-159] Sync migration config

---
 config/migrate_plus.migration.reliefweb_book.yml      |  2 +-
 config/migrate_plus.migration.reliefweb_bookmarks.yml |  2 +-
 config/migrate_plus.migration.reliefweb_image.yml     |  2 +-
 ....migration.reliefweb_media__image_announcement.yml |  2 +-
 ..._media__image_blog_post__field_attached_images.yml |  2 +-
 ....reliefweb_media__image_blog_post__field_image.yml |  2 +-
 ...fweb_media__image_report__field_headline_image.yml |  2 +-
 ...ion.reliefweb_media__image_report__field_image.yml |  2 +-
 ...te_plus.migration.reliefweb_media__image_topic.yml |  2 +-
 ...ate_plus.migration.reliefweb_menu_link__footer.yml |  2 +-
 ...grate_plus.migration.reliefweb_menu_link__main.yml |  2 +-
 ...te_plus.migration.reliefweb_node__announcement.yml |  2 +-
 ...grate_plus.migration.reliefweb_node__blog_post.yml |  2 +-
 .../migrate_plus.migration.reliefweb_node__book.yml   |  2 +-
 config/migrate_plus.migration.reliefweb_node__job.yml | 11 ++++++++---
 .../migrate_plus.migration.reliefweb_node__report.yml |  2 +-
 .../migrate_plus.migration.reliefweb_node__topic.yml  |  2 +-
 ...igrate_plus.migration.reliefweb_node__training.yml | 11 ++++++++---
 ...igration.reliefweb_node_revision__announcement.yml |  2 +-
 ...s.migration.reliefweb_node_revision__blog_post.yml |  2 +-
 ...e_plus.migration.reliefweb_node_revision__book.yml |  2 +-
 ...te_plus.migration.reliefweb_node_revision__job.yml | 11 ++++++++---
 ...plus.migration.reliefweb_node_revision__report.yml |  2 +-
 ..._plus.migration.reliefweb_node_revision__topic.yml |  2 +-
 ...us.migration.reliefweb_node_revision__training.yml | 11 ++++++++---
 ...migrate_plus.migration.reliefweb_subscriptions.yml |  2 +-
 ...migrate_plus.migration.reliefweb_taxonomy_term.yml |  2 +-
 ...lus.migration.reliefweb_taxonomy_term__country.yml |  2 +-
 ...us.migration.reliefweb_taxonomy_term__disaster.yml |  2 +-
 ...plus.migration.reliefweb_taxonomy_term__source.yml |  2 +-
 ...lus.migration.reliefweb_taxonomy_term_revision.yml |  2 +-
 ...tion.reliefweb_taxonomy_term_revision__country.yml |  2 +-
 ...ion.reliefweb_taxonomy_term_revision__disaster.yml |  2 +-
 ...ation.reliefweb_taxonomy_term_revision__source.yml |  2 +-
 config/migrate_plus.migration.reliefweb_url_alias.yml |  2 +-
 config/migrate_plus.migration.reliefweb_user.yml      |  2 +-
 ...migrate_plus.migration.reliefweb_user__default.yml |  2 +-
 .../migrate_plus.migration_group.reliefweb_base.yml   |  2 +-
 .../migrate_plus.migration_group.reliefweb_extra.yml  |  2 +-
 .../migrate_plus.migration_group.reliefweb_image.yml  |  2 +-
 .../migrate_plus.migration_group.reliefweb_media.yml  |  2 +-
 .../migrate_plus.migration_group.reliefweb_node.yml   |  2 +-
 ...e_plus.migration_group.reliefweb_node_revision.yml |  2 +-
 .../migrate_plus.migration_group.reliefweb_term.yml   |  2 +-
 ...e_plus.migration_group.reliefweb_term_revision.yml |  2 +-
 45 files changed, 73 insertions(+), 53 deletions(-)

diff --git a/config/migrate_plus.migration.reliefweb_book.yml b/config/migrate_plus.migration.reliefweb_book.yml
index 9d05ffd6f..2f1bd6b55 100644
--- a/config/migrate_plus.migration.reliefweb_book.yml
+++ b/config/migrate_plus.migration.reliefweb_book.yml
@@ -1,4 +1,4 @@
-uuid: 71db9865-3e48-4564-9898-8d50dd553fee
+uuid: 9d4630ca-6cce-4b4a-8c57-ea3f7095a471
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_bookmarks.yml b/config/migrate_plus.migration.reliefweb_bookmarks.yml
index 0d6125864..2f4236fbe 100644
--- a/config/migrate_plus.migration.reliefweb_bookmarks.yml
+++ b/config/migrate_plus.migration.reliefweb_bookmarks.yml
@@ -1,4 +1,4 @@
-uuid: faa96efa-d630-47e5-9776-211de8246e0d
+uuid: 32541d54-68ce-4f73-aa6e-1a164d85900e
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_image.yml b/config/migrate_plus.migration.reliefweb_image.yml
index 70d4a805d..350e4d19c 100644
--- a/config/migrate_plus.migration.reliefweb_image.yml
+++ b/config/migrate_plus.migration.reliefweb_image.yml
@@ -1,4 +1,4 @@
-uuid: 34ebac59-b10b-4c16-a7e8-a14c599fad41
+uuid: 3099a0bb-c98d-4dd7-b52d-f3108e9629df
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_media__image_announcement.yml b/config/migrate_plus.migration.reliefweb_media__image_announcement.yml
index 339afcafb..800ddb3b5 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_announcement.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_announcement.yml
@@ -1,4 +1,4 @@
-uuid: 489aa1ff-5862-4b96-aed7-7704408b56de
+uuid: d7f30d8a-cfa3-4de3-aeb5-eec1787ce6dd
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_attached_images.yml b/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_attached_images.yml
index d0dd73868..da9c2923f 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_attached_images.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_attached_images.yml
@@ -1,4 +1,4 @@
-uuid: 2b72bb9e-1d59-4fa3-83f4-e185bd5e04a7
+uuid: e8f0fc3c-9688-46c3-b7aa-f8ea989c785c
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_image.yml b/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_image.yml
index ea6e74241..a71be1be2 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_image.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_image.yml
@@ -1,4 +1,4 @@
-uuid: 79ec617a-7320-42e3-a444-f1939db31379
+uuid: d20923b2-b300-4420-a823-35f740c4d379
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_media__image_report__field_headline_image.yml b/config/migrate_plus.migration.reliefweb_media__image_report__field_headline_image.yml
index d3546777d..d9dc17dc8 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_report__field_headline_image.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_report__field_headline_image.yml
@@ -1,4 +1,4 @@
-uuid: d1f036d5-c332-40bb-9cb8-5735e7acb432
+uuid: 7b2feca9-36c9-4272-a3ff-e14b14296c55
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_media__image_report__field_image.yml b/config/migrate_plus.migration.reliefweb_media__image_report__field_image.yml
index f8d26d370..b3649cd8c 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_report__field_image.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_report__field_image.yml
@@ -1,4 +1,4 @@
-uuid: 4d9939da-0ce8-46fc-9857-3db45a217737
+uuid: 2784efaa-c551-4d95-96bb-773b41806e24
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_media__image_topic.yml b/config/migrate_plus.migration.reliefweb_media__image_topic.yml
index 647a98886..af4ad1dca 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_topic.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_topic.yml
@@ -1,4 +1,4 @@
-uuid: d532ab6f-33fc-4ec6-be86-28556da2dffa
+uuid: 979b6aac-fc70-4cb1-9983-d09f32e81937
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_menu_link__footer.yml b/config/migrate_plus.migration.reliefweb_menu_link__footer.yml
index 0822e1175..dd014fe7b 100644
--- a/config/migrate_plus.migration.reliefweb_menu_link__footer.yml
+++ b/config/migrate_plus.migration.reliefweb_menu_link__footer.yml
@@ -1,4 +1,4 @@
-uuid: 76061f94-d164-40b8-8688-31a14b47fca2
+uuid: 3a93e143-4a72-4b37-94c8-5909c0b7e419
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_menu_link__main.yml b/config/migrate_plus.migration.reliefweb_menu_link__main.yml
index a5ba06e44..aa1d242d1 100644
--- a/config/migrate_plus.migration.reliefweb_menu_link__main.yml
+++ b/config/migrate_plus.migration.reliefweb_menu_link__main.yml
@@ -1,4 +1,4 @@
-uuid: 6f6b15bf-3e8d-49af-8272-2e4be83f9e67
+uuid: 1f627007-8733-4dbe-b873-24b1dd3edb36
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_node__announcement.yml b/config/migrate_plus.migration.reliefweb_node__announcement.yml
index 5163a3b92..d3aa1c73c 100644
--- a/config/migrate_plus.migration.reliefweb_node__announcement.yml
+++ b/config/migrate_plus.migration.reliefweb_node__announcement.yml
@@ -1,4 +1,4 @@
-uuid: 016b8ab5-8ee4-4e70-944f-e69dfdda6982
+uuid: 2082c6df-2c0a-4678-a67c-d7baf64495b9
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node__blog_post.yml b/config/migrate_plus.migration.reliefweb_node__blog_post.yml
index 2d3e4934a..2cb435c7d 100644
--- a/config/migrate_plus.migration.reliefweb_node__blog_post.yml
+++ b/config/migrate_plus.migration.reliefweb_node__blog_post.yml
@@ -1,4 +1,4 @@
-uuid: 5e264994-ae9c-4274-bcb9-a2098ff65836
+uuid: c2c4c0d8-459e-441f-a0b8-e177398b65a7
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node__book.yml b/config/migrate_plus.migration.reliefweb_node__book.yml
index 9e3b25230..259c9067b 100644
--- a/config/migrate_plus.migration.reliefweb_node__book.yml
+++ b/config/migrate_plus.migration.reliefweb_node__book.yml
@@ -1,4 +1,4 @@
-uuid: 7da0e0c4-c2c3-4a53-ac10-f07729714f3a
+uuid: 52c65a5a-de20-4c7c-a08d-f90c6b796a15
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node__job.yml b/config/migrate_plus.migration.reliefweb_node__job.yml
index dcbff2cb1..87ec7d7a9 100644
--- a/config/migrate_plus.migration.reliefweb_node__job.yml
+++ b/config/migrate_plus.migration.reliefweb_node__job.yml
@@ -1,9 +1,9 @@
-uuid: f6cd1c3e-b264-4389-80a1-9e9b1725b1ad
+uuid: 9d4a08bc-904c-4cd5-8e46-b97943e06f1c
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: 2K5i6FmC8Lgq4-t0_fbwD3_VA48FcdhjFeKPQccXAas
+  default_config_hash: 8DBBZFIvaJTfF8GdHcHMVgjIKK9lTpcfv_QmhIvVZhk
 id: reliefweb_node__job
 class: null
 field_plugin_method: null
@@ -14,6 +14,9 @@ label: 'Migrate ReliefWeb jobs.'
 source:
   bundle: job
 process:
+  body/format:
+    plugin: default_value
+    default_value: markdown_editor
   field_career_categories/value:
     plugin: sub_process
     source: field_career_categories
@@ -32,7 +35,9 @@ process:
     plugin: skip_on_empty
     method: process
     source: field_how_to_apply/0/value
-  field_how_to_apply/format: constants/format
+  field_how_to_apply/format:
+    plugin: default_value
+    default_value: markdown_editor
   field_job_closing_date:
     -
       plugin: skip_on_empty
diff --git a/config/migrate_plus.migration.reliefweb_node__report.yml b/config/migrate_plus.migration.reliefweb_node__report.yml
index 357f7f1bd..8a6d5ae65 100644
--- a/config/migrate_plus.migration.reliefweb_node__report.yml
+++ b/config/migrate_plus.migration.reliefweb_node__report.yml
@@ -1,4 +1,4 @@
-uuid: b61cd0ec-3b98-4717-9953-aaaf298c3d7e
+uuid: c0e7b6f0-0155-4b85-9fac-881accbe57a3
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node__topic.yml b/config/migrate_plus.migration.reliefweb_node__topic.yml
index d138fd7ee..2af7141fd 100644
--- a/config/migrate_plus.migration.reliefweb_node__topic.yml
+++ b/config/migrate_plus.migration.reliefweb_node__topic.yml
@@ -1,4 +1,4 @@
-uuid: 39978a53-e5b6-463f-b6b0-509f0278d335
+uuid: 4288f88b-cc86-4eac-ab81-498d8329906f
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node__training.yml b/config/migrate_plus.migration.reliefweb_node__training.yml
index 95aaadf7f..74a1bd60e 100644
--- a/config/migrate_plus.migration.reliefweb_node__training.yml
+++ b/config/migrate_plus.migration.reliefweb_node__training.yml
@@ -1,9 +1,9 @@
-uuid: 209709cb-bce9-41a5-8ef9-d40f894d7134
+uuid: 670470de-b71a-4626-8d0b-c4b94896d9b2
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: UaO8PaZNdJlxV9r8v0fMwy0rdod637dj96uNR6irLpY
+  default_config_hash: JAPBYw8MeZgqoLftDwBKMOYWGhlnRa8YpPcsoLJjdNY
 id: reliefweb_node__training
 class: null
 field_plugin_method: null
@@ -14,6 +14,9 @@ label: 'Migrate ReliefWeb training ads.'
 source:
   bundle: training
 process:
+  body/format:
+    plugin: default_value
+    default_value: markdown_editor
   field_career_categories/value:
     plugin: sub_process
     source: field_career_categories
@@ -40,7 +43,9 @@ process:
     plugin: skip_on_empty
     method: process
     source: field_how_to_apply/0/value
-  field_how_to_register/format: constants/format
+  field_how_to_register/format:
+    plugin: default_value
+    default_value: markdown_editor
   field_language:
     plugin: sub_process
     source: field_language
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__announcement.yml b/config/migrate_plus.migration.reliefweb_node_revision__announcement.yml
index 13947b32a..33e4aee2f 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__announcement.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__announcement.yml
@@ -1,4 +1,4 @@
-uuid: 7ea37354-efee-43a2-820d-8bdc90a31128
+uuid: 4c47d2d5-9862-40a7-b5de-0039b48b2ebe
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__blog_post.yml b/config/migrate_plus.migration.reliefweb_node_revision__blog_post.yml
index de404bf35..e80af4a5d 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__blog_post.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__blog_post.yml
@@ -1,4 +1,4 @@
-uuid: 230530fd-7f77-424f-9582-02243d2e578e
+uuid: 0bfa3797-bdc9-4a4d-a4c5-e9064b47c725
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__book.yml b/config/migrate_plus.migration.reliefweb_node_revision__book.yml
index c807798ac..35953e683 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__book.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__book.yml
@@ -1,4 +1,4 @@
-uuid: 6d755fa4-f2fe-40c3-a23e-ddb36cfc2717
+uuid: 0fb608d9-eac6-4770-a5df-9b7f9916424f
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__job.yml b/config/migrate_plus.migration.reliefweb_node_revision__job.yml
index d3edded2c..20078a52c 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__job.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__job.yml
@@ -1,9 +1,9 @@
-uuid: e8ea6547-3b63-4b0e-b920-acb886fc6702
+uuid: bd19027d-6627-481d-8a31-e860bd8e7b61
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: NNDXTHeboJSQRaQd11L6YZKIGO0_E6kEk1qb1Qirejk
+  default_config_hash: zUZbQwbkZXq5R7OYr3FMFJ0wFKalJ6iUkzCREDqCMV4
 id: reliefweb_node_revision__job
 class: null
 field_plugin_method: null
@@ -14,6 +14,9 @@ label: 'Migrate ReliefWeb job revisions.'
 source:
   bundle: job
 process:
+  body/format:
+    plugin: default_value
+    default_value: markdown_editor
   field_career_categories/value:
     plugin: sub_process
     source: field_career_categories
@@ -32,7 +35,9 @@ process:
     plugin: skip_on_empty
     method: process
     source: field_how_to_apply/0/value
-  field_how_to_apply/format: constants/format
+  field_how_to_apply/format:
+    plugin: default_value
+    default_value: markdown_editor
   field_job_closing_date:
     -
       plugin: skip_on_empty
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__report.yml b/config/migrate_plus.migration.reliefweb_node_revision__report.yml
index 4564fa8f6..d765903c8 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__report.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__report.yml
@@ -1,4 +1,4 @@
-uuid: a3634a7f-5275-4e41-a089-d28cd7801951
+uuid: 0a56491d-1b57-48b1-9339-7a1ac6cb7b8a
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__topic.yml b/config/migrate_plus.migration.reliefweb_node_revision__topic.yml
index 3b6fdd46b..4486b20a3 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__topic.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__topic.yml
@@ -1,4 +1,4 @@
-uuid: 29b16107-d8cb-422e-981b-99937cf95836
+uuid: abcb1f36-a47d-4dac-9914-72b033ceab68
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__training.yml b/config/migrate_plus.migration.reliefweb_node_revision__training.yml
index 1eb0f1b25..0cc91d101 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__training.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__training.yml
@@ -1,9 +1,9 @@
-uuid: e1a602bf-ec25-4b05-8db1-6250d4eefdbb
+uuid: f7f68140-6dfe-42d6-86fb-af86f43733af
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: gA4d2zju51IuVcuSKQX6T80_kGIlP4FyBQ3L6Q6BbHs
+  default_config_hash: lETZJat6fv3IIz05H7qS_1DYmwITJXrqaftjy0ylO7s
 id: reliefweb_node_revision__training
 class: null
 field_plugin_method: null
@@ -14,6 +14,9 @@ label: 'Migrate ReliefWeb training revisions.'
 source:
   bundle: training
 process:
+  body/format:
+    plugin: default_value
+    default_value: markdown_editor
   field_career_categories/value:
     plugin: sub_process
     source: field_career_categories
@@ -40,7 +43,9 @@ process:
     plugin: skip_on_empty
     method: process
     source: field_how_to_register/0/value
-  field_how_to_register/format: constants/format
+  field_how_to_register/format:
+    plugin: default_value
+    default_value: markdown_editor
   field_language:
     plugin: sub_process
     source: field_language
diff --git a/config/migrate_plus.migration.reliefweb_subscriptions.yml b/config/migrate_plus.migration.reliefweb_subscriptions.yml
index dfa34b645..72c5a5085 100644
--- a/config/migrate_plus.migration.reliefweb_subscriptions.yml
+++ b/config/migrate_plus.migration.reliefweb_subscriptions.yml
@@ -1,4 +1,4 @@
-uuid: deb8f5b1-6b51-4d7f-9b11-ea3baad1ac22
+uuid: 7ce0e6b3-fda0-4384-badd-42ede13826d4
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term.yml
index 7d5083401..4f2eba90a 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term.yml
@@ -1,4 +1,4 @@
-uuid: 5e722a4d-c9b1-4f37-95fd-ab5e70e9d080
+uuid: b6a782b2-5f4a-427f-bba0-baa3bfa03bb7
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term__country.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term__country.yml
index fdc7d826b..4e07cdbec 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term__country.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term__country.yml
@@ -1,4 +1,4 @@
-uuid: d5aed4b8-5a0b-4c6e-9193-cd1601f68cd9
+uuid: 9263f8ee-678d-45c2-8ab4-ca9d3edeba3a
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term__disaster.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term__disaster.yml
index 05c2941a3..9c03b9852 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term__disaster.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term__disaster.yml
@@ -1,4 +1,4 @@
-uuid: 8bcf6795-c990-4203-9f77-296a5ae1e425
+uuid: 16890909-e15d-4405-91b1-d45fda48d3e9
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term__source.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
index 7f19b2458..5c8f604db 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
@@ -1,4 +1,4 @@
-uuid: fa35fab6-e05f-4456-bfc5-f7d8204867ca
+uuid: 8944df0d-4259-418e-bde0-d76fa7b99e01
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision.yml
index fd39da821..66be444f0 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision.yml
@@ -1,4 +1,4 @@
-uuid: c24092f2-c024-4e88-9198-f18c4751012f
+uuid: 339be4ff-59c8-4af2-b886-1c2693beb17d
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__country.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__country.yml
index be6ef247a..2c04b41b2 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__country.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__country.yml
@@ -1,4 +1,4 @@
-uuid: 63724339-0404-4ae4-b351-68fcad92f461
+uuid: bb5ad0a2-92f3-4ac0-8eaf-d0cd3ce781e5
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__disaster.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__disaster.yml
index 2230b1125..97026634f 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__disaster.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__disaster.yml
@@ -1,4 +1,4 @@
-uuid: ffb046dd-1934-4d1c-8ee4-2599e4fd8ea7
+uuid: 2b1d34d4-6dcb-4f4a-9a55-5d971474a7cb
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
index 69a19e386..cb5f8b154 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
@@ -1,4 +1,4 @@
-uuid: 766f63a5-9637-4d3c-83e0-8eb086c07fcc
+uuid: 8806dd82-66ba-4c82-83eb-ef338fdceab4
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_url_alias.yml b/config/migrate_plus.migration.reliefweb_url_alias.yml
index 057836280..6a0e9a78a 100644
--- a/config/migrate_plus.migration.reliefweb_url_alias.yml
+++ b/config/migrate_plus.migration.reliefweb_url_alias.yml
@@ -1,4 +1,4 @@
-uuid: 5e191c17-bff2-4d77-9871-d030c32e43b3
+uuid: bd343992-e660-498b-a64e-c7edcc023ffa
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_user.yml b/config/migrate_plus.migration.reliefweb_user.yml
index c6c70a4ab..7f0dbccab 100644
--- a/config/migrate_plus.migration.reliefweb_user.yml
+++ b/config/migrate_plus.migration.reliefweb_user.yml
@@ -1,4 +1,4 @@
-uuid: 1b313b14-1c38-47b0-8e37-d90bc2def4c3
+uuid: ddc34618-7336-4d97-b7ff-60a321f0a959
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_user__default.yml b/config/migrate_plus.migration.reliefweb_user__default.yml
index 1ec56e402..e275d598a 100644
--- a/config/migrate_plus.migration.reliefweb_user__default.yml
+++ b/config/migrate_plus.migration.reliefweb_user__default.yml
@@ -1,4 +1,4 @@
-uuid: 2e5cee67-215e-40d6-9c67-8afd0f63a23d
+uuid: c3baf078-4fd8-4d87-a514-5c2f23cc44fd
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration_group.reliefweb_base.yml b/config/migrate_plus.migration_group.reliefweb_base.yml
index 3a7ca1ce3..b1b285e1d 100644
--- a/config/migrate_plus.migration_group.reliefweb_base.yml
+++ b/config/migrate_plus.migration_group.reliefweb_base.yml
@@ -1,4 +1,4 @@
-uuid: 20ec076f-b4ce-4707-a6df-e0dc6be1bbe1
+uuid: 3484ae7f-5fc5-44c7-9d5a-de06c2900c90
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration_group.reliefweb_extra.yml b/config/migrate_plus.migration_group.reliefweb_extra.yml
index bd44978ae..af8d435f8 100644
--- a/config/migrate_plus.migration_group.reliefweb_extra.yml
+++ b/config/migrate_plus.migration_group.reliefweb_extra.yml
@@ -1,4 +1,4 @@
-uuid: b17b7be1-b1d3-4f39-a53f-01d954a131f3
+uuid: 4fd04afb-d3f4-42de-ba3d-1be612f6f182
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration_group.reliefweb_image.yml b/config/migrate_plus.migration_group.reliefweb_image.yml
index 00a59b04d..cec2d3adf 100644
--- a/config/migrate_plus.migration_group.reliefweb_image.yml
+++ b/config/migrate_plus.migration_group.reliefweb_image.yml
@@ -1,4 +1,4 @@
-uuid: 0076693b-0556-4364-9781-cf34f7804bf2
+uuid: 50f2223d-9322-4817-8bda-2039c3d96f65
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration_group.reliefweb_media.yml b/config/migrate_plus.migration_group.reliefweb_media.yml
index 9f26959a7..6d5883cd7 100644
--- a/config/migrate_plus.migration_group.reliefweb_media.yml
+++ b/config/migrate_plus.migration_group.reliefweb_media.yml
@@ -1,4 +1,4 @@
-uuid: 1ef07031-1f8b-4362-956e-b925826e5a27
+uuid: e95897b7-8253-4591-8bc9-a80eb71b2bda
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration_group.reliefweb_node.yml b/config/migrate_plus.migration_group.reliefweb_node.yml
index 28a9789b8..1070fcfbe 100644
--- a/config/migrate_plus.migration_group.reliefweb_node.yml
+++ b/config/migrate_plus.migration_group.reliefweb_node.yml
@@ -1,4 +1,4 @@
-uuid: 10d45c3d-f46e-4fb9-9c51-42d491c09568
+uuid: 63de7499-3869-4426-902c-1091d268fe3e
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration_group.reliefweb_node_revision.yml b/config/migrate_plus.migration_group.reliefweb_node_revision.yml
index 03160d461..835b7368d 100644
--- a/config/migrate_plus.migration_group.reliefweb_node_revision.yml
+++ b/config/migrate_plus.migration_group.reliefweb_node_revision.yml
@@ -1,4 +1,4 @@
-uuid: c88a86b7-37ec-405b-bc36-7bcb0156dace
+uuid: 11b815ce-0438-4380-a23a-31628a17021d
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration_group.reliefweb_term.yml b/config/migrate_plus.migration_group.reliefweb_term.yml
index 582f5c6c1..61eb50ece 100644
--- a/config/migrate_plus.migration_group.reliefweb_term.yml
+++ b/config/migrate_plus.migration_group.reliefweb_term.yml
@@ -1,4 +1,4 @@
-uuid: ea2434e4-dbf2-4f53-bcaf-da4cc391ac27
+uuid: eafd426f-ae75-4582-b1c3-ccd8da49dece
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration_group.reliefweb_term_revision.yml b/config/migrate_plus.migration_group.reliefweb_term_revision.yml
index 2d36845f0..951c04f3a 100644
--- a/config/migrate_plus.migration_group.reliefweb_term_revision.yml
+++ b/config/migrate_plus.migration_group.reliefweb_term_revision.yml
@@ -1,4 +1,4 @@
-uuid: 057f4246-bbcc-4dc7-b49b-92dde0c790a9
+uuid: 42ff7ed8-0381-4495-9df1-a2ce6794bad5
 langcode: en
 status: true
 dependencies:

From a3fd7d729002b86bf38b7d461ab4297c00ed5922 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Thu, 9 Dec 2021 11:48:27 +0100
Subject: [PATCH 262/720] Use title, not name

---
 .../guidelines/components/guidelines-json/guidelines-json.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.js b/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.js
index 683f09222..e0f707e1e 100644
--- a/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.js
+++ b/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.js
@@ -100,7 +100,7 @@
 
         var link = document.createElement('a');
         link.setAttribute('href', card.link);
-        link.appendChild(document.createTextNode(card.name));
+        link.appendChild(document.createTextNode(card.title));
 
         var heading = document.createElement('h3');
         heading.appendChild(link);

From 17d2846efae5ce3dd801a37b3a7b05e2e9f8cd99 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Thu, 9 Dec 2021 11:50:31 +0100
Subject: [PATCH 263/720] Add alter hook

---
 .../custom/guidelines/guidelinesapi.php       | 29 +++++++++++++++++++
 .../Controller/GuidelineJsonController.php    | 15 +++++++++-
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 html/modules/custom/guidelines/guidelinesapi.php

diff --git a/html/modules/custom/guidelines/guidelinesapi.php b/html/modules/custom/guidelines/guidelinesapi.php
new file mode 100644
index 000000000..80aee1877
--- /dev/null
+++ b/html/modules/custom/guidelines/guidelinesapi.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * @file
+ * Hooks.
+ */
+
+use Drupal\guidelines\Entity\Guideline;
+
+/**
+ * Alter description exposed by the JSON controller.
+ *
+ * @param array $description
+ *   Description with basic fields present.
+ * @param \Drupal\guidelines\Entity\Guideline $guideline
+ *   The full guideline.
+ * @param array $context
+ *   Array containing entity type and bundle.
+ *
+ * @see src/Controller/GuidelineJsonController.php
+ */
+function hook_guideline_json_fields_alter(array &$description, Guideline $guideline, array $context) {
+  // Change the link on nodes.
+  if ($context['entity_type'] === 'node') {
+    if ($guideline->hasField('field_short_link')) {
+      $description['link'] = '/guidelines#' . $guideline->field_short_link->value;
+    }
+  }
+}
diff --git a/html/modules/custom/guidelines/src/Controller/GuidelineJsonController.php b/html/modules/custom/guidelines/src/Controller/GuidelineJsonController.php
index bb1511074..f7f545518 100644
--- a/html/modules/custom/guidelines/src/Controller/GuidelineJsonController.php
+++ b/html/modules/custom/guidelines/src/Controller/GuidelineJsonController.php
@@ -39,11 +39,24 @@ public function getFormGuidelines($entity_type, $bundle) {
           $pre_render = $view_builder->view($guideline, 'default');
           $render_output = render($pre_render);
 
-          $descriptions[] = [
+          $description = [
             'label' => $f,
+            'title' => $guideline->field_title->value,
             'content' => $render_output,
             'link' => $guideline->toUrl()->toString(),
           ];
+
+          // Allow other modules to add extra fields.
+          $module_handler = \Drupal::moduleHandler();
+          $context = [
+            'entity_type' => $entity_type,
+            'bundle' => $bundle,
+          ];
+          $module_handler->alter('guideline_json_fields', $description, $guideline, $context);
+
+          if (isset($description['label']) && !empty($description['label'])) {
+            $descriptions[] = $description;
+          }
         }
       }
     }

From 6185b63e89162f16a1ccca093f5dcd2023d44902 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Thu, 9 Dec 2021 11:51:17 +0100
Subject: [PATCH 264/720] Make search text visible

---
 .../components/reliefweb-guidelines/reliefweb-guidelines.css     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
index 5ea7b948d..753d7f512 100644
--- a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
+++ b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
@@ -79,6 +79,7 @@
   flex: 0 0 auto;
 }
 .rw-guidelines-list aside form input {
+  color: #333;
   border: none;
   border-bottom: 1px solid #333;
   box-shadow: inset 0px 1px 5px 0px rgba(0,0,0,0.5);

From bab48f6832a73852ba660737522f6f6de6e105f0 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Thu, 9 Dec 2021 11:52:33 +0100
Subject: [PATCH 265/720] Hide toolbar, add title prefix

---
 .../reliefweb_guidelines.module               | 30 +++++++++++++++++++
 .../GuidelineSinglePageController.php         | 12 ++++----
 .../reliefweb-guidelines-item.html.twig       |  2 +-
 .../reliefweb-guidelines-list.html.twig       |  3 +-
 4 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
index 9d0f7d132..9f8574c4a 100644
--- a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
@@ -27,6 +27,7 @@ function reliefweb_guidelines_theme() {
       'variables' => [
         'id' => '',
         'title' => '',
+        'title_prefix' => '',
         'description' => '',
         'children' => [],
       ],
@@ -267,3 +268,32 @@ function _reliefweb_guidelines_delete_all() {
   }
 
 }
+
+/**
+ * Implements hook_page_attachments_alter().
+ */
+function reliefweb_guidelines_page_attachments_alter(array &$attachments) {
+  if (\Drupal::routeMatch()->getRouteName() === 'reliefweb_guidelines.guidelines') {
+    if (in_array('core/drupal.active-link', $attachments['#attached']['library'])) {
+      $index = array_search('core/drupal.active-link', $attachments['#attached']['library']);
+      unset($attachments['#attached']['library'][$index]);
+    }
+  }
+}
+
+/**
+ * Implements hook_page_top().
+ */
+function reliefweb_guidelines_page_top(array &$page_top) {
+  $page_top['toolbar']['#access'] = FALSE;
+}
+
+/**
+ * Implements hook_guideline_json_fields_alter().
+ */
+function reliefweb_guidelines_guideline_json_fields_alter(&$description, $guideline, $context) {
+  /** @var Drupal\guidelines\Entity\Guideline $guideline */
+  if ($guideline->hasField('field_short_link')) {
+    $description['link'] = '/guidelines#' . $guideline->field_short_link->value;
+  }
+}
diff --git a/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php b/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
index bb28301e5..6ae1d4501 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
@@ -115,16 +115,18 @@ public function getPageContent() {
       if ($parents = $guideline->getParentIds()) {
         $items[$parents[0]]['#children'][] = [
           '#theme' => 'reliefweb_guidelines_item',
-          '#id' => $guideline->hasField('field_short_link') ? Html::getUniqueId($guideline->field_short_link->value) : Html::getUniqueId($guideline->field_title->value),
-          '#title' => $guidelines[$parents[0]]->field_title->value . ' > ' . $guideline->field_title->value,
+          '#id' => $guideline->hasField('field_short_link') ? $guideline->field_short_link->value : Html::getUniqueId($guideline->field_title->value),
+          '#title' => $guideline->field_title->value,
+          '#title_prefix' => $guidelines[$parents[0]]->field_title->value . ' > ',
           '#description' => $this->cleanAtags($guideline->hasField('field_description') ? check_markup($guideline->field_description->value, $guideline->field_description->format) : ''),
         ];
       }
       else {
         $items[$guideline->id()] = [
           '#theme' => 'reliefweb_guidelines_item',
-          '#id' => $guideline->hasField('field_short_link') ? Html::getUniqueId($guideline->field_short_link->value) : Html::getUniqueId($guideline->field_title->value),
+          '#id' => $guideline->hasField('field_short_link') ? $guideline->field_short_link->value : Html::getUniqueId($guideline->field_title->value),
           '#title' => $guideline->field_title->value,
+          '#title_prefix' => '',
           '#description' => $this->cleanAtags($guideline->hasField('field_description') ? check_markup($guideline->field_description->value, $guideline->field_description->format) : ''),
           '#children' => [],
         ];
@@ -155,12 +157,12 @@ protected function cleanAtags($text) {
 
     $pattern = '/\<a.+href="https:\/\/trello.com\/c\/([0-9A-Z]+)"/i';
     $text = preg_replace_callback($pattern, function ($matches) {
-      return '<a class="xyzzy1" href="#' . strtolower($matches[1]) . '"';
+      return '<a class="xyzzy1" href="#' . $matches[1] . '"';
     }, $text);
 
     $pattern = '/\<a.+href="https:\/\/guidelines.rwdev.org\/#([0-9A-Z]+)"/i';
     $text = preg_replace_callback($pattern, function ($matches) {
-      return '<a class="xyzzy2" href="#' . strtolower($matches[1]) . '"';
+      return '<a class="xyzzy2" href="#' . $matches[1] . '"';
     }, $text);
 
     return $text;
diff --git a/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-item.html.twig b/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-item.html.twig
index b5f23133d..c68a405b3 100644
--- a/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-item.html.twig
+++ b/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-item.html.twig
@@ -12,6 +12,6 @@
 #}
 
 <article{{ attributes.setAttribute('id', id).addClass('rw-guidelines-item') }}>
-  <h2>{{ title }}</h2>
+  <h2>{{ title_prefix }}{{ title }}</h2>
   <div>{{ description }}</div>
 </article>
diff --git a/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-list.html.twig b/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-list.html.twig
index e3f3dc129..c1d353252 100644
--- a/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-list.html.twig
+++ b/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-list.html.twig
@@ -15,7 +15,7 @@
   <aside>
     <h1>Guidelines</h1>
     <form action="#search">
-      <input id="search" type="text" placeholder="Search">
+      <input id="" type="text" placeholder="Search">
     </form>
     <nav class="scroll">
       {% for guideline in guidelines %}
@@ -39,6 +39,7 @@
         <a name="{{ guideline['#id'] }}"></a>
         {{ guideline['#children'] }}
       {% endfor %}
+      <article id="search"></article>
     </div>
   </main>
 </div>

From b9c329db683c408ce2499fc7d4a08678e1b9f57a Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Thu, 9 Dec 2021 11:53:39 +0100
Subject: [PATCH 266/720] Use html template without top/bottom bar

---
 .../rw-guidelines/guidelines-json.js          |  2 +-
 .../layout/html--guidelines.html.twig         | 46 +++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 html/themes/custom/common_design_subtheme/templates/layout/html--guidelines.html.twig

diff --git a/html/themes/custom/common_design_subtheme/components/rw-guidelines/guidelines-json.js b/html/themes/custom/common_design_subtheme/components/rw-guidelines/guidelines-json.js
index f97fd4eda..5c54cce22 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-guidelines/guidelines-json.js
+++ b/html/themes/custom/common_design_subtheme/components/rw-guidelines/guidelines-json.js
@@ -101,7 +101,7 @@
 
         var link = document.createElement('a');
         link.setAttribute('href', card.link);
-        link.appendChild(document.createTextNode(card.name));
+        link.appendChild(document.createTextNode(card.title));
 
         var heading = document.createElement('h3');
         heading.appendChild(link);
diff --git a/html/themes/custom/common_design_subtheme/templates/layout/html--guidelines.html.twig b/html/themes/custom/common_design_subtheme/templates/layout/html--guidelines.html.twig
new file mode 100644
index 000000000..581dd2312
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/templates/layout/html--guidelines.html.twig
@@ -0,0 +1,46 @@
+{#
+/**
+ * @file
+ * Theme override for the basic structure of a single Drupal page.
+ *
+ * Variables:
+ * - logged_in: A flag indicating if user is logged in.
+ * - root_path: The root path of the current page (e.g., node, admin, user).
+ * - node_type: The content type for the current node, if the page is a node.
+ * - head_title: List of text elements that make up the head_title variable.
+ *   May contain one or more of the following:
+ *   - title: The title of the page.
+ *   - name: The name of the site.
+ *   - slogan: The slogan of the site.
+ * - page_top: Initial rendered markup. This should be printed before 'page'.
+ * - page: The rendered page markup.
+ * - page_bottom: Closing rendered markup. This variable should be printed after
+ *   'page'.
+ * - db_offline: A flag indicating if the database is offline.
+ * - placeholder_token: The token for generating head, css, js and js-bottom
+ *   placeholders.
+ *
+ * @see template_preprocess_html()
+ */
+#}
+{%
+  set body_classes = [
+    logged_in ? 'user-logged-in',
+    not root_path ? 'path-frontpage' : 'path-' ~ root_path|clean_class,
+    node_type ? 'page-node-type-' ~ node_type|clean_class,
+    db_offline ? 'db-offline',
+  ]
+%}
+<!DOCTYPE html>
+<html{{ html_attributes.addClass('no-js') }}>
+  <head>
+    <head-placeholder token="{{ placeholder_token }}">
+    <title>{{ head_title|safe_join(' | ') }}</title>
+    <css-placeholder token="{{ placeholder_token }}">
+    <js-placeholder token="{{ placeholder_token }}">
+  </head>
+  <body{{ attributes.addClass(body_classes) }}>
+    {{ page }}
+    <js-bottom-placeholder token="{{ placeholder_token }}">
+  </body>
+</html>

From 2ff5ebaa317bfa676439776c6bfc9f7f5bc46910 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Thu, 9 Dec 2021 11:56:00 +0100
Subject: [PATCH 267/720] Fix api file name

---
 .../custom/guidelines/{guidelinesapi.php => guidelines.api.php}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename html/modules/custom/guidelines/{guidelinesapi.php => guidelines.api.php} (100%)

diff --git a/html/modules/custom/guidelines/guidelinesapi.php b/html/modules/custom/guidelines/guidelines.api.php
similarity index 100%
rename from html/modules/custom/guidelines/guidelinesapi.php
rename to html/modules/custom/guidelines/guidelines.api.php

From b729e37c509116a002663d08ed9aedd4073a0d8b Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Thu, 9 Dec 2021 12:17:35 +0100
Subject: [PATCH 268/720] Fix regexp

---
 .../src/Controller/GuidelineSinglePageController.php      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php b/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
index 6ae1d4501..50a5693e4 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
@@ -155,14 +155,14 @@ protected function cleanAtags($text) {
       return $text;
     }
 
-    $pattern = '/\<a.+href="https:\/\/trello.com\/c\/([0-9A-Z]+)"/i';
+    $pattern = '/\<a.+href="https:\/\/trello.com\/c\/([0-9A-Z]+)".+>/i';
     $text = preg_replace_callback($pattern, function ($matches) {
-      return '<a class="xyzzy1" href="#' . $matches[1] . '"';
+      return '<a class="xyzzy1" href="#' . $matches[1] . '">';
     }, $text);
 
-    $pattern = '/\<a.+href="https:\/\/guidelines.rwdev.org\/#([0-9A-Z]+)"/i';
+    $pattern = '/\<a.+href="https:\/\/guidelines.rwdev.org\/#([0-9A-Z]+).+>"/i';
     $text = preg_replace_callback($pattern, function ($matches) {
-      return '<a class="xyzzy2" href="#' . $matches[1] . '"';
+      return '<a class="xyzzy2" href="#' . $matches[1] . '">';
     }, $text);
 
     return $text;

From dd4309784eca0632feafa45275349cfcfe939e7e Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Thu, 9 Dec 2021 12:35:15 +0100
Subject: [PATCH 269/720] Prep for contrib module

---
 html/modules/custom/guidelines/README.md       | 18 ++++++++++++++----
 .../guidelines/guidelines.links.menu.yml       | 13 ++++++++-----
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/html/modules/custom/guidelines/README.md b/html/modules/custom/guidelines/README.md
index 961ade73a..d70730545 100644
--- a/html/modules/custom/guidelines/README.md
+++ b/html/modules/custom/guidelines/README.md
@@ -1,7 +1,17 @@
 # Guidelines
 
-## Todo
+This module allows you to add extended help text to fields on edit forms.
 
-- [ ] Add moderation
-- [x] Add tab for child pages
-- [x] Add drag and drop, https://www.drupal.org/project/drupal/issues/2989889
+- The guidelines are stored as entites, so they will not be reset when importing config.
+- Guidelines can have a parent and can be ordered.
+- Guidelines can either replace the default `'#description` of a field or can be loaded using json, see `/admin/structure/guideline_type/settings`
+- Guidelines are fieldable, by default they have
+  1. Guideline list can be used to group field guidelines
+    - Title
+    - Description
+  2. Field guideline
+    - Title
+    - Description
+    - Images
+    - Links
+- Output is controlled by manage display
diff --git a/html/modules/custom/guidelines/guidelines.links.menu.yml b/html/modules/custom/guidelines/guidelines.links.menu.yml
index 2704d590b..4eb1c13d1 100644
--- a/html/modules/custom/guidelines/guidelines.links.menu.yml
+++ b/html/modules/custom/guidelines/guidelines.links.menu.yml
@@ -1,5 +1,3 @@
-
-# Guideline menu items definition
 entity.guideline.collection:
   title: 'Guideline list'
   route_name: entity.guideline.collection
@@ -7,11 +5,16 @@ entity.guideline.collection:
   parent: system.admin_structure
   weight: 100
 
-
-# Guideline type menu items definition
 entity.guideline_type.collection:
   title: 'Guideline type'
   route_name: entity.guideline_type.collection
   description: 'List Guideline type (bundles)'
   parent: system.admin_structure
-  weight: 99
+  weight: 101
+
+entity.guideline_type.settings:
+  title: 'Guideline settings'
+  route_name: guidelines.settings
+  description: 'Global settings'
+  parent: system.admin_structure
+  weight: 102

From 088fe52dd5c0bb06fae840165cc3175aa6e44300 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Thu, 9 Dec 2021 12:42:39 +0100
Subject: [PATCH 270/720] Use contrib for guidelines

---
 composer.json                                 |   1 +
 composer.lock                                 |  47 ++-
 html/modules/custom/guidelines/README.md      |  17 -
 .../guidelines-json/guidelines-json.css       |  71 ----
 .../guidelines-json/guidelines-json.js        | 213 ----------
 html/modules/custom/guidelines/composer.json  |  13 -
 .../config/install/guidelines.settings.yml    |   2 -
 ...play.guideline.field_guideline.default.yml |  71 ----
 ...splay.guideline.guideline_list.default.yml |  38 --
 ...play.guideline.field_guideline.default.yml |  46 ---
 ...splay.guideline.guideline_list.default.yml |  22 -
 ...line.field_guideline.field_description.yml |  20 -
 ....guideline.field_guideline.field_field.yml |  20 -
 ...guideline.field_guideline.field_images.yml |  37 --
 ....guideline.field_guideline.field_title.yml |  18 -
 ...d.guideline.guideline_list.field_title.yml |  18 -
 ...ld.storage.guideline.field_description.yml |  18 -
 .../field.storage.guideline.field_field.yml   |  20 -
 .../field.storage.guideline.field_images.yml  |  29 --
 .../field.storage.guideline.field_title.yml   |  20 -
 .../optional/filter.format.guideline.yml      |   7 -
 ...delines.guideline_type.field_guideline.yml |   5 -
 ...idelines.guideline_type.guideline_list.yml |   5 -
 .../config/optional/guidelines.settings.yml   |   2 -
 .../image.style.guideline_thumbnail.yml       |  14 -
 .../config/schema/guidelines.schema.yml       |  10 -
 .../custom/guidelines/guideline.page.inc      |  27 --
 .../custom/guidelines/guidelines.api.php      |  29 --
 .../custom/guidelines/guidelines.info.yml     |   6 -
 .../guidelines/guidelines.libraries.yml       |   6 -
 .../guidelines/guidelines.links.action.yml    |  10 -
 .../guidelines/guidelines.links.menu.yml      |  20 -
 .../guidelines/guidelines.links.task.yml      |  28 --
 .../custom/guidelines/guidelines.module       | 155 -------
 .../guidelines/guidelines.permissions.yml     |  36 --
 .../custom/guidelines/guidelines.routing.yml  |  20 -
 .../custom/guidelines/guidelines.schema.yml   |  10 -
 .../src/Controller/GuidelineController.php    | 223 ----------
 .../Controller/GuidelineJsonController.php    |  67 ---
 .../guidelines/src/Entity/Guideline.php       | 380 ------------------
 .../src/Entity/GuidelineInterface.php         | 128 ------
 .../guidelines/src/Entity/GuidelineType.php   |  62 ---
 .../src/Entity/GuidelineTypeInterface.php     |  13 -
 .../src/Entity/GuidelineViewsData.php         |  23 --
 .../src/Form/GuidelineDeleteForm.php          |  15 -
 .../guidelines/src/Form/GuidelineForm.php     | 164 --------
 .../src/Form/GuidelineGlobalSettingsForm.php  |  70 ----
 .../src/Form/GuidelineRevisionDeleteForm.php  | 122 ------
 .../src/Form/GuidelineRevisionRevertForm.php  | 143 -------
 ...GuidelineRevisionRevertTranslationForm.php |  97 -----
 .../src/Form/GuidelineSettingsForm.php        |  53 ---
 .../guidelines/src/Form/GuidelineSortForm.php | 182 ---------
 .../src/Form/GuidelineTypeDeleteForm.php      |  51 ---
 .../guidelines/src/Form/GuidelineTypeForm.php |  65 ---
 .../src/GuidelineAccessControlHandler.php     | 119 ------
 .../src/GuidelineHtmlRouteProvider.php        | 233 -----------
 .../guidelines/src/GuidelineListBuilder.php   |  69 ----
 .../guidelines/src/GuidelinePermissions.php   |  78 ----
 .../guidelines/src/GuidelineStorage.php       |  58 ---
 .../src/GuidelineStorageInterface.php         |  61 ---
 .../src/GuidelineTranslationHandler.php       |  13 -
 .../src/GuidelineTypeHtmlRouteProvider.php    |  26 --
 .../src/GuidelineTypeListBuilder.php          |  32 --
 .../GuidelineFieldTargetFormatter.php         |  79 ----
 .../FieldType/GuidelineFieldTargetType.php    | 103 -----
 .../GuidelineFieldTargetWidget.php            | 161 --------
 .../guideline-content-add-list.html.twig      |  23 --
 .../guidelines/templates/guideline.html.twig  |  22 -
 .../guidelines/templates/guidelines.html.twig |   1 -
 symfony.lock                                  |   3 +
 70 files changed, 50 insertions(+), 4020 deletions(-)
 delete mode 100644 html/modules/custom/guidelines/README.md
 delete mode 100644 html/modules/custom/guidelines/components/guidelines-json/guidelines-json.css
 delete mode 100644 html/modules/custom/guidelines/components/guidelines-json/guidelines-json.js
 delete mode 100644 html/modules/custom/guidelines/composer.json
 delete mode 100644 html/modules/custom/guidelines/config/install/guidelines.settings.yml
 delete mode 100644 html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.field_guideline.default.yml
 delete mode 100644 html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.guideline_list.default.yml
 delete mode 100644 html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.field_guideline.default.yml
 delete mode 100644 html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.guideline_list.default.yml
 delete mode 100644 html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_description.yml
 delete mode 100644 html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_field.yml
 delete mode 100644 html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_images.yml
 delete mode 100644 html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_title.yml
 delete mode 100644 html/modules/custom/guidelines/config/optional/field.field.guideline.guideline_list.field_title.yml
 delete mode 100644 html/modules/custom/guidelines/config/optional/field.storage.guideline.field_description.yml
 delete mode 100644 html/modules/custom/guidelines/config/optional/field.storage.guideline.field_field.yml
 delete mode 100644 html/modules/custom/guidelines/config/optional/field.storage.guideline.field_images.yml
 delete mode 100644 html/modules/custom/guidelines/config/optional/field.storage.guideline.field_title.yml
 delete mode 100644 html/modules/custom/guidelines/config/optional/filter.format.guideline.yml
 delete mode 100644 html/modules/custom/guidelines/config/optional/guidelines.guideline_type.field_guideline.yml
 delete mode 100644 html/modules/custom/guidelines/config/optional/guidelines.guideline_type.guideline_list.yml
 delete mode 100644 html/modules/custom/guidelines/config/optional/guidelines.settings.yml
 delete mode 100644 html/modules/custom/guidelines/config/optional/image.style.guideline_thumbnail.yml
 delete mode 100644 html/modules/custom/guidelines/config/schema/guidelines.schema.yml
 delete mode 100644 html/modules/custom/guidelines/guideline.page.inc
 delete mode 100644 html/modules/custom/guidelines/guidelines.api.php
 delete mode 100644 html/modules/custom/guidelines/guidelines.info.yml
 delete mode 100644 html/modules/custom/guidelines/guidelines.libraries.yml
 delete mode 100644 html/modules/custom/guidelines/guidelines.links.action.yml
 delete mode 100644 html/modules/custom/guidelines/guidelines.links.menu.yml
 delete mode 100644 html/modules/custom/guidelines/guidelines.links.task.yml
 delete mode 100644 html/modules/custom/guidelines/guidelines.module
 delete mode 100644 html/modules/custom/guidelines/guidelines.permissions.yml
 delete mode 100644 html/modules/custom/guidelines/guidelines.routing.yml
 delete mode 100644 html/modules/custom/guidelines/guidelines.schema.yml
 delete mode 100644 html/modules/custom/guidelines/src/Controller/GuidelineController.php
 delete mode 100644 html/modules/custom/guidelines/src/Controller/GuidelineJsonController.php
 delete mode 100644 html/modules/custom/guidelines/src/Entity/Guideline.php
 delete mode 100644 html/modules/custom/guidelines/src/Entity/GuidelineInterface.php
 delete mode 100644 html/modules/custom/guidelines/src/Entity/GuidelineType.php
 delete mode 100644 html/modules/custom/guidelines/src/Entity/GuidelineTypeInterface.php
 delete mode 100644 html/modules/custom/guidelines/src/Entity/GuidelineViewsData.php
 delete mode 100644 html/modules/custom/guidelines/src/Form/GuidelineDeleteForm.php
 delete mode 100644 html/modules/custom/guidelines/src/Form/GuidelineForm.php
 delete mode 100644 html/modules/custom/guidelines/src/Form/GuidelineGlobalSettingsForm.php
 delete mode 100644 html/modules/custom/guidelines/src/Form/GuidelineRevisionDeleteForm.php
 delete mode 100644 html/modules/custom/guidelines/src/Form/GuidelineRevisionRevertForm.php
 delete mode 100644 html/modules/custom/guidelines/src/Form/GuidelineRevisionRevertTranslationForm.php
 delete mode 100644 html/modules/custom/guidelines/src/Form/GuidelineSettingsForm.php
 delete mode 100644 html/modules/custom/guidelines/src/Form/GuidelineSortForm.php
 delete mode 100644 html/modules/custom/guidelines/src/Form/GuidelineTypeDeleteForm.php
 delete mode 100644 html/modules/custom/guidelines/src/Form/GuidelineTypeForm.php
 delete mode 100644 html/modules/custom/guidelines/src/GuidelineAccessControlHandler.php
 delete mode 100644 html/modules/custom/guidelines/src/GuidelineHtmlRouteProvider.php
 delete mode 100644 html/modules/custom/guidelines/src/GuidelineListBuilder.php
 delete mode 100644 html/modules/custom/guidelines/src/GuidelinePermissions.php
 delete mode 100644 html/modules/custom/guidelines/src/GuidelineStorage.php
 delete mode 100644 html/modules/custom/guidelines/src/GuidelineStorageInterface.php
 delete mode 100644 html/modules/custom/guidelines/src/GuidelineTranslationHandler.php
 delete mode 100644 html/modules/custom/guidelines/src/GuidelineTypeHtmlRouteProvider.php
 delete mode 100644 html/modules/custom/guidelines/src/GuidelineTypeListBuilder.php
 delete mode 100644 html/modules/custom/guidelines/src/Plugin/Field/FieldFormatter/GuidelineFieldTargetFormatter.php
 delete mode 100644 html/modules/custom/guidelines/src/Plugin/Field/FieldType/GuidelineFieldTargetType.php
 delete mode 100644 html/modules/custom/guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetWidget.php
 delete mode 100644 html/modules/custom/guidelines/templates/guideline-content-add-list.html.twig
 delete mode 100644 html/modules/custom/guidelines/templates/guideline.html.twig
 delete mode 100644 html/modules/custom/guidelines/templates/guidelines.html.twig

diff --git a/composer.json b/composer.json
index 163f2f58b..72387d03a 100644
--- a/composer.json
+++ b/composer.json
@@ -60,6 +60,7 @@
         "drupal/core-recommended": "^9.2.4",
         "drupal/geofield": "^1.22",
         "drupal/google_tag": "^1.4",
+        "drupal/guidelines": "^1.0",
         "drupal/imageapi_optimize_binaries": "^1.0-alpha2",
         "drupal/mailsystem": "^4.3",
         "drupal/maintenance200": "^1.1",
diff --git a/composer.lock b/composer.lock
index 4d697c10c..85e2e11f2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "8db2f3649b52fc7fb83aabb714b29d48",
+    "content-hash": "9c34fdab81b6f0a54029d70ac71a3096",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -3025,6 +3025,51 @@
                 "source": "https://git.drupalcode.org/project/google_tag"
             }
         },
+        {
+            "name": "drupal/guidelines",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupalcode.org/project/guidelines.git",
+                "reference": "1.0.0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/guidelines-1.0.0.zip",
+                "reference": "1.0.0",
+                "shasum": "2ccc48898982e03c993b46b00e06daff8900e34c"
+            },
+            "require": {
+                "drupal/core": "^9"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "drupal": {
+                    "version": "1.0.0",
+                    "datestamp": "1639049991",
+                    "security-coverage": {
+                        "status": "not-covered",
+                        "message": "Project has not opted into security advisory coverage!"
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "attiks",
+                    "homepage": "https://www.drupal.org/user/105002"
+                }
+            ],
+            "description": "Add guidelines to entities and fields",
+            "homepage": "https://www.drupal.org/project/guidelines",
+            "support": {
+                "source": "http://cgit.drupalcode.org/guidelines",
+                "issues": "https://www.drupal.org/project/issues/guidelines"
+            }
+        },
         {
             "name": "drupal/imageapi_optimize",
             "version": "4.0.0-beta1",
diff --git a/html/modules/custom/guidelines/README.md b/html/modules/custom/guidelines/README.md
deleted file mode 100644
index d70730545..000000000
--- a/html/modules/custom/guidelines/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Guidelines
-
-This module allows you to add extended help text to fields on edit forms.
-
-- The guidelines are stored as entites, so they will not be reset when importing config.
-- Guidelines can have a parent and can be ordered.
-- Guidelines can either replace the default `'#description` of a field or can be loaded using json, see `/admin/structure/guideline_type/settings`
-- Guidelines are fieldable, by default they have
-  1. Guideline list can be used to group field guidelines
-    - Title
-    - Description
-  2. Field guideline
-    - Title
-    - Description
-    - Images
-    - Links
-- Output is controlled by manage display
diff --git a/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.css b/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.css
deleted file mode 100644
index bed901821..000000000
--- a/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.css
+++ /dev/null
@@ -1,71 +0,0 @@
-form[data-with-guidelines] > * .form-wrapper {
-  position: relative;
-}
-
-form[data-with-guidelines] button[data-guideline] {
-  display: inline-block;
-  vertical-align: middle;
-  position: absolute;
-  top: 0;
-  right: 0;
-  padding: 4px 10px;
-  margin-top: 0;
-}
-form[data-with-guidelines] button[data-guideline]:hover {
-  background-position-x: -96px;
-}
-form[data-with-guidelines] .guideline:before {
-  content: "";
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  margin: 0;
-  padding: 0;
-  background: rgba(1, 1, 1, 0.3);
-  z-index: 10000;
-}
-form[data-with-guidelines] .guideline {
-  position: fixed;
-  top: 10vh;
-  left: 25vw;
-  width: 50vw;
-  height: 80vh;
-  border: 10px solid black;
-  border: 10px solid rgba(0, 0, 0, 0.1);
-  z-index: 1;
-}
-form[data-with-guidelines] .guideline > button[value="close"] {
-  position: absolute;
-  top: -50px;
-  left: -50px;
-  border: 2px solid #2e3436;
-  padding: 4px 10px;
-  z-index: 10002;
-}
-form[data-with-guidelines] .guideline > button[value="close"]:hover {
-  border-color: #eb1405;
-}
-form[data-with-guidelines] .guideline > button[value="close"]:hover:after {
-  background-position-x: -96px;
-}
-form[data-with-guidelines] .guideline > div {
-  position: relative;
-  width: 100%;
-  height: 100%;
-  padding: 16px;
-  background-color: white;
-  overflow-y: auto;
-  overflow-x: hidden;
-  z-index: 10001;
-}
-form[data-with-guidelines] .guideline > div > h3 {
-  text-align: center;
-}
-form[data-with-guidelines] .guideline > div > .content {
-  padding-top: 0;
-}
-form[data-with-guidelines] .guideline > div > .content img {
-  border: 4px solid #e6ecef;
-}
diff --git a/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.js b/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.js
deleted file mode 100644
index e0f707e1e..000000000
--- a/html/modules/custom/guidelines/components/guidelines-json/guidelines-json.js
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * Guidelines tooltip handling.
- */
-(function ($) {
-
-  'use strict';
-
-  Drupal.behaviors.Guidelines = {
-    attach: function (context, settings) {
-      // Skip for IE8 and lower.
-      if (!document.addEventListener || !window.XMLHttpRequest) {
-        return;
-      }
-
-      var t = Drupal.t;
-
-      /**
-       * Helpers.
-       */
-
-      // Trim a string.
-      function trim(string) {
-        if (typeof string.trim === 'function') {
-          return string.trim();
-        }
-        return string.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '');
-      }
-
-      /**
-       * Main logic.
-       */
-
-      // Get the list of label/legend elements.
-      function getLabelElements(form) {
-        var labels = {};
-
-        // Search for field labels to which attach the guideline toggler.
-        var elements = form.querySelectorAll('fieldset[data-drupal-selector], div[data-drupal-selector]');
-        for (var i = 0, l = elements.length; i < l; i++) {
-          var element = elements[i];
-          if (!element.querySelector('[name]')) {
-            continue;
-          }
-
-          var fieldName = element.querySelector('[name]').name;
-          if (fieldName.indexOf('[') > 0) {
-            fieldName = fieldName.substring(0, fieldName.indexOf('['));
-          }
-
-          var label = '';
-          var labelElement = element.querySelector('label, legend');
-          if (labelElement) {
-            label = trim(labelElement.textContent || labelElement.innerText);
-          }
-
-          labels[fieldName] = {
-            element: element,
-            label: label
-          };
-        }
-        return labels;
-      }
-
-      // Remove guidelines elements from the form.
-      function cleanGuidelines(form, popupOnly) {
-        var selector = '.guideline';
-        if (!popupOnly) {
-          selector += ', [data-guideline]';
-        }
-        var elements = form.querySelectorAll(selector);
-        for (var i = elements.length - 1; i >= 0; i--) {
-          var element = elements[i];
-          element.parentNode.removeChild(element);
-        }
-      }
-
-      // Hide the guideline popup.
-      function hideGuideline(form) {
-        cleanGuidelines(form, true);
-      }
-
-      // Show the guideline popup.
-      function showGuideline(form, card) {
-        hideGuideline(form);
-
-        var close = document.createElement('button');
-        close.setAttribute('type', 'button');
-        close.setAttribute('value', 'close');
-        close.appendChild(document.createTextNode(t('Close')));
-        close.addEventListener('click', function (event) {
-          hideGuideline(form);
-        });
-
-        form.addEventListener('keydown', function(event) {
-          const key = event.key;
-          if (key === "Escape") {
-            hideGuideline(form);
-          }
-        });
-
-        var link = document.createElement('a');
-        link.setAttribute('href', card.link);
-        link.appendChild(document.createTextNode(card.title));
-
-        var heading = document.createElement('h3');
-        heading.appendChild(link);
-
-        var content = document.createElement('div');
-        content.className = 'content';
-        content.innerHTML = card.content;
-
-        var container = document.createElement('div');
-        container.appendChild(heading);
-        container.appendChild(content);
-
-        var popup = document.createElement('div');
-        popup.className = 'guideline';
-        popup.appendChild(close);
-        popup.appendChild(container);
-
-        form.appendChild(popup);
-
-        // Update the links in the popup to open in new pages/tabs.
-        var links = popup.querySelectorAll('a');
-        for (var i = 0, l = links.length; i < l; i++) {
-          var link = links[i];
-          link.setAttribute('target', '_blank');
-          link.setAttribute('rel', 'noopener');
-        }
-      }
-
-      // Prepare the guidelines card.
-      function prepareGuidelines(data) {
-        var guidelines = {};
-
-        // Parse the guideline cards.
-        if (Array.isArray(data)) {
-          var cards = data;
-          for (var i = 0, l = cards.length; i < l; i++) {
-            var card = cards[i];
-            // Remove blank image used for lazy laoding.
-            card.content = card.content.replace(/src="\/assets\/images\/blank\.gif"/g, '');
-            // Add the card as guideline for each of the target fields.
-            guidelines[card.label] = card;
-          }
-        }
-
-        return guidelines;
-      }
-
-      // Add the guidelines to the page with a question mark icon to trigger the display.
-      function setGuidelines(form, guidelines) {
-        // Remove the existing guidelines from the page if any.
-        cleanGuidelines(form);
-
-        // Add a guideline toggler to each label element.
-        var list = getLabelElements(form);
-        for (var field in list) {
-          if (list.hasOwnProperty(field) && guidelines.hasOwnProperty(field)) {
-            var item = list[field];
-            var element = item.element;
-            var label = item.label;
-
-            var button = document.createElement('button');
-            button.setAttribute('type', 'button');
-            button.setAttribute('data-guideline', field);
-            button.appendChild(document.createTextNode(t('View guidelines for ' + label)));
-
-            button.addEventListener('click', function (event) {
-              showGuideline(form, guidelines[event.target.getAttribute('data-guideline')]);
-            });
-
-            if (element.nodeName === 'LABEL') {
-              element.parentNode.insertBefore(button, element.nextSibling);
-            }
-            else {
-              element.appendChild(button);
-            }
-          }
-        }
-      }
-
-      // Either load the guidelines from the guidelines site or use the cache.
-      function loadGuidelines(form) {
-        var entityId = form.getAttribute('data-guidelines-entity-type');
-        var bundle = form.getAttribute('data-guidelines-entity-bundle');
-        var url = '/guidelines/json/' + entityId + '/' + bundle;
-
-        // Load the guidelines.
-        var xhr = new XMLHttpRequest();
-        // 10 seconds timeout.
-        xhr.timeout = 10000;
-        xhr.onreadystatechange = function () {
-          if (xhr.readyState === 4 && xhr.status === 200) {
-            try {
-              setGuidelines(form, prepareGuidelines(JSON.parse(xhr.responseText)));
-            }
-            catch (error) {
-              // Do nothing.
-            }
-          }
-        };
-        xhr.open('GET', url, true);
-        xhr.send(null);
-      }
-
-      // Load the guidelines for the form.
-      $('form[data-with-guidelines]', context).once('guidelines').each(function () {
-        loadGuidelines(this);
-      });
-    }
-  };
-})(jQuery);
diff --git a/html/modules/custom/guidelines/composer.json b/html/modules/custom/guidelines/composer.json
deleted file mode 100644
index 5173b4a6a..000000000
--- a/html/modules/custom/guidelines/composer.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "name": "drupal/guidelines",
-    "type": "drupal-module",
-    "description": "Add guidelines to entities and fields",
-    "keywords": [
-    ],
-    "homepage": "https://www.drupal.org/project/guidelines",
-    "minimum-stability": "dev",
-    "support": {
-        "issues": "https://www.drupal.org/project/issues/guidelines",
-        "source": "http://cgit.drupalcode.org/guidelines"
-    }
-}
diff --git a/html/modules/custom/guidelines/config/install/guidelines.settings.yml b/html/modules/custom/guidelines/config/install/guidelines.settings.yml
deleted file mode 100644
index 964ac4e31..000000000
--- a/html/modules/custom/guidelines/config/install/guidelines.settings.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-overwrite_description: true
-use_json_loading: false
diff --git a/html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.field_guideline.default.yml b/html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.field_guideline.default.yml
deleted file mode 100644
index f5c65403e..000000000
--- a/html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.field_guideline.default.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.guideline.field_guideline.field_description
-    - field.field.guideline.field_guideline.field_field
-    - field.field.guideline.field_guideline.field_images
-    - field.field.guideline.field_guideline.field_title
-    - guidelines.guideline_type.field_guideline
-    - image.style.thumbnail
-  module:
-    - guidelines
-    - image
-    - text
-id: guideline.field_guideline.default
-targetEntityType: guideline
-bundle: field_guideline
-mode: default
-content:
-  field_description:
-    weight: 3
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-    type: text_textarea
-    region: content
-  field_field:
-    type: guideline_field_target_widget
-    weight: 1
-    region: content
-    settings:
-      enabled_entities:
-        - node.article
-        - node.page
-    third_party_settings: {  }
-  field_images:
-    type: image_image
-    weight: 4
-    region: content
-    settings:
-      progress_indicator: throbber
-      preview_image_style: thumbnail
-    third_party_settings: {  }
-  field_title:
-    type: string_textfield
-    weight: 2
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  user_id:
-    type: entity_reference_autocomplete
-    weight: 5
-    settings:
-      match_operator: CONTAINS
-      size: 60
-      placeholder: ''
-      match_limit: 10
-    region: content
-    third_party_settings: {  }
-hidden: {  }
diff --git a/html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.guideline_list.default.yml b/html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.guideline_list.default.yml
deleted file mode 100644
index e1c324ada..000000000
--- a/html/modules/custom/guidelines/config/optional/core.entity_form_display.guideline.guideline_list.default.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.guideline.guideline_list.field_title
-    - guidelines.guideline_type.guideline_list
-id: guideline.guideline_list.default
-targetEntityType: guideline
-bundle: guideline_list
-mode: default
-content:
-  field_title:
-    type: string_textfield
-    weight: 1
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  user_id:
-    type: entity_reference_autocomplete
-    weight: 2
-    settings:
-      match_operator: CONTAINS
-      size: 60
-      placeholder: ''
-      match_limit: 10
-    region: content
-    third_party_settings: {  }
-hidden: {  }
diff --git a/html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.field_guideline.default.yml b/html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.field_guideline.default.yml
deleted file mode 100644
index 0deaf8f7c..000000000
--- a/html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.field_guideline.default.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.guideline.field_guideline.field_description
-    - field.field.guideline.field_guideline.field_field
-    - field.field.guideline.field_guideline.field_images
-    - field.field.guideline.field_guideline.field_title
-    - guidelines.guideline_type.field_guideline
-    - image.style.guideline_thumbnail
-  module:
-    - image
-    - text
-id: guideline.field_guideline.default
-targetEntityType: guideline
-bundle: field_guideline
-mode: default
-content:
-  field_description:
-    weight: 1
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    type: text_default
-    region: content
-  field_images:
-    type: image
-    weight: 2
-    region: content
-    label: hidden
-    settings:
-      image_style: guideline_thumbnail
-      image_link: file
-    third_party_settings: {  }
-  field_title:
-    type: string
-    weight: 0
-    region: content
-    label: hidden
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-hidden:
-  field_field: true
-  name: true
-  user_id: true
diff --git a/html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.guideline_list.default.yml b/html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.guideline_list.default.yml
deleted file mode 100644
index da3711c9c..000000000
--- a/html/modules/custom/guidelines/config/optional/core.entity_view_display.guideline.guideline_list.default.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.guideline.guideline_list.field_title
-    - guidelines.guideline_type.guideline_list
-id: guideline.guideline_list.default
-targetEntityType: guideline
-bundle: guideline_list
-mode: default
-content:
-  field_title:
-    type: string
-    weight: 0
-    region: content
-    label: hidden
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-hidden:
-  name: true
-  user_id: true
diff --git a/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_description.yml b/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_description.yml
deleted file mode 100644
index 48dd55401..000000000
--- a/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_description.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.guideline.field_description
-    - guidelines.guideline_type.field_guideline
-  module:
-    - text
-id: guideline.field_guideline.field_description
-field_name: field_description
-entity_type: guideline
-bundle: field_guideline
-label: Description
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: text_long
diff --git a/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_field.yml b/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_field.yml
deleted file mode 100644
index 2e2f5f659..000000000
--- a/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_field.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.guideline.field_field
-    - guidelines.guideline_type.field_guideline
-  module:
-    - guidelines
-id: guideline.field_guideline.field_field
-field_name: field_field
-entity_type: guideline
-bundle: field_guideline
-label: Field
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: guideline_field_target_type
diff --git a/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_images.yml b/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_images.yml
deleted file mode 100644
index 9255f1886..000000000
--- a/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_images.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.guideline.field_images
-    - guidelines.guideline_type.field_guideline
-  module:
-    - image
-id: guideline.field_guideline.field_images
-field_name: field_images
-entity_type: guideline
-bundle: field_guideline
-label: Images
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  file_directory: 'guidelines/[date:custom:Y]-[date:custom:m]'
-  file_extensions: 'png gif jpg jpeg'
-  max_filesize: ''
-  max_resolution: ''
-  min_resolution: ''
-  alt_field: true
-  alt_field_required: false
-  title_field: false
-  title_field_required: false
-  default_image:
-    uuid: ''
-    alt: ''
-    title: ''
-    width: null
-    height: null
-  handler: 'default:file'
-  handler_settings: {  }
-field_type: image
diff --git a/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_title.yml b/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_title.yml
deleted file mode 100644
index 459952303..000000000
--- a/html/modules/custom/guidelines/config/optional/field.field.guideline.field_guideline.field_title.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.guideline.field_title
-    - guidelines.guideline_type.field_guideline
-id: guideline.field_guideline.field_title
-field_name: field_title
-entity_type: guideline
-bundle: field_guideline
-label: Title
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/html/modules/custom/guidelines/config/optional/field.field.guideline.guideline_list.field_title.yml b/html/modules/custom/guidelines/config/optional/field.field.guideline.guideline_list.field_title.yml
deleted file mode 100644
index 655034e28..000000000
--- a/html/modules/custom/guidelines/config/optional/field.field.guideline.guideline_list.field_title.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.guideline.field_title
-    - guidelines.guideline_type.guideline_list
-id: guideline.guideline_list.field_title
-field_name: field_title
-entity_type: guideline
-bundle: guideline_list
-label: Title
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_description.yml b/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_description.yml
deleted file mode 100644
index 149589160..000000000
--- a/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_description.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - guidelines
-    - text
-id: guideline.field_description
-field_name: field_description
-entity_type: guideline
-type: text_long
-settings: {  }
-module: text
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_field.yml b/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_field.yml
deleted file mode 100644
index be50d24b0..000000000
--- a/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_field.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - guidelines
-id: guideline.field_field
-field_name: field_field
-entity_type: guideline
-type: guideline_field_target_type
-settings:
-  enabled_entities:
-    node: node
-    terms: 0
-module: guidelines
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_images.yml b/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_images.yml
deleted file mode 100644
index 1f94d064c..000000000
--- a/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_images.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - file
-    - guidelines
-    - image
-id: guideline.field_images
-field_name: field_images
-entity_type: guideline
-type: image
-settings:
-  uri_scheme: public
-  default_image:
-    uuid: ''
-    alt: ''
-    title: ''
-    width: null
-    height: null
-  target_type: file
-  display_field: false
-  display_default: false
-module: image
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_title.yml b/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_title.yml
deleted file mode 100644
index b2d205a3e..000000000
--- a/html/modules/custom/guidelines/config/optional/field.storage.guideline.field_title.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - guidelines
-id: guideline.field_title
-field_name: field_title
-entity_type: guideline
-type: string
-settings:
-  max_length: 255
-  is_ascii: false
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/html/modules/custom/guidelines/config/optional/filter.format.guideline.yml b/html/modules/custom/guidelines/config/optional/filter.format.guideline.yml
deleted file mode 100644
index b9c911e76..000000000
--- a/html/modules/custom/guidelines/config/optional/filter.format.guideline.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-langcode: en
-status: true
-dependencies: {  }
-name: Guideline
-format: guideline
-weight: 0
-filters: {  }
diff --git a/html/modules/custom/guidelines/config/optional/guidelines.guideline_type.field_guideline.yml b/html/modules/custom/guidelines/config/optional/guidelines.guideline_type.field_guideline.yml
deleted file mode 100644
index 253320f53..000000000
--- a/html/modules/custom/guidelines/config/optional/guidelines.guideline_type.field_guideline.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-langcode: en
-status: true
-dependencies: {  }
-id: field_guideline
-label: 'Field guideline'
diff --git a/html/modules/custom/guidelines/config/optional/guidelines.guideline_type.guideline_list.yml b/html/modules/custom/guidelines/config/optional/guidelines.guideline_type.guideline_list.yml
deleted file mode 100644
index eaad8174a..000000000
--- a/html/modules/custom/guidelines/config/optional/guidelines.guideline_type.guideline_list.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-langcode: en
-status: true
-dependencies: {  }
-id: guideline_list
-label: 'Guideline list'
diff --git a/html/modules/custom/guidelines/config/optional/guidelines.settings.yml b/html/modules/custom/guidelines/config/optional/guidelines.settings.yml
deleted file mode 100644
index 5e041d9a0..000000000
--- a/html/modules/custom/guidelines/config/optional/guidelines.settings.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-overwrite_description: 1
-use_json_loading: 0
diff --git a/html/modules/custom/guidelines/config/optional/image.style.guideline_thumbnail.yml b/html/modules/custom/guidelines/config/optional/image.style.guideline_thumbnail.yml
deleted file mode 100644
index e9b65f500..000000000
--- a/html/modules/custom/guidelines/config/optional/image.style.guideline_thumbnail.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-langcode: en
-status: true
-dependencies: {  }
-name: guideline_thumbnail
-label: 'Guideline thumbnail'
-effects:
-  9788b5f9-ff16-47a9-92a0-1c66b68753cb:
-    uuid: 9788b5f9-ff16-47a9-92a0-1c66b68753cb
-    id: image_scale
-    weight: 1
-    data:
-      width: 200
-      height: 200
-      upscale: false
diff --git a/html/modules/custom/guidelines/config/schema/guidelines.schema.yml b/html/modules/custom/guidelines/config/schema/guidelines.schema.yml
deleted file mode 100644
index ff7b2c773..000000000
--- a/html/modules/custom/guidelines/config/schema/guidelines.schema.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-guidelines.guideline_type.*:
-  type: config_entity
-  label: 'Guideline type config'
-  mapping:
-    overwrite_description:
-      type: boolean
-      label: 'ID'
-    use_json_loading:
-      type: boolean
-      label: 'ID'
diff --git a/html/modules/custom/guidelines/guideline.page.inc b/html/modules/custom/guidelines/guideline.page.inc
deleted file mode 100644
index 25d4c71d5..000000000
--- a/html/modules/custom/guidelines/guideline.page.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains guideline.page.inc.
- *
- * Page callback for Guideline entities.
- */
-
-use Drupal\Core\Render\Element;
-
-/**
- * Prepares variables for Guideline templates.
- *
- * Default template: guideline.html.twig.
- *
- * @param array $variables
- *   An associative array containing:
- *   - elements: An associative array containing the user information and any
- *   - attributes: HTML attributes for the containing element.
- */
-function template_preprocess_guideline(array &$variables) {
-  // Helpful $content variable for templates.
-  foreach (Element::children($variables['elements']) as $key) {
-    $variables['content'][$key] = $variables['elements'][$key];
-  }
-}
diff --git a/html/modules/custom/guidelines/guidelines.api.php b/html/modules/custom/guidelines/guidelines.api.php
deleted file mode 100644
index 80aee1877..000000000
--- a/html/modules/custom/guidelines/guidelines.api.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * @file
- * Hooks.
- */
-
-use Drupal\guidelines\Entity\Guideline;
-
-/**
- * Alter description exposed by the JSON controller.
- *
- * @param array $description
- *   Description with basic fields present.
- * @param \Drupal\guidelines\Entity\Guideline $guideline
- *   The full guideline.
- * @param array $context
- *   Array containing entity type and bundle.
- *
- * @see src/Controller/GuidelineJsonController.php
- */
-function hook_guideline_json_fields_alter(array &$description, Guideline $guideline, array $context) {
-  // Change the link on nodes.
-  if ($context['entity_type'] === 'node') {
-    if ($guideline->hasField('field_short_link')) {
-      $description['link'] = '/guidelines#' . $guideline->field_short_link->value;
-    }
-  }
-}
diff --git a/html/modules/custom/guidelines/guidelines.info.yml b/html/modules/custom/guidelines/guidelines.info.yml
deleted file mode 100644
index f115a231b..000000000
--- a/html/modules/custom/guidelines/guidelines.info.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-name: 'Guidelines'
-type: module
-description: 'Add guidelines to entities and fields'
-core_version_requirement: ^9
-package: 'Custom'
-configure: guidelines.settings
diff --git a/html/modules/custom/guidelines/guidelines.libraries.yml b/html/modules/custom/guidelines/guidelines.libraries.yml
deleted file mode 100644
index c231c16c2..000000000
--- a/html/modules/custom/guidelines/guidelines.libraries.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-guidelines-json:
-  css:
-    component:
-      components/guidelines-json/guidelines-json.css: {}
-  js:
-    components/guidelines-json/guidelines-json.js: {}
diff --git a/html/modules/custom/guidelines/guidelines.links.action.yml b/html/modules/custom/guidelines/guidelines.links.action.yml
deleted file mode 100644
index 9c4df42ed..000000000
--- a/html/modules/custom/guidelines/guidelines.links.action.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-entity.guideline.add_form:
-  route_name: entity.guideline.add_page
-  title: 'Add Guideline'
-  appears_on:
-    - entity.guideline.collection
-entity.guideline_type.add_form:
-  route_name: entity.guideline_type.add_form
-  title: 'Add Guideline type'
-  appears_on:
-    - entity.guideline_type.collection
diff --git a/html/modules/custom/guidelines/guidelines.links.menu.yml b/html/modules/custom/guidelines/guidelines.links.menu.yml
deleted file mode 100644
index 4eb1c13d1..000000000
--- a/html/modules/custom/guidelines/guidelines.links.menu.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-entity.guideline.collection:
-  title: 'Guideline list'
-  route_name: entity.guideline.collection
-  description: 'List Guideline entities'
-  parent: system.admin_structure
-  weight: 100
-
-entity.guideline_type.collection:
-  title: 'Guideline type'
-  route_name: entity.guideline_type.collection
-  description: 'List Guideline type (bundles)'
-  parent: system.admin_structure
-  weight: 101
-
-entity.guideline_type.settings:
-  title: 'Guideline settings'
-  route_name: guidelines.settings
-  description: 'Global settings'
-  parent: system.admin_structure
-  weight: 102
diff --git a/html/modules/custom/guidelines/guidelines.links.task.yml b/html/modules/custom/guidelines/guidelines.links.task.yml
deleted file mode 100644
index 997aa40b3..000000000
--- a/html/modules/custom/guidelines/guidelines.links.task.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-# Guideline routing definition
-
-entity.guideline.canonical:
-  route_name: entity.guideline.canonical
-  base_route: entity.guideline.canonical
-  title: 'View'
-
-entity.guideline.edit_form:
-  route_name: entity.guideline.edit_form
-  base_route: entity.guideline.canonical
-  title: 'Edit'
-
-entity.guideline.version_history:
-  route_name: entity.guideline.version_history
-  base_route: entity.guideline.canonical
-  title: 'Revisions'
-
-entity.guideline.delete_form:
-  route_name:  entity.guideline.delete_form
-  base_route:  entity.guideline.canonical
-  title: Delete
-  weight: 10
-
-entity.guideline.sort:
-  route_name:  entity.guideline.sort
-  base_route:  entity.guideline.canonical
-  title: Sort
-  weight: 10
diff --git a/html/modules/custom/guidelines/guidelines.module b/html/modules/custom/guidelines/guidelines.module
deleted file mode 100644
index ecfff7bbf..000000000
--- a/html/modules/custom/guidelines/guidelines.module
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains guidelines.module.
- */
-
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Entity\ContentEntityForm;
-use Drupal\guidelines\Entity\Guideline;
-
-/**
- * Implements hook_help().
- */
-function guidelines_help($route_name, RouteMatchInterface $route_match) {
-  switch ($route_name) {
-    // Main module help for the guidelines module.
-    case 'help.page.guidelines':
-      $output = '';
-      $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('Add guidelines to entities and fields') . '</p>';
-      return $output;
-
-    default:
-  }
-}
-
-/**
- * Implements hook_theme().
- */
-function guidelines_theme() {
-  $theme = [];
-  $theme['guideline'] = [
-    'render element' => 'elements',
-    'file' => 'guideline.page.inc',
-    'template' => 'guideline',
-  ];
-  $theme['guideline_content_add_list'] = [
-    'render element' => 'content',
-    'variables' => ['content' => NULL],
-    'file' => 'guideline.page.inc',
-  ];
-  return $theme;
-}
-
-/**
- * Implements hook_theme_suggestions_HOOK().
- */
-function guidelines_theme_suggestions_guideline(array $variables) {
-  $suggestions = [];
-  $entity = $variables['elements']['#guideline'];
-  $sanitized_view_mode = strtr($variables['elements']['#view_mode'], '.', '_');
-
-  $suggestions[] = 'guideline__' . $sanitized_view_mode;
-  $suggestions[] = 'guideline__' . $entity->bundle();
-  $suggestions[] = 'guideline__' . $entity->bundle() . '__' . $sanitized_view_mode;
-  $suggestions[] = 'guideline__' . $entity->id();
-  $suggestions[] = 'guideline__' . $entity->id() . '__' . $sanitized_view_mode;
-  return $suggestions;
-}
-
-/**
- * Implements hook_form_HOOK_alter().
- */
-function guidelines_form_node_form_alter(array &$form, FormStateInterface $form_state) {
-  $config = \Drupal::config('guidelines.settings');
-  if ($config->get('use_json_loading')) {
-    $bundle = '';
-    $form_object = $form_state->getFormObject();
-    $entity_type = $form_object->getEntity()->getEntityType()->id();
-    if ($form_object instanceof ContentEntityForm) {
-      $bundle = $form_object->getEntity()->bundle();
-    }
-
-    if (Guideline::entityBundleHasGuidelines($entity_type, $bundle)) {
-      $form['#attributes']['data-with-guidelines'] = '';
-      $form['#attributes']['data-guidelines-entity-type'] = $entity_type;
-      $form['#attributes']['data-guidelines-entity-bundle'] = $bundle;
-      $form['#attached']['library'][] = 'guidelines/guidelines-json';
-    }
-  }
-}
-
-/**
- * Implements hook_form_HOOK_alter().
- */
-function guidelines_form_taxonomy_term_form_alter(array &$form, FormStateInterface $form_state) {
-  $config = \Drupal::config('guidelines.settings');
-  if ($config->get('use_json_loading')) {
-    $bundle = '';
-    $form_object = $form_state->getFormObject();
-    $entity_type = $form_object->getEntity()->getEntityType()->id();
-    if ($form_object instanceof ContentEntityForm) {
-      $bundle = $form_object->getEntity()->bundle();
-    }
-
-    if (Guideline::entityBundleHasGuidelines($entity_type, $bundle)) {
-      $form['#attributes']['data-with-guidelines'] = '';
-      $form['#attributes']['data-guidelines-entity-type'] = $entity_type;
-      $form['#attributes']['data-guidelines-entity-bundle'] = $bundle;
-      $form['#attached']['library'][] = 'guidelines/guidelines-json';
-    }
-  }
-}
-
-/**
- * Implements hook_field_widget_form_alter().
- */
-function guidelines_field_widget_form_alter(&$element, FormStateInterface &$form_state, $context) {
-  $config = \Drupal::config('guidelines.settings');
-  if ($config->get('overwrite_description')) {
-    guidelines_attach_to_widget($element, $form_state, $context);
-  }
-}
-
-/**
- * Attach guideline to a widget.
- */
-function guidelines_attach_to_widget(&$element, FormStateInterface &$form_state, $context) {
-  static $descriptions = [];
-
-  $bundle = '';
-  $form_object = $form_state->getFormObject();
-  $entity_type = $form_object->getEntity()->getEntityType()->id();
-  if ($form_object instanceof ContentEntityForm) {
-    $bundle = $form_object->getEntity()->bundle();
-  }
-  $field_name = $context['items']->getName();
-
-  if (!isset($descriptions[$entity_type])) {
-    /** @var Drupal\guidelines\Entity\Guideline[] $description_entities */
-    $guidelines = Guideline::loadByEntity($entity_type);
-    foreach ($guidelines as $guideline) {
-      foreach ($guideline->field_field as $field) {
-        $descriptions[$entity_type][$field->value] = $guideline;
-      }
-    }
-  }
-
-  $key = $entity_type . '.' . $bundle . '.' . $field_name;
-  if (isset($descriptions[$entity_type][$key])) {
-    $view_builder = \Drupal::entityTypeManager()->getViewBuilder('guideline');
-    $pre_render = $view_builder->view($descriptions[$entity_type][$key], 'default');
-    $render_output = render($pre_render);
-
-    if (isset($element['#description'])) {
-      $element['#description'] = $render_output;
-    }
-
-    if (isset($element['value']['#description'])) {
-      $element['value']['#description'] = $render_output;
-    }
-  }
-}
diff --git a/html/modules/custom/guidelines/guidelines.permissions.yml b/html/modules/custom/guidelines/guidelines.permissions.yml
deleted file mode 100644
index 4ff8906e3..000000000
--- a/html/modules/custom/guidelines/guidelines.permissions.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-add guideline entities:
-  title: 'Create new Guideline entities'
-
-administer guideline entities:
-  title: 'Administer Guideline entities'
-  description: 'Allow to access the administration form to configure Guideline entities.'
-  restrict access: true
-
-delete guideline entities:
-  title: 'Delete Guideline entities'
-
-edit guideline entities:
-  title: 'Edit Guideline entities'
-
-view published guideline entities:
-  title: 'View published Guideline entities'
-
-view unpublished guideline entities:
-  title: 'View unpublished Guideline entities'
-
-view all guideline revisions:
-  title: 'View all Guideline revisions'
-
-sort all guideline:
-  title: 'Sort all guideline'
-
-revert all guideline revisions:
-  title: 'Revert all Guideline revisions'
-  description: 'Role requires permission <em>view Guideline revisions</em> and <em>edit rights</em> for guideline entities in question or <em>administer guideline entities</em>.'
-
-delete all guideline revisions:
-  title: 'Delete all revisions'
-  description: 'Role requires permission to <em>view Guideline revisions</em> and <em>delete rights</em> for guideline entities in question or <em>administer guideline entities</em>.'
-
-permission_callbacks:
-  - \Drupal\guidelines\GuidelinePermissions::generatePermissions
diff --git a/html/modules/custom/guidelines/guidelines.routing.yml b/html/modules/custom/guidelines/guidelines.routing.yml
deleted file mode 100644
index 864de7d92..000000000
--- a/html/modules/custom/guidelines/guidelines.routing.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-guidelines.form.json:
-  path: '/guidelines/json/{entity_type}/{bundle}'
-  defaults:
-    _title: 'Guidelines'
-    _controller: '\Drupal\guidelines\Controller\GuidelineJsonController::getFormGuidelines'
-  options:
-    parameters:
-      entity_type:
-        type: string
-      bundle:
-        type: string
-  requirements:
-    _permission: 'access content'
-guidelines.settings:
-  path: '/admin/structure/guideline_type/settings'
-  defaults:
-    _form: '\Drupal\guidelines\Form\GuidelineGlobalSettingsForm'
-    _title: 'Global guideline settings'
-  requirements:
-    _permission: 'administer site configuration'
diff --git a/html/modules/custom/guidelines/guidelines.schema.yml b/html/modules/custom/guidelines/guidelines.schema.yml
deleted file mode 100644
index 3baeb93ca..000000000
--- a/html/modules/custom/guidelines/guidelines.schema.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-field.widget.settings.guideline_field_target_widget:
-  type: mapping
-  label: 'Guideline field target widget widget settings'
-  mapping:
-    size:
-      type: integer
-      label: 'Size'
-    placeholder:
-      type: textfield
-      label: 'Placeholder'
diff --git a/html/modules/custom/guidelines/src/Controller/GuidelineController.php b/html/modules/custom/guidelines/src/Controller/GuidelineController.php
deleted file mode 100644
index 3650001a0..000000000
--- a/html/modules/custom/guidelines/src/Controller/GuidelineController.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-
-namespace Drupal\guidelines\Controller;
-
-use Drupal\Component\Utility\Xss;
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
-use Drupal\Core\Url;
-use Drupal\guidelines\Entity\GuidelineInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Class GuidelineController.
- *
- *  Returns responses for Guideline routes.
- */
-class GuidelineController extends ControllerBase implements ContainerInjectionInterface {
-
-  /**
-   * The date formatter.
-   *
-   * @var \Drupal\Core\Datetime\DateFormatter
-   */
-  protected $dateFormatter;
-
-  /**
-   * The renderer.
-   *
-   * @var \Drupal\Core\Render\Renderer
-   */
-  protected $renderer;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    $instance = parent::create($container);
-    $instance->dateFormatter = $container->get('date.formatter');
-    $instance->renderer = $container->get('renderer');
-    return $instance;
-  }
-
-  /**
-   * Displays a Guideline revision.
-   *
-   * @param int $guideline_revision
-   *   The Guideline revision ID.
-   *
-   * @return array
-   *   An array suitable for drupal_render().
-   */
-  public function revisionShow($guideline_revision) {
-    $guideline = $this->entityTypeManager()->getStorage('guideline')
-      ->loadRevision($guideline_revision);
-    $view_builder = $this->entityTypeManager()->getViewBuilder('guideline');
-
-    if ($guideline) {
-      return $view_builder->view($guideline);
-    }
-
-    return [];
-  }
-
-  /**
-   * Page title callback for a Guideline revision.
-   *
-   * @param int $guideline_revision
-   *   The Guideline revision ID.
-   *
-   * @return string
-   *   The page title.
-   */
-  public function revisionPageTitle($guideline_revision) {
-    $guideline = $this->entityTypeManager()->getStorage('guideline')
-      ->loadRevision($guideline_revision);
-
-    if ($guideline) {
-      return $this->t('Revision of %title from %date', [
-        '%title' => $guideline->label(),
-        '%date' => $this->dateFormatter->format($guideline->getRevisionCreationTime()),
-      ]);
-    }
-
-    return $this->t('Non existing revision');
-  }
-
-  /**
-   * Generates an overview table of older revisions of a Guideline.
-   *
-   * @param \Drupal\guidelines\Entity\GuidelineInterface $guideline
-   *   A Guideline object.
-   *
-   * @return array
-   *   An array as expected by drupal_render().
-   */
-  public function revisionOverview(GuidelineInterface $guideline) {
-    $account = $this->currentUser();
-    $guideline_storage = $this->entityTypeManager()->getStorage('guideline');
-
-    $langcode = $guideline->language()->getId();
-    $langname = $guideline->language()->getName();
-    $languages = $guideline->getTranslationLanguages();
-    $has_translations = (count($languages) > 1);
-    $build['#title'] = $has_translations ? $this->t('@langname revisions for %title', [
-      '@langname' => $langname,
-      '%title' => $guideline->label(),
-    ]) : $this->t('Revisions for %title', [
-      '%title' => $guideline->label(),
-    ]);
-
-    $header = [$this->t('Revision'), $this->t('Operations')];
-    $revert_permission = $account->hasPermission("revert all guideline revisions") || $account->hasPermission('administer guideline entities');
-    $delete_permission = $account->hasPermission("delete all guideline revisions") || $account->hasPermission('administer guideline entities');
-
-    $rows = [];
-
-    $vids = $guideline_storage->revisionIds($guideline);
-
-    $latest_revision = TRUE;
-
-    foreach (array_reverse($vids) as $vid) {
-      /** @var \Drupal\guidelines\GuidelineInterface $revision */
-      $revision = $guideline_storage->loadRevision($vid);
-      // Only show revisions that are affected by the language that is being
-      // displayed.
-      if ($revision->hasTranslation($langcode) && $revision->getTranslation($langcode)->isRevisionTranslationAffected()) {
-        $username = [
-          '#theme' => 'username',
-          '#account' => $revision->getRevisionUser(),
-        ];
-
-        // Use revision link to link to revisions that are not active.
-        $date = $this->dateFormatter->format($revision->getRevisionCreationTime(), 'short');
-        if ($vid != $guideline->getRevisionId()) {
-          $link = $this->l($date, new Url('entity.guideline.revision', [
-            'guideline' => $guideline->id(),
-            'guideline_revision' => $vid,
-          ]));
-        }
-        else {
-          $link = $guideline->toLink($date)->toString();
-        }
-
-        $row = [];
-        $column = [
-          'data' => [
-            '#type' => 'inline_template',
-            '#template' => '{% trans %}{{ date }} by {{ username }}{% endtrans %}{% if message %}<p class="revision-log">{{ message }}</p>{% endif %}',
-            '#context' => [
-              'date' => $link,
-              'username' => $this->renderer->renderPlain($username),
-              'message' => [
-                '#markup' => $revision->getRevisionLogMessage(),
-                '#allowed_tags' => Xss::getHtmlTagList(),
-              ],
-            ],
-          ],
-        ];
-        $row[] = $column;
-
-        if ($latest_revision) {
-          $row[] = [
-            'data' => [
-              '#prefix' => '<em>',
-              '#markup' => $this->t('Current revision'),
-              '#suffix' => '</em>',
-            ],
-          ];
-          foreach ($row as &$current) {
-            $current['class'] = ['revision-current'];
-          }
-          $latest_revision = FALSE;
-        }
-        else {
-          $links = [];
-          if ($revert_permission) {
-            $links['revert'] = [
-              'title' => $this->t('Revert'),
-              'url' => $has_translations ?
-              Url::fromRoute('entity.guideline.translation_revert', [
-                'guideline' => $guideline->id(),
-                'guideline_revision' => $vid,
-                'langcode' => $langcode,
-              ]) :
-              Url::fromRoute('entity.guideline.revision_revert', [
-                'guideline' => $guideline->id(),
-                'guideline_revision' => $vid,
-              ]),
-            ];
-          }
-
-          if ($delete_permission) {
-            $links['delete'] = [
-              'title' => $this->t('Delete'),
-              'url' => Url::fromRoute('entity.guideline.revision_delete', [
-                'guideline' => $guideline->id(),
-                'guideline_revision' => $vid,
-              ]),
-            ];
-          }
-
-          $row[] = [
-            'data' => [
-              '#type' => 'operations',
-              '#links' => $links,
-            ],
-          ];
-        }
-
-        $rows[] = $row;
-      }
-    }
-
-    $build['guideline_revisions_table'] = [
-      '#theme' => 'table',
-      '#rows' => $rows,
-      '#header' => $header,
-    ];
-
-    return $build;
-  }
-
-}
diff --git a/html/modules/custom/guidelines/src/Controller/GuidelineJsonController.php b/html/modules/custom/guidelines/src/Controller/GuidelineJsonController.php
deleted file mode 100644
index f7f545518..000000000
--- a/html/modules/custom/guidelines/src/Controller/GuidelineJsonController.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-namespace Drupal\guidelines\Controller;
-
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\guidelines\Entity\Guideline;
-use Symfony\Component\HttpFoundation\JsonResponse;
-
-/**
- * Class GuidelineJsonController.
- *
- *  Returns responses for Guideline routes.
- */
-class GuidelineJsonController extends ControllerBase {
-
-  /**
-   * Return guidelines for a form.
-   *
-   * @param string $entity_type
-   *   The entity type.
-   *
-   * @param string $bundle
-   *   The entity bundle.
-   *
-   * @return array
-   *   An array suitable for drupal_render().
-   */
-  public function getFormGuidelines($entity_type, $bundle) {
-    $descriptions = [];
-
-    /** @var Drupal\guidelines\Entity\Guideline[] $guidelines */
-    $guidelines = Guideline::loadByEntity($entity_type);
-
-    foreach ($guidelines as $guideline) {
-      foreach ($guideline->field_field as $field) {
-        list($e, $b, $f) = explode('.', $field->value);
-        if (!empty($bundle) && $bundle === $b) {
-          $view_builder = \Drupal::entityTypeManager()->getViewBuilder('guideline');
-          $pre_render = $view_builder->view($guideline, 'default');
-          $render_output = render($pre_render);
-
-          $description = [
-            'label' => $f,
-            'title' => $guideline->field_title->value,
-            'content' => $render_output,
-            'link' => $guideline->toUrl()->toString(),
-          ];
-
-          // Allow other modules to add extra fields.
-          $module_handler = \Drupal::moduleHandler();
-          $context = [
-            'entity_type' => $entity_type,
-            'bundle' => $bundle,
-          ];
-          $module_handler->alter('guideline_json_fields', $description, $guideline, $context);
-
-          if (isset($description['label']) && !empty($description['label'])) {
-            $descriptions[] = $description;
-          }
-        }
-      }
-    }
-
-    return new JsonResponse($descriptions);
-  }
-
-}
diff --git a/html/modules/custom/guidelines/src/Entity/Guideline.php b/html/modules/custom/guidelines/src/Entity/Guideline.php
deleted file mode 100644
index df0ff8606..000000000
--- a/html/modules/custom/guidelines/src/Entity/Guideline.php
+++ /dev/null
@@ -1,380 +0,0 @@
-<?php
-
-namespace Drupal\guidelines\Entity;
-
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\Core\Entity\EditorialContentEntityBase;
-use Drupal\Core\Entity\RevisionableInterface;
-use Drupal\Core\Entity\EntityChangedTrait;
-use Drupal\Core\Entity\EntityPublishedTrait;
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\user\UserInterface;
-
-/**
- * Defines the Guideline entity.
- *
- * @ingroup guidelines
- *
- * @ContentEntityType(
- *   id = "guideline",
- *   label = @Translation("Guideline"),
- *   bundle_label = @Translation("Guideline type"),
- *   handlers = {
- *     "storage" = "Drupal\guidelines\GuidelineStorage",
- *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
- *     "list_builder" = "Drupal\guidelines\GuidelineListBuilder",
- *     "views_data" = "Drupal\guidelines\Entity\GuidelineViewsData",
- *     "translation" = "Drupal\guidelines\GuidelineTranslationHandler",
- *
- *     "form" = {
- *       "default" = "Drupal\guidelines\Form\GuidelineForm",
- *       "add" = "Drupal\guidelines\Form\GuidelineForm",
- *       "edit" = "Drupal\guidelines\Form\GuidelineForm",
- *       "delete" = "Drupal\guidelines\Form\GuidelineDeleteForm",
- *       "sort" = "Drupal\guidelines\Form\GuidelineSortForm",
- *     },
- *     "route_provider" = {
- *       "html" = "Drupal\guidelines\GuidelineHtmlRouteProvider",
- *     },
- *     "access" = "Drupal\guidelines\GuidelineAccessControlHandler",
- *   },
- *   base_table = "guideline",
- *   data_table = "guideline_field_data",
- *   revision_table = "guideline_revision",
- *   revision_data_table = "guideline_field_revision",
- *   translatable = TRUE,
- *   permission_granularity = "bundle",
- *   admin_permission = "administer guideline entities",
- *   entity_keys = {
- *     "id" = "id",
- *     "revision" = "vid",
- *     "bundle" = "type",
- *     "label" = "name",
- *     "uuid" = "uuid",
- *     "uid" = "user_id",
- *     "langcode" = "langcode",
- *     "published" = "status",
- *     "weight" = "weight",
- *   },
- *   revision_metadata_keys = {
- *     "revision_user" = "revision_user",
- *     "revision_created" = "revision_created",
- *     "revision_log_message" = "revision_log",
- *   },
- *   links = {
- *     "canonical" = "/admin/structure/guideline/{guideline}",
- *     "add-page" = "/admin/structure/guideline/add",
- *     "add-form" = "/admin/structure/guideline/add/{guideline_type}",
- *     "edit-form" = "/admin/structure/guideline/{guideline}/edit",
- *     "sort-form" = "/admin/structure/guideline/{guideline}/sort",
- *     "delete-form" = "/admin/structure/guideline/{guideline}/delete",
- *     "version-history" = "/admin/structure/guideline/{guideline}/revisions",
- *     "revision" = "/admin/structure/guideline/{guideline}/revisions/{guideline_revision}/view",
- *     "revision_revert" = "/admin/structure/guideline/{guideline}/revisions/{guideline_revision}/revert",
- *     "revision_delete" = "/admin/structure/guideline/{guideline}/revisions/{guideline_revision}/delete",
- *     "translation_revert" = "/admin/structure/guideline/{guideline}/revisions/{guideline_revision}/revert/{langcode}",
- *     "collection" = "/admin/structure/guideline",
- *   },
- *   bundle_entity_type = "guideline_type",
- *   field_ui_base_route = "entity.guideline_type.edit_form"
- * )
- */
-class Guideline extends EditorialContentEntityBase implements GuidelineInterface {
-
-  use EntityChangedTrait;
-  use EntityPublishedTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function preCreate(EntityStorageInterface $storage_controller, array &$values) {
-    parent::preCreate($storage_controller, $values);
-    $values += [
-      'user_id' => \Drupal::currentUser()->id(),
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function urlRouteParameters($rel) {
-    $uri_route_parameters = parent::urlRouteParameters($rel);
-
-    if ($rel === 'revision_revert' && $this instanceof RevisionableInterface) {
-      $uri_route_parameters[$this->getEntityTypeId() . '_revision'] = $this->getRevisionId();
-    }
-    elseif ($rel === 'revision_delete' && $this instanceof RevisionableInterface) {
-      $uri_route_parameters[$this->getEntityTypeId() . '_revision'] = $this->getRevisionId();
-    }
-
-    return $uri_route_parameters;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function preSave(EntityStorageInterface $storage) {
-    parent::preSave($storage);
-
-    foreach (array_keys($this->getTranslationLanguages()) as $langcode) {
-      $translation = $this->getTranslation($langcode);
-
-      // If no owner has been set explicitly, make the anonymous user the owner.
-      if (!$translation->getOwner()) {
-        $translation->setOwnerId(0);
-      }
-    }
-
-    // If no revision author has been set explicitly,
-    // make the guideline owner the revision author.
-    if (!$this->getRevisionUser()) {
-      $this->setRevisionUserId($this->getOwnerId());
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getName() {
-    return $this->get('name')->value;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setName($name) {
-    $this->set('name', $name);
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCreatedTime() {
-    return $this->get('created')->value;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setCreatedTime($timestamp) {
-    $this->set('created', $timestamp);
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getOwner() {
-    return $this->get('user_id')->entity;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getOwnerId() {
-    return $this->get('user_id')->target_id;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setOwnerId($uid) {
-    $this->set('user_id', $uid);
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setOwner(UserInterface $account) {
-    $this->set('user_id', $account->id());
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getWeight() {
-    return $this->get('weight')->value;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setWeight($weight) {
-    $this->set('weight', $weight);
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getParents() {
-    return $this->get('parent')->referencedEntities();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getParentIds() {
-    $ids = [];
-    foreach ($this->get('parent')->referencedEntities() as $parent) {
-      $ids[] = $parent->id();
-    }
-
-    return $ids;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setParents($parent) {
-    $this->set('parent', $parent);
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getChildren() {
-    $entity_type_repository = \Drupal::service('entity_type.repository');
-    $entity_type_manager = \Drupal::entityTypeManager();
-    $storage = $entity_type_manager->getStorage($entity_type_repository->getEntityTypeFromClass(static::class));
-
-    $query = $storage->getQuery();
-    $query->condition('parent', $this->id());
-    $query->sort('weight');
-
-    $result = $query->execute();
-    return $result ? $storage->loadMultiple($result) : [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
-    $fields = parent::baseFieldDefinitions($entity_type);
-
-    // Add the published field.
-    $fields += static::publishedBaseFieldDefinitions($entity_type);
-
-    $fields['user_id'] = BaseFieldDefinition::create('entity_reference')
-      ->setLabel(t('Authored by'))
-      ->setDescription(t('The user ID of author of the Guideline entity.'))
-      ->setRevisionable(TRUE)
-      ->setSetting('target_type', 'user')
-      ->setSetting('handler', 'default')
-      ->setTranslatable(TRUE)
-      ->setDisplayOptions('view', [
-        'label' => 'hidden',
-        'type' => 'author',
-        'weight' => 0,
-      ])
-      ->setDisplayOptions('form', [
-        'type' => 'entity_reference_autocomplete',
-        'weight' => 5,
-        'settings' => [
-          'match_operator' => 'CONTAINS',
-          'size' => '60',
-          'autocomplete_type' => 'tags',
-          'placeholder' => '',
-        ],
-      ])
-      ->setDisplayConfigurable('form', TRUE)
-      ->setDisplayConfigurable('view', TRUE);
-
-    $fields['name'] = BaseFieldDefinition::create('string')
-      ->setLabel(t('Name'))
-      ->setDescription(t('The name of the Guideline entity.'))
-      ->setRevisionable(TRUE)
-      ->setSettings([
-        'max_length' => 250,
-        'text_processing' => 0,
-      ])
-      ->setDefaultValue('')
-      ->setDisplayOptions('view', [
-        'label' => 'above',
-        'type' => 'string',
-        'weight' => -4,
-      ])
-      ->setDisplayOptions('form', [
-        'type' => 'string_textfield',
-        'weight' => -4,
-      ])
-      ->setDisplayConfigurable('form', TRUE)
-      ->setDisplayConfigurable('view', TRUE)
-      ->setRequired(TRUE);
-
-    $fields['status']->setDescription(t('A boolean indicating whether the Guideline is published.'))
-      ->setDisplayOptions('form', [
-        'type' => 'boolean_checkbox',
-        'weight' => -3,
-      ]);
-
-    $fields['created'] = BaseFieldDefinition::create('created')
-      ->setLabel(t('Created'))
-      ->setDescription(t('The time that the entity was created.'));
-
-    $fields['changed'] = BaseFieldDefinition::create('changed')
-      ->setLabel(t('Changed'))
-      ->setDescription(t('The time that the entity was last edited.'));
-
-    $fields['revision_translation_affected'] = BaseFieldDefinition::create('boolean')
-      ->setLabel(t('Revision translation affected'))
-      ->setDescription(t('Indicates if the last edit of a translation belongs to current revision.'))
-      ->setReadOnly(TRUE)
-      ->setRevisionable(TRUE)
-      ->setTranslatable(TRUE);
-
-    $fields['weight'] = BaseFieldDefinition::create('integer')
-      ->setLabel(t('Weight'))
-      ->setDescription(t('The weight of this guideline in relation to other guidelines.'))
-      ->setDefaultValue(0);
-
-    $fields['parent'] = BaseFieldDefinition::create('entity_reference')
-      ->setLabel(t('Guideline parents'))
-      ->setDescription(t('The parents of this term.'))
-      ->setSetting('target_type', 'guideline')
-      ->setCardinality(BaseFieldDefinition::CARDINALITY_UNLIMITED);
-
-    return $fields;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function loadByEntity($entity) {
-    $entity_type_repository = \Drupal::service('entity_type.repository');
-    $entity_type_manager = \Drupal::entityTypeManager();
-    $storage = $entity_type_manager->getStorage($entity_type_repository->getEntityTypeFromClass(static::class));
-
-    $query = $storage->getQuery();
-    $query->condition('field_field', $entity . '.', 'STARTS_WITH');
-
-    $result = $query->execute();
-    return $result ? $storage->loadMultiple($result) : [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function entityBundleHasGuidelines($entity, $bundle) {
-    $entity_type_repository = \Drupal::service('entity_type.repository');
-    $entity_type_manager = \Drupal::entityTypeManager();
-    $storage = $entity_type_manager->getStorage($entity_type_repository->getEntityTypeFromClass(static::class));
-
-    $query = $storage->getQuery();
-    if (empty($bundle)) {
-      $query->condition('field_field', $entity . '.', 'STARTS_WITH');
-    }
-    else {
-      $query->condition('field_field', $entity . '.' . $bundle . '.', 'STARTS_WITH');
-    }
-
-    $count = $query->count()->execute();
-    return $count > 0;
-  }
-
-}
diff --git a/html/modules/custom/guidelines/src/Entity/GuidelineInterface.php b/html/modules/custom/guidelines/src/Entity/GuidelineInterface.php
deleted file mode 100644
index 23241fbf5..000000000
--- a/html/modules/custom/guidelines/src/Entity/GuidelineInterface.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-
-namespace Drupal\guidelines\Entity;
-
-use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Entity\RevisionLogInterface;
-use Drupal\Core\Entity\EntityChangedInterface;
-use Drupal\Core\Entity\EntityPublishedInterface;
-use Drupal\user\EntityOwnerInterface;
-
-/**
- * Provides an interface for defining Guideline entities.
- *
- * @ingroup guidelines
- */
-interface GuidelineInterface extends ContentEntityInterface, RevisionLogInterface, EntityChangedInterface, EntityPublishedInterface, EntityOwnerInterface {
-
-  /**
-   * Add get/set methods for your configuration properties here.
-   */
-
-  /**
-   * Gets the Guideline name.
-   *
-   * @return string
-   *   Name of the Guideline.
-   */
-  public function getName();
-
-  /**
-   * Sets the Guideline name.
-   *
-   * @param string $name
-   *   The Guideline name.
-   *
-   * @return \Drupal\guidelines\Entity\GuidelineInterface
-   *   The called Guideline entity.
-   */
-  public function setName($name);
-
-  /**
-   * Gets the Guideline creation timestamp.
-   *
-   * @return int
-   *   Creation timestamp of the Guideline.
-   */
-  public function getCreatedTime();
-
-  /**
-   * Sets the Guideline creation timestamp.
-   *
-   * @param int $timestamp
-   *   The Guideline creation timestamp.
-   *
-   * @return \Drupal\guidelines\Entity\GuidelineInterface
-   *   The called Guideline entity.
-   */
-  public function setCreatedTime($timestamp);
-
-  /**
-   * Gets the Guideline revision creation timestamp.
-   *
-   * @return int
-   *   The UNIX timestamp of when this revision was created.
-   */
-  public function getRevisionCreationTime();
-
-  /**
-   * Sets the Guideline revision creation timestamp.
-   *
-   * @param int $timestamp
-   *   The UNIX timestamp of when this revision was created.
-   *
-   * @return \Drupal\guidelines\Entity\GuidelineInterface
-   *   The called Guideline entity.
-   */
-  public function setRevisionCreationTime($timestamp);
-
-  /**
-   * Gets the Guideline revision author.
-   *
-   * @return \Drupal\user\UserInterface
-   *   The user entity for the revision author.
-   */
-  public function getRevisionUser();
-
-  /**
-   * Sets the Guideline revision author.
-   *
-   * @param int $uid
-   *   The user ID of the revision author.
-   *
-   * @return \Drupal\guidelines\Entity\GuidelineInterface
-   *   The called Guideline entity.
-   */
-  public function setRevisionUserId($uid);
-
-  /**
-   * Get weight.
-   */
-  public function getWeight();
-
-  /**
-   * Set weight.
-   */
-  public function setWeight($weight);
-
-  /**
-   * Get parents.
-   */
-  public function getParents();
-
-  /**
-   * Get parent Ids.
-   */
-  public function getParentIds();
-
-  /**
-   * Set parents.
-   */
-  public function setParents($parent);
-
-  /**
-   * Get children.
-   */
-  public function getChildren();
-
-}
diff --git a/html/modules/custom/guidelines/src/Entity/GuidelineType.php b/html/modules/custom/guidelines/src/Entity/GuidelineType.php
deleted file mode 100644
index 00ccc89e9..000000000
--- a/html/modules/custom/guidelines/src/Entity/GuidelineType.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-namespace Drupal\guidelines\Entity;
-
-use Drupal\Core\Config\Entity\ConfigEntityBundleBase;
-
-/**
- * Defines the Guideline type entity.
- *
- * @ConfigEntityType(
- *   id = "guideline_type",
- *   label = @Translation("Guideline type"),
- *   handlers = {
- *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
- *     "list_builder" = "Drupal\guidelines\GuidelineTypeListBuilder",
- *     "form" = {
- *       "add" = "Drupal\guidelines\Form\GuidelineTypeForm",
- *       "edit" = "Drupal\guidelines\Form\GuidelineTypeForm",
- *       "delete" = "Drupal\guidelines\Form\GuidelineTypeDeleteForm"
- *     },
- *     "route_provider" = {
- *       "html" = "Drupal\guidelines\GuidelineTypeHtmlRouteProvider",
- *     },
- *   },
- *   config_prefix = "guideline_type",
- *   admin_permission = "administer site configuration",
- *   bundle_of = "guideline",
- *   entity_keys = {
- *     "id" = "id",
- *     "label" = "label",
- *     "uuid" = "uuid"
- *   },
- *   config_export = {
- *     "id",
- *     "label",
- *   },
- *   links = {
- *     "canonical" = "/admin/structure/guideline_type/{guideline_type}",
- *     "add-form" = "/admin/structure/guideline_type/add",
- *     "edit-form" = "/admin/structure/guideline_type/{guideline_type}/edit",
- *     "delete-form" = "/admin/structure/guideline_type/{guideline_type}/delete",
- *     "collection" = "/admin/structure/guideline_type"
- *   }
- * )
- */
-class GuidelineType extends ConfigEntityBundleBase implements GuidelineTypeInterface {
-
-  /**
-   * The Guideline type ID.
-   *
-   * @var string
-   */
-  protected $id;
-
-  /**
-   * The Guideline type label.
-   *
-   * @var string
-   */
-  protected $label;
-
-}
diff --git a/html/modules/custom/guidelines/src/Entity/GuidelineTypeInterface.php b/html/modules/custom/guidelines/src/Entity/GuidelineTypeInterface.php
deleted file mode 100644
index bdbfff65f..000000000
--- a/html/modules/custom/guidelines/src/Entity/GuidelineTypeInterface.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Drupal\guidelines\Entity;
-
-use Drupal\Core\Config\Entity\ConfigEntityInterface;
-
-/**
- * Provides an interface for defining Guideline type entities.
- */
-interface GuidelineTypeInterface extends ConfigEntityInterface {
-
-  // Add get/set methods for your configuration properties here.
-}
diff --git a/html/modules/custom/guidelines/src/Entity/GuidelineViewsData.php b/html/modules/custom/guidelines/src/Entity/GuidelineViewsData.php
deleted file mode 100644
index b7a3be7b6..000000000
--- a/html/modules/custom/guidelines/src/Entity/GuidelineViewsData.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace Drupal\guidelines\Entity;
-
-use Drupal\views\EntityViewsData;
-
-/**
- * Provides Views data for Guideline entities.
- */
-class GuidelineViewsData extends EntityViewsData {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getViewsData() {
-    $data = parent::getViewsData();
-
-    // Additional information for Views integration, such as table joins, can be
-    // put here.
-    return $data;
-  }
-
-}
diff --git a/html/modules/custom/guidelines/src/Form/GuidelineDeleteForm.php b/html/modules/custom/guidelines/src/Form/GuidelineDeleteForm.php
deleted file mode 100644
index b04fa9b6e..000000000
--- a/html/modules/custom/guidelines/src/Form/GuidelineDeleteForm.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace Drupal\guidelines\Form;
-
-use Drupal\Core\Entity\ContentEntityDeleteForm;
-
-/**
- * Provides a form for deleting Guideline entities.
- *
- * @ingroup guidelines
- */
-class GuidelineDeleteForm extends ContentEntityDeleteForm {
-
-
-}
diff --git a/html/modules/custom/guidelines/src/Form/GuidelineForm.php b/html/modules/custom/guidelines/src/Form/GuidelineForm.php
deleted file mode 100644
index 72065f0ee..000000000
--- a/html/modules/custom/guidelines/src/Form/GuidelineForm.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-
-namespace Drupal\guidelines\Form;
-
-use Drupal\Core\Entity\ContentEntityForm;
-use Drupal\Core\Form\FormStateInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Form controller for Guideline edit forms.
- *
- * @ingroup guidelines
- */
-class GuidelineForm extends ContentEntityForm {
-
-  /**
-   * The current user account.
-   *
-   * @var \Drupal\Core\Session\AccountProxyInterface
-   */
-  protected $account;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    // Instantiates this form class.
-    $instance = parent::create($container);
-    $instance->account = $container->get('current_user');
-    return $instance;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    /** @var \Drupal\guidelines\Entity\Guideline $this->entity */
-    $form = parent::buildForm($form, $form_state);
-
-    if (!$this->entity->isNew()) {
-      $form['new_revision'] = [
-        '#type' => 'checkbox',
-        '#title' => $this->t('Create new revision'),
-        '#default_value' => FALSE,
-        '#weight' => 10,
-      ];
-    }
-
-    $guideline_storage = $this->entityTypeManager->getStorage('guideline');
-    $guidelines = $guideline_storage->loadMultiple();
-    $guideline_options = [
-      '<' . $this->t('root') . '>',
-    ];
-
-    foreach ($guidelines as $guideline) {
-      if ($guideline->id() != $this->entity->id()) {
-        $guideline_options[$guideline->id()] = $guideline->label();
-      }
-    }
-
-    $form['relations'] = [
-      '#type' => 'details',
-      '#title' => $this->t('Relations'),
-      '#open' => count($guideline_options) > 1,
-      '#weight' => 10,
-    ];
-
-    $form['relations']['parent'] = [
-      '#type' => 'select',
-      '#title' => $this->t('Parent guideline(s)'),
-      '#options' => $guideline_options,
-      '#default_value' => $this->entity->getParentIds(),
-      '#multiple' => TRUE,
-    ];
-
-    $form['relations']['weight'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('Weight'),
-      '#size' => 6,
-      '#default_value' => $this->entity->getWeight(),
-      '#description' => $this->t('Guilines are displayed in ascending order by weight.'),
-      '#required' => TRUE,
-    ];
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-    parent::validateForm($form, $form_state);
-
-    // Ensure numeric values.
-    if ($form_state->hasValue('weight') && !is_numeric($form_state->getValue('weight'))) {
-      $form_state->setErrorByName('weight', $this->t('Weight value must be numeric.'));
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildEntity(array $form, FormStateInterface $form_state) {
-    $guideline = parent::buildEntity($form, $form_state);
-
-    // Prevent leading and trailing spaces in guideline names.
-    $guideline->setName(trim($guideline->getName()));
-
-    // Assign parents with proper delta values starting from 0.
-    $guideline->parent = array_values($form_state->getValue('parent'));
-
-    return $guideline;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getEditedFieldNames(FormStateInterface $form_state) {
-    return array_merge(['parent', 'weight'], parent::getEditedFieldNames($form_state));
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function save(array $form, FormStateInterface $form_state) {
-    $entity = $this->entity;
-
-    // Save as a new revision if requested to do so.
-    if (!$form_state->isValueEmpty('new_revision') && $form_state->getValue('new_revision') != FALSE) {
-      $entity->setNewRevision();
-
-      // If a new revision is created, save the current user as revision author.
-      $entity->setRevisionCreationTime($this->time->getRequestTime());
-      $entity->setRevisionUserId($this->account->id());
-    }
-    else {
-      $entity->setNewRevision(FALSE);
-    }
-
-    $current_parent_count = count($form_state->getValue('parent'));
-    // Root doesn't count if it's the only parent.
-    if ($current_parent_count == 1 && $form_state->hasValue(['parent', 0])) {
-      $form_state->setValue('parent', []);
-    }
-
-    $status = parent::save($form, $form_state);
-
-    switch ($status) {
-      case SAVED_NEW:
-        $this->messenger()->addMessage($this->t('Created the %label Guideline.', [
-          '%label' => $entity->label(),
-        ]));
-        break;
-
-      default:
-        $this->messenger()->addMessage($this->t('Saved the %label Guideline.', [
-          '%label' => $entity->label(),
-        ]));
-    }
-
-    $form_state->setRedirect('entity.guideline.canonical', ['guideline' => $entity->id()]);
-  }
-
-}
diff --git a/html/modules/custom/guidelines/src/Form/GuidelineGlobalSettingsForm.php b/html/modules/custom/guidelines/src/Form/GuidelineGlobalSettingsForm.php
deleted file mode 100644
index 86e225c4c..000000000
--- a/html/modules/custom/guidelines/src/Form/GuidelineGlobalSettingsForm.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-namespace Drupal\guidelines\Form;
-
-use Drupal\Core\Form\ConfigFormBase;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Configure example settings for this site.
- */
-class GuidelineGlobalSettingsForm extends ConfigFormBase {
-
-  /**
-   * Config settings.
-   *
-   * @var string
-   */
-  const SETTINGS = 'guidelines.settings';
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'guidelines_global_settings';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getEditableConfigNames() {
-    return [
-      static::SETTINGS,
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $config = $this->config(static::SETTINGS);
-
-    $form['overwrite_description'] = [
-      '#type' => 'checkbox',
-      '#title' => $this->t('Overwrite description'),
-      '#default_value' => $config->get('overwrite_description'),
-    ];
-
-    $form['use_json_loading'] = [
-      '#type' => 'checkbox',
-      '#title' => $this->t('Use Json to load guidelines'),
-      '#default_value' => $config->get('use_json_loading'),
-    ];
-
-    return parent::buildForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    // Retrieve the configuration.
-    $this->configFactory->getEditable(static::SETTINGS)
-      ->set('overwrite_description', $form_state->getValue('overwrite_description'))
-      ->set('use_json_loading', $form_state->getValue('use_json_loading'))
-      ->save();
-
-    parent::submitForm($form, $form_state);
-  }
-
-}
diff --git a/html/modules/custom/guidelines/src/Form/GuidelineRevisionDeleteForm.php b/html/modules/custom/guidelines/src/Form/GuidelineRevisionDeleteForm.php
deleted file mode 100644
index df99ca7e6..000000000
--- a/html/modules/custom/guidelines/src/Form/GuidelineRevisionDeleteForm.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-namespace Drupal\guidelines\Form;
-
-use Drupal\Core\Form\ConfirmFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a form for deleting a Guideline revision.
- *
- * @ingroup guidelines
- */
-class GuidelineRevisionDeleteForm extends ConfirmFormBase {
-
-  /**
-   * The Guideline revision.
-   *
-   * @var \Drupal\guidelines\Entity\GuidelineInterface
-   */
-  protected $revision;
-
-  /**
-   * The Guideline storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $guidelineStorage;
-
-  /**
-   * The database connection.
-   *
-   * @var \Drupal\Core\Database\Connection
-   */
-  protected $connection;
-
-  /**
-   * The date formatter service.
-   *
-   * @var \Drupal\Core\Datetime\DateFormatterInterface
-   */
-  protected $dateFormatter;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    $instance = parent::create($container);
-    $instance->guidelineStorage = $container->get('entity_type.manager')->getStorage('guideline');
-    $instance->connection = $container->get('database');
-    $instance->dateFormatter = $container->get('date.formatter');
-    return $instance;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'guideline_revision_delete_confirm';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getQuestion() {
-    return $this->t('Are you sure you want to delete the revision from %revision-date?', [
-      '%revision-date' => $this->dateFormatter->format($this->revision->getRevisionCreationTime()),
-    ]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCancelUrl() {
-    return new Url('entity.guideline.version_history', ['guideline' => $this->revision->id()]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfirmText() {
-    return $this->t('Delete');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $guideline_revision = NULL) {
-    $this->revision = $this->GuidelineStorage->loadRevision($guideline_revision);
-    $form = parent::buildForm($form, $form_state);
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $this->GuidelineStorage->deleteRevision($this->revision->getRevisionId());
-
-    $this->logger('content')->notice('Guideline: deleted %title revision %revision.', [
-      '%title' => $this->revision->label(),
-      '%revision' => $this->revision->getRevisionId(),
-    ]);
-    $this->messenger()->addMessage($this->t('Revision from %revision-date of Guideline %title has been deleted.', [
-      '%revision-date' => $this->dateFormatter->format($this->revision->getRevisionCreationTime()),
-      '%title' => $this->revision->label(),
-    ]));
-    $form_state->setRedirect(
-      'entity.guideline.canonical',
-       ['guideline' => $this->revision->id()]
-    );
-    if ($this->connection->query('SELECT COUNT(DISTINCT vid) FROM {guideline_field_revision} WHERE id = :id', [':id' => $this->revision->id()])->fetchField() > 1) {
-      $form_state->setRedirect(
-        'entity.guideline.version_history',
-         ['guideline' => $this->revision->id()]
-      );
-    }
-  }
-
-}
diff --git a/html/modules/custom/guidelines/src/Form/GuidelineRevisionRevertForm.php b/html/modules/custom/guidelines/src/Form/GuidelineRevisionRevertForm.php
deleted file mode 100644
index 0830421f6..000000000
--- a/html/modules/custom/guidelines/src/Form/GuidelineRevisionRevertForm.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-namespace Drupal\guidelines\Form;
-
-use Drupal\Core\Form\ConfirmFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-use Drupal\guidelines\Entity\GuidelineInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a form for reverting a Guideline revision.
- *
- * @ingroup guidelines
- */
-class GuidelineRevisionRevertForm extends ConfirmFormBase {
-
-  /**
-   * The Guideline revision.
-   *
-   * @var \Drupal\guidelines\Entity\GuidelineInterface
-   */
-  protected $revision;
-
-  /**
-   * The Guideline storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $guidelineStorage;
-
-  /**
-   * The date formatter service.
-   *
-   * @var \Drupal\Core\Datetime\DateFormatterInterface
-   */
-  protected $dateFormatter;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    $instance = parent::create($container);
-    $instance->guidelineStorage = $container->get('entity_type.manager')->getStorage('guideline');
-    $instance->dateFormatter = $container->get('date.formatter');
-    return $instance;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'guideline_revision_revert_confirm';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getQuestion() {
-    return $this->t('Are you sure you want to revert to the revision from %revision-date?', [
-      '%revision-date' => $this->dateFormatter->format($this->revision->getRevisionCreationTime()),
-    ]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCancelUrl() {
-    return new Url('entity.guideline.version_history', ['guideline' => $this->revision->id()]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfirmText() {
-    return $this->t('Revert');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDescription() {
-    return '';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $guideline_revision = NULL) {
-    $this->revision = $this->GuidelineStorage->loadRevision($guideline_revision);
-    $form = parent::buildForm($form, $form_state);
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    // The revision timestamp will be updated when the revision is saved. Keep
-    // the original one for the confirmation message.
-    $original_revision_timestamp = $this->revision->getRevisionCreationTime();
-
-    $this->revision = $this->prepareRevertedRevision($this->revision, $form_state);
-    $this->revision->revision_log = $this->t('Copy of the revision from %date.', [
-      '%date' => $this->dateFormatter->format($original_revision_timestamp),
-    ]);
-    $this->revision->save();
-
-    $this->logger('content')->notice('Guideline: reverted %title revision %revision.', [
-      '%title' => $this->revision->label(),
-      '%revision' => $this->revision->getRevisionId(),
-    ]);
-    $this->messenger()->addMessage($this->t('Guideline %title has been reverted to the revision from %revision-date.', [
-      '%title' => $this->revision->label(),
-      '%revision-date' => $this->dateFormatter->format($original_revision_timestamp),
-    ]));
-    $form_state->setRedirect(
-      'entity.guideline.version_history',
-      ['guideline' => $this->revision->id()]
-    );
-  }
-
-  /**
-   * Prepares a revision to be reverted.
-   *
-   * @param \Drupal\guidelines\Entity\GuidelineInterface $revision
-   *   The revision to be reverted.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   *
-   * @return \Drupal\guidelines\Entity\GuidelineInterface
-   *   The prepared revision ready to be stored.
-   */
-  protected function prepareRevertedRevision(GuidelineInterface $revision, FormStateInterface $form_state) {
-    $revision->setNewRevision();
-    $revision->isDefaultRevision(TRUE);
-    $revision->setRevisionCreationTime(REQUEST_TIME);
-
-    return $revision;
-  }
-
-}
diff --git a/html/modules/custom/guidelines/src/Form/GuidelineRevisionRevertTranslationForm.php b/html/modules/custom/guidelines/src/Form/GuidelineRevisionRevertTranslationForm.php
deleted file mode 100644
index c764348bf..000000000
--- a/html/modules/custom/guidelines/src/Form/GuidelineRevisionRevertTranslationForm.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-namespace Drupal\guidelines\Form;
-
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\guidelines\Entity\GuidelineInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides a form for reverting a Guideline revision for a single trans.
- *
- * @ingroup guidelines
- */
-class GuidelineRevisionRevertTranslationForm extends GuidelineRevisionRevertForm {
-
-  /**
-   * The language to be reverted.
-   *
-   * @var string
-   */
-  protected $langcode;
-
-  /**
-   * The language manager.
-   *
-   * @var \Drupal\Core\Language\LanguageManagerInterface
-   */
-  protected $languageManager;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    $instance = parent::create($container);
-    $instance->languageManager = $container->get('language_manager');
-    return $instance;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'guideline_revision_revert_translation_confirm';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getQuestion() {
-    return $this->t('Are you sure you want to revert @language translation to the revision from %revision-date?', [
-      '@language' => $this->languageManager->getLanguageName($this->langcode),
-      '%revision-date' => $this->dateFormatter->format($this->revision->getRevisionCreationTime()),
-    ]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, $guideline_revision = NULL, $langcode = NULL) {
-    $this->langcode = $langcode;
-    $form = parent::buildForm($form, $form_state, $guideline_revision);
-
-    $form['revert_untranslated_fields'] = [
-      '#type' => 'checkbox',
-      '#title' => $this->t('Revert content shared among translations'),
-      '#default_value' => FALSE,
-    ];
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function prepareRevertedRevision(GuidelineInterface $revision, FormStateInterface $form_state) {
-    $revert_untranslated_fields = $form_state->getValue('revert_untranslated_fields');
-
-    /** @var \Drupal\guidelines\Entity\GuidelineInterface $default_revision */
-    $latest_revision = $this->GuidelineStorage->load($revision->id());
-    $latest_revision_translation = $latest_revision->getTranslation($this->langcode);
-
-    $revision_translation = $revision->getTranslation($this->langcode);
-
-    foreach ($latest_revision_translation->getFieldDefinitions() as $field_name => $definition) {
-      if ($definition->isTranslatable() || $revert_untranslated_fields) {
-        $latest_revision_translation->set($field_name, $revision_translation->get($field_name)->getValue());
-      }
-    }
-
-    $latest_revision_translation->setNewRevision();
-    $latest_revision_translation->isDefaultRevision(TRUE);
-    $revision->setRevisionCreationTime(REQUEST_TIME);
-
-    return $latest_revision_translation;
-  }
-
-}
diff --git a/html/modules/custom/guidelines/src/Form/GuidelineSettingsForm.php b/html/modules/custom/guidelines/src/Form/GuidelineSettingsForm.php
deleted file mode 100644
index 25cc12a8a..000000000
--- a/html/modules/custom/guidelines/src/Form/GuidelineSettingsForm.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-namespace Drupal\guidelines\Form;
-
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Guideline settings.
- *
- * @ingroup guidelines
- */
-class GuidelineSettingsForm extends FormBase {
-
-  /**
-   * Returns a unique string identifying the form.
-   *
-   * @return string
-   *   The unique string identifying the form.
-   */
-  public function getFormId() {
-    return 'guideline_settings';
-  }
-
-  /**
-   * Form submission handler.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    // Empty implementation of the abstract submit class.
-  }
-
-  /**
-   * Defines the settings form for Guideline entities.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   *
-   * @return array
-   *   Form definition array.
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    $form['guideline_settings']['#markup'] = 'Settings form for Guideline entities. Manage field settings here.';
-    return $form;
-  }
-
-}
diff --git a/html/modules/custom/guidelines/src/Form/GuidelineSortForm.php b/html/modules/custom/guidelines/src/Form/GuidelineSortForm.php
deleted file mode 100644
index 19a0a67ad..000000000
--- a/html/modules/custom/guidelines/src/Form/GuidelineSortForm.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-
-namespace Drupal\guidelines\Form;
-
-use Drupal\Core\Entity\ContentEntityForm;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\FieldableEntityInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Link;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Form controller for Guideline edit forms.
- *
- * @ingroup guidelines
- */
-class GuidelineSortForm extends ContentEntityForm {
-
-  /**
-   * The current user account.
-   *
-   * @var \Drupal\Core\Session\AccountProxyInterface
-   */
-  protected $account;
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    // Instantiates this form class.
-    $instance = parent::create($container);
-    $instance->account = $container->get('current_user');
-    return $instance;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'guideline_sort_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-    /** @var \Drupal\guidelines\Entity\Guideline $guideline */
-    $guideline = $this->entity;
-
-    $children = $guideline->getChildren();
-    if (empty($children)) {
-      return;
-    }
-
-    $items = [];
-    foreach ($children as $child) {
-      $data = [];
-      $data['id'] = $child->id();
-      $data['label'] = Link::createFromRoute(
-        $child->label(),
-        'entity.guideline.canonical',
-        ['guideline' => $child->id()]
-      )->toString();
-
-      $parents = [];
-      $parent_entities = $child->getParents();
-      foreach ($parent_entities as $parent_entity) {
-        $parents[] = Link::createFromRoute(
-          $parent_entity->label(),
-          'entity.guideline.canonical',
-          ['guideline' => $parent_entity->id()]
-        )->toString();
-      }
-
-      $data['parent'] = implode(', ', $parents);
-      $data['weight'] = $child->getWeight();
-
-      $items[$child->id()] = $data;
-    }
-
-    // Build table.
-    $group_class = 'group-order-weight';
-    $form['items'] = [
-      '#type' => 'table',
-      '#caption' => $this->t('Items'),
-      '#header' => [
-        $this->t('ID'),
-        $this->t('Label'),
-        $this->t('Parent(s)'),
-        $this->t('Weight'),
-      ],
-      '#empty' => $this->t('No items.'),
-      '#tableselect' => FALSE,
-      '#tabledrag' => [
-        [
-          'action' => 'order',
-          'relationship' => 'sibling',
-          'group' => $group_class,
-        ],
-      ],
-    ];
-
-    // Build rows.
-    foreach ($items as $key => $value) {
-      $form['items'][$key]['#attributes']['class'][] = 'draggable';
-      $form['items'][$key]['#weight'] = $value['weight'];
-
-      // Id.
-      $form['items'][$key]['id'] = [
-        '#plain_text' => $value['id'],
-      ];
-
-      // Label.
-      $form['items'][$key]['label'] = [
-        '#markup' => $value['label'],
-      ];
-
-      // Parent(s).
-      $form['items'][$key]['parent'] = [
-        '#markup' => $value['parent'],
-      ];
-
-      // Weight.
-      $form['items'][$key]['weight'] = [
-        '#type' => 'weight',
-        '#title' => $this->t('Weight for @title', ['@title' => $value['label']]),
-        '#title_display' => 'invisible',
-        '#default_value' => $value['weight'],
-        '#attributes' => ['class' => [$group_class]],
-      ];
-    }
-
-    $form['actions']['#type'] = 'actions';
-    $form['actions']['submit'] = [
-      '#type' => 'submit',
-      '#value' => $this->t('Save'),
-      '#button_type' => 'primary',
-    ];
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function extractFormValues(FieldableEntityInterface $entity, array &$form, FormStateInterface $form_state) {
-    return [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function copyFormValuesToEntity(EntityInterface $entity, array $form, FormStateInterface $form_state) {
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    /** @var \Drupal\guidelines\Entity\Guideline $guideline */
-    $guideline = $this->entity;
-
-    $children = $guideline->getChildren();
-    $new_weights = $form_state->getValue('items');
-
-    foreach ($children as $child) {
-      if (isset($new_weights[$child->id()])) {
-        if ($child->getWeight() !== $new_weights[$child->id()]['weight']) {
-          $child->setWeight($new_weights[$child->id()]['weight']);
-          $child->save();
-        }
-      }
-    }
-  }
-
-}
diff --git a/html/modules/custom/guidelines/src/Form/GuidelineTypeDeleteForm.php b/html/modules/custom/guidelines/src/Form/GuidelineTypeDeleteForm.php
deleted file mode 100644
index e83a576e1..000000000
--- a/html/modules/custom/guidelines/src/Form/GuidelineTypeDeleteForm.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace Drupal\guidelines\Form;
-
-use Drupal\Core\Entity\EntityConfirmFormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-
-/**
- * Builds the form to delete Guideline type entities.
- */
-class GuidelineTypeDeleteForm extends EntityConfirmFormBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getQuestion() {
-    return $this->t('Are you sure you want to delete %name?', ['%name' => $this->entity->label()]);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getCancelUrl() {
-    return new Url('entity.guideline_type.collection');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfirmText() {
-    return $this->t('Delete');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $this->entity->delete();
-
-    $this->messenger()->addMessage(
-      $this->t('content @type: deleted @label.', [
-        '@type' => $this->entity->bundle(),
-        '@label' => $this->entity->label(),
-      ])
-    );
-
-    $form_state->setRedirectUrl($this->getCancelUrl());
-  }
-
-}
diff --git a/html/modules/custom/guidelines/src/Form/GuidelineTypeForm.php b/html/modules/custom/guidelines/src/Form/GuidelineTypeForm.php
deleted file mode 100644
index 0cffbdc6a..000000000
--- a/html/modules/custom/guidelines/src/Form/GuidelineTypeForm.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-namespace Drupal\guidelines\Form;
-
-use Drupal\Core\Entity\EntityForm;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Guideline type form.
- */
-class GuidelineTypeForm extends EntityForm {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function form(array $form, FormStateInterface $form_state) {
-    $form = parent::form($form, $form_state);
-
-    $guideline_type = $this->entity;
-    $form['label'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('Label'),
-      '#maxlength' => 255,
-      '#default_value' => $guideline_type->label(),
-      '#description' => $this->t("Label for the Guideline type."),
-      '#required' => TRUE,
-    ];
-
-    $form['id'] = [
-      '#type' => 'machine_name',
-      '#default_value' => $guideline_type->id(),
-      '#machine_name' => [
-        'exists' => '\Drupal\guidelines\Entity\GuidelineType::load',
-      ],
-      '#disabled' => !$guideline_type->isNew(),
-    ];
-
-    /* You will need additional form elements for your custom properties. */
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function save(array $form, FormStateInterface $form_state) {
-    $guideline_type = $this->entity;
-    $status = $guideline_type->save();
-
-    switch ($status) {
-      case SAVED_NEW:
-        $this->messenger()->addMessage($this->t('Created the %label Guideline type.', [
-          '%label' => $guideline_type->label(),
-        ]));
-        break;
-
-      default:
-        $this->messenger()->addMessage($this->t('Saved the %label Guideline type.', [
-          '%label' => $guideline_type->label(),
-        ]));
-    }
-    $form_state->setRedirectUrl($guideline_type->toUrl('collection'));
-  }
-
-}
diff --git a/html/modules/custom/guidelines/src/GuidelineAccessControlHandler.php b/html/modules/custom/guidelines/src/GuidelineAccessControlHandler.php
deleted file mode 100644
index 2c4e66ad5..000000000
--- a/html/modules/custom/guidelines/src/GuidelineAccessControlHandler.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-namespace Drupal\guidelines;
-
-use Drupal\Core\Entity\EntityAccessControlHandler;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Access\AccessResult;
-
-/**
- * Access controller for the Guideline entity.
- *
- * @see \Drupal\guidelines\Entity\Guideline.
- */
-class GuidelineAccessControlHandler extends EntityAccessControlHandler {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
-    /** @var \Drupal\guidelines\Entity\GuidelineInterface $entity */
-
-    switch ($operation) {
-
-      case 'view':
-
-        if (!$entity->isPublished()) {
-          $permission = $this->checkOwn($entity, 'view unpublished', $account);
-          if (!empty($permission)) {
-            return AccessResult::allowed();
-          }
-
-          return AccessResult::allowedIfHasPermission($account, 'view unpublished guideline entities');
-        }
-
-        $permission = $this->checkOwn($entity, $operation, $account);
-        if (!empty($permission)) {
-          return AccessResult::allowed();
-        }
-
-        return AccessResult::allowedIfHasPermission($account, 'view published guideline entities');
-
-      case 'update':
-
-        $permission = $this->checkOwn($entity, $operation, $account);
-        if (!empty($permission)) {
-          return AccessResult::allowed();
-        }
-        return AccessResult::allowedIfHasPermission($account, 'edit guideline entities');
-
-      case 'delete':
-
-        $permission = $this->checkOwn($entity, $operation, $account);
-        if (!empty($permission)) {
-          return AccessResult::allowed();
-        }
-        return AccessResult::allowedIfHasPermission($account, 'delete guideline entities');
-    }
-
-    // Unknown operation, no opinion.
-    return AccessResult::neutral();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function checkCreateAccess(AccountInterface $account, array $context, $entity_bundle = NULL) {
-    return AccessResult::allowedIfHasPermission($account, 'add guideline entities');
-  }
-
-  /**
-   * Test for given 'own' permission.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   Guideline.
-   * @param string $operation
-   *   Operation.
-   * @param \Drupal\Core\Session\AccountInterface $account
-   *   Account.
-   *
-   * @return string|null
-   *   The permission string indicating it's allowed.
-   */
-  protected function checkOwn(EntityInterface $entity, $operation, AccountInterface $account) {
-    $status = $entity->isPublished();
-    $uid = $entity->getOwnerId();
-
-    $is_own = $account->isAuthenticated() && $account->id() == $uid;
-    if (!$is_own) {
-      return;
-    }
-
-    $bundle = $entity->bundle();
-
-    $ops = [
-      'create' => '%bundle add own %bundle entities',
-      'view unpublished' => '%bundle view own unpublished %bundle entities',
-      'view' => '%bundle view own entities',
-      'update' => '%bundle edit own entities',
-      'delete' => '%bundle delete own entities',
-    ];
-    $permission = strtr($ops[$operation], ['%bundle' => $bundle]);
-
-    if ($operation === 'view unpublished') {
-      if (!$status && $account->hasPermission($permission)) {
-        return $permission;
-      }
-      else {
-        return NULL;
-      }
-    }
-    if ($account->hasPermission($permission)) {
-      return $permission;
-    }
-
-    return NULL;
-  }
-
-}
diff --git a/html/modules/custom/guidelines/src/GuidelineHtmlRouteProvider.php b/html/modules/custom/guidelines/src/GuidelineHtmlRouteProvider.php
deleted file mode 100644
index 804b24999..000000000
--- a/html/modules/custom/guidelines/src/GuidelineHtmlRouteProvider.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-
-namespace Drupal\guidelines;
-
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Entity\Routing\AdminHtmlRouteProvider;
-use Symfony\Component\Routing\Route;
-
-/**
- * Provides routes for Guideline entities.
- *
- * @see \Drupal\Core\Entity\Routing\AdminHtmlRouteProvider
- * @see \Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider
- */
-class GuidelineHtmlRouteProvider extends AdminHtmlRouteProvider {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getRoutes(EntityTypeInterface $entity_type) {
-    $collection = parent::getRoutes($entity_type);
-
-    $entity_type_id = $entity_type->id();
-
-    if ($history_route = $this->getHistoryRoute($entity_type)) {
-      $collection->add("entity.{$entity_type_id}.version_history", $history_route);
-    }
-
-    if ($revision_route = $this->getRevisionRoute($entity_type)) {
-      $collection->add("entity.{$entity_type_id}.revision", $revision_route);
-    }
-
-    if ($revert_route = $this->getRevisionRevertRoute($entity_type)) {
-      $collection->add("entity.{$entity_type_id}.revision_revert", $revert_route);
-    }
-
-    if ($delete_route = $this->getRevisionDeleteRoute($entity_type)) {
-      $collection->add("entity.{$entity_type_id}.revision_delete", $delete_route);
-    }
-
-    if ($translation_route = $this->getRevisionTranslationRevertRoute($entity_type)) {
-      $collection->add("{$entity_type_id}.revision_revert_translation_confirm", $translation_route);
-    }
-
-    if ($settings_form_route = $this->getSettingsFormRoute($entity_type)) {
-      $collection->add("$entity_type_id.settings", $settings_form_route);
-    }
-
-    if ($sort_route = $this->getSortRoute($entity_type)) {
-      $collection->add("entity.{$entity_type_id}.sort", $sort_route);
-    }
-
-    return $collection;
-  }
-
-  /**
-   * Gets the sort route.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type.
-   *
-   * @return \Symfony\Component\Routing\Route|null
-   *   The generated route, if available.
-   */
-  protected function getSortRoute(EntityTypeInterface $entity_type) {
-    if ($entity_type->hasLinkTemplate('sort-form')) {
-      $entity_type_id = $entity_type->id();
-      $route = new Route($entity_type->getLinkTemplate('sort-form'));
-      $route
-        ->setDefaults([
-          '_entity_form' => "{$entity_type_id}.sort",
-          '_title' => "Sort {$entity_type->getLabel()} children",
-        ])
-        ->setRequirement('_permission', 'sort guideline')
-        ->setOption('_admin_route', TRUE)
-        ->setRequirement('_entity_access', "{$entity_type_id}.update")
-        ->setOption('parameters', [
-          $entity_type_id => ['type' => 'entity:' . $entity_type_id],
-        ]);
-
-      if ($this->getEntityTypeIdKeyType($entity_type) === 'integer') {
-        $route->setRequirement($entity_type_id, '\d+');
-      }
-
-      return $route;
-    }
-  }
-
-  /**
-   * Gets the version history route.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type.
-   *
-   * @return \Symfony\Component\Routing\Route|null
-   *   The generated route, if available.
-   */
-  protected function getHistoryRoute(EntityTypeInterface $entity_type) {
-    if ($entity_type->hasLinkTemplate('version-history')) {
-      $route = new Route($entity_type->getLinkTemplate('version-history'));
-      $route
-        ->setDefaults([
-          '_title' => "{$entity_type->getLabel()} revisions",
-          '_controller' => '\Drupal\guidelines\Controller\GuidelineController::revisionOverview',
-        ])
-        ->setRequirement('_permission', 'view all guideline revisions')
-        ->setOption('_admin_route', TRUE);
-
-      return $route;
-    }
-  }
-
-  /**
-   * Gets the revision route.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type.
-   *
-   * @return \Symfony\Component\Routing\Route|null
-   *   The generated route, if available.
-   */
-  protected function getRevisionRoute(EntityTypeInterface $entity_type) {
-    if ($entity_type->hasLinkTemplate('revision')) {
-      $route = new Route($entity_type->getLinkTemplate('revision'));
-      $route
-        ->setDefaults([
-          '_controller' => '\Drupal\guidelines\Controller\GuidelineController::revisionShow',
-          '_title_callback' => '\Drupal\guidelines\Controller\GuidelineController::revisionPageTitle',
-        ])
-        ->setRequirement('_permission', 'view all guideline revisions')
-        ->setOption('_admin_route', TRUE);
-
-      return $route;
-    }
-  }
-
-  /**
-   * Gets the revision revert route.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type.
-   *
-   * @return \Symfony\Component\Routing\Route|null
-   *   The generated route, if available.
-   */
-  protected function getRevisionRevertRoute(EntityTypeInterface $entity_type) {
-    if ($entity_type->hasLinkTemplate('revision_revert')) {
-      $route = new Route($entity_type->getLinkTemplate('revision_revert'));
-      $route
-        ->setDefaults([
-          '_form' => '\Drupal\guidelines\Form\GuidelineRevisionRevertForm',
-          '_title' => 'Revert to earlier revision',
-        ])
-        ->setRequirement('_permission', 'revert all guideline revisions')
-        ->setOption('_admin_route', TRUE);
-
-      return $route;
-    }
-  }
-
-  /**
-   * Gets the revision delete route.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type.
-   *
-   * @return \Symfony\Component\Routing\Route|null
-   *   The generated route, if available.
-   */
-  protected function getRevisionDeleteRoute(EntityTypeInterface $entity_type) {
-    if ($entity_type->hasLinkTemplate('revision_delete')) {
-      $route = new Route($entity_type->getLinkTemplate('revision_delete'));
-      $route
-        ->setDefaults([
-          '_form' => '\Drupal\guidelines\Form\GuidelineRevisionDeleteForm',
-          '_title' => 'Delete earlier revision',
-        ])
-        ->setRequirement('_permission', 'delete all guideline revisions')
-        ->setOption('_admin_route', TRUE);
-
-      return $route;
-    }
-  }
-
-  /**
-   * Gets the revision translation revert route.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type.
-   *
-   * @return \Symfony\Component\Routing\Route|null
-   *   The generated route, if available.
-   */
-  protected function getRevisionTranslationRevertRoute(EntityTypeInterface $entity_type) {
-    if ($entity_type->hasLinkTemplate('translation_revert')) {
-      $route = new Route($entity_type->getLinkTemplate('translation_revert'));
-      $route
-        ->setDefaults([
-          '_form' => '\Drupal\guidelines\Form\GuidelineRevisionRevertTranslationForm',
-          '_title' => 'Revert to earlier revision of a translation',
-        ])
-        ->setRequirement('_permission', 'revert all guideline revisions')
-        ->setOption('_admin_route', TRUE);
-
-      return $route;
-    }
-  }
-
-  /**
-   * Gets the settings form route.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity type.
-   *
-   * @return \Symfony\Component\Routing\Route|null
-   *   The generated route, if available.
-   */
-  protected function getSettingsFormRoute(EntityTypeInterface $entity_type) {
-    if (!$entity_type->getBundleEntityType()) {
-      $route = new Route("/admin/structure/{$entity_type->id()}/settings");
-      $route
-        ->setDefaults([
-          '_form' => 'Drupal\guidelines\Form\GuidelineSettingsForm',
-          '_title' => "{$entity_type->getLabel()} settings",
-        ])
-        ->setRequirement('_permission', $entity_type->getAdminPermission())
-        ->setOption('_admin_route', TRUE);
-
-      return $route;
-    }
-  }
-
-}
diff --git a/html/modules/custom/guidelines/src/GuidelineListBuilder.php b/html/modules/custom/guidelines/src/GuidelineListBuilder.php
deleted file mode 100644
index 5174870ec..000000000
--- a/html/modules/custom/guidelines/src/GuidelineListBuilder.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-namespace Drupal\guidelines;
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityListBuilder;
-use Drupal\Core\Link;
-
-/**
- * Defines a class to build a listing of Guideline entities.
- *
- * @ingroup guidelines
- */
-class GuidelineListBuilder extends EntityListBuilder {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $limit = FALSE;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'guidelines_list';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildHeader() {
-    $header['label'] = $this->t('Name');
-    $header['parent'] = $this->t('Parent(s)');
-    $header = $header + parent::buildHeader();
-
-    return $header;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildRow(EntityInterface $entity) {
-    /** @var \Drupal\guidelines\Entity\Guideline $entity */
-    $row['label'] = Link::createFromRoute(
-      $entity->label(),
-      'entity.guideline.canonical',
-      ['guideline' => $entity->id()]
-    )->toString();
-
-    $parents = [];
-    $parent_entities = $entity->getParents();
-    foreach ($parent_entities as $parent_entity) {
-      $parents[] = Link::createFromRoute(
-        $parent_entity->label(),
-        'entity.guideline.canonical',
-        ['guideline' => $parent_entity->id()]
-      )->toString();
-    }
-
-    $row['parent'] = [
-      'data' => [
-        '#markup' => implode(', ', $parents),
-      ],
-    ];
-
-    return $row + parent::buildRow($entity);
-  }
-
-}
diff --git a/html/modules/custom/guidelines/src/GuidelinePermissions.php b/html/modules/custom/guidelines/src/GuidelinePermissions.php
deleted file mode 100644
index 86df0e5df..000000000
--- a/html/modules/custom/guidelines/src/GuidelinePermissions.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-namespace Drupal\guidelines;
-
-use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\guidelines\Entity\Guideline;
-
-/**
- * Provides dynamic permissions for Guideline of different types.
- *
- * @ingroup guidelines
- */
-class GuidelinePermissions {
-
-  use StringTranslationTrait;
-
-  /**
-   * Returns an array of node type permissions.
-   *
-   * @return array
-   *   The Guideline by bundle permissions.
-   *   @see \Drupal\user\PermissionHandlerInterface::getPermissions()
-   */
-  public function generatePermissions() {
-    $perms = [];
-
-    foreach (Guideline::loadMultiple() as $type) {
-      $perms += $this->buildPermissions($type);
-    }
-
-    return $perms;
-  }
-
-  /**
-   * Returns a list of node permissions for a given node type.
-   *
-   * @param \Drupal\guidelines\Entity\Guideline $type
-   *   The Guideline type.
-   *
-   * @return array
-   *   An associative array of permission names and descriptions.
-   */
-  protected function buildPermissions(Guideline $type) {
-    $type_id = $type->id();
-    $type_params = ['%type_name' => $type->label()];
-
-    return [
-      "$type_id create entities" => [
-        'title' => $this->t('Create new %type_name entities', $type_params),
-      ],
-      "$type_id edit own entities" => [
-        'title' => $this->t('Edit own %type_name entities', $type_params),
-      ],
-      "$type_id edit any entities" => [
-        'title' => $this->t('Edit any %type_name entities', $type_params),
-      ],
-      "$type_id delete own entities" => [
-        'title' => $this->t('Delete own %type_name entities', $type_params),
-      ],
-      "$type_id delete any entities" => [
-        'title' => $this->t('Delete any %type_name entities', $type_params),
-      ],
-      "$type_id view revisions" => [
-        'title' => $this->t('View %type_name revisions', $type_params),
-        'description' => $this->t('To view a revision, you also need permission to view the entity item.'),
-      ],
-      "$type_id revert revisions" => [
-        'title' => $this->t('Revert %type_name revisions', $type_params),
-        'description' => $this->t('To revert a revision, you also need permission to edit the entity item.'),
-      ],
-      "$type_id delete revisions" => [
-        'title' => $this->t('Delete %type_name revisions', $type_params),
-        'description' => $this->t('To delete a revision, you also need permission to delete the entity item.'),
-      ],
-    ];
-  }
-
-}
diff --git a/html/modules/custom/guidelines/src/GuidelineStorage.php b/html/modules/custom/guidelines/src/GuidelineStorage.php
deleted file mode 100644
index 569c84e89..000000000
--- a/html/modules/custom/guidelines/src/GuidelineStorage.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace Drupal\guidelines;
-
-use Drupal\Core\Entity\Sql\SqlContentEntityStorage;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\guidelines\Entity\GuidelineInterface;
-
-/**
- * Defines the storage handler class for Guideline entities.
- *
- * This extends the base storage class, adding required special handling for
- * Guideline entities.
- *
- * @ingroup guidelines
- */
-class GuidelineStorage extends SqlContentEntityStorage implements GuidelineStorageInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function revisionIds(GuidelineInterface $entity) {
-    return $this->database->query(
-      'SELECT vid FROM {guideline_revision} WHERE id=:id ORDER BY vid',
-      [':id' => $entity->id()]
-    )->fetchCol();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function userRevisionIds(AccountInterface $account) {
-    return $this->database->query(
-      'SELECT vid FROM {guideline_field_revision} WHERE uid = :uid ORDER BY vid',
-      [':uid' => $account->id()]
-    )->fetchCol();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function countDefaultLanguageRevisions(GuidelineInterface $entity) {
-    return $this->database->query('SELECT COUNT(*) FROM {guideline_field_revision} WHERE id = :id AND default_langcode = 1', [':id' => $entity->id()])
-      ->fetchField();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function clearRevisionsLanguage(LanguageInterface $language) {
-    return $this->database->update('guideline_revision')
-      ->fields(['langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED])
-      ->condition('langcode', $language->getId())
-      ->execute();
-  }
-
-}
diff --git a/html/modules/custom/guidelines/src/GuidelineStorageInterface.php b/html/modules/custom/guidelines/src/GuidelineStorageInterface.php
deleted file mode 100644
index ab09f5118..000000000
--- a/html/modules/custom/guidelines/src/GuidelineStorageInterface.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace Drupal\guidelines;
-
-use Drupal\Core\Entity\ContentEntityStorageInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Language\LanguageInterface;
-use Drupal\guidelines\Entity\GuidelineInterface;
-
-/**
- * Defines the storage handler class for Guideline entities.
- *
- * This extends the base storage class, adding required special handling for
- * Guideline entities.
- *
- * @ingroup guidelines
- */
-interface GuidelineStorageInterface extends ContentEntityStorageInterface {
-
-  /**
-   * Gets a list of Guideline revision IDs for a specific Guideline.
-   *
-   * @param \Drupal\guidelines\Entity\GuidelineInterface $entity
-   *   The Guideline entity.
-   *
-   * @return int[]
-   *   Guideline revision IDs (in ascending order).
-   */
-  public function revisionIds(GuidelineInterface $entity);
-
-  /**
-   * Gets a list of revision IDs having a given user as Guideline author.
-   *
-   * @param \Drupal\Core\Session\AccountInterface $account
-   *   The user entity.
-   *
-   * @return int[]
-   *   Guideline revision IDs (in ascending order).
-   */
-  public function userRevisionIds(AccountInterface $account);
-
-  /**
-   * Counts the number of revisions in the default language.
-   *
-   * @param \Drupal\guidelines\Entity\GuidelineInterface $entity
-   *   The Guideline entity.
-   *
-   * @return int
-   *   The number of revisions in the default language.
-   */
-  public function countDefaultLanguageRevisions(GuidelineInterface $entity);
-
-  /**
-   * Unsets the language for all Guideline with the given language.
-   *
-   * @param \Drupal\Core\Language\LanguageInterface $language
-   *   The language object.
-   */
-  public function clearRevisionsLanguage(LanguageInterface $language);
-
-}
diff --git a/html/modules/custom/guidelines/src/GuidelineTranslationHandler.php b/html/modules/custom/guidelines/src/GuidelineTranslationHandler.php
deleted file mode 100644
index 978875e5c..000000000
--- a/html/modules/custom/guidelines/src/GuidelineTranslationHandler.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Drupal\guidelines;
-
-use Drupal\content_translation\ContentTranslationHandler;
-
-/**
- * Defines the translation handler for guideline.
- */
-class GuidelineTranslationHandler extends ContentTranslationHandler {
-
-  // Override here the needed methods from ContentTranslationHandler.
-}
diff --git a/html/modules/custom/guidelines/src/GuidelineTypeHtmlRouteProvider.php b/html/modules/custom/guidelines/src/GuidelineTypeHtmlRouteProvider.php
deleted file mode 100644
index 4476c13c6..000000000
--- a/html/modules/custom/guidelines/src/GuidelineTypeHtmlRouteProvider.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace Drupal\guidelines;
-
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Entity\Routing\AdminHtmlRouteProvider;
-
-/**
- * Provides routes for Guideline type entities.
- *
- * @see Drupal\Core\Entity\Routing\AdminHtmlRouteProvider
- * @see Drupal\Core\Entity\Routing\DefaultHtmlRouteProvider
- */
-class GuidelineTypeHtmlRouteProvider extends AdminHtmlRouteProvider {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getRoutes(EntityTypeInterface $entity_type) {
-    $collection = parent::getRoutes($entity_type);
-
-    // Provide your custom entity routes here.
-    return $collection;
-  }
-
-}
diff --git a/html/modules/custom/guidelines/src/GuidelineTypeListBuilder.php b/html/modules/custom/guidelines/src/GuidelineTypeListBuilder.php
deleted file mode 100644
index 7591a0a39..000000000
--- a/html/modules/custom/guidelines/src/GuidelineTypeListBuilder.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Drupal\guidelines;
-
-use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
-use Drupal\Core\Entity\EntityInterface;
-
-/**
- * Provides a listing of Guideline type entities.
- */
-class GuidelineTypeListBuilder extends ConfigEntityListBuilder {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildHeader() {
-    $header['label'] = $this->t('Guideline type');
-    $header['id'] = $this->t('Machine name');
-    return $header + parent::buildHeader();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildRow(EntityInterface $entity) {
-    $row['label'] = $entity->label();
-    $row['id'] = $entity->id();
-    // You probably want a few more properties here...
-    return $row + parent::buildRow($entity);
-  }
-
-}
diff --git a/html/modules/custom/guidelines/src/Plugin/Field/FieldFormatter/GuidelineFieldTargetFormatter.php b/html/modules/custom/guidelines/src/Plugin/Field/FieldFormatter/GuidelineFieldTargetFormatter.php
deleted file mode 100644
index ee446af81..000000000
--- a/html/modules/custom/guidelines/src/Plugin/Field/FieldFormatter/GuidelineFieldTargetFormatter.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-namespace Drupal\guidelines\Plugin\Field\FieldFormatter;
-
-use Drupal\Component\Utility\Html;
-use Drupal\Core\Field\FieldItemInterface;
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Field\FormatterBase;
-use Drupal\Core\Form\FormStateInterface;
-
-/**
- * Plugin implementation of the 'guideline_field_target_formatter' formatter.
- *
- * @FieldFormatter(
- *   id = "guideline_field_target_formatter",
- *   label = @Translation("Guideline field target formatter"),
- *   field_types = {
- *     "guideline_field_target_type"
- *   }
- * )
- */
-class GuidelineFieldTargetFormatter extends FormatterBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function defaultSettings() {
-    return [
-      // Implement default settings.
-    ] + parent::defaultSettings();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function settingsForm(array $form, FormStateInterface $form_state) {
-    return [
-      // Implement settings form.
-    ] + parent::settingsForm($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function settingsSummary() {
-    $summary = [];
-
-    return $summary;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function viewElements(FieldItemListInterface $items, $langcode) {
-    $elements = [];
-
-    foreach ($items as $delta => $item) {
-      $elements[$delta] = ['#markup' => $this->viewValue($item)];
-    }
-
-    return $elements;
-  }
-
-  /**
-   * Generate the output appropriate for one field item.
-   *
-   * @param \Drupal\Core\Field\FieldItemInterface $item
-   *   One field item.
-   *
-   * @return string
-   *   The textual output generated.
-   */
-  protected function viewValue(FieldItemInterface $item) {
-    // The text value has no text format assigned to it, so the user input
-    // should equal the output, including newlines.
-    return nl2br(Html::escape($item->value));
-  }
-
-}
diff --git a/html/modules/custom/guidelines/src/Plugin/Field/FieldType/GuidelineFieldTargetType.php b/html/modules/custom/guidelines/src/Plugin/Field/FieldType/GuidelineFieldTargetType.php
deleted file mode 100644
index b3d7fcee3..000000000
--- a/html/modules/custom/guidelines/src/Plugin/Field/FieldType/GuidelineFieldTargetType.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-namespace Drupal\guidelines\Plugin\Field\FieldType;
-
-use Drupal\Component\Utility\Random;
-use Drupal\Core\Field\FieldDefinitionInterface;
-use Drupal\Core\Field\FieldItemBase;
-use Drupal\Core\Field\FieldStorageDefinitionInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\StringTranslation\TranslatableMarkup;
-use Drupal\Core\TypedData\DataDefinition;
-
-/**
- * Plugin implementation of the 'guideline_field_target_type' field type.
- *
- * @FieldType(
- *   id = "guideline_field_target_type",
- *   label = @Translation("Guideline field target type"),
- *   description = @Translation("My Field Type"),
- *   default_widget = "guideline_field_target_widget",
- *   default_formatter = "guideline_field_target_formatter"
- * )
- */
-class GuidelineFieldTargetType extends FieldItemBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function defaultStorageSettings() {
-    return [
-      'enabled_entities' => [],
-    ] + parent::defaultStorageSettings();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
-    // Prevent early t() calls by using the TranslatableMarkup.
-    $properties['value'] = DataDefinition::create('string')
-      ->setLabel(new TranslatableMarkup('Target'))
-      ->setRequired(TRUE);
-
-    return $properties;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function schema(FieldStorageDefinitionInterface $field_definition) {
-    $schema = [
-      'columns' => [
-        'value' => [
-          'type' => 'varchar',
-          'length' => 255,
-          'binary' => FALSE,
-        ],
-      ],
-    ];
-
-    return $schema;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function generateSampleValue(FieldDefinitionInterface $field_definition) {
-    $random = new Random();
-    $values['value'] = $random->word(mt_rand(1, 100));
-    return $values;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function storageSettingsForm(array &$form, FormStateInterface $form_state, $has_data) {
-    $elements = [];
-
-    $elements['enabled_entities'] = [
-      '#type' => 'checkboxes',
-      '#title' => $this->t('Allowed entities'),
-      '#default_value' => $this->getSetting('enabled_entities'),
-      '#required' => FALSE,
-      '#description' => $this->t('The entities that are allowed.'),
-      '#disabled' => $has_data,
-      '#options' => [
-        'node' => $this->t('Node'),
-        'terms' => $this->t('Terms'),
-      ],
-    ];
-
-    return $elements;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isEmpty() {
-    $value = $this->get('value')->getValue();
-    return $value === NULL || $value === '';
-  }
-
-}
diff --git a/html/modules/custom/guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetWidget.php b/html/modules/custom/guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetWidget.php
deleted file mode 100644
index 94681ef1b..000000000
--- a/html/modules/custom/guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetWidget.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-
-namespace Drupal\guidelines\Plugin\Field\FieldWidget;
-
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Field\Plugin\Field\FieldWidget\OptionsButtonsWidget;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Entity\FieldableEntityInterface;
-use Drupal\Core\Field\BaseFieldDefinition;
-use Drupal\field\Entity\FieldConfig;
-
-/**
- * Plugin implementation of the 'guideline_field_target_widget' widget.
- *
- * @FieldWidget(
- *   id = "guideline_field_target_widget",
- *   module = "guidelines",
- *   label = @Translation("Guideline field target widget"),
- *   multiple_values = true,
- *   field_types = {
- *     "guideline_field_target_type"
- *   }
- * )
- */
-class GuidelineFieldTargetWidget extends OptionsButtonsWidget {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function defaultSettings() {
-    return [
-      'enabled_entities' => [],
-    ] + parent::defaultSettings();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function settingsForm(array $form, FormStateInterface $form_state) {
-    $elements = [];
-
-    $content_entities = array_keys(\Drupal::service('entity_type.repository')->getEntityTypeLabels(TRUE)['Content']);
-
-    /** @var \Drupal\Core\Entity\EntityTypeBundleInfo $entity_type_bundle_info */
-    $entity_type_bundle_info = \Drupal::service('entity_type.bundle.info');
-    $all_bundle_info = $entity_type_bundle_info->getAllBundleInfo();
-
-    $options = [];
-    foreach ($content_entities as $content_entity) {
-      $options[$content_entity] = [];
-      foreach ($all_bundle_info[$content_entity] as $bundle => $info) {
-        $options[$content_entity][$content_entity . '.' . $bundle] = $info['label'];
-      }
-    }
-
-    $elements['enabled_entities'] = [
-      '#type' => 'select',
-      '#title' => $this->t('Enabled entities'),
-      '#default_value' => $this->getSetting('enabled_entities'),
-      '#required' => FALSE,
-      '#multiple' => TRUE,
-      '#options' => $options,
-    ];
-
-    return $elements;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function settingsSummary() {
-    $summary = [];
-
-    $summary[] = $this->t('Enabled entities: @enabled_entities', [
-      '@enabled_entities' => implode(', ', array_filter($this->getSetting('enabled_entities'))),
-    ]);
-
-    return $summary;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
-    $element = parent::formElement($items, $delta, $element, $form, $form_state);
-    return $element;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getOptions(FieldableEntityInterface $entity) {
-    if (!isset($this->options)) {
-      $options = [];
-      $hidden_base_fields = [
-        'nid',
-        'uuid',
-        'vid',
-        'type',
-        'revision_timestamp',
-        'revision_uid',
-        'uid',
-        'default_langcode',
-        'revision_default',
-        'revision_translation_affected',
-      ];
-
-      /** @var \Drupal\Core\Entity\EntityFieldManager $entity_field_manager */
-      $entity_field_manager = \Drupal::service('entity_field.manager');
-
-      $enabled_entities = array_filter($this->getSetting('enabled_entities'));
-      foreach ($enabled_entities as $enabled_entity) {
-        list($entity_type, $bundle) = explode('.', $enabled_entity);
-        $field_definitions = $entity_field_manager->getFieldDefinitions($entity_type, $bundle);
-
-        foreach ($field_definitions as $field_name => $field_definition) {
-          // Skip computed, internal and read-only fields.
-          if ($field_definition->isComputed() || $field_definition->isInternal() || $field_definition->isReadOnly()) {
-            continue;
-          }
-
-          if ($field_definition instanceof BaseFieldDefinition) {
-            if (in_array($field_name, $hidden_base_fields)) {
-              continue;
-            }
-
-            /** @var \Drupal\Core\Field\BaseFieldDefinition $field_definition */
-            $key = $entity_type . '.' . $bundle . '.' . $field_name;
-            $options[$key] = $this->getBundleLabel($entity_type, $bundle) . ' > ' . $field_definition->getLabel() . ' (' . $field_name . ')';
-          }
-          elseif ($field_definition instanceof FieldConfig) {
-            /** @var \Drupal\field\Entity\FieldConfig $field_definition */
-            $key = $entity_type . '.' . $bundle . '.' . $field_name;
-            $options[$key] = $this->getBundleLabel($entity_type, $bundle) . ' > ' . $field_definition->getLabel() . ' (' . $field_name . ')';
-          }
-        }
-      }
-
-      $this->options = $options;
-    }
-
-    return $this->options;
-  }
-
-  /**
-   * Get bundle label.
-   */
-  protected function getBundleLabel($entity_type_id, $bundle) {
-    $entity_type_manager = \Drupal::entityTypeManager();
-    $entity_type = $entity_type_manager
-      ->getStorage($entity_type_id)
-      ->getEntityType();
-    $bundle_label = $entity_type_manager
-      ->getStorage($entity_type->getBundleEntityType())
-      ->load($bundle)
-      ->label();
-
-    return $entity_type->getLabel() . ' > ' . $bundle_label;
-  }
-
-}
diff --git a/html/modules/custom/guidelines/templates/guideline-content-add-list.html.twig b/html/modules/custom/guidelines/templates/guideline-content-add-list.html.twig
deleted file mode 100644
index 0dec8ebe1..000000000
--- a/html/modules/custom/guidelines/templates/guideline-content-add-list.html.twig
+++ /dev/null
@@ -1,23 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation to present a list of custom content entity types/bundles.
- *
- * Available variables:
- * - types: A collection of all the available custom entity types/bundles.
- *   Each type/bundle contains the following:
- *   - link: A link to add a content entity of this type.
- *   - description: A description of this content entity types/bundle.
- *
- * @see template_preprocess_guideline_content_add_list()
- *
- * @ingroup themeable
- */
-#}
-{% spaceless %}
-  <dl>
-    {% for type in types %}
-      <dt>{{ type.link }}</dt>
-    {% endfor %}
-  </dl>
-{% endspaceless %}
diff --git a/html/modules/custom/guidelines/templates/guideline.html.twig b/html/modules/custom/guidelines/templates/guideline.html.twig
deleted file mode 100644
index b60b6bfe4..000000000
--- a/html/modules/custom/guidelines/templates/guideline.html.twig
+++ /dev/null
@@ -1,22 +0,0 @@
-{#
-/**
- * @file guideline.html.twig
- * Default theme implementation to present Guideline data.
- *
- * This template is used when viewing Guideline pages.
- *
- *
- * Available variables:
- * - content: A list of content items. Use 'content' to print all content, or
- * - attributes: HTML attributes for the container element.
- *
- * @see template_preprocess_guideline()
- *
- * @ingroup themeable
- */
-#}
-<div{{ attributes.addClass('guideline') }}>
-  {% if content %}
-    {{- content -}}
-  {% endif %}
-</div>
diff --git a/html/modules/custom/guidelines/templates/guidelines.html.twig b/html/modules/custom/guidelines/templates/guidelines.html.twig
deleted file mode 100644
index 95722bd34..000000000
--- a/html/modules/custom/guidelines/templates/guidelines.html.twig
+++ /dev/null
@@ -1 +0,0 @@
-<!-- Add you custom twig html here -->
diff --git a/symfony.lock b/symfony.lock
index 20bbdfae9..7b81500db 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -176,6 +176,9 @@
     "drupal/google_tag": {
         "version": "1.4.0"
     },
+    "drupal/guidelines": {
+        "version": "1.0.0"
+    },
     "drupal/imageapi_optimize": {
         "version": "4.0.0-beta1"
     },

From e70dc1c0f61c5d0b26d81756bb2387d8d39120cf Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Thu, 9 Dec 2021 12:50:57 +0100
Subject: [PATCH 271/720] Remove debug classes

---
 .../src/Controller/GuidelineSinglePageController.php          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php b/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
index 50a5693e4..5bad833d4 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
@@ -157,12 +157,12 @@ protected function cleanAtags($text) {
 
     $pattern = '/\<a.+href="https:\/\/trello.com\/c\/([0-9A-Z]+)".+>/i';
     $text = preg_replace_callback($pattern, function ($matches) {
-      return '<a class="xyzzy1" href="#' . $matches[1] . '">';
+      return '<a href="#' . $matches[1] . '">';
     }, $text);
 
     $pattern = '/\<a.+href="https:\/\/guidelines.rwdev.org\/#([0-9A-Z]+).+>"/i';
     $text = preg_replace_callback($pattern, function ($matches) {
-      return '<a class="xyzzy2" href="#' . $matches[1] . '">';
+      return '<a href="#' . $matches[1] . '">';
     }, $text);
 
     return $text;

From 4c76ae8db9f31fd6e04315e9d9abe0ca721bc10f Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 9 Dec 2021 17:17:20 -0700
Subject: [PATCH 272/720] duplicate tag

---
 .../reliefweb_docstore/templates/reliefweb-file-widget.html.twig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget.html.twig b/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget.html.twig
index 73fd0bad0..58b1817dd 100644
--- a/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget.html.twig
+++ b/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget.html.twig
@@ -22,7 +22,6 @@
       {{ files }}
     </tbody>
   </table>
-  </table>
   {% endif %}
 
   {{ add_more }}

From 29d722b69c753603fb80427c4e6a118152d58244 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 9 Dec 2021 17:33:12 -0700
Subject: [PATCH 273/720] rules for file widget

---
 .../components/rw-form/rw-form--widget.css    | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
index 742649023..0ed8f5608 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
@@ -2,6 +2,7 @@
 form .js-media-library-widget .fieldset-wrapper {
   border: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
+
 form .image-widget {
   padding: 0 0 16px;
 }
@@ -78,3 +79,29 @@ form .views-field-media-library-select-form .form-type-checkbox:only-of-type {
   text-decoration: underline;
   background: var(--cd-reliefweb-brand-red--dark);
 }
+
+/* RW docstore */
+form .field--type-reliefweb-file {
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
+}
+.rw-file-widget {
+  padding: 16px;
+}
+.rw-file-widget .description {
+  margin-bottom: 1rem;
+}
+.rw-file-widget table {
+  margin-bottom: 1rem;
+}
+.rw-file-widget input[data-drupal-selector*="operations-replace"] {
+  margin-top: 0.5rem;
+}
+.rw-file-widget input[data-drupal-selector*="operations-delete"] {
+  /* --cd-highlight-red: hsl(4, 90%, 64%) */
+  --cd-primary-color-h: 4;
+  --cd-primary-color-s: 90%;
+  --cd-primary-color-l: 64%;
+  --cd-primary-color: hsl(var(--cd-primary-color-h), var(--cd-primary-color-s), var(--cd-primary-color-l));
+  /* lighten */
+  --cd-primary-color--light: hsl(var(--cd-primary-color-h), var(--cd-primary-color-s), calc(var(--cd-primary-color-l) + 10%));
+}

From c27676a21db05292fe4a85ad3065da79a8713941 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 9 Dec 2021 17:35:34 -0700
Subject: [PATCH 274/720] comments

---
 .../components/rw-form/rw-form--widget.css                     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
index 0ed8f5608..24c3d8670 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
@@ -2,7 +2,6 @@
 form .js-media-library-widget .fieldset-wrapper {
   border: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
-
 form .image-widget {
   padding: 0 0 16px;
 }
@@ -93,9 +92,11 @@ form .field--type-reliefweb-file {
 .rw-file-widget table {
   margin-bottom: 1rem;
 }
+/* Replace file button */
 .rw-file-widget input[data-drupal-selector*="operations-replace"] {
   margin-top: 0.5rem;
 }
+/* Delete file button */
 .rw-file-widget input[data-drupal-selector*="operations-delete"] {
   /* --cd-highlight-red: hsl(4, 90%, 64%) */
   --cd-primary-color-h: 4;

From 87054cc3777402a7014dfe10abe481b90ad1b759 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Mon, 13 Dec 2021 09:25:18 -0700
Subject: [PATCH 275/720] add custom toggle arrow to actions details element

---
 .../components/rw-form/rw-form--widget.css    | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
index 24c3d8670..54a10ebcd 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
@@ -105,4 +105,31 @@ form .field--type-reliefweb-file {
   --cd-primary-color: hsl(var(--cd-primary-color-h), var(--cd-primary-color-s), var(--cd-primary-color-l));
   /* lighten */
   --cd-primary-color--light: hsl(var(--cd-primary-color-h), var(--cd-primary-color-s), calc(var(--cd-primary-color-l) + 10%));
+
+  margin-top: 0.5rem;
+}
+/* Actions details element */
+.rw-file-widget summary {
+  display: flex;
+  align-items: baseline;
+  cursor: pointer;
+}
+.rw-file-widget summary > span {
+  display: inline-block;
+}
+/* Use custom icon */
+.rw-file-widget summary::-webkit-details-marker {
+  display: none;
+}
+.rw-file-widget summary::before {
+  display: inline-block;
+  overflow: hidden;
+  width: 12px;
+  height: 12px;
+  margin-right: 4px;
+  content: "";
+  background: var(--rw-icons--toggle--down--12--dark-blue);
+}
+.rw-file-widget details[open] > summary::before {
+  background: var(--rw-icons--toggle--up--12--dark-blue);
 }

From 3f7a872b6195f6b3b4af41a0a7cc7715308f39f3 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Mon, 13 Dec 2021 12:14:43 -0700
Subject: [PATCH 276/720] RW-271 remove unneeded template override in favour of
 base theme

---
 .../templates/form/datetime-wrapper.html.twig | 38 -------------------
 1 file changed, 38 deletions(-)
 delete mode 100644 html/themes/custom/common_design_subtheme/templates/form/datetime-wrapper.html.twig

diff --git a/html/themes/custom/common_design_subtheme/templates/form/datetime-wrapper.html.twig b/html/themes/custom/common_design_subtheme/templates/form/datetime-wrapper.html.twig
deleted file mode 100644
index b7a108c8a..000000000
--- a/html/themes/custom/common_design_subtheme/templates/form/datetime-wrapper.html.twig
+++ /dev/null
@@ -1,38 +0,0 @@
-{#
-/**
- * @file
- * Theme override of a datetime form wrapper.
- *
- * Available variables:
- * - content: The form element to be output, usually a datelist, or datetime.
- * - title: The title of the form element.
- * - title_attributes: HTML attributes for the title wrapper.
- * - description: Description text for the form element.
- * - required: An indicator for whether the associated form element is required.
- *
- * @see template_preprocess_datetime_wrapper()
- *
- * @todo move that to the CD base theme.
- */
-#}
-{%
-  set title_classes = [
-    'label',
-    required ? 'js-form-required',
-    required ? 'form-required',
-  ]
-%}
-{% if title %}
-  <h4{{ title_attributes.addClass(title_classes) }}>{{ title }}</h4>
-{% endif %}
-{{ content }}
-{% if errors %}
-  <div class="form-item--error-message">
-    <strong>{{ errors }}</strong>
-  </div>
-{% endif %}
-{% if description %}
-  <div{{ description_attributes.addClass('description') }}>
-    {{ description }}
-  </div>
-{% endif %}

From a9d311a08cb9cd8496fe37a43a5aec6d1036ce08 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Mon, 13 Dec 2021 12:16:33 -0700
Subject: [PATCH 277/720] RW-271 override bg colour of base theme rule

---
 .../components/rw-form/rw-form.css                     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 5cf224069..6652477c4 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -199,7 +199,7 @@ form .description {
   padding: 6px 0 0 0;
   font-size: 15px;
   font-style: italic;
-  line-height: 24px;
+  line-height: 1.5;
 }
 form .description a {
   text-decoration: underline;
@@ -429,7 +429,7 @@ form > #actions legend + .form-type-checkbox.form-item-notifications-content-dis
 
 form [data-lengthchecker-status] {
   margin-top: -2px;
-  padding: 8px 8px;
+  padding: 8px;
   background-color: var(--cd-reliefweb-pink);
   font-size: 15px;
   line-height: 1.2;
@@ -487,3 +487,9 @@ form button[value="edit"] {
   padding: 8px;
   font-size: 14px;
 }
+
+/* Inline error messages. */
+.form-item--error-message,
+.cd-form__error-message {
+  background-color: var(--cd-reliefweb-pink);
+}

From f406adc4c7101961e1274f75574c1eb18d2f74f2 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Mon, 13 Dec 2021 12:26:27 -0700
Subject: [PATCH 278/720] set font-size for error messages

---
 .../custom/common_design_subtheme/components/rw-form/rw-form.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 6652477c4..c3c609725 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -492,4 +492,5 @@ form button[value="edit"] {
 .form-item--error-message,
 .cd-form__error-message {
   background-color: var(--cd-reliefweb-pink);
+  font-size: 15px;
 }

From 7629c30fd962241fae14c981e37c630e3ddedb5d Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Mon, 13 Dec 2021 13:06:16 -0700
Subject: [PATCH 279/720] update base theme branch with latest commits

---
 composer.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.lock b/composer.lock
index c67db75aa..5ac0111e7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -12388,12 +12388,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/UN-OCHA/common_design.git",
-                "reference": "921b3b8c2c9a7518ef8b06b28236c87afb0132e9"
+                "reference": "575e8050194d6ec817c180762fb7b766d2f1d548"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/921b3b8c2c9a7518ef8b06b28236c87afb0132e9",
-                "reference": "921b3b8c2c9a7518ef8b06b28236c87afb0132e9",
+                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/575e8050194d6ec817c180762fb7b766d2f1d548",
+                "reference": "575e8050194d6ec817c180762fb7b766d2f1d548",
                 "shasum": ""
             },
             "require": {
@@ -12408,7 +12408,7 @@
                 "source": "https://github.com/UN-OCHA/common_design/tree/cd-304-forms",
                 "issues": "https://github.com/UN-OCHA/common_design/issues"
             },
-            "time": "2021-11-16T20:27:33+00:00"
+            "time": "2021-12-13T19:57:14+00:00"
         },
         {
             "name": "webflo/drupal-finder",

From 6858750f858255dfe1d99bb4dbe0c28f761fce81 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Mon, 13 Dec 2021 14:16:02 -0700
Subject: [PATCH 280/720] update base theme branch with latest commits

---
 composer.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.lock b/composer.lock
index 5ac0111e7..4689754b1 100644
--- a/composer.lock
+++ b/composer.lock
@@ -12388,12 +12388,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/UN-OCHA/common_design.git",
-                "reference": "575e8050194d6ec817c180762fb7b766d2f1d548"
+                "reference": "673f162b0b390d7a3c96bf986d6acec338617dcc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/575e8050194d6ec817c180762fb7b766d2f1d548",
-                "reference": "575e8050194d6ec817c180762fb7b766d2f1d548",
+                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/673f162b0b390d7a3c96bf986d6acec338617dcc",
+                "reference": "673f162b0b390d7a3c96bf986d6acec338617dcc",
                 "shasum": ""
             },
             "require": {
@@ -12408,7 +12408,7 @@
                 "source": "https://github.com/UN-OCHA/common_design/tree/cd-304-forms",
                 "issues": "https://github.com/UN-OCHA/common_design/issues"
             },
-            "time": "2021-12-13T19:57:14+00:00"
+            "time": "2021-12-13T21:13:16+00:00"
         },
         {
             "name": "webflo/drupal-finder",

From 374154a1f8d8e2e72f5319d38419894966b0b31b Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Mon, 13 Dec 2021 16:17:58 -0700
Subject: [PATCH 281/720] add revision confirmation forms to rule for top
 padding

---
 .../common_design_subtheme/components/rw-form/rw-form.css     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index c3c609725..0f606e37c 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -447,7 +447,9 @@ form [data-lengthchecker-status="ok"] {
 .taxonomy-term-disaster-profile-form,
 .taxonomy-term-source-user-posting-rights-form,
 .taxonomy-term-confirm-form,
-.node-confirm-form {
+.node-confirm-form,
+.node-revision-revert-confirm,
+.node-revision-delete-confirm {
   padding-top: 24px;
 }
 

From 51d8f05c2d538b0d1dea5738049f5a33efd7d766 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Mon, 13 Dec 2021 16:18:30 -0700
Subject: [PATCH 282/720] add cd-form as a dependency of rw-form

---
 .../common_design_subtheme/common_design_subtheme.libraries.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
index 5a6560915..02d5261e7 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
@@ -132,6 +132,8 @@ rw-form:
     theme:
       components/rw-form/rw-form.css: {}
       components/rw-form/rw-form--widget.css: {}
+  dependencies:
+    - common_design/cd-form
 
 rw-guidelines:
   css:

From 17cc85dfdf3960ac7c4bac434f9d6d97fb680df9 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Mon, 13 Dec 2021 16:23:44 -0700
Subject: [PATCH 283/720] update base theme branch with latest commits

---
 composer.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.lock b/composer.lock
index 4689754b1..15f5c13ea 100644
--- a/composer.lock
+++ b/composer.lock
@@ -12388,12 +12388,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/UN-OCHA/common_design.git",
-                "reference": "673f162b0b390d7a3c96bf986d6acec338617dcc"
+                "reference": "105127ae1a84d21f33a41fec3f6f99ef950e71d7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/673f162b0b390d7a3c96bf986d6acec338617dcc",
-                "reference": "673f162b0b390d7a3c96bf986d6acec338617dcc",
+                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/105127ae1a84d21f33a41fec3f6f99ef950e71d7",
+                "reference": "105127ae1a84d21f33a41fec3f6f99ef950e71d7",
                 "shasum": ""
             },
             "require": {
@@ -12408,7 +12408,7 @@
                 "source": "https://github.com/UN-OCHA/common_design/tree/cd-304-forms",
                 "issues": "https://github.com/UN-OCHA/common_design/issues"
             },
-            "time": "2021-12-13T21:13:16+00:00"
+            "time": "2021-12-13T23:19:33+00:00"
         },
         {
             "name": "webflo/drupal-finder",

From 7488b29461b4e64dec7605213f0c420d4f91aef6 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 14 Dec 2021 12:59:15 +0100
Subject: [PATCH 284/720] RW-276: Build list of short links

---
 .../reliefweb_guidelines.module               | 67 ++++++++++++++++++-
 1 file changed, 66 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
index 9f8574c4a..dd477fee4 100644
--- a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
@@ -39,6 +39,7 @@ function reliefweb_guidelines_theme() {
  * Migrate datas from Trello.
  */
 function reliefweb_guidelines_migrate_from_trello() {
+  $shortlinks = [];
   $config = \Drupal::config('reliefweb_trello.settings');
   $key = $config->get('key');
   $token = $config->get('token');
@@ -62,6 +63,12 @@ function reliefweb_guidelines_migrate_from_trello() {
     // Get cards.
     $cards = $trello->getCards($list['id']);
     foreach ($cards as $weight_card => $card) {
+      $shortlink = [
+        'short_link' => $card['shortLink'],
+        'guideline_id' => 0,
+        'links_found' => reliefweb_guidelines_extract_links($card['desc']),
+      ];
+
       // Extract and fetch images.
       $files = guidelines_extract_images($card['desc']);
 
@@ -170,6 +177,8 @@ function reliefweb_guidelines_migrate_from_trello() {
       $guideline = Guideline::create($values);
       $guideline->setParents([$guideline_list]);
       $guideline->save();
+
+      $shortlink['guideline_id'] = $guideline->id();
     }
   }
 }
@@ -253,6 +262,63 @@ function guidelines_fetch_image($url, &$files) {
   return $file->createFileUrl();
 }
 
+/**
+ * Extract possible shortlinks.
+ */
+function reliefweb_guidelines_extract_links($text) {
+  if (empty($text)) {
+    return [];
+  }
+
+  $shortlinks = [];
+  $matches = [];
+
+  $pattern = '/[^!]?\[([^\]]+)\]\((https:\/\/guidelines\.rwdev\.org.*?)\)/i';
+  preg_match_all($pattern, $text, $matches);
+  foreach ($matches[0] as $key => $match) {
+    $shortlinks[] = [
+      'string' => $match,
+      'title' => $matches[1][$key],
+      'url' => $matches[2][$key],
+      'short' => reliefweb_guidelines_extract_shortlink($matches[2][$key]),
+    ];
+  }
+
+  $pattern = '/[^!]?\[([^\]]+)\]\((https:\/\/trello\.com.*?)\)/i';
+  preg_match_all($pattern, $text, $matches);
+  foreach ($matches[0] as $key => $match) {
+    $shortlinks[] = [
+      'string' => $match,
+      'title' => $matches[1][$key],
+      'url' => $matches[2][$key],
+      'short' => reliefweb_guidelines_extract_shortlink($matches[2][$key]),
+    ];
+  }
+
+  return $shortlinks;
+}
+
+/**
+ * Extract shortlink.
+ */
+function reliefweb_guidelines_extract_shortlink($text) {
+  $matches = [];
+
+  $pattern = '/\/#([0-9A-Z]+)/i';
+  preg_match($pattern, $text, $matches);
+  if ($matches) {
+    return $matches[1];
+  }
+
+  $pattern = '/\/c\/([0-9A-Z]+)/i';
+  preg_match($pattern, $text, $matches);
+  if ($matches) {
+    return $matches[1];
+  }
+
+  return 'not found';
+}
+
 /**
  * Delete all guidelines.
  */
@@ -266,7 +332,6 @@ function _reliefweb_guidelines_delete_all() {
   foreach ($guideline_types as $guideline_type) {
     $guideline_type->delete();
   }
-
 }
 
 /**

From b54697bcfcf5908bd56485f1d71ec177084bee0a Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 14 Dec 2021 15:31:35 +0100
Subject: [PATCH 285/720] RW-276: Prefill short link

---
 .../reliefweb_guidelines.module               | 68 ++++++++++++++++++-
 .../GuidelineSinglePageController.php         | 17 ++---
 2 files changed, 72 insertions(+), 13 deletions(-)

diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
index dd477fee4..ba427e42f 100644
--- a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
@@ -5,7 +5,9 @@
  * Contains integration for guidelines.
  */
 
+use Drupal\Component\Utility\Random;
 use Drupal\Core\File\FileSystemInterface;
+use Drupal\Core\Form\FormStateInterface;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\guidelines\Entity\Guideline;
 use Drupal\guidelines\Entity\GuidelineType;
@@ -179,6 +181,45 @@ function reliefweb_guidelines_migrate_from_trello() {
       $guideline->save();
 
       $shortlink['guideline_id'] = $guideline->id();
+      $shortlinks[$shortlink['short_link']] = $shortlink;
+    }
+  }
+
+  // Fix shortlinks.
+  foreach ($shortlinks as $shortlink) {
+    if (empty($shortlink['links_found'])) {
+      continue;
+    }
+
+    $guideline = Guideline::load($shortlink['guideline_id']);
+    $text = $guideline->get('field_description')->value;
+    $replaced = FALSE;
+
+    print_r($shortlink);
+    foreach ($shortlink['links_found'] as $link_found) {
+      // Skip if short link is unknown.
+      if (!isset($shortlinks[$link_found['short']])) {
+        continue;
+      }
+
+      // Build new link.
+      $new = implode('', [
+        '[',
+        $link_found['title'] ?? '/admin/structure/guideline/' . $shortlinks[$link_found['short']]['guideline_id'],
+        ']',
+        '(',
+        '/admin/structure/guideline/' . $shortlinks[$link_found['short']]['guideline_id'],
+        ')',
+      ]);
+
+      // Replace it.
+      $text = str_replace($link_found['string'], $new, $text);
+      $replaced = TRUE;
+    }
+
+    if ($replaced) {
+      $guideline->field_description->value = $text;
+      $guideline->save();
     }
   }
 }
@@ -273,11 +314,12 @@ function reliefweb_guidelines_extract_links($text) {
   $shortlinks = [];
   $matches = [];
 
+  // Skip images.
   $pattern = '/[^!]?\[([^\]]+)\]\((https:\/\/guidelines\.rwdev\.org.*?)\)/i';
   preg_match_all($pattern, $text, $matches);
   foreach ($matches[0] as $key => $match) {
     $shortlinks[] = [
-      'string' => $match,
+      'string' => substr($match, 1),
       'title' => $matches[1][$key],
       'url' => $matches[2][$key],
       'short' => reliefweb_guidelines_extract_shortlink($matches[2][$key]),
@@ -288,7 +330,7 @@ function reliefweb_guidelines_extract_links($text) {
   preg_match_all($pattern, $text, $matches);
   foreach ($matches[0] as $key => $match) {
     $shortlinks[] = [
-      'string' => $match,
+      'string' => substr($match, 1),
       'title' => $matches[1][$key],
       'url' => $matches[2][$key],
       'short' => reliefweb_guidelines_extract_shortlink($matches[2][$key]),
@@ -362,3 +404,25 @@ function reliefweb_guidelines_guideline_json_fields_alter(&$description, $guidel
     $description['link'] = '/guidelines#' . $guideline->field_short_link->value;
   }
 }
+
+/**
+ * Implements hook_form_FROM_ID_alter().
+ */
+function reliefweb_guidelines_form_guideline_field_guideline_add_form_alter(array &$form, FormStateInterface $form_state, $form_id) {
+  if (isset($form['field_short_link'])) {
+    if (empty($form['field_short_link']['widget'][0]['value']['#default_value'])) {
+      $random = new Random();
+      $form['field_short_link']['widget'][0]['value']['#default_value'] = $random->name();
+    }
+    else {
+      $form['field_short_link']['#access'] = FALSE;
+    }
+  }
+}
+
+/**
+ * Implements hook_form_FROM_ID_alter().
+ */
+function reliefweb_guidelines_form_guideline_field_guideline_edit_form_alter(array &$form, FormStateInterface $form_state, $form_id) {
+  reliefweb_guidelines_form_guideline_field_guideline_add_form_alter($form, $form_state, $form_id);
+}
diff --git a/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php b/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
index 5bad833d4..5939949d2 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
@@ -118,7 +118,7 @@ public function getPageContent() {
           '#id' => $guideline->hasField('field_short_link') ? $guideline->field_short_link->value : Html::getUniqueId($guideline->field_title->value),
           '#title' => $guideline->field_title->value,
           '#title_prefix' => $guidelines[$parents[0]]->field_title->value . ' > ',
-          '#description' => $this->cleanAtags($guideline->hasField('field_description') ? check_markup($guideline->field_description->value, $guideline->field_description->format) : ''),
+          '#description' => $this->cleanAtags($guideline->hasField('field_description') ? check_markup($guideline->field_description->value, $guideline->field_description->format) : '', $guidelines),
         ];
       }
       else {
@@ -127,7 +127,7 @@ public function getPageContent() {
           '#id' => $guideline->hasField('field_short_link') ? $guideline->field_short_link->value : Html::getUniqueId($guideline->field_title->value),
           '#title' => $guideline->field_title->value,
           '#title_prefix' => '',
-          '#description' => $this->cleanAtags($guideline->hasField('field_description') ? check_markup($guideline->field_description->value, $guideline->field_description->format) : ''),
+          '#description' => $this->cleanAtags($guideline->hasField('field_description') ? check_markup($guideline->field_description->value, $guideline->field_description->format) : '', $guidelines),
           '#children' => [],
         ];
       }
@@ -150,19 +150,14 @@ public function getPageContent() {
   /**
    * Clean A-tags.
    */
-  protected function cleanAtags($text) {
+  protected function cleanAtags($text, $guidelines) {
     if (empty($text)) {
       return $text;
     }
 
-    $pattern = '/\<a.+href="https:\/\/trello.com\/c\/([0-9A-Z]+)".+>/i';
-    $text = preg_replace_callback($pattern, function ($matches) {
-      return '<a href="#' . $matches[1] . '">';
-    }, $text);
-
-    $pattern = '/\<a.+href="https:\/\/guidelines.rwdev.org\/#([0-9A-Z]+).+>"/i';
-    $text = preg_replace_callback($pattern, function ($matches) {
-      return '<a href="#' . $matches[1] . '">';
+    $pattern = '/\/admin\/structure\/guideline\/([0-9]+)/i';
+    $text = preg_replace_callback($pattern, function ($matches) use ($guidelines) {
+      return '#' . $guidelines[$matches[1]]->field_short_link->value;
     }, $text);
 
     return $text;

From 8b3d4a74e54e4832149e14d8509a41a30de526ca Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 14 Dec 2021 15:34:49 +0100
Subject: [PATCH 286/720] RW-276: Empty links

---
 .../custom/reliefweb_guidelines/reliefweb_guidelines.module   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
index ba427e42f..ce6f80f68 100644
--- a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
@@ -320,7 +320,7 @@ function reliefweb_guidelines_extract_links($text) {
   foreach ($matches[0] as $key => $match) {
     $shortlinks[] = [
       'string' => substr($match, 1),
-      'title' => $matches[1][$key],
+      'title' => !empty($matches[1][$key]) ? $matches[1][$key] : $matches[2][$key],
       'url' => $matches[2][$key],
       'short' => reliefweb_guidelines_extract_shortlink($matches[2][$key]),
     ];
@@ -331,7 +331,7 @@ function reliefweb_guidelines_extract_links($text) {
   foreach ($matches[0] as $key => $match) {
     $shortlinks[] = [
       'string' => substr($match, 1),
-      'title' => $matches[1][$key],
+      'title' => !empty($matches[1][$key]) ? $matches[1][$key] : $matches[2][$key],
       'url' => $matches[2][$key],
       'short' => reliefweb_guidelines_extract_shortlink($matches[2][$key]),
     ];

From 36e7d25915aa9024ac949016bb35bfd6bb6d5c78 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 14 Dec 2021 12:37:11 -0700
Subject: [PATCH 287/720] revert dependency as it is too disruptive and was
 only added for the revisions table which may be dropped

---
 .../common_design_subtheme/common_design_subtheme.libraries.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
index 02d5261e7..5a6560915 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
@@ -132,8 +132,6 @@ rw-form:
     theme:
       components/rw-form/rw-form.css: {}
       components/rw-form/rw-form--widget.css: {}
-  dependencies:
-    - common_design/cd-form
 
 rw-guidelines:
   css:

From bff59ca6d640c543a6ea090fd5c41669927d6e75 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 14 Dec 2021 13:24:21 -0700
Subject: [PATCH 288/720] update base theme branch with latest commits

---
 composer.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.lock b/composer.lock
index 15f5c13ea..3734f9345 100644
--- a/composer.lock
+++ b/composer.lock
@@ -12388,12 +12388,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/UN-OCHA/common_design.git",
-                "reference": "105127ae1a84d21f33a41fec3f6f99ef950e71d7"
+                "reference": "811ad8bc26d8c90eeeebae8ff4efa686c201f9c6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/105127ae1a84d21f33a41fec3f6f99ef950e71d7",
-                "reference": "105127ae1a84d21f33a41fec3f6f99ef950e71d7",
+                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/811ad8bc26d8c90eeeebae8ff4efa686c201f9c6",
+                "reference": "811ad8bc26d8c90eeeebae8ff4efa686c201f9c6",
                 "shasum": ""
             },
             "require": {
@@ -12408,7 +12408,7 @@
                 "source": "https://github.com/UN-OCHA/common_design/tree/cd-304-forms",
                 "issues": "https://github.com/UN-OCHA/common_design/issues"
             },
-            "time": "2021-12-13T23:19:33+00:00"
+            "time": "2021-12-14T20:22:03+00:00"
         },
         {
             "name": "webflo/drupal-finder",

From 7cd02b3b22d72cc696d8ca4687a47f8064c4bc6d Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 14 Dec 2021 15:17:37 -0700
Subject: [PATCH 289/720] center the PDF preview in the table cell

---
 .../components/rw-form/rw-form--widget.css                     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
index 54a10ebcd..55b02c6e4 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
@@ -92,6 +92,9 @@ form .field--type-reliefweb-file {
 .rw-file-widget table {
   margin-bottom: 1rem;
 }
+.rw-file-widget .rw-file-widget-item__preview > div:first-child {
+  text-align: center;
+}
 /* Replace file button */
 .rw-file-widget input[data-drupal-selector*="operations-replace"] {
   margin-top: 0.5rem;

From a82b089ef37715af08861ccc85b132cc0a8fa405 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Wed, 15 Dec 2021 09:14:25 +0100
Subject: [PATCH 290/720] RW-276: Fix links in json popup

---
 .../reliefweb_guidelines.module               |  3 +++
 .../reliefweb_guidelines.routing.yml          |  8 +++++++
 .../GuidelineSinglePageController.php         | 21 +++++++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
index ce6f80f68..3668b672f 100644
--- a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
@@ -403,6 +403,9 @@ function reliefweb_guidelines_guideline_json_fields_alter(&$description, $guidel
   if ($guideline->hasField('field_short_link')) {
     $description['link'] = '/guidelines#' . $guideline->field_short_link->value;
   }
+
+  // Replace links to guidelines.
+  $description['content'] = str_replace('/admin/structure/guideline/', '/guidelines/', $description['content']);
 }
 
 /**
diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.routing.yml b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.routing.yml
index 37ce60841..b79457e02 100644
--- a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.routing.yml
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.routing.yml
@@ -5,3 +5,11 @@ reliefweb_guidelines.guidelines:
     _controller: '\Drupal\reliefweb_guidelines\Controller\GuidelineSinglePageController::getPageContent'
   requirements:
     _permission: 'access content'
+reliefweb_guidelines.guidelines_redirect:
+  path: '/guidelines/{guideline_id}'
+  defaults:
+    _title: 'ReliefWeb guidelines'
+    _controller: '\Drupal\reliefweb_guidelines\Controller\GuidelineSinglePageController::redirectToPage'
+  requirements:
+    _permission: 'access content'
+    guideline_id: \d+
diff --git a/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php b/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
index 5939949d2..20a38e4fb 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
@@ -92,6 +92,27 @@ public static function create(ContainerInterface $container) {
     );
   }
 
+  /**
+   * Redirect based on guideline Id.
+   */
+  public function redirectToPage($guideline_id) {
+    $storage = $this->entityTypeManager->getStorage('guideline');
+    /** @var \Drupal\guidelines\Entity\Guideline $guideline */
+    $guideline = $storage->load($guideline_id);
+
+    if (!$guideline) {
+      return $this->redirect('reliefweb_guidelines.guidelines');
+    }
+
+    if ($guideline->hasField('field_short_link')) {
+      return $this->redirect('reliefweb_guidelines.guidelines', [], [
+        'fragment' => $guideline->field_short_link->value,
+      ]);
+    }
+
+    return $this->redirect('reliefweb_guidelines.guidelines');
+  }
+
   /**
    * Get the page content.
    *

From 204cfea1d8889a054b60f32dab7f537b4cadd544 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 15 Dec 2021 12:28:29 +0000
Subject: [PATCH 291/720] [RW-159] Add heading transformation handling to the
 WYSIWYG editor

---
 .../config/schema/reliefweb_fields.schema.yml | 11 +++
 .../reliefweb_formatted_text/plugin.js        | 80 +++++++++++++++
 .../CKEditorPlugin/ReliefWebFormattedText.php | 60 ++++++++++++
 .../FieldWidget/ReliefWebFormattedText.php    | 97 +++++++++++++++++--
 .../Plugin/Filter/ReliefWebFormattedText.php  | 29 ++++++
 5 files changed, 268 insertions(+), 9 deletions(-)
 create mode 100644 html/modules/custom/reliefweb_fields/js/plugins/reliefweb_formatted_text/plugin.js
 create mode 100644 html/modules/custom/reliefweb_fields/src/Plugin/CKEditorPlugin/ReliefWebFormattedText.php
 create mode 100644 html/modules/custom/reliefweb_fields/src/Plugin/Filter/ReliefWebFormattedText.php

diff --git a/html/modules/custom/reliefweb_fields/config/schema/reliefweb_fields.schema.yml b/html/modules/custom/reliefweb_fields/config/schema/reliefweb_fields.schema.yml
index 15cd3282e..14d3f1df8 100644
--- a/html/modules/custom/reliefweb_fields/config/schema/reliefweb_fields.schema.yml
+++ b/html/modules/custom/reliefweb_fields/config/schema/reliefweb_fields.schema.yml
@@ -11,3 +11,14 @@ field.widget.settings.reliefweb_entity_reference_select:
       sequence:
         - type: string
           label: 'Extra data'
+
+field.widget.settings.reliefweb_formatted_text:
+  type: mapping
+  label: 'ReliefWeb Formatted Text widget settings'
+  mapping:
+    max_heading_level:
+      type: integer
+      label: 'Maximum heading level'
+    strip_embedded_content:
+      type: boolean
+      label: 'Strip embedded content'
diff --git a/html/modules/custom/reliefweb_fields/js/plugins/reliefweb_formatted_text/plugin.js b/html/modules/custom/reliefweb_fields/js/plugins/reliefweb_formatted_text/plugin.js
new file mode 100644
index 000000000..83a34b406
--- /dev/null
+++ b/html/modules/custom/reliefweb_fields/js/plugins/reliefweb_formatted_text/plugin.js
@@ -0,0 +1,80 @@
+/* global CKEDITOR */
+(function (CKEDITOR) {
+  'use strict';
+
+  // Filter transformation for headings.
+  function createHeadingTransformation(element, tag) {
+    return [
+      {
+        element: element,
+        right: function (element, tools) {
+          tools.transform(element, tag);
+
+          // Wrap headings changed to `<strong>` elements into `<p>` elements
+          // so they are not displayed inline.
+          if (tag === 'strong' && typeof element.clone !== 'undefined') {
+            element.wrapWith(new CKEDITOR.htmlParser.element('p')); // eslint-disable-line new-cap
+          }
+        }
+      }
+    ];
+  }
+
+  // Add a plugin to apply transformations to the "reliefweb_formatted_text"
+  // fields.
+  CKEDITOR.plugins.add('reliefweb_formatted_text', {
+    // Disable text styles and remove unallowed headings.
+    // We need to do that in the `beforeInit` function otherwise changes don't
+    // apply.
+    beforeInit: function (editor) {
+      var element = editor.element;
+      if (element && element.hasAttribute('data-max-heading-level')) {
+        // Get the maximum heading level allowed for the field.
+        var maxHeadingLevel = parseInt(element.getAttribute('data-max-heading-level'), 10);
+
+        // Get the list of tags available as text styles.
+        var formatTags = editor.config.format_tags.split(';');
+
+        // Disable heading text styles and remove unallowed headings.
+        for (var i = 1; i <= 6; i++) {
+          if (i < maxHeadingLevel) {
+            // Ensure the heading before the max level are not allowed.
+            delete editor.config.allowedContent['h' + i];
+
+            // Remove them from the list of available text styles.
+            var index = formatTags.indexOf('h' + i);
+            if (index !== -1) {
+              formatTags.splice(index, 1);
+            }
+          }
+        }
+
+        // Update the list of available text styles.
+        editor.config.format_tags = formatTags.join(';'); // eslint-disable-line camelcase
+      }
+    },
+
+    // Add heading transformations.
+    // We need to do that in the `init` function so that the `parseFilter`
+    // editor property is available to add the transformations to.
+    init: function (editor) {
+      var element = editor.element;
+      if (element && element.hasAttribute('data-max-heading-level')) {
+        // Get the maximum heading level allowed for the field.
+        var maxHeadingLevel = parseInt(element.getAttribute('data-max-heading-level'), 10);
+
+        // Add the heading transformations.
+        var transformations = [];
+        for (var i = 1; i <= 6; i++) {
+          var level = i + maxHeadingLevel - 1;
+          var tag = level > 6 ? 'strong' : 'h' + level;
+
+          // Add the heading transformation.
+          transformations.push(createHeadingTransformation('h' + i, tag));
+        }
+        editor.pasteFilter.addTransformations(transformations);
+      }
+    }
+  });
+
+})(CKEDITOR);
diff --git a/html/modules/custom/reliefweb_fields/src/Plugin/CKEditorPlugin/ReliefWebFormattedText.php b/html/modules/custom/reliefweb_fields/src/Plugin/CKEditorPlugin/ReliefWebFormattedText.php
new file mode 100644
index 000000000..fa5c121df
--- /dev/null
+++ b/html/modules/custom/reliefweb_fields/src/Plugin/CKEditorPlugin/ReliefWebFormattedText.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Drupal\reliefweb_fields\Plugin\CKEditorPlugin;
+
+use Drupal\ckeditor\CKEditorPluginBase;
+use Drupal\ckeditor\CKEditorPluginContextualInterface;
+use Drupal\editor\Entity\Editor;
+
+/**
+ * Defines the "reliefweb_formatted_text" plugin.
+ *
+ * @CKEditorPlugin(
+ *   id = "reliefweb_formatted_text",
+ *   label = @Translation("ReliefWeb Formatted Text CKEditor plugin")
+ * )
+ */
+class ReliefWebFormattedText extends CKEditorPluginBase implements CKEditorPluginContextualInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function isInternal() {
+    return FALSE;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function isEnabled(Editor $editor) {
+    if (!$editor->hasAssociatedFilterFormat()) {
+      return FALSE;
+    }
+
+    /** @var \Drupal\filter\FilterFormatInterface|null $format */
+    $format = $editor->getFilterFormat();
+    return !empty($format) && !empty($format->filters('reliefweb_formatted_text')->status);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getButtons() {
+    return [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFile() {
+    return drupal_get_path('module', 'reliefweb_fields') . '/js/plugins/reliefweb_formatted_text/plugin.js';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getConfig(Editor $editor) {
+    return [];
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebFormattedText.php b/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebFormattedText.php
index 137345dfb..48e16bdde 100644
--- a/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebFormattedText.php
+++ b/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebFormattedText.php
@@ -23,6 +23,49 @@
  */
 class ReliefWebFormattedText extends TextareaWidget {
 
+  /**
+   * {@inheritdoc}
+   */
+  public static function defaultSettings() {
+    return [
+      'max_heading_level' => 2,
+      'strip_embedded_content' => TRUE,
+    ] + parent::defaultSettings();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function settingsForm(array $form, FormStateInterface $form_state) {
+    $element = parent::settingsForm($form, $form_state);
+    $element['max_heading_level'] = [
+      '#type' => 'select',
+      '#title' => $this->t('Maximum heading level'),
+      '#options' => array_combine(range(1, 6), range(1, 6)),
+      '#default_value' => $this->getSetting('max_heading_level'),
+    ];
+    $element['strip_embedded_content'] = [
+      '#type' => 'checkbox',
+      '#title' => $this->t('Strip embedded content'),
+      '#default_value' => !empty($this->getSetting('strip_embedded_content')),
+    ];
+    return $element;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function settingsSummary() {
+    $summary = parent::settingsSummary();
+    $summary[] = $this->t('Maximum heading level: @max_heading_level', [
+      '@max_heading_level' => $this->getSetting('max_heading_level'),
+    ]);
+    $summary[] = $this->t('Strip embedded content: @strip_embedded_content', [
+      '@strip_embedded_content' => !empty($this->getSetting('strip_embedded_content')) ? $this->t('Yes') : $this->t('No'),
+    ]);
+    return $summary;
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -31,10 +74,15 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
 
     // Convert the value to HTML to work with the editor.
     $item = $items[$delta];
-    if ($item->format === 'markdown_editor') {
-      $element['#default_value'] = check_markup($item->value, $item->format);
+    if (!empty($item->format) && !empty($item->value) && static::shouldConversionApply($item->format)) {
+      $html = check_markup($item->value, $item->format);
+      $element['#default_value'] = $this->sanitizeHtml($html);
     }
 
+    // Add the attribute with the maximum heading level so the CKeditor
+    // plugin can update the available text styles and add heading conversions.
+    $element['#attributes']['data-max-heading-level'] = $this->getSetting('max_heading_level');
+
     return $element;
   }
 
@@ -44,13 +92,9 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
   public function massageFormValues(array $values, array $form, FormStateInterface $form_state) {
     // Converted the values from HTML to markdown.
     foreach ($values as $delta => $value) {
-      if (isset($value['format']) && $value['format'] === 'markdown_editor' && empty($value['_converted']) && !empty($value['value'])) {
+      if (isset($value['format']) && static::shouldConversionApply($value['format']) && empty($value['_converted']) && !empty($value['value'])) {
         // Sanitize the HTML string.
-        $sanitizer = new HtmlSanitizer();
-        $text = $sanitizer->sanitizeHtml($value['value']);
-
-        // Remove embedded content.
-        $text = TextHelper::stripEmbeddedContent($text);
+        $html = $this->sanitizeHtml(trim($value['value']));
 
         // Convert to markdown.
         $converter = new HtmlConverter();
@@ -59,7 +103,7 @@ public function massageFormValues(array $values, array $form, FormStateInterface
         $converter->getConfig()->setOption('header_style', 'atx');
         $converter->getConfig()->setOption('strip_placeholder_links', TRUE);
 
-        $value['value'] = trim($converter->convert($text));
+        $value['value'] = trim($converter->convert($html));
         $value['_converted'] = TRUE;
         $values[$delta] = $value;
       }
@@ -67,4 +111,39 @@ public function massageFormValues(array $values, array $form, FormStateInterface
     return $values;
   }
 
+  /**
+   * Sanitize a HTML string.
+   *
+   * @param string $html
+   *   HTML string.
+   *
+   * @return string
+   *   Sanitized HTML string.
+   */
+  public function sanitizeHtml($html) {
+    // Sanitize the HTML string.
+    $heading_offset = $this->getSetting('max_heading_level') - 1;
+    $html = HtmlSanitizer::sanitize($html, FALSE, $heading_offset);
+
+    // Remove embedded content.
+    if (!empty($this->getSetting('strip_embedded_content'))) {
+      $html = TextHelper::stripEmbeddedContent($html);
+    }
+    return $html;
+  }
+
+  /**
+   * Check if the markdown/HTML conversion should apply.
+   *
+   * @param string $format_id
+   *   Text format id.
+   *
+   * @return bool
+   *   TRUE if we should apply the conversion.
+   */
+  public static function shouldConversionApply($format_id) {
+    $formats = filter_formats(\Drupal::currentUser());
+    return isset($formats[$format_id]) && !empty($formats[$format_id]->filters('reliefweb_formatted_text')->status);
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_fields/src/Plugin/Filter/ReliefWebFormattedText.php b/html/modules/custom/reliefweb_fields/src/Plugin/Filter/ReliefWebFormattedText.php
new file mode 100644
index 000000000..68f5c6e86
--- /dev/null
+++ b/html/modules/custom/reliefweb_fields/src/Plugin/Filter/ReliefWebFormattedText.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\reliefweb_fields\Plugin\Filter;
+
+use Drupal\filter\FilterProcessResult;
+use Drupal\filter\Plugin\FilterBase;
+
+/**
+ * Provides a filter flag for ReliefWeb formatted text manipulations.
+ *
+ * @Filter(
+ *   id = "reliefweb_formatted_text",
+ *   title = @Translation("ReliefWeb Formatted Text"),
+ *   description = @Translation("Flag to enable ReliefWeb formatted text manipulations."),
+ *   type = Drupal\filter\Plugin\FilterInterface::TYPE_MARKUP_LANGUAGE
+ * )
+ */
+class ReliefWebFormattedText extends FilterBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function process($text, $langcode) {
+    // We don't do anything as this filter is just to enable the ReliefWeb
+    // formatted text manipulations.
+    return new FilterProcessResult($text);
+  }
+
+}

From cbb4766429a73ac766822a3b5719148e8b8f01e8 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 15 Dec 2021 12:29:26 +0000
Subject: [PATCH 292/720] [RW-159] Remove 'remove format' from editor as it
 doesn't work well

---
 config/editor.editor.markdown_editor.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/editor.editor.markdown_editor.yml b/config/editor.editor.markdown_editor.yml
index e2312b568..4e84e8d84 100644
--- a/config/editor.editor.markdown_editor.yml
+++ b/config/editor.editor.markdown_editor.yml
@@ -33,7 +33,6 @@ settings:
           items:
             - Undo
             - Redo
-            - RemoveFormat
         -
           name: Paste
           items:

From d8f361fbc9c05d1ae8fc8fbf0c830fb4fd1e420f Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 15 Dec 2021 12:30:47 +0000
Subject: [PATCH 293/720] [RW-159] Add flag fitler to markdown_editor text
 format to enable CKeditor plugin to handle headings

---
 config/filter.format.markdown_editor.yml | 19 ++++++++-----------
 config/filter.format.token_markdown.yml  |  4 ++--
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/config/filter.format.markdown_editor.yml b/config/filter.format.markdown_editor.yml
index a3800c547..651ef7838 100644
--- a/config/filter.format.markdown_editor.yml
+++ b/config/filter.format.markdown_editor.yml
@@ -3,11 +3,11 @@ langcode: en
 status: true
 dependencies:
   module:
-    - media
+    - reliefweb_fields
     - reliefweb_utility
 name: 'Markdown with Editor'
 format: markdown_editor
-weight: 0
+weight: -6
 filters:
   filter_html:
     id: filter_html
@@ -24,15 +24,6 @@ filters:
     status: true
     weight: 10
     settings: {  }
-  media_embed:
-    id: media_embed
-    provider: media
-    status: false
-    weight: 100
-    settings:
-      default_view_mode: default
-      allowed_media_types: {  }
-      allowed_view_modes: {  }
   filter_markdown:
     id: filter_markdown
     provider: reliefweb_utility
@@ -46,3 +37,9 @@ filters:
     weight: 0
     settings:
       replace_empty: '0'
+  reliefweb_formatted_text:
+    id: reliefweb_formatted_text
+    provider: reliefweb_fields
+    status: true
+    weight: 0
+    settings: {  }
diff --git a/config/filter.format.token_markdown.yml b/config/filter.format.token_markdown.yml
index 3076ba01a..cf6bc1e49 100644
--- a/config/filter.format.token_markdown.yml
+++ b/config/filter.format.token_markdown.yml
@@ -7,7 +7,7 @@ dependencies:
     - reliefweb_utility
 name: 'Token & Markdown'
 format: token_markdown
-weight: 0
+weight: -7
 filters:
   filter_htmlcorrector:
     id: filter_htmlcorrector
@@ -31,8 +31,8 @@ filters:
     weight: -45
     settings:
       default_view_mode: default
-      allowed_media_types: {  }
       allowed_view_modes: {  }
+      allowed_media_types: {  }
   filter_markdown:
     id: filter_markdown
     provider: reliefweb_utility

From 47e252b50d8233c98905a7b3e6c9800f2d5e1c29 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 15 Dec 2021 12:32:13 +0000
Subject: [PATCH 294/720] [RW-159] Update job and training body and how to
 apply/register field form settings to handle headings

---
 config/core.entity_form_display.node.job.default.yml      | 8 ++++++--
 config/core.entity_form_display.node.training.default.yml | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/config/core.entity_form_display.node.job.default.yml b/config/core.entity_form_display.node.job.default.yml
index fe116c747..2868c4240 100644
--- a/config/core.entity_form_display.node.job.default.yml
+++ b/config/core.entity_form_display.node.job.default.yml
@@ -29,8 +29,10 @@ content:
   body:
     weight: 9
     settings:
-      rows: 20
+      rows: '20'
       placeholder: ''
+      max_heading_level: 2
+      strip_embedded_content: true
     third_party_settings:
       allowed_formats:
         hide_help: '1'
@@ -90,8 +92,10 @@ content:
   field_how_to_apply:
     weight: 10
     settings:
-      rows: 10
+      rows: '10'
       placeholder: ''
+      max_heading_level: 3
+      strip_embedded_content: true
     third_party_settings:
       allowed_formats:
         hide_help: '1'
diff --git a/config/core.entity_form_display.node.training.default.yml b/config/core.entity_form_display.node.training.default.yml
index a0c5b7ea7..b0467d19a 100644
--- a/config/core.entity_form_display.node.training.default.yml
+++ b/config/core.entity_form_display.node.training.default.yml
@@ -35,8 +35,10 @@ content:
   body:
     weight: 15
     settings:
-      rows: 20
+      rows: '20'
       placeholder: ''
+      max_heading_level: 2
+      strip_embedded_content: true
     third_party_settings:
       allowed_formats:
         hide_help: '1'
@@ -110,8 +112,10 @@ content:
   field_how_to_register:
     weight: 16
     settings:
-      rows: 10
+      rows: '10'
       placeholder: ''
+      max_heading_level: 3
+      strip_embedded_content: true
     third_party_settings:
       allowed_formats:
         hide_help: '1'

From d72a55055d1b902c8801bb34c697ea57429bf065 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 15 Dec 2021 12:32:52 +0000
Subject: [PATCH 295/720] [RW-159] Use subtheme styling inside the WYSIWYG
 editors

---
 .../common_design_subtheme/common_design_subtheme.info.yml     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.info.yml b/html/themes/custom/common_design_subtheme/common_design_subtheme.info.yml
index c08f6bcd5..b09dba4e4 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.info.yml
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.info.yml
@@ -53,6 +53,9 @@ libraries-extend:
   reliefweb_form/form.guidelines:
     - common_design_subtheme/rw-guidelines
 
+# Use the common_design_subtheme styles inside the editor.
+ckeditor_stylesheets:
+  - css/styles.css
 
 # Custom namespace
 # https://www.drupal.org/docs/contributed-modules/components/understanding-twig-namespaces

From c65c5ca7903289c869cfd7bd5f030039a07711d7 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 15 Dec 2021 12:33:59 +0000
Subject: [PATCH 296/720] [RW-273] Fix issue with save button in ckeditor link
 dialog

---
 .../common_design_subtheme.theme              | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.theme b/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
index 11b6411e3..d78bc2749 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
@@ -6,6 +6,7 @@
  */
 
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Form\FormStateInterface;
 
 /**
  * Implements hook_preprocess_taxonomy_term().
@@ -119,3 +120,43 @@ function common_design_subtheme_theme_suggestions_page_title_alter(array &$sugge
     $suggestions[] = 'page_title__wrapped';
   }
 }
+
+/**
+ * Implements hook_form_FORM_ID_alter().
+ *
+ * Add a process callback to ensure that the editor link dialog "save"submit
+ * button is not moved to the modal dialog's button area.
+ *
+ * Note: this the same workaround as used for the media library dialog.
+ *
+ * @see html/core/modules/media_library/media_library.module
+ *
+ * @todo move to the base theme or use the approach describe in
+ * https://gist.github.com/opi/b855eb28cbeb4d01abe125e8c978d978
+ */
+function common_design_subtheme_form_editor_link_dialog_alter(array &$form, FormStateInterface $form_state, $form_id) {
+  $form['#after_build'][] = 'common_design_subtheme_editor_link_dialog_form_after_build';
+}
+
+/**
+ * Form #after_build callback for editor_link_dialog form.
+ */
+function common_design_subtheme_editor_link_dialog_form_after_build(array $form, FormStateInterface $form_state) {
+  // Remove .form-actions from the edit link dialog form. This prevents
+  // the "Save" submit button from being moved into the dialog's button area and
+  // breaking accessibility (tab to focus element) and causing a redirection
+  // to the form page instead of adding the link to the editable area.
+  //
+  // @see \Drupal\Core\Render\Element\Actions::processActions
+  // @see Drupal.behaviors.dialog.prepareDialogButtons
+  //
+  // @todo Remove this when https://www.drupal.org/project/drupal/issues/3089751
+  // is fixed.
+  if (isset($form['actions']['#attributes']['class'])) {
+    $key = array_search('form-actions', $form['actions']['#attributes']['class']);
+    if ($key !== FALSE) {
+      unset($form['actions']['#attributes']['class'][$key]);
+    }
+  }
+  return $form;
+}

From 232527ac31875cadcd2b975f7c5ef3afc43c74ff Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 15 Dec 2021 12:35:38 +0000
Subject: [PATCH 297/720] [RW-159] Make heading handling consistent for jobs
 created via the form or via the importer

---
 .../src/Command/ReliefwebImportCommand.php               | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php b/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php
index 7f91bd9e0..f33141d7c 100644
--- a/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php
+++ b/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php
@@ -563,7 +563,7 @@ protected function validateBody($data) {
    */
   protected function validateHowToApply($data) {
     // Clean the field.
-    $field_how_to_apply = $this->sanitizeText('field_how_to_apply', $data, 'markdown');
+    $field_how_to_apply = $this->sanitizeText('field_how_to_apply', $data, 'markdown', 3);
 
     // Ensure the field size is reasonable.
     $length = mb_strlen($field_how_to_apply);
@@ -637,11 +637,13 @@ protected function validateJobClosingDate($data) {
    *   Field text content.
    * @param string $format
    *   Format to which conver the text if not already HTML.
+   * @param int $max_heading_level
+   *   Maximum heading level.
    *
    * @return string
    *   Sanitized content.
    */
-  protected function sanitizeText($field, $text, $format = 'plain_text') {
+  protected function sanitizeText($field, $text, $format = 'plain_text', $max_heading_level = 2) {
     if (!is_string($text)) {
       return '';
     }
@@ -681,8 +683,7 @@ protected function sanitizeText($field, $text, $format = 'plain_text') {
     }
 
     // We then sanitize the HTML string.
-    $sanitizer = new HtmlSanitizer();
-    $text = $sanitizer->sanitizeHtml($text);
+    $text = HtmlSanitizer::sanitize($text, FALSE, $max_heading_level - 1);
 
     // Remove embedded content.
     $text = TextHelper::stripEmbeddedContent($text);

From 86ea17401fcf45b5843c3e269ff3d8297477ad61 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 15 Dec 2021 12:37:50 +0000
Subject: [PATCH 298/720] [RW-159] Wrap headings converted to strong into a <p>
 to avoid unwanted inline display

---
 .../custom/reliefweb_utility/src/Helpers/HtmlOutliner.php  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/html/modules/custom/reliefweb_utility/src/Helpers/HtmlOutliner.php b/html/modules/custom/reliefweb_utility/src/Helpers/HtmlOutliner.php
index 79f7dc289..07bd46028 100644
--- a/html/modules/custom/reliefweb_utility/src/Helpers/HtmlOutliner.php
+++ b/html/modules/custom/reliefweb_utility/src/Helpers/HtmlOutliner.php
@@ -516,6 +516,13 @@ public static function fixHeadingRank(\DOMNode $heading, $rank) {
     foreach ($heading->attributes as $attribute => $dummy) {
       $node->setAttribute($attribute, $heading->getAttribute($attribute));
     }
+    // Wrap the strong element into a `<p>` element so that it's not displayed
+    // inline.
+    if ($tag === 'strong') {
+      $wrapper = $heading->ownerDocument->createElement('p');
+      $wrapper->appendChild($node);
+      $node = $wrapper;
+    }
     // Replace the heading node with the new one.
     $heading->parentNode->replaceChild($node, $heading);
     return $node;

From c87594425a8145785e66b66497bcd102bc517d44 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 15 Dec 2021 12:39:03 +0000
Subject: [PATCH 299/720] [RW-159] Fix level for heading sanitation in reports,
 jobs, trainign, book and blog posts

---
 .../templates/content/node--blog_post--full.html.twig           | 2 +-
 .../templates/content/node--book--full.html.twig                | 2 +-
 .../templates/content/node--job--full.html.twig                 | 2 +-
 .../templates/content/node--report--full.html.twig              | 2 +-
 .../templates/content/node--training--full.html.twig            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/templates/content/node--blog_post--full.html.twig b/html/themes/custom/common_design_subtheme/templates/content/node--blog_post--full.html.twig
index 89a2cdd67..d6757c9c3 100644
--- a/html/themes/custom/common_design_subtheme/templates/content/node--blog_post--full.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/content/node--blog_post--full.html.twig
@@ -133,7 +133,7 @@
       }) }}
     {% endif %}
 
-    {{ content.body.0|render|sanitize_html(true, 2) }}
+    {{ content.body.0|render|sanitize_html(true, 1) }}
   </div>
 
   <footer class="rw-article__footer">
diff --git a/html/themes/custom/common_design_subtheme/templates/content/node--book--full.html.twig b/html/themes/custom/common_design_subtheme/templates/content/node--book--full.html.twig
index fd63adaa1..955d5f880 100644
--- a/html/themes/custom/common_design_subtheme/templates/content/node--book--full.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/content/node--book--full.html.twig
@@ -94,7 +94,7 @@
   </header>
 
   <div class="rw-article__content">
-    {{ content.body.0|render|sanitize_html(true, 2) }}
+    {{ content.body.0|render|sanitize_html(true, 1) }}
   </div>
 
   <footer class="rw-article__footer">
diff --git a/html/themes/custom/common_design_subtheme/templates/content/node--job--full.html.twig b/html/themes/custom/common_design_subtheme/templates/content/node--job--full.html.twig
index cc46f7720..995a4159a 100644
--- a/html/themes/custom/common_design_subtheme/templates/content/node--job--full.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/content/node--job--full.html.twig
@@ -125,7 +125,7 @@
   </header>
 
   <div class="rw-article__content">
-    {{ content.body.0|render|sanitize_html(false, 2) }}
+    {{ content.body.0|render|sanitize_html(false, 1) }}
 
     <section class="rw-how-to-apply">
       <h2 class="rw-how-to-apply__title">{{ 'How to apply'|t }}</h2>
diff --git a/html/themes/custom/common_design_subtheme/templates/content/node--report--full.html.twig b/html/themes/custom/common_design_subtheme/templates/content/node--report--full.html.twig
index 557ad07ac..aaa8bd49d 100644
--- a/html/themes/custom/common_design_subtheme/templates/content/node--report--full.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/content/node--report--full.html.twig
@@ -204,7 +204,7 @@
 {#        </ul>#}
 {#      </section>#}
 
-    {{ content.body.0|render|sanitize_html(false, 2) }}
+    {{ content.body.0|render|sanitize_html(false, 1) }}
 
     {{ node.getSourceDisclaimers() }}
 
diff --git a/html/themes/custom/common_design_subtheme/templates/content/node--training--full.html.twig b/html/themes/custom/common_design_subtheme/templates/content/node--training--full.html.twig
index eddbf264d..b66c959a2 100644
--- a/html/themes/custom/common_design_subtheme/templates/content/node--training--full.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/content/node--training--full.html.twig
@@ -146,7 +146,7 @@
   </header>
 
   <div class="rw-article__content">
-    {{ content.body.0|render|sanitize_html(false, 2) }}
+    {{ content.body.0|render|sanitize_html(false, 1) }}
 
     {% if not node.field_fee_information.isEmpty() %}
     <section class="rw-fee-information">

From d43fdf4f415a563c055a15e01773557e679fc5a3 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 15 Dec 2021 13:17:55 +0000
Subject: [PATCH 300/720] [RW-159] Update tests to reflect change to method
 signature in job importer

---
 .../tests/src/Unit/Stub/ReliefwebImportCommandStub.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_import/tests/src/Unit/Stub/ReliefwebImportCommandStub.php b/html/modules/custom/reliefweb_import/tests/src/Unit/Stub/ReliefwebImportCommandStub.php
index 7a096cf85..c73d5186d 100644
--- a/html/modules/custom/reliefweb_import/tests/src/Unit/Stub/ReliefwebImportCommandStub.php
+++ b/html/modules/custom/reliefweb_import/tests/src/Unit/Stub/ReliefwebImportCommandStub.php
@@ -28,7 +28,7 @@ public function validateBody($data) {
   /**
    * {@inheritdoc}
    */
-  public function sanitizeText($field, $text, $format = 'plain_text') {
+  public function sanitizeText($field, $text, $format = 'plain_text', $max_heading_level = 2) {
     return parent::sanitizeText($field, $text, $format);
   }
 

From 059500b7695f1c36d4db2fd2ee945515905f949b Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 15 Dec 2021 10:48:33 -0700
Subject: [PATCH 301/720] set width for preview page select and for preview
 column, float image preview div for more compact display and copy some D7
 style declarations

---
 .../components/rw-form/rw-form--widget.css    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
index 55b02c6e4..29c66f2e6 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
@@ -92,9 +92,28 @@ form .field--type-reliefweb-file {
 .rw-file-widget table {
   margin-bottom: 1rem;
 }
+.rw-file-widget .rw-file-widget-item__preview {
+  width: 15rem;
+}
 .rw-file-widget .rw-file-widget-item__preview > div:first-child {
+  display: flex;
+  float: left;
+  align-items: center;
+  justify-content: center;
+  width: 102px;
+  height: 102px;
+  margin: 12px 12px 12px 0;
   text-align: center;
+  border: 1px solid #e6ecef;
+}
+.rw-file-widget .rw-file-widget-item__preview .rw-file-preview {
+  width: 100%;
+  height: 100%;
 }
+.form-item-field-file-0-preview-page select {
+  width: 6rem;
+}
+
 /* Replace file button */
 .rw-file-widget input[data-drupal-selector*="operations-replace"] {
   margin-top: 0.5rem;

From 52dc352f26761211cd093f4279e4bc235b5a23b9 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 15 Dec 2021 10:49:07 -0700
Subject: [PATCH 302/720] use the word none for brevity

---
 .../src/Plugin/Field/FieldWidget/ReliefWebFile.php              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
index d56ffa5be..91bfe550e 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
@@ -370,7 +370,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
         '#type' => 'select',
         '#title' => $this->t('Preview page'),
         '#options' => array_merge(
-          [0 => $this->t('No preview')],
+          [0 => $this->t('none')],
           range(1, $item->getPageCount())
         ),
         '#default_value' => $preview_page,

From 365984bd8be3b9915d181a8a0fce73e0d57e0372 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 15 Dec 2021 11:10:19 -0700
Subject: [PATCH 303/720] use id with attribute selector ends with preview to
 differentiate from other divs, set font size and overflow for preview alt
 text

---
 .../components/rw-form/rw-form--widget.css                    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
index 29c66f2e6..a1e5e6936 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
@@ -95,7 +95,7 @@ form .field--type-reliefweb-file {
 .rw-file-widget .rw-file-widget-item__preview {
   width: 15rem;
 }
-.rw-file-widget .rw-file-widget-item__preview > div:first-child {
+.rw-file-widget .rw-file-widget-item__preview > div[id$="preview"] {
   display: flex;
   float: left;
   align-items: center;
@@ -107,8 +107,10 @@ form .field--type-reliefweb-file {
   border: 1px solid #e6ecef;
 }
 .rw-file-widget .rw-file-widget-item__preview .rw-file-preview {
+  overflow: hidden;
   width: 100%;
   height: 100%;
+  font-size: 14px;
 }
 .form-item-field-file-0-preview-page select {
   width: 6rem;

From 6aef25cb288b66b2aa43afb1fac6787816f9c7ef Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 15 Dec 2021 23:50:24 +0000
Subject: [PATCH 304/720] [RW-159] Fix pasting filter across browsers

---
 .../js/plugins/reliefweb_formatted_text/plugin.js            | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/html/modules/custom/reliefweb_fields/js/plugins/reliefweb_formatted_text/plugin.js b/html/modules/custom/reliefweb_fields/js/plugins/reliefweb_formatted_text/plugin.js
index 83a34b406..ec8ebd86b 100644
--- a/html/modules/custom/reliefweb_fields/js/plugins/reliefweb_formatted_text/plugin.js
+++ b/html/modules/custom/reliefweb_fields/js/plugins/reliefweb_formatted_text/plugin.js
@@ -52,6 +52,11 @@
         // Update the list of available text styles.
         editor.config.format_tags = formatTags.join(';'); // eslint-disable-line camelcase
       }
+
+      // This will enable the editor.parseFilter across browsers and allow
+      // to add the heading transformations. By default it's only enabled in
+      // webkit and blink browsers.
+      editor.config.pasteFilter = 'semantic-content';
     },
 
     // Add heading transformations.

From 36e8463ec9fe9770d39263c299b0bd43bd28ab48 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 16 Dec 2021 02:55:05 +0000
Subject: [PATCH 305/720] [RW-283] Update drupal code and modules

---
 composer.json                                 |   49 +-
 composer.lock                                 | 2057 ++++++++---------
 composer.patches.json                         |    1 -
 ...-drupal--2570593-bundle-entity-class.patch |  766 ------
 ...47110-taxonomy-term-moderation-class.patch |  277 ++-
 symfony.lock                                  |  270 ++-
 6 files changed, 1420 insertions(+), 2000 deletions(-)
 delete mode 100644 patches/core--drupal--2570593-bundle-entity-class.patch

diff --git a/composer.json b/composer.json
index 72387d03a..dc1b9ae10 100644
--- a/composer.json
+++ b/composer.json
@@ -53,12 +53,12 @@
         "drupal-composer/preserve-paths": "^0.1.6",
         "drupal/admin_denied": "^1.1",
         "drupal/allowed_formats": "^1.3",
-        "drupal/components": "^2.2",
-        "drupal/config_split": "^2.0.0-beta4",
-        "drupal/core-composer-scaffold": "^9.2.4",
-        "drupal/core-dev": "^9.2.4",
-        "drupal/core-recommended": "^9.2.4",
-        "drupal/geofield": "^1.22",
+        "drupal/components": "^2.4",
+        "drupal/config_split": "^2.0.0-beta5",
+        "drupal/core-composer-scaffold": "^9.3",
+        "drupal/core-dev": "^9.3",
+        "drupal/core-recommended": "^9.3",
+        "drupal/geofield": "^1.35",
         "drupal/google_tag": "^1.4",
         "drupal/guidelines": "^1.0",
         "drupal/imageapi_optimize_binaries": "^1.0-alpha2",
@@ -67,43 +67,41 @@
         "drupal/metatag": "^1.16",
         "drupal/migrate_plus": "^5.1",
         "drupal/migrate_tools": "^5.0",
-        "drupal/mimemail": "^1.0@alpha",
-        "drupal/paragraphs": "^1.12",
-        "drupal/paragraphs_viewmode": "^1.0",
+        "drupal/mimemail": "^1.0-alpha4",
         "drupal/pathauto": "^1.8",
-        "drupal/redirect": "^1.6",
+        "drupal/redirect": "^1.7",
         "drupal/redis": "^1.5",
-        "drupal/social_auth_hid": "^2.6",
+        "drupal/social_auth_hid": "^2.7",
         "drupal/svg_image": "^1.15",
         "drupal/taxonomy_term_revision": "1.x-dev",
         "drupal/theme_switcher": "^1.2",
-        "drupal/token": "^1.9",
+        "drupal/token": "^1.10",
         "drupal/user_display_name": "^1.0",
-        "drush/drush": "^10.4",
+        "drush/drush": "^10.6",
         "league/commonmark": "^1.6",
         "league/html-to-markdown": "^5.0",
-        "pelago/emogrifier": "^5.0",
-        "reliefweb/simple-autocomplete": "v1.3.0",
+        "pelago/emogrifier": "^6.0",
+        "reliefweb/simple-autocomplete": "^v1.3.0",
         "reliefweb/simple-datepicker": "^v1.3.1",
-        "symfony/flex": "^1.12",
-        "symfony/uid": "^5.3",
+        "symfony/flex": "^2.0",
+        "symfony/uid": "^6.0",
         "unocha/common_design": "dev-cd-304-forms",
         "webflo/drupal-finder": "^1.2.2"
     },
     "require-dev": {
-        "drupal/coder": "^8.3.12",
+        "drupal/coder": "^8.3",
         "drupal/config_filter": "^2.2",
-        "drupal/console": "^1.9.7",
+        "drupal/console": "^1.9",
         "drupal/devel": "^4.1",
         "drupal/devel_php": "^1.3",
-        "drupal/stage_file_proxy": "^1.1",
+        "drupal/stage_file_proxy": "^1.2",
         "kint-php/kint": "^3.3",
-        "mikey179/vfsstream": "^1.6.8",
-        "phpcompatibility/php-compatibility": "^9.3.5",
-        "phpmd/phpmd": "^2.9.1",
+        "mikey179/vfsstream": "^1.6",
+        "phpcompatibility/php-compatibility": "^9.3",
+        "phpmd/phpmd": "^2.11",
         "phpspec/prophecy-phpunit": "^2",
         "phpunit/php-code-coverage": "^9.2",
-        "phpunit/phpunit": "^9.5.4",
+        "phpunit/phpunit": "^9.5",
         "weitzman/drupal-test-traits": "^1.5"
     },
     "conflict": {
@@ -113,9 +111,6 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "config": {
-        "platform": {
-            "php": "8.0"
-        },
         "bin-dir": "vendor/bin/",
         "sort-packages": true
     },
diff --git a/composer.lock b/composer.lock
index 85e2e11f2..57192534e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9c34fdab81b6f0a54029d70ac71a3096",
+    "content-hash": "467886a9d48d0f0fa17f498a73a6cdc3",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -64,26 +64,27 @@
         },
         {
             "name": "behat/mink",
-            "version": "v1.8.1",
+            "version": "v1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/minkphp/Mink.git",
-                "reference": "07c6a9fe3fa98c2de074b25d9ed26c22904e3887"
+                "reference": "e35f4695de8800fc776af34ebf665ad58ebdd996"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/minkphp/Mink/zipball/07c6a9fe3fa98c2de074b25d9ed26c22904e3887",
-                "reference": "07c6a9fe3fa98c2de074b25d9ed26c22904e3887",
+                "url": "https://api.github.com/repos/minkphp/Mink/zipball/e35f4695de8800fc776af34ebf665ad58ebdd996",
+                "reference": "e35f4695de8800fc776af34ebf665ad58ebdd996",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.1",
+                "php": ">=5.4",
                 "symfony/css-selector": "^2.7|^3.0|^4.0|^5.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20",
-                "symfony/debug": "^2.7|^3.0|^4.0",
-                "symfony/phpunit-bridge": "^3.4.38 || ^5.0.5"
+                "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5 || ^9.5",
+                "symfony/debug": "^2.7|^3.0|^4.0|^5.0",
+                "symfony/phpunit-bridge": "^3.4.38 || ^4.4 || ^5.0.5",
+                "yoast/phpunit-polyfills": "^1.0"
             },
             "suggest": {
                 "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)",
@@ -95,7 +96,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.8.x-dev"
+                    "dev-master": "1.x-dev"
                 }
             },
             "autoload": {
@@ -115,7 +116,7 @@
                 }
             ],
             "description": "Browser controller/emulator abstraction for PHP",
-            "homepage": "http://mink.behat.org/",
+            "homepage": "https://mink.behat.org/",
             "keywords": [
                 "browser",
                 "testing",
@@ -123,81 +124,22 @@
             ],
             "support": {
                 "issues": "https://github.com/minkphp/Mink/issues",
-                "source": "https://github.com/minkphp/Mink/tree/v1.8.1"
-            },
-            "time": "2020-03-11T15:45:53+00:00"
-        },
-        {
-            "name": "behat/mink-goutte-driver",
-            "version": "v1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/minkphp/MinkGoutteDriver.git",
-                "reference": "8b9ad6d2d95bc70b840d15323365f52fcdaea6ca"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/8b9ad6d2d95bc70b840d15323365f52fcdaea6ca",
-                "reference": "8b9ad6d2d95bc70b840d15323365f52fcdaea6ca",
-                "shasum": ""
-            },
-            "require": {
-                "behat/mink": "~1.6@dev",
-                "behat/mink-browserkit-driver": "~1.2@dev",
-                "fabpot/goutte": "~1.0.4|~2.0|~3.1",
-                "php": ">=5.3.1"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~2.7|~3.0"
-            },
-            "type": "mink-driver",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Behat\\Mink\\Driver\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                }
-            ],
-            "description": "Goutte driver for Mink framework",
-            "homepage": "http://mink.behat.org/",
-            "keywords": [
-                "browser",
-                "goutte",
-                "headless",
-                "testing"
-            ],
-            "support": {
-                "issues": "https://github.com/minkphp/MinkGoutteDriver/issues",
-                "source": "https://github.com/minkphp/MinkGoutteDriver/tree/master"
+                "source": "https://github.com/minkphp/Mink/tree/v1.9.0"
             },
-            "time": "2016-03-05T09:04:22+00:00"
+            "time": "2021-10-11T11:58:47+00:00"
         },
         {
             "name": "behat/mink-selenium2-driver",
-            "version": "v1.4.0",
+            "version": "v1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/minkphp/MinkSelenium2Driver.git",
-                "reference": "312a967dd527f28980cce40850339cd5316da092"
+                "reference": "0dee8cceed7e198bf130b4af0fab0ffab6dab47f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/minkphp/MinkSelenium2Driver/zipball/312a967dd527f28980cce40850339cd5316da092",
-                "reference": "312a967dd527f28980cce40850339cd5316da092",
+                "url": "https://api.github.com/repos/minkphp/MinkSelenium2Driver/zipball/0dee8cceed7e198bf130b4af0fab0ffab6dab47f",
+                "reference": "0dee8cceed7e198bf130b4af0fab0ffab6dab47f",
                 "shasum": ""
             },
             "require": {
@@ -211,7 +153,7 @@
             "type": "mink-driver",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4.x-dev"
+                    "dev-master": "1.x-dev"
                 }
             },
             "autoload": {
@@ -236,7 +178,7 @@
                 }
             ],
             "description": "Selenium2 (WebDriver) driver for Mink framework",
-            "homepage": "http://mink.behat.org/",
+            "homepage": "https://mink.behat.org/",
             "keywords": [
                 "ajax",
                 "browser",
@@ -247,9 +189,9 @@
             ],
             "support": {
                 "issues": "https://github.com/minkphp/MinkSelenium2Driver/issues",
-                "source": "https://github.com/minkphp/MinkSelenium2Driver/tree/v1.4.0"
+                "source": "https://github.com/minkphp/MinkSelenium2Driver/tree/v1.5.0"
             },
-            "time": "2020-03-11T14:43:21+00:00"
+            "time": "2021-10-12T16:01:47+00:00"
         },
         {
             "name": "chi-teck/drupal-code-generator",
@@ -305,16 +247,16 @@
         },
         {
             "name": "composer/ca-bundle",
-            "version": "1.2.11",
+            "version": "1.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "0b072d51c5a9c6f3412f7ea3ab043d6603cb2582"
+                "reference": "4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/0b072d51c5a9c6f3412f7ea3ab043d6603cb2582",
-                "reference": "0b072d51c5a9c6f3412f7ea3ab043d6603cb2582",
+                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b",
+                "reference": "4c679186f2aca4ab6a0f1b0b9cf9252decb44d0b",
                 "shasum": ""
             },
             "require": {
@@ -361,7 +303,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/ca-bundle/issues",
-                "source": "https://github.com/composer/ca-bundle/tree/1.2.11"
+                "source": "https://github.com/composer/ca-bundle/tree/1.3.1"
             },
             "funding": [
                 {
@@ -377,20 +319,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-25T20:32:43+00:00"
+            "time": "2021-10-28T20:44:15+00:00"
         },
         {
             "name": "composer/composer",
-            "version": "2.1.9",
+            "version": "2.1.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/composer.git",
-                "reference": "e558c88f28d102d497adec4852802c0dc14c7077"
+                "reference": "cd28fc05b0c9d3beaf58b57018725c4dc15a6446"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/e558c88f28d102d497adec4852802c0dc14c7077",
-                "reference": "e558c88f28d102d497adec4852802c0dc14c7077",
+                "url": "https://api.github.com/repos/composer/composer/zipball/cd28fc05b0c9d3beaf58b57018725c4dc15a6446",
+                "reference": "cd28fc05b0c9d3beaf58b57018725c4dc15a6446",
                 "shasum": ""
             },
             "require": {
@@ -401,11 +343,11 @@
                 "composer/xdebug-handler": "^2.0",
                 "justinrainbow/json-schema": "^5.2.11",
                 "php": "^5.3.2 || ^7.0 || ^8.0",
-                "psr/log": "^1.0",
+                "psr/log": "^1.0 || ^2.0",
                 "react/promise": "^1.2 || ^2.7",
                 "seld/jsonlint": "^1.4",
                 "seld/phar-utils": "^1.0",
-                "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
+                "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0",
                 "symfony/filesystem": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
                 "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
                 "symfony/process": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0"
@@ -425,7 +367,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1-dev"
+                    "dev-main": "2.1-dev"
                 }
             },
             "autoload": {
@@ -459,7 +401,7 @@
             "support": {
                 "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/composer/issues",
-                "source": "https://github.com/composer/composer/tree/2.1.9"
+                "source": "https://github.com/composer/composer/tree/2.1.14"
             },
             "funding": [
                 {
@@ -475,7 +417,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-05T07:47:38+00:00"
+            "time": "2021-11-30T09:51:43+00:00"
         },
         {
             "name": "composer/installers",
@@ -697,18 +639,89 @@
             ],
             "time": "2021-04-07T13:37:33+00:00"
         },
+        {
+            "name": "composer/pcre",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/pcre.git",
+                "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/3d322d715c43a1ac36c7fe215fa59336265500f2",
+                "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.2 || ^7.0 || ^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1",
+                "phpstan/phpstan-strict-rules": "^1.1",
+                "symfony/phpunit-bridge": "^4.2 || ^5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Pcre\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "PCRE wrapping library that offers type-safe preg_* replacements.",
+            "keywords": [
+                "PCRE",
+                "preg",
+                "regex",
+                "regular expression"
+            ],
+            "support": {
+                "issues": "https://github.com/composer/pcre/issues",
+                "source": "https://github.com/composer/pcre/tree/1.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-12-06T15:17:27+00:00"
+        },
         {
             "name": "composer/semver",
-            "version": "3.2.5",
+            "version": "3.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9"
+                "reference": "83e511e247de329283478496f7a1e114c9517506"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/31f3ea725711245195f62e54ffa402d8ef2fdba9",
-                "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9",
+                "url": "https://api.github.com/repos/composer/semver/zipball/83e511e247de329283478496f7a1e114c9517506",
+                "reference": "83e511e247de329283478496f7a1e114c9517506",
                 "shasum": ""
             },
             "require": {
@@ -760,7 +773,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/semver/issues",
-                "source": "https://github.com/composer/semver/tree/3.2.5"
+                "source": "https://github.com/composer/semver/tree/3.2.6"
             },
             "funding": [
                 {
@@ -776,27 +789,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-24T12:41:47+00:00"
+            "time": "2021-10-25T11:34:17+00:00"
         },
         {
             "name": "composer/spdx-licenses",
-            "version": "1.5.5",
+            "version": "1.5.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/spdx-licenses.git",
-                "reference": "de30328a7af8680efdc03e396aad24befd513200"
+                "reference": "a30d487169d799745ca7280bc90fdfa693536901"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/de30328a7af8680efdc03e396aad24befd513200",
-                "reference": "de30328a7af8680efdc03e396aad24befd513200",
+                "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/a30d487169d799745ca7280bc90fdfa693536901",
+                "reference": "a30d487169d799745ca7280bc90fdfa693536901",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3.2 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 7"
+                "phpstan/phpstan": "^0.12.55",
+                "symfony/phpunit-bridge": "^4.2 || ^5"
             },
             "type": "library",
             "extra": {
@@ -839,7 +853,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/spdx-licenses/issues",
-                "source": "https://github.com/composer/spdx-licenses/tree/1.5.5"
+                "source": "https://github.com/composer/spdx-licenses/tree/1.5.6"
             },
             "funding": [
                 {
@@ -855,29 +869,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-12-03T16:04:16+00:00"
+            "time": "2021-11-18T10:14:14+00:00"
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "2.0.2",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "84674dd3a7575ba617f5a76d7e9e29a7d3891339"
+                "reference": "6555461e76962fd0379c444c46fd558a0fcfb65e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/84674dd3a7575ba617f5a76d7e9e29a7d3891339",
-                "reference": "84674dd3a7575ba617f5a76d7e9e29a7d3891339",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6555461e76962fd0379c444c46fd558a0fcfb65e",
+                "reference": "6555461e76962fd0379c444c46fd558a0fcfb65e",
                 "shasum": ""
             },
             "require": {
+                "composer/pcre": "^1",
                 "php": "^5.3.2 || ^7.0 || ^8.0",
                 "psr/log": "^1 || ^2 || ^3"
             },
             "require-dev": {
-                "phpstan/phpstan": "^0.12.55",
-                "symfony/phpunit-bridge": "^4.2 || ^5"
+                "phpstan/phpstan": "^1.0",
+                "phpstan/phpstan-strict-rules": "^1.1",
+                "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0"
             },
             "type": "library",
             "autoload": {
@@ -903,7 +919,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/2.0.2"
+                "source": "https://github.com/composer/xdebug-handler/tree/2.0.3"
             },
             "funding": [
                 {
@@ -919,7 +935,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-31T17:03:58+00:00"
+            "time": "2021-12-08T13:07:32+00:00"
         },
         {
             "name": "consolidation/annotated-command",
@@ -1343,16 +1359,16 @@
         },
         {
             "name": "consolidation/self-update",
-            "version": "2.0.0",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/self-update.git",
-                "reference": "7d6877f8006c51069e1469a9c57b1435640f74b7"
+                "reference": "7b9223bdfc1b23ab93489b580382accb6f0411b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/self-update/zipball/7d6877f8006c51069e1469a9c57b1435640f74b7",
-                "reference": "7d6877f8006c51069e1469a9c57b1435640f74b7",
+                "url": "https://api.github.com/repos/consolidation/self-update/zipball/7b9223bdfc1b23ab93489b580382accb6f0411b6",
+                "reference": "7b9223bdfc1b23ab93489b580382accb6f0411b6",
                 "shasum": ""
             },
             "require": {
@@ -1392,9 +1408,9 @@
             "description": "Provides a self:update command for Symfony Console applications.",
             "support": {
                 "issues": "https://github.com/consolidation/self-update/issues",
-                "source": "https://github.com/consolidation/self-update/tree/2.0.0"
+                "source": "https://github.com/consolidation/self-update/tree/2.0.1"
             },
-            "time": "2021-10-05T23:29:47+00:00"
+            "time": "2021-12-03T23:57:36+00:00"
         },
         {
             "name": "consolidation/site-alias",
@@ -1686,16 +1702,16 @@
         },
         {
             "name": "doctrine/annotations",
-            "version": "1.13.1",
+            "version": "1.13.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/annotations.git",
-                "reference": "e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f"
+                "reference": "5b668aef16090008790395c02c893b1ba13f7e08"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f",
-                "reference": "e6e7b7d5b45a2f2abc5460cc6396480b2b1d321f",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/5b668aef16090008790395c02c893b1ba13f7e08",
+                "reference": "5b668aef16090008790395c02c893b1ba13f7e08",
                 "shasum": ""
             },
             "require": {
@@ -1752,9 +1768,9 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/annotations/issues",
-                "source": "https://github.com/doctrine/annotations/tree/1.13.1"
+                "source": "https://github.com/doctrine/annotations/tree/1.13.2"
             },
-            "time": "2021-05-16T18:07:53+00:00"
+            "time": "2021-08-05T19:00:23+00:00"
         },
         {
             "name": "doctrine/instantiator",
@@ -2232,17 +2248,17 @@
         },
         {
             "name": "drupal/config_split",
-            "version": "2.0.0-beta4",
+            "version": "2.0.0-beta5",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/config_split.git",
-                "reference": "2.0.0-beta4"
+                "reference": "2.0.0-beta5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/config_split-2.0.0-beta4.zip",
-                "reference": "2.0.0-beta4",
-                "shasum": "815af0f3ac3b51368624d7ecb07424b0d9ad6c87"
+                "url": "https://ftp.drupal.org/files/projects/config_split-2.0.0-beta5.zip",
+                "reference": "2.0.0-beta5",
+                "shasum": "b5cf4ee3d7af1ba38883bebead12678214a98f1e"
             },
             "require": {
                 "drupal/core": "^8.8 || ^9"
@@ -2260,8 +2276,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "2.0.0-beta4",
-                    "datestamp": "1631393371",
+                    "version": "2.0.0-beta5",
+                    "datestamp": "1637101204",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Beta releases are not covered by Drupal security advisories."
@@ -2310,16 +2326,16 @@
         },
         {
             "name": "drupal/core",
-            "version": "9.2.7",
+            "version": "9.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core.git",
-                "reference": "ce3220458c7a744bb00e9436e48d8e644e134576"
+                "reference": "1e1bf0e841e11029b21775dd125332d7ffd6fb47"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core/zipball/ce3220458c7a744bb00e9436e48d8e644e134576",
-                "reference": "ce3220458c7a744bb00e9436e48d8e644e134576",
+                "url": "https://api.github.com/repos/drupal/core/zipball/1e1bf0e841e11029b21775dd125332d7ffd6fb47",
+                "reference": "1e1bf0e841e11029b21775dd125332d7ffd6fb47",
                 "shasum": ""
             },
             "require": {
@@ -2327,7 +2343,7 @@
                 "composer/semver": "^3.0",
                 "doctrine/annotations": "^1.12",
                 "doctrine/reflection": "^1.1",
-                "egulias/email-validator": "^2.0",
+                "egulias/email-validator": "^2.1.22|^3.0",
                 "ext-date": "*",
                 "ext-dom": "*",
                 "ext-filter": "*",
@@ -2355,8 +2371,9 @@
                 "symfony/event-dispatcher": "^4.4",
                 "symfony/http-foundation": "^4.4.7",
                 "symfony/http-kernel": "^4.4",
-                "symfony/mime": "^5.3.0",
+                "symfony/mime": "^5.4",
                 "symfony/polyfill-iconv": "^1.0",
+                "symfony/polyfill-php80": "^1.16",
                 "symfony/process": "^4.4",
                 "symfony/psr-http-message-bridge": "^2.0",
                 "symfony/routing": "^4.4",
@@ -2383,6 +2400,7 @@
                 "drupal/book": "self.version",
                 "drupal/breakpoint": "self.version",
                 "drupal/ckeditor": "self.version",
+                "drupal/ckeditor5": "self.version",
                 "drupal/claro": "self.version",
                 "drupal/classy": "self.version",
                 "drupal/color": "self.version",
@@ -2549,7 +2567,8 @@
                     "lib/Drupal/Core/Site/Settings.php"
                 ],
                 "files": [
-                    "includes/bootstrap.inc"
+                    "includes/bootstrap.inc",
+                    "includes/guzzle_php81_shim.php"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2558,22 +2577,22 @@
             ],
             "description": "Drupal is an open source content management platform powering millions of websites and applications.",
             "support": {
-                "source": "https://github.com/drupal/core/tree/9.2.7"
+                "source": "https://github.com/drupal/core/tree/9.3.0"
             },
-            "time": "2021-10-06T10:34:39+00:00"
+            "time": "2021-12-08T22:09:38+00:00"
         },
         {
             "name": "drupal/core-composer-scaffold",
-            "version": "9.2.7",
+            "version": "9.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-composer-scaffold.git",
-                "reference": "3c9efe8e154acc2cadb86b51733be55556677b0b"
+                "reference": "d3e0b1d707125c5de0f54315906e65654c3608da"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/3c9efe8e154acc2cadb86b51733be55556677b0b",
-                "reference": "3c9efe8e154acc2cadb86b51733be55556677b0b",
+                "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/d3e0b1d707125c5de0f54315906e65654c3608da",
+                "reference": "d3e0b1d707125c5de0f54315906e65654c3608da",
                 "shasum": ""
             },
             "require": {
@@ -2608,32 +2627,30 @@
                 "drupal"
             ],
             "support": {
-                "source": "https://github.com/drupal/core-composer-scaffold/tree/9.2.7"
+                "source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.0"
             },
-            "time": "2021-08-24T12:04:07+00:00"
+            "time": "2021-11-19T09:52:23+00:00"
         },
         {
             "name": "drupal/core-dev",
-            "version": "9.2.7",
+            "version": "9.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-dev.git",
-                "reference": "4b5b8556711315e180d72830733ddb07a57a2d73"
+                "reference": "d093ec9dd1106069fd01535235dd5797662a61cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core-dev/zipball/4b5b8556711315e180d72830733ddb07a57a2d73",
-                "reference": "4b5b8556711315e180d72830733ddb07a57a2d73",
+                "url": "https://api.github.com/repos/drupal/core-dev/zipball/d093ec9dd1106069fd01535235dd5797662a61cb",
+                "reference": "d093ec9dd1106069fd01535235dd5797662a61cb",
                 "shasum": ""
             },
             "require": {
                 "behat/mink": "^1.8",
-                "behat/mink-goutte-driver": "^1.2",
                 "behat/mink-selenium2-driver": "^1.4",
                 "composer/composer": "^2.0.2",
                 "drupal/coder": "^8.3.10",
                 "easyrdf/easyrdf": "^0.9 || ^1.0",
-                "fabpot/goutte": "^3.3",
                 "friends-of-behat/mink-browserkit-driver": "^1.4",
                 "instaclick/php-webdriver": "^1.4.1",
                 "justinrainbow/json-schema": "^5.2",
@@ -2647,8 +2664,8 @@
                 "symfony/filesystem": "^4.4",
                 "symfony/finder": "^4.4",
                 "symfony/lock": "^4.4",
-                "symfony/phpunit-bridge": "^5.3.0",
-                "symfony/var-dumper": "^5.3.0"
+                "symfony/phpunit-bridge": "^5.4",
+                "symfony/var-dumper": "^5.4"
             },
             "conflict": {
                 "webflo/drupal-core-require-dev": "*"
@@ -2660,44 +2677,43 @@
             ],
             "description": "require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.",
             "support": {
-                "source": "https://github.com/drupal/core-dev/tree/9.2.7"
+                "source": "https://github.com/drupal/core-dev/tree/9.3.0"
             },
-            "time": "2021-06-01T16:41:50+00:00"
+            "time": "2021-11-30T05:41:29+00:00"
         },
         {
             "name": "drupal/core-recommended",
-            "version": "9.2.7",
+            "version": "9.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-recommended.git",
-                "reference": "87c998e8d60d6b2452b21827fb7b16f77d02a38a"
+                "reference": "d65aaa36a8cab54332787a20676f81928f675bb3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core-recommended/zipball/87c998e8d60d6b2452b21827fb7b16f77d02a38a",
-                "reference": "87c998e8d60d6b2452b21827fb7b16f77d02a38a",
+                "url": "https://api.github.com/repos/drupal/core-recommended/zipball/d65aaa36a8cab54332787a20676f81928f675bb3",
+                "reference": "d65aaa36a8cab54332787a20676f81928f675bb3",
                 "shasum": ""
             },
             "require": {
                 "asm89/stack-cors": "1.3.0",
-                "composer/semver": "3.2.5",
-                "doctrine/annotations": "1.13.1",
+                "composer/semver": "3.2.6",
+                "doctrine/annotations": "1.13.2",
                 "doctrine/lexer": "1.2.1",
                 "doctrine/reflection": "1.2.2",
-                "drupal/core": "9.2.7",
-                "egulias/email-validator": "2.1.25",
+                "drupal/core": "9.3.0",
+                "egulias/email-validator": "3.1.2",
                 "guzzlehttp/guzzle": "6.5.5",
-                "guzzlehttp/promises": "1.4.1",
-                "guzzlehttp/psr7": "1.8.2",
-                "laminas/laminas-diactoros": "2.6.0",
-                "laminas/laminas-escaper": "2.7.0",
-                "laminas/laminas-feed": "2.14.1",
-                "laminas/laminas-stdlib": "3.3.1",
-                "laminas/laminas-zendframework-bridge": "1.2.0",
-                "masterminds/html5": "2.7.4",
+                "guzzlehttp/promises": "1.5.1",
+                "guzzlehttp/psr7": "1.8.3",
+                "laminas/laminas-diactoros": "2.8.0",
+                "laminas/laminas-escaper": "2.9.0",
+                "laminas/laminas-feed": "2.15.0",
+                "laminas/laminas-stdlib": "3.6.1",
+                "masterminds/html5": "2.7.5",
                 "pear/archive_tar": "1.4.14",
                 "pear/console_getopt": "v1.4.3",
-                "pear/pear-core-minimal": "v1.10.10",
+                "pear/pear-core-minimal": "v1.10.11",
                 "pear/pear_exception": "v1.0.2",
                 "psr/cache": "1.0.1",
                 "psr/container": "1.1.1",
@@ -2706,36 +2722,36 @@
                 "psr/log": "1.1.4",
                 "ralouphie/getallheaders": "3.0.3",
                 "stack/builder": "v1.0.6",
-                "symfony-cmf/routing": "2.3.3",
-                "symfony/console": "v4.4.25",
-                "symfony/debug": "v4.4.25",
-                "symfony/dependency-injection": "v4.4.25",
-                "symfony/deprecation-contracts": "v2.4.0",
-                "symfony/error-handler": "v4.4.25",
-                "symfony/event-dispatcher": "v4.4.25",
-                "symfony/event-dispatcher-contracts": "v1.1.9",
-                "symfony/http-client-contracts": "v2.4.0",
-                "symfony/http-foundation": "v4.4.25",
-                "symfony/http-kernel": "v4.4.25",
-                "symfony/mime": "v5.3.0",
+                "symfony-cmf/routing": "2.3.4",
+                "symfony/console": "v4.4.34",
+                "symfony/debug": "v4.4.31",
+                "symfony/dependency-injection": "v4.4.34",
+                "symfony/deprecation-contracts": "v2.5.0",
+                "symfony/error-handler": "v4.4.34",
+                "symfony/event-dispatcher": "v4.4.34",
+                "symfony/event-dispatcher-contracts": "v1.1.11",
+                "symfony/http-client-contracts": "v2.5.0",
+                "symfony/http-foundation": "v4.4.34",
+                "symfony/http-kernel": "v4.4.35",
+                "symfony/mime": "v5.4.0",
                 "symfony/polyfill-ctype": "v1.23.0",
                 "symfony/polyfill-iconv": "v1.23.0",
                 "symfony/polyfill-intl-idn": "v1.23.0",
                 "symfony/polyfill-intl-normalizer": "v1.23.0",
-                "symfony/polyfill-mbstring": "v1.23.0",
-                "symfony/polyfill-php80": "v1.23.0",
-                "symfony/process": "v4.4.25",
-                "symfony/psr-http-message-bridge": "v2.1.0",
-                "symfony/routing": "v4.4.25",
-                "symfony/serializer": "v4.4.25",
-                "symfony/service-contracts": "v2.4.0",
-                "symfony/translation": "v4.4.25",
-                "symfony/translation-contracts": "v2.4.0",
-                "symfony/validator": "v4.4.25",
-                "symfony/var-dumper": "v5.3.0",
-                "symfony/yaml": "v4.4.25",
-                "twig/twig": "v2.14.6",
-                "typo3/phar-stream-wrapper": "v3.1.6"
+                "symfony/polyfill-mbstring": "v1.23.1",
+                "symfony/polyfill-php80": "v1.23.1",
+                "symfony/process": "v4.4.35",
+                "symfony/psr-http-message-bridge": "v2.1.2",
+                "symfony/routing": "v4.4.34",
+                "symfony/serializer": "v4.4.35",
+                "symfony/service-contracts": "v2.5.0",
+                "symfony/translation": "v4.4.34",
+                "symfony/translation-contracts": "v2.5.0",
+                "symfony/validator": "v4.4.35",
+                "symfony/var-dumper": "v5.4.0",
+                "symfony/yaml": "v4.4.34",
+                "twig/twig": "v2.14.7",
+                "typo3/phar-stream-wrapper": "v3.1.7"
             },
             "conflict": {
                 "webflo/drupal-core-strict": "*"
@@ -2747,9 +2763,9 @@
             ],
             "description": "Locked core dependencies; require this project INSTEAD OF drupal/core.",
             "support": {
-                "source": "https://github.com/drupal/core-recommended/tree/9.2.7"
+                "source": "https://github.com/drupal/core-recommended/tree/9.3.0"
             },
-            "time": "2021-10-06T10:34:39+00:00"
+            "time": "2021-12-08T22:09:38+00:00"
         },
         {
             "name": "drupal/ctools",
@@ -2844,78 +2860,19 @@
                 "issues": "https://www.drupal.org/project/issues/ctools"
             }
         },
-        {
-            "name": "drupal/entity_reference_revisions",
-            "version": "1.9.0",
-            "source": {
-                "type": "git",
-                "url": "https://git.drupalcode.org/project/entity_reference_revisions.git",
-                "reference": "8.x-1.9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/entity_reference_revisions-8.x-1.9.zip",
-                "reference": "8.x-1.9",
-                "shasum": "e1c51bdea495eb3b458130d6f0a00c347f5637df"
-            },
-            "require": {
-                "drupal/core": "^8.7.7 || ^9"
-            },
-            "require-dev": {
-                "drupal/diff": "1.x-dev"
-            },
-            "type": "drupal-module",
-            "extra": {
-                "drupal": {
-                    "version": "8.x-1.9",
-                    "datestamp": "1614805871",
-                    "security-coverage": {
-                        "status": "covered",
-                        "message": "Covered by Drupal's security advisory policy"
-                    }
-                }
-            },
-            "notification-url": "https://packages.drupal.org/8/downloads",
-            "license": [
-                "GPL-2.0-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "Berdir",
-                    "homepage": "https://www.drupal.org/user/214652"
-                },
-                {
-                    "name": "Frans",
-                    "homepage": "https://www.drupal.org/user/514222"
-                },
-                {
-                    "name": "jeroen.b",
-                    "homepage": "https://www.drupal.org/user/1853532"
-                },
-                {
-                    "name": "miro_dietiker",
-                    "homepage": "https://www.drupal.org/user/227761"
-                }
-            ],
-            "description": "Entity Reference Revisions",
-            "homepage": "https://www.drupal.org/project/entity_reference_revisions",
-            "support": {
-                "source": "https://git.drupalcode.org/project/entity_reference_revisions"
-            }
-        },
         {
             "name": "drupal/geofield",
-            "version": "1.34.0",
+            "version": "1.35.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/geofield.git",
-                "reference": "8.x-1.34"
+                "reference": "8.x-1.35"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/geofield-8.x-1.34.zip",
-                "reference": "8.x-1.34",
-                "shasum": "69b6253475b7d810ccc44fa8791c2ff026c0ae6b"
+                "url": "https://ftp.drupal.org/files/projects/geofield-8.x-1.35.zip",
+                "reference": "8.x-1.35",
+                "shasum": "9565fb799451f3cbad243979f9d2372e3456fe27"
             },
             "require": {
                 "drupal/core": "^8.8 || ^9",
@@ -2924,8 +2881,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.34",
-                    "datestamp": "1626906581",
+                    "version": "8.x-1.35",
+                    "datestamp": "1637015166",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -3072,29 +3029,29 @@
         },
         {
             "name": "drupal/imageapi_optimize",
-            "version": "4.0.0-beta1",
+            "version": "4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/imageapi_optimize.git",
-                "reference": "4.0.0-beta1"
+                "reference": "4.0.0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/imageapi_optimize-4.0.0-beta1.zip",
-                "reference": "4.0.0-beta1",
-                "shasum": "9c32fbedec551613c820fd5f2c115ab5c9a08353"
+                "url": "https://ftp.drupal.org/files/projects/imageapi_optimize-4.0.0.zip",
+                "reference": "4.0.0",
+                "shasum": "16d2ef6f1931833b40980d7d0475132e5f43cdf3"
             },
             "require": {
-                "drupal/core": "^8 || ^9"
+                "drupal/core": "^9"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "4.0.0-beta1",
-                    "datestamp": "1591257441",
+                    "version": "4.0.0",
+                    "datestamp": "1634305832",
                     "security-coverage": {
-                        "status": "not-covered",
-                        "message": "Beta releases are not covered by Drupal security advisories."
+                        "status": "covered",
+                        "message": "Covered by Drupal's security advisory policy"
                     }
                 }
             },
@@ -3398,6 +3355,10 @@
                     "name": "Lucas Hedding",
                     "homepage": "https://www.drupal.org/u/heddn",
                     "role": "Maintainer"
+                },
+                {
+                    "name": "mikeryan",
+                    "homepage": "https://www.drupal.org/user/4420"
                 }
             ],
             "description": "Enhancements to core migration support.",
@@ -3414,10 +3375,10 @@
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/migrate_tools.git",
-                "reference": "56d82b4fc111dd26f2c3a1e53c06015eb854df20"
+                "reference": "60bc0c01f1468cd58f7dec1dee6f6170cd5244e8"
             },
             "require": {
-                "drupal/core": "^8.8 | ^9",
+                "drupal/core": "^9.1",
                 "drupal/migrate_plus": "^5",
                 "php": ">=7.1"
             },
@@ -3434,8 +3395,8 @@
                     "dev-5.x": "5.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-5.0+13-dev",
-                    "datestamp": "1618603463",
+                    "version": "8.x-5.0+20-dev",
+                    "datestamp": "1637259316",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Dev releases are not covered by Drupal security advisories."
@@ -3477,27 +3438,30 @@
         },
         {
             "name": "drupal/mimemail",
-            "version": "1.0.0-alpha3",
+            "version": "1.0.0-alpha4",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/mimemail.git",
-                "reference": "8.x-1.0-alpha3"
+                "reference": "8.x-1.0-alpha4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/mimemail-8.x-1.0-alpha3.zip",
-                "reference": "8.x-1.0-alpha3",
-                "shasum": "5e02422aa7ea56411c10086c56a5033558eccfa4"
+                "url": "https://ftp.drupal.org/files/projects/mimemail-8.x-1.0-alpha4.zip",
+                "reference": "8.x-1.0-alpha4",
+                "shasum": "7e65bbcb616de898ecc7c01d280b8d69101f2dcc"
             },
             "require": {
-                "drupal/core": "^8 || ^9",
+                "drupal/core": "^8.8.2 || ^9",
                 "drupal/mailsystem": "*"
             },
+            "require-dev": {
+                "drupal/rules": "*"
+            },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.0-alpha3",
-                    "datestamp": "1591399267",
+                    "version": "8.x-1.0-alpha4",
+                    "datestamp": "1638738304",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Alpha releases are not covered by Drupal security advisories."
@@ -3532,140 +3496,6 @@
                 "source": "https://git.drupalcode.org/project/mimemail"
             }
         },
-        {
-            "name": "drupal/paragraphs",
-            "version": "1.12.0",
-            "source": {
-                "type": "git",
-                "url": "https://git.drupalcode.org/project/paragraphs.git",
-                "reference": "8.x-1.12"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/paragraphs-8.x-1.12.zip",
-                "reference": "8.x-1.12",
-                "shasum": "3b67d8af1160af42d93a4610be1e02869e428965"
-            },
-            "require": {
-                "drupal/core": "^8.8 || ^9",
-                "drupal/entity_reference_revisions": "~1.3"
-            },
-            "require-dev": {
-                "drupal/block_field": "~1.0",
-                "drupal/ctools": "3.x-dev",
-                "drupal/diff": "~1.0",
-                "drupal/entity_browser": "2.x-dev",
-                "drupal/entity_usage": "2.x-dev",
-                "drupal/field_group": "3.x-dev",
-                "drupal/inline_entity_form": "~1.0",
-                "drupal/paragraphs-paragraphs_library": "*",
-                "drupal/replicate": "~1.0",
-                "drupal/search_api": "~1.0",
-                "drupal/search_api_db": "*"
-            },
-            "suggest": {
-                "drupal/entity_browser": "Recommended for an improved user experience when using the Paragraphs library module"
-            },
-            "type": "drupal-module",
-            "extra": {
-                "drupal": {
-                    "version": "8.x-1.12",
-                    "datestamp": "1590140081",
-                    "security-coverage": {
-                        "status": "covered",
-                        "message": "Covered by Drupal's security advisory policy"
-                    }
-                }
-            },
-            "notification-url": "https://packages.drupal.org/8/downloads",
-            "license": [
-                "GPL-2.0-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "Berdir",
-                    "homepage": "https://www.drupal.org/user/214652"
-                },
-                {
-                    "name": "Frans",
-                    "homepage": "https://www.drupal.org/user/514222"
-                },
-                {
-                    "name": "Primsi",
-                    "homepage": "https://www.drupal.org/user/282629"
-                },
-                {
-                    "name": "jeroen.b",
-                    "homepage": "https://www.drupal.org/user/1853532"
-                },
-                {
-                    "name": "jstoller",
-                    "homepage": "https://www.drupal.org/user/99012"
-                },
-                {
-                    "name": "miro_dietiker",
-                    "homepage": "https://www.drupal.org/user/227761"
-                }
-            ],
-            "description": "Enables the creation of Paragraphs entities.",
-            "homepage": "https://www.drupal.org/project/paragraphs",
-            "support": {
-                "source": "https://git.drupalcode.org/project/paragraphs"
-            }
-        },
-        {
-            "name": "drupal/paragraphs_viewmode",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://git.drupalcode.org/project/paragraphs_viewmode.git",
-                "reference": "8.x-1.0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/paragraphs_viewmode-8.x-1.0.zip",
-                "reference": "8.x-1.0",
-                "shasum": "46b95d74c4bf33665d04e7ac01e58f158772294f"
-            },
-            "require": {
-                "drupal/core": "^8.8 || ^9",
-                "drupal/paragraphs": "^1.2"
-            },
-            "type": "drupal-module",
-            "extra": {
-                "drupal": {
-                    "version": "8.x-1.0",
-                    "datestamp": "1605320322",
-                    "security-coverage": {
-                        "status": "covered",
-                        "message": "Covered by Drupal's security advisory policy"
-                    }
-                }
-            },
-            "notification-url": "https://packages.drupal.org/8/downloads",
-            "license": [
-                "GPL-2.0+"
-            ],
-            "authors": [
-                {
-                    "name": "VladimirAus",
-                    "homepage": "https://www.drupal.org/user/673120"
-                },
-                {
-                    "name": "mikelutz",
-                    "homepage": "https://www.drupal.org/user/2972409"
-                }
-            ],
-            "description": "Allows you to select the paragraph view mode on a per paragraph basis",
-            "homepage": "https://www.drupal.org/project/paragraphs_viewmode",
-            "keywords": [
-                "Drupal"
-            ],
-            "support": {
-                "source": "http://cgit.drupalcode.org/paragraphs_viewmode",
-                "issues": "https://www.drupal.org/project/issues/paragraphs_viewmode"
-            }
-        },
         {
             "name": "drupal/pathauto",
             "version": "1.8.0",
@@ -3736,17 +3566,17 @@
         },
         {
             "name": "drupal/redirect",
-            "version": "1.6.0",
+            "version": "1.7.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/redirect.git",
-                "reference": "8.x-1.6"
+                "reference": "8.x-1.7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/redirect-8.x-1.6.zip",
-                "reference": "8.x-1.6",
-                "shasum": "f848e001deac8425ae57d4b9397087c491d37294"
+                "url": "https://ftp.drupal.org/files/projects/redirect-8.x-1.7.zip",
+                "reference": "8.x-1.7",
+                "shasum": "013b2541a5ef0cf423a3caa1ae89cc5866504877"
             },
             "require": {
                 "drupal/core": "^8.8 || ^9"
@@ -3754,8 +3584,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.6",
-                    "datestamp": "1589312204",
+                    "version": "8.x-1.7",
+                    "datestamp": "1639380488",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -4189,17 +4019,17 @@
         },
         {
             "name": "drupal/token",
-            "version": "1.9.0",
+            "version": "1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/token.git",
-                "reference": "8.x-1.9"
+                "reference": "8.x-1.10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/token-8.x-1.9.zip",
-                "reference": "8.x-1.9",
-                "shasum": "a5d234382a1a0e4ba61d4c7a2fa10671ca656be4"
+                "url": "https://ftp.drupal.org/files/projects/token-8.x-1.10.zip",
+                "reference": "8.x-1.10",
+                "shasum": "8b81224ab0420221b292e8d3b66d0da726317400"
             },
             "require": {
                 "drupal/core": "^8.8 || ^9"
@@ -4207,8 +4037,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.9",
-                    "datestamp": "1608284866",
+                    "version": "8.x-1.10",
+                    "datestamp": "1638619775",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -4303,16 +4133,16 @@
         },
         {
             "name": "drush/drush",
-            "version": "10.6.1",
+            "version": "10.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drush-ops/drush.git",
-                "reference": "d36bca3322555a6f94edc94439873afcde2bbe90"
+                "reference": "0a570a16ec63259eb71195aba5feab532318b337"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drush-ops/drush/zipball/d36bca3322555a6f94edc94439873afcde2bbe90",
-                "reference": "d36bca3322555a6f94edc94439873afcde2bbe90",
+                "url": "https://api.github.com/repos/drush-ops/drush/zipball/0a570a16ec63259eb71195aba5feab532318b337",
+                "reference": "0a570a16ec63259eb71195aba5feab532318b337",
                 "shasum": ""
             },
             "require": {
@@ -4330,7 +4160,7 @@
                 "league/container": "^2.5 || ^3.4",
                 "php": ">=7.1.3",
                 "psr/log": "~1.0",
-                "psy/psysh": "~0.6",
+                "psy/psysh": ">=0.6 <0.11",
                 "symfony/event-dispatcher": "^3.4 || ^4.0",
                 "symfony/finder": "^3.4 || ^4.0 || ^5",
                 "symfony/var-dumper": "^3.4 || ^4.0 || ^5.0",
@@ -4436,7 +4266,7 @@
                 "irc": "irc://irc.freenode.org/drush",
                 "issues": "https://github.com/drush-ops/drush/issues",
                 "slack": "https://drupal.slack.com/messages/C62H9CWQM",
-                "source": "https://github.com/drush-ops/drush/tree/10.6.1"
+                "source": "https://github.com/drush-ops/drush/tree/10.6.2"
             },
             "funding": [
                 {
@@ -4444,7 +4274,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-10-05T11:14:14+00:00"
+            "time": "2021-12-15T17:09:54+00:00"
         },
         {
             "name": "easyrdf/easyrdf",
@@ -4523,27 +4353,27 @@
         },
         {
             "name": "egulias/email-validator",
-            "version": "2.1.25",
+            "version": "3.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/egulias/EmailValidator.git",
-                "reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4"
+                "reference": "ee0db30118f661fb166bcffbf5d82032df484697"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/0dbf5d78455d4d6a41d186da50adc1122ec066f4",
-                "reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ee0db30118f661fb166bcffbf5d82032df484697",
+                "reference": "ee0db30118f661fb166bcffbf5d82032df484697",
                 "shasum": ""
             },
             "require": {
-                "doctrine/lexer": "^1.0.1",
-                "php": ">=5.5",
-                "symfony/polyfill-intl-idn": "^1.10"
+                "doctrine/lexer": "^1.2",
+                "php": ">=7.2",
+                "symfony/polyfill-intl-idn": "^1.15"
             },
             "require-dev": {
-                "dominicsayers/isemail": "^3.0.7",
-                "phpunit/phpunit": "^4.8.36|^7.5.15",
-                "satooshi/php-coveralls": "^1.0.1"
+                "php-coveralls/php-coveralls": "^2.2",
+                "phpunit/phpunit": "^8.5.8|^9.3.3",
+                "vimeo/psalm": "^4"
             },
             "suggest": {
                 "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
@@ -4551,7 +4381,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1.x-dev"
+                    "dev-master": "3.0.x-dev"
                 }
             },
             "autoload": {
@@ -4579,7 +4409,7 @@
             ],
             "support": {
                 "issues": "https://github.com/egulias/EmailValidator/issues",
-                "source": "https://github.com/egulias/EmailValidator/tree/2.1.25"
+                "source": "https://github.com/egulias/EmailValidator/tree/3.1.2"
             },
             "funding": [
                 {
@@ -4587,7 +4417,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-12-29T14:50:06+00:00"
+            "time": "2021-10-11T09:18:27+00:00"
         },
         {
             "name": "enlightn/security-checker",
@@ -4701,91 +4531,32 @@
             },
             "time": "2021-08-09T23:46:54+00:00"
         },
-        {
-            "name": "fabpot/goutte",
-            "version": "v3.3.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/FriendsOfPHP/Goutte.git",
-                "reference": "80a23b64f44d54dd571d114c473d9d7e9ed84ca5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/80a23b64f44d54dd571d114c473d9d7e9ed84ca5",
-                "reference": "80a23b64f44d54dd571d114c473d9d7e9ed84ca5",
-                "shasum": ""
-            },
-            "require": {
-                "guzzlehttp/guzzle": "^6.0",
-                "php": ">=7.1.3",
-                "symfony/browser-kit": "^4.4|^5.0",
-                "symfony/css-selector": "^4.4|^5.0",
-                "symfony/dom-crawler": "^4.4|^5.0"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "^5.0"
-            },
-            "type": "application",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Goutte\\": "Goutte"
-                },
-                "exclude-from-classmap": [
-                    "Goutte/Tests"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "A simple PHP Web Scraper",
-            "homepage": "https://github.com/FriendsOfPHP/Goutte",
-            "keywords": [
-                "scraper"
-            ],
-            "support": {
-                "issues": "https://github.com/FriendsOfPHP/Goutte/issues",
-                "source": "https://github.com/FriendsOfPHP/Goutte/tree/v3.3.1"
-            },
-            "time": "2020-11-01T09:30:18+00:00"
-        },
         {
             "name": "friends-of-behat/mink-browserkit-driver",
-            "version": "v1.5.0",
+            "version": "v1.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfBehat/MinkBrowserKitDriver.git",
-                "reference": "8110b99ed1ac2b50ad287280bfc20e08f58b6cc6"
+                "reference": "b3c29f18fe20487846e4c2733b066ec5e47f4f76"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfBehat/MinkBrowserKitDriver/zipball/8110b99ed1ac2b50ad287280bfc20e08f58b6cc6",
-                "reference": "8110b99ed1ac2b50ad287280bfc20e08f58b6cc6",
+                "url": "https://api.github.com/repos/FriendsOfBehat/MinkBrowserKitDriver/zipball/b3c29f18fe20487846e4c2733b066ec5e47f4f76",
+                "reference": "b3c29f18fe20487846e4c2733b066ec5e47f4f76",
                 "shasum": ""
             },
             "require": {
                 "behat/mink": "^1.7",
-                "php": "^7.2|^8.0",
-                "symfony/browser-kit": "^4.4|^5.0",
-                "symfony/dom-crawler": "^4.4|^5.0"
+                "php": "^7.4|^8.0",
+                "symfony/browser-kit": "^4.4|^5.0|^6.0",
+                "symfony/dom-crawler": "^4.4|^5.0|^6.0"
             },
             "replace": {
                 "behat/mink-browserkit-driver": "self.version"
             },
             "require-dev": {
                 "friends-of-behat/mink-driver-testsuite": "dev-master",
-                "symfony/http-kernel": "^4.4|^5.0"
+                "symfony/http-kernel": "^4.4|^5.0|^6.0"
             },
             "type": "mink-driver",
             "extra": {
@@ -4818,9 +4589,9 @@
                 "testing"
             ],
             "support": {
-                "source": "https://github.com/FriendsOfBehat/MinkBrowserKitDriver/tree/v1.5.0"
+                "source": "https://github.com/FriendsOfBehat/MinkBrowserKitDriver/tree/v1.6.1"
             },
-            "time": "2021-02-04T14:39:46+00:00"
+            "time": "2021-12-13T10:41:57+00:00"
         },
         {
             "name": "grasmash/expander",
@@ -4998,16 +4769,16 @@
         },
         {
             "name": "guzzlehttp/promises",
-            "version": "1.4.1",
+            "version": "1.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/promises.git",
-                "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d"
+                "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/8e7d04f1f6450fef59366c399cfad4b9383aa30d",
-                "reference": "8e7d04f1f6450fef59366c399cfad4b9383aa30d",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
+                "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
                 "shasum": ""
             },
             "require": {
@@ -5019,7 +4790,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4-dev"
+                    "dev-master": "1.5-dev"
                 }
             },
             "autoload": {
@@ -5035,10 +4806,25 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
                 {
                     "name": "Michael Dowling",
                     "email": "mtdowling@gmail.com",
                     "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com",
+                    "homepage": "https://github.com/Nyholm"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "email": "webmaster@tubo-world.de",
+                    "homepage": "https://github.com/Tobion"
                 }
             ],
             "description": "Guzzle promises library",
@@ -5047,22 +4833,36 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/1.4.1"
+                "source": "https://github.com/guzzle/promises/tree/1.5.1"
             },
-            "time": "2021-03-07T09:25:29+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/Nyholm",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-10-22T20:56:57+00:00"
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.8.2",
+            "version": "1.8.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "dc960a912984efb74d0a90222870c72c87f10c91"
+                "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/dc960a912984efb74d0a90222870c72c87f10c91",
-                "reference": "dc960a912984efb74d0a90222870c72c87f10c91",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/1afdd860a2566ed3c2b0b4a3de6e23434a79ec85",
+                "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85",
                 "shasum": ""
             },
             "require": {
@@ -5099,13 +4899,34 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
                 {
                     "name": "Michael Dowling",
                     "email": "mtdowling@gmail.com",
                     "homepage": "https://github.com/mtdowling"
                 },
+                {
+                    "name": "George Mponos",
+                    "email": "gmponos@gmail.com",
+                    "homepage": "https://github.com/gmponos"
+                },
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com",
+                    "homepage": "https://github.com/Nyholm"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://github.com/sagikazarmark"
+                },
                 {
                     "name": "Tobias Schultze",
+                    "email": "webmaster@tubo-world.de",
                     "homepage": "https://github.com/Tobion"
                 }
             ],
@@ -5122,22 +4943,36 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/1.8.2"
+                "source": "https://github.com/guzzle/psr7/tree/1.8.3"
             },
-            "time": "2021-04-26T09:17:50+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/Nyholm",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-10-05T13:56:00+00:00"
         },
         {
             "name": "instaclick/php-webdriver",
-            "version": "1.4.9",
+            "version": "1.4.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/instaclick/php-webdriver.git",
-                "reference": "961b12178cb71f8667afaf2f66ab3e000e060e1c"
+                "reference": "6bc1f44cf23031e68c326cd61e14ec32486f241b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/961b12178cb71f8667afaf2f66ab3e000e060e1c",
-                "reference": "961b12178cb71f8667afaf2f66ab3e000e060e1c",
+                "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/6bc1f44cf23031e68c326cd61e14ec32486f241b",
+                "reference": "6bc1f44cf23031e68c326cd61e14ec32486f241b",
                 "shasum": ""
             },
             "require": {
@@ -5185,9 +5020,9 @@
             ],
             "support": {
                 "issues": "https://github.com/instaclick/php-webdriver/issues",
-                "source": "https://github.com/instaclick/php-webdriver/tree/1.4.9"
+                "source": "https://github.com/instaclick/php-webdriver/tree/1.4.10"
             },
-            "time": "2021-06-28T22:23:20+00:00"
+            "time": "2021-10-14T03:25:34+00:00"
         },
         {
             "name": "justinrainbow/json-schema",
@@ -5261,34 +5096,31 @@
         },
         {
             "name": "laminas/laminas-diactoros",
-            "version": "2.6.0",
+            "version": "2.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-diactoros.git",
-                "reference": "7d2034110ae18afe05050b796a3ee4b3fe177876"
+                "reference": "0c26ef1d95b6d7e6e3943a243ba3dc0797227199"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/7d2034110ae18afe05050b796a3ee4b3fe177876",
-                "reference": "7d2034110ae18afe05050b796a3ee4b3fe177876",
+                "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/0c26ef1d95b6d7e6e3943a243ba3dc0797227199",
+                "reference": "0c26ef1d95b6d7e6e3943a243ba3dc0797227199",
                 "shasum": ""
             },
             "require": {
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^7.3 || ~8.0.0",
+                "php": "^7.3 || ~8.0.0 || ~8.1.0",
                 "psr/http-factory": "^1.0",
                 "psr/http-message": "^1.0"
             },
             "conflict": {
-                "phpspec/prophecy": "<1.9.0"
+                "phpspec/prophecy": "<1.9.0",
+                "zendframework/zend-diactoros": "*"
             },
             "provide": {
                 "psr/http-factory-implementation": "1.0",
                 "psr/http-message-implementation": "1.0"
             },
-            "replace": {
-                "zendframework/zend-diactoros": "^2.2.1"
-            },
             "require-dev": {
                 "ext-curl": "*",
                 "ext-dom": "*",
@@ -5359,31 +5191,30 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2021-05-18T14:41:54+00:00"
+            "time": "2021-09-22T03:54:36+00:00"
         },
         {
             "name": "laminas/laminas-escaper",
-            "version": "2.7.0",
+            "version": "2.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-escaper.git",
-                "reference": "5e04bc5ae5990b17159d79d331055e2c645e5cc5"
+                "reference": "891ad70986729e20ed2e86355fcf93c9dc238a5f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/5e04bc5ae5990b17159d79d331055e2c645e5cc5",
-                "reference": "5e04bc5ae5990b17159d79d331055e2c645e5cc5",
+                "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/891ad70986729e20ed2e86355fcf93c9dc238a5f",
+                "reference": "891ad70986729e20ed2e86355fcf93c9dc238a5f",
                 "shasum": ""
             },
             "require": {
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^7.3 || ~8.0.0"
+                "php": "^7.3 || ~8.0.0 || ~8.1.0"
             },
-            "replace": {
-                "zendframework/zend-escaper": "^2.6.1"
+            "conflict": {
+                "zendframework/zend-escaper": "*"
             },
             "require-dev": {
-                "laminas/laminas-coding-standard": "~1.0.0",
+                "laminas/laminas-coding-standard": "~2.3.0",
                 "phpunit/phpunit": "^9.3",
                 "psalm/plugin-phpunit": "^0.12.2",
                 "vimeo/psalm": "^3.16"
@@ -5422,44 +5253,41 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2020-11-17T21:26:43+00:00"
+            "time": "2021-09-02T17:10:53+00:00"
         },
         {
             "name": "laminas/laminas-feed",
-            "version": "2.14.1",
+            "version": "2.15.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-feed.git",
-                "reference": "463fdae515fba30633906098c258d3b2c733c15c"
+                "reference": "3ef837a12833c74b438d2c3780023c4244e0abae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-feed/zipball/463fdae515fba30633906098c258d3b2c733c15c",
-                "reference": "463fdae515fba30633906098c258d3b2c733c15c",
+                "url": "https://api.github.com/repos/laminas/laminas-feed/zipball/3ef837a12833c74b438d2c3780023c4244e0abae",
+                "reference": "3ef837a12833c74b438d2c3780023c4244e0abae",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
-                "laminas/laminas-escaper": "^2.5.2",
-                "laminas/laminas-stdlib": "^3.2.1",
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^7.3 || ~8.0.0"
+                "laminas/laminas-escaper": "^2.9",
+                "laminas/laminas-stdlib": "^3.6",
+                "php": "^7.3 || ~8.0.0 || ~8.1.0"
             },
             "conflict": {
-                "laminas/laminas-servicemanager": "<3.3"
-            },
-            "replace": {
-                "zendframework/zend-feed": "^2.12.0"
+                "laminas/laminas-servicemanager": "<3.3",
+                "zendframework/zend-feed": "*"
             },
             "require-dev": {
                 "laminas/laminas-cache": "^2.7.2",
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "laminas/laminas-db": "^2.8.2",
-                "laminas/laminas-http": "^2.7",
-                "laminas/laminas-servicemanager": "^3.3",
-                "laminas/laminas-validator": "^2.10.1",
-                "phpunit/phpunit": "^9.3",
+                "laminas/laminas-coding-standard": "~2.2.1",
+                "laminas/laminas-db": "^2.13.3",
+                "laminas/laminas-http": "^2.15",
+                "laminas/laminas-servicemanager": "^3.7",
+                "laminas/laminas-validator": "^2.15",
+                "phpunit/phpunit": "^9.5.5",
                 "psalm/plugin-phpunit": "^0.13.0",
                 "psr/http-message": "^1.0.1",
                 "vimeo/psalm": "^4.1"
@@ -5469,90 +5297,32 @@
                 "laminas/laminas-db": "Laminas\\Db component, for use with PubSubHubbub",
                 "laminas/laminas-http": "Laminas\\Http for PubSubHubbub, and optionally for use with Laminas\\Feed\\Reader",
                 "laminas/laminas-servicemanager": "Laminas\\ServiceManager component, for easily extending ExtensionManager implementations",
-                "laminas/laminas-validator": "Laminas\\Validator component, for validating email addresses used in Atom feeds and entries when using the Writer subcomponent",
-                "psr/http-message": "PSR-7 ^1.0.1, if you wish to use Laminas\\Feed\\Reader\\Http\\Psr7ResponseDecorator"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Laminas\\Feed\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "provides functionality for consuming RSS and Atom feeds",
-            "homepage": "https://laminas.dev",
-            "keywords": [
-                "feed",
-                "laminas"
-            ],
-            "support": {
-                "chat": "https://laminas.dev/chat",
-                "docs": "https://docs.laminas.dev/laminas-feed/",
-                "forum": "https://discourse.laminas.dev",
-                "issues": "https://github.com/laminas/laminas-feed/issues",
-                "rss": "https://github.com/laminas/laminas-feed/releases.atom",
-                "source": "https://github.com/laminas/laminas-feed"
-            },
-            "funding": [
-                {
-                    "url": "https://funding.communitybridge.org/projects/laminas-project",
-                    "type": "community_bridge"
-                }
-            ],
-            "time": "2021-04-01T19:26:09+00:00"
-        },
-        {
-            "name": "laminas/laminas-stdlib",
-            "version": "3.3.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laminas/laminas-stdlib.git",
-                "reference": "d81c7ffe602ed0e6ecb18691019111c0f4bf1efe"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/d81c7ffe602ed0e6ecb18691019111c0f4bf1efe",
-                "reference": "d81c7ffe602ed0e6ecb18691019111c0f4bf1efe",
-                "shasum": ""
-            },
-            "require": {
-                "laminas/laminas-zendframework-bridge": "^1.0",
-                "php": "^7.3 || ^8.0"
-            },
-            "replace": {
-                "zendframework/zend-stdlib": "^3.2.1"
-            },
-            "require-dev": {
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "phpbench/phpbench": "^0.17.1",
-                "phpunit/phpunit": "~9.3.7"
+                "laminas/laminas-validator": "Laminas\\Validator component, for validating email addresses used in Atom feeds and entries when using the Writer subcomponent",
+                "psr/http-message": "PSR-7 ^1.0.1, if you wish to use Laminas\\Feed\\Reader\\Http\\Psr7ResponseDecorator"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Laminas\\Stdlib\\": "src/"
+                    "Laminas\\Feed\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "SPL extensions, array utilities, error handlers, and more",
+            "description": "provides functionality for consuming RSS and Atom feeds",
             "homepage": "https://laminas.dev",
             "keywords": [
-                "laminas",
-                "stdlib"
+                "feed",
+                "laminas"
             ],
             "support": {
                 "chat": "https://laminas.dev/chat",
-                "docs": "https://docs.laminas.dev/laminas-stdlib/",
+                "docs": "https://docs.laminas.dev/laminas-feed/",
                 "forum": "https://discourse.laminas.dev",
-                "issues": "https://github.com/laminas/laminas-stdlib/issues",
-                "rss": "https://github.com/laminas/laminas-stdlib/releases.atom",
-                "source": "https://github.com/laminas/laminas-stdlib"
+                "issues": "https://github.com/laminas/laminas-feed/issues",
+                "rss": "https://github.com/laminas/laminas-feed/releases.atom",
+                "source": "https://github.com/laminas/laminas-feed"
             },
             "funding": [
                 {
@@ -5560,61 +5330,58 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2020-11-19T20:18:59+00:00"
+            "time": "2021-09-20T18:11:11+00:00"
         },
         {
-            "name": "laminas/laminas-zendframework-bridge",
-            "version": "1.2.0",
+            "name": "laminas/laminas-stdlib",
+            "version": "3.6.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/laminas/laminas-zendframework-bridge.git",
-                "reference": "6cccbddfcfc742eb02158d6137ca5687d92cee32"
+                "url": "https://github.com/laminas/laminas-stdlib.git",
+                "reference": "db581851a092246ad99e12d4fddf105184924c71"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-zendframework-bridge/zipball/6cccbddfcfc742eb02158d6137ca5687d92cee32",
-                "reference": "6cccbddfcfc742eb02158d6137ca5687d92cee32",
+                "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/db581851a092246ad99e12d4fddf105184924c71",
+                "reference": "db581851a092246ad99e12d4fddf105184924c71",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ^8.0"
+                "php": "^7.3 || ~8.0.0 || ~8.1.0"
+            },
+            "conflict": {
+                "zendframework/zend-stdlib": "*"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.1 || ^9.3",
-                "psalm/plugin-phpunit": "^0.15.1",
-                "squizlabs/php_codesniffer": "^3.5",
-                "vimeo/psalm": "^4.6"
+                "laminas/laminas-coding-standard": "~2.3.0",
+                "phpbench/phpbench": "^0.17.1",
+                "phpunit/phpunit": "~9.3.7",
+                "psalm/plugin-phpunit": "^0.16.0",
+                "vimeo/psalm": "^4.7"
             },
             "type": "library",
-            "extra": {
-                "laminas": {
-                    "module": "Laminas\\ZendFrameworkBridge"
-                }
-            },
             "autoload": {
-                "files": [
-                    "src/autoload.php"
-                ],
                 "psr-4": {
-                    "Laminas\\ZendFrameworkBridge\\": "src//"
+                    "Laminas\\Stdlib\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Alias legacy ZF class names to Laminas Project equivalents.",
+            "description": "SPL extensions, array utilities, error handlers, and more",
+            "homepage": "https://laminas.dev",
             "keywords": [
-                "ZendFramework",
-                "autoloading",
                 "laminas",
-                "zf"
+                "stdlib"
             ],
             "support": {
-                "forum": "https://discourse.laminas.dev/",
-                "issues": "https://github.com/laminas/laminas-zendframework-bridge/issues",
-                "rss": "https://github.com/laminas/laminas-zendframework-bridge/releases.atom",
-                "source": "https://github.com/laminas/laminas-zendframework-bridge"
+                "chat": "https://laminas.dev/chat",
+                "docs": "https://docs.laminas.dev/laminas-stdlib/",
+                "forum": "https://discourse.laminas.dev",
+                "issues": "https://github.com/laminas/laminas-stdlib/issues",
+                "rss": "https://github.com/laminas/laminas-stdlib/releases.atom",
+                "source": "https://github.com/laminas/laminas-stdlib"
             },
             "funding": [
                 {
@@ -5622,7 +5389,7 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2021-02-25T21:54:58+00:00"
+            "time": "2021-11-10T11:33:52+00:00"
         },
         {
             "name": "league/commonmark",
@@ -5806,16 +5573,16 @@
         },
         {
             "name": "league/html-to-markdown",
-            "version": "5.0.1",
+            "version": "5.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/html-to-markdown.git",
-                "reference": "e5600a2c5ce7b7571b16732c7086940f56f7abec"
+                "reference": "4d0394e120dc14b0d5c52fd1755fd48656da2ec9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/e5600a2c5ce7b7571b16732c7086940f56f7abec",
-                "reference": "e5600a2c5ce7b7571b16732c7086940f56f7abec",
+                "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/4d0394e120dc14b0d5c52fd1755fd48656da2ec9",
+                "reference": "4d0394e120dc14b0d5c52fd1755fd48656da2ec9",
                 "shasum": ""
             },
             "require": {
@@ -5871,7 +5638,7 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/html-to-markdown/issues",
-                "source": "https://github.com/thephpleague/html-to-markdown/tree/5.0.1"
+                "source": "https://github.com/thephpleague/html-to-markdown/tree/5.0.2"
             },
             "funding": [
                 {
@@ -5891,7 +5658,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-17T20:00:27+00:00"
+            "time": "2021-11-06T05:38:26+00:00"
         },
         {
             "name": "league/oauth2-client",
@@ -5965,16 +5732,16 @@
         },
         {
             "name": "masterminds/html5",
-            "version": "2.7.4",
+            "version": "2.7.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Masterminds/html5-php.git",
-                "reference": "9227822783c75406cfe400984b2f095cdf03d417"
+                "reference": "f640ac1bdddff06ea333a920c95bbad8872429ab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/9227822783c75406cfe400984b2f095cdf03d417",
-                "reference": "9227822783c75406cfe400984b2f095cdf03d417",
+                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f640ac1bdddff06ea333a920c95bbad8872429ab",
+                "reference": "f640ac1bdddff06ea333a920c95bbad8872429ab",
                 "shasum": ""
             },
             "require": {
@@ -5984,7 +5751,7 @@
                 "php": ">=5.3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35"
+                "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7"
             },
             "type": "library",
             "extra": {
@@ -6028,9 +5795,9 @@
             ],
             "support": {
                 "issues": "https://github.com/Masterminds/html5-php/issues",
-                "source": "https://github.com/Masterminds/html5-php/tree/2.7.4"
+                "source": "https://github.com/Masterminds/html5-php/tree/2.7.5"
             },
-            "time": "2020-10-01T13:52:52+00:00"
+            "time": "2021-07-01T14:25:37+00:00"
         },
         {
             "name": "mikey179/vfsstream",
@@ -6143,16 +5910,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.13.0",
+            "version": "v4.13.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "50953a2691a922aa1769461637869a0a2faa3f53"
+                "reference": "210577fe3cf7badcc5814d99455df46564f3c077"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/50953a2691a922aa1769461637869a0a2faa3f53",
-                "reference": "50953a2691a922aa1769461637869a0a2faa3f53",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077",
+                "reference": "210577fe3cf7badcc5814d99455df46564f3c077",
                 "shasum": ""
             },
             "require": {
@@ -6193,9 +5960,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.0"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2"
             },
-            "time": "2021-09-20T12:20:58+00:00"
+            "time": "2021-11-30T19:35:32+00:00"
         },
         {
             "name": "paragonie/random_compat",
@@ -6380,16 +6147,16 @@
         },
         {
             "name": "pear/pear-core-minimal",
-            "version": "v1.10.10",
+            "version": "v1.10.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/pear-core-minimal.git",
-                "reference": "625a3c429d9b2c1546438679074cac1b089116a7"
+                "reference": "68d0d32ada737153b7e93b8d3c710ebe70ac867d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/625a3c429d9b2c1546438679074cac1b089116a7",
-                "reference": "625a3c429d9b2c1546438679074cac1b089116a7",
+                "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/68d0d32ada737153b7e93b8d3c710ebe70ac867d",
+                "reference": "68d0d32ada737153b7e93b8d3c710ebe70ac867d",
                 "shasum": ""
             },
             "require": {
@@ -6424,7 +6191,7 @@
                 "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=PEAR",
                 "source": "https://github.com/pear/pear-core-minimal"
             },
-            "time": "2019-11-19T19:00:24+00:00"
+            "time": "2021-08-10T22:31:03+00:00"
         },
         {
             "name": "pear/pear_exception",
@@ -6487,34 +6254,34 @@
         },
         {
             "name": "pelago/emogrifier",
-            "version": "v5.0.1",
+            "version": "v6.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/MyIntervals/emogrifier.git",
-                "reference": "37595a9bb62c3c25969bdd9e8d7dd24c3ac62bc9"
+                "reference": "aa72d5407efac118f3896bcb995a2cba793df0ae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/37595a9bb62c3c25969bdd9e8d7dd24c3ac62bc9",
-                "reference": "37595a9bb62c3c25969bdd9e8d7dd24c3ac62bc9",
+                "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/aa72d5407efac118f3896bcb995a2cba793df0ae",
+                "reference": "aa72d5407efac118f3896bcb995a2cba793df0ae",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
-                "php": "~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0",
-                "symfony/css-selector": "^3.4.32 || ^4.4 || ^5.1"
+                "php": "~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0",
+                "sabberworm/php-css-parser": "^8.3.1",
+                "symfony/css-selector": "^3.4.32 || ^4.4 || ^5.3 || ^6.0"
             },
             "require-dev": {
-                "php-parallel-lint/php-parallel-lint": "^1.2.0",
-                "rawr/cross-data-providers": "^2.3.0",
-                "slevomat/coding-standard": "^6.4.1",
-                "squizlabs/php_codesniffer": "^3.5.8"
+                "php-parallel-lint/php-parallel-lint": "^1.3.0",
+                "phpunit/phpunit": "^8.5.16",
+                "rawr/cross-data-providers": "^2.3.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "6.0.x-dev"
+                    "dev-main": "7.0.x-dev"
                 }
             },
             "autoload": {
@@ -6561,7 +6328,7 @@
                 "issues": "https://github.com/MyIntervals/emogrifier/issues",
                 "source": "https://github.com/MyIntervals/emogrifier"
             },
-            "time": "2021-04-06T08:18:22+00:00"
+            "time": "2021-09-16T16:22:04+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -6769,16 +6536,16 @@
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "5.2.2",
+            "version": "5.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556"
+                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556",
-                "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170",
+                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170",
                 "shasum": ""
             },
             "require": {
@@ -6789,7 +6556,8 @@
                 "webmozart/assert": "^1.9.1"
             },
             "require-dev": {
-                "mockery/mockery": "~1.3.2"
+                "mockery/mockery": "~1.3.2",
+                "psalm/phar": "^4.8"
             },
             "type": "library",
             "extra": {
@@ -6819,9 +6587,9 @@
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
             "support": {
                 "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master"
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0"
             },
-            "time": "2020-09-03T19:13:55+00:00"
+            "time": "2021-10-19T17:43:47+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
@@ -6875,16 +6643,16 @@
         },
         {
             "name": "phpspec/prophecy",
-            "version": "1.14.0",
+            "version": "v1.15.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e"
+                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e",
-                "reference": "d86dfc2e2a3cd366cee475e52c6bb3bbc371aa0e",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
+                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
                 "shasum": ""
             },
             "require": {
@@ -6936,29 +6704,29 @@
             ],
             "support": {
                 "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/1.14.0"
+                "source": "https://github.com/phpspec/prophecy/tree/v1.15.0"
             },
-            "time": "2021-09-10T09:02:12+00:00"
+            "time": "2021-12-08T12:19:24+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.7",
+            "version": "9.2.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "d4c798ed8d51506800b441f7a13ecb0f76f12218"
+                "reference": "d5850aaf931743067f4bfc1ae4cbd06468400687"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/d4c798ed8d51506800b441f7a13ecb0f76f12218",
-                "reference": "d4c798ed8d51506800b441f7a13ecb0f76f12218",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/d5850aaf931743067f4bfc1ae4cbd06468400687",
+                "reference": "d5850aaf931743067f4bfc1ae4cbd06468400687",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.12.0",
+                "nikic/php-parser": "^4.13.0",
                 "php": ">=7.3",
                 "phpunit/php-file-iterator": "^3.0.3",
                 "phpunit/php-text-template": "^2.0.2",
@@ -7007,7 +6775,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.7"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.10"
             },
             "funding": [
                 {
@@ -7015,20 +6783,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-09-17T05:39:03+00:00"
+            "time": "2021-12-05T09:12:13+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "3.0.5",
+            "version": "3.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8"
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/aa4be8575f26070b100fccb67faabb28f21f66f8",
-                "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
                 "shasum": ""
             },
             "require": {
@@ -7067,7 +6835,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.5"
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6"
             },
             "funding": [
                 {
@@ -7075,7 +6843,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:57:25+00:00"
+            "time": "2021-12-02T12:48:52+00:00"
         },
         {
             "name": "phpunit/php-invoker",
@@ -7618,16 +7386,16 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.10.8",
+            "version": "v0.10.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "e4573f47750dd6c92dca5aee543fa77513cbd8d3"
+                "reference": "a0d9981aa07ecfcbea28e4bfa868031cca121e7d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/e4573f47750dd6c92dca5aee543fa77513cbd8d3",
-                "reference": "e4573f47750dd6c92dca5aee543fa77513cbd8d3",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/a0d9981aa07ecfcbea28e4bfa868031cca121e7d",
+                "reference": "a0d9981aa07ecfcbea28e4bfa868031cca121e7d",
                 "shasum": ""
             },
             "require": {
@@ -7687,9 +7455,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.10.8"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.10.12"
             },
-            "time": "2021-04-10T16:23:39+00:00"
+            "time": "2021-11-30T14:05:36+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -7805,6 +7573,59 @@
             },
             "type": "drupal-library"
         },
+        {
+            "name": "sabberworm/php-css-parser",
+            "version": "8.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sabberworm/PHP-CSS-Parser.git",
+                "reference": "e41d2140031d533348b2192a83f02d8dd8a71d30"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/e41d2140031d533348b2192a83f02d8dd8a71d30",
+                "reference": "e41d2140031d533348b2192a83f02d8dd8a71d30",
+                "shasum": ""
+            },
+            "require": {
+                "ext-iconv": "*",
+                "php": ">=5.6.20"
+            },
+            "require-dev": {
+                "codacy/coverage": "^1.4",
+                "phpunit/phpunit": "^4.8.36"
+            },
+            "suggest": {
+                "ext-mbstring": "for parsing UTF-8 CSS"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Sabberworm\\CSS\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Raphael Schweikert"
+                }
+            ],
+            "description": "Parser for CSS Files written in PHP",
+            "homepage": "https://www.sabberworm.com/blog/2010/6/10/php-css-parser",
+            "keywords": [
+                "css",
+                "parser",
+                "stylesheet"
+            ],
+            "support": {
+                "issues": "https://github.com/sabberworm/PHP-CSS-Parser/issues",
+                "source": "https://github.com/sabberworm/PHP-CSS-Parser/tree/8.4.0"
+            },
+            "time": "2021-12-11T13:40:54+00:00"
+        },
         {
             "name": "sebastian/cli-parser",
             "version": "1.0.1",
@@ -8234,16 +8055,16 @@
         },
         {
             "name": "sebastian/exporter",
-            "version": "4.0.3",
+            "version": "4.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65"
+                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/d89cc98761b8cb5a1a235a6b703ae50d34080e65",
-                "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9",
+                "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9",
                 "shasum": ""
             },
             "require": {
@@ -8292,14 +8113,14 @@
                 }
             ],
             "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "homepage": "https://www.github.com/sebastianbergmann/exporter",
             "keywords": [
                 "export",
                 "exporter"
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.3"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4"
             },
             "funding": [
                 {
@@ -8307,7 +8128,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:24:23+00:00"
+            "time": "2021-11-11T14:18:36+00:00"
         },
         {
             "name": "sebastian/global-state",
@@ -8834,16 +8655,16 @@
         },
         {
             "name": "seld/phar-utils",
-            "version": "1.1.2",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/phar-utils.git",
-                "reference": "749042a2315705d2dfbbc59234dd9ceb22bf3ff0"
+                "reference": "9f3452c93ff423469c0d56450431562ca423dcee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/749042a2315705d2dfbbc59234dd9ceb22bf3ff0",
-                "reference": "749042a2315705d2dfbbc59234dd9ceb22bf3ff0",
+                "url": "https://api.github.com/repos/Seldaek/phar-utils/zipball/9f3452c93ff423469c0d56450431562ca423dcee",
+                "reference": "9f3452c93ff423469c0d56450431562ca423dcee",
                 "shasum": ""
             },
             "require": {
@@ -8876,9 +8697,9 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/phar-utils/issues",
-                "source": "https://github.com/Seldaek/phar-utils/tree/1.1.2"
+                "source": "https://github.com/Seldaek/phar-utils/tree/1.2.0"
             },
-            "time": "2021-08-19T21:01:38+00:00"
+            "time": "2021-12-10T11:20:11+00:00"
         },
         {
             "name": "sirbrillig/phpcs-variable-analysis",
@@ -8935,16 +8756,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.6.0",
+            "version": "3.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625"
+                "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ffced0d2c8fa8e6cdc4d695a743271fab6c38625",
-                "reference": "ffced0d2c8fa8e6cdc4d695a743271fab6c38625",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5e4e71592f69da17871dba6e80dd51bce74a351a",
+                "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a",
                 "shasum": ""
             },
             "require": {
@@ -8987,7 +8808,7 @@
                 "source": "https://github.com/squizlabs/PHP_CodeSniffer",
                 "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
             },
-            "time": "2021-04-09T00:54:41+00:00"
+            "time": "2021-12-12T21:44:58+00:00"
         },
         {
             "name": "stack/builder",
@@ -9045,21 +8866,21 @@
         },
         {
             "name": "symfony-cmf/routing",
-            "version": "2.3.3",
+            "version": "2.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony-cmf/Routing.git",
-                "reference": "3c97e7b7709b313cecfb76d691ad4cc22acbf3f5"
+                "reference": "bbcdf2f6301d740454ba9ebb8adaefd436c36a6b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/3c97e7b7709b313cecfb76d691ad4cc22acbf3f5",
-                "reference": "3c97e7b7709b313cecfb76d691ad4cc22acbf3f5",
+                "url": "https://api.github.com/repos/symfony-cmf/Routing/zipball/bbcdf2f6301d740454ba9ebb8adaefd436c36a6b",
+                "reference": "bbcdf2f6301d740454ba9ebb8adaefd436c36a6b",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2 || ^8.0",
-                "psr/log": "^1.0",
+                "psr/log": "^1.0 || ^2.0 || ^3.0",
                 "symfony/http-kernel": "^4.4 || ^5.0",
                 "symfony/routing": "^4.4 || ^5.0"
             },
@@ -9102,9 +8923,9 @@
             ],
             "support": {
                 "issues": "https://github.com/symfony-cmf/Routing/issues",
-                "source": "https://github.com/symfony-cmf/Routing/tree/2.3.3"
+                "source": "https://github.com/symfony-cmf/Routing/tree/2.3.4"
             },
-            "time": "2020-10-06T10:15:37+00:00"
+            "time": "2021-11-08T16:33:10+00:00"
         },
         {
             "name": "symfony/browser-kit",
@@ -9180,36 +9001,37 @@
         },
         {
             "name": "symfony/console",
-            "version": "v4.4.25",
+            "version": "v4.4.34",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "a62acecdf5b50e314a4f305cd01b5282126f3095"
+                "reference": "329b3a75cc6b16d435ba1b1a41df54a53382a3f0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/a62acecdf5b50e314a4f305cd01b5282126f3095",
-                "reference": "a62acecdf5b50e314a4f305cd01b5282126f3095",
+                "url": "https://api.github.com/repos/symfony/console/zipball/329b3a75cc6b16d435ba1b1a41df54a53382a3f0",
+                "reference": "329b3a75cc6b16d435ba1b1a41df54a53382a3f0",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1.3",
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/polyfill-php73": "^1.8",
-                "symfony/polyfill-php80": "^1.15",
+                "symfony/polyfill-php80": "^1.16",
                 "symfony/service-contracts": "^1.1|^2"
             },
             "conflict": {
+                "psr/log": ">=3",
                 "symfony/dependency-injection": "<3.4",
                 "symfony/event-dispatcher": "<4.3|>=5",
                 "symfony/lock": "<4.4",
                 "symfony/process": "<3.3"
             },
             "provide": {
-                "psr/log-implementation": "1.0"
+                "psr/log-implementation": "1.0|2.0"
             },
             "require-dev": {
-                "psr/log": "~1.0",
+                "psr/log": "^1|^2",
                 "symfony/config": "^3.4|^4.0|^5.0",
                 "symfony/dependency-injection": "^3.4|^4.0|^5.0",
                 "symfony/event-dispatcher": "^4.3",
@@ -9249,7 +9071,7 @@
             "description": "Eases the creation of beautiful and testable command line interfaces",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/console/tree/v4.4.25"
+                "source": "https://github.com/symfony/console/tree/v4.4.34"
             },
             "funding": [
                 {
@@ -9265,7 +9087,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-26T11:20:16+00:00"
+            "time": "2021-11-04T12:23:33+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -9335,22 +9157,21 @@
         },
         {
             "name": "symfony/debug",
-            "version": "v4.4.25",
+            "version": "v4.4.31",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "a8d2d5c94438548bff9f998ca874e202bb29d07f"
+                "reference": "43ede438d4cb52cd589ae5dc070e9323866ba8e0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/a8d2d5c94438548bff9f998ca874e202bb29d07f",
-                "reference": "a8d2d5c94438548bff9f998ca874e202bb29d07f",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/43ede438d4cb52cd589ae5dc070e9323866ba8e0",
+                "reference": "43ede438d4cb52cd589ae5dc070e9323866ba8e0",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1.3",
-                "psr/log": "~1.0",
-                "symfony/polyfill-php80": "^1.15"
+                "psr/log": "^1|^2|^3"
             },
             "conflict": {
                 "symfony/http-kernel": "<3.4"
@@ -9384,7 +9205,7 @@
             "description": "Provides tools to ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/debug/tree/v4.4.25"
+                "source": "https://github.com/symfony/debug/tree/v4.4.31"
             },
             "funding": [
                 {
@@ -9400,25 +9221,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-26T17:39:37+00:00"
+            "time": "2021-09-24T13:30:14+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v4.4.25",
+            "version": "v4.4.34",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "2ed2a0a6c960bf4e2e862ec77b2f2c558b83c64d"
+                "reference": "117d7f132ed7efbd535ec947709d49bec1b9d24b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/2ed2a0a6c960bf4e2e862ec77b2f2c558b83c64d",
-                "reference": "2ed2a0a6c960bf4e2e862ec77b2f2c558b83c64d",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/117d7f132ed7efbd535ec947709d49bec1b9d24b",
+                "reference": "117d7f132ed7efbd535ec947709d49bec1b9d24b",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1.3",
                 "psr/container": "^1.0",
+                "symfony/polyfill-php80": "^1.16",
                 "symfony/service-contracts": "^1.1.6|^2"
             },
             "conflict": {
@@ -9469,7 +9291,7 @@
             "description": "Allows you to standardize and centralize the way objects are constructed in your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dependency-injection/tree/v4.4.25"
+                "source": "https://github.com/symfony/dependency-injection/tree/v4.4.34"
             },
             "funding": [
                 {
@@ -9485,20 +9307,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-26T17:54:16+00:00"
+            "time": "2021-11-15T14:42:25+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v2.4.0",
+            "version": "v2.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627"
+                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627",
-                "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8",
+                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8",
                 "shasum": ""
             },
             "require": {
@@ -9507,7 +9329,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.4-dev"
+                    "dev-main": "2.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -9536,7 +9358,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.4.0"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.0"
             },
             "funding": [
                 {
@@ -9552,7 +9374,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-03-23T23:28:01+00:00"
+            "time": "2021-07-12T14:48:14+00:00"
         },
         {
             "name": "symfony/dom-crawler",
@@ -9630,23 +9452,22 @@
         },
         {
             "name": "symfony/error-handler",
-            "version": "v4.4.25",
+            "version": "v4.4.34",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "310a756cec00d29d89a08518405aded046a54a8b"
+                "reference": "17785c374645def1e884d8ec49976c156c61db4d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/310a756cec00d29d89a08518405aded046a54a8b",
-                "reference": "310a756cec00d29d89a08518405aded046a54a8b",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/17785c374645def1e884d8ec49976c156c61db4d",
+                "reference": "17785c374645def1e884d8ec49976c156c61db4d",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1.3",
-                "psr/log": "~1.0",
+                "psr/log": "^1|^2|^3",
                 "symfony/debug": "^4.4.5",
-                "symfony/polyfill-php80": "^1.15",
                 "symfony/var-dumper": "^4.4|^5.0"
             },
             "require-dev": {
@@ -9679,7 +9500,7 @@
             "description": "Provides tools to manage errors and ease debugging PHP code",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/error-handler/tree/v4.4.25"
+                "source": "https://github.com/symfony/error-handler/tree/v4.4.34"
             },
             "funding": [
                 {
@@ -9695,25 +9516,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-26T17:39:37+00:00"
+            "time": "2021-11-12T14:57:39+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v4.4.25",
+            "version": "v4.4.34",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "047773e7016e4fd45102cedf4bd2558ae0d0c32f"
+                "reference": "1a024b45369c9d55d76b6b8a241bd20c9ea1cbd8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/047773e7016e4fd45102cedf4bd2558ae0d0c32f",
-                "reference": "047773e7016e4fd45102cedf4bd2558ae0d0c32f",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1a024b45369c9d55d76b6b8a241bd20c9ea1cbd8",
+                "reference": "1a024b45369c9d55d76b6b8a241bd20c9ea1cbd8",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1.3",
-                "symfony/event-dispatcher-contracts": "^1.1"
+                "symfony/event-dispatcher-contracts": "^1.1",
+                "symfony/polyfill-php80": "^1.16"
             },
             "conflict": {
                 "symfony/dependency-injection": "<3.4"
@@ -9723,7 +9545,7 @@
                 "symfony/event-dispatcher-implementation": "1.1"
             },
             "require-dev": {
-                "psr/log": "~1.0",
+                "psr/log": "^1|^2|^3",
                 "symfony/config": "^3.4|^4.0|^5.0",
                 "symfony/dependency-injection": "^3.4|^4.0|^5.0",
                 "symfony/error-handler": "~3.4|~4.4",
@@ -9762,7 +9584,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.25"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.34"
             },
             "funding": [
                 {
@@ -9778,20 +9600,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-26T17:39:37+00:00"
+            "time": "2021-11-15T14:42:25+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v1.1.9",
+            "version": "v1.1.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "84e23fdcd2517bf37aecbd16967e83f0caee25a7"
+                "reference": "01e9a4efac0ee33a05dfdf93b346f62e7d0e998c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/84e23fdcd2517bf37aecbd16967e83f0caee25a7",
-                "reference": "84e23fdcd2517bf37aecbd16967e83f0caee25a7",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/01e9a4efac0ee33a05dfdf93b346f62e7d0e998c",
+                "reference": "01e9a4efac0ee33a05dfdf93b346f62e7d0e998c",
                 "shasum": ""
             },
             "require": {
@@ -9804,7 +9626,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1-dev"
+                    "dev-main": "1.1-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -9841,7 +9663,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.1.9"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.1.11"
             },
             "funding": [
                 {
@@ -9857,7 +9679,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-07-06T13:19:58+00:00"
+            "time": "2021-03-23T15:25:38+00:00"
         },
         {
             "name": "symfony/filesystem",
@@ -9986,34 +9808,31 @@
         },
         {
             "name": "symfony/flex",
-            "version": "v1.16.3",
+            "version": "v2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/flex.git",
-                "reference": "f05406b33681409b83285f4d2ff4efbca7c55b03"
+                "reference": "3dbfa5c4e3308fd9def9a2006a20fa0c272a30a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/flex/zipball/f05406b33681409b83285f4d2ff4efbca7c55b03",
-                "reference": "f05406b33681409b83285f4d2ff4efbca7c55b03",
+                "url": "https://api.github.com/repos/symfony/flex/zipball/3dbfa5c4e3308fd9def9a2006a20fa0c272a30a2",
+                "reference": "3dbfa5c4e3308fd9def9a2006a20fa0c272a30a2",
                 "shasum": ""
             },
             "require": {
-                "composer-plugin-api": "^1.0|^2.0",
-                "php": ">=7.1"
+                "composer-plugin-api": "^2.1",
+                "php": ">=8.0"
             },
             "require-dev": {
-                "composer/composer": "^1.0.2|^2.0",
-                "symfony/dotenv": "^4.4|^5.0",
-                "symfony/filesystem": "^4.4|^5.0",
-                "symfony/phpunit-bridge": "^4.4.12|^5.0",
-                "symfony/process": "^3.4|^4.4|^5.0"
+                "composer/composer": "^2.1",
+                "symfony/dotenv": "^5.4|^6.0",
+                "symfony/filesystem": "^5.4|^6.0",
+                "symfony/phpunit-bridge": "^5.4|^6.0",
+                "symfony/process": "^5.4|^6.0"
             },
             "type": "composer-plugin",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.16-dev"
-                },
                 "class": "Symfony\\Flex\\Flex"
             },
             "autoload": {
@@ -10034,7 +9853,7 @@
             "description": "Composer plugin for Symfony",
             "support": {
                 "issues": "https://github.com/symfony/flex/issues",
-                "source": "https://github.com/symfony/flex/tree/v1.16.3"
+                "source": "https://github.com/symfony/flex/tree/v2.0.1"
             },
             "funding": [
                 {
@@ -10050,20 +9869,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-28T17:00:52+00:00"
+            "time": "2021-11-29T15:40:20+00:00"
         },
         {
             "name": "symfony/http-client-contracts",
-            "version": "v2.4.0",
+            "version": "v2.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client-contracts.git",
-                "reference": "7e82f6084d7cae521a75ef2cb5c9457bbda785f4"
+                "reference": "ec82e57b5b714dbb69300d348bd840b345e24166"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/7e82f6084d7cae521a75ef2cb5c9457bbda785f4",
-                "reference": "7e82f6084d7cae521a75ef2cb5c9457bbda785f4",
+                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/ec82e57b5b714dbb69300d348bd840b345e24166",
+                "reference": "ec82e57b5b714dbb69300d348bd840b345e24166",
                 "shasum": ""
             },
             "require": {
@@ -10075,7 +9894,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.4-dev"
+                    "dev-main": "2.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -10112,7 +9931,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/http-client-contracts/tree/v2.4.0"
+                "source": "https://github.com/symfony/http-client-contracts/tree/v2.5.0"
             },
             "funding": [
                 {
@@ -10128,27 +9947,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-04-11T23:07:08+00:00"
+            "time": "2021-11-03T09:24:47+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v4.4.25",
+            "version": "v4.4.34",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "0c79d5a65ace4fe66e49702658c024a419d2438b"
+                "reference": "f4cbbb6fc428588ce8373802461e7fe84e6809ab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/0c79d5a65ace4fe66e49702658c024a419d2438b",
-                "reference": "0c79d5a65ace4fe66e49702658c024a419d2438b",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f4cbbb6fc428588ce8373802461e7fe84e6809ab",
+                "reference": "f4cbbb6fc428588ce8373802461e7fe84e6809ab",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1.3",
                 "symfony/mime": "^4.3|^5.0",
                 "symfony/polyfill-mbstring": "~1.1",
-                "symfony/polyfill-php80": "^1.15"
+                "symfony/polyfill-php80": "^1.16"
             },
             "require-dev": {
                 "predis/predis": "~1.0",
@@ -10180,7 +9999,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v4.4.25"
+                "source": "https://github.com/symfony/http-foundation/tree/v4.4.34"
             },
             "funding": [
                 {
@@ -10196,32 +10015,32 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-26T11:20:16+00:00"
+            "time": "2021-11-04T12:23:33+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v4.4.25",
+            "version": "v4.4.35",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "3795165596fe81a52296b78c9aae938d434069cc"
+                "reference": "fb793f1381c34b79a43596a532a6a49bd729c9db"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3795165596fe81a52296b78c9aae938d434069cc",
-                "reference": "3795165596fe81a52296b78c9aae938d434069cc",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/fb793f1381c34b79a43596a532a6a49bd729c9db",
+                "reference": "fb793f1381c34b79a43596a532a6a49bd729c9db",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1.3",
-                "psr/log": "~1.0",
+                "psr/log": "^1|^2",
                 "symfony/error-handler": "^4.4",
                 "symfony/event-dispatcher": "^4.4",
                 "symfony/http-client-contracts": "^1.1|^2",
-                "symfony/http-foundation": "^4.4|^5.0",
+                "symfony/http-foundation": "^4.4.30|^5.3.7",
                 "symfony/polyfill-ctype": "^1.8",
                 "symfony/polyfill-php73": "^1.9",
-                "symfony/polyfill-php80": "^1.15"
+                "symfony/polyfill-php80": "^1.16"
             },
             "conflict": {
                 "symfony/browser-kit": "<4.3",
@@ -10232,7 +10051,7 @@
                 "twig/twig": "<1.43|<2.13,>=2"
             },
             "provide": {
-                "psr/log-implementation": "1.0"
+                "psr/log-implementation": "1.0|2.0"
             },
             "require-dev": {
                 "psr/cache": "^1.0|^2.0|^3.0",
@@ -10284,7 +10103,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v4.4.25"
+                "source": "https://github.com/symfony/http-kernel/tree/v4.4.35"
             },
             "funding": [
                 {
@@ -10300,20 +10119,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-06-01T07:12:08+00:00"
+            "time": "2021-11-24T08:40:10+00:00"
         },
         {
             "name": "symfony/lock",
-            "version": "v4.4.27",
+            "version": "v4.4.33",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/lock.git",
-                "reference": "6ca476d4ac992802f2a4043929f68f1818449486"
+                "reference": "567d29b1bc6e3937652054dafc069151d17824a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/lock/zipball/6ca476d4ac992802f2a4043929f68f1818449486",
-                "reference": "6ca476d4ac992802f2a4043929f68f1818449486",
+                "url": "https://api.github.com/repos/symfony/lock/zipball/567d29b1bc6e3937652054dafc069151d17824a9",
+                "reference": "567d29b1bc6e3937652054dafc069151d17824a9",
                 "shasum": ""
             },
             "require": {
@@ -10362,7 +10181,7 @@
                 "semaphore"
             ],
             "support": {
-                "source": "https://github.com/symfony/lock/tree/v4.4.27"
+                "source": "https://github.com/symfony/lock/tree/v4.4.33"
             },
             "funding": [
                 {
@@ -10378,28 +10197,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-23T15:41:52+00:00"
+            "time": "2021-10-05T20:27:01+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v5.3.0",
+            "version": "v5.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "ed710d297b181f6a7194d8172c9c2423d58e4852"
+                "reference": "d4365000217b67c01acff407573906ff91bcfb34"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/ed710d297b181f6a7194d8172c9c2423d58e4852",
-                "reference": "ed710d297b181f6a7194d8172c9c2423d58e4852",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/d4365000217b67c01acff407573906ff91bcfb34",
+                "reference": "d4365000217b67c01acff407573906ff91bcfb34",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1",
+                "symfony/deprecation-contracts": "^2.1|^3",
                 "symfony/polyfill-intl-idn": "^1.10",
                 "symfony/polyfill-mbstring": "^1.0",
-                "symfony/polyfill-php80": "^1.15"
+                "symfony/polyfill-php80": "^1.16"
             },
             "conflict": {
                 "egulias/email-validator": "~3.0.0",
@@ -10410,10 +10229,10 @@
             "require-dev": {
                 "egulias/email-validator": "^2.1.10|^3.1",
                 "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0",
-                "symfony/dependency-injection": "^4.4|^5.0",
-                "symfony/property-access": "^4.4|^5.1",
-                "symfony/property-info": "^4.4|^5.1",
-                "symfony/serializer": "^5.2"
+                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
+                "symfony/property-access": "^4.4|^5.1|^6.0",
+                "symfony/property-info": "^4.4|^5.1|^6.0",
+                "symfony/serializer": "^5.2|^6.0"
             },
             "type": "library",
             "autoload": {
@@ -10445,7 +10264,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v5.3.0"
+                "source": "https://github.com/symfony/mime/tree/v5.4.0"
             },
             "funding": [
                 {
@@ -10461,31 +10280,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-26T17:43:10+00:00"
+            "time": "2021-11-23T10:19:22+00:00"
         },
         {
             "name": "symfony/phpunit-bridge",
-            "version": "v5.3.8",
+            "version": "v5.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/phpunit-bridge.git",
-                "reference": "e9c0548d8d7abcd257f18f0adc0517895996a9c1"
+                "reference": "59bbd98ee7aa15b9f75c0fc088c7a5cbf7aa9b5c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/e9c0548d8d7abcd257f18f0adc0517895996a9c1",
-                "reference": "e9c0548d8d7abcd257f18f0adc0517895996a9c1",
+                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/59bbd98ee7aa15b9f75c0fc088c7a5cbf7aa9b5c",
+                "reference": "59bbd98ee7aa15b9f75c0fc088c7a5cbf7aa9b5c",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1.3",
-                "symfony/deprecation-contracts": "^2.1"
+                "symfony/deprecation-contracts": "^2.1|^3"
             },
             "conflict": {
                 "phpunit/phpunit": "<7.5|9.1.2"
             },
             "require-dev": {
-                "symfony/error-handler": "^4.4|^5.0"
+                "symfony/error-handler": "^4.4|^5.0|^6.0"
             },
             "suggest": {
                 "symfony/error-handler": "For tracking deprecated interfaces usages at runtime with DebugClassLoader"
@@ -10528,7 +10347,7 @@
             "description": "Provides utilities for PHPUnit, especially user deprecation notices management",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/phpunit-bridge/tree/v5.3.8"
+                "source": "https://github.com/symfony/phpunit-bridge/tree/v5.4.0"
             },
             "funding": [
                 {
@@ -10544,7 +10363,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-14T13:57:08+00:00"
+            "time": "2021-11-29T15:30:56+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -10878,16 +10697,16 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.23.0",
+            "version": "v1.23.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1"
+                "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2df51500adbaebdc4c38dea4c89a2e131c45c8a1",
-                "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6",
+                "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6",
                 "shasum": ""
             },
             "require": {
@@ -10938,7 +10757,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.1"
             },
             "funding": [
                 {
@@ -10954,7 +10773,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-27T09:27:20+00:00"
+            "time": "2021-05-27T12:26:48+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
@@ -11113,16 +10932,16 @@
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.23.0",
+            "version": "v1.23.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0"
+                "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/eca0bf41ed421bed1b57c4958bab16aa86b757d0",
-                "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be",
+                "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be",
                 "shasum": ""
             },
             "require": {
@@ -11176,7 +10995,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1"
             },
             "funding": [
                 {
@@ -11192,7 +11011,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-19T12:13:01+00:00"
+            "time": "2021-07-28T13:41:28+00:00"
         },
         {
             "name": "symfony/polyfill-uuid",
@@ -11275,20 +11094,21 @@
         },
         {
             "name": "symfony/process",
-            "version": "v4.4.25",
+            "version": "v4.4.35",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "cd61e6dd273975c6625316de9d141ebd197f93c9"
+                "reference": "c2098705326addae6e6742151dfade47ac71da1b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/cd61e6dd273975c6625316de9d141ebd197f93c9",
-                "reference": "cd61e6dd273975c6625316de9d141ebd197f93c9",
+                "url": "https://api.github.com/repos/symfony/process/zipball/c2098705326addae6e6742151dfade47ac71da1b",
+                "reference": "c2098705326addae6e6742151dfade47ac71da1b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1.3"
+                "php": ">=7.1.3",
+                "symfony/polyfill-php80": "^1.16"
             },
             "type": "library",
             "autoload": {
@@ -11316,7 +11136,7 @@
             "description": "Executes commands in sub-processes",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/process/tree/v4.4.25"
+                "source": "https://github.com/symfony/process/tree/v4.4.35"
             },
             "funding": [
                 {
@@ -11332,36 +11152,36 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-26T11:20:16+00:00"
+            "time": "2021-11-22T22:36:24+00:00"
         },
         {
             "name": "symfony/psr-http-message-bridge",
-            "version": "v2.1.0",
+            "version": "v2.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/psr-http-message-bridge.git",
-                "reference": "81db2d4ae86e9f0049828d9343a72b9523884e5d"
+                "reference": "22b37c8a3f6b5d94e9cdbd88e1270d96e2f97b34"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/81db2d4ae86e9f0049828d9343a72b9523884e5d",
-                "reference": "81db2d4ae86e9f0049828d9343a72b9523884e5d",
+                "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/22b37c8a3f6b5d94e9cdbd88e1270d96e2f97b34",
+                "reference": "22b37c8a3f6b5d94e9cdbd88e1270d96e2f97b34",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1",
                 "psr/http-message": "^1.0",
-                "symfony/http-foundation": "^4.4 || ^5.0"
+                "symfony/http-foundation": "^4.4 || ^5.0 || ^6.0"
             },
             "require-dev": {
                 "nyholm/psr7": "^1.1",
-                "psr/log": "^1.1",
-                "symfony/browser-kit": "^4.4 || ^5.0",
-                "symfony/config": "^4.4 || ^5.0",
-                "symfony/event-dispatcher": "^4.4 || ^5.0",
-                "symfony/framework-bundle": "^4.4 || ^5.0",
-                "symfony/http-kernel": "^4.4 || ^5.0",
-                "symfony/phpunit-bridge": "^4.4.19 || ^5.2"
+                "psr/log": "^1.1 || ^2 || ^3",
+                "symfony/browser-kit": "^4.4 || ^5.0 || ^6.0",
+                "symfony/config": "^4.4 || ^5.0 || ^6.0",
+                "symfony/event-dispatcher": "^4.4 || ^5.0 || ^6.0",
+                "symfony/framework-bundle": "^4.4 || ^5.0 || ^6.0",
+                "symfony/http-kernel": "^4.4 || ^5.0 || ^6.0",
+                "symfony/phpunit-bridge": "^5.4@dev || ^6.0"
             },
             "suggest": {
                 "nyholm/psr7": "For a super lightweight PSR-7/17 implementation"
@@ -11404,7 +11224,7 @@
             ],
             "support": {
                 "issues": "https://github.com/symfony/psr-http-message-bridge/issues",
-                "source": "https://github.com/symfony/psr-http-message-bridge/tree/v2.1.0"
+                "source": "https://github.com/symfony/psr-http-message-bridge/tree/v2.1.2"
             },
             "funding": [
                 {
@@ -11420,24 +11240,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-17T10:35:25+00:00"
+            "time": "2021-11-05T13:13:39+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v4.4.25",
+            "version": "v4.4.34",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "3a3c2f197ad0846ac6413225fc78868ba1c61434"
+                "reference": "fc9dda0c8496f8ef0a89805c2eabfc43b8cef366"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/3a3c2f197ad0846ac6413225fc78868ba1c61434",
-                "reference": "3a3c2f197ad0846ac6413225fc78868ba1c61434",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/fc9dda0c8496f8ef0a89805c2eabfc43b8cef366",
+                "reference": "fc9dda0c8496f8ef0a89805c2eabfc43b8cef366",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1.3"
+                "php": ">=7.1.3",
+                "symfony/polyfill-php80": "^1.16"
             },
             "conflict": {
                 "symfony/config": "<4.2",
@@ -11446,7 +11267,7 @@
             },
             "require-dev": {
                 "doctrine/annotations": "^1.10.4",
-                "psr/log": "~1.0",
+                "psr/log": "^1|^2|^3",
                 "symfony/config": "^4.2|^5.0",
                 "symfony/dependency-injection": "^3.4|^4.0|^5.0",
                 "symfony/expression-language": "^3.4|^4.0|^5.0",
@@ -11492,7 +11313,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v4.4.25"
+                "source": "https://github.com/symfony/routing/tree/v4.4.34"
             },
             "funding": [
                 {
@@ -11508,25 +11329,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-26T17:39:37+00:00"
+            "time": "2021-11-04T12:23:33+00:00"
         },
         {
             "name": "symfony/serializer",
-            "version": "v4.4.25",
+            "version": "v4.4.35",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/serializer.git",
-                "reference": "6db3eb4f1bb437cd3730f52353ba4b568acaddf5"
+                "reference": "1b2ae02cb1b923987947e013688c51954a80b751"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/serializer/zipball/6db3eb4f1bb437cd3730f52353ba4b568acaddf5",
-                "reference": "6db3eb4f1bb437cd3730f52353ba4b568acaddf5",
+                "url": "https://api.github.com/repos/symfony/serializer/zipball/1b2ae02cb1b923987947e013688c51954a80b751",
+                "reference": "1b2ae02cb1b923987947e013688c51954a80b751",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1.3",
-                "symfony/polyfill-ctype": "~1.8"
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-php80": "^1.16"
             },
             "conflict": {
                 "phpdocumentor/reflection-docblock": "<3.0|>=3.2.0,<3.2.2",
@@ -11585,7 +11407,7 @@
             "description": "Handles serializing and deserializing data structures, including object graphs, into array structures or other formats like XML and JSON.",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/serializer/tree/v4.4.25"
+                "source": "https://github.com/symfony/serializer/tree/v4.4.35"
             },
             "funding": [
                 {
@@ -11601,25 +11423,29 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-26T11:20:16+00:00"
+            "time": "2021-11-24T08:12:42+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v2.4.0",
+            "version": "v2.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb"
+                "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb",
-                "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc",
+                "reference": "1ab11b933cd6bc5464b08e81e2c5b07dec58b0fc",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
-                "psr/container": "^1.1"
+                "psr/container": "^1.1",
+                "symfony/deprecation-contracts": "^2.1"
+            },
+            "conflict": {
+                "ext-psr": "<1.1|>=2"
             },
             "suggest": {
                 "symfony/service-implementation": ""
@@ -11627,7 +11453,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.4-dev"
+                    "dev-main": "2.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -11664,7 +11490,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v2.4.0"
+                "source": "https://github.com/symfony/service-contracts/tree/v2.5.0"
             },
             "funding": [
                 {
@@ -11680,25 +11506,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-04-01T10:43:52+00:00"
+            "time": "2021-11-04T16:48:04+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v4.4.25",
+            "version": "v4.4.34",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "dfe132c5c6d89f90ce7f961742cc532e9ca16dd4"
+                "reference": "26d330720627b234803595ecfc0191eeabc65190"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/dfe132c5c6d89f90ce7f961742cc532e9ca16dd4",
-                "reference": "dfe132c5c6d89f90ce7f961742cc532e9ca16dd4",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/26d330720627b234803595ecfc0191eeabc65190",
+                "reference": "26d330720627b234803595ecfc0191eeabc65190",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1.3",
                 "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php80": "^1.16",
                 "symfony/translation-contracts": "^1.1.6|^2"
             },
             "conflict": {
@@ -11711,7 +11538,7 @@
                 "symfony/translation-implementation": "1.0|2.0"
             },
             "require-dev": {
-                "psr/log": "~1.0",
+                "psr/log": "^1|^2|^3",
                 "symfony/config": "^3.4|^4.0|^5.0",
                 "symfony/console": "^3.4|^4.0|^5.0",
                 "symfony/dependency-injection": "^3.4|^4.0|^5.0",
@@ -11752,7 +11579,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v4.4.25"
+                "source": "https://github.com/symfony/translation/tree/v4.4.34"
             },
             "funding": [
                 {
@@ -11768,20 +11595,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-26T17:39:37+00:00"
+            "time": "2021-11-04T12:23:33+00:00"
         },
         {
             "name": "symfony/translation-contracts",
-            "version": "v2.4.0",
+            "version": "v2.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation-contracts.git",
-                "reference": "95c812666f3e91db75385749fe219c5e494c7f95"
+                "reference": "d28150f0f44ce854e942b671fc2620a98aae1b1e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/95c812666f3e91db75385749fe219c5e494c7f95",
-                "reference": "95c812666f3e91db75385749fe219c5e494c7f95",
+                "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/d28150f0f44ce854e942b671fc2620a98aae1b1e",
+                "reference": "d28150f0f44ce854e942b671fc2620a98aae1b1e",
                 "shasum": ""
             },
             "require": {
@@ -11793,7 +11620,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.4-dev"
+                    "dev-main": "2.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -11830,7 +11657,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v2.4.0"
+                "source": "https://github.com/symfony/translation-contracts/tree/v2.5.0"
             },
             "funding": [
                 {
@@ -11846,28 +11673,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-03-23T23:28:01+00:00"
+            "time": "2021-08-17T14:20:01+00:00"
         },
         {
             "name": "symfony/uid",
-            "version": "v5.3.3",
+            "version": "v6.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/uid.git",
-                "reference": "45853bbc72f2b91c32e707afe7f896fddb3ee8e9"
+                "reference": "6ef7c361b84f8ae666843279d08b2b8ce8006033"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/uid/zipball/45853bbc72f2b91c32e707afe7f896fddb3ee8e9",
-                "reference": "45853bbc72f2b91c32e707afe7f896fddb3ee8e9",
+                "url": "https://api.github.com/repos/symfony/uid/zipball/6ef7c361b84f8ae666843279d08b2b8ce8006033",
+                "reference": "6ef7c361b84f8ae666843279d08b2b8ce8006033",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
+                "php": ">=8.0.2",
                 "symfony/polyfill-uuid": "^1.15"
             },
             "require-dev": {
-                "symfony/console": "^4.4|^5.0"
+                "symfony/console": "^5.4|^6.0"
             },
             "type": "library",
             "autoload": {
@@ -11903,7 +11730,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/uid/tree/v5.3.3"
+                "source": "https://github.com/symfony/uid/tree/v6.0.1"
             },
             "funding": [
                 {
@@ -11919,26 +11746,27 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-06-24T08:13:00+00:00"
+            "time": "2021-12-08T15:13:44+00:00"
         },
         {
             "name": "symfony/validator",
-            "version": "v4.4.25",
+            "version": "v4.4.35",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/validator.git",
-                "reference": "29c14955e8b2e7351aaa11553cb36d4a689b7b11"
+                "reference": "629f420d8350634fd8ed686d4472c1f10044b265"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/validator/zipball/29c14955e8b2e7351aaa11553cb36d4a689b7b11",
-                "reference": "29c14955e8b2e7351aaa11553cb36d4a689b7b11",
+                "url": "https://api.github.com/repos/symfony/validator/zipball/629f420d8350634fd8ed686d4472c1f10044b265",
+                "reference": "629f420d8350634fd8ed686d4472c1f10044b265",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1.3",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-mbstring": "~1.0",
+                "symfony/polyfill-php80": "^1.16",
                 "symfony/translation-contracts": "^1.1|^2"
             },
             "conflict": {
@@ -12008,7 +11836,7 @@
             "description": "Provides tools to validate values",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/validator/tree/v4.4.25"
+                "source": "https://github.com/symfony/validator/tree/v4.4.35"
             },
             "funding": [
                 {
@@ -12024,26 +11852,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-26T17:39:37+00:00"
+            "time": "2021-11-22T21:43:32+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v5.3.0",
+            "version": "v5.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "1d3953e627fe4b5f6df503f356b6545ada6351f3"
+                "reference": "89ab66eaef230c9cd1992de2e9a1b26652b127b9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/1d3953e627fe4b5f6df503f356b6545ada6351f3",
-                "reference": "1d3953e627fe4b5f6df503f356b6545ada6351f3",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/89ab66eaef230c9cd1992de2e9a1b26652b127b9",
+                "reference": "89ab66eaef230c9cd1992de2e9a1b26652b127b9",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
                 "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php80": "^1.15"
+                "symfony/polyfill-php80": "^1.16"
             },
             "conflict": {
                 "phpunit/phpunit": "<5.4.3",
@@ -12051,8 +11879,9 @@
             },
             "require-dev": {
                 "ext-iconv": "*",
-                "symfony/console": "^4.4|^5.0",
-                "symfony/process": "^4.4|^5.0",
+                "symfony/console": "^4.4|^5.0|^6.0",
+                "symfony/process": "^4.4|^5.0|^6.0",
+                "symfony/uid": "^5.1|^6.0",
                 "twig/twig": "^2.13|^3.0.4"
             },
             "suggest": {
@@ -12096,7 +11925,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v5.3.0"
+                "source": "https://github.com/symfony/var-dumper/tree/v5.4.0"
             },
             "funding": [
                 {
@@ -12112,20 +11941,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-27T12:28:50+00:00"
+            "time": "2021-11-29T15:30:56+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v4.4.25",
+            "version": "v4.4.34",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "81cdac5536925c1c4b7b50aabc9ff6330b9eb5fc"
+                "reference": "2c309e258adeb9970229042be39b360d34986fad"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/81cdac5536925c1c4b7b50aabc9ff6330b9eb5fc",
-                "reference": "81cdac5536925c1c4b7b50aabc9ff6330b9eb5fc",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/2c309e258adeb9970229042be39b360d34986fad",
+                "reference": "2c309e258adeb9970229042be39b360d34986fad",
                 "shasum": ""
             },
             "require": {
@@ -12167,7 +11996,7 @@
             "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/v4.4.25"
+                "source": "https://github.com/symfony/yaml/tree/v4.4.34"
             },
             "funding": [
                 {
@@ -12183,7 +12012,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-26T17:39:37+00:00"
+            "time": "2021-11-18T18:49:23+00:00"
         },
         {
             "name": "theseer/tokenizer",
@@ -12237,16 +12066,16 @@
         },
         {
             "name": "twig/twig",
-            "version": "v2.14.6",
+            "version": "v2.14.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "27e5cf2b05e3744accf39d4c68a3235d9966d260"
+                "reference": "8e202327ee1ed863629de9b18a5ec70ac614d88f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/27e5cf2b05e3744accf39d4c68a3235d9966d260",
-                "reference": "27e5cf2b05e3744accf39d4c68a3235d9966d260",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/8e202327ee1ed863629de9b18a5ec70ac614d88f",
+                "reference": "8e202327ee1ed863629de9b18a5ec70ac614d88f",
                 "shasum": ""
             },
             "require": {
@@ -12256,7 +12085,7 @@
             },
             "require-dev": {
                 "psr/container": "^1.0",
-                "symfony/phpunit-bridge": "^4.4.9|^5.0.9"
+                "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0"
             },
             "type": "library",
             "extra": {
@@ -12300,7 +12129,7 @@
             ],
             "support": {
                 "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v2.14.6"
+                "source": "https://github.com/twigphp/Twig/tree/v2.14.7"
             },
             "funding": [
                 {
@@ -12312,20 +12141,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-16T12:12:47+00:00"
+            "time": "2021-09-17T08:39:54+00:00"
         },
         {
             "name": "typo3/phar-stream-wrapper",
-            "version": "v3.1.6",
+            "version": "v3.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3/phar-stream-wrapper.git",
-                "reference": "60131cb573a1e478cfecd34e4ea38e3b31505f75"
+                "reference": "5cc2f04a4e2f5c7e9cc02a3bdf80fae0f3e11a8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3/phar-stream-wrapper/zipball/60131cb573a1e478cfecd34e4ea38e3b31505f75",
-                "reference": "60131cb573a1e478cfecd34e4ea38e3b31505f75",
+                "url": "https://api.github.com/repos/TYPO3/phar-stream-wrapper/zipball/5cc2f04a4e2f5c7e9cc02a3bdf80fae0f3e11a8c",
+                "reference": "5cc2f04a4e2f5c7e9cc02a3bdf80fae0f3e11a8c",
                 "shasum": ""
             },
             "require": {
@@ -12365,9 +12194,9 @@
             ],
             "support": {
                 "issues": "https://github.com/TYPO3/phar-stream-wrapper/issues",
-                "source": "https://github.com/TYPO3/phar-stream-wrapper/tree/v3.1.6"
+                "source": "https://github.com/TYPO3/phar-stream-wrapper/tree/v3.1.7"
             },
-            "time": "2020-11-07T09:06:16+00:00"
+            "time": "2021-09-20T19:19:13+00:00"
         },
         {
             "name": "un-ocha/oauth2-hid",
@@ -12433,12 +12262,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/UN-OCHA/common_design.git",
-                "reference": "921b3b8c2c9a7518ef8b06b28236c87afb0132e9"
+                "reference": "811ad8bc26d8c90eeeebae8ff4efa686c201f9c6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/921b3b8c2c9a7518ef8b06b28236c87afb0132e9",
-                "reference": "921b3b8c2c9a7518ef8b06b28236c87afb0132e9",
+                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/811ad8bc26d8c90eeeebae8ff4efa686c201f9c6",
+                "reference": "811ad8bc26d8c90eeeebae8ff4efa686c201f9c6",
                 "shasum": ""
             },
             "require": {
@@ -12453,7 +12282,7 @@
                 "source": "https://github.com/UN-OCHA/common_design/tree/cd-304-forms",
                 "issues": "https://github.com/UN-OCHA/common_design/issues"
             },
-            "time": "2021-11-16T20:27:33+00:00"
+            "time": "2021-12-14T20:22:03+00:00"
         },
         {
             "name": "webflo/drupal-finder",
@@ -12605,6 +12434,7 @@
                 "issues": "https://github.com/webmozart/path-util/issues",
                 "source": "https://github.com/webmozart/path-util/tree/2.3.0"
             },
+            "abandoned": "symfony/filesystem",
             "time": "2015-12-17T08:42:14+00:00"
         }
     ],
@@ -12677,6 +12507,64 @@
             },
             "time": "2018-02-22T13:58:36+00:00"
         },
+        {
+            "name": "behat/mink-goutte-driver",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/minkphp/MinkGoutteDriver.git",
+                "reference": "8139f520f417c81bf9d2f9a171fff400f6adc9ea"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/8139f520f417c81bf9d2f9a171fff400f6adc9ea",
+                "reference": "8139f520f417c81bf9d2f9a171fff400f6adc9ea",
+                "shasum": ""
+            },
+            "require": {
+                "behat/mink-browserkit-driver": "~1.2@dev",
+                "fabpot/goutte": "~1.0.4|~2.0|~3.1",
+                "php": ">=5.4"
+            },
+            "require-dev": {
+                "mink/driver-testsuite": "dev-master"
+            },
+            "type": "mink-driver",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Behat\\Mink\\Driver\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                }
+            ],
+            "description": "Goutte driver for Mink framework",
+            "homepage": "https://mink.behat.org/",
+            "keywords": [
+                "browser",
+                "goutte",
+                "headless",
+                "testing"
+            ],
+            "support": {
+                "issues": "https://github.com/minkphp/MinkGoutteDriver/issues",
+                "source": "https://github.com/minkphp/MinkGoutteDriver/tree/v1.3.0"
+            },
+            "time": "2021-10-12T11:35:46+00:00"
+        },
         {
             "name": "dflydev/dot-access-configuration",
             "version": "v1.0.3",
@@ -13429,16 +13317,16 @@
         },
         {
             "name": "drupal/console",
-            "version": "1.9.7",
+            "version": "1.9.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/hechoendrupal/drupal-console.git",
-                "reference": "90053d30f52427edb4e4941a9063acb65b5a2c1e"
+                "reference": "d292c940c07d164e32bbe9525e909311ca65e8cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/hechoendrupal/drupal-console/zipball/90053d30f52427edb4e4941a9063acb65b5a2c1e",
-                "reference": "90053d30f52427edb4e4941a9063acb65b5a2c1e",
+                "url": "https://api.github.com/repos/hechoendrupal/drupal-console/zipball/d292c940c07d164e32bbe9525e909311ca65e8cb",
+                "reference": "d292c940c07d164e32bbe9525e909311ca65e8cb",
                 "shasum": ""
             },
             "require": {
@@ -13508,7 +13396,7 @@
                 "docs": "https://docs.drupalconsole.com/",
                 "forum": "https://gitter.im/hechoendrupal/DrupalConsole",
                 "issues": "https://github.com/hechoendrupal/drupal-console/issues",
-                "source": "https://github.com/hechoendrupal/drupal-console/tree/1.9.7"
+                "source": "https://github.com/hechoendrupal/drupal-console/tree/1.9.8"
             },
             "funding": [
                 {
@@ -13516,7 +13404,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2020-11-30T02:09:53+00:00"
+            "time": "2021-11-29T17:09:44+00:00"
         },
         {
             "name": "drupal/console-core",
@@ -13714,17 +13602,17 @@
         },
         {
             "name": "drupal/devel",
-            "version": "4.1.1",
+            "version": "4.1.3",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/devel.git",
-                "reference": "4.1.1"
+                "reference": "4.1.3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/devel-4.1.1.zip",
-                "reference": "4.1.1",
-                "shasum": "88e5d49dda26a3136291ecd97bc6c8e897b24198"
+                "url": "https://ftp.drupal.org/files/projects/devel-4.1.3.zip",
+                "reference": "4.1.3",
+                "shasum": "f82261ca19a43379742e1df4c5a3795ef7a70441"
             },
             "require": {
                 "doctrine/common": "^2.7",
@@ -13743,8 +13631,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "4.1.1",
-                    "datestamp": "1631968537",
+                    "version": "4.1.3",
+                    "datestamp": "1639534069",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -13832,17 +13720,17 @@
         },
         {
             "name": "drupal/stage_file_proxy",
-            "version": "1.1.0",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/stage_file_proxy.git",
-                "reference": "8.x-1.1"
+                "reference": "8.x-1.2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/stage_file_proxy-8.x-1.1.zip",
-                "reference": "8.x-1.1",
-                "shasum": "bad4d500e56f4e77adb2704ec5d4efdf52340df8"
+                "url": "https://ftp.drupal.org/files/projects/stage_file_proxy-8.x-1.2.zip",
+                "reference": "8.x-1.2",
+                "shasum": "a0bea520c139a4b0b67738b0c54e7ee21af081da"
             },
             "require": {
                 "drupal/core": ">=8.7.7"
@@ -13850,8 +13738,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.1",
-                    "datestamp": "1601040759",
+                    "version": "8.x-1.2",
+                    "datestamp": "1637007759",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -13907,6 +13795,65 @@
                 "source": "https://git.drupalcode.org/project/stage_file_proxy"
             }
         },
+        {
+            "name": "fabpot/goutte",
+            "version": "v3.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/FriendsOfPHP/Goutte.git",
+                "reference": "80a23b64f44d54dd571d114c473d9d7e9ed84ca5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/FriendsOfPHP/Goutte/zipball/80a23b64f44d54dd571d114c473d9d7e9ed84ca5",
+                "reference": "80a23b64f44d54dd571d114c473d9d7e9ed84ca5",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/guzzle": "^6.0",
+                "php": ">=7.1.3",
+                "symfony/browser-kit": "^4.4|^5.0",
+                "symfony/css-selector": "^4.4|^5.0",
+                "symfony/dom-crawler": "^4.4|^5.0"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "^5.0"
+            },
+            "type": "application",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.3-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Goutte\\": "Goutte"
+                },
+                "exclude-from-classmap": [
+                    "Goutte/Tests"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "A simple PHP Web Scraper",
+            "homepage": "https://github.com/FriendsOfPHP/Goutte",
+            "keywords": [
+                "scraper"
+            ],
+            "support": {
+                "issues": "https://github.com/FriendsOfPHP/Goutte/issues",
+                "source": "https://github.com/FriendsOfPHP/Goutte/tree/v3.3.1"
+            },
+            "time": "2020-11-01T09:30:18+00:00"
+        },
         {
             "name": "kint-php/kint",
             "version": "3.3",
@@ -13983,16 +13930,16 @@
         },
         {
             "name": "pdepend/pdepend",
-            "version": "2.10.0",
+            "version": "2.10.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pdepend/pdepend.git",
-                "reference": "1fd30f4352b630ad53fec3fd5e8b8ba760f85596"
+                "reference": "c8c1d2af43fb8c2b5387d50e9c42a9c56de13686"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/1fd30f4352b630ad53fec3fd5e8b8ba760f85596",
-                "reference": "1fd30f4352b630ad53fec3fd5e8b8ba760f85596",
+                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/c8c1d2af43fb8c2b5387d50e9c42a9c56de13686",
+                "reference": "c8c1d2af43fb8c2b5387d50e9c42a9c56de13686",
                 "shasum": ""
             },
             "require": {
@@ -14028,7 +13975,7 @@
             "description": "Official version of pdepend to be handled with Composer",
             "support": {
                 "issues": "https://github.com/pdepend/pdepend/issues",
-                "source": "https://github.com/pdepend/pdepend/tree/2.10.0"
+                "source": "https://github.com/pdepend/pdepend/tree/2.10.2"
             },
             "funding": [
                 {
@@ -14036,7 +13983,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-20T09:56:09+00:00"
+            "time": "2021-11-16T20:05:32+00:00"
         },
         {
             "name": "phpcompatibility/php-compatibility",
@@ -14102,22 +14049,22 @@
         },
         {
             "name": "phpmd/phpmd",
-            "version": "2.10.2",
+            "version": "2.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpmd/phpmd.git",
-                "reference": "1bc74db7cf834662d83abebae265be11bb2eec3a"
+                "reference": "3637949092e6471aeaeca66bc6c016f45e459e24"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/1bc74db7cf834662d83abebae265be11bb2eec3a",
-                "reference": "1bc74db7cf834662d83abebae265be11bb2eec3a",
+                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/3637949092e6471aeaeca66bc6c016f45e459e24",
+                "reference": "3637949092e6471aeaeca66bc6c016f45e459e24",
                 "shasum": ""
             },
             "require": {
                 "composer/xdebug-handler": "^1.0 || ^2.0",
                 "ext-xml": "*",
-                "pdepend/pdepend": "^2.10.0",
+                "pdepend/pdepend": "^2.10.2",
                 "php": ">=5.3.9"
             },
             "require-dev": {
@@ -14173,7 +14120,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/phpmd",
                 "issues": "https://github.com/phpmd/phpmd/issues",
-                "source": "https://github.com/phpmd/phpmd/tree/2.10.2"
+                "source": "https://github.com/phpmd/phpmd/tree/2.11.0"
             },
             "funding": [
                 {
@@ -14181,7 +14128,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-22T09:56:23+00:00"
+            "time": "2021-11-29T14:05:52+00:00"
         },
         {
             "name": "phpspec/prophecy-phpunit",
@@ -14286,16 +14233,16 @@
         },
         {
             "name": "symfony/config",
-            "version": "v4.4.30",
+            "version": "v4.4.34",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "d9ea72de055cd822e5228ff898e2aad2f52f76b0"
+                "reference": "e99b65a18faa34fde57078095c39a1bc91a22492"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/d9ea72de055cd822e5228ff898e2aad2f52f76b0",
-                "reference": "d9ea72de055cd822e5228ff898e2aad2f52f76b0",
+                "url": "https://api.github.com/repos/symfony/config/zipball/e99b65a18faa34fde57078095c39a1bc91a22492",
+                "reference": "e99b65a18faa34fde57078095c39a1bc91a22492",
                 "shasum": ""
             },
             "require": {
@@ -14344,7 +14291,7 @@
             "description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/config/tree/v4.4.30"
+                "source": "https://github.com/symfony/config/tree/v4.4.34"
             },
             "funding": [
                 {
@@ -14360,7 +14307,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-08-04T20:31:23+00:00"
+            "time": "2021-10-29T15:43:26+00:00"
         },
         {
             "name": "symfony/polyfill-php81",
@@ -14517,7 +14464,6 @@
     "aliases": [],
     "minimum-stability": "dev",
     "stability-flags": {
-        "drupal/mimemail": 15,
         "drupal/taxonomy_term_revision": 20,
         "unocha/common_design": 20
     },
@@ -14527,8 +14473,5 @@
         "php": ">=8.0"
     },
     "platform-dev": [],
-    "platform-overrides": {
-        "php": "8.0"
-    },
     "plugin-api-version": "2.1.0"
 }
diff --git a/composer.patches.json b/composer.patches.json
index 72c7f4cd3..ba4d71f7d 100644
--- a/composer.patches.json
+++ b/composer.patches.json
@@ -1,7 +1,6 @@
 {
     "patches": {
         "drupal/core" : {
-            "https://www.drupal.org/project/drupal/issues/2570593": "patches/core--drupal--2570593-bundle-entity-class.patch",
             "https://www.drupal.org/project/drupal/issues/3047110": "patches/core--drupal--3047110-taxonomy-term-moderation-class.patch"
         }
     }
diff --git a/patches/core--drupal--2570593-bundle-entity-class.patch b/patches/core--drupal--2570593-bundle-entity-class.patch
deleted file mode 100644
index aa765c425..000000000
--- a/patches/core--drupal--2570593-bundle-entity-class.patch
+++ /dev/null
@@ -1,766 +0,0 @@
-diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
-index 9dcec1835b..440dd52bc4 100644
---- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
-+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
-@@ -214,7 +214,8 @@ protected function doLoadMultiple(array $ids = NULL) {
-   protected function doCreate(array $values) {
-     // Set default language to current language if not provided.
-     $values += [$this->langcodeKey => $this->languageManager->getCurrentLanguage()->getId()];
--    $entity = new $this->entityClass($values, $this->entityTypeId);
-+    $entity_class = $this->getEntityClass();
-+    $entity = new $entity_class($values, $this->entityTypeId);
- 
-     return $entity;
-   }
-diff --git a/core/lib/Drupal/Core/Entity/BundleEntityStorageInterface.php b/core/lib/Drupal/Core/Entity/BundleEntityStorageInterface.php
-new file mode 100644
-index 0000000000..9ba915fabd
---- /dev/null
-+++ b/core/lib/Drupal/Core/Entity/BundleEntityStorageInterface.php
-@@ -0,0 +1,33 @@
-+<?php
-+
-+namespace Drupal\Core\Entity;
-+
-+/**
-+ * A storage that supports entities with bundle specific classes.
-+ */
-+interface BundleEntityStorageInterface {
-+
-+  /**
-+   * Retrieves the bundle name for a provided class name.
-+   *
-+   * @param string $class_name
-+   *   The class name to check.
-+   *
-+   * @return string|null
-+   *   The bundle name of the class provided or NULL if unable to determine the
-+   *   bundle from the provided class.
-+   *
-+   * @throws \Drupal\Core\Entity\Exception\AmbiguousBundleClassException
-+   *   Thrown when multiple bundles are using the provided class.
-+   */
-+  public function getBundleFromClass($class_name);
-+
-+  /**
-+   * Retrieves the entity bundle key.
-+   *
-+   * @return bool|string
-+   *   The entity bundle key.
-+   */
-+  public function getBundleKey();
-+
-+}
-diff --git a/core/lib/Drupal/Core/Entity/ContentEntityBase.php b/core/lib/Drupal/Core/Entity/ContentEntityBase.php
-index 3e82c6f95f..70d69c0b38 100644
---- a/core/lib/Drupal/Core/Entity/ContentEntityBase.php
-+++ b/core/lib/Drupal/Core/Entity/ContentEntityBase.php
-@@ -1125,6 +1125,23 @@ public function __unset($name) {
-     }
-   }
- 
-+  /**
-+   * {@inheritdoc}
-+   */
-+  public static function create(array $values = []) {
-+    $entity_type_repository = \Drupal::service('entity_type.repository');
-+    $entity_type_manager = \Drupal::entityTypeManager();
-+    $class_name = get_called_class();
-+    $storage = $entity_type_manager->getStorage($entity_type_repository->getEntityTypeFromClass($class_name));
-+
-+    // Always explicitly specify the bundle if the entity has a bundle class.
-+    if ($storage instanceof BundleEntityStorageInterface && ($bundle = $storage->getBundleFromClass($class_name))) {
-+      $values[$storage->getBundleKey()] = $bundle;
-+    }
-+
-+    return $storage->create($values);
-+  }
-+
-   /**
-    * {@inheritdoc}
-    */
-diff --git a/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php b/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
-index b69958d8e8..e003838e0b 100644
---- a/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
-+++ b/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
-@@ -5,6 +5,8 @@
- use Drupal\Core\Cache\Cache;
- use Drupal\Core\Cache\CacheBackendInterface;
- use Drupal\Core\Cache\MemoryCache\MemoryCacheInterface;
-+use Drupal\Core\Entity\Exception\AmbiguousBundleClassException;
-+use Drupal\Core\Entity\Exception\BundleClassInheritanceException;
- use Drupal\Core\Field\FieldDefinitionInterface;
- use Drupal\Core\Field\FieldStorageDefinitionInterface;
- use Drupal\Core\Language\LanguageInterface;
-@@ -14,7 +16,7 @@
- /**
-  * Base class for content entity storage handlers.
-  */
--abstract class ContentEntityStorageBase extends EntityStorageBase implements ContentEntityStorageInterface, DynamicallyFieldableEntityStorageInterface {
-+abstract class ContentEntityStorageBase extends EntityStorageBase implements ContentEntityStorageInterface, DynamicallyFieldableEntityStorageInterface, BundleEntityStorageInterface {
- 
-   /**
-    * The entity bundle key.
-@@ -73,6 +75,34 @@ public function __construct(EntityTypeInterface $entity_type, EntityFieldManager
-     $this->entityTypeBundleInfo = $entity_type_bundle_info;
-   }
- 
-+  /**
-+   * {@inheritdoc}
-+   */
-+  public function create(array $values = []) {
-+    // In some cases the entity bundle may be provided by the ::preCreate()
-+    // method in the entity class. If a bundle is truly required an exception
-+    // will be thrown in ::doCreate() so there's no need to throw one here.
-+    $bundle = $this->getBundleFromValues($values);
-+    $entity_class = $this->getEntityClass($bundle);
-+    $entity_class::preCreate($this, $values);
-+
-+    // Assign a new UUID if there is none yet.
-+    if ($this->uuidKey && $this->uuidService && !isset($values[$this->uuidKey])) {
-+      $values[$this->uuidKey] = $this->uuidService->generate();
-+    }
-+
-+    $entity = $this->doCreate($values);
-+    $entity->enforceIsNew();
-+
-+    $entity->postCreate($this);
-+
-+    // Modules might need to add or change the data initially held by the new
-+    // entity object, for instance to fill-in default values.
-+    $this->invokeHook('create', $entity);
-+
-+    return $entity;
-+  }
-+
-   /**
-    * {@inheritdoc}
-    */
-@@ -90,13 +120,47 @@ public static function createInstance(ContainerInterface $container, EntityTypeI
-    * {@inheritdoc}
-    */
-   protected function doCreate(array $values) {
--    // We have to determine the bundle first.
--    $bundle = FALSE;
--    if ($this->bundleKey) {
--      if (!isset($values[$this->bundleKey])) {
--        throw new EntityStorageException('Missing bundle for entity type ' . $this->entityTypeId);
-+    $bundle = $this->getBundleFromValues($values);
-+    if (!empty($this->bundleKey) && empty($bundle)) {
-+      throw new EntityStorageException('Missing bundle for entity type ' . $this->entityTypeId);
-+    }
-+    $entity_class = $this->getEntityClass($bundle);
-+    $entity = new $entity_class([], $this->entityTypeId, $bundle);
-+    $this->initFieldValues($entity, $values);
-+    return $entity;
-+  }
-+
-+  /**
-+   * {@inheritdoc}
-+   */
-+  public function getBundleFromClass($class_name) {
-+    $bundle_for_class = NULL;
-+    foreach ($this->entityTypeBundleInfo->getBundleInfo($this->entityTypeId) as $bundle => $bundle_info) {
-+      if (!empty($bundle_info['class']) && $bundle_info['class'] === $class_name) {
-+        // There is already a class for that bundle.
-+        if (!empty($bundle_for_class)) {
-+          throw new AmbiguousBundleClassException($class_name);
-+        }
-+        else {
-+          $bundle_for_class = $bundle;
-+        }
-       }
-+    }
-+    return $bundle_for_class;
-+  }
- 
-+  /**
-+   * Retrieves the bundle from an array of values.
-+   *
-+   * @param array $values
-+   *   An array of values to set, keyed by field name.
-+   *
-+   * @return string|null
-+   *   The bundle or NULL if not set.
-+   */
-+  protected function getBundleFromValues(array $values) {
-+    $bundle = NULL;
-+    if (!empty($this->bundleKey) && !empty($values[$this->bundleKey])) {
-       // Normalize the bundle value. This is an optimized version of
-       // \Drupal\Core\Field\FieldInputValueNormalizerTrait::normalizeValue()
-       // because we just need the scalar value.
-@@ -115,9 +179,37 @@ protected function doCreate(array $values) {
-         $bundle = reset($bundle_value);
-       }
-     }
--    $entity = new $this->entityClass([], $this->entityTypeId, $bundle);
--    $this->initFieldValues($entity, $values);
--    return $entity;
-+    return $bundle;
-+  }
-+
-+  /**
-+   * {@inheritdoc}
-+   */
-+  public function getBundleKey() {
-+    return $this->bundleKey;
-+  }
-+
-+  /**
-+   * {@inheritdoc}
-+   */
-+  public function getEntityClass($bundle = NULL) {
-+    $entity_class = parent::getEntityClass();
-+
-+    if (!empty($bundle)) {
-+      // Return the bundle class if it has been defined for this bundle.
-+      $bundle_info = $this->entityTypeBundleInfo->getBundleInfo($this->entityTypeId);
-+      $bundle_class = $bundle_info[$bundle]['class'] ?? NULL;
-+
-+      // Bundle classes should extend the main entity class.
-+      if ($bundle_class) {
-+        if (!is_subclass_of($bundle_class, $entity_class)) {
-+          throw new BundleClassInheritanceException($bundle_class, $entity_class);
-+        }
-+        return $bundle_class;
-+      }
-+    }
-+
-+    return $entity_class;
-   }
- 
-   /**
-diff --git a/core/lib/Drupal/Core/Entity/EntityStorageBase.php b/core/lib/Drupal/Core/Entity/EntityStorageBase.php
-index 8b78be167a..4d890c868d 100644
---- a/core/lib/Drupal/Core/Entity/EntityStorageBase.php
-+++ b/core/lib/Drupal/Core/Entity/EntityStorageBase.php
-@@ -99,6 +99,13 @@ public function __construct(EntityTypeInterface $entity_type, MemoryCacheInterfa
-     $this->memoryCacheTag = 'entity.memory_cache:' . $this->entityTypeId;
-   }
- 
-+  /**
-+   * {@inheritdoc}
-+   */
-+  public function getEntityClass($bundle = NULL) {
-+    return $this->entityClass;
-+  }
-+
-   /**
-    * {@inheritdoc}
-    */
-@@ -205,7 +212,7 @@ protected function invokeHook($hook, EntityInterface $entity) {
-    * {@inheritdoc}
-    */
-   public function create(array $values = []) {
--    $entity_class = $this->entityClass;
-+    $entity_class = $this->getEntityClass();
-     $entity_class::preCreate($this, $values);
- 
-     // Assign a new UUID if there is none yet.
-@@ -234,7 +241,8 @@ public function create(array $values = []) {
-    * @return \Drupal\Core\Entity\EntityInterface
-    */
-   protected function doCreate(array $values) {
--    return new $this->entityClass($values, $this->entityTypeId);
-+    $entity_class = $this->getEntityClass();
-+    return new $entity_class($values, $this->entityTypeId);
-   }
- 
-   /**
-@@ -353,17 +361,22 @@ protected function preLoad(array &$ids = NULL) {
-    *   Associative array of query results, keyed on the entity ID.
-    */
-   protected function postLoad(array &$entities) {
--    $entity_class = $this->entityClass;
--    $entity_class::postLoad($this, $entities);
--    // Call hook_entity_load().
--    foreach ($this->moduleHandler()->getImplementations('entity_load') as $module) {
--      $function = $module . '_entity_load';
--      $function($entities, $this->entityTypeId);
--    }
--    // Call hook_TYPE_load().
--    foreach ($this->moduleHandler()->getImplementations($this->entityTypeId . '_load') as $module) {
--      $function = $module . '_' . $this->entityTypeId . '_load';
--      $function($entities);
-+    $entities_by_class = $this->getEntitiesByClass($entities);
-+
-+    foreach ($entities_by_class as $entity_class => &$items) {
-+      $entity_class::postLoad($this, $items);
-+
-+      // Call hook_entity_load().
-+      foreach ($this->moduleHandler()->getImplementations('entity_load') as $module) {
-+        $function = $module . '_entity_load';
-+        $function($items, $this->entityTypeId);
-+      }
-+
-+      // Call hook_TYPE_load().
-+      foreach ($this->moduleHandler()->getImplementations($this->entityTypeId . '_load') as $module) {
-+        $function = $module . '_' . $this->entityTypeId . '_load';
-+        $function($items);
-+      }
-     }
-   }
- 
-@@ -379,7 +392,9 @@ protected function postLoad(array &$entities) {
-   protected function mapFromStorageRecords(array $records) {
-     $entities = [];
-     foreach ($records as $record) {
--      $entity = new $this->entityClass($record, $this->entityTypeId);
-+      $entity_class = $this->getEntityClass();
-+      /** @var \Drupal\Core\Entity\EntityInterface $entity */
-+      $entity = new $entity_class($record, $this->entityTypeId);
-       $entities[$entity->id()] = $entity;
-     }
-     return $entities;
-@@ -394,6 +409,7 @@ protected function mapFromStorageRecords(array $records) {
-    *   The entity being saved.
-    *
-    * @return bool
-+   *   TRUE if this entity exists in storage, FALSE otherwise.
-    */
-   abstract protected function has($id, EntityInterface $entity);
- 
-@@ -406,27 +422,24 @@ public function delete(array $entities) {
-       return;
-     }
- 
--    // Ensure that the entities are keyed by ID.
--    $keyed_entities = [];
--    foreach ($entities as $entity) {
--      $keyed_entities[$entity->id()] = $entity;
--    }
-+    $entities_by_class = $this->getEntitiesByClass($entities);
- 
-     // Allow code to run before deleting.
--    $entity_class = $this->entityClass;
--    $entity_class::preDelete($this, $keyed_entities);
--    foreach ($keyed_entities as $entity) {
--      $this->invokeHook('predelete', $entity);
--    }
-+    foreach ($entities_by_class as $entity_class => &$items) {
-+      $entity_class::preDelete($this, $items);
-+      foreach ($items as $entity) {
-+        $this->invokeHook('predelete', $entity);
-+      }
- 
--    // Perform the delete and reset the static cache for the deleted entities.
--    $this->doDelete($keyed_entities);
--    $this->resetCache(array_keys($keyed_entities));
-+      // Perform the delete and reset the static cache for the deleted entities.
-+      $this->doDelete($items);
-+      $this->resetCache(array_keys($items));
- 
--    // Allow code to run after deleting.
--    $entity_class::postDelete($this, $keyed_entities);
--    foreach ($keyed_entities as $entity) {
--      $this->invokeHook('delete', $entity);
-+      // Allow code to run after deleting.
-+      $entity_class::postDelete($this, $items);
-+      foreach ($items as $entity) {
-+        $this->invokeHook('delete', $entity);
-+      }
-     }
-   }
- 
-@@ -605,4 +618,27 @@ public function getAggregateQuery($conjunction = 'AND') {
-    */
-   abstract protected function getQueryServiceName();
- 
-+  /**
-+   * Group the given array of entities by their class name and ID.
-+   *
-+   * @param \Drupal\Core\Entity\EntityInterface[] $entities
-+   *   The array of entities to index.
-+   *
-+   * @return \Drupal\Core\Entity\EntityInterface[][]
-+   *   An array of the passed-in entities, grouped by their class name and ID.
-+   */
-+  protected function getEntitiesByClass(array $entities) {
-+    $entity_classes = [];
-+
-+    foreach ($entities as $entity) {
-+      $entity_class = get_class($entity);
-+      if (!isset($entity_classes[$entity_class])) {
-+        $entity_classes[$entity_class] = [];
-+      }
-+      $entity_classes[$entity_class][$entity->id()] = $entity;
-+    }
-+
-+    return $entity_classes;
-+  }
-+
- }
-diff --git a/core/lib/Drupal/Core/Entity/EntityStorageInterface.php b/core/lib/Drupal/Core/Entity/EntityStorageInterface.php
-index 71898e0026..9a1297b6ef 100644
---- a/core/lib/Drupal/Core/Entity/EntityStorageInterface.php
-+++ b/core/lib/Drupal/Core/Entity/EntityStorageInterface.php
-@@ -230,4 +230,16 @@ public function getEntityTypeId();
-    */
-   public function getEntityType();
- 
-+  /**
-+   * Retrieves the class name used to create the entity.
-+   *
-+   * @param string|null $bundle
-+   *   (optional) A specific entity type bundle identifier. Can be omitted in
-+   *   the case of entity types without bundles, like User.
-+   *
-+   * @return string|null
-+   *   The class name or NULL if none exists.
-+   */
-+  public function getEntityClass($bundle = NULL);
-+
- }
-diff --git a/core/lib/Drupal/Core/Entity/EntityTypeRepository.php b/core/lib/Drupal/Core/Entity/EntityTypeRepository.php
-index 0bc900dbbc..e1c1cd5d16 100644
---- a/core/lib/Drupal/Core/Entity/EntityTypeRepository.php
-+++ b/core/lib/Drupal/Core/Entity/EntityTypeRepository.php
-@@ -2,6 +2,7 @@
- 
- namespace Drupal\Core\Entity;
- 
-+use Drupal\Core\Entity\Exception\AmbiguousBundleClassException;
- use Drupal\Core\Entity\Exception\AmbiguousEntityClassException;
- use Drupal\Core\Entity\Exception\NoCorrespondingEntityClassException;
- use Drupal\Core\StringTranslation\StringTranslationTrait;
-@@ -80,7 +81,8 @@ public function getEntityTypeFromClass($class_name) {
- 
-     $same_class = 0;
-     $entity_type_id = NULL;
--    foreach ($this->entityTypeManager->getDefinitions() as $entity_type) {
-+    $definitions = $this->entityTypeManager->getDefinitions();
-+    foreach ($definitions as $entity_type) {
-       if ($entity_type->getOriginalClass() == $class_name  || $entity_type->getClass() == $class_name) {
-         $entity_type_id = $entity_type->id();
-         if ($same_class++) {
-@@ -89,6 +91,20 @@ public function getEntityTypeFromClass($class_name) {
-       }
-     }
- 
-+    // If no match was found check if it is a bundle class. This needs to be in
-+    // a separate loop to avoid false positives, since an entity class can
-+    // subclass another entity class.
-+    if (!$entity_type_id) {
-+      foreach ($definitions as $entity_type) {
-+        if (is_subclass_of($class_name, $entity_type->getOriginalClass()) || is_subclass_of($class_name, $entity_type->getClass())) {
-+          $entity_type_id = $entity_type->id();
-+          if ($same_class++) {
-+            throw new AmbiguousBundleClassException($class_name);
-+          }
-+        }
-+      }
-+    }
-+
-     // Return the matching entity type ID if there is one.
-     if ($entity_type_id) {
-       $this->classNameEntityTypeMap[$class_name] = $entity_type_id;
-diff --git a/core/lib/Drupal/Core/Entity/EntityTypeRepositoryInterface.php b/core/lib/Drupal/Core/Entity/EntityTypeRepositoryInterface.php
-index 53af033e4d..0d05bc9673 100644
---- a/core/lib/Drupal/Core/Entity/EntityTypeRepositoryInterface.php
-+++ b/core/lib/Drupal/Core/Entity/EntityTypeRepositoryInterface.php
-@@ -34,6 +34,8 @@ public function getEntityTypeLabels($group = FALSE);
-    *
-    * @throws \Drupal\Core\Entity\Exception\AmbiguousEntityClassException
-    *   Thrown when multiple subclasses correspond to the called class.
-+   * @throws \Drupal\Core\Entity\Exception\AmbiguousBundleClassException
-+   *   Thrown when multiple subclasses correspond to the called bundle class.
-    * @throws \Drupal\Core\Entity\Exception\NoCorrespondingEntityClassException
-    *   Thrown when no entity class corresponds to the called class.
-    *
-diff --git a/core/lib/Drupal/Core/Entity/Exception/AmbiguousBundleClassException.php b/core/lib/Drupal/Core/Entity/Exception/AmbiguousBundleClassException.php
-new file mode 100644
-index 0000000000..f556fabbc9
---- /dev/null
-+++ b/core/lib/Drupal/Core/Entity/Exception/AmbiguousBundleClassException.php
-@@ -0,0 +1,23 @@
-+<?php
-+
-+namespace Drupal\Core\Entity\Exception;
-+
-+/**
-+ * Exception thrown if a bundle class is defined for multiple bundles.
-+ *
-+ * @see \Drupal\Core\Entity\ContentEntityStorageBase::getBundleFromClass()
-+ */
-+class AmbiguousBundleClassException extends AmbiguousEntityClassException {
-+
-+  /**
-+   * Constructs an AmbiguousBundleClassException.
-+   *
-+   * @param string $class
-+   *   The bundle class which is defined for multiple bundles.
-+   */
-+  public function __construct(string $class) {
-+    $message = sprintf('Multiple bundles are using the bundle class %s.', $class);
-+    parent::__construct($message);
-+  }
-+
-+}
-diff --git a/core/lib/Drupal/Core/Entity/Exception/BundleClassInheritanceException.php b/core/lib/Drupal/Core/Entity/Exception/BundleClassInheritanceException.php
-new file mode 100644
-index 0000000000..4f0d1fd2ba
---- /dev/null
-+++ b/core/lib/Drupal/Core/Entity/Exception/BundleClassInheritanceException.php
-@@ -0,0 +1,25 @@
-+<?php
-+
-+namespace Drupal\Core\Entity\Exception;
-+
-+/**
-+ * Exception thrown if a bundle class does not extend the main entity class.
-+ *
-+ * @see \Drupal\Core\Entity\ContentEntityStorageBase::getEntityClass()
-+ */
-+class BundleClassInheritanceException extends \Exception {
-+
-+  /**
-+   * Constructs a BundleClassInheritanceException.
-+   *
-+   * @param string $bundle_class
-+   *   The bundle class which should extend the entity class.
-+   * @param string $entity_class
-+   *   The entity class which should be extended.
-+   */
-+  public function __construct(string $bundle_class, string $entity_class) {
-+    $message = sprintf('Bundle class %s does not extend entity class %s.', $bundle_class, $entity_class);
-+    parent::__construct($message);
-+  }
-+
-+}
-diff --git a/core/lib/Drupal/Core/Entity/KeyValueStore/KeyValueEntityStorage.php b/core/lib/Drupal/Core/Entity/KeyValueStore/KeyValueEntityStorage.php
-index 98c5a41a32..4fe53ca1b6 100644
---- a/core/lib/Drupal/Core/Entity/KeyValueStore/KeyValueEntityStorage.php
-+++ b/core/lib/Drupal/Core/Entity/KeyValueStore/KeyValueEntityStorage.php
-@@ -93,7 +93,8 @@ public static function createInstance(ContainerInterface $container, EntityTypeI
-   public function doCreate(array $values = []) {
-     // Set default language to site default if not provided.
-     $values += [$this->getEntityType()->getKey('langcode') => $this->languageManager->getDefaultLanguage()->getId()];
--    $entity = new $this->entityClass($values, $this->entityTypeId);
-+    $entity_class = $this->getEntityClass();
-+    $entity = new $entity_class($values, $this->entityTypeId);
- 
-     // @todo This is handled by ContentEntityStorageBase, which assumes
-     //   FieldableEntityInterface. The current approach in
-diff --git a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
-index ba319da7a1..b017bbfc5d 100644
---- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
-+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorage.php
-@@ -505,7 +505,8 @@ protected function mapFromStorageRecords(array $records, $load_from_revision = F
-     foreach ($values as $id => $entity_values) {
-       $bundle = $this->bundleKey ? $entity_values[$this->bundleKey][LanguageInterface::LANGCODE_DEFAULT] : FALSE;
-       // Turn the record into an entity class.
--      $entities[$id] = new $this->entityClass($entity_values, $this->entityTypeId, $bundle, array_keys($translations[$id]));
-+      $entity_class = $this->getEntityClass($bundle);
-+      $entities[$id] = new $entity_class($entity_values, $this->entityTypeId, $bundle, array_keys($translations[$id]));
-     }
- 
-     return $entities;
-diff --git a/core/lib/Drupal/Core/Entity/entity.api.php b/core/lib/Drupal/Core/Entity/entity.api.php
-index f31561d70c..6c184a8868 100644
---- a/core/lib/Drupal/Core/Entity/entity.api.php
-+++ b/core/lib/Drupal/Core/Entity/entity.api.php
-@@ -846,6 +846,8 @@ function hook_entity_view_mode_info_alter(&$view_modes) {
-  *     the entity type and the bundle, the one for the bundle is used.
-  *   - translatable: (optional) A boolean value specifying whether this bundle
-  *     has translation support enabled. Defaults to FALSE.
-+ *   - class: (optional) The fully qualified class name for this bundle. If
-+ *     omitted the class from the entity type definition will be used.
-  *
-  * @see \Drupal\Core\Entity\EntityTypeBundleInfo::getBundleInfo()
-  * @see hook_entity_bundle_info_alter()
-@@ -866,6 +868,8 @@ function hook_entity_bundle_info() {
-  */
- function hook_entity_bundle_info_alter(&$bundles) {
-   $bundles['user']['user']['label'] = t('Full account');
-+  // Override the bundle class for the "article" node type in a custom module.
-+  $bundles['node']['article']['class'] = 'Drupal\mymodule\Entity\Article';
- }
- 
- /**
-diff --git a/core/modules/system/tests/modules/entity_test_bundle_class/entity_test_bundle_class.info.yml b/core/modules/system/tests/modules/entity_test_bundle_class/entity_test_bundle_class.info.yml
-new file mode 100644
-index 0000000000..2bc73bd55d
---- /dev/null
-+++ b/core/modules/system/tests/modules/entity_test_bundle_class/entity_test_bundle_class.info.yml
-@@ -0,0 +1,7 @@
-+name: 'Entity Bundle Class Test'
-+type: module
-+description: 'Support module for testing entity bundle classes.'
-+package: Testing
-+version: VERSION
-+dependencies:
-+  - drupal:entity_test
-diff --git a/core/modules/system/tests/modules/entity_test_bundle_class/entity_test_bundle_class.module b/core/modules/system/tests/modules/entity_test_bundle_class/entity_test_bundle_class.module
-new file mode 100644
-index 0000000000..576143a4c1
---- /dev/null
-+++ b/core/modules/system/tests/modules/entity_test_bundle_class/entity_test_bundle_class.module
-@@ -0,0 +1,26 @@
-+<?php
-+
-+/**
-+ * @file
-+ * Support module for testing entity bundle classes.
-+ */
-+
-+use Drupal\entity_test_bundle_class\Entity\EntityTestBundleClass;
-+use Drupal\entity_test_bundle_class\Entity\NonInheritingBundleClass;
-+
-+/**
-+ * Implements hook_entity_bundle_info_alter().
-+ */
-+function entity_test_bundle_class_entity_bundle_info_alter(&$bundles) {
-+  if (!empty($bundles['entity_test']['bundle_class'])) {
-+    $bundles['entity_test']['bundle_class']['class'] = EntityTestBundleClass::class;
-+  }
-+
-+  if (\Drupal::state()->get('entity_test_bundle_class_enable_ambiguous_entity_types', FALSE)) {
-+    $bundles['entity_test']['entity_test_no_label']['class'] = EntityTestBundleClass::class;
-+  }
-+
-+  if (\Drupal::state()->get('entity_test_bundle_class_non_inheriting', FALSE)) {
-+    $bundles['entity_test']['bundle_class']['class'] = NonInheritingBundleClass::class;
-+  }
-+}
-diff --git a/core/modules/system/tests/modules/entity_test_bundle_class/src/Entity/EntityTestBundleClass.php b/core/modules/system/tests/modules/entity_test_bundle_class/src/Entity/EntityTestBundleClass.php
-new file mode 100644
-index 0000000000..56291da832
---- /dev/null
-+++ b/core/modules/system/tests/modules/entity_test_bundle_class/src/Entity/EntityTestBundleClass.php
-@@ -0,0 +1,11 @@
-+<?php
-+
-+namespace Drupal\entity_test_bundle_class\Entity;
-+
-+use Drupal\entity_test\Entity\EntityTest;
-+
-+/**
-+ * The bundle class for the bundle_class bundle of the entity_test entity.
-+ */
-+class EntityTestBundleClass extends EntityTest {
-+}
-diff --git a/core/modules/system/tests/modules/entity_test_bundle_class/src/Entity/NonInheritingBundleClass.php b/core/modules/system/tests/modules/entity_test_bundle_class/src/Entity/NonInheritingBundleClass.php
-new file mode 100644
-index 0000000000..1ad9b67fd5
---- /dev/null
-+++ b/core/modules/system/tests/modules/entity_test_bundle_class/src/Entity/NonInheritingBundleClass.php
-@@ -0,0 +1,9 @@
-+<?php
-+
-+namespace Drupal\entity_test_bundle_class\Entity;
-+
-+/**
-+ * An invalid bundle class which does not inherit the main entity class.
-+ */
-+class NonInheritingBundleClass {
-+}
-diff --git a/core/tests/Drupal/KernelTests/Core/Entity/BundleClassTest.php b/core/tests/Drupal/KernelTests/Core/Entity/BundleClassTest.php
-new file mode 100644
-index 0000000000..21a4958ff6
---- /dev/null
-+++ b/core/tests/Drupal/KernelTests/Core/Entity/BundleClassTest.php
-@@ -0,0 +1,104 @@
-+<?php
-+
-+namespace Drupal\KernelTests\Core\Entity;
-+
-+use Drupal\Core\Entity\Exception\AmbiguousBundleClassException;
-+use Drupal\Core\Entity\Exception\BundleClassInheritanceException;
-+use Drupal\entity_test\Entity\EntityTest;
-+use Drupal\entity_test_bundle_class\Entity\EntityTestBundleClass;
-+
-+/**
-+ * Tests entity bundle classes.
-+ *
-+ * @group Entity
-+ */
-+class BundleClassTest extends EntityKernelTestBase {
-+
-+  /**
-+   * {@inheritdoc}
-+   */
-+  protected static $modules = ['entity_test_bundle_class'];
-+
-+  /**
-+   * The entity storage.
-+   *
-+   * @var \Drupal\Core\Entity\EntityStorageInterface
-+   */
-+  protected $storage;
-+
-+  /**
-+   * {@inheritdoc}
-+   */
-+  protected function setUp(): void {
-+    parent::setUp();
-+    $this->storage = $this->entityTypeManager->getStorage('entity_test');
-+  }
-+
-+  /**
-+   * Tests making use of a custom bundle field.
-+   */
-+  public function testEntitySubclass() {
-+    entity_test_create_bundle('bundle_class');
-+
-+    // Verify statically created entity with bundle class returns correct class.
-+    $entity = EntityTestBundleClass::create();
-+    $this->assertInstanceOf(EntityTestBundleClass::class, $entity);
-+
-+    // Verify statically created entity with bundle class returns correct
-+    // bundle.
-+    $entity = EntityTestBundleClass::create(['type' => 'custom']);
-+    $this->assertInstanceOf(EntityTestBundleClass::class, $entity);
-+    $this->assertEquals('bundle_class', $entity->bundle());
-+
-+    // Verify that the entity storage creates the entity using the proper class.
-+    $entity = $this->storage->create(['type' => 'bundle_class']);
-+    $this->assertInstanceOf(EntityTestBundleClass::class, $entity);
-+
-+    // Verify that loading an entity returns the proper class.
-+    $entity->save();
-+    $id = $entity->id();
-+    $this->storage->resetCache();
-+    $entity = $this->storage->load($id);
-+    $this->assertInstanceOf(EntityTestBundleClass::class, $entity);
-+
-+    // Verify that getEntityClass without bundle returns the default entity
-+    // class.
-+    $entity_class = $this->storage->getEntityClass(NULL);
-+    $this->assertEquals(EntityTest::class, $entity_class);
-+
-+    // Verify that getEntityClass with a bundle returns the proper class.
-+    $entity_class = $this->storage->getEntityClass('bundle_class');
-+    $this->assertEquals(EntityTestBundleClass::class, $entity_class);
-+
-+    // Verify that getEntityClass with a non-existing bundle returns the entity
-+    // class.
-+    $entity_class = $this->storage->getEntityClass('custom');
-+    $this->assertEquals(EntityTest::class, $entity_class);
-+  }
-+
-+  /**
-+   * Checks exception is thrown if multiple classes implement the same bundle.
-+   */
-+  public function testAmbiguousBundleClassException() {
-+    $this->container->get('state')->set('entity_test_bundle_class_enable_ambiguous_entity_types', TRUE);
-+    $this->entityTypeManager->clearCachedDefinitions();
-+    $this->expectException(AmbiguousBundleClassException::class);
-+    entity_test_create_bundle('bundle_class');
-+
-+    // Since we now have two entity types that returns the same class for the
-+    // same bundle, we expect this to throw an exception.
-+    EntityTestBundleClass::create();
-+  }
-+
-+  /**
-+   * Checks exception thrown if a bundle class doesn't extend the entity class.
-+   */
-+  public function testBundleClassShouldExtendEntityClass() {
-+    $this->container->get('state')->set('entity_test_bundle_class_non_inheriting', TRUE);
-+    $this->entityTypeManager->clearCachedDefinitions();
-+    $this->expectException(BundleClassInheritanceException::class);
-+    entity_test_create_bundle('bundle_class');
-+    $this->storage->create(['type' => 'bundle_class']);
-+  }
-+
-+}
diff --git a/patches/core--drupal--3047110-taxonomy-term-moderation-class.patch b/patches/core--drupal--3047110-taxonomy-term-moderation-class.patch
index 520c42f18..914f75d60 100644
--- a/patches/core--drupal--3047110-taxonomy-term-moderation-class.patch
+++ b/patches/core--drupal--3047110-taxonomy-term-moderation-class.patch
@@ -1,14 +1,8 @@
 diff --git a/core/modules/content_moderation/src/EntityTypeInfo.php b/core/modules/content_moderation/src/EntityTypeInfo.php
-index fe8e6eb45c..9593c6ae73 100644
+index fe8e6eb45c..cf5bd715f8 100644
 --- a/core/modules/content_moderation/src/EntityTypeInfo.php
 +++ b/core/modules/content_moderation/src/EntityTypeInfo.php
-@@ -138,13 +138,9 @@ public function entityTypeAlter(array &$entity_types) {
-       // Workspace entities can not be moderated because they use string IDs.
-       // @see \Drupal\content_moderation\Entity\ContentModerationState::baseFieldDefinitions()
-       // where the target entity ID is defined as an integer.
--      // @todo Moderation is disabled for taxonomy terms until integration is
--      //   enabled for them.
--      // @see https://www.drupal.org/project/drupal/issues/3047110
+@@ -144,7 +144,6 @@ public function entityTypeAlter(array &$entity_types) {
        $entity_type_to_exclude = [
          'path_alias',
          'workspace',
@@ -16,3 +10,270 @@ index fe8e6eb45c..9593c6ae73 100644
        ];
        if ($entity_type->isRevisionable() && !$entity_type->isInternal() && !in_array($entity_type_id, $entity_type_to_exclude)) {
          $entity_types[$entity_type_id] = $this->addModerationToEntityType($entity_type);
+diff --git a/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php b/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php
+index c238eb3d44..5d20a48235 100644
+--- a/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php
++++ b/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php
+@@ -78,6 +78,7 @@ protected function setUp(): void {
+     $this->installEntitySchema('block_content');
+     $this->installEntitySchema('media');
+     $this->installEntitySchema('file');
++    $this->installEntitySchema('taxonomy_term');
+     $this->installEntitySchema('content_moderation_state');
+     $this->installConfig('content_moderation');
+     $this->installSchema('file', 'file_usage');
+@@ -157,6 +158,9 @@ public function basicModerationTestCases() {
+       'Nodes' => [
+         'node',
+       ],
++      'Taxonomy term' => [
++        'taxonomy_term',
++      ],
+       'Block content' => [
+         'block_content',
+       ],
+@@ -278,7 +282,7 @@ public function testContentModerationStateTranslationDataRemoval($entity_type_id
+       /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
+       $entity = $this->createEntity($entity_type_id, 'published');
+       $langcode = 'fr';
+-      $translation = $entity->addTranslation($langcode, ['title' => 'French title test']);
++      $translation = $entity->addTranslation($langcode, [$entity->getEntityType()->getKey('label') => 'French title test']);
+       // Make sure we add values for all of the required fields.
+       if ($entity_type_id == 'block_content') {
+         $translation->info = $this->randomString();
+@@ -788,14 +792,4 @@ protected function assertDefaultRevision(EntityInterface $entity, $revision_id,
+     }
+   }
+ 
+-  /**
+-   * Tests that the 'taxonomy_term' entity type cannot be moderated.
+-   */
+-  public function testTaxonomyTermEntityTypeModeration() {
+-    /** @var \Drupal\content_moderation\ModerationInformationInterface $moderation_info */
+-    $moderation_info = \Drupal::service('content_moderation.moderation_information');
+-    $entity_type = \Drupal::entityTypeManager()->getDefinition('taxonomy_term');
+-    $this->assertFalse($moderation_info->canModerateEntitiesOfEntityType($entity_type));
+-  }
+-
+ }
+diff --git a/core/modules/taxonomy/tests/src/Functional/TaxonomyTermContentModerationTest.php b/core/modules/taxonomy/tests/src/Functional/TaxonomyTermContentModerationTest.php
+new file mode 100644
+index 0000000000..d055b0c45b
+--- /dev/null
++++ b/core/modules/taxonomy/tests/src/Functional/TaxonomyTermContentModerationTest.php
+@@ -0,0 +1,215 @@
++<?php
++
++namespace Drupal\Tests\taxonomy\Functional;
++
++use Drupal\Tests\content_moderation\Traits\ContentModerationTestTrait;
++use Drupal\workflows\Entity\Workflow;
++
++/**
++ * Tests taxonomy terms with Content Moderation.
++ *
++ * @group content_moderation
++ * @group taxonomy
++ */
++class TaxonomyTermContentModerationTest extends TaxonomyTestBase {
++
++  use ContentModerationTestTrait;
++
++  /**
++   * {@inheritdoc}
++   */
++  protected $defaultTheme = 'stark';
++
++  /**
++   * The vocabulary used for creating terms.
++   *
++   * @var \Drupal\taxonomy\VocabularyInterface
++   */
++  protected $vocabulary;
++
++  /**
++   * {@inheritdoc}
++   */
++  protected static $modules = ['taxonomy', 'content_moderation'];
++
++  /**
++   * {@inheritdoc}
++   */
++  protected function setUp(): void {
++    parent::setUp();
++
++    $this->createEditorialWorkflow();
++
++    $this->drupalLogin($this->drupalCreateUser([
++      'administer taxonomy',
++      'use editorial transition create_new_draft',
++      'use editorial transition publish',
++      'view any unpublished content',
++      'view latest version',
++    ]));
++
++    $this->vocabulary = $this->createVocabulary();
++
++    // Set the vocabulary as moderated.
++    $workflow = Workflow::load('editorial');
++    $workflow->getTypePlugin()->addEntityTypeAndBundle('taxonomy_term', $this->vocabulary->id());
++    $workflow->save();
++  }
++
++  /**
++   * Tests taxonomy term parents on a moderated vocabulary.
++   */
++  public function testTaxonomyTermParents() {
++    $assert_session = $this->assertSession();
++    // Create a simple hierarchy in the vocabulary, a root term and three parent
++    // terms.
++    $root = $this->createTerm($this->vocabulary, ['langcode' => 'en', 'moderation_state' => 'published']);
++    $parent_1 = $this->createTerm($this->vocabulary, [
++      'langcode' => 'en',
++      'moderation_state' => 'published',
++      'parent' => $root->id(),
++    ]);
++    $parent_2 = $this->createTerm($this->vocabulary, [
++      'langcode' => 'en',
++      'moderation_state' => 'published',
++      'parent' => $root->id(),
++    ]);
++    $parent_3 = $this->createTerm($this->vocabulary, [
++      'langcode' => 'en',
++      'moderation_state' => 'published',
++      'parent' => $root->id(),
++    ]);
++
++    // Create a child term and assign one of the parents above.
++    $child = $this->createTerm($this->vocabulary, [
++      'langcode' => 'en',
++      'moderation_state' => 'published',
++      'parent' => $parent_1->id(),
++    ]);
++
++    /** @var \Drupal\taxonomy\TermStorageInterface $taxonomy_storage */
++    $taxonomy_storage = \Drupal::entityTypeManager()->getStorage('taxonomy_term');
++    $validation_message = 'You can only change the hierarchy for the published version of this term.';
++
++    // Add a pending revision without changing the term parent.
++    $this->drupalGet('taxonomy/term/' . $child->id() . '/edit');
++    $this->submitForm(['moderation_state[0][state]' => 'draft'], 'Save');
++
++    $assert_session->pageTextNotContains($validation_message);
++
++    // Add a pending revision and change the parent.
++    $this->drupalGet('taxonomy/term/' . $child->id() . '/edit');
++    $this->submitForm(['parent[]' => [$parent_2->id()], 'moderation_state[0][state]' => 'draft'], 'Save');
++
++    // Check that parents were not changed.
++    $assert_session->pageTextContains($validation_message);
++    $taxonomy_storage->resetCache();
++    $this->assertEquals([$parent_1->id()], array_keys($taxonomy_storage->loadParents($child->id())));
++
++    // Add a pending revision and add a new parent.
++    $this->drupalGet('taxonomy/term/' . $child->id() . '/edit');
++    $this->submitForm(['parent[]' => [$parent_1->id(), $parent_3->id()], 'moderation_state[0][state]' => 'draft'], 'Save');
++
++    // Check that parents were not changed.
++    $assert_session->pageTextContains($validation_message);
++    $taxonomy_storage->resetCache();
++    $this->assertEquals([$parent_1->id()], array_keys($taxonomy_storage->loadParents($child->id())));
++
++    // Add a pending revision and use the root term as a parent.
++    $this->drupalGet('taxonomy/term/' . $child->id() . '/edit');
++    $this->submitForm(['parent[]' => [$root->id()], 'moderation_state[0][state]' => 'draft'], 'Save');
++
++    // Check that parents were not changed.
++    $assert_session->pageTextContains($validation_message);
++    $taxonomy_storage->resetCache();
++    $this->assertEquals([$parent_1->id()], array_keys($taxonomy_storage->loadParents($child->id())));
++
++    // Add a pending revision and remove the parent.
++    $this->drupalGet('taxonomy/term/' . $child->id() . '/edit');
++    $this->submitForm(['parent[]' => [], 'moderation_state[0][state]' => 'draft'], 'Save');
++
++    // Check that parents were not changed.
++    $assert_session->pageTextContains($validation_message);
++    $taxonomy_storage->resetCache();
++    $this->assertEquals([$parent_1->id()], array_keys($taxonomy_storage->loadParents($child->id())));
++
++    // Add a published revision.
++    $this->drupalGet('taxonomy/term/' . $child->id() . '/edit');
++    $this->submitForm(['moderation_state[0][state]' => 'published'], 'Save');
++
++    // Change the parents.
++    $this->drupalGet('taxonomy/term/' . $child->id() . '/edit');
++    $this->submitForm(['parent[]' => [$parent_2->id()]], 'Save');
++
++    // Check that parents were changed.
++    $assert_session->pageTextNotContains($validation_message);
++    $taxonomy_storage->resetCache();
++    $this->assertEquals([$parent_2->id()], array_keys($taxonomy_storage->loadParents($child->id())));
++
++    // Add a pending revision and change the weight.
++    $this->drupalGet('taxonomy/term/' . $child->id() . '/edit');
++    $this->submitForm(['weight' => 10, 'moderation_state[0][state]' => 'draft'], 'Save');
++
++    // Check that weight was not changed.
++    $assert_session->pageTextContains($validation_message);
++
++    // Add a new term without any parent and publish it.
++    $edit = [
++      'name[0][value]' => $this->randomMachineName(),
++      'moderation_state[0][state]' => 'published',
++    ];
++    $this->drupalGet("admin/structure/taxonomy/manage/{$this->vocabulary->id()}/add");
++    $this->submitForm($edit, 'Save');
++    // Add a pending revision without any changes.
++    $terms = \Drupal::entityTypeManager()->getStorage('taxonomy_term')->loadByProperties(["name" => $edit['name[0][value]']]);
++    $term = reset($terms);
++    $this->drupalGet('taxonomy/term/' . $term->id() . '/edit');
++    $this->submitForm(['moderation_state[0][state]' => 'draft'], 'Save');
++    $assert_session->pageTextNotContains($validation_message);
++  }
++
++  /**
++   * Tests changing field values in pending revisions of taxonomy terms.
++   */
++  public function testTaxonomyTermPendingRevisions() {
++    $assert_session = $this->assertSession();
++    $default_term_name = 'term - default revision';
++    $default_term_description = 'The default revision of a term.';
++    $term = $this->createTerm($this->vocabulary, [
++      'name' => $default_term_name,
++      'description' => $default_term_description,
++      'langcode' => 'en',
++      'moderation_state' => 'published',
++    ]);
++
++    // Add a pending revision without changing the term parent.
++    $this->drupalGet('taxonomy/term/' . $term->id() . '/edit');
++    $assert_session->pageTextContains($default_term_name);
++    $assert_session->pageTextContains($default_term_description);
++
++    // Check the revision log message field does not appear on the term edit
++    // page.
++    $this->drupalGet('taxonomy/term/' . $term->id() . '/edit');
++    $assert_session->fieldNotExists('revision_log_message[0][value]');
++
++    $pending_term_name = 'term - pending revision';
++    $pending_term_description = 'The pending revision of a term.';
++    $edit = [
++      'name[0][value]' => $pending_term_name,
++      'description[0][value]' => $pending_term_description,
++      'moderation_state[0][state]' => 'draft',
++    ];
++    $this->drupalGet('taxonomy/term/' . $term->id() . '/edit');
++    $this->submitForm($edit, 'Save');
++
++    $assert_session->pageTextContains($pending_term_name);
++    $assert_session->pageTextContains($pending_term_description);
++    $assert_session->pageTextNotContains($default_term_description);
++
++    // Check that the default revision of the term contains the correct values.
++    $this->drupalGet('taxonomy/term/' . $term->id());
++    $assert_session->pageTextContains($default_term_name);
++    $assert_session->pageTextContains($default_term_description);
++  }
++
++}
diff --git a/symfony.lock b/symfony.lock
index 7b81500db..5a6ffa6ca 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -6,40 +6,40 @@
         "version": "1.3.0"
     },
     "behat/mink": {
-        "version": "v1.8.1"
-    },
-    "behat/mink-browserkit-driver": {
-        "version": "v1.3.4"
+        "version": "v1.9.0"
     },
     "behat/mink-goutte-driver": {
-        "version": "v1.2.1"
+        "version": "v1.3.0"
     },
     "behat/mink-selenium2-driver": {
-        "version": "v1.4.0"
+        "version": "v1.5.0"
     },
     "chi-teck/drupal-code-generator": {
         "version": "1.33.1"
     },
     "composer/ca-bundle": {
-        "version": "1.2.9"
+        "version": "1.3.1"
     },
     "composer/composer": {
-        "version": "2.0.13"
+        "version": "2.1.14"
     },
     "composer/metadata-minifier": {
         "version": "1.0.0"
     },
+    "composer/pcre": {
+        "version": "1.0.0"
+    },
     "composer/semver": {
-        "version": "3.2.2"
+        "version": "3.2.6"
     },
     "composer/spdx-licenses": {
-        "version": "1.5.5"
+        "version": "1.5.6"
     },
     "composer/xdebug-handler": {
-        "version": "1.4.6"
+        "version": "2.0.3"
     },
     "consolidation/annotated-command": {
-        "version": "4.2.4"
+        "version": "4.4.0"
     },
     "consolidation/config": {
         "version": "1.2.1"
@@ -54,20 +54,17 @@
         "version": "4.1.2"
     },
     "consolidation/robo": {
-        "version": "2.2.2"
+        "version": "3.0.6"
     },
     "consolidation/self-update": {
-        "version": "1.2.0"
+        "version": "2.0.1"
     },
     "consolidation/site-alias": {
-        "version": "3.1.0"
+        "version": "3.1.1"
     },
     "consolidation/site-process": {
         "version": "4.1.0"
     },
-    "container-interop/container-interop": {
-        "version": "1.2.0"
-    },
     "d4h/finediff": {
         "version": "1.0.1"
     },
@@ -81,7 +78,7 @@
         "version": "v1.0.2"
     },
     "doctrine/annotations": {
-        "version": "1.0",
+        "version": "1.13",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "master",
@@ -93,10 +90,10 @@
         ]
     },
     "doctrine/cache": {
-        "version": "1.11.0"
+        "version": "1.12.1"
     },
     "doctrine/collections": {
-        "version": "1.6.7"
+        "version": "1.6.8"
     },
     "doctrine/common": {
         "version": "2.13.3"
@@ -132,13 +129,13 @@
         "version": "2.4.0"
     },
     "drupal/config_filter": {
-        "version": "1.8.0"
+        "version": "2.2.0"
     },
     "drupal/config_split": {
-        "version": "1.7.0"
+        "version": "2.0.0-beta5"
     },
     "drupal/console": {
-        "version": "1.9.7"
+        "version": "1.9.8"
     },
     "drupal/console-core": {
         "version": "1.9.7"
@@ -150,28 +147,25 @@
         "version": "0.9.5"
     },
     "drupal/core": {
-        "version": "9.1.8"
+        "version": "9.3.0"
     },
     "drupal/core-dev": {
-        "version": "9.1.8"
+        "version": "9.3.0"
     },
     "drupal/core-recommended": {
-        "version": "9.1.8"
+        "version": "9.3.0"
     },
     "drupal/ctools": {
-        "version": "3.5.0"
+        "version": "3.7.0"
     },
     "drupal/devel": {
-        "version": "4.1.1"
+        "version": "4.1.3"
     },
     "drupal/devel_php": {
         "version": "1.3.0"
     },
-    "drupal/entity_reference_revisions": {
-        "version": "1.9.0"
-    },
     "drupal/geofield": {
-        "version": "1.22.0"
+        "version": "1.35.0"
     },
     "drupal/google_tag": {
         "version": "1.4.0"
@@ -180,7 +174,7 @@
         "version": "1.0.0"
     },
     "drupal/imageapi_optimize": {
-        "version": "4.0.0-beta1"
+        "version": "4.0.0"
     },
     "drupal/imageapi_optimize_binaries": {
         "version": "1.0.0-alpha2"
@@ -201,58 +195,52 @@
         "version": "5.x-dev"
     },
     "drupal/mimemail": {
-        "version": "1.0.0-alpha3"
-    },
-    "drupal/paragraphs": {
-        "version": "1.12.0"
-    },
-    "drupal/paragraphs_viewmode": {
-        "version": "1.0.0"
+        "version": "1.0.0-alpha4"
     },
     "drupal/pathauto": {
         "version": "1.8.0"
     },
     "drupal/redirect": {
-        "version": "1.6.0"
+        "version": "1.7.0"
     },
     "drupal/redis": {
         "version": "1.5.0"
     },
     "drupal/social_api": {
-        "version": "2.0.0-rc4"
+        "version": "3.0.2"
     },
     "drupal/social_auth": {
-        "version": "2.0.0-rc4"
+        "version": "3.0.2"
     },
     "drupal/social_auth_hid": {
-        "version": "2.x-dev"
+        "version": "2.7.0"
     },
     "drupal/stage_file_proxy": {
-        "version": "1.1.0"
+        "version": "1.2.0"
     },
     "drupal/svg_image": {
         "version": "1.15.0"
     },
     "drupal/taxonomy_term_revision": {
-        "version": "1.0.0"
+        "version": "1.x-dev"
     },
     "drupal/theme_switcher": {
         "version": "1.2.0"
     },
     "drupal/token": {
-        "version": "1.9.0"
+        "version": "1.10.0"
     },
     "drupal/user_display_name": {
         "version": "1.0.1"
     },
     "drush/drush": {
-        "version": "10.5.0"
+        "version": "10.6.2"
     },
     "easyrdf/easyrdf": {
         "version": "1.1.1"
     },
     "egulias/email-validator": {
-        "version": "2.1.22"
+        "version": "3.1.2"
     },
     "enlightn/security-checker": {
         "version": "v1.9.0"
@@ -264,7 +252,7 @@
         "version": "v3.3.1"
     },
     "friends-of-behat/mink-browserkit-driver": {
-        "version": "v1.5.0"
+        "version": "v1.6.1"
     },
     "grasmash/expander": {
         "version": "1.0.0"
@@ -276,82 +264,79 @@
         "version": "6.5.5"
     },
     "guzzlehttp/promises": {
-        "version": "1.4.0"
+        "version": "1.5.1"
     },
     "guzzlehttp/psr7": {
-        "version": "1.7.0"
+        "version": "1.8.3"
     },
     "instaclick/php-webdriver": {
-        "version": "1.4.7"
+        "version": "1.4.10"
     },
     "justinrainbow/json-schema": {
-        "version": "5.2.10"
+        "version": "5.2.11"
     },
     "kint-php/kint": {
         "version": "3.3"
     },
     "laminas/laminas-diactoros": {
-        "version": "2.5.0"
+        "version": "2.8.0"
     },
     "laminas/laminas-escaper": {
-        "version": "2.7.0"
+        "version": "2.9.0"
     },
     "laminas/laminas-feed": {
-        "version": "2.13.0"
+        "version": "2.15.0"
     },
     "laminas/laminas-stdlib": {
-        "version": "3.3.0"
-    },
-    "laminas/laminas-zendframework-bridge": {
-        "version": "1.1.1"
+        "version": "3.6.1"
     },
     "league/commonmark": {
-        "version": "1.6.2"
+        "version": "1.6.6"
     },
     "league/container": {
-        "version": "2.5.0"
+        "version": "3.4.1"
     },
     "league/html-to-markdown": {
-        "version": "5.0.1"
+        "version": "5.0.2"
     },
     "league/oauth2-client": {
         "version": "2.6.0"
     },
     "masterminds/html5": {
-        "version": "2.7.4"
+        "version": "2.7.5"
     },
     "mikey179/vfsstream": {
-        "version": "v1.6.8"
+        "version": "v1.6.10"
     },
     "myclabs/deep-copy": {
         "version": "1.10.2"
     },
     "nikic/php-parser": {
-        "version": "v4.10.5"
+        "version": "v4.13.2"
     },
     "paragonie/random_compat": {
         "version": "v9.99.100"
     },
     "pdepend/pdepend": {
-        "version": "2.9.1"
+        "version": "2.10.2"
     },
     "pear/archive_tar": {
-        "version": "1.4.13"
+        "version": "1.4.14"
     },
     "pear/console_getopt": {
         "version": "v1.4.3"
     },
     "pear/pear-core-minimal": {
-        "version": "v1.10.10"
+        "version": "v1.10.11"
     },
     "pear/pear_exception": {
-        "version": "v1.0.1"
+        "version": "v1.0.2"
     },
     "pelago/emogrifier": {
-        "version": "v5.0.1"
+        "version": "v6.0.0"
     },
     "phar-io/manifest": {
-        "version": "2.0.1"
+        "version": "2.0.3"
     },
     "phar-io/version": {
         "version": "3.1.0"
@@ -366,25 +351,25 @@
         "version": "2.2.0"
     },
     "phpdocumentor/reflection-docblock": {
-        "version": "5.2.2"
+        "version": "5.3.0"
     },
     "phpdocumentor/type-resolver": {
-        "version": "1.4.0"
+        "version": "1.5.1"
     },
     "phpmd/phpmd": {
-        "version": "2.10.1"
+        "version": "2.11.0"
     },
     "phpspec/prophecy": {
-        "version": "1.13.0"
+        "version": "v1.15.0"
     },
     "phpspec/prophecy-phpunit": {
         "version": "v2.0.1"
     },
     "phpunit/php-code-coverage": {
-        "version": "9.2.6"
+        "version": "9.2.10"
     },
     "phpunit/php-file-iterator": {
-        "version": "3.0.5"
+        "version": "3.0.6"
     },
     "phpunit/php-invoker": {
         "version": "3.1.1"
@@ -396,12 +381,12 @@
         "version": "5.0.3"
     },
     "phpunit/phpunit": {
-        "version": "4.7",
+        "version": "9.5",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "master",
-            "version": "4.7",
-            "ref": "fc18a41d910bd168b6d83b09330d3dd892ddbcdd"
+            "version": "9.3",
+            "ref": "a6249a6c4392e9169b87abf93225f7f9f59025e6"
         },
         "files": [
             ".env.test",
@@ -413,7 +398,7 @@
         "version": "1.0.1"
     },
     "psr/container": {
-        "version": "1.0.0"
+        "version": "1.1.1"
     },
     "psr/http-factory": {
         "version": "1.0.1"
@@ -422,10 +407,10 @@
         "version": "1.0.1"
     },
     "psr/log": {
-        "version": "1.1.3"
+        "version": "1.1.4"
     },
     "psy/psysh": {
-        "version": "v0.10.8"
+        "version": "v0.10.12"
     },
     "ralouphie/getallheaders": {
         "version": "3.0.3"
@@ -437,7 +422,10 @@
         "version": "v1.3.0"
     },
     "reliefweb/simple-datepicker": {
-        "version": "v1.2.0"
+        "version": "v1.3.1"
+    },
+    "sabberworm/php-css-parser": {
+        "version": "8.4.0"
     },
     "sebastian/cli-parser": {
         "version": "1.0.1"
@@ -461,10 +449,10 @@
         "version": "5.1.3"
     },
     "sebastian/exporter": {
-        "version": "4.0.3"
+        "version": "4.0.4"
     },
     "sebastian/global-state": {
-        "version": "5.0.2"
+        "version": "5.0.3"
     },
     "sebastian/lines-of-code": {
         "version": "1.0.3"
@@ -482,7 +470,7 @@
         "version": "3.0.3"
     },
     "sebastian/type": {
-        "version": "2.3.1"
+        "version": "2.3.4"
     },
     "sebastian/version": {
         "version": "3.0.2"
@@ -491,18 +479,18 @@
         "version": "1.8.3"
     },
     "seld/phar-utils": {
-        "version": "1.1.1"
+        "version": "1.2.0"
     },
     "sirbrillig/phpcs-variable-analysis": {
-        "version": "v2.11.0"
+        "version": "v2.11.2"
     },
     "squizlabs/php_codesniffer": {
-        "version": "3.0",
+        "version": "3.6",
         "recipe": {
             "repo": "github.com/symfony/recipes-contrib",
             "branch": "master",
-            "version": "3.0",
-            "ref": "0dc9cceda799fd3a08b96987e176a261028a3709"
+            "version": "3.6",
+            "ref": "1019e5c08d4821cb9b77f4891f8e9c31ff20ac6f"
         },
         "files": [
             "phpcs.xml.dist"
@@ -515,13 +503,13 @@
         "version": "0.11.0"
     },
     "symfony-cmf/routing": {
-        "version": "2.3.3"
+        "version": "2.3.4"
     },
     "symfony/browser-kit": {
-        "version": "v4.4.22"
+        "version": "v4.4.27"
     },
     "symfony/config": {
-        "version": "v4.4.22"
+        "version": "v4.4.34"
     },
     "symfony/console": {
         "version": "4.4",
@@ -529,7 +517,7 @@
             "repo": "github.com/symfony/recipes",
             "branch": "master",
             "version": "4.4",
-            "ref": "ea8c0eda34fda57e7d5cd8cbd889e2a387e3472c"
+            "ref": "fd5340d07d4c90504843b53da41525cf42e31f5c"
         },
         "files": [
             "bin/console",
@@ -537,37 +525,37 @@
         ]
     },
     "symfony/css-selector": {
-        "version": "v4.4.22"
+        "version": "v4.4.27"
     },
     "symfony/debug": {
-        "version": "v4.4.19"
+        "version": "v4.4.31"
     },
     "symfony/dependency-injection": {
-        "version": "v4.4.19"
+        "version": "v4.4.34"
     },
     "symfony/deprecation-contracts": {
-        "version": "v2.4.0"
+        "version": "v2.5.0"
     },
     "symfony/dom-crawler": {
-        "version": "v4.4.20"
+        "version": "v4.4.30"
     },
     "symfony/error-handler": {
-        "version": "v4.4.19"
+        "version": "v4.4.34"
     },
     "symfony/event-dispatcher": {
-        "version": "v4.4.19"
+        "version": "v4.4.34"
     },
     "symfony/event-dispatcher-contracts": {
-        "version": "v1.1.9"
+        "version": "v1.1.11"
     },
     "symfony/filesystem": {
-        "version": "v4.4.22"
+        "version": "v4.4.27"
     },
     "symfony/finder": {
-        "version": "v4.4.20"
+        "version": "v4.4.30"
     },
     "symfony/flex": {
-        "version": "1.0",
+        "version": "2.0",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "master",
@@ -579,13 +567,13 @@
         ]
     },
     "symfony/http-client-contracts": {
-        "version": "v2.3.1"
+        "version": "v2.5.0"
     },
     "symfony/http-foundation": {
-        "version": "v4.4.19"
+        "version": "v4.4.34"
     },
     "symfony/http-kernel": {
-        "version": "v4.4.19"
+        "version": "v4.4.35"
     },
     "symfony/lock": {
         "version": "4.4",
@@ -600,15 +588,15 @@
         ]
     },
     "symfony/mime": {
-        "version": "v5.1.11"
+        "version": "v5.4.0"
     },
     "symfony/phpunit-bridge": {
-        "version": "5.1",
+        "version": "5.4",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "master",
-            "version": "5.1",
-            "ref": "bf16921ef8309a81d9f046e9b6369c46bcbd031f"
+            "version": "5.3",
+            "ref": "97cb3dc7b0f39c7cfc4b7553504c9d7b7795de96"
         },
         "files": [
             ".env.test",
@@ -618,28 +606,28 @@
         ]
     },
     "symfony/polyfill-ctype": {
-        "version": "v1.20.0"
+        "version": "v1.23.0"
     },
     "symfony/polyfill-iconv": {
-        "version": "v1.20.0"
+        "version": "v1.23.0"
     },
     "symfony/polyfill-intl-idn": {
-        "version": "v1.20.0"
+        "version": "v1.23.0"
     },
     "symfony/polyfill-intl-normalizer": {
-        "version": "v1.20.0"
+        "version": "v1.23.0"
     },
     "symfony/polyfill-mbstring": {
-        "version": "v1.20.0"
+        "version": "v1.23.1"
     },
     "symfony/polyfill-php72": {
-        "version": "v1.22.1"
+        "version": "v1.23.0"
     },
     "symfony/polyfill-php73": {
-        "version": "v1.22.1"
+        "version": "v1.23.0"
     },
     "symfony/polyfill-php80": {
-        "version": "v1.20.0"
+        "version": "v1.23.1"
     },
     "symfony/polyfill-php81": {
         "version": "v1.23.0"
@@ -648,13 +636,13 @@
         "version": "v1.23.0"
     },
     "symfony/process": {
-        "version": "v4.4.19"
+        "version": "v4.4.35"
     },
     "symfony/psr-http-message-bridge": {
-        "version": "v2.0.2"
+        "version": "v2.1.2"
     },
     "symfony/routing": {
-        "version": "4.2",
+        "version": "4.4",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "master",
@@ -668,13 +656,13 @@
         ]
     },
     "symfony/serializer": {
-        "version": "v4.4.19"
+        "version": "v4.4.35"
     },
     "symfony/service-contracts": {
-        "version": "v2.2.0"
+        "version": "v2.5.0"
     },
     "symfony/translation": {
-        "version": "3.3",
+        "version": "4.4",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "master",
@@ -687,18 +675,18 @@
         ]
     },
     "symfony/translation-contracts": {
-        "version": "v2.3.0"
+        "version": "v2.5.0"
     },
     "symfony/uid": {
-        "version": "v5.3.3"
+        "version": "v6.0.1"
     },
     "symfony/validator": {
-        "version": "4.3",
+        "version": "4.4",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "master",
             "version": "4.3",
-            "ref": "d902da3e4952f18d3bf05aab29512eb61cabd869"
+            "ref": "3eb8df139ec05414489d55b97603c5f6ca0c44cb"
         },
         "files": [
             "config/packages/test/validator.yaml",
@@ -706,25 +694,25 @@
         ]
     },
     "symfony/var-dumper": {
-        "version": "v5.1.11"
+        "version": "v5.4.0"
     },
     "symfony/yaml": {
-        "version": "v4.4.19"
+        "version": "v4.4.34"
     },
     "theseer/tokenizer": {
-        "version": "1.2.0"
+        "version": "1.2.1"
     },
     "twig/twig": {
-        "version": "v2.14.1"
+        "version": "v2.14.7"
     },
     "typo3/phar-stream-wrapper": {
-        "version": "v3.1.6"
+        "version": "v3.1.7"
     },
     "un-ocha/oauth2-hid": {
         "version": "v1.0.2"
     },
     "unocha/common_design": {
-        "version": "v4.0.5"
+        "version": "dev-cd-304-forms"
     },
     "webflo/drupal-finder": {
         "version": "1.2.2"

From 6d1e37f0a8752613e75a45988ddd2abab5a659f3 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 16 Dec 2021 03:22:47 +0000
Subject: [PATCH 306/720] [RW-283] Update config files (only reordering of some
 properties due to Drupal core update)

---
 config/block.block.breadcrumbs.yml            |   2 +-
 config/block.block.common_design_admin.yml    |   2 +-
 config/block.block.common_design_branding.yml |   2 +-
 ...lock.block.common_design_local_actions.yml |   2 +-
 .../block.block.common_design_local_tasks.yml |   2 +-
 config/block.block.common_design_messages.yml |   2 +-
 .../block.block.common_design_page_title.yml  |   2 +-
 ....block.common_design_subtheme_branding.yml |   2 +-
 ...k.common_design_subtheme_local_actions.yml |   2 +-
 ...ock.common_design_subtheme_local_tasks.yml |   2 +-
 ....block.common_design_subtheme_messages.yml |   2 +-
 ...lock.common_design_subtheme_page_title.yml |   2 +-
 config/block.block.common_design_tools.yml    |   2 +-
 config/block.block.footer.yml                 |   2 +-
 config/block.block.help.yml                   |   2 +-
 config/block.block.languageswitcher.yml       |   2 +-
 config/block.block.mainnavigation.yml         |   2 +-
 config/block.block.seven_admin.yml            |   2 +-
 config/block.block.seven_branding.yml         |   2 +-
 config/block.block.seven_local_actions.yml    |   2 +-
 config/block.block.seven_local_tasks.yml      |   2 +-
 config/block.block.seven_messages.yml         |   2 +-
 config/block.block.seven_page_title.yml       |   2 +-
 config/block.block.seven_tools.yml            |   2 +-
 config/block.block.stark_admin.yml            |   2 +-
 config/block.block.stark_branding.yml         |   2 +-
 config/block.block.stark_local_actions.yml    |   2 +-
 config/block.block.stark_local_tasks.yml      |   2 +-
 config/block.block.stark_messages.yml         |   2 +-
 config/block.block.stark_page_title.yml       |   2 +-
 config/block.block.stark_tools.yml            |   2 +-
 config/block.block.useraccountmenu.yml        |   2 +-
 config/book.settings.yml                      |   4 +-
 config/contact.settings.yml                   |   4 +-
 ...splay.contact_message.personal.default.yml |   6 +-
 ...play.guideline.field_guideline.default.yml |  28 +-
 ...splay.guideline.guideline_list.default.yml |  12 +-
 ...form_display.media.file_report.default.yml |  16 +-
 ...isplay.media.file_report.media_library.yml |   4 +-
 ...splay.media.image_announcement.default.yml |   8 +-
 ...media.image_announcement.media_library.yml |   8 +-
 ..._display.media.image_blog_post.default.yml |  12 +-
 ...ay.media.image_blog_post.media_library.yml |   8 +-
 ..._form_display.media.image_book.default.yml |  12 +-
 ...display.media.image_book.media_library.yml |   8 +-
 ...orm_display.media.image_report.default.yml |  12 +-
 ...splay.media.image_report.media_library.yml |   8 +-
 ...form_display.media.image_topic.default.yml |   6 +-
 ...isplay.media.image_topic.media_library.yml |  10 +-
 ...form_display.node.announcement.default.yml |  16 +-
 ...ty_form_display.node.blog_post.default.yml |  26 +-
 ....entity_form_display.node.book.default.yml |  12 +-
 ...e.entity_form_display.node.job.default.yml |  54 +-
 ...ntity_form_display.node.report.default.yml | 102 +--
 ...entity_form_display.node.topic.default.yml |  50 +-
 ...ity_form_display.node.training.default.yml |  78 +-
 ..._display.taxonomy_term.country.default.yml |  34 +-
 ..._display.taxonomy_term.country.profile.yml |   4 +-
 ...display.taxonomy_term.disaster.default.yml |  46 +-
 ...ay.taxonomy_term.disaster_type.default.yml |   6 +-
 ..._display.taxonomy_term.feature.default.yml |   2 +-
 ...display.taxonomy_term.language.default.yml |  10 +-
 ...m_display.taxonomy_term.source.default.yml |  66 +-
 ....entity_form_display.user.user.default.yml |  13 +-
 ...e.entity_form_mode.media.media_library.yml |   4 +-
 ...splay.contact_message.personal.default.yml |   4 +-
 ...play.guideline.field_guideline.default.yml |   8 +-
 ...splay.guideline.guideline_list.default.yml |  20 +-
 ...view_display.media.file_report.default.yml |  12 +-
 ...isplay.media.file_report.media_library.yml |   4 +-
 ...splay.media.image_announcement.default.yml |   6 +-
 ...media.image_announcement.media_library.yml |   4 +-
 ..._display.media.image_blog_post.default.yml |  10 +-
 ...ay.media.image_blog_post.media_library.yml |   4 +-
 ..._view_display.media.image_book.default.yml |  10 +-
 ...display.media.image_book.media_library.yml |   4 +-
 ...iew_display.media.image_report.default.yml |  14 +-
 ...splay.media.image_report.media_library.yml |   4 +-
 ...view_display.media.image_topic.default.yml |   8 +-
 ...isplay.media.image_topic.media_library.yml |   6 +-
 ...view_display.node.announcement.default.yml |  10 +-
 ..._view_display.node.announcement.teaser.yml |   6 +-
 ...ty_view_display.node.blog_post.default.yml |  20 +-
 ...ity_view_display.node.blog_post.teaser.yml |  14 +-
 ....entity_view_display.node.book.default.yml |   6 +-
 ...e.entity_view_display.node.job.default.yml |  42 +-
 ...re.entity_view_display.node.job.teaser.yml |  10 +-
 ...ntity_view_display.node.report.default.yml |  57 +-
 ...tity_view_display.node.report.headline.yml |  29 +-
 ...entity_view_display.node.report.teaser.yml |  33 +-
 ...entity_view_display.node.topic.default.yml |  42 +-
 ....entity_view_display.node.topic.teaser.yml |   4 +-
 ...ity_view_display.node.training.default.yml |  62 +-
 ...tity_view_display.node.training.teaser.yml |  22 +-
 ...display.taxonomy_term.disaster.default.yml |  24 +-
 ...ay.taxonomy_term.disaster_type.default.yml |  10 +-
 ...display.taxonomy_term.language.default.yml |  10 +-
 ...w_display.taxonomy_term.source.default.yml |  22 +-
 ...e.entity_view_mode.media.media_library.yml |   4 +-
 config/core.entity_view_mode.node.print.yml   |   4 +-
 config/core.extension.yml                     |   4 +-
 .../core.menu.static_menu_link_overrides.yml  |   2 +-
 ...guideline.field_guideline.field_images.yml |   4 +-
 ....guideline.field_guideline.field_links.yml |   2 +-
 ...eld.media.file_report.field_media_file.yml |   6 +-
 ...a.image_announcement.field_media_image.yml |   4 +-
 ...edia.image_blog_post.field_media_image.yml |   4 +-
 ...eld.media.image_book.field_media_image.yml |   4 +-
 ...d.media.image_report.field_media_image.yml |   4 +-
 ...ld.media.image_topic.field_media_image.yml |   4 +-
 ...eld.field.node.announcement.field_link.yml |   2 +-
 .../field.field.node.training.field_link.yml  |   2 +-
 ...ld.taxonomy_term.source.field_homepage.yml |   2 +-
 ..._term.source.field_job_import_feed_url.yml |   2 +-
 ...field.taxonomy_term.source.field_links.yml |   2 +-
 ....field.taxonomy_term.source.field_logo.yml |   4 +-
 config/field.settings.yml                     |   2 +-
 .../field.storage.guideline.field_images.yml  |   6 +-
 ...eld.storage.guideline.field_short_link.yml |   2 +-
 .../field.storage.guideline.field_title.yml   |   2 +-
 .../field.storage.media.field_copyright.yml   |   2 +-
 .../field.storage.media.field_description.yml |   2 +-
 .../field.storage.media.field_media_image.yml |   8 +-
 config/field.storage.node.field_author.yml    |   2 +-
 config/field.storage.node.field_city.yml      |   2 +-
 ...ield.storage.node.field_headline_title.yml |   2 +-
 config/field.storage.node.field_job_id.yml    |   2 +-
 .../field.storage.node.field_origin_notes.yml |   2 +-
 ...taxonomy_term.field_disaster_type_code.yml |   2 +-
 ...eld.storage.taxonomy_term.field_fts_id.yml |   2 +-
 ...ield.storage.taxonomy_term.field_glide.yml |   2 +-
 ...field.storage.taxonomy_term.field_iso3.yml |   2 +-
 ...rage.taxonomy_term.field_language_code.yml |   2 +-
 ...field.storage.taxonomy_term.field_logo.yml |   6 +-
 ...d.storage.taxonomy_term.field_longname.yml |   2 +-
 ....storage.taxonomy_term.field_shortname.yml |   2 +-
 ...orage.taxonomy_term.field_spanish_name.yml |   2 +-
 config/field_ui.settings.yml                  |   2 +-
 config/file.settings.yml                      |   4 +-
 config/filter.format.guideline.yml            |   9 -
 config/filter.format.html.yml                 |   2 +-
 config/filter.format.markdown.yml             |   2 +-
 config/filter.settings.yml                    |   4 +-
 config/google_tag.settings.yml                |  32 +-
 config/image.settings.yml                     |   4 +-
 ...geapi_optimize.pipeline.local_binaries.yml |  38 +-
 config/imageapi_optimize.settings.yml         |   2 +-
 config/language.mappings.yml                  |   4 +-
 config/language.negotiation.yml               |   4 +-
 config/language.types.yml                     |   4 +-
 config/locale.settings.yml                    |   4 +-
 config/mailsystem.settings.yml                |   4 +-
 config/maintenance200.settings.yml            |   4 +-
 config/media.settings.yml                     |   4 +-
 config/media_library.settings.yml             |   2 +-
 config/menu_ui.settings.yml                   |   2 +-
 config/mimemail.settings.yml                  |  12 +-
 config/node.settings.yml                      |   2 +-
 config/node.type.book.yml                     |   4 +-
 config/pathauto.pattern.blog_post.yml         |   6 +-
 config/pathauto.pattern.book_page.yml         |   6 +-
 config/pathauto.pattern.country.yml           |   6 +-
 config/pathauto.pattern.disaster.yml          |   6 +-
 config/pathauto.pattern.job.yml               |   6 +-
 config/pathauto.pattern.report.yml            |   6 +-
 config/pathauto.pattern.source.yml            |   6 +-
 config/pathauto.pattern.topic.yml             |   6 +-
 config/pathauto.pattern.training.yml          |   6 +-
 config/pathauto.settings.yml                  |   4 +-
 config/redirect.settings.yml                  |   4 +-
 config/reliefweb_api.settings.yml             |   4 +-
 config/reliefweb_revisions.settings.yml       |   2 +-
 config/social_auth.settings.yml               |   6 +-
 config/social_auth_hid.settings.yml           |   8 +-
 config/syslog.settings.yml                    |   4 +-
 ...stem.action.pathauto_update_alias_node.yml |   4 +-
 ...stem.action.pathauto_update_alias_user.yml |   4 +-
 .../system.action.redirect_delete_action.yml  |   4 +-
 config/system.advisories.yml                  |   2 +-
 config/system.authorize.yml                   |   3 -
 config/system.cron.yml                        |   4 +-
 config/system.date.yml                        |   8 +-
 config/system.diff.yml                        |   4 +-
 config/system.file.yml                        |   4 +-
 config/system.image.gd.yml                    |   2 +-
 config/system.image.yml                       |   2 +-
 config/system.logging.yml                     |   2 +-
 config/system.mail.yml                        |   4 +-
 config/system.maintenance.yml                 |   4 +-
 config/system.performance.yml                 |   4 +-
 config/system.rss.yml                         |   4 +-
 config/system.site.yml                        |   6 +-
 config/system.theme.global.yml                |   4 +-
 config/system.theme.yml                       |   4 +-
 config/taxonomy.settings.yml                  |   4 +-
 config/text.settings.yml                      |   2 +-
 config/theme_switcher.rule.content_type.yml   |   6 +-
 config/theme_switcher.rule.request_path.yml   |   2 +-
 config/theme_switcher.rule.vocabulary.yml     |   6 +-
 config/update.settings.yml                    |   4 +-
 config/user.flood.yml                         |   4 +-
 config/user.mail.yml                          |  24 +-
 config/user.role.anonymous.yml                |   5 +-
 config/user.role.authenticated.yml            |  20 +-
 config/user.role.editor.yml                   |  48 +-
 .../user.role.external_disaster_manager.yml   |   8 +-
 config/user.role.job_importer.yml             |   8 +-
 config/user.role.user_manager.yml             |   4 +-
 config/user.role.webmaster.yml                |  27 +-
 config/user.settings.yml                      |   6 +-
 config/views.settings.yml                     |   6 +-
 config/views.view.archive.yml                 | 129 ++--
 config/views.view.content.yml                 | 384 +++++-----
 config/views.view.content_recent.yml          | 195 ++---
 config/views.view.files.yml                   | 500 ++++++-------
 config/views.view.frontpage.yml               | 302 ++++----
 config/views.view.glossary.yml                | 306 ++++----
 config/views.view.media.yml                   | 403 +++++-----
 config/views.view.media_library.yml           | 707 +++++++++---------
 config/views.view.moderated_content.yml       | 350 ++++-----
 config/views.view.redirect.yml                | 342 ++++-----
 config/views.view.taxonomy_term.yml           | 136 ++--
 config/views.view.user_admin_people.yml       | 425 +++++------
 config/views.view.who_s_new.yml               | 161 ++--
 config/views.view.who_s_online.yml            | 199 ++---
 config/workflows.workflow.announcement.yml    |   8 +-
 config/workflows.workflow.blog_post.yml       |   4 +-
 config/workflows.workflow.book.yml            |   4 +-
 config/workflows.workflow.country.yml         |  10 +-
 config/workflows.workflow.disaster.yml        |  30 +-
 config/workflows.workflow.job.yml             |  18 +-
 config/workflows.workflow.report.yml          |  24 +-
 config/workflows.workflow.source.yml          |  22 +-
 config/workflows.workflow.topic.yml           |   4 +-
 config/workflows.workflow.training.yml        |  18 +-
 config_dev/dblog.settings.yml                 |   2 +-
 config_dev/devel.settings.yml                 |   4 +-
 config_dev/devel.toolbar.settings.yml         |   4 +-
 config_dev/stage_file_proxy.settings.yml      |   4 +-
 config_dev/views.view.watchdog.yml            | 347 ++++-----
 240 files changed, 3536 insertions(+), 3408 deletions(-)
 delete mode 100644 config/system.authorize.yml

diff --git a/config/block.block.breadcrumbs.yml b/config/block.block.breadcrumbs.yml
index 992c7f1ac..4c57f4917 100644
--- a/config/block.block.breadcrumbs.yml
+++ b/config/block.block.breadcrumbs.yml
@@ -15,6 +15,6 @@ plugin: system_breadcrumb_block
 settings:
   id: system_breadcrumb_block
   label: Breadcrumbs
-  provider: system
   label_display: '0'
+  provider: system
 visibility: {  }
diff --git a/config/block.block.common_design_admin.yml b/config/block.block.common_design_admin.yml
index 75e35d396..39793eacb 100644
--- a/config/block.block.common_design_admin.yml
+++ b/config/block.block.common_design_admin.yml
@@ -19,8 +19,8 @@ plugin: 'system_menu_block:admin'
 settings:
   id: 'system_menu_block:admin'
   label: Administration
-  provider: system
   label_display: visible
+  provider: system
   level: 1
   depth: 0
   expand_all_items: false
diff --git a/config/block.block.common_design_branding.yml b/config/block.block.common_design_branding.yml
index 1df73e2ec..bc11e4d01 100644
--- a/config/block.block.common_design_branding.yml
+++ b/config/block.block.common_design_branding.yml
@@ -17,8 +17,8 @@ plugin: system_branding_block
 settings:
   id: system_branding_block
   label: 'Site branding'
-  provider: system
   label_display: '0'
+  provider: system
   use_site_logo: true
   use_site_name: true
   use_site_slogan: true
diff --git a/config/block.block.common_design_local_actions.yml b/config/block.block.common_design_local_actions.yml
index 6cf0e7a20..cc4244750 100644
--- a/config/block.block.common_design_local_actions.yml
+++ b/config/block.block.common_design_local_actions.yml
@@ -15,6 +15,6 @@ plugin: local_actions_block
 settings:
   id: local_actions_block
   label: 'Primary admin actions'
-  provider: core
   label_display: '0'
+  provider: core
 visibility: {  }
diff --git a/config/block.block.common_design_local_tasks.yml b/config/block.block.common_design_local_tasks.yml
index 2332da53a..8d92efc83 100644
--- a/config/block.block.common_design_local_tasks.yml
+++ b/config/block.block.common_design_local_tasks.yml
@@ -15,8 +15,8 @@ plugin: local_tasks_block
 settings:
   id: local_tasks_block
   label: Tabs
-  provider: core
   label_display: '0'
+  provider: core
   primary: true
   secondary: true
 visibility: {  }
diff --git a/config/block.block.common_design_messages.yml b/config/block.block.common_design_messages.yml
index ed6516149..f2eb8f6bf 100644
--- a/config/block.block.common_design_messages.yml
+++ b/config/block.block.common_design_messages.yml
@@ -17,6 +17,6 @@ plugin: system_messages_block
 settings:
   id: system_messages_block
   label: 'Status messages'
-  provider: system
   label_display: '0'
+  provider: system
 visibility: {  }
diff --git a/config/block.block.common_design_page_title.yml b/config/block.block.common_design_page_title.yml
index f391498b1..04cf53602 100644
--- a/config/block.block.common_design_page_title.yml
+++ b/config/block.block.common_design_page_title.yml
@@ -15,6 +15,6 @@ plugin: page_title_block
 settings:
   id: page_title_block
   label: 'Page title'
-  provider: core
   label_display: '0'
+  provider: core
 visibility: {  }
diff --git a/config/block.block.common_design_subtheme_branding.yml b/config/block.block.common_design_subtheme_branding.yml
index dc3b3c25a..9647da1ea 100644
--- a/config/block.block.common_design_subtheme_branding.yml
+++ b/config/block.block.common_design_subtheme_branding.yml
@@ -17,8 +17,8 @@ plugin: system_branding_block
 settings:
   id: system_branding_block
   label: 'Site branding'
-  provider: system
   label_display: '0'
+  provider: system
   use_site_logo: true
   use_site_name: true
   use_site_slogan: true
diff --git a/config/block.block.common_design_subtheme_local_actions.yml b/config/block.block.common_design_subtheme_local_actions.yml
index db0bfb041..3976c4962 100644
--- a/config/block.block.common_design_subtheme_local_actions.yml
+++ b/config/block.block.common_design_subtheme_local_actions.yml
@@ -15,6 +15,6 @@ plugin: local_actions_block
 settings:
   id: local_actions_block
   label: 'Primary admin actions'
-  provider: core
   label_display: '0'
+  provider: core
 visibility: {  }
diff --git a/config/block.block.common_design_subtheme_local_tasks.yml b/config/block.block.common_design_subtheme_local_tasks.yml
index 91437eaf5..312880ff9 100644
--- a/config/block.block.common_design_subtheme_local_tasks.yml
+++ b/config/block.block.common_design_subtheme_local_tasks.yml
@@ -15,8 +15,8 @@ plugin: local_tasks_block
 settings:
   id: local_tasks_block
   label: Tabs
-  provider: core
   label_display: '0'
+  provider: core
   primary: true
   secondary: true
 visibility: {  }
diff --git a/config/block.block.common_design_subtheme_messages.yml b/config/block.block.common_design_subtheme_messages.yml
index 63aaa6300..4c5940212 100644
--- a/config/block.block.common_design_subtheme_messages.yml
+++ b/config/block.block.common_design_subtheme_messages.yml
@@ -17,6 +17,6 @@ plugin: system_messages_block
 settings:
   id: system_messages_block
   label: 'Status messages'
-  provider: system
   label_display: '0'
+  provider: system
 visibility: {  }
diff --git a/config/block.block.common_design_subtheme_page_title.yml b/config/block.block.common_design_subtheme_page_title.yml
index 13160c9fc..ff262d6ff 100644
--- a/config/block.block.common_design_subtheme_page_title.yml
+++ b/config/block.block.common_design_subtheme_page_title.yml
@@ -15,6 +15,6 @@ plugin: page_title_block
 settings:
   id: page_title_block
   label: 'Page title'
-  provider: core
   label_display: '0'
+  provider: core
 visibility: {  }
diff --git a/config/block.block.common_design_tools.yml b/config/block.block.common_design_tools.yml
index b45146e97..bd909029e 100644
--- a/config/block.block.common_design_tools.yml
+++ b/config/block.block.common_design_tools.yml
@@ -19,8 +19,8 @@ plugin: 'system_menu_block:tools'
 settings:
   id: 'system_menu_block:tools'
   label: Tools
-  provider: system
   label_display: visible
+  provider: system
   level: 1
   depth: 0
   expand_all_items: false
diff --git a/config/block.block.footer.yml b/config/block.block.footer.yml
index 8d51b3737..1cfb9091b 100644
--- a/config/block.block.footer.yml
+++ b/config/block.block.footer.yml
@@ -17,8 +17,8 @@ plugin: 'system_menu_block:footer'
 settings:
   id: 'system_menu_block:footer'
   label: Footer
-  provider: system
   label_display: '0'
+  provider: system
   level: 1
   depth: 0
   expand_all_items: false
diff --git a/config/block.block.help.yml b/config/block.block.help.yml
index bcb7f0d38..259e65dce 100644
--- a/config/block.block.help.yml
+++ b/config/block.block.help.yml
@@ -17,8 +17,8 @@ plugin: 'system_menu_block:help'
 settings:
   id: 'system_menu_block:help'
   label: Help
-  provider: system
   label_display: '0'
+  provider: system
   level: 1
   depth: 0
   expand_all_items: false
diff --git a/config/block.block.languageswitcher.yml b/config/block.block.languageswitcher.yml
index 507e7079b..9bbd10abf 100644
--- a/config/block.block.languageswitcher.yml
+++ b/config/block.block.languageswitcher.yml
@@ -15,6 +15,6 @@ plugin: 'language_block:language_interface'
 settings:
   id: 'language_block:language_interface'
   label: 'Language switcher'
-  provider: language
   label_display: '0'
+  provider: language
 visibility: {  }
diff --git a/config/block.block.mainnavigation.yml b/config/block.block.mainnavigation.yml
index ba8e98bda..2c23b1cc2 100644
--- a/config/block.block.mainnavigation.yml
+++ b/config/block.block.mainnavigation.yml
@@ -17,8 +17,8 @@ plugin: 'system_menu_block:main'
 settings:
   id: 'system_menu_block:main'
   label: 'Main navigation'
-  provider: system
   label_display: '0'
+  provider: system
   level: 1
   depth: 0
   expand_all_items: false
diff --git a/config/block.block.seven_admin.yml b/config/block.block.seven_admin.yml
index 9a93bf521..7c75e3450 100644
--- a/config/block.block.seven_admin.yml
+++ b/config/block.block.seven_admin.yml
@@ -19,8 +19,8 @@ plugin: 'system_menu_block:admin'
 settings:
   id: 'system_menu_block:admin'
   label: Administration
-  provider: system
   label_display: visible
+  provider: system
   level: 1
   depth: 0
   expand_all_items: false
diff --git a/config/block.block.seven_branding.yml b/config/block.block.seven_branding.yml
index b877425ab..77de050b6 100644
--- a/config/block.block.seven_branding.yml
+++ b/config/block.block.seven_branding.yml
@@ -17,8 +17,8 @@ plugin: system_branding_block
 settings:
   id: system_branding_block
   label: 'Site branding'
-  provider: system
   label_display: '0'
+  provider: system
   use_site_logo: true
   use_site_name: true
   use_site_slogan: true
diff --git a/config/block.block.seven_local_actions.yml b/config/block.block.seven_local_actions.yml
index 4cc491675..8684e23a6 100644
--- a/config/block.block.seven_local_actions.yml
+++ b/config/block.block.seven_local_actions.yml
@@ -15,6 +15,6 @@ plugin: local_actions_block
 settings:
   id: local_actions_block
   label: 'Primary admin actions'
-  provider: core
   label_display: '0'
+  provider: core
 visibility: {  }
diff --git a/config/block.block.seven_local_tasks.yml b/config/block.block.seven_local_tasks.yml
index d8f72def9..0cb1cab4d 100644
--- a/config/block.block.seven_local_tasks.yml
+++ b/config/block.block.seven_local_tasks.yml
@@ -15,8 +15,8 @@ plugin: local_tasks_block
 settings:
   id: local_tasks_block
   label: Tabs
-  provider: core
   label_display: '0'
+  provider: core
   primary: true
   secondary: true
 visibility: {  }
diff --git a/config/block.block.seven_messages.yml b/config/block.block.seven_messages.yml
index b69e72d47..363be7938 100644
--- a/config/block.block.seven_messages.yml
+++ b/config/block.block.seven_messages.yml
@@ -17,6 +17,6 @@ plugin: system_messages_block
 settings:
   id: system_messages_block
   label: 'Status messages'
-  provider: system
   label_display: '0'
+  provider: system
 visibility: {  }
diff --git a/config/block.block.seven_page_title.yml b/config/block.block.seven_page_title.yml
index 4e49f145b..0b3c96f93 100644
--- a/config/block.block.seven_page_title.yml
+++ b/config/block.block.seven_page_title.yml
@@ -15,6 +15,6 @@ plugin: page_title_block
 settings:
   id: page_title_block
   label: 'Page title'
-  provider: core
   label_display: '0'
+  provider: core
 visibility: {  }
diff --git a/config/block.block.seven_tools.yml b/config/block.block.seven_tools.yml
index 17d737b30..3869eba29 100644
--- a/config/block.block.seven_tools.yml
+++ b/config/block.block.seven_tools.yml
@@ -19,8 +19,8 @@ plugin: 'system_menu_block:tools'
 settings:
   id: 'system_menu_block:tools'
   label: Tools
-  provider: system
   label_display: visible
+  provider: system
   level: 1
   depth: 0
   expand_all_items: false
diff --git a/config/block.block.stark_admin.yml b/config/block.block.stark_admin.yml
index f4c541fec..97fc284a1 100644
--- a/config/block.block.stark_admin.yml
+++ b/config/block.block.stark_admin.yml
@@ -19,8 +19,8 @@ plugin: 'system_menu_block:admin'
 settings:
   id: 'system_menu_block:admin'
   label: Administration
-  provider: system
   label_display: visible
+  provider: system
   level: 1
   depth: 0
   expand_all_items: false
diff --git a/config/block.block.stark_branding.yml b/config/block.block.stark_branding.yml
index 76e089796..9b6ece04b 100644
--- a/config/block.block.stark_branding.yml
+++ b/config/block.block.stark_branding.yml
@@ -17,8 +17,8 @@ plugin: system_branding_block
 settings:
   id: system_branding_block
   label: 'Site branding'
-  provider: system
   label_display: '0'
+  provider: system
   use_site_logo: true
   use_site_name: true
   use_site_slogan: true
diff --git a/config/block.block.stark_local_actions.yml b/config/block.block.stark_local_actions.yml
index 6fb4a62b9..d2c2011a7 100644
--- a/config/block.block.stark_local_actions.yml
+++ b/config/block.block.stark_local_actions.yml
@@ -15,6 +15,6 @@ plugin: local_actions_block
 settings:
   id: local_actions_block
   label: 'Primary admin actions'
-  provider: core
   label_display: '0'
+  provider: core
 visibility: {  }
diff --git a/config/block.block.stark_local_tasks.yml b/config/block.block.stark_local_tasks.yml
index 6630667f6..d13575892 100644
--- a/config/block.block.stark_local_tasks.yml
+++ b/config/block.block.stark_local_tasks.yml
@@ -15,8 +15,8 @@ plugin: local_tasks_block
 settings:
   id: local_tasks_block
   label: Tabs
-  provider: core
   label_display: '0'
+  provider: core
   primary: true
   secondary: true
 visibility: {  }
diff --git a/config/block.block.stark_messages.yml b/config/block.block.stark_messages.yml
index 0c651e5be..816e359c5 100644
--- a/config/block.block.stark_messages.yml
+++ b/config/block.block.stark_messages.yml
@@ -17,6 +17,6 @@ plugin: system_messages_block
 settings:
   id: system_messages_block
   label: 'Status messages'
-  provider: system
   label_display: '0'
+  provider: system
 visibility: {  }
diff --git a/config/block.block.stark_page_title.yml b/config/block.block.stark_page_title.yml
index 58f16edf3..fb032c799 100644
--- a/config/block.block.stark_page_title.yml
+++ b/config/block.block.stark_page_title.yml
@@ -15,6 +15,6 @@ plugin: page_title_block
 settings:
   id: page_title_block
   label: 'Page title'
-  provider: core
   label_display: '0'
+  provider: core
 visibility: {  }
diff --git a/config/block.block.stark_tools.yml b/config/block.block.stark_tools.yml
index 05b565dd6..353174987 100644
--- a/config/block.block.stark_tools.yml
+++ b/config/block.block.stark_tools.yml
@@ -19,8 +19,8 @@ plugin: 'system_menu_block:tools'
 settings:
   id: 'system_menu_block:tools'
   label: Tools
-  provider: system
   label_display: visible
+  provider: system
   level: 1
   depth: 0
   expand_all_items: false
diff --git a/config/block.block.useraccountmenu.yml b/config/block.block.useraccountmenu.yml
index e3fefc0dc..fd8df23bf 100644
--- a/config/block.block.useraccountmenu.yml
+++ b/config/block.block.useraccountmenu.yml
@@ -17,8 +17,8 @@ plugin: 'system_menu_block:account'
 settings:
   id: 'system_menu_block:account'
   label: 'User account menu'
-  provider: system
   label_display: '0'
+  provider: system
   level: 1
   depth: 0
   expand_all_items: false
diff --git a/config/book.settings.yml b/config/book.settings.yml
index cf6121660..a476f5f5b 100644
--- a/config/book.settings.yml
+++ b/config/book.settings.yml
@@ -1,8 +1,8 @@
+_core:
+  default_config_hash: i-_2TVi6FUEAqBgNRJkt6aaYmiw1k_LTrXzJS6wlZ4U
 allowed_types:
   - book
 block:
   navigation:
     mode: 'all pages'
 child_type: book
-_core:
-  default_config_hash: i-_2TVi6FUEAqBgNRJkt6aaYmiw1k_LTrXzJS6wlZ4U
diff --git a/config/contact.settings.yml b/config/contact.settings.yml
index a2903f519..1c949a66a 100644
--- a/config/contact.settings.yml
+++ b/config/contact.settings.yml
@@ -1,7 +1,7 @@
+_core:
+  default_config_hash: U69DBeuvXuNVOC15rVNaBjDPK2fWFbo9v4takdYSSO8
 default_form: feedback
 flood:
   limit: 5
   interval: 3600
 user_default_enabled: true
-_core:
-  default_config_hash: U69DBeuvXuNVOC15rVNaBjDPK2fWFbo9v4takdYSSO8
diff --git a/config/core.entity_form_display.contact_message.personal.default.yml b/config/core.entity_form_display.contact_message.personal.default.yml
index 61437c914..87a111006 100644
--- a/config/core.entity_form_display.contact_message.personal.default.yml
+++ b/config/core.entity_form_display.contact_message.personal.default.yml
@@ -11,18 +11,18 @@ bundle: personal
 mode: default
 content:
   field_sender:
+    type: options_select
     weight: 0
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: options_select
-    region: content
   message:
     type: string_textarea
     weight: 2
+    region: content
     settings:
       rows: 12
       placeholder: ''
-    region: content
     third_party_settings: {  }
   subject:
     type: string_textfield
diff --git a/config/core.entity_form_display.guideline.field_guideline.default.yml b/config/core.entity_form_display.guideline.field_guideline.default.yml
index 7d0f4be8a..4eeb256d3 100644
--- a/config/core.entity_form_display.guideline.field_guideline.default.yml
+++ b/config/core.entity_form_display.guideline.field_guideline.default.yml
@@ -22,15 +22,17 @@ bundle: field_guideline
 mode: default
 content:
   field_description:
+    type: text_textarea
     weight: 4
+    region: content
     settings:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
-    type: text_textarea
-    region: content
   field_field:
+    type: guideline_field_target_widget
     weight: 1
+    region: content
     settings:
       enabled_entities:
         - node.announcement
@@ -42,40 +44,38 @@ content:
         - taxonomy_term.disaster
         - taxonomy_term.disaster_type
     third_party_settings: {  }
-    type: guideline_field_target_widget
-    region: content
   field_images:
+    type: image_image
     weight: 5
+    region: content
     settings:
       progress_indicator: throbber
       preview_image_style: thumbnail
     third_party_settings: {  }
-    type: image_image
-    region: content
   field_links:
+    type: link_default
     weight: 6
+    region: content
     settings:
       placeholder_url: ''
       placeholder_title: ''
     third_party_settings: {  }
-    type: link_default
-    region: content
   field_short_link:
+    type: string_textfield
     weight: 3
+    region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
-    region: content
   field_title:
+    type: string_textfield
     weight: 2
+    region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
-    region: content
   langcode:
     type: language_select
     weight: 7
@@ -94,11 +94,11 @@ content:
   user_id:
     type: entity_reference_autocomplete
     weight: 8
+    region: content
     settings:
       match_operator: CONTAINS
+      match_limit: 10
       size: 60
       placeholder: ''
-      match_limit: 10
-    region: content
     third_party_settings: {  }
 hidden: {  }
diff --git a/config/core.entity_form_display.guideline.guideline_list.default.yml b/config/core.entity_form_display.guideline.guideline_list.default.yml
index fcb56b4e3..75273c515 100644
--- a/config/core.entity_form_display.guideline.guideline_list.default.yml
+++ b/config/core.entity_form_display.guideline.guideline_list.default.yml
@@ -14,21 +14,21 @@ bundle: guideline_list
 mode: default
 content:
   field_description:
+    type: text_textarea
     weight: 27
+    region: content
     settings:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
-    type: text_textarea
-    region: content
   field_title:
+    type: string_textfield
     weight: 26
+    region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
-    region: content
   langcode:
     type: language_select
     weight: 2
@@ -47,11 +47,11 @@ content:
   user_id:
     type: entity_reference_autocomplete
     weight: 5
+    region: content
     settings:
       match_operator: CONTAINS
+      match_limit: 10
       size: 60
       placeholder: ''
-      match_limit: 10
-    region: content
     third_party_settings: {  }
 hidden: {  }
diff --git a/config/core.entity_form_display.media.file_report.default.yml b/config/core.entity_form_display.media.file_report.default.yml
index af76717dd..3916ecef7 100644
--- a/config/core.entity_form_display.media.file_report.default.yml
+++ b/config/core.entity_form_display.media.file_report.default.yml
@@ -15,26 +15,26 @@ bundle: file_report
 mode: default
 content:
   field_description:
+    type: string_textfield
     weight: 2
+    region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
-    region: content
   field_language:
+    type: options_select
     weight: 3
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: options_select
-    region: content
   field_media_file:
+    type: file_generic
     weight: 1
+    region: content
     settings:
       progress_indicator: throbber
     third_party_settings: {  }
-    type: file_generic
-    region: content
   name:
     type: string_textfield
     weight: 0
@@ -45,10 +45,10 @@ content:
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    settings:
-      display_label: true
     weight: 4
     region: content
+    settings:
+      display_label: true
     third_party_settings: {  }
 hidden:
   created: true
diff --git a/config/core.entity_form_display.media.file_report.media_library.yml b/config/core.entity_form_display.media.file_report.media_library.yml
index b685e424c..e33b877c3 100644
--- a/config/core.entity_form_display.media.file_report.media_library.yml
+++ b/config/core.entity_form_display.media.file_report.media_library.yml
@@ -15,12 +15,12 @@ mode: media_library
 content:
   name:
     type: string_textfield
+    weight: 0
+    region: content
     settings:
       size: 60
       placeholder: ''
-    weight: 0
     third_party_settings: {  }
-    region: content
 hidden:
   created: true
   field_description: true
diff --git a/config/core.entity_form_display.media.image_announcement.default.yml b/config/core.entity_form_display.media.image_announcement.default.yml
index 172d0a3f2..ab6a17e70 100644
--- a/config/core.entity_form_display.media.image_announcement.default.yml
+++ b/config/core.entity_form_display.media.image_announcement.default.yml
@@ -14,13 +14,13 @@ bundle: image_announcement
 mode: default
 content:
   field_media_image:
+    type: image_image
     weight: 1
+    region: content
     settings:
       progress_indicator: throbber
       preview_image_style: thumbnail
     third_party_settings: {  }
-    type: image_image
-    region: content
   name:
     type: string_textfield
     weight: 0
@@ -31,10 +31,10 @@ content:
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    settings:
-      display_label: true
     weight: 2
     region: content
+    settings:
+      display_label: true
     third_party_settings: {  }
 hidden:
   created: true
diff --git a/config/core.entity_form_display.media.image_announcement.media_library.yml b/config/core.entity_form_display.media.image_announcement.media_library.yml
index b3ec85644..27c55afa8 100644
--- a/config/core.entity_form_display.media.image_announcement.media_library.yml
+++ b/config/core.entity_form_display.media.image_announcement.media_library.yml
@@ -15,21 +15,21 @@ bundle: image_announcement
 mode: media_library
 content:
   field_media_image:
+    type: image_image
     weight: 5
+    region: content
     settings:
       progress_indicator: throbber
       preview_image_style: thumbnail
     third_party_settings: {  }
-    type: image_image
-    region: content
   name:
     type: string_textfield
+    weight: 0
+    region: content
     settings:
       size: 60
       placeholder: ''
-    weight: 0
     third_party_settings: {  }
-    region: content
 hidden:
   created: true
   langcode: true
diff --git a/config/core.entity_form_display.media.image_blog_post.default.yml b/config/core.entity_form_display.media.image_blog_post.default.yml
index 77df378dd..85efccfb8 100644
--- a/config/core.entity_form_display.media.image_blog_post.default.yml
+++ b/config/core.entity_form_display.media.image_blog_post.default.yml
@@ -16,29 +16,29 @@ bundle: image_blog_post
 mode: default
 content:
   field_copyright:
+    type: string_textfield
     weight: 2
+    region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
-    region: content
   field_description:
+    type: string_textfield
     weight: 3
+    region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
-    region: content
   field_media_image:
+    type: image_image
     weight: 1
+    region: content
     settings:
       progress_indicator: throbber
       preview_image_style: thumbnail
     third_party_settings: {  }
-    type: image_image
-    region: content
   name:
     type: string_textfield
     weight: 0
diff --git a/config/core.entity_form_display.media.image_blog_post.media_library.yml b/config/core.entity_form_display.media.image_blog_post.media_library.yml
index bcaf6b9d2..4106e4dd8 100644
--- a/config/core.entity_form_display.media.image_blog_post.media_library.yml
+++ b/config/core.entity_form_display.media.image_blog_post.media_library.yml
@@ -33,21 +33,21 @@ content:
       placeholder: ''
     third_party_settings: {  }
   field_media_image:
+    type: image_image
     weight: 1
+    region: content
     settings:
       progress_indicator: throbber
       preview_image_style: thumbnail
     third_party_settings: {  }
-    type: image_image
-    region: content
   name:
     type: string_textfield
+    weight: 0
+    region: content
     settings:
       size: 60
       placeholder: ''
-    weight: 0
     third_party_settings: {  }
-    region: content
 hidden:
   created: true
   langcode: true
diff --git a/config/core.entity_form_display.media.image_book.default.yml b/config/core.entity_form_display.media.image_book.default.yml
index c36939d4a..256e41ac3 100644
--- a/config/core.entity_form_display.media.image_book.default.yml
+++ b/config/core.entity_form_display.media.image_book.default.yml
@@ -16,29 +16,29 @@ bundle: image_book
 mode: default
 content:
   field_copyright:
+    type: string_textfield
     weight: 2
+    region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
-    region: content
   field_description:
+    type: string_textfield
     weight: 3
+    region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
-    region: content
   field_media_image:
+    type: image_image
     weight: 1
+    region: content
     settings:
       progress_indicator: throbber
       preview_image_style: thumbnail
     third_party_settings: {  }
-    type: image_image
-    region: content
   name:
     type: string_textfield
     weight: 0
diff --git a/config/core.entity_form_display.media.image_book.media_library.yml b/config/core.entity_form_display.media.image_book.media_library.yml
index ad049b30f..9145e72e8 100644
--- a/config/core.entity_form_display.media.image_book.media_library.yml
+++ b/config/core.entity_form_display.media.image_book.media_library.yml
@@ -33,21 +33,21 @@ content:
       placeholder: ''
     third_party_settings: {  }
   field_media_image:
+    type: image_image
     weight: 1
+    region: content
     settings:
       progress_indicator: throbber
       preview_image_style: thumbnail
     third_party_settings: {  }
-    type: image_image
-    region: content
   name:
     type: string_textfield
+    weight: 0
+    region: content
     settings:
       size: 60
       placeholder: ''
-    weight: 0
     third_party_settings: {  }
-    region: content
 hidden:
   created: true
   langcode: true
diff --git a/config/core.entity_form_display.media.image_report.default.yml b/config/core.entity_form_display.media.image_report.default.yml
index f4df9fd13..574cd1374 100644
--- a/config/core.entity_form_display.media.image_report.default.yml
+++ b/config/core.entity_form_display.media.image_report.default.yml
@@ -16,29 +16,29 @@ bundle: image_report
 mode: default
 content:
   field_copyright:
+    type: string_textfield
     weight: 2
+    region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
-    region: content
   field_description:
+    type: string_textfield
     weight: 3
+    region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
-    region: content
   field_media_image:
+    type: image_image
     weight: 1
+    region: content
     settings:
       progress_indicator: throbber
       preview_image_style: thumbnail
     third_party_settings: {  }
-    type: image_image
-    region: content
   name:
     type: string_textfield
     weight: 0
diff --git a/config/core.entity_form_display.media.image_report.media_library.yml b/config/core.entity_form_display.media.image_report.media_library.yml
index 9b252d818..c98cd9fcd 100644
--- a/config/core.entity_form_display.media.image_report.media_library.yml
+++ b/config/core.entity_form_display.media.image_report.media_library.yml
@@ -33,21 +33,21 @@ content:
       placeholder: ''
     third_party_settings: {  }
   field_media_image:
+    type: image_image
     weight: 1
+    region: content
     settings:
       progress_indicator: throbber
       preview_image_style: thumbnail
     third_party_settings: {  }
-    type: image_image
-    region: content
   name:
     type: string_textfield
+    weight: 0
+    region: content
     settings:
       size: 60
       placeholder: ''
-    weight: 0
     third_party_settings: {  }
-    region: content
 hidden:
   created: true
   langcode: true
diff --git a/config/core.entity_form_display.media.image_topic.default.yml b/config/core.entity_form_display.media.image_topic.default.yml
index 770976dd1..f42bacbd7 100644
--- a/config/core.entity_form_display.media.image_topic.default.yml
+++ b/config/core.entity_form_display.media.image_topic.default.yml
@@ -14,13 +14,13 @@ bundle: image_topic
 mode: default
 content:
   field_media_image:
+    type: image_image
     weight: 1
+    region: content
     settings:
-      preview_image_style: icon
       progress_indicator: throbber
+      preview_image_style: icon
     third_party_settings: {  }
-    type: image_image
-    region: content
   name:
     type: string_textfield
     weight: 0
diff --git a/config/core.entity_form_display.media.image_topic.media_library.yml b/config/core.entity_form_display.media.image_topic.media_library.yml
index 003325dcd..a380ee4f0 100644
--- a/config/core.entity_form_display.media.image_topic.media_library.yml
+++ b/config/core.entity_form_display.media.image_topic.media_library.yml
@@ -15,21 +15,21 @@ bundle: image_topic
 mode: media_library
 content:
   field_media_image:
+    type: image_image
     weight: 5
+    region: content
     settings:
-      preview_image_style: icon
       progress_indicator: throbber
+      preview_image_style: icon
     third_party_settings: {  }
-    type: image_image
-    region: content
   name:
     type: string_textfield
+    weight: 0
+    region: content
     settings:
       size: 60
       placeholder: ''
-    weight: 0
     third_party_settings: {  }
-    region: content
 hidden:
   created: true
   langcode: true
diff --git a/config/core.entity_form_display.node.announcement.default.yml b/config/core.entity_form_display.node.announcement.default.yml
index bf9964ca3..1ce131d86 100644
--- a/config/core.entity_form_display.node.announcement.default.yml
+++ b/config/core.entity_form_display.node.announcement.default.yml
@@ -17,36 +17,36 @@ bundle: announcement
 mode: default
 content:
   body:
+    type: text_textarea_with_summary
     weight: 3
+    region: content
     settings:
       rows: 9
       summary_rows: 3
       placeholder: ''
       show_summary: false
     third_party_settings: {  }
-    type: text_textarea_with_summary
-    region: content
   field_image:
+    type: media_library_widget
     weight: 2
+    region: content
     settings:
       media_types: {  }
     third_party_settings: {  }
-    type: media_library_widget
-    region: content
   field_link:
+    type: link_default
     weight: 1
+    region: content
     settings:
       placeholder_url: ''
       placeholder_title: ''
     third_party_settings: {  }
-    type: link_default
-    region: content
   status:
     type: boolean_checkbox
-    settings:
-      display_label: true
     weight: 4
     region: content
+    settings:
+      display_label: true
     third_party_settings: {  }
   title:
     type: string_textfield
diff --git a/config/core.entity_form_display.node.blog_post.default.yml b/config/core.entity_form_display.node.blog_post.default.yml
index c8dcf8bdb..f24e5992f 100644
--- a/config/core.entity_form_display.node.blog_post.default.yml
+++ b/config/core.entity_form_display.node.blog_post.default.yml
@@ -21,52 +21,52 @@ bundle: blog_post
 mode: default
 content:
   body:
+    type: text_textarea_with_summary
     weight: 4
+    region: content
     settings:
       rows: 9
       summary_rows: 3
       placeholder: ''
       show_summary: false
     third_party_settings: {  }
-    type: text_textarea_with_summary
-    region: content
   field_attached_images:
+    type: media_library_widget
     weight: 6
+    region: content
     settings:
       media_types: {  }
     third_party_settings: {  }
-    type: media_library_widget
-    region: content
   field_author:
+    type: string_textfield
     weight: 2
+    region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
-    region: content
   field_image:
+    type: media_library_widget
     weight: 5
+    region: content
     settings:
       media_types: {  }
     third_party_settings: {  }
-    type: media_library_widget
-    region: content
   field_tags:
+    type: entity_reference_autocomplete
     weight: 1
+    region: content
     settings:
       match_operator: CONTAINS
       match_limit: 10
       size: 60
       placeholder: ''
     third_party_settings: {  }
-    type: entity_reference_autocomplete
-    region: content
   moderation_state:
     type: moderation_state_default
     weight: 8
-    settings: {  }
     region: content
+    settings: {  }
     third_party_settings: {  }
   path:
     type: path
@@ -76,10 +76,10 @@ content:
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    settings:
-      display_label: true
     weight: 7
     region: content
+    settings:
+      display_label: true
     third_party_settings: {  }
   title:
     type: string_textfield
diff --git a/config/core.entity_form_display.node.book.default.yml b/config/core.entity_form_display.node.book.default.yml
index e35959b1e..d107a48a0 100644
--- a/config/core.entity_form_display.node.book.default.yml
+++ b/config/core.entity_form_display.node.book.default.yml
@@ -26,25 +26,25 @@ content:
     region: content
     settings:
       rows: 9
-      placeholder: ''
       summary_rows: 3
+      placeholder: ''
       show_summary: false
     third_party_settings:
       allowed_formats:
         hide_help: '1'
         hide_guidelines: '1'
   field_attached_images:
+    type: media_library_widget
     weight: 2
+    region: content
     settings:
       media_types: {  }
     third_party_settings: {  }
-    type: media_library_widget
-    region: content
   moderation_state:
     type: moderation_state_default
     weight: 3
-    settings: {  }
     region: content
+    settings: {  }
     third_party_settings: {  }
   path:
     type: path
@@ -54,10 +54,10 @@ content:
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    settings:
-      display_label: true
     weight: 4
     region: content
+    settings:
+      display_label: true
     third_party_settings: {  }
   title:
     type: string_textfield
diff --git a/config/core.entity_form_display.node.job.default.yml b/config/core.entity_form_display.node.job.default.yml
index 2868c4240..b31bb61fc 100644
--- a/config/core.entity_form_display.node.job.default.yml
+++ b/config/core.entity_form_display.node.job.default.yml
@@ -27,34 +27,36 @@ bundle: job
 mode: default
 content:
   body:
+    type: reliefweb_formatted_text
     weight: 9
+    region: content
     settings:
-      rows: '20'
-      placeholder: ''
       max_heading_level: 2
       strip_embedded_content: true
+      rows: '20'
+      placeholder: ''
     third_party_settings:
       allowed_formats:
         hide_help: '1'
         hide_guidelines: '1'
-    type: reliefweb_formatted_text
-    region: content
   field_career_categories:
+    type: options_buttons
     weight: 7
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: options_buttons
-    region: content
   field_city:
+    type: string_textfield
     weight: 3
+    region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
-    region: content
   field_country:
+    type: reliefweb_entity_reference_select
     weight: 2
+    region: content
     settings:
       sort: label
       extra_data:
@@ -87,41 +89,41 @@ content:
         'country:field_timezone': '0'
         'country:field_useful_links': '0'
     third_party_settings: {  }
-    type: reliefweb_entity_reference_select
-    region: content
   field_how_to_apply:
+    type: reliefweb_formatted_text
     weight: 10
+    region: content
     settings:
-      rows: '10'
-      placeholder: ''
       max_heading_level: 3
       strip_embedded_content: true
+      rows: '10'
+      placeholder: ''
     third_party_settings:
       allowed_formats:
         hide_help: '1'
         hide_guidelines: '1'
-    type: reliefweb_formatted_text
-    region: content
   field_job_closing_date:
+    type: reliefweb_datetime
     weight: 4
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: reliefweb_datetime
-    region: content
   field_job_experience:
+    type: options_buttons
     weight: 6
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: options_buttons
-    region: content
   field_job_type:
+    type: options_buttons
     weight: 5
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: options_buttons
-    region: content
   field_source:
+    type: reliefweb_source
     weight: 1
+    region: content
     settings:
       sort: label
       extra_data:
@@ -162,19 +164,17 @@ content:
         'source:field_spanish_name': 0
         'source:field_user_posting_rights': 0
     third_party_settings: {  }
-    type: reliefweb_source
-    region: content
   field_theme:
+    type: options_buttons
     weight: 8
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: options_buttons
-    region: content
   moderation_state:
     type: moderation_state_default
     weight: 12
-    settings: {  }
     region: content
+    settings: {  }
     third_party_settings: {  }
   path:
     type: path
@@ -184,10 +184,10 @@ content:
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    settings:
-      display_label: true
     weight: 11
     region: content
+    settings:
+      display_label: true
     third_party_settings: {  }
   title:
     type: string_textfield
diff --git a/config/core.entity_form_display.node.report.default.yml b/config/core.entity_form_display.node.report.default.yml
index 992d2504c..61fddf026 100644
--- a/config/core.entity_form_display.node.report.default.yml
+++ b/config/core.entity_form_display.node.report.default.yml
@@ -42,32 +42,34 @@ bundle: report
 mode: default
 content:
   body:
+    type: text_textarea_with_summary
     weight: 2
+    region: content
     settings:
       rows: 9
       summary_rows: 3
       placeholder: ''
       show_summary: false
     third_party_settings: {  }
-    type: text_textarea_with_summary
-    region: content
   field_bury:
+    type: boolean_checkbox
     weight: 22
+    region: content
     settings:
       display_label: true
     third_party_settings: {  }
-    type: boolean_checkbox
-    region: content
   field_content_format:
+    type: reliefweb_entity_reference_select
     weight: 15
+    region: content
     settings:
-      extra_data: {  }
       sort: label
+      extra_data: {  }
     third_party_settings: {  }
-    type: reliefweb_entity_reference_select
-    region: content
   field_country:
+    type: reliefweb_entity_reference_select
     weight: 11
+    region: content
     settings:
       sort: label
       extra_data:
@@ -100,10 +102,10 @@ content:
         'country:field_timezone': '0'
         'country:field_useful_links': '0'
     third_party_settings: {  }
-    type: reliefweb_entity_reference_select
-    region: content
   field_disaster:
+    type: reliefweb_disaster
     weight: 13
+    region: content
     settings:
       sort: id
       extra_data:
@@ -138,117 +140,117 @@ content:
         'disaster:field_timezone': 0
         'disaster:field_useful_links': 0
     third_party_settings: {  }
-    type: reliefweb_disaster
-    region: content
   field_disaster_type:
+    type: reliefweb_entity_reference_select
     weight: 14
+    region: content
     settings:
-      extra_data: {  }
       sort: label
+      extra_data: {  }
     third_party_settings: {  }
-    type: reliefweb_entity_reference_select
-    region: content
   field_embargo_date:
+    type: datetime_datelist
     weight: 6
+    region: content
     settings:
+      increment: 1
       date_order: YMD
       time_type: '24'
-      increment: 1
     third_party_settings: {  }
-    type: datetime_datelist
-    region: content
   field_feature:
+    type: options_buttons
     weight: 21
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: options_buttons
-    region: content
   field_file:
     type: media_library_widget
     weight: 3
+    region: content
     settings:
       media_types: {  }
     third_party_settings: {  }
-    region: content
   field_headline:
+    type: boolean_checkbox
     weight: 17
+    region: content
     settings:
       display_label: true
     third_party_settings: {  }
-    type: boolean_checkbox
-    region: content
   field_headline_image:
     type: media_library_widget
     weight: 19
+    region: content
     settings:
       media_types: {  }
     third_party_settings: {  }
-    region: content
   field_headline_summary:
+    type: string_textarea
     weight: 20
+    region: content
     settings:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
-    type: string_textarea
-    region: content
   field_headline_title:
+    type: string_textfield
     weight: 18
+    region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
-    region: content
   field_image:
+    type: media_library_widget
     weight: 4
+    region: content
     settings:
       media_types: {  }
     third_party_settings: {  }
-    type: media_library_widget
-    region: content
   field_language:
+    type: options_buttons
     weight: 0
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: options_buttons
-    region: content
   field_notify:
+    type: string_textarea
     weight: 23
+    region: content
     settings:
       rows: 3
       placeholder: ''
     third_party_settings: {  }
-    type: string_textarea
-    region: content
   field_ocha_product:
+    type: options_buttons
     weight: 8
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: options_buttons
-    region: content
   field_origin:
+    type: options_buttons
     weight: 9
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: options_buttons
-    region: content
   field_origin_notes:
+    type: string_textfield
     weight: 10
+    region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
-    region: content
   field_original_publication_date:
+    type: reliefweb_datetime
     weight: 5
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: reliefweb_datetime
-    region: content
   field_primary_country:
+    type: reliefweb_entity_reference_select
     weight: 12
+    region: content
     settings:
       sort: label
       extra_data:
@@ -281,10 +283,10 @@ content:
         'country:field_timezone': '0'
         'country:field_useful_links': '0'
     third_party_settings: {  }
-    type: reliefweb_entity_reference_select
-    region: content
   field_source:
+    type: reliefweb_source
     weight: 7
+    region: content
     settings:
       sort: label
       extra_data:
@@ -325,21 +327,19 @@ content:
         'source:field_spanish_name': 0
         'source:field_user_posting_rights': 0
     third_party_settings: {  }
-    type: reliefweb_source
-    region: content
   field_theme:
+    type: reliefweb_entity_reference_select
     weight: 16
+    region: content
     settings:
-      extra_data: {  }
       sort: label
+      extra_data: {  }
     third_party_settings: {  }
-    type: reliefweb_entity_reference_select
-    region: content
   moderation_state:
     type: moderation_state_default
     weight: 100
-    settings: {  }
     region: content
+    settings: {  }
     third_party_settings: {  }
   path:
     type: path
@@ -349,10 +349,10 @@ content:
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    settings:
-      display_label: true
     weight: 24
     region: content
+    settings:
+      display_label: true
     third_party_settings: {  }
   title:
     type: string_textfield
diff --git a/config/core.entity_form_display.node.topic.default.yml b/config/core.entity_form_display.node.topic.default.yml
index bd250661d..e40e697ed 100644
--- a/config/core.entity_form_display.node.topic.default.yml
+++ b/config/core.entity_form_display.node.topic.default.yml
@@ -29,53 +29,55 @@ bundle: topic
 mode: default
 content:
   body:
+    type: text_textarea_with_summary
     weight: 1
+    region: content
     settings:
       rows: 9
-      placeholder: ''
       summary_rows: 3
+      placeholder: ''
       show_summary: false
     third_party_settings:
       allowed_formats:
         hide_help: '1'
         hide_guidelines: '1'
-    type: text_textarea_with_summary
-    region: content
   field_bury:
+    type: boolean_checkbox
     weight: 11
+    region: content
     settings:
       display_label: true
     third_party_settings: {  }
-    type: boolean_checkbox
-    region: content
   field_disasters_search:
+    type: reliefweb_section_links
     weight: 9
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: reliefweb_section_links
-    region: content
   field_featured:
+    type: boolean_checkbox
     weight: 10
+    region: content
     settings:
       display_label: true
     third_party_settings: {  }
-    type: boolean_checkbox
-    region: content
   field_icon:
     type: media_library_widget
     weight: 2
+    region: content
     settings:
       media_types: {  }
     third_party_settings: {  }
-    region: content
   field_jobs_search:
+    type: reliefweb_section_links
     weight: 7
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: reliefweb_section_links
-    region: content
   field_overview:
+    type: text_textarea
     weight: 3
+    region: content
     settings:
       rows: 5
       placeholder: ''
@@ -83,16 +85,16 @@ content:
       allowed_formats:
         hide_help: '1'
         hide_guidelines: '1'
-    type: text_textarea
-    region: content
   field_reports_search:
+    type: reliefweb_section_links
     weight: 6
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: reliefweb_section_links
-    region: content
   field_resources:
+    type: text_textarea
     weight: 4
+    region: content
     settings:
       rows: 5
       placeholder: ''
@@ -100,25 +102,23 @@ content:
       allowed_formats:
         hide_help: '1'
         hide_guidelines: '1'
-    type: text_textarea
-    region: content
   field_sections:
+    type: reliefweb_section_links
     weight: 5
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: reliefweb_section_links
-    region: content
   field_training_search:
+    type: reliefweb_section_links
     weight: 8
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: reliefweb_section_links
-    region: content
   moderation_state:
     type: moderation_state_default
     weight: 13
-    settings: {  }
     region: content
+    settings: {  }
     third_party_settings: {  }
   path:
     type: path
@@ -128,10 +128,10 @@ content:
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    settings:
-      display_label: true
     weight: 12
     region: content
+    settings:
+      display_label: true
     third_party_settings: {  }
   title:
     type: string_textfield
diff --git a/config/core.entity_form_display.node.training.default.yml b/config/core.entity_form_display.node.training.default.yml
index b0467d19a..772f5a9e4 100644
--- a/config/core.entity_form_display.node.training.default.yml
+++ b/config/core.entity_form_display.node.training.default.yml
@@ -33,40 +33,42 @@ bundle: training
 mode: default
 content:
   body:
+    type: reliefweb_formatted_text
     weight: 15
+    region: content
     settings:
-      rows: '20'
-      placeholder: ''
       max_heading_level: 2
       strip_embedded_content: true
+      rows: '20'
+      placeholder: ''
     third_party_settings:
       allowed_formats:
         hide_help: '1'
         hide_guidelines: '1'
-    type: reliefweb_formatted_text
-    region: content
   field_career_categories:
+    type: options_buttons
     weight: 11
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: options_buttons
-    region: content
   field_city:
+    type: string_textfield
     weight: 3
+    region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
-    region: content
   field_cost:
+    type: options_buttons
     weight: 7
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: options_buttons
-    region: content
   field_country:
+    type: reliefweb_entity_reference_select
     weight: 2
+    region: content
     settings:
       sort: label
       extra_data:
@@ -99,51 +101,51 @@ content:
         'country:field_timezone': '0'
         'country:field_useful_links': '0'
     third_party_settings: {  }
-    type: reliefweb_entity_reference_select
-    region: content
   field_fee_information:
+    type: string_textarea
     weight: 8
+    region: content
     settings:
       rows: 3
       placeholder: ''
     third_party_settings: {  }
-    type: string_textarea
-    region: content
   field_how_to_register:
+    type: reliefweb_formatted_text
     weight: 16
+    region: content
     settings:
-      rows: '10'
-      placeholder: ''
       max_heading_level: 3
       strip_embedded_content: true
+      rows: '10'
+      placeholder: ''
     third_party_settings:
       allowed_formats:
         hide_help: '1'
         hide_guidelines: '1'
-    type: reliefweb_formatted_text
-    region: content
   field_language:
+    type: options_buttons
     weight: 13
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: options_buttons
-    region: content
   field_link:
+    type: link_default
     weight: 6
+    region: content
     settings:
       placeholder_url: ''
       placeholder_title: ''
     third_party_settings: {  }
-    type: link_default
-    region: content
   field_registration_deadline:
+    type: reliefweb_datetime
     weight: 5
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: reliefweb_datetime
-    region: content
   field_source:
+    type: reliefweb_source
     weight: 0
+    region: content
     settings:
       sort: label
       extra_data:
@@ -184,43 +186,41 @@ content:
         'source:field_spanish_name': 0
         'source:field_user_posting_rights': 0
     third_party_settings: {  }
-    type: reliefweb_source
-    region: content
   field_theme:
+    type: options_buttons
     weight: 12
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: options_buttons
-    region: content
   field_training_date:
+    type: reliefweb_daterange
     weight: 4
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: reliefweb_daterange
-    region: content
   field_training_format:
+    type: options_buttons
     weight: 1
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: options_buttons
-    region: content
   field_training_language:
+    type: options_buttons
     weight: 10
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: options_buttons
-    region: content
   field_training_type:
+    type: options_buttons
     weight: 9
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: options_buttons
-    region: content
   moderation_state:
     type: moderation_state_default
     weight: 18
-    settings: {  }
     region: content
+    settings: {  }
     third_party_settings: {  }
   path:
     type: path
@@ -230,10 +230,10 @@ content:
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    settings:
-      display_label: true
     weight: 17
     region: content
+    settings:
+      display_label: true
     third_party_settings: {  }
   title:
     type: string_textfield
diff --git a/config/core.entity_form_display.taxonomy_term.country.default.yml b/config/core.entity_form_display.taxonomy_term.country.default.yml
index 08e799175..12004b0f6 100644
--- a/config/core.entity_form_display.taxonomy_term.country.default.yml
+++ b/config/core.entity_form_display.taxonomy_term.country.default.yml
@@ -38,62 +38,62 @@ content:
         hide_help: '1'
         hide_guidelines: '1'
   field_aliases:
+    type: string_textarea
     weight: 3
+    region: content
     settings:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
-    type: string_textarea
-    region: content
   field_iso3:
+    type: string_textfield
     weight: 5
+    region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
-    region: content
   field_location:
+    type: geofield_latlon
     weight: 6
+    region: content
     settings:
       html5_geolocation: false
     third_party_settings: {  }
-    type: geofield_latlon
-    region: content
   field_longname:
+    type: string_textfield
     weight: 2
+    region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
-    region: content
   field_profile:
+    type: boolean_checkbox
     weight: 7
+    region: content
     settings:
       display_label: true
     third_party_settings: {  }
-    type: boolean_checkbox
-    region: content
   field_shortname:
+    type: string_textfield
     weight: 1
+    region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
-    region: content
   field_timezone:
+    type: options_select
     weight: 8
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: options_select
-    region: content
   moderation_state:
     type: moderation_state_default
     weight: 10
-    settings: {  }
     region: content
+    settings: {  }
     third_party_settings: {  }
   name:
     type: string_textfield
@@ -111,10 +111,10 @@ content:
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    settings:
-      display_label: true
     weight: 9
     region: content
+    settings:
+      display_label: true
     third_party_settings: {  }
 hidden:
   field_appeals_response_plans: true
diff --git a/config/core.entity_form_display.taxonomy_term.country.profile.yml b/config/core.entity_form_display.taxonomy_term.country.profile.yml
index 571a0a9f9..4a5d7276a 100644
--- a/config/core.entity_form_display.taxonomy_term.country.profile.yml
+++ b/config/core.entity_form_display.taxonomy_term.country.profile.yml
@@ -48,12 +48,12 @@ content:
     settings: {  }
     third_party_settings: {  }
   field_profile:
+    type: boolean_checkbox
     weight: 0
+    region: content
     settings:
       display_label: true
     third_party_settings: {  }
-    type: boolean_checkbox
-    region: content
   field_useful_links:
     type: reliefweb_links
     weight: 4
diff --git a/config/core.entity_form_display.taxonomy_term.disaster.default.yml b/config/core.entity_form_display.taxonomy_term.disaster.default.yml
index 33fc691ee..3a2cd9265 100644
--- a/config/core.entity_form_display.taxonomy_term.disaster.default.yml
+++ b/config/core.entity_form_display.taxonomy_term.disaster.default.yml
@@ -41,7 +41,9 @@ content:
         hide_help: '1'
         hide_guidelines: '1'
   field_country:
+    type: reliefweb_entity_reference_select
     weight: 2
+    region: content
     settings:
       sort: label
       extra_data:
@@ -74,40 +76,40 @@ content:
         'country:field_timezone': '0'
         'country:field_useful_links': '0'
     third_party_settings: {  }
-    type: reliefweb_entity_reference_select
-    region: content
   field_disaster_date:
+    type: datetime_default
     weight: 5
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: datetime_default
-    region: content
   field_disaster_type:
+    type: reliefweb_entity_reference_select
     weight: 4
+    region: content
     settings:
-      extra_data: {  }
       sort: label
+      extra_data: {  }
     third_party_settings: {  }
-    type: reliefweb_entity_reference_select
-    region: content
   field_glide:
+    type: string_textfield
     weight: 7
+    region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
-    region: content
   field_glide_related:
+    type: string_textarea
     weight: 8
+    region: content
     settings:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
-    type: string_textarea
-    region: content
   field_primary_country:
+    type: reliefweb_entity_reference_select
     weight: 1
+    region: content
     settings:
       sort: label
       extra_data:
@@ -140,34 +142,32 @@ content:
         'country:field_timezone': '0'
         'country:field_useful_links': '0'
     third_party_settings: {  }
-    type: reliefweb_entity_reference_select
-    region: content
   field_primary_disaster_type:
+    type: reliefweb_entity_reference_select
     weight: 3
+    region: content
     settings:
-      extra_data: {  }
       sort: label
+      extra_data: {  }
     third_party_settings: {  }
-    type: reliefweb_entity_reference_select
-    region: content
   field_profile:
+    type: boolean_checkbox
     weight: 9
+    region: content
     settings:
       display_label: true
     third_party_settings: {  }
-    type: boolean_checkbox
-    region: content
   field_timezone:
+    type: options_select
     weight: 10
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: options_select
-    region: content
   moderation_state:
     type: moderation_state_default
     weight: 12
-    settings: {  }
     region: content
+    settings: {  }
     third_party_settings: {  }
   name:
     type: string_textfield
@@ -185,10 +185,10 @@ content:
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    settings:
-      display_label: true
     weight: 11
     region: content
+    settings:
+      display_label: true
     third_party_settings: {  }
 hidden:
   field_appeals_response_plans: true
diff --git a/config/core.entity_form_display.taxonomy_term.disaster_type.default.yml b/config/core.entity_form_display.taxonomy_term.disaster_type.default.yml
index 2aa061388..f3fb7501d 100644
--- a/config/core.entity_form_display.taxonomy_term.disaster_type.default.yml
+++ b/config/core.entity_form_display.taxonomy_term.disaster_type.default.yml
@@ -25,18 +25,18 @@ content:
         hide_help: '1'
         hide_guidelines: '1'
   field_disaster_type_code:
+    type: string_textfield
     weight: 2
+    region: content
     settings:
       size: 2
       placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
-    region: content
   moderation_state:
     type: moderation_state_default
     weight: 100
-    settings: {  }
     region: content
+    settings: {  }
     third_party_settings: {  }
   name:
     type: string_textfield
diff --git a/config/core.entity_form_display.taxonomy_term.feature.default.yml b/config/core.entity_form_display.taxonomy_term.feature.default.yml
index b2385fa74..b9c49e2fe 100644
--- a/config/core.entity_form_display.taxonomy_term.feature.default.yml
+++ b/config/core.entity_form_display.taxonomy_term.feature.default.yml
@@ -16,8 +16,8 @@ content:
     weight: 1
     region: content
     settings:
-      placeholder: ''
       rows: 5
+      placeholder: ''
     third_party_settings: {  }
   name:
     type: string_textfield
diff --git a/config/core.entity_form_display.taxonomy_term.language.default.yml b/config/core.entity_form_display.taxonomy_term.language.default.yml
index 55098900e..f6d490e03 100644
--- a/config/core.entity_form_display.taxonomy_term.language.default.yml
+++ b/config/core.entity_form_display.taxonomy_term.language.default.yml
@@ -17,17 +17,17 @@ content:
     weight: 1
     region: content
     settings:
-      placeholder: ''
       rows: 5
+      placeholder: ''
     third_party_settings: {  }
   field_language_code:
+    type: string_textfield
     weight: 2
+    region: content
     settings:
       size: 2
       placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
-    region: content
   name:
     type: string_textfield
     weight: 0
@@ -38,10 +38,10 @@ content:
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    settings:
-      display_label: true
     weight: 3
     region: content
+    settings:
+      display_label: true
     third_party_settings: {  }
 hidden:
   langcode: true
diff --git a/config/core.entity_form_display.taxonomy_term.source.default.yml b/config/core.entity_form_display.taxonomy_term.source.default.yml
index edc374b87..8832fd242 100644
--- a/config/core.entity_form_display.taxonomy_term.source.default.yml
+++ b/config/core.entity_form_display.taxonomy_term.source.default.yml
@@ -49,45 +49,47 @@ content:
         hide_help: '1'
         hide_guidelines: '1'
   field_aliases:
+    type: string_textarea
     weight: 4
+    region: content
     settings:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
-    type: string_textarea
-    region: content
   field_allowed_content_types:
+    type: options_buttons
     weight: 11
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: options_buttons
-    region: content
   field_attention_job:
+    type: string_textarea
     weight: 14
+    region: content
     settings:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
-    type: string_textarea
-    region: content
   field_attention_report:
+    type: string_textarea
     weight: 13
+    region: content
     settings:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
-    type: string_textarea
-    region: content
   field_attention_training:
+    type: string_textarea
     weight: 15
+    region: content
     settings:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
-    type: string_textarea
-    region: content
   field_country:
+    type: reliefweb_entity_reference_select
     weight: 7
+    region: content
     settings:
       sort: label
       extra_data:
@@ -120,32 +122,30 @@ content:
         'country:field_timezone': '0'
         'country:field_useful_links': '0'
     third_party_settings: {  }
-    type: reliefweb_entity_reference_select
-    region: content
   field_disclaimer:
+    type: string_textarea
     weight: 12
+    region: content
     settings:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
-    type: string_textarea
-    region: content
   field_fts_id:
+    type: string_textfield
     weight: 16
+    region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
-    region: content
   field_homepage:
+    type: link_default
     weight: 9
+    region: content
     settings:
       placeholder_url: ''
       placeholder_title: ''
     third_party_settings: {  }
-    type: link_default
-    region: content
   field_job_import_feed:
     type: reliefweb_import_info
     weight: 18
@@ -153,56 +153,56 @@ content:
     settings: {  }
     third_party_settings: {  }
   field_links:
+    type: link_default
     weight: 10
+    region: content
     settings:
       placeholder_url: ''
       placeholder_title: ''
     third_party_settings: {  }
-    type: link_default
-    region: content
   field_logo:
+    type: image_image
     weight: 8
+    region: content
     settings:
       progress_indicator: throbber
       preview_image_style: thumbnail
     third_party_settings: {  }
-    type: image_image
-    region: content
   field_longname:
+    type: string_textfield
     weight: 2
+    region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
-    region: content
   field_organization_type:
+    type: options_buttons
     weight: 6
+    region: content
     settings: {  }
     third_party_settings: {  }
-    type: options_buttons
-    region: content
   field_shortname:
+    type: string_textfield
     weight: 1
+    region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
-    region: content
   field_spanish_name:
+    type: string_textfield
     weight: 3
+    region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-    type: string_textfield
-    region: content
   moderation_state:
     type: moderation_state_default
     weight: 20
-    settings: {  }
     region: content
+    settings: {  }
     third_party_settings: {  }
   name:
     type: string_textfield
@@ -220,10 +220,10 @@ content:
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    settings:
-      display_label: true
     weight: 19
     region: content
+    settings:
+      display_label: true
     third_party_settings: {  }
 hidden:
   field_job_import_feed_url: true
diff --git a/config/core.entity_form_display.user.user.default.yml b/config/core.entity_form_display.user.user.default.yml
index ebd6abfd4..aa9ee5236 100644
--- a/config/core.entity_form_display.user.user.default.yml
+++ b/config/core.entity_form_display.user.user.default.yml
@@ -13,26 +13,31 @@ mode: default
 content:
   account:
     weight: -10
+    region: content
     settings: {  }
     third_party_settings: {  }
+  contact:
+    weight: 5
     region: content
+    settings: {  }
+    third_party_settings: {  }
   field_notes:
+    type: string_textarea
     weight: 7
+    region: content
     settings:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
-    type: string_textarea
-    region: content
   language:
     weight: 0
+    region: content
     settings: {  }
     third_party_settings: {  }
-    region: content
   timezone:
     weight: 6
+    region: content
     settings: {  }
     third_party_settings: {  }
-    region: content
 hidden:
   langcode: true
diff --git a/config/core.entity_form_mode.media.media_library.yml b/config/core.entity_form_mode.media.media_library.yml
index a2cb7e213..4f47910e8 100644
--- a/config/core.entity_form_mode.media.media_library.yml
+++ b/config/core.entity_form_mode.media.media_library.yml
@@ -2,11 +2,11 @@ uuid: af6d132b-39d6-4579-9448-2a8291e0f74a
 langcode: en
 status: true
 dependencies:
+  module:
+    - media
   enforced:
     module:
       - media_library
-  module:
-    - media
 _core:
   default_config_hash: pkq0uj-IoqEQRBOP_ddUDV0ZJ-dKQ_fLcppsEDF2UO8
 id: media.media_library
diff --git a/config/core.entity_view_display.contact_message.personal.default.yml b/config/core.entity_view_display.contact_message.personal.default.yml
index 28931312b..21e174145 100644
--- a/config/core.entity_view_display.contact_message.personal.default.yml
+++ b/config/core.entity_view_display.contact_message.personal.default.yml
@@ -12,11 +12,11 @@ mode: default
 content:
   message:
     type: basic_string
-    weight: 0
     label: hidden
-    region: content
     settings: {  }
     third_party_settings: {  }
+    weight: 0
+    region: content
 hidden:
   field_sender: true
   langcode: true
diff --git a/config/core.entity_view_display.guideline.field_guideline.default.yml b/config/core.entity_view_display.guideline.field_guideline.default.yml
index bfc2d75e0..6670432d2 100644
--- a/config/core.entity_view_display.guideline.field_guideline.default.yml
+++ b/config/core.entity_view_display.guideline.field_guideline.default.yml
@@ -19,14 +19,14 @@ bundle: field_guideline
 mode: default
 content:
   field_description:
-    weight: 0
+    type: text_default
     label: hidden
     settings: {  }
     third_party_settings: {  }
-    type: text_default
+    weight: 0
     region: content
   field_links:
-    weight: 1
+    type: link
     label: above
     settings:
       trim_length: 80
@@ -35,7 +35,7 @@ content:
       rel: ''
       target: ''
     third_party_settings: {  }
-    type: link
+    weight: 1
     region: content
 hidden:
   field_field: true
diff --git a/config/core.entity_view_display.guideline.guideline_list.default.yml b/config/core.entity_view_display.guideline.guideline_list.default.yml
index e9503e18b..41b44f4b4 100644
--- a/config/core.entity_view_display.guideline.guideline_list.default.yml
+++ b/config/core.entity_view_display.guideline.guideline_list.default.yml
@@ -15,34 +15,34 @@ bundle: guideline_list
 mode: default
 content:
   field_description:
-    weight: 2
+    type: text_default
     label: above
     settings: {  }
     third_party_settings: {  }
-    type: text_default
+    weight: 2
     region: content
   field_title:
-    weight: 1
+    type: string
     label: above
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    type: string
+    weight: 1
     region: content
   name:
-    label: above
     type: string
-    weight: -4
-    region: content
+    label: above
     settings:
       link_to_entity: false
     third_party_settings: {  }
+    weight: -4
+    region: content
   user_id:
-    label: hidden
     type: author
-    weight: 0
-    region: content
+    label: hidden
     settings: {  }
     third_party_settings: {  }
+    weight: 0
+    region: content
 hidden:
   langcode: true
diff --git a/config/core.entity_view_display.media.file_report.default.yml b/config/core.entity_view_display.media.file_report.default.yml
index 41f6e231c..202e70675 100644
--- a/config/core.entity_view_display.media.file_report.default.yml
+++ b/config/core.entity_view_display.media.file_report.default.yml
@@ -15,28 +15,28 @@ bundle: file_report
 mode: default
 content:
   field_description:
-    weight: 1
+    type: string
     label: hidden
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    type: string
+    weight: 1
     region: content
   field_language:
-    weight: 2
+    type: entity_reference_label
     label: hidden
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 2
     region: content
   field_media_file:
+    type: file_default
     label: visually_hidden
-    weight: 0
     settings:
       use_description_as_link_text: true
     third_party_settings: {  }
-    type: file_default
+    weight: 0
     region: content
 hidden:
   created: true
diff --git a/config/core.entity_view_display.media.file_report.media_library.yml b/config/core.entity_view_display.media.file_report.media_library.yml
index f5dc871a4..ef071c895 100644
--- a/config/core.entity_view_display.media.file_report.media_library.yml
+++ b/config/core.entity_view_display.media.file_report.media_library.yml
@@ -20,10 +20,10 @@ content:
     type: image
     label: hidden
     settings:
-      image_style: medium
       image_link: ''
-    weight: 0
+      image_style: medium
     third_party_settings: {  }
+    weight: 0
     region: content
 hidden:
   created: true
diff --git a/config/core.entity_view_display.media.image_announcement.default.yml b/config/core.entity_view_display.media.image_announcement.default.yml
index 4ce57623e..f332515de 100644
--- a/config/core.entity_view_display.media.image_announcement.default.yml
+++ b/config/core.entity_view_display.media.image_announcement.default.yml
@@ -14,13 +14,13 @@ bundle: image_announcement
 mode: default
 content:
   field_media_image:
+    type: image
     label: visually_hidden
-    weight: 0
     settings:
-      image_style: announcement
       image_link: ''
+      image_style: announcement
     third_party_settings: {  }
-    type: image
+    weight: 0
     region: content
 hidden:
   created: true
diff --git a/config/core.entity_view_display.media.image_announcement.media_library.yml b/config/core.entity_view_display.media.image_announcement.media_library.yml
index ecb4c9bf6..858f50b15 100644
--- a/config/core.entity_view_display.media.image_announcement.media_library.yml
+++ b/config/core.entity_view_display.media.image_announcement.media_library.yml
@@ -18,10 +18,10 @@ content:
     type: image
     label: hidden
     settings:
-      image_style: medium
       image_link: ''
-    weight: 0
+      image_style: medium
     third_party_settings: {  }
+    weight: 0
     region: content
 hidden:
   created: true
diff --git a/config/core.entity_view_display.media.image_blog_post.default.yml b/config/core.entity_view_display.media.image_blog_post.default.yml
index ce4554ce3..3bfb7cb48 100644
--- a/config/core.entity_view_display.media.image_blog_post.default.yml
+++ b/config/core.entity_view_display.media.image_blog_post.default.yml
@@ -16,21 +16,21 @@ bundle: image_blog_post
 mode: default
 content:
   field_copyright:
-    weight: 1
+    type: string
     label: visually_hidden
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    type: string
+    weight: 1
     region: content
   field_media_image:
+    type: image
     label: visually_hidden
-    weight: 0
     settings:
-      image_style: large
       image_link: ''
+      image_style: large
     third_party_settings: {  }
-    type: image
+    weight: 0
     region: content
 hidden:
   created: true
diff --git a/config/core.entity_view_display.media.image_blog_post.media_library.yml b/config/core.entity_view_display.media.image_blog_post.media_library.yml
index 9e7e9ac8a..31af3757d 100644
--- a/config/core.entity_view_display.media.image_blog_post.media_library.yml
+++ b/config/core.entity_view_display.media.image_blog_post.media_library.yml
@@ -20,10 +20,10 @@ content:
     type: image
     label: hidden
     settings:
-      image_style: medium
       image_link: ''
-    weight: 0
+      image_style: medium
     third_party_settings: {  }
+    weight: 0
     region: content
 hidden:
   created: true
diff --git a/config/core.entity_view_display.media.image_book.default.yml b/config/core.entity_view_display.media.image_book.default.yml
index cef534f71..cde78f5b4 100644
--- a/config/core.entity_view_display.media.image_book.default.yml
+++ b/config/core.entity_view_display.media.image_book.default.yml
@@ -16,21 +16,21 @@ bundle: image_book
 mode: default
 content:
   field_copyright:
-    weight: 1
+    type: string
     label: visually_hidden
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    type: string
+    weight: 1
     region: content
   field_media_image:
+    type: image
     label: visually_hidden
-    weight: 0
     settings:
-      image_style: large
       image_link: ''
+      image_style: large
     third_party_settings: {  }
-    type: image
+    weight: 0
     region: content
 hidden:
   created: true
diff --git a/config/core.entity_view_display.media.image_book.media_library.yml b/config/core.entity_view_display.media.image_book.media_library.yml
index 4fe859f93..200dc70f3 100644
--- a/config/core.entity_view_display.media.image_book.media_library.yml
+++ b/config/core.entity_view_display.media.image_book.media_library.yml
@@ -20,10 +20,10 @@ content:
     type: image
     label: hidden
     settings:
-      image_style: medium
       image_link: ''
-    weight: 0
+      image_style: medium
     third_party_settings: {  }
+    weight: 0
     region: content
 hidden:
   created: true
diff --git a/config/core.entity_view_display.media.image_report.default.yml b/config/core.entity_view_display.media.image_report.default.yml
index 8c7928c28..043ec2e06 100644
--- a/config/core.entity_view_display.media.image_report.default.yml
+++ b/config/core.entity_view_display.media.image_report.default.yml
@@ -16,29 +16,29 @@ bundle: image_report
 mode: default
 content:
   field_copyright:
-    weight: 2
+    type: string
     label: hidden
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    type: string
+    weight: 2
     region: content
   field_description:
     type: string
-    weight: 1
-    region: content
     label: hidden
     settings:
       link_to_entity: false
     third_party_settings: {  }
+    weight: 1
+    region: content
   field_media_image:
+    type: image
     label: visually_hidden
-    weight: 0
     settings:
-      image_style: large
       image_link: ''
+      image_style: large
     third_party_settings: {  }
-    type: image
+    weight: 0
     region: content
 hidden:
   created: true
diff --git a/config/core.entity_view_display.media.image_report.media_library.yml b/config/core.entity_view_display.media.image_report.media_library.yml
index a7069b22e..71b0e40fa 100644
--- a/config/core.entity_view_display.media.image_report.media_library.yml
+++ b/config/core.entity_view_display.media.image_report.media_library.yml
@@ -20,10 +20,10 @@ content:
     type: image
     label: hidden
     settings:
-      image_style: medium
       image_link: ''
-    weight: 0
+      image_style: medium
     third_party_settings: {  }
+    weight: 0
     region: content
 hidden:
   created: true
diff --git a/config/core.entity_view_display.media.image_topic.default.yml b/config/core.entity_view_display.media.image_topic.default.yml
index 6da27dd6c..f5cf11652 100644
--- a/config/core.entity_view_display.media.image_topic.default.yml
+++ b/config/core.entity_view_display.media.image_topic.default.yml
@@ -14,17 +14,17 @@ bundle: image_topic
 mode: default
 content:
   field_media_image:
+    type: image
     label: hidden
-    weight: 0
     settings:
-      image_style: icon
       image_link: ''
-      svg_render_as_image: true
+      image_style: icon
       svg_attributes:
         width: 64
         height: 64
+      svg_render_as_image: true
     third_party_settings: {  }
-    type: image
+    weight: 0
     region: content
 hidden:
   created: true
diff --git a/config/core.entity_view_display.media.image_topic.media_library.yml b/config/core.entity_view_display.media.image_topic.media_library.yml
index 9bca404a0..4b7ac9dd0 100644
--- a/config/core.entity_view_display.media.image_topic.media_library.yml
+++ b/config/core.entity_view_display.media.image_topic.media_library.yml
@@ -18,14 +18,14 @@ content:
     type: image
     label: hidden
     settings:
-      image_style: icon
       image_link: ''
-      svg_render_as_image: true
+      image_style: icon
       svg_attributes:
         width: 64
         height: 64
-    weight: 0
+      svg_render_as_image: true
     third_party_settings: {  }
+    weight: 0
     region: content
 hidden:
   created: true
diff --git a/config/core.entity_view_display.node.announcement.default.yml b/config/core.entity_view_display.node.announcement.default.yml
index 7cb184bf9..11065a2ab 100644
--- a/config/core.entity_view_display.node.announcement.default.yml
+++ b/config/core.entity_view_display.node.announcement.default.yml
@@ -17,23 +17,23 @@ bundle: announcement
 mode: default
 content:
   body:
-    weight: 2
+    type: text_default
     label: above
     settings: {  }
     third_party_settings: {  }
-    type: text_default
+    weight: 2
     region: content
   field_image:
     type: entity_reference_entity_view
-    weight: 1
     label: above
     settings:
       view_mode: default
       link: false
     third_party_settings: {  }
+    weight: 1
     region: content
   field_link:
-    weight: 0
+    type: link
     label: above
     settings:
       trim_length: 80
@@ -42,7 +42,7 @@ content:
       rel: ''
       target: ''
     third_party_settings: {  }
-    type: link
+    weight: 0
     region: content
 hidden:
   langcode: true
diff --git a/config/core.entity_view_display.node.announcement.teaser.yml b/config/core.entity_view_display.node.announcement.teaser.yml
index a829b7178..3ac6ad1e3 100644
--- a/config/core.entity_view_display.node.announcement.teaser.yml
+++ b/config/core.entity_view_display.node.announcement.teaser.yml
@@ -17,13 +17,13 @@ mode: teaser
 content:
   field_image:
     type: entity_reference_entity_view
-    weight: 0
-    region: content
     label: hidden
     settings:
-      link: true
       view_mode: default
+      link: true
     third_party_settings: {  }
+    weight: 0
+    region: content
 hidden:
   body: true
   field_link: true
diff --git a/config/core.entity_view_display.node.blog_post.default.yml b/config/core.entity_view_display.node.blog_post.default.yml
index b1cef6033..e53a18091 100644
--- a/config/core.entity_view_display.node.blog_post.default.yml
+++ b/config/core.entity_view_display.node.blog_post.default.yml
@@ -18,41 +18,41 @@ bundle: blog_post
 mode: default
 content:
   body:
-    weight: 4
+    type: text_default
     label: hidden
     settings: {  }
     third_party_settings: {  }
-    type: text_default
+    weight: 4
     region: content
   content_moderation_control:
-    weight: -20
     settings: {  }
     third_party_settings: {  }
+    weight: -20
     region: content
   field_author:
-    weight: 0
+    type: string
     label: inline
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    type: string
+    weight: 0
     region: content
   field_image:
-    weight: 3
+    type: entity_reference_entity_view
     label: hidden
     settings:
-      link: true
       view_mode: default
+      link: true
     third_party_settings: {  }
-    type: entity_reference_entity_view
+    weight: 3
     region: content
   field_tags:
-    weight: 1
+    type: entity_reference_label
     label: inline
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 1
     region: content
 hidden:
   field_attached_images: true
diff --git a/config/core.entity_view_display.node.blog_post.teaser.yml b/config/core.entity_view_display.node.blog_post.teaser.yml
index b9a9723ac..271e855e2 100644
--- a/config/core.entity_view_display.node.blog_post.teaser.yml
+++ b/config/core.entity_view_display.node.blog_post.teaser.yml
@@ -20,33 +20,33 @@ mode: teaser
 content:
   body:
     type: text_summary_or_trimmed
-    weight: 1
-    region: content
     label: hidden
     settings:
       trim_length: 600
     third_party_settings: {  }
+    weight: 1
+    region: content
   content_moderation_control:
-    weight: -20
     settings: {  }
     third_party_settings: {  }
+    weight: -20
     region: content
   field_author:
     type: string
-    weight: 0
-    region: content
     label: visually_hidden
     settings:
       link_to_entity: false
     third_party_settings: {  }
+    weight: 0
+    region: content
   field_tags:
     type: entity_reference_label
-    weight: 3
-    region: content
     label: inline
     settings:
       link: true
     third_party_settings: {  }
+    weight: 3
+    region: content
 hidden:
   field_attached_images: true
   field_image: true
diff --git a/config/core.entity_view_display.node.book.default.yml b/config/core.entity_view_display.node.book.default.yml
index 7ccd0215a..2225a859b 100644
--- a/config/core.entity_view_display.node.book.default.yml
+++ b/config/core.entity_view_display.node.book.default.yml
@@ -17,12 +17,12 @@ bundle: book
 mode: default
 content:
   body:
-    label: hidden
     type: text_default
-    weight: 0
-    region: content
+    label: hidden
     settings: {  }
     third_party_settings: {  }
+    weight: 0
+    region: content
 hidden:
   content_moderation_control: true
   field_attached_images: true
diff --git a/config/core.entity_view_display.node.job.default.yml b/config/core.entity_view_display.node.job.default.yml
index 5d7a7717e..3bc6d068d 100644
--- a/config/core.entity_view_display.node.job.default.yml
+++ b/config/core.entity_view_display.node.job.default.yml
@@ -24,88 +24,88 @@ bundle: job
 mode: default
 content:
   body:
-    weight: 3
+    type: text_default
     label: hidden
     settings: {  }
     third_party_settings: {  }
-    type: text_default
+    weight: 3
     region: content
   content_moderation_control:
-    weight: -20
     settings: {  }
     third_party_settings: {  }
+    weight: -20
     region: content
   field_career_categories:
-    weight: 7
+    type: entity_reference_label
     label: above
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 7
     region: content
   field_city:
-    weight: 5
+    type: string
     label: above
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    type: string
+    weight: 5
     region: content
   field_country:
-    weight: 0
+    type: entity_reference_label
     label: visually_hidden
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 0
     region: content
   field_how_to_apply:
-    weight: 4
+    type: text_default
     label: above
     settings: {  }
     third_party_settings: {  }
-    type: text_default
+    weight: 4
     region: content
   field_job_closing_date:
-    weight: 2
+    type: datetime_default
     label: inline
     settings:
       timezone_override: UTC
       format_type: date_short
     third_party_settings: {  }
-    type: datetime_default
+    weight: 2
     region: content
   field_job_experience:
-    weight: 8
+    type: entity_reference_label
     label: above
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 8
     region: content
   field_job_type:
-    weight: 6
+    type: entity_reference_label
     label: above
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 6
     region: content
   field_source:
-    weight: 1
+    type: entity_reference_label
     label: inline
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 1
     region: content
   field_theme:
-    weight: 9
+    type: entity_reference_label
     label: above
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 9
     region: content
 hidden:
   field_job_id: true
diff --git a/config/core.entity_view_display.node.job.teaser.yml b/config/core.entity_view_display.node.job.teaser.yml
index 3621e6030..cb8b94e98 100644
--- a/config/core.entity_view_display.node.job.teaser.yml
+++ b/config/core.entity_view_display.node.job.teaser.yml
@@ -24,27 +24,27 @@ bundle: job
 mode: teaser
 content:
   content_moderation_control:
-    weight: -20
     settings: {  }
     third_party_settings: {  }
+    weight: -20
     region: content
   field_job_closing_date:
     type: datetime_default
-    weight: 1
-    region: content
     label: inline
     settings:
       timezone_override: UTC
       format_type: date_short
     third_party_settings: {  }
+    weight: 1
+    region: content
   field_source:
     type: entity_reference_label
-    weight: 0
-    region: content
     label: inline
     settings:
       link: true
     third_party_settings: {  }
+    weight: 0
+    region: content
 hidden:
   body: true
   field_career_categories: true
diff --git a/config/core.entity_view_display.node.report.default.yml b/config/core.entity_view_display.node.report.default.yml
index 4354bcef8..7f38fda75 100644
--- a/config/core.entity_view_display.node.report.default.yml
+++ b/config/core.entity_view_display.node.report.default.yml
@@ -38,110 +38,115 @@ bundle: report
 mode: default
 content:
   body:
-    weight: 7
+    type: text_default
     label: hidden
     settings: {  }
     third_party_settings: {  }
-    type: text_default
+    weight: 7
+    region: content
+  content_moderation_control:
+    settings: {  }
+    third_party_settings: {  }
+    weight: -20
     region: content
   field_content_format:
-    weight: 2
+    type: entity_reference_label
     label: visually_hidden
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 2
     region: content
   field_country:
-    weight: 1
+    type: entity_reference_label
     label: visually_hidden
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 1
     region: content
   field_disaster:
-    weight: 10
+    type: entity_reference_label
     label: above
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 10
     region: content
   field_disaster_type:
-    weight: 11
+    type: entity_reference_label
     label: above
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 11
     region: content
   field_file:
     type: entity_reference_entity_view
-    weight: 8
     label: visually_hidden
     settings:
       view_mode: default
       link: false
     third_party_settings: {  }
+    weight: 8
     region: content
   field_image:
-    weight: 6
+    type: entity_reference_entity_view
     label: hidden
     settings:
-      link: true
       view_mode: default
+      link: true
     third_party_settings: {  }
-    type: entity_reference_entity_view
+    weight: 6
     region: content
   field_language:
-    weight: 12
+    type: entity_reference_label
     label: above
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 12
     region: content
   field_origin_notes:
-    weight: 5
+    type: string
     label: inline
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    type: string
+    weight: 5
     region: content
   field_original_publication_date:
-    weight: 4
+    type: datetime_default
     label: inline
     settings:
       timezone_override: UTC
       format_type: date_short
     third_party_settings: {  }
-    type: datetime_default
+    weight: 4
     region: content
   field_primary_country:
-    weight: 0
+    type: entity_reference_label
     label: visually_hidden
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 0
     region: content
   field_source:
-    weight: 3
+    type: entity_reference_label
     label: inline
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 3
     region: content
   field_theme:
-    weight: 9
+    type: entity_reference_label
     label: above
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 9
     region: content
 hidden:
   field_bury: true
diff --git a/config/core.entity_view_display.node.report.headline.yml b/config/core.entity_view_display.node.report.headline.yml
index aa7db72ca..2bba2bd4b 100644
--- a/config/core.entity_view_display.node.report.headline.yml
+++ b/config/core.entity_view_display.node.report.headline.yml
@@ -36,53 +36,58 @@ targetEntityType: node
 bundle: report
 mode: headline
 content:
+  content_moderation_control:
+    settings: {  }
+    third_party_settings: {  }
+    weight: -20
+    region: content
   field_country:
-    weight: 2
+    type: entity_reference_label
     label: visually_hidden
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 2
     region: content
   field_headline_image:
     type: entity_reference_entity_view
-    weight: 0
-    region: content
     label: hidden
     settings:
       view_mode: default
       link: false
     third_party_settings: {  }
+    weight: 0
+    region: content
   field_headline_summary:
     type: basic_string
-    weight: 4
-    region: content
     label: hidden
     settings: {  }
     third_party_settings: {  }
+    weight: 4
+    region: content
   field_headline_title:
     type: string
-    weight: 3
-    region: content
     label: hidden
     settings:
       link_to_entity: false
     third_party_settings: {  }
+    weight: 3
+    region: content
   field_primary_country:
-    weight: 1
+    type: entity_reference_label
     label: visually_hidden
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 1
     region: content
   field_source:
-    weight: 5
+    type: entity_reference_label
     label: inline
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 5
     region: content
 hidden:
   body: true
diff --git a/config/core.entity_view_display.node.report.teaser.yml b/config/core.entity_view_display.node.report.teaser.yml
index 38ecddedb..b586d39a4 100644
--- a/config/core.entity_view_display.node.report.teaser.yml
+++ b/config/core.entity_view_display.node.report.teaser.yml
@@ -40,61 +40,66 @@ mode: teaser
 content:
   body:
     type: text_summary_or_trimmed
-    weight: 3
-    region: content
     label: hidden
     settings:
       trim_length: 300
     third_party_settings: {  }
+    weight: 3
+    region: content
+  content_moderation_control:
+    settings: {  }
+    third_party_settings: {  }
+    weight: -20
+    region: content
   field_content_format:
     type: entity_reference_label
-    weight: 4
-    region: content
     label: visually_hidden
     settings:
       link: true
     third_party_settings: {  }
+    weight: 4
+    region: content
   field_country:
     type: entity_reference_label
-    weight: 1
-    region: content
     label: visually_hidden
     settings:
       link: true
     third_party_settings: {  }
+    weight: 1
+    region: content
   field_file:
     type: entity_reference_label
-    weight: 2
-    region: content
     label: hidden
     settings:
       link: true
     third_party_settings: {  }
+    weight: 2
+    region: content
   field_original_publication_date:
     type: datetime_default
-    weight: 6
-    region: content
     label: inline
     settings:
       timezone_override: UTC
       format_type: date_short
     third_party_settings: {  }
+    weight: 6
+    region: content
   field_primary_country:
     type: entity_reference_label
-    weight: 0
-    region: content
     label: visually_hidden
     settings:
       link: true
     third_party_settings: {  }
+    weight: 0
+    region: content
   field_source:
     type: entity_reference_label
-    weight: 5
-    region: content
     label: inline
     settings:
       link: true
     third_party_settings: {  }
+    weight: 5
+    region: content
 hidden:
   field_bury: true
   field_disaster: true
diff --git a/config/core.entity_view_display.node.topic.default.yml b/config/core.entity_view_display.node.topic.default.yml
index ecb764ba2..bbbc6932d 100644
--- a/config/core.entity_view_display.node.topic.default.yml
+++ b/config/core.entity_view_display.node.topic.default.yml
@@ -25,89 +25,89 @@ bundle: topic
 mode: default
 content:
   body:
-    weight: 1
+    type: text_default
     label: above
     settings: {  }
     third_party_settings: {  }
-    type: text_default
+    weight: 1
     region: content
   field_bury:
-    weight: 10
+    type: boolean
     label: above
     settings:
       format: default
       format_custom_false: ''
       format_custom_true: ''
     third_party_settings: {  }
-    type: boolean
+    weight: 10
     region: content
   field_disasters_search:
-    weight: 8
+    type: reliefweb_section_links
     label: above
     settings: {  }
     third_party_settings: {  }
-    type: reliefweb_section_links
+    weight: 8
     region: content
   field_featured:
-    weight: 9
+    type: boolean
     label: above
     settings:
       format: default
       format_custom_false: ''
       format_custom_true: ''
     third_party_settings: {  }
-    type: boolean
+    weight: 9
     region: content
   field_icon:
     type: entity_reference_entity_view
-    weight: 0
     label: hidden
     settings:
       view_mode: default
       link: false
     third_party_settings: {  }
+    weight: 0
     region: content
   field_jobs_search:
-    weight: 6
+    type: reliefweb_section_links
     label: above
     settings: {  }
     third_party_settings: {  }
-    type: reliefweb_section_links
+    weight: 6
     region: content
   field_overview:
-    weight: 2
+    type: text_default
     label: above
     settings: {  }
     third_party_settings: {  }
-    type: text_default
+    weight: 2
     region: content
   field_reports_search:
-    weight: 4
+    type: reliefweb_section_links
     label: above
     settings: {  }
     third_party_settings: {  }
-    type: reliefweb_section_links
+    weight: 4
     region: content
   field_resources:
-    weight: 5
+    type: text_default
     label: above
     settings: {  }
     third_party_settings: {  }
-    type: text_default
+    weight: 5
     region: content
   field_sections:
-    weight: 3
+    type: reliefweb_section_links
     label: above
     settings: {  }
     third_party_settings: {  }
-    type: reliefweb_section_links
+    weight: 3
     region: content
   field_training_search:
-    weight: 7
+    type: reliefweb_section_links
     label: above
     settings: {  }
     third_party_settings: {  }
-    type: reliefweb_section_links
+    weight: 7
     region: content
 hidden:
   content_moderation_control: true
diff --git a/config/core.entity_view_display.node.topic.teaser.yml b/config/core.entity_view_display.node.topic.teaser.yml
index 9f6584463..0127a2518 100644
--- a/config/core.entity_view_display.node.topic.teaser.yml
+++ b/config/core.entity_view_display.node.topic.teaser.yml
@@ -24,14 +24,14 @@ bundle: topic
 mode: teaser
 content:
   content_moderation_control:
-    weight: -20
     settings: {  }
     third_party_settings: {  }
+    weight: -20
     region: content
   links:
-    weight: 100
     settings: {  }
     third_party_settings: {  }
+    weight: 100
     region: content
 hidden:
   body: true
diff --git a/config/core.entity_view_display.node.training.default.yml b/config/core.entity_view_display.node.training.default.yml
index c28eba1a8..8e67dab25 100644
--- a/config/core.entity_view_display.node.training.default.yml
+++ b/config/core.entity_view_display.node.training.default.yml
@@ -33,127 +33,127 @@ bundle: training
 mode: default
 content:
   body:
-    weight: 5
+    type: text_default
     label: hidden
     settings: {  }
     third_party_settings: {  }
-    type: text_default
+    weight: 5
     region: content
   field_career_categories:
-    weight: 10
+    type: entity_reference_label
     label: above
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 10
     region: content
   field_city:
-    weight: 13
+    type: string
     label: above
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    type: string
+    weight: 13
     region: content
   field_cost:
-    weight: 14
+    type: list_default
     label: above
     settings: {  }
     third_party_settings: {  }
-    type: list_default
+    weight: 14
     region: content
   field_country:
-    weight: 0
+    type: entity_reference_label
     label: visually_hidden
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 0
     region: content
   field_fee_information:
-    weight: 7
+    type: basic_string
     label: above
     settings: {  }
     third_party_settings: {  }
-    type: basic_string
+    weight: 7
     region: content
   field_how_to_register:
-    weight: 6
+    type: text_default
     label: above
     settings: {  }
     third_party_settings: {  }
-    type: text_default
+    weight: 6
     region: content
   field_link:
-    weight: 4
+    type: link
     label: inline
     settings:
       trim_length: null
       url_only: true
-      target: _blank
       url_plain: false
       rel: '0'
+      target: _blank
     third_party_settings: {  }
-    type: link
+    weight: 4
     region: content
   field_registration_deadline:
-    weight: 3
+    type: datetime_default
     label: inline
     settings:
       timezone_override: UTC
       format_type: date_short
     third_party_settings: {  }
-    type: datetime_default
+    weight: 3
     region: content
   field_source:
-    weight: 1
+    type: entity_reference_label
     label: inline
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 1
     region: content
   field_theme:
-    weight: 11
+    type: entity_reference_label
     label: above
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 11
     region: content
   field_training_date:
-    weight: 2
+    type: daterange_default
     label: inline
     settings:
       timezone_override: UTC
       format_type: date_short
       separator: '-'
     third_party_settings: {  }
-    type: daterange_default
+    weight: 2
     region: content
   field_training_format:
-    weight: 8
+    type: entity_reference_label
     label: above
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 8
     region: content
   field_training_language:
-    weight: 12
+    type: entity_reference_label
     label: above
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 12
     region: content
   field_training_type:
-    weight: 9
+    type: entity_reference_label
     label: above
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 9
     region: content
 hidden:
   field_language: true
diff --git a/config/core.entity_view_display.node.training.teaser.yml b/config/core.entity_view_display.node.training.teaser.yml
index bf66c4a8c..1207c5ad2 100644
--- a/config/core.entity_view_display.node.training.teaser.yml
+++ b/config/core.entity_view_display.node.training.teaser.yml
@@ -32,39 +32,39 @@ mode: teaser
 content:
   field_country:
     type: entity_reference_label
-    weight: 0
-    region: content
     label: visually_hidden
     settings:
       link: true
     third_party_settings: {  }
+    weight: 0
+    region: content
   field_registration_deadline:
     type: datetime_default
-    weight: 3
-    region: content
     label: inline
     settings:
-      format_type: medium
       timezone_override: ''
+      format_type: medium
     third_party_settings: {  }
+    weight: 3
+    region: content
   field_source:
     type: entity_reference_label
-    weight: 1
-    region: content
     label: inline
     settings:
       link: true
     third_party_settings: {  }
+    weight: 1
+    region: content
   field_training_date:
     type: daterange_default
-    weight: 2
-    region: content
     label: inline
     settings:
-      separator: '-'
-      format_type: medium
       timezone_override: ''
+      format_type: medium
+      separator: '-'
     third_party_settings: {  }
+    weight: 2
+    region: content
 hidden:
   body: true
   field_career_categories: true
diff --git a/config/core.entity_view_display.taxonomy_term.disaster.default.yml b/config/core.entity_view_display.taxonomy_term.disaster.default.yml
index 7d6c1b5a2..c29e170f6 100644
--- a/config/core.entity_view_display.taxonomy_term.disaster.default.yml
+++ b/config/core.entity_view_display.taxonomy_term.disaster.default.yml
@@ -24,49 +24,49 @@ bundle: disaster
 mode: default
 content:
   field_appeals_response_plans:
-    weight: 3
+    type: reliefweb_links
     label: above
     settings: {  }
     third_party_settings: {  }
-    type: reliefweb_links
+    weight: 3
     region: content
   field_country:
-    weight: 2
+    type: entity_reference_label
     label: inline
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 2
     region: content
   field_disaster_type:
-    weight: 1
+    type: entity_reference_label
     label: inline
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 1
     region: content
   field_glide:
-    weight: 0
+    type: string
     label: inline
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    type: string
+    weight: 0
     region: content
   field_key_content:
-    weight: 4
+    type: reliefweb_links
     label: above
     settings: {  }
     third_party_settings: {  }
-    type: reliefweb_links
+    weight: 4
     region: content
   field_useful_links:
-    weight: 5
+    type: reliefweb_links
     label: above
     settings: {  }
     third_party_settings: {  }
-    type: reliefweb_links
+    weight: 5
     region: content
 hidden:
   content_moderation_control: true
diff --git a/config/core.entity_view_display.taxonomy_term.disaster_type.default.yml b/config/core.entity_view_display.taxonomy_term.disaster_type.default.yml
index 7374a4c33..b6664101a 100644
--- a/config/core.entity_view_display.taxonomy_term.disaster_type.default.yml
+++ b/config/core.entity_view_display.taxonomy_term.disaster_type.default.yml
@@ -13,19 +13,19 @@ bundle: disaster_type
 mode: default
 content:
   description:
-    label: hidden
     type: text_default
-    weight: 0
-    region: content
+    label: hidden
     settings: {  }
     third_party_settings: {  }
+    weight: 0
+    region: content
   field_disaster_type_code:
-    weight: 1
+    type: string
     label: above
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    type: string
+    weight: 1
     region: content
 hidden:
   langcode: true
diff --git a/config/core.entity_view_display.taxonomy_term.language.default.yml b/config/core.entity_view_display.taxonomy_term.language.default.yml
index 032562f28..bba92496a 100644
--- a/config/core.entity_view_display.taxonomy_term.language.default.yml
+++ b/config/core.entity_view_display.taxonomy_term.language.default.yml
@@ -13,19 +13,19 @@ bundle: language
 mode: default
 content:
   description:
-    label: hidden
     type: text_default
-    weight: 0
-    region: content
+    label: hidden
     settings: {  }
     third_party_settings: {  }
+    weight: 0
+    region: content
   field_language_code:
-    weight: 1
+    type: string
     label: above
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    type: string
+    weight: 1
     region: content
 hidden:
   langcode: true
diff --git a/config/core.entity_view_display.taxonomy_term.source.default.yml b/config/core.entity_view_display.taxonomy_term.source.default.yml
index c611b69b3..c702ab421 100644
--- a/config/core.entity_view_display.taxonomy_term.source.default.yml
+++ b/config/core.entity_view_display.taxonomy_term.source.default.yml
@@ -30,22 +30,22 @@ bundle: source
 mode: default
 content:
   description:
-    label: hidden
     type: text_default
-    weight: 0
-    region: content
+    label: hidden
     settings: {  }
     third_party_settings: {  }
+    weight: 0
+    region: content
   field_country:
-    weight: 2
+    type: entity_reference_label
     label: inline
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 2
     region: content
   field_homepage:
-    weight: 3
+    type: link
     label: inline
     settings:
       trim_length: 80
@@ -54,10 +54,10 @@ content:
       rel: ''
       target: ''
     third_party_settings: {  }
-    type: link
+    weight: 3
     region: content
   field_links:
-    weight: 4
+    type: link
     label: above
     settings:
       trim_length: 80
@@ -66,15 +66,15 @@ content:
       rel: ''
       target: ''
     third_party_settings: {  }
-    type: link
+    weight: 4
     region: content
   field_organization_type:
-    weight: 1
+    type: entity_reference_label
     label: inline
     settings:
       link: true
     third_party_settings: {  }
-    type: entity_reference_label
+    weight: 1
     region: content
 hidden:
   content_moderation_control: true
diff --git a/config/core.entity_view_mode.media.media_library.yml b/config/core.entity_view_mode.media.media_library.yml
index 3072953f8..15a600b5c 100644
--- a/config/core.entity_view_mode.media.media_library.yml
+++ b/config/core.entity_view_mode.media.media_library.yml
@@ -2,11 +2,11 @@ uuid: 5ec635bf-528e-4ea4-b49c-5afcc1206a4e
 langcode: en
 status: true
 dependencies:
+  module:
+    - media
   enforced:
     module:
       - media_library
-  module:
-    - media
 _core:
   default_config_hash: pkq0uj-IoqEQRBOP_ddUDV0ZJ-dKQ_fLcppsEDF2UO8
 id: media.media_library
diff --git a/config/core.entity_view_mode.node.print.yml b/config/core.entity_view_mode.node.print.yml
index d841a1ae8..721ed7bf2 100644
--- a/config/core.entity_view_mode.node.print.yml
+++ b/config/core.entity_view_mode.node.print.yml
@@ -2,11 +2,11 @@ uuid: 945122fc-739d-4e11-8c59-7ea6a853a702
 langcode: en
 status: false
 dependencies:
+  module:
+    - node
   enforced:
     module:
       - book
-  module:
-    - node
 _core:
   default_config_hash: ERjobPGdPFAM9p5cmQIcJzk-0cY-1mE1OV_pKmMlJaE
 id: node.print
diff --git a/config/core.extension.yml b/config/core.extension.yml
index d79f2449d..2e25f5fe1 100644
--- a/config/core.extension.yml
+++ b/config/core.extension.yml
@@ -1,3 +1,5 @@
+_core:
+  default_config_hash: R4IF-ClDHXxblLcG0L7MgsLvfBIMAvi_skumNFQwkDc
 module:
   admin_denied: 0
   allowed_formats: 0
@@ -98,5 +100,3 @@ theme:
   common_design_subtheme: 0
   seven: 0
 profile: minimal
-_core:
-  default_config_hash: R4IF-ClDHXxblLcG0L7MgsLvfBIMAvi_skumNFQwkDc
diff --git a/config/core.menu.static_menu_link_overrides.yml b/config/core.menu.static_menu_link_overrides.yml
index df14c4607..2261a221b 100644
--- a/config/core.menu.static_menu_link_overrides.yml
+++ b/config/core.menu.static_menu_link_overrides.yml
@@ -1,3 +1,3 @@
-definitions: {  }
 _core:
   default_config_hash: jdY7AU0tU-QsjmiOw3W8vwpYMb-By--_MSFgbqKUTYM
+definitions: {  }
diff --git a/config/field.field.guideline.field_guideline.field_images.yml b/config/field.field.guideline.field_guideline.field_images.yml
index e5a6a73fc..3b9109137 100644
--- a/config/field.field.guideline.field_guideline.field_images.yml
+++ b/config/field.field.guideline.field_guideline.field_images.yml
@@ -18,6 +18,8 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
+  handler: 'default:file'
+  handler_settings: {  }
   file_directory: 'guidelines/[date:custom:Y]-[date:custom:m]'
   file_extensions: 'png gif jpg jpeg'
   max_filesize: ''
@@ -33,6 +35,4 @@ settings:
     title: ''
     width: null
     height: null
-  handler: 'default:file'
-  handler_settings: {  }
 field_type: image
diff --git a/config/field.field.guideline.field_guideline.field_links.yml b/config/field.field.guideline.field_guideline.field_links.yml
index 6ddc1cb4f..f5ec9800d 100644
--- a/config/field.field.guideline.field_guideline.field_links.yml
+++ b/config/field.field.guideline.field_guideline.field_links.yml
@@ -18,6 +18,6 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  link_type: 17
   title: 1
+  link_type: 17
 field_type: link
diff --git a/config/field.field.media.file_report.field_media_file.yml b/config/field.field.media.file_report.field_media_file.yml
index 89f5ab334..d0ce4b1cd 100644
--- a/config/field.field.media.file_report.field_media_file.yml
+++ b/config/field.field.media.file_report.field_media_file.yml
@@ -18,10 +18,10 @@ translatable: true
 default_value: {  }
 default_value_callback: ''
 settings:
-  file_extensions: 'txt doc docx pdf'
+  handler: 'default:file'
+  handler_settings: {  }
   file_directory: '[date:custom:Y]-[date:custom:m]'
+  file_extensions: 'txt doc docx pdf'
   max_filesize: ''
   description_field: false
-  handler: 'default:file'
-  handler_settings: {  }
 field_type: file
diff --git a/config/field.field.media.image_announcement.field_media_image.yml b/config/field.field.media.image_announcement.field_media_image.yml
index 17905fda5..b2d3df338 100644
--- a/config/field.field.media.image_announcement.field_media_image.yml
+++ b/config/field.field.media.image_announcement.field_media_image.yml
@@ -25,6 +25,8 @@ translatable: true
 default_value: {  }
 default_value_callback: ''
 settings:
+  handler: 'default:file'
+  handler_settings: {  }
   file_directory: images/announcements
   file_extensions: 'png gif jpg jpeg'
   max_filesize: ''
@@ -40,6 +42,4 @@ settings:
     title: ''
     width: null
     height: null
-  handler: 'default:file'
-  handler_settings: {  }
 field_type: image
diff --git a/config/field.field.media.image_blog_post.field_media_image.yml b/config/field.field.media.image_blog_post.field_media_image.yml
index c9e6ca18b..3bffa3df8 100644
--- a/config/field.field.media.image_blog_post.field_media_image.yml
+++ b/config/field.field.media.image_blog_post.field_media_image.yml
@@ -25,6 +25,8 @@ translatable: true
 default_value: {  }
 default_value_callback: ''
 settings:
+  handler: 'default:file'
+  handler_settings: {  }
   file_directory: images/blog-posts
   file_extensions: 'png gif jpg jpeg'
   max_filesize: ''
@@ -40,6 +42,4 @@ settings:
     title: ''
     width: null
     height: null
-  handler: 'default:file'
-  handler_settings: {  }
 field_type: image
diff --git a/config/field.field.media.image_book.field_media_image.yml b/config/field.field.media.image_book.field_media_image.yml
index ec288f9d7..d3bc66413 100644
--- a/config/field.field.media.image_book.field_media_image.yml
+++ b/config/field.field.media.image_book.field_media_image.yml
@@ -25,6 +25,8 @@ translatable: true
 default_value: {  }
 default_value_callback: ''
 settings:
+  handler: 'default:file'
+  handler_settings: {  }
   file_directory: images/book-pages
   file_extensions: 'png gif jpg jpeg'
   max_filesize: ''
@@ -40,6 +42,4 @@ settings:
     title: ''
     width: null
     height: null
-  handler: 'default:file'
-  handler_settings: {  }
 field_type: image
diff --git a/config/field.field.media.image_report.field_media_image.yml b/config/field.field.media.image_report.field_media_image.yml
index 817f4432e..97dd2a856 100644
--- a/config/field.field.media.image_report.field_media_image.yml
+++ b/config/field.field.media.image_report.field_media_image.yml
@@ -25,6 +25,8 @@ translatable: true
 default_value: {  }
 default_value_callback: ''
 settings:
+  handler: 'default:file'
+  handler_settings: {  }
   file_directory: images/reports
   file_extensions: 'png gif jpg jpeg'
   max_filesize: ''
@@ -40,6 +42,4 @@ settings:
     title: ''
     width: null
     height: null
-  handler: 'default:file'
-  handler_settings: {  }
 field_type: image
diff --git a/config/field.field.media.image_topic.field_media_image.yml b/config/field.field.media.image_topic.field_media_image.yml
index 84d6eed84..c05045d19 100644
--- a/config/field.field.media.image_topic.field_media_image.yml
+++ b/config/field.field.media.image_topic.field_media_image.yml
@@ -25,6 +25,8 @@ translatable: true
 default_value: {  }
 default_value_callback: ''
 settings:
+  handler: 'default:file'
+  handler_settings: {  }
   file_directory: images/topics
   file_extensions: 'png gif jpg jpeg svg'
   max_filesize: ''
@@ -40,6 +42,4 @@ settings:
     title: ''
     width: null
     height: null
-  handler: 'default:file'
-  handler_settings: {  }
 field_type: image
diff --git a/config/field.field.node.announcement.field_link.yml b/config/field.field.node.announcement.field_link.yml
index a8adbcd5d..e4a4bf510 100644
--- a/config/field.field.node.announcement.field_link.yml
+++ b/config/field.field.node.announcement.field_link.yml
@@ -18,6 +18,6 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  link_type: 17
   title: 0
+  link_type: 17
 field_type: link
diff --git a/config/field.field.node.training.field_link.yml b/config/field.field.node.training.field_link.yml
index 72ce2209c..3eb11723b 100644
--- a/config/field.field.node.training.field_link.yml
+++ b/config/field.field.node.training.field_link.yml
@@ -18,6 +18,6 @@ translatable: true
 default_value: {  }
 default_value_callback: ''
 settings:
-  link_type: 16
   title: 0
+  link_type: 16
 field_type: link
diff --git a/config/field.field.taxonomy_term.source.field_homepage.yml b/config/field.field.taxonomy_term.source.field_homepage.yml
index 58c0776a7..0609de235 100644
--- a/config/field.field.taxonomy_term.source.field_homepage.yml
+++ b/config/field.field.taxonomy_term.source.field_homepage.yml
@@ -18,6 +18,6 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  link_type: 16
   title: 0
+  link_type: 16
 field_type: link
diff --git a/config/field.field.taxonomy_term.source.field_job_import_feed_url.yml b/config/field.field.taxonomy_term.source.field_job_import_feed_url.yml
index 579f8f06c..ae9e1f62f 100644
--- a/config/field.field.taxonomy_term.source.field_job_import_feed_url.yml
+++ b/config/field.field.taxonomy_term.source.field_job_import_feed_url.yml
@@ -18,6 +18,6 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  link_type: 16
   title: 2
+  link_type: 16
 field_type: link
diff --git a/config/field.field.taxonomy_term.source.field_links.yml b/config/field.field.taxonomy_term.source.field_links.yml
index f48ffd4ef..d2a62879f 100644
--- a/config/field.field.taxonomy_term.source.field_links.yml
+++ b/config/field.field.taxonomy_term.source.field_links.yml
@@ -18,6 +18,6 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  link_type: 16
   title: 0
+  link_type: 16
 field_type: link
diff --git a/config/field.field.taxonomy_term.source.field_logo.yml b/config/field.field.taxonomy_term.source.field_logo.yml
index 429971cdc..5b68a406f 100644
--- a/config/field.field.taxonomy_term.source.field_logo.yml
+++ b/config/field.field.taxonomy_term.source.field_logo.yml
@@ -18,6 +18,8 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
+  handler: 'default:file'
+  handler_settings: {  }
   file_directory: organization-logos
   file_extensions: 'png gif jpg jpeg'
   max_filesize: ''
@@ -33,6 +35,4 @@ settings:
     title: ''
     width: null
     height: null
-  handler: 'default:file'
-  handler_settings: {  }
 field_type: image
diff --git a/config/field.settings.yml b/config/field.settings.yml
index 95c042d77..2225b8ffd 100644
--- a/config/field.settings.yml
+++ b/config/field.settings.yml
@@ -1,3 +1,3 @@
-purge_batch_size: 50
 _core:
   default_config_hash: nJk0TAQBzlNo52ehiHI7bIEPLGi0BYqZvPdEn7Chfu0
+purge_batch_size: 50
diff --git a/config/field.storage.guideline.field_images.yml b/config/field.storage.guideline.field_images.yml
index e4b15efe9..469e39b6a 100644
--- a/config/field.storage.guideline.field_images.yml
+++ b/config/field.storage.guideline.field_images.yml
@@ -11,6 +11,9 @@ field_name: field_images
 entity_type: guideline
 type: image
 settings:
+  target_type: file
+  display_field: false
+  display_default: false
   uri_scheme: public
   default_image:
     uuid: ''
@@ -18,9 +21,6 @@ settings:
     title: ''
     width: null
     height: null
-  target_type: file
-  display_field: false
-  display_default: false
 module: image
 locked: false
 cardinality: -1
diff --git a/config/field.storage.guideline.field_short_link.yml b/config/field.storage.guideline.field_short_link.yml
index 9fb0edc86..9988ec3d8 100644
--- a/config/field.storage.guideline.field_short_link.yml
+++ b/config/field.storage.guideline.field_short_link.yml
@@ -10,8 +10,8 @@ entity_type: guideline
 type: string
 settings:
   max_length: 255
-  is_ascii: false
   case_sensitive: false
+  is_ascii: false
 module: core
 locked: false
 cardinality: 1
diff --git a/config/field.storage.guideline.field_title.yml b/config/field.storage.guideline.field_title.yml
index 14d2a5bd3..83821c3e7 100644
--- a/config/field.storage.guideline.field_title.yml
+++ b/config/field.storage.guideline.field_title.yml
@@ -10,8 +10,8 @@ entity_type: guideline
 type: string
 settings:
   max_length: 255
-  is_ascii: false
   case_sensitive: false
+  is_ascii: false
 module: core
 locked: false
 cardinality: 1
diff --git a/config/field.storage.media.field_copyright.yml b/config/field.storage.media.field_copyright.yml
index 516700bae..38a617965 100644
--- a/config/field.storage.media.field_copyright.yml
+++ b/config/field.storage.media.field_copyright.yml
@@ -10,8 +10,8 @@ entity_type: media
 type: string
 settings:
   max_length: 512
-  is_ascii: false
   case_sensitive: false
+  is_ascii: false
 module: core
 locked: false
 cardinality: 1
diff --git a/config/field.storage.media.field_description.yml b/config/field.storage.media.field_description.yml
index c18fa99dc..3518a78e9 100644
--- a/config/field.storage.media.field_description.yml
+++ b/config/field.storage.media.field_description.yml
@@ -10,8 +10,8 @@ entity_type: media
 type: string
 settings:
   max_length: 1024
-  is_ascii: false
   case_sensitive: false
+  is_ascii: false
 module: core
 locked: false
 cardinality: 1
diff --git a/config/field.storage.media.field_media_image.yml b/config/field.storage.media.field_media_image.yml
index 82a84b3df..fea2c2dd2 100644
--- a/config/field.storage.media.field_media_image.yml
+++ b/config/field.storage.media.field_media_image.yml
@@ -11,16 +11,16 @@ field_name: field_media_image
 entity_type: media
 type: image
 settings:
+  target_type: file
+  display_field: false
+  display_default: false
+  uri_scheme: public
   default_image:
     uuid: null
     alt: ''
     title: ''
     width: null
     height: null
-  target_type: file
-  display_field: false
-  display_default: false
-  uri_scheme: public
 module: image
 locked: false
 cardinality: 1
diff --git a/config/field.storage.node.field_author.yml b/config/field.storage.node.field_author.yml
index 907317c4a..d178e036a 100644
--- a/config/field.storage.node.field_author.yml
+++ b/config/field.storage.node.field_author.yml
@@ -10,8 +10,8 @@ entity_type: node
 type: string
 settings:
   max_length: 255
-  is_ascii: false
   case_sensitive: false
+  is_ascii: false
 module: core
 locked: false
 cardinality: 1
diff --git a/config/field.storage.node.field_city.yml b/config/field.storage.node.field_city.yml
index d81ba55c4..1c997e91d 100644
--- a/config/field.storage.node.field_city.yml
+++ b/config/field.storage.node.field_city.yml
@@ -10,8 +10,8 @@ entity_type: node
 type: string
 settings:
   max_length: 255
-  is_ascii: false
   case_sensitive: false
+  is_ascii: false
 module: core
 locked: false
 cardinality: 1
diff --git a/config/field.storage.node.field_headline_title.yml b/config/field.storage.node.field_headline_title.yml
index 0773a5d1d..0ecae4920 100644
--- a/config/field.storage.node.field_headline_title.yml
+++ b/config/field.storage.node.field_headline_title.yml
@@ -10,8 +10,8 @@ entity_type: node
 type: string
 settings:
   max_length: 255
-  is_ascii: false
   case_sensitive: false
+  is_ascii: false
 module: core
 locked: false
 cardinality: 1
diff --git a/config/field.storage.node.field_job_id.yml b/config/field.storage.node.field_job_id.yml
index fe35f8282..d5d4ec3af 100644
--- a/config/field.storage.node.field_job_id.yml
+++ b/config/field.storage.node.field_job_id.yml
@@ -10,8 +10,8 @@ entity_type: node
 type: string
 settings:
   max_length: 255
-  is_ascii: false
   case_sensitive: false
+  is_ascii: false
 module: core
 locked: false
 cardinality: 1
diff --git a/config/field.storage.node.field_origin_notes.yml b/config/field.storage.node.field_origin_notes.yml
index c7144b393..eca4448a5 100644
--- a/config/field.storage.node.field_origin_notes.yml
+++ b/config/field.storage.node.field_origin_notes.yml
@@ -10,8 +10,8 @@ entity_type: node
 type: string
 settings:
   max_length: 1024
-  is_ascii: false
   case_sensitive: false
+  is_ascii: false
 module: core
 locked: false
 cardinality: 1
diff --git a/config/field.storage.taxonomy_term.field_disaster_type_code.yml b/config/field.storage.taxonomy_term.field_disaster_type_code.yml
index 387559adb..f56c68732 100644
--- a/config/field.storage.taxonomy_term.field_disaster_type_code.yml
+++ b/config/field.storage.taxonomy_term.field_disaster_type_code.yml
@@ -10,8 +10,8 @@ entity_type: taxonomy_term
 type: string
 settings:
   max_length: 2
-  is_ascii: false
   case_sensitive: false
+  is_ascii: false
 module: core
 locked: false
 cardinality: 1
diff --git a/config/field.storage.taxonomy_term.field_fts_id.yml b/config/field.storage.taxonomy_term.field_fts_id.yml
index 135819299..5a0f898fd 100644
--- a/config/field.storage.taxonomy_term.field_fts_id.yml
+++ b/config/field.storage.taxonomy_term.field_fts_id.yml
@@ -10,8 +10,8 @@ entity_type: taxonomy_term
 type: string
 settings:
   max_length: 255
-  is_ascii: false
   case_sensitive: false
+  is_ascii: false
 module: core
 locked: false
 cardinality: 1
diff --git a/config/field.storage.taxonomy_term.field_glide.yml b/config/field.storage.taxonomy_term.field_glide.yml
index 01923fe7b..dc0036952 100644
--- a/config/field.storage.taxonomy_term.field_glide.yml
+++ b/config/field.storage.taxonomy_term.field_glide.yml
@@ -10,8 +10,8 @@ entity_type: taxonomy_term
 type: string
 settings:
   max_length: 20
-  is_ascii: false
   case_sensitive: false
+  is_ascii: false
 module: core
 locked: false
 cardinality: 1
diff --git a/config/field.storage.taxonomy_term.field_iso3.yml b/config/field.storage.taxonomy_term.field_iso3.yml
index 78a827a55..becd8eb5c 100644
--- a/config/field.storage.taxonomy_term.field_iso3.yml
+++ b/config/field.storage.taxonomy_term.field_iso3.yml
@@ -10,8 +10,8 @@ entity_type: taxonomy_term
 type: string
 settings:
   max_length: 3
-  is_ascii: false
   case_sensitive: false
+  is_ascii: false
 module: core
 locked: false
 cardinality: 1
diff --git a/config/field.storage.taxonomy_term.field_language_code.yml b/config/field.storage.taxonomy_term.field_language_code.yml
index cc3550fbd..04eee3e2d 100644
--- a/config/field.storage.taxonomy_term.field_language_code.yml
+++ b/config/field.storage.taxonomy_term.field_language_code.yml
@@ -10,8 +10,8 @@ entity_type: taxonomy_term
 type: string
 settings:
   max_length: 2
-  is_ascii: false
   case_sensitive: false
+  is_ascii: false
 module: core
 locked: false
 cardinality: 1
diff --git a/config/field.storage.taxonomy_term.field_logo.yml b/config/field.storage.taxonomy_term.field_logo.yml
index 570257588..204a480c0 100644
--- a/config/field.storage.taxonomy_term.field_logo.yml
+++ b/config/field.storage.taxonomy_term.field_logo.yml
@@ -11,6 +11,9 @@ field_name: field_logo
 entity_type: taxonomy_term
 type: image
 settings:
+  target_type: file
+  display_field: false
+  display_default: false
   uri_scheme: public
   default_image:
     uuid: ''
@@ -18,9 +21,6 @@ settings:
     title: ''
     width: null
     height: null
-  target_type: file
-  display_field: false
-  display_default: false
 module: image
 locked: false
 cardinality: 1
diff --git a/config/field.storage.taxonomy_term.field_longname.yml b/config/field.storage.taxonomy_term.field_longname.yml
index c3295a43e..36010d7a9 100644
--- a/config/field.storage.taxonomy_term.field_longname.yml
+++ b/config/field.storage.taxonomy_term.field_longname.yml
@@ -10,8 +10,8 @@ entity_type: taxonomy_term
 type: string
 settings:
   max_length: 255
-  is_ascii: false
   case_sensitive: false
+  is_ascii: false
 module: core
 locked: false
 cardinality: 1
diff --git a/config/field.storage.taxonomy_term.field_shortname.yml b/config/field.storage.taxonomy_term.field_shortname.yml
index 7206b1a95..c178fc9af 100644
--- a/config/field.storage.taxonomy_term.field_shortname.yml
+++ b/config/field.storage.taxonomy_term.field_shortname.yml
@@ -10,8 +10,8 @@ entity_type: taxonomy_term
 type: string
 settings:
   max_length: 255
-  is_ascii: false
   case_sensitive: false
+  is_ascii: false
 module: core
 locked: false
 cardinality: 1
diff --git a/config/field.storage.taxonomy_term.field_spanish_name.yml b/config/field.storage.taxonomy_term.field_spanish_name.yml
index e82b8aed7..3fa0e91f1 100644
--- a/config/field.storage.taxonomy_term.field_spanish_name.yml
+++ b/config/field.storage.taxonomy_term.field_spanish_name.yml
@@ -10,8 +10,8 @@ entity_type: taxonomy_term
 type: string
 settings:
   max_length: 255
-  is_ascii: false
   case_sensitive: false
+  is_ascii: false
 module: core
 locked: false
 cardinality: 1
diff --git a/config/field_ui.settings.yml b/config/field_ui.settings.yml
index 274396991..365450f25 100644
--- a/config/field_ui.settings.yml
+++ b/config/field_ui.settings.yml
@@ -1,3 +1,3 @@
-field_prefix: field_
 _core:
   default_config_hash: Q1nMi90W6YQxKzZAgJQw7Ag9U4JrsEUwkomF0lhvbIM
+field_prefix: field_
diff --git a/config/file.settings.yml b/config/file.settings.yml
index 33151657d..1ca5bd99c 100644
--- a/config/file.settings.yml
+++ b/config/file.settings.yml
@@ -1,8 +1,8 @@
+_core:
+  default_config_hash: 0aMkoXYnax5_tHI9C9zHs-K48KJ6K75PHtD9x-0nbgM
 description:
   type: textfield
   length: 128
 icon:
   directory: core/modules/file/icons
 make_unused_managed_files_temporary: false
-_core:
-  default_config_hash: 0aMkoXYnax5_tHI9C9zHs-K48KJ6K75PHtD9x-0nbgM
diff --git a/config/filter.format.guideline.yml b/config/filter.format.guideline.yml
index 535293692..ecbb3096e 100644
--- a/config/filter.format.guideline.yml
+++ b/config/filter.format.guideline.yml
@@ -9,15 +9,6 @@ name: Guideline
 format: guideline
 weight: 0
 filters:
-  media_embed:
-    id: media_embed
-    provider: media
-    status: false
-    weight: 100
-    settings:
-      default_view_mode: default
-      allowed_media_types: {  }
-      allowed_view_modes: {  }
   reliefweb_token_filter:
     id: reliefweb_token_filter
     provider: reliefweb_utility
diff --git a/config/filter.format.html.yml b/config/filter.format.html.yml
index 5fcc4ce83..97ac806bd 100644
--- a/config/filter.format.html.yml
+++ b/config/filter.format.html.yml
@@ -31,8 +31,8 @@ filters:
     weight: -41
     settings:
       default_view_mode: default
-      allowed_media_types: {  }
       allowed_view_modes: {  }
+      allowed_media_types: {  }
   filter_align:
     id: filter_align
     provider: filter
diff --git a/config/filter.format.markdown.yml b/config/filter.format.markdown.yml
index d2aeb830c..3c9b3f296 100644
--- a/config/filter.format.markdown.yml
+++ b/config/filter.format.markdown.yml
@@ -31,8 +31,8 @@ filters:
     weight: -41
     settings:
       default_view_mode: default
-      allowed_media_types: {  }
       allowed_view_modes: {  }
+      allowed_media_types: {  }
   filter_align:
     id: filter_align
     provider: filter
diff --git a/config/filter.settings.yml b/config/filter.settings.yml
index dfcfed362..9ce293937 100644
--- a/config/filter.settings.yml
+++ b/config/filter.settings.yml
@@ -1,4 +1,4 @@
-fallback_format: plain_text
-always_show_fallback_choice: false
 _core:
   default_config_hash: FiPjM3WdB__ruFA7B6TLwni_UcZbmek5G4b2dxQItxA
+fallback_format: plain_text
+always_show_fallback_choice: false
diff --git a/config/google_tag.settings.yml b/config/google_tag.settings.yml
index f9dbb0fe6..87516bc20 100644
--- a/config/google_tag.settings.yml
+++ b/config/google_tag.settings.yml
@@ -1,3 +1,5 @@
+_core:
+  default_config_hash: 65d5DfK5p2hQDpBskbvCIj2hSEqw_Odm2e_d46BH1Lk
 uri: 'public:/'
 compact_snippet: true
 include_file: true
@@ -6,6 +8,19 @@ flush_snippets: false
 debug_output: false
 _default_container:
   container_id: ''
+  data_layer: dataLayer
+  include_classes: false
+  whitelist_classes: |-
+    google
+    nonGooglePixels
+    nonGoogleScripts
+    nonGoogleIframes
+  blacklist_classes: |-
+    customScripts
+    customPixels
+  include_environment: false
+  environment_id: ''
+  environment_token: ''
   path_toggle: 'exclude listed'
   path_list: |-
     /admin*
@@ -20,19 +35,4 @@ _default_container:
   status_toggle: 'exclude listed'
   status_list: |-
     403
-    404
-  data_layer: dataLayer
-  include_classes: false
-  whitelist_classes: |-
-    google
-    nonGooglePixels
-    nonGoogleScripts
-    nonGoogleIframes
-  blacklist_classes: |-
-    customScripts
-    customPixels
-  include_environment: false
-  environment_id: ''
-  environment_token: ''
-_core:
-  default_config_hash: 65d5DfK5p2hQDpBskbvCIj2hSEqw_Odm2e_d46BH1Lk
+    404
\ No newline at end of file
diff --git a/config/image.settings.yml b/config/image.settings.yml
index 52ee4a8f4..b75749097 100644
--- a/config/image.settings.yml
+++ b/config/image.settings.yml
@@ -1,5 +1,5 @@
+_core:
+  default_config_hash: k-yDFHbqNfpe-Srg4sdCSqaosCl2D8uwyEY5esF8gEw
 preview_image: core/modules/image/sample.png
 allow_insecure_derivatives: false
 suppress_itok_output: false
-_core:
-  default_config_hash: k-yDFHbqNfpe-Srg4sdCSqaosCl2D8uwyEY5esF8gEw
diff --git a/config/imageapi_optimize.pipeline.local_binaries.yml b/config/imageapi_optimize.pipeline.local_binaries.yml
index c6c469389..b8e7243cd 100644
--- a/config/imageapi_optimize.pipeline.local_binaries.yml
+++ b/config/imageapi_optimize.pipeline.local_binaries.yml
@@ -10,70 +10,70 @@ name: local_binaries
 label: 'Local Binaries'
 processors:
   ad260c90-e845-452d-b5dd-d20d9db687fe:
-    uuid: ad260c90-e845-452d-b5dd-d20d9db687fe
     id: advdef
-    weight: 1
     data:
       manual_executable_path: ''
       recompress: false
       mode: 3
+    weight: 1
+    uuid: ad260c90-e845-452d-b5dd-d20d9db687fe
   0a8a85c1-2ccc-4cde-844c-97a7588f006c:
-    uuid: 0a8a85c1-2ccc-4cde-844c-97a7588f006c
     id: advpng
-    weight: 2
     data:
       manual_executable_path: ''
       recompress: false
       mode: 3
+    weight: 2
+    uuid: 0a8a85c1-2ccc-4cde-844c-97a7588f006c
   2987bbcc-6a38-4c82-a9f5-86df39c67935:
-    uuid: 2987bbcc-6a38-4c82-a9f5-86df39c67935
     id: jfifremove
-    weight: 3
     data:
       manual_executable_path: ''
+    weight: 3
+    uuid: 2987bbcc-6a38-4c82-a9f5-86df39c67935
   2c1a727a-d7d5-4355-842a-519554d46647:
-    uuid: 2c1a727a-d7d5-4355-842a-519554d46647
     id: jpegoptim
-    weight: 4
     data:
       manual_executable_path: ''
       progressive: null
       quality: null
       size: null
+    weight: 4
+    uuid: 2c1a727a-d7d5-4355-842a-519554d46647
   74c9f4a7-e5c8-4ddd-8698-4d940f73fea9:
-    uuid: 74c9f4a7-e5c8-4ddd-8698-4d940f73fea9
     id: jpegtran
-    weight: 5
     data:
       manual_executable_path: ''
       progressive: false
+    weight: 5
+    uuid: 74c9f4a7-e5c8-4ddd-8698-4d940f73fea9
   fb380dd6-14f0-4b5f-8615-1ed40147ae17:
-    uuid: fb380dd6-14f0-4b5f-8615-1ed40147ae17
     id: optipng
-    weight: 6
     data:
       manual_executable_path: ''
-      level: 5
       interlace: null
+      level: 5
+    weight: 6
+    uuid: fb380dd6-14f0-4b5f-8615-1ed40147ae17
   f1390b39-5a83-46a5-ba88-4f671ee0e941:
-    uuid: f1390b39-5a83-46a5-ba88-4f671ee0e941
     id: pngcrush
-    weight: 7
     data:
       manual_executable_path: ''
+    weight: 7
+    uuid: f1390b39-5a83-46a5-ba88-4f671ee0e941
   f8156232-0825-4655-9d53-5333120387df:
-    uuid: f8156232-0825-4655-9d53-5333120387df
     id: pngout
-    weight: 8
     data:
       manual_executable_path: ''
+    weight: 8
+    uuid: f8156232-0825-4655-9d53-5333120387df
   7645ce49-49f7-4a53-a781-4c7929e7d11c:
-    uuid: 7645ce49-49f7-4a53-a781-4c7929e7d11c
     id: pngquant
-    weight: 9
     data:
       manual_executable_path: ''
       speed: 3
       quality:
         min: 90
         max: 99
+    weight: 9
+    uuid: 7645ce49-49f7-4a53-a781-4c7929e7d11c
diff --git a/config/imageapi_optimize.settings.yml b/config/imageapi_optimize.settings.yml
index a8ec832fd..afddbaefe 100644
--- a/config/imageapi_optimize.settings.yml
+++ b/config/imageapi_optimize.settings.yml
@@ -1,3 +1,3 @@
-default_pipeline: local_binaries
 _core:
   default_config_hash: MTm0uqe2B71zGYpOt10vRcS7pf9m92Yy2P4cnTXbSR0
+default_pipeline: local_binaries
diff --git a/config/language.mappings.yml b/config/language.mappings.yml
index 96ee03bd7..bdfaae28d 100644
--- a/config/language.mappings.yml
+++ b/config/language.mappings.yml
@@ -1,3 +1,5 @@
+_core:
+  default_config_hash: EMWe7Yu4Q5eD-NUfNuQAWGBvYUNZPIinztEtONSmsDc
 map:
   'no': nb
   pt: pt-pt
@@ -9,5 +11,3 @@ map:
   zh-cn: zh-hans
   zh-sg: zh-hans
   zh-chs: zh-hans
-_core:
-  default_config_hash: EMWe7Yu4Q5eD-NUfNuQAWGBvYUNZPIinztEtONSmsDc
diff --git a/config/language.negotiation.yml b/config/language.negotiation.yml
index afcf540df..eb24579fa 100644
--- a/config/language.negotiation.yml
+++ b/config/language.negotiation.yml
@@ -1,3 +1,5 @@
+_core:
+  default_config_hash: uEePITI9tV6WqzmsTb7MfPCi5yPWXSxAN1xeLcYFQbM
 session:
   parameter: language
 url:
@@ -8,5 +10,3 @@ url:
   domains:
     en: ''
 selected_langcode: site_default
-_core:
-  default_config_hash: uEePITI9tV6WqzmsTb7MfPCi5yPWXSxAN1xeLcYFQbM
diff --git a/config/language.types.yml b/config/language.types.yml
index 96952d9c1..1808f38c2 100644
--- a/config/language.types.yml
+++ b/config/language.types.yml
@@ -1,3 +1,5 @@
+_core:
+  default_config_hash: dqouFqVseNJNvEjsoYKxbinFOITuCxYhi4y2OTNQP_8
 all:
   - language_interface
   - language_content
@@ -15,5 +17,3 @@ negotiation:
   language_interface:
     enabled:
       language-url: 0
-_core:
-  default_config_hash: dqouFqVseNJNvEjsoYKxbinFOITuCxYhi4y2OTNQP_8
diff --git a/config/locale.settings.yml b/config/locale.settings.yml
index cd1ac5151..970cc15e6 100644
--- a/config/locale.settings.yml
+++ b/config/locale.settings.yml
@@ -1,3 +1,5 @@
+_core:
+  default_config_hash: cSdYeE-_AQETCNZnl8BMFS9-sVn5--VzAYILkpPBUbM
 cache_strings: true
 translate_english: false
 javascript:
@@ -11,5 +13,3 @@ translation:
   update_interval_days: 0
   path: sites/default/files/translations
   import_enabled: true
-_core:
-  default_config_hash: cSdYeE-_AQETCNZnl8BMFS9-sVn5--VzAYILkpPBUbM
diff --git a/config/mailsystem.settings.yml b/config/mailsystem.settings.yml
index 71f789325..44dafb065 100644
--- a/config/mailsystem.settings.yml
+++ b/config/mailsystem.settings.yml
@@ -1,6 +1,6 @@
+_core:
+  default_config_hash: IhwTepsVwtbtbcT5GzQKhCXDCRvbk3MNkWqPiuiZ10s
 theme: common_design_subtheme
 defaults:
   sender: php_mail
   formatter: mime_mail
-_core:
-  default_config_hash: IhwTepsVwtbtbcT5GzQKhCXDCRvbk3MNkWqPiuiZ10s
diff --git a/config/maintenance200.settings.yml b/config/maintenance200.settings.yml
index af3ecf704..7a87bb927 100644
--- a/config/maintenance200.settings.yml
+++ b/config/maintenance200.settings.yml
@@ -1,4 +1,4 @@
-maintenance200_enabled: 1
-maintenance200_status_code: 200
 _core:
   default_config_hash: rr5HdOPJpHAL-TZJoY9Bm6h0O4Tbls1Jc6twt0A-wBc
+maintenance200_enabled: 1
+maintenance200_status_code: 200
diff --git a/config/media.settings.yml b/config/media.settings.yml
index 27467c0b3..fd32318b2 100644
--- a/config/media.settings.yml
+++ b/config/media.settings.yml
@@ -1,6 +1,6 @@
+_core:
+  default_config_hash: PlWtVQXY5oKYZqCMPXh6SPamXagn5BoZqgAI8EY9WsY
 icon_base_uri: 'public://media-icons/generic'
 iframe_domain: ''
 oembed_providers_url: 'https://oembed.com/providers.json'
 standalone_url: false
-_core:
-  default_config_hash: PlWtVQXY5oKYZqCMPXh6SPamXagn5BoZqgAI8EY9WsY
diff --git a/config/media_library.settings.yml b/config/media_library.settings.yml
index 62ce1ed48..3a1479aa7 100644
--- a/config/media_library.settings.yml
+++ b/config/media_library.settings.yml
@@ -1,3 +1,3 @@
-advanced_ui: false
 _core:
   default_config_hash: _3gQsCnZELUjUUqHk8SSh8bXnx7TZwN95vctAeVJG60
+advanced_ui: false
diff --git a/config/menu_ui.settings.yml b/config/menu_ui.settings.yml
index c9fe099e7..0b987fa3b 100644
--- a/config/menu_ui.settings.yml
+++ b/config/menu_ui.settings.yml
@@ -1,3 +1,3 @@
-override_parent_selector: false
 _core:
   default_config_hash: SqMarzIjxC3F8dZo9FEOxfqDKD_sdW1tbcFTV1BA2zU
+override_parent_selector: false
diff --git a/config/mimemail.settings.yml b/config/mimemail.settings.yml
index e64c1640f..191bd3d6c 100644
--- a/config/mimemail.settings.yml
+++ b/config/mimemail.settings.yml
@@ -1,13 +1,13 @@
-format: html
+_core:
+  default_config_hash: rLKGzzC9TqjbEZiBoiyMpOSyZgldADa5SzvbA2gQDxE
 name: ReliefWeb
 mail: admin@reliefweb.int
-linkonly: false
-textonly: false
-sitestyle: true
 simple_address: false
+sitestyle: true
+textonly: false
+linkonly: false
+format: html
 preserve_class: false
 advanced:
   incoming: false
   key: CFDxUu_9yazjn2xMq4S7MgFHeDGnZ6WahqWlpa5YQJI
-_core:
-  default_config_hash: rLKGzzC9TqjbEZiBoiyMpOSyZgldADa5SzvbA2gQDxE
diff --git a/config/node.settings.yml b/config/node.settings.yml
index b65cead43..3a9d97ee0 100644
--- a/config/node.settings.yml
+++ b/config/node.settings.yml
@@ -1,3 +1,3 @@
-use_admin_theme: false
 _core:
   default_config_hash: 2OMXCScXUOLSYID9-phjO4q36nnnaMWNUlDxEqZzG1U
+use_admin_theme: false
diff --git a/config/node.type.book.yml b/config/node.type.book.yml
index d6ef648e6..e945b34c8 100644
--- a/config/node.type.book.yml
+++ b/config/node.type.book.yml
@@ -2,11 +2,11 @@ uuid: c0b66caf-3c4f-4490-8232-f232debe314a
 langcode: en
 status: true
 dependencies:
+  module:
+    - menu_ui
   enforced:
     module:
       - book
-  module:
-    - menu_ui
 third_party_settings:
   menu_ui:
     available_menus: {  }
diff --git a/config/pathauto.pattern.blog_post.yml b/config/pathauto.pattern.blog_post.yml
index eb16451d9..7bc4fed00 100644
--- a/config/pathauto.pattern.blog_post.yml
+++ b/config/pathauto.pattern.blog_post.yml
@@ -11,12 +11,12 @@ pattern: 'blogpost/[node:title]'
 selection_criteria:
   6e9d3879-0e75-4d7d-bcdb-957a0aff6353:
     id: node_type
-    bundles:
-      blog_post: blog_post
     negate: false
+    uuid: 6e9d3879-0e75-4d7d-bcdb-957a0aff6353
     context_mapping:
       node: node
-    uuid: 6e9d3879-0e75-4d7d-bcdb-957a0aff6353
+    bundles:
+      blog_post: blog_post
 selection_logic: and
 weight: -10
 relationships: {  }
diff --git a/config/pathauto.pattern.book_page.yml b/config/pathauto.pattern.book_page.yml
index 25c3814a2..56a1d7bc3 100644
--- a/config/pathauto.pattern.book_page.yml
+++ b/config/pathauto.pattern.book_page.yml
@@ -11,12 +11,12 @@ pattern: '[node:title]'
 selection_criteria:
   3db763c8-2879-4d9f-8bc8-35cbb0c2a8c2:
     id: node_type
-    bundles:
-      book: book
     negate: false
+    uuid: 3db763c8-2879-4d9f-8bc8-35cbb0c2a8c2
     context_mapping:
       node: node
-    uuid: 3db763c8-2879-4d9f-8bc8-35cbb0c2a8c2
+    bundles:
+      book: book
 selection_logic: and
 weight: -9
 relationships: {  }
diff --git a/config/pathauto.pattern.country.yml b/config/pathauto.pattern.country.yml
index 4d328ecfb..2c077a50d 100644
--- a/config/pathauto.pattern.country.yml
+++ b/config/pathauto.pattern.country.yml
@@ -12,12 +12,12 @@ pattern: 'country/[term:field_iso3]'
 selection_criteria:
   93afc822-1fd3-4ad1-a44b-e5e0068e0016:
     id: 'entity_bundle:taxonomy_term'
-    bundles:
-      country: country
     negate: false
+    uuid: 93afc822-1fd3-4ad1-a44b-e5e0068e0016
     context_mapping:
       taxonomy_term: taxonomy_term
-    uuid: 93afc822-1fd3-4ad1-a44b-e5e0068e0016
+    bundles:
+      country: country
 selection_logic: and
 weight: -4
 relationships: {  }
diff --git a/config/pathauto.pattern.disaster.yml b/config/pathauto.pattern.disaster.yml
index bc53fc401..aea88b90d 100644
--- a/config/pathauto.pattern.disaster.yml
+++ b/config/pathauto.pattern.disaster.yml
@@ -12,12 +12,12 @@ pattern: 'disaster/[term:field_glide]'
 selection_criteria:
   3366e40d-d392-435b-aea7-6cfdeae0811b:
     id: 'entity_bundle:taxonomy_term'
-    bundles:
-      disaster: disaster
     negate: false
+    uuid: 3366e40d-d392-435b-aea7-6cfdeae0811b
     context_mapping:
       taxonomy_term: taxonomy_term
-    uuid: 3366e40d-d392-435b-aea7-6cfdeae0811b
+    bundles:
+      disaster: disaster
 selection_logic: and
 weight: -3
 relationships: {  }
diff --git a/config/pathauto.pattern.job.yml b/config/pathauto.pattern.job.yml
index 6d64c2cf9..c0f397b2a 100644
--- a/config/pathauto.pattern.job.yml
+++ b/config/pathauto.pattern.job.yml
@@ -11,12 +11,12 @@ pattern: 'job/[node:nid]/[node:title]'
 selection_criteria:
   140bd801-78ac-4a99-8477-c5d2ce4e73d6:
     id: node_type
-    bundles:
-      job: job
     negate: false
+    uuid: 140bd801-78ac-4a99-8477-c5d2ce4e73d6
     context_mapping:
       node: node
-    uuid: 140bd801-78ac-4a99-8477-c5d2ce4e73d6
+    bundles:
+      job: job
 selection_logic: and
 weight: -8
 relationships: {  }
diff --git a/config/pathauto.pattern.report.yml b/config/pathauto.pattern.report.yml
index 002d3be35..972a09f92 100644
--- a/config/pathauto.pattern.report.yml
+++ b/config/pathauto.pattern.report.yml
@@ -11,12 +11,12 @@ pattern: '[node:reliefweb-content-type]/[node:field_primary_country:entity:name]
 selection_criteria:
   cac24841-112a-498c-92d9-845c71da29f6:
     id: node_type
-    bundles:
-      report: report
     negate: false
+    uuid: cac24841-112a-498c-92d9-845c71da29f6
     context_mapping:
       node: node
-    uuid: cac24841-112a-498c-92d9-845c71da29f6
+    bundles:
+      report: report
 selection_logic: and
 weight: -7
 relationships: {  }
diff --git a/config/pathauto.pattern.source.yml b/config/pathauto.pattern.source.yml
index a7f65c3ff..42637af0b 100644
--- a/config/pathauto.pattern.source.yml
+++ b/config/pathauto.pattern.source.yml
@@ -12,12 +12,12 @@ pattern: 'organization/[term:field_shortname]'
 selection_criteria:
   6ee5ca55-8fcc-4e01-a4b6-2b2f520e020a:
     id: 'entity_bundle:taxonomy_term'
-    bundles:
-      source: source
     negate: false
+    uuid: 6ee5ca55-8fcc-4e01-a4b6-2b2f520e020a
     context_mapping:
       taxonomy_term: taxonomy_term
-    uuid: 6ee5ca55-8fcc-4e01-a4b6-2b2f520e020a
+    bundles:
+      source: source
 selection_logic: and
 weight: -2
 relationships: {  }
diff --git a/config/pathauto.pattern.topic.yml b/config/pathauto.pattern.topic.yml
index 3e1698502..cec598766 100644
--- a/config/pathauto.pattern.topic.yml
+++ b/config/pathauto.pattern.topic.yml
@@ -11,12 +11,12 @@ pattern: 'topic/[node:title]'
 selection_criteria:
   ff97a756-5597-44b5-b955-edf1eac6d22e:
     id: node_type
-    bundles:
-      topic: topic
     negate: false
+    uuid: ff97a756-5597-44b5-b955-edf1eac6d22e
     context_mapping:
       node: node
-    uuid: ff97a756-5597-44b5-b955-edf1eac6d22e
+    bundles:
+      topic: topic
 selection_logic: and
 weight: -6
 relationships: {  }
diff --git a/config/pathauto.pattern.training.yml b/config/pathauto.pattern.training.yml
index 99ba45471..ff87292c8 100644
--- a/config/pathauto.pattern.training.yml
+++ b/config/pathauto.pattern.training.yml
@@ -11,12 +11,12 @@ pattern: 'training/[node:nid]/[node:title]'
 selection_criteria:
   5eabdf04-0f4f-4dd4-a921-2a506dae29b8:
     id: node_type
-    bundles:
-      training: training
     negate: false
+    uuid: 5eabdf04-0f4f-4dd4-a921-2a506dae29b8
     context_mapping:
       node: node
-    uuid: 5eabdf04-0f4f-4dd4-a921-2a506dae29b8
+    bundles:
+      training: training
 selection_logic: and
 weight: -5
 relationships: {  }
diff --git a/config/pathauto.settings.yml b/config/pathauto.settings.yml
index 34237a4e8..6fbd46ac7 100644
--- a/config/pathauto.settings.yml
+++ b/config/pathauto.settings.yml
@@ -1,3 +1,5 @@
+_core:
+  default_config_hash: SwvLp8snyPEExF41CaJJYdPUVomofLqtXvwciHc4cPg
 enabled_entity_types: {  }
 punctuation:
   double_quotes: 0
@@ -48,5 +50,3 @@ safe_tokens:
   - login-url
   - url
   - url-brief
-_core:
-  default_config_hash: SwvLp8snyPEExF41CaJJYdPUVomofLqtXvwciHc4cPg
diff --git a/config/redirect.settings.yml b/config/redirect.settings.yml
index 79c09c832..e3e647ab6 100644
--- a/config/redirect.settings.yml
+++ b/config/redirect.settings.yml
@@ -1,3 +1,5 @@
+_core:
+  default_config_hash: FEwQLW1wXW7fiJdG1B2bxW1c_-k6w-r-3V3bSsW6PqM
 auto_redirect: true
 default_status_code: 301
 passthrough_querystring: true
@@ -5,5 +7,3 @@ warning: false
 ignore_admin_path: false
 access_check: false
 route_normalizer_enabled: true
-_core:
-  default_config_hash: FEwQLW1wXW7fiJdG1B2bxW1c_-k6w-r-3V3bSsW6PqM
diff --git a/config/reliefweb_api.settings.yml b/config/reliefweb_api.settings.yml
index ce6336070..0bd4feae0 100644
--- a/config/reliefweb_api.settings.yml
+++ b/config/reliefweb_api.settings.yml
@@ -1,8 +1,8 @@
+_core:
+  default_config_hash: qlrFo79lCY4kxobmocSAnQRsAcqu3ikDmbm108-Brtw
 api_url: 'https://api.reliefweb.int/v1'
 api_url_external: 'https://api.reliefweb.int/v1'
 appname: reliefweb.int
 cache_enabled: true
 verify_ssl: true
 elasticsearch: 'http://elasticsearch:7200'
-_core:
-  default_config_hash: qlrFo79lCY4kxobmocSAnQRsAcqu3ikDmbm108-Brtw
diff --git a/config/reliefweb_revisions.settings.yml b/config/reliefweb_revisions.settings.yml
index 24c18d735..c129602df 100644
--- a/config/reliefweb_revisions.settings.yml
+++ b/config/reliefweb_revisions.settings.yml
@@ -1,3 +1,3 @@
-limit: 50
 _core:
   default_config_hash: AxbvUsmHwqt7iYNg5422eKvk4Mv5GFggh8W467BqwTk
+limit: 50
diff --git a/config/social_auth.settings.yml b/config/social_auth.settings.yml
index 10979a799..0d2fcbb6b 100644
--- a/config/social_auth.settings.yml
+++ b/config/social_auth.settings.yml
@@ -1,8 +1,11 @@
+_core:
+  default_config_hash: 0E8z47ONguVcapiw1PGWDRs6g0NRDCzrym4mP_jcELU
 auth:
   social_auth_hid:
     route: social_auth_hid.redirect_to_hid
     img_path: modules/contrib/social_auth_hid/img/hid_logo.png
 post_login: /user
+user_allowed: register
 redirect_user_form: false
 disable_admin_login: false
 disabled_roles:
@@ -12,6 +15,3 @@ disabled_roles:
   external_disaster_manager: '0'
   user_manager: '0'
   webmaster: '0'
-user_allowed: register
-_core:
-  default_config_hash: 0E8z47ONguVcapiw1PGWDRs6g0NRDCzrym4mP_jcELU
diff --git a/config/social_auth_hid.settings.yml b/config/social_auth_hid.settings.yml
index 851168d49..c6ba506da 100644
--- a/config/social_auth_hid.settings.yml
+++ b/config/social_auth_hid.settings.yml
@@ -1,11 +1,11 @@
+_core:
+  default_config_hash: B3_vC6x6B42V4R6M9ydwieDSue2W-7J4HLg2z9avqh8
+client_id: CLIENT_ID
+client_secret: SECRET
 base_url: 'https://auth.humanitarian.id'
 auto_redirect: true
 disable_default: true
 disable_password_fields: true
 disable_email_field: true
 disable_user_field: true
-_core:
-  default_config_hash: B3_vC6x6B42V4R6M9ydwieDSue2W-7J4HLg2z9avqh8
-client_id: CLIENT_ID
-client_secret: SECRET
 maintenance_access: false
diff --git a/config/syslog.settings.yml b/config/syslog.settings.yml
index 272f915ad..655f2e8a2 100644
--- a/config/syslog.settings.yml
+++ b/config/syslog.settings.yml
@@ -1,5 +1,5 @@
+_core:
+  default_config_hash: vdXLRPZRg35PBykBRRXr6RTql5EJR_fUi2kxyZ8c5m0
 identity: drupal
 facility: 128
 format: '!base_url|!timestamp|!type|!ip|!request_uri|!referer|!uid|!link|!message'
-_core:
-  default_config_hash: vdXLRPZRg35PBykBRRXr6RTql5EJR_fUi2kxyZ8c5m0
diff --git a/config/system.action.pathauto_update_alias_node.yml b/config/system.action.pathauto_update_alias_node.yml
index 2faa9209b..59a933e9d 100644
--- a/config/system.action.pathauto_update_alias_node.yml
+++ b/config/system.action.pathauto_update_alias_node.yml
@@ -2,11 +2,11 @@ uuid: e1f5cf45-3586-4fff-a525-e2b080387ba9
 langcode: en
 status: true
 dependencies:
+  module:
+    - pathauto
   enforced:
     module:
       - node
-  module:
-    - pathauto
 _core:
   default_config_hash: lno8QThS348UX-kaUsagJtCnuPHKLXYnTQiF_9HSDWA
 id: pathauto_update_alias_node
diff --git a/config/system.action.pathauto_update_alias_user.yml b/config/system.action.pathauto_update_alias_user.yml
index c5dfc32f6..035e38beb 100644
--- a/config/system.action.pathauto_update_alias_user.yml
+++ b/config/system.action.pathauto_update_alias_user.yml
@@ -2,11 +2,11 @@ uuid: ff5f3ecc-1bf0-4631-990c-25f1cf21069d
 langcode: en
 status: true
 dependencies:
+  module:
+    - pathauto
   enforced:
     module:
       - user
-  module:
-    - pathauto
 _core:
   default_config_hash: x_ok_ZsfA4Xk4B_hVW3O4-3PcNoK57nXLz_Dlletidg
 id: pathauto_update_alias_user
diff --git a/config/system.action.redirect_delete_action.yml b/config/system.action.redirect_delete_action.yml
index ff835afa5..dda681823 100644
--- a/config/system.action.redirect_delete_action.yml
+++ b/config/system.action.redirect_delete_action.yml
@@ -2,11 +2,11 @@ uuid: 5c1b14c2-103d-4a0c-b290-fcac96b95211
 langcode: en
 status: true
 dependencies:
+  module:
+    - redirect
   enforced:
     module:
       - redirect
-  module:
-    - redirect
 _core:
   default_config_hash: vcnRZRvBqTbK3nZ2M4_lKPlEGc8GjPzgaqapYUfyX8M
 id: redirect_delete_action
diff --git a/config/system.advisories.yml b/config/system.advisories.yml
index 154599917..bfdac8689 100644
--- a/config/system.advisories.yml
+++ b/config/system.advisories.yml
@@ -1,2 +1,2 @@
-interval_hours: 6
 enabled: true
+interval_hours: 6
diff --git a/config/system.authorize.yml b/config/system.authorize.yml
deleted file mode 100644
index c469caee1..000000000
--- a/config/system.authorize.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-filetransfer_default: null
-_core:
-  default_config_hash: z63ds8M4zPrylEgFRkRcOlfcsXWwfITzjD4cj1kRdfg
diff --git a/config/system.cron.yml b/config/system.cron.yml
index 6801fb591..49e58a00c 100644
--- a/config/system.cron.yml
+++ b/config/system.cron.yml
@@ -1,6 +1,6 @@
+_core:
+  default_config_hash: 5Pw921y1EPfFN98wykliBBLArm51pC-SmrXeYCe7d0Y
 threshold:
   requirements_warning: 172800
   requirements_error: 1209600
 logging: 1
-_core:
-  default_config_hash: 5Pw921y1EPfFN98wykliBBLArm51pC-SmrXeYCe7d0Y
diff --git a/config/system.date.yml b/config/system.date.yml
index 59acb7a45..0912337ab 100644
--- a/config/system.date.yml
+++ b/config/system.date.yml
@@ -1,11 +1,11 @@
+_core:
+  default_config_hash: V9UurX2GPT05NWKG9f2GWQqFG2TRG8vczidwjpy7Woo
+first_day: 0
 country:
   default: ''
-first_day: 0
 timezone:
   default: UTC
   user:
     configurable: true
-    warn: false
     default: 0
-_core:
-  default_config_hash: V9UurX2GPT05NWKG9f2GWQqFG2TRG8vczidwjpy7Woo
+    warn: false
diff --git a/config/system.diff.yml b/config/system.diff.yml
index c43dd916d..f2fff7b30 100644
--- a/config/system.diff.yml
+++ b/config/system.diff.yml
@@ -1,5 +1,5 @@
+_core:
+  default_config_hash: 1WanmaEhxW_vM8_5Ktsdntj8MaO9UBHXg0lN603PsWM
 context:
   lines_leading: 2
   lines_trailing: 2
-_core:
-  default_config_hash: 1WanmaEhxW_vM8_5Ktsdntj8MaO9UBHXg0lN603PsWM
diff --git a/config/system.file.yml b/config/system.file.yml
index 5a6287026..de4742464 100644
--- a/config/system.file.yml
+++ b/config/system.file.yml
@@ -1,5 +1,5 @@
+_core:
+  default_config_hash: mguGHCYb9Dw5EcpfjwoShGV1Vjkbz3QuPRCLfxiye-g
 allow_insecure_uploads: false
 default_scheme: public
 temporary_maximum_age: 21600
-_core:
-  default_config_hash: mguGHCYb9Dw5EcpfjwoShGV1Vjkbz3QuPRCLfxiye-g
diff --git a/config/system.image.gd.yml b/config/system.image.gd.yml
index b676907e4..2d812667b 100644
--- a/config/system.image.gd.yml
+++ b/config/system.image.gd.yml
@@ -1,3 +1,3 @@
-jpeg_quality: 75
 _core:
   default_config_hash: eNXaHfkJJUThHeF0nvkoXyPLRrKYGxgHRjORvT4F5rQ
+jpeg_quality: 75
diff --git a/config/system.image.yml b/config/system.image.yml
index 990d3dc79..2e18f7fc5 100644
--- a/config/system.image.yml
+++ b/config/system.image.yml
@@ -1,3 +1,3 @@
-toolkit: gd
 _core:
   default_config_hash: durWHaKeBaq4d9Wpi4RqwADj1OufDepcnJuhVLmKN24
+toolkit: gd
diff --git a/config/system.logging.yml b/config/system.logging.yml
index e95b28a48..d6164de51 100644
--- a/config/system.logging.yml
+++ b/config/system.logging.yml
@@ -1,3 +1,3 @@
-error_level: hide
 _core:
   default_config_hash: u3-njszl92FaxjrCMiq0yDcjAfcdx72w1zT1O9dx6aA
+error_level: hide
diff --git a/config/system.mail.yml b/config/system.mail.yml
index 60ed34d5a..419e77e58 100644
--- a/config/system.mail.yml
+++ b/config/system.mail.yml
@@ -1,4 +1,4 @@
-interface:
-  default: php_mail
 _core:
   default_config_hash: rYgt7uhPafP2ngaN_ZUPFuyI4KdE0zU868zLNSlzKoE
+interface:
+  default: php_mail
diff --git a/config/system.maintenance.yml b/config/system.maintenance.yml
index 79501fb1d..7bc5b985f 100644
--- a/config/system.maintenance.yml
+++ b/config/system.maintenance.yml
@@ -1,4 +1,4 @@
-message: '@site is currently under maintenance. We should be back shortly. Thank you for your patience.'
-langcode: en
 _core:
   default_config_hash: Z5MXifrF77GEAgx0GQ6iWT8wStjFuY8BD9OruofWTJ8
+langcode: en
+message: '@site is currently under maintenance. We should be back shortly. Thank you for your patience.'
diff --git a/config/system.performance.yml b/config/system.performance.yml
index d4f85d555..cd81c181f 100644
--- a/config/system.performance.yml
+++ b/config/system.performance.yml
@@ -1,3 +1,5 @@
+_core:
+  default_config_hash: b2cssrj-lOmATIbdehfCqfCFgVR0qCdxxWhwqa2KBVQ
 cache:
   page:
     max_age: 0
@@ -13,5 +15,3 @@ js:
   preprocess: true
   gzip: true
 stale_file_threshold: 2592000
-_core:
-  default_config_hash: b2cssrj-lOmATIbdehfCqfCFgVR0qCdxxWhwqa2KBVQ
diff --git a/config/system.rss.yml b/config/system.rss.yml
index 7cdd6dee4..04a8fe03f 100644
--- a/config/system.rss.yml
+++ b/config/system.rss.yml
@@ -1,4 +1,4 @@
-items:
-  view_mode: rss
 _core:
   default_config_hash: TlH7NNk46phfxu1mSUfwg1C0YqaGsUCeD4l9JQnQlDU
+items:
+  view_mode: rss
diff --git a/config/system.site.yml b/config/system.site.yml
index ec1c9ac19..3a42bd6cd 100644
--- a/config/system.site.yml
+++ b/config/system.site.yml
@@ -1,3 +1,6 @@
+_core:
+  default_config_hash: yXadRE77Va-G6dxhd2kPYapAvbnSvTF6hO4oXiOEynI
+langcode: en
 uuid: a475b4b3-5bfb-45b7-887d-f6b8eb50a6fd
 name: ReliefWeb
 mail: donotreply@reliefweb.int
@@ -8,8 +11,5 @@ page:
   front: /home
 admin_compact_mode: false
 weight_select_max: 100
-langcode: en
 default_langcode: en
-_core:
-  default_config_hash: yXadRE77Va-G6dxhd2kPYapAvbnSvTF6hO4oXiOEynI
 mail_notification: donotreply@reliefweb.int
diff --git a/config/system.theme.global.yml b/config/system.theme.global.yml
index 0450b3a93..46e6002ca 100644
--- a/config/system.theme.global.yml
+++ b/config/system.theme.global.yml
@@ -1,3 +1,5 @@
+_core:
+  default_config_hash: KHk8rzK2GMRtdfoAeocFrll8Q7gGtiocl2GF5jnX9cY
 favicon:
   mimetype: image/vnd.microsoft.icon
   path: ''
@@ -12,5 +14,3 @@ logo:
   path: ''
   url: ''
   use_default: true
-_core:
-  default_config_hash: KHk8rzK2GMRtdfoAeocFrll8Q7gGtiocl2GF5jnX9cY
diff --git a/config/system.theme.yml b/config/system.theme.yml
index df1e709fb..a7c2346d5 100644
--- a/config/system.theme.yml
+++ b/config/system.theme.yml
@@ -1,4 +1,4 @@
-admin: seven
-default: common_design_subtheme
 _core:
   default_config_hash: 6lQ55NXM9ysybMQ6NzJj4dtiQ1dAkOYxdDompa-r_kk
+admin: seven
+default: common_design_subtheme
diff --git a/config/taxonomy.settings.yml b/config/taxonomy.settings.yml
index c98a316b1..0e3837de0 100644
--- a/config/taxonomy.settings.yml
+++ b/config/taxonomy.settings.yml
@@ -1,5 +1,5 @@
+_core:
+  default_config_hash: zKpaWT6cJc1tVQQaTqatGELaCqU_oyRym6zTl27Yias
 maintain_index_table: true
 override_selector: false
 terms_per_page_admin: 100
-_core:
-  default_config_hash: zKpaWT6cJc1tVQQaTqatGELaCqU_oyRym6zTl27Yias
diff --git a/config/text.settings.yml b/config/text.settings.yml
index ef751a5ce..a295c7ea2 100644
--- a/config/text.settings.yml
+++ b/config/text.settings.yml
@@ -1,3 +1,3 @@
-default_summary_length: 600
 _core:
   default_config_hash: Bkewb77RBOK3_aXMPsp8p87gbc03NvmC5gBLzPl7hVA
+default_summary_length: 600
diff --git a/config/theme_switcher.rule.content_type.yml b/config/theme_switcher.rule.content_type.yml
index edcd5a8c4..290c3bb0b 100644
--- a/config/theme_switcher.rule.content_type.yml
+++ b/config/theme_switcher.rule.content_type.yml
@@ -12,6 +12,9 @@ admin_theme: common_design_subtheme
 visibility:
   'entity_bundle:node':
     id: 'entity_bundle:node'
+    negate: false
+    context_mapping:
+      node: '@node.node_route_context:node'
     bundles:
       announcement: announcement
       blog_post: blog_post
@@ -20,6 +23,3 @@ visibility:
       report: report
       topic: topic
       training: training
-    negate: false
-    context_mapping:
-      node: '@node.node_route_context:node'
diff --git a/config/theme_switcher.rule.request_path.yml b/config/theme_switcher.rule.request_path.yml
index f808bb792..6a60a96e2 100644
--- a/config/theme_switcher.rule.request_path.yml
+++ b/config/theme_switcher.rule.request_path.yml
@@ -12,5 +12,5 @@ admin_theme: common_design_subtheme
 visibility:
   request_path:
     id: request_path
-    pages: "/moderation/content/*\r\n/user/*/edit\r\n/user/*/notifications\r\n/user/*/bookmarks\r\n/user/*/posts\r\n/user/*/contact\r\n/admin/community-topics\r\n/admin/reliefweb_revisions/history/*/*"
     negate: false
+    pages: "/moderation/content/*\r\n/user/*/edit\r\n/user/*/notifications\r\n/user/*/bookmarks\r\n/user/*/posts\r\n/user/*/contact\r\n/admin/community-topics\r\n/admin/reliefweb_revisions/history/*/*"
diff --git a/config/theme_switcher.rule.vocabulary.yml b/config/theme_switcher.rule.vocabulary.yml
index c5198af4a..470620059 100644
--- a/config/theme_switcher.rule.vocabulary.yml
+++ b/config/theme_switcher.rule.vocabulary.yml
@@ -12,6 +12,9 @@ admin_theme: common_design_subtheme
 visibility:
   'entity_bundle:taxonomy_term':
     id: 'entity_bundle:taxonomy_term'
+    negate: false
+    context_mapping:
+      taxonomy_term: '@taxonomy_term.taxonomy_term_route_context:taxonomy_term'
     bundles:
       career_category: career_category
       content_format: content_format
@@ -30,6 +33,3 @@ visibility:
       training_format: training_format
       training_type: training_type
       vulnerable_group: vulnerable_group
-    negate: false
-    context_mapping:
-      taxonomy_term: '@taxonomy_term.taxonomy_term_route_context:taxonomy_term'
diff --git a/config/update.settings.yml b/config/update.settings.yml
index aca754fef..61c8912e4 100644
--- a/config/update.settings.yml
+++ b/config/update.settings.yml
@@ -1,3 +1,5 @@
+_core:
+  default_config_hash: 2QzULf0zovJQx3J06Y9rufzzfi-CY2CTTlEfJJh2Qyw
 check:
   disabled_extensions: false
   interval_days: 1
@@ -9,5 +11,3 @@ notification:
   emails:
     - admin@example.com
   threshold: all
-_core:
-  default_config_hash: 2QzULf0zovJQx3J06Y9rufzzfi-CY2CTTlEfJJh2Qyw
diff --git a/config/user.flood.yml b/config/user.flood.yml
index f165c9525..4eb3644f2 100644
--- a/config/user.flood.yml
+++ b/config/user.flood.yml
@@ -1,7 +1,7 @@
+_core:
+  default_config_hash: UYfMzeP1S8jKm9PSvxf7nQNe8DsNS-3bc2WSNNXBQWs
 uid_only: false
 ip_limit: 50
 ip_window: 3600
 user_limit: 5
 user_window: 21600
-_core:
-  default_config_hash: UYfMzeP1S8jKm9PSvxf7nQNe8DsNS-3bc2WSNNXBQWs
diff --git a/config/user.mail.yml b/config/user.mail.yml
index 821eeee67..224d08312 100644
--- a/config/user.mail.yml
+++ b/config/user.mail.yml
@@ -1,30 +1,30 @@
+_core:
+  default_config_hash: IWzNdUVX2YSiflxrGSTLIiqTrhgIzbV2C-hRL5DniJM
+langcode: en
 cancel_confirm:
-  body: "[user:display-name],\r\n\r\nA request to cancel your account has been made at [site:name].\r\n\r\nYou may now cancel your account on [site:url-brief] by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:cancel-url]\r\n\r\nNOTE: The cancellation of your account is not reversible.\r\n\r\nThis link expires in one day and nothing will happen if it is not used.\r\n\r\n--  [site:name] team"
   subject: 'Account cancellation request for [user:display-name] at [site:name]'
+  body: "[user:display-name],\r\n\r\nA request to cancel your account has been made at [site:name].\r\n\r\nYou may now cancel your account on [site:url-brief] by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:cancel-url]\r\n\r\nNOTE: The cancellation of your account is not reversible.\r\n\r\nThis link expires in one day and nothing will happen if it is not used.\r\n\r\n--  [site:name] team"
 password_reset:
-  body: "[user:display-name],\r\n\r\nA request to reset the password for your account has been made at [site:name].\r\n\r\nYou may now log in by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis link can only be used once to log in and will lead you to a page where you can set your password. It expires after one day and nothing will happen if it's not used.\r\n\r\n--  [site:name] team"
   subject: 'Replacement login information for [user:display-name] at [site:name]'
+  body: "[user:display-name],\r\n\r\nA request to reset the password for your account has been made at [site:name].\r\n\r\nYou may now log in by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis link can only be used once to log in and will lead you to a page where you can set your password. It expires after one day and nothing will happen if it's not used.\r\n\r\n--  [site:name] team"
 register_admin_created:
-  body: "[user:display-name],\r\n\r\nA site administrator at [site:name] has created an account for you. You may now log in by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis link can only be used once to log in and will lead you to a page where you can set your password.\r\n\r\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\r\n\r\nusername: [user:name]\r\npassword: Your password\r\n\r\n--  [site:name] team"
   subject: 'An administrator created an account for you at [site:name]'
+  body: "[user:display-name],\r\n\r\nA site administrator at [site:name] has created an account for you. You may now log in by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis link can only be used once to log in and will lead you to a page where you can set your password.\r\n\r\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\r\n\r\nusername: [user:name]\r\npassword: Your password\r\n\r\n--  [site:name] team"
 register_no_approval_required:
-  body: "[user:display-name],\r\n\r\nThank you for registering at [site:name]. You may now log in by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis link can only be used once to log in and will lead you to a page where you can set your password.\r\n\r\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\r\n\r\nusername: [user:name]\r\npassword: Your password\r\n\r\n--  [site:name] team"
   subject: 'Account details for [user:display-name] at [site:name]'
+  body: "[user:display-name],\r\n\r\nThank you for registering at [site:name]. You may now log in by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis link can only be used once to log in and will lead you to a page where you can set your password.\r\n\r\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\r\n\r\nusername: [user:name]\r\npassword: Your password\r\n\r\n--  [site:name] team"
 register_pending_approval:
-  body: "[user:display-name],\r\n\r\nThank you for registering at [site:name]. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to log in, set your password, and other details.\r\n\r\n--  [site:name] team"
   subject: 'Account details for [user:display-name] at [site:name] (pending admin approval)'
+  body: "[user:display-name],\r\n\r\nThank you for registering at [site:name]. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to log in, set your password, and other details.\r\n\r\n--  [site:name] team"
 register_pending_approval_admin:
-  body: "[user:display-name] has applied for an account.\r\n\r\n[user:edit-url]"
   subject: 'Account details for [user:display-name] at [site:name] (pending admin approval)'
+  body: "[user:display-name] has applied for an account.\r\n\r\n[user:edit-url]"
 status_activated:
-  body: "[user:display-name],\r\n\r\nYour account at [site:name] has been activated.\r\n\r\nYou may now log in by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis link can only be used once to log in and will lead you to a page where you can set your password.\r\n\r\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\r\n\r\nusername: [user:account-name]\r\npassword: Your password\r\n\r\n--  [site:name] team"
   subject: 'Account details for [user:display-name] at [site:name] (approved)'
+  body: "[user:display-name],\r\n\r\nYour account at [site:name] has been activated.\r\n\r\nYou may now log in by clicking this link or copying and pasting it into your browser:\r\n\r\n[user:one-time-login-url]\r\n\r\nThis link can only be used once to log in and will lead you to a page where you can set your password.\r\n\r\nAfter setting your password, you will be able to log in at [site:login-url] in the future using:\r\n\r\nusername: [user:account-name]\r\npassword: Your password\r\n\r\n--  [site:name] team"
 status_blocked:
-  body: "[user:display-name],\r\n\r\nYour account on [site:name] has been blocked.\r\n\r\n--  [site:name] team"
   subject: 'Account details for [user:display-name] at [site:name] (blocked)'
+  body: "[user:display-name],\r\n\r\nYour account on [site:name] has been blocked.\r\n\r\n--  [site:name] team"
 status_canceled:
-  body: "[user:display-name],\r\n\r\nYour account on [site:name] has been canceled.\r\n\r\n--  [site:name] team"
   subject: 'Account details for [user:display-name] at [site:name] (canceled)'
-langcode: en
-_core:
-  default_config_hash: IWzNdUVX2YSiflxrGSTLIiqTrhgIzbV2C-hRL5DniJM
+  body: "[user:display-name],\r\n\r\nYour account on [site:name] has been canceled.\r\n\r\n--  [site:name] team"
diff --git a/config/user.role.anonymous.yml b/config/user.role.anonymous.yml
index e83470efa..fce92c9f5 100644
--- a/config/user.role.anonymous.yml
+++ b/config/user.role.anonymous.yml
@@ -1,7 +1,10 @@
 uuid: 7cf57b0f-d754-4e62-bd9f-57fabb258f6f
 langcode: en
 status: true
-dependencies: {  }
+dependencies:
+  module:
+    - media
+    - system
 _core:
   default_config_hash: j5zLMOdJBqC0bMvSdth5UebkprJB8g_2FXHqhfpJzow
 id: anonymous
diff --git a/config/user.role.authenticated.yml b/config/user.role.authenticated.yml
index 27940f170..4af607da9 100644
--- a/config/user.role.authenticated.yml
+++ b/config/user.role.authenticated.yml
@@ -1,7 +1,25 @@
 uuid: 0b3bdcc6-3347-42ad-9731-5f3149dd596b
 langcode: en
 status: true
-dependencies: {  }
+dependencies:
+  config:
+    - filter.format.markdown
+    - filter.format.markdown_editor
+    - filter.format.token_markdown
+    - node.type.job
+    - node.type.training
+    - workflows.workflow.job
+    - workflows.workflow.training
+  module:
+    - content_moderation
+    - filter
+    - media
+    - node
+    - reliefweb_bookmarks
+    - reliefweb_form
+    - reliefweb_subscriptions
+    - reliefweb_user_posts
+    - system
 _core:
   default_config_hash: dJ0L2DNSj5q6XVZAGsuVDpJTh5UeYkIPwKrUOOpr8YI
 id: authenticated
diff --git a/config/user.role.editor.yml b/config/user.role.editor.yml
index fc3ce2e87..742a8e9d8 100644
--- a/config/user.role.editor.yml
+++ b/config/user.role.editor.yml
@@ -1,7 +1,53 @@
 uuid: e57c47d0-5c11-4ce8-91bc-d8a565b5e3f6
 langcode: en
 status: true
-dependencies: {  }
+dependencies:
+  config:
+    - filter.format.html
+    - filter.format.markdown
+    - media.type.image_announcement
+    - media.type.image_blog_post
+    - media.type.image_book
+    - media.type.image_report
+    - media.type.image_topic
+    - node.type.announcement
+    - node.type.blog_post
+    - node.type.book
+    - node.type.job
+    - node.type.report
+    - node.type.topic
+    - node.type.training
+    - taxonomy.vocabulary.country
+    - taxonomy.vocabulary.disaster
+    - taxonomy.vocabulary.source
+    - taxonomy.vocabulary.tag
+    - workflows.workflow.announcement
+    - workflows.workflow.blog_post
+    - workflows.workflow.book
+    - workflows.workflow.country
+    - workflows.workflow.disaster
+    - workflows.workflow.job
+    - workflows.workflow.report
+    - workflows.workflow.source
+    - workflows.workflow.topic
+    - workflows.workflow.training
+  module:
+    - book
+    - contact
+    - content_moderation
+    - filter
+    - media
+    - node
+    - path
+    - reliefweb_fields
+    - reliefweb_form
+    - reliefweb_homepage
+    - reliefweb_moderation
+    - reliefweb_revisions
+    - reliefweb_topics
+    - reliefweb_user_posts
+    - taxonomy
+    - taxonomy_term_revision
 id: editor
 label: Editor
 weight: 2
diff --git a/config/user.role.external_disaster_manager.yml b/config/user.role.external_disaster_manager.yml
index 8fd258c5c..c0cab3169 100644
--- a/config/user.role.external_disaster_manager.yml
+++ b/config/user.role.external_disaster_manager.yml
@@ -1,7 +1,13 @@
 uuid: 5f99a06f-6144-41f4-a5de-b59a801f17d2
 langcode: en
 status: true
-dependencies: {  }
+dependencies:
+  config:
+    - taxonomy.vocabulary.disaster
+    - workflows.workflow.disaster
+  module:
+    - content_moderation
+    - taxonomy
 id: external_disaster_manager
 label: 'External disaster manager'
 weight: 6
diff --git a/config/user.role.job_importer.yml b/config/user.role.job_importer.yml
index d0db9ef2a..bc9819624 100644
--- a/config/user.role.job_importer.yml
+++ b/config/user.role.job_importer.yml
@@ -1,7 +1,13 @@
 uuid: b927268a-c7ab-43e4-a806-dbd949f7aaf6
 langcode: en
 status: true
-dependencies: {  }
+dependencies:
+  config:
+    - node.type.job
+    - workflows.workflow.job
+  module:
+    - content_moderation
+    - node
 id: job_importer
 label: 'Job importer'
 weight: 8
diff --git a/config/user.role.user_manager.yml b/config/user.role.user_manager.yml
index 27024af72..d2497b99d 100644
--- a/config/user.role.user_manager.yml
+++ b/config/user.role.user_manager.yml
@@ -1,7 +1,9 @@
 uuid: 8468181e-6cde-42fa-a8a0-e67d5dd01960
 langcode: en
 status: true
-dependencies: {  }
+dependencies:
+  module:
+    - reliefweb_subscriptions
 id: user_manager
 label: 'User manager'
 weight: 3
diff --git a/config/user.role.webmaster.yml b/config/user.role.webmaster.yml
index 99c3de4ae..f3764c63f 100644
--- a/config/user.role.webmaster.yml
+++ b/config/user.role.webmaster.yml
@@ -1,7 +1,32 @@
 uuid: cc2c5bae-b15b-41c7-ae45-8afb7153c18c
 langcode: en
 status: true
-dependencies: {  }
+dependencies:
+  config:
+    - taxonomy.vocabulary.career_category
+    - taxonomy.vocabulary.content_format
+    - taxonomy.vocabulary.country
+    - taxonomy.vocabulary.disaster
+    - taxonomy.vocabulary.disaster_type
+    - taxonomy.vocabulary.feature
+    - taxonomy.vocabulary.job_experience
+    - taxonomy.vocabulary.job_type
+    - taxonomy.vocabulary.language
+    - taxonomy.vocabulary.ocha_product
+    - taxonomy.vocabulary.organization_type
+    - taxonomy.vocabulary.source
+    - taxonomy.vocabulary.tag
+    - taxonomy.vocabulary.theme
+    - taxonomy.vocabulary.training_format
+    - taxonomy.vocabulary.training_type
+    - taxonomy.vocabulary.vulnerable_group
+    - workflows.workflow.report
+  module:
+    - book
+    - content_moderation
+    - google_tag
+    - taxonomy
+    - taxonomy_term_revision
 id: webmaster
 label: Webmaster
 weight: 4
diff --git a/config/user.settings.yml b/config/user.settings.yml
index 928cc218b..842960a04 100644
--- a/config/user.settings.yml
+++ b/config/user.settings.yml
@@ -1,3 +1,6 @@
+_core:
+  default_config_hash: w314Zp7B4NbrlV4KeeZLNSmTTpdJiv-KwZO2E1fSSK0
+langcode: en
 anonymous: Anonymous
 verify_mail: true
 notify:
@@ -13,6 +16,3 @@ register: visitors
 cancel_method: user_cancel_block
 password_reset_timeout: 86400
 password_strength: true
-langcode: en
-_core:
-  default_config_hash: w314Zp7B4NbrlV4KeeZLNSmTTpdJiv-KwZO2E1fSSK0
diff --git a/config/views.settings.yml b/config/views.settings.yml
index b10d1c3c2..b48ea1604 100644
--- a/config/views.settings.yml
+++ b/config/views.settings.yml
@@ -1,3 +1,5 @@
+_core:
+  default_config_hash: RaRd9EIcwA4u3qCSRLL8EnCicbda1kV__ASmVbyehvQ
 display_extenders: {  }
 skip_cache: false
 sql_signature: false
@@ -5,13 +7,13 @@ ui:
   show:
     additional_queries: false
     advanced_column: false
+    default_display: false
     performance_statistics: false
     preview_information: true
     sql_query:
       enabled: false
       where: above
     display_embed: false
-    default_display: false
   always_live_preview: true
   exposed_filter_any_label: old_any
 field_rewrite_elements:
@@ -44,5 +46,3 @@ field_rewrite_elements:
   ins: INS
   q: Q
   s: S
-_core:
-  default_config_hash: RaRd9EIcwA4u3qCSRLL8EnCicbda1kV__ASmVbyehvQ
diff --git a/config/views.view.archive.yml b/config/views.view.archive.yml
index 10c2c49ab..bcd6f7739 100644
--- a/config/views.view.archive.yml
+++ b/config/views.view.archive.yml
@@ -23,39 +23,18 @@ display:
     display_plugin: default
     position: 0
     display_options:
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
       title: 'Monthly archive'
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      cache:
-        type: tag
-        options: {  }
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
+      fields: {  }
       pager:
         type: mini
         options:
-          items_per_page: 10
           offset: 0
-          id: 0
+          items_per_page: 10
           total_pages: 0
+          id: 0
+          tags:
+            next: ››
+            previous: ‹‹
           expose:
             items_per_page: false
             items_per_page_label: 'Items per page'
@@ -64,59 +43,75 @@ display:
             items_per_page_options_all_label: '- All -'
             offset: false
             offset_label: Offset
-          tags:
-            previous: ‹‹
-            next: ››
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      access:
+        type: perm
+        options:
+          perm: 'access content'
+      cache:
+        type: tag
+        options: {  }
+      empty: {  }
       sorts:
         created:
           id: created
           table: node_field_data
           field: created
-          order: DESC
-          plugin_id: date
           relationship: none
           group_type: group
           admin_label: ''
-          exposed: false
+          entity_type: node
+          entity_field: created
+          plugin_id: date
+          order: DESC
           expose:
             label: ''
+            field_identifier: created
+          exposed: false
           granularity: second
-          entity_type: node
-          entity_field: created
       arguments:
         created_year_month:
           id: created_year_month
           table: node_field_data
           field: created_year_month
+          entity_type: node
+          plugin_id: date_year_month
           default_action: summary
           exception:
             title_enable: true
           title_enable: true
           title: '{{ arguments.created_year_month }}'
           default_argument_type: fixed
-          summary:
-            sort_order: desc
-            format: default_summary
           summary_options:
             override: true
             items_per_page: 30
+          summary:
+            sort_order: desc
+            format: default_summary
           specify_validation: true
-          plugin_id: date_year_month
-          entity_type: node
       filters:
         status:
           id: status
           table: node_field_data
           field: status
+          entity_type: node
+          entity_field: status
+          plugin_id: boolean
           value: '1'
           group: 0
           expose:
             operator: '0'
             operator_limit_selection: false
             operator_list: {  }
-          plugin_id: boolean
-          entity_type: node
-          entity_field: status
         langcode:
           id: langcode
           table: node_field_data
@@ -124,6 +119,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: node
+          entity_field: langcode
+          plugin_id: language
           operator: in
           value:
             '***LANGUAGE_language_content***': '***LANGUAGE_language_content***'
@@ -135,6 +133,8 @@ display:
             description: ''
             use_operator: false
             operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: ''
             required: false
             remember: false
@@ -142,8 +142,6 @@ display:
             remember_roles:
               authenticated: authenticated
             reduce: false
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -156,9 +154,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          plugin_id: language
-          entity_type: node
-          entity_field: langcode
       style:
         type: default
         options:
@@ -170,20 +165,26 @@ display:
         type: 'entity:node'
         options:
           view_mode: teaser
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
+      relationships: {  }
       header: {  }
       footer: {  }
-      empty: {  }
-      relationships: {  }
-      fields: {  }
       display_extenders: {  }
     cache_metadata:
+      max-age: -1
       contexts:
         - 'languages:language_interface'
         - url
         - url.query_args
         - 'user.node_grants:view'
         - user.permissions
-      max-age: -1
       tags: {  }
   block_1:
     id: block_1
@@ -191,38 +192,38 @@ display:
     display_plugin: block
     position: 1
     display_options:
-      query:
-        type: views_query
-        options: {  }
-      defaults:
-        arguments: false
       arguments:
         created_year_month:
           id: created_year_month
           table: node_field_data
           field: created_year_month
+          entity_type: node
+          plugin_id: date_year_month
           default_action: summary
           exception:
             title_enable: true
           title_enable: true
           title: '{{ arguments.created_year_month }}'
           default_argument_type: fixed
-          summary:
-            format: default_summary
           summary_options:
             items_per_page: 30
+          summary:
+            format: default_summary
           specify_validation: true
-          plugin_id: date_year_month
-          entity_type: node
+      query:
+        type: views_query
+        options: {  }
+      defaults:
+        arguments: false
       display_extenders: {  }
     cache_metadata:
+      max-age: -1
       contexts:
         - 'languages:language_interface'
         - url
         - url.query_args
         - 'user.node_grants:view'
         - user.permissions
-      max-age: -1
       tags: {  }
   page_1:
     id: page_1
@@ -233,14 +234,14 @@ display:
       query:
         type: views_query
         options: {  }
-      path: archive
       display_extenders: {  }
+      path: archive
     cache_metadata:
+      max-age: -1
       contexts:
         - 'languages:language_interface'
         - url
         - url.query_args
         - 'user.node_grants:view'
         - user.permissions
-      max-age: -1
       tags: {  }
diff --git a/config/views.view.content.yml b/config/views.view.content.yml
index 36a1fcf99..03d358413 100644
--- a/config/views.view.content.yml
+++ b/config/views.view.content.yml
@@ -16,134 +16,19 @@ base_table: node_field_data
 base_field: nid
 display:
   default:
+    id: default
+    display_title: Master
+    display_plugin: default
+    position: 0
     display_options:
-      access:
-        type: perm
-        options:
-          perm: 'access content overview'
-      cache:
-        type: tag
-      query:
-        type: views_query
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Filter
-          reset_button: true
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      pager:
-        type: full
-        options:
-          items_per_page: 50
-          tags:
-            previous: '‹ Previous'
-            next: 'Next ›'
-            first: '« First'
-            last: 'Last »'
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          override: true
-          sticky: true
-          caption: ''
-          summary: ''
-          description: ''
-          columns:
-            node_bulk_form: node_bulk_form
-            title: title
-            type: type
-            name: name
-            status: status
-            changed: changed
-            edit_node: edit_node
-            delete_node: delete_node
-            dropbutton: dropbutton
-            timestamp: title
-          info:
-            node_bulk_form:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            title:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            type:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            name:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-low
-            status:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            changed:
-              sortable: true
-              default_sort_order: desc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-low
-            edit_node:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            delete_node:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            dropbutton:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            timestamp:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          default: changed
-          empty_table: true
-      row:
-        type: fields
+      title: Content
       fields:
         node_bulk_form:
           id: node_bulk_form
           table: node
           field: node_bulk_form
+          entity_type: node
+          plugin_id: node_bulk_form
           label: ''
           exclude: false
           alter:
@@ -154,12 +39,13 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          plugin_id: node_bulk_form
-          entity_type: node
         title:
           id: title
           table: node_field_data
           field: title
+          entity_type: node
+          entity_field: title
+          plugin_id: field
           label: Title
           exclude: false
           alter:
@@ -170,12 +56,9 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          entity_type: node
-          entity_field: title
           type: string
           settings:
             link_to_entity: true
-          plugin_id: field
         type:
           id: type
           table: node_field_data
@@ -183,6 +66,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: node
+          entity_field: type
+          plugin_id: field
           label: 'Content type'
           exclude: false
           alter:
@@ -238,14 +124,14 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          entity_type: node
-          entity_field: type
-          plugin_id: field
         name:
           id: name
           table: users_field_data
           field: name
           relationship: uid
+          entity_type: user
+          entity_field: name
+          plugin_id: field
           label: Author
           exclude: false
           alter:
@@ -256,14 +142,14 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          plugin_id: field
           type: user_name
-          entity_type: user
-          entity_field: name
         status:
           id: status
           table: node_field_data
           field: status
+          entity_type: node
+          entity_field: status
+          plugin_id: field
           label: Status
           exclude: false
           alter:
@@ -277,15 +163,15 @@ display:
           type: boolean
           settings:
             format: custom
-            format_custom_true: Published
             format_custom_false: Unpublished
-          plugin_id: field
-          entity_type: node
-          entity_field: status
+            format_custom_true: Published
         changed:
           id: changed
           table: node_field_data
           field: changed
+          entity_type: node
+          entity_field: changed
+          plugin_id: field
           label: Updated
           exclude: false
           alter:
@@ -301,9 +187,6 @@ display:
             date_format: short
             custom_date_format: ''
             timezone: ''
-          plugin_id: field
-          entity_type: node
-          entity_field: changed
         operations:
           id: operations
           table: node
@@ -311,6 +194,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: entity_operations
           label: Operations
           exclude: false
           alter:
@@ -353,7 +237,41 @@ display:
           empty_zero: false
           hide_alter_empty: true
           destination: true
-          plugin_id: entity_operations
+      pager:
+        type: full
+        options:
+          items_per_page: 50
+          tags:
+            next: 'Next ›'
+            previous: '‹ Previous'
+            first: '« First'
+            last: 'Last »'
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Filter
+          reset_button: true
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      access:
+        type: perm
+        options:
+          perm: 'access content overview'
+      cache:
+        type: tag
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          plugin_id: text_custom
+          empty: true
+          content: 'No content available.'
+      sorts: {  }
+      arguments: {  }
       filters:
         title:
           id: title
@@ -362,6 +280,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: node
+          entity_field: title
+          plugin_id: string
           operator: contains
           value: ''
           group: 1
@@ -372,6 +293,8 @@ display:
             description: ''
             use_operator: false
             operator: title_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: title
             required: false
             remember: false
@@ -380,8 +303,6 @@ display:
               authenticated: authenticated
               anonymous: '0'
               administrator: '0'
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -394,9 +315,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          plugin_id: string
-          entity_type: node
-          entity_field: title
         type:
           id: type
           table: node_field_data
@@ -404,6 +322,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: node
+          entity_field: type
+          plugin_id: bundle
           operator: in
           value: {  }
           group: 1
@@ -414,6 +335,8 @@ display:
             description: ''
             use_operator: false
             operator: type_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: type
             required: false
             remember: false
@@ -423,8 +346,6 @@ display:
               anonymous: '0'
               administrator: '0'
             reduce: false
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -437,9 +358,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          plugin_id: bundle
-          entity_type: node
-          entity_field: type
         status:
           id: status
           table: node_field_data
@@ -447,6 +365,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: node
+          entity_field: status
+          plugin_id: boolean
           operator: '='
           value: '1'
           group: 1
@@ -457,14 +378,14 @@ display:
             description: ''
             use_operator: false
             operator: status_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: status
             required: false
             remember: false
             multiple: false
             remember_roles:
               authenticated: authenticated
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: true
           group_info:
             label: 'Published status'
@@ -485,9 +406,6 @@ display:
                 title: Unpublished
                 operator: '='
                 value: '0'
-          plugin_id: boolean
-          entity_type: node
-          entity_field: status
         langcode:
           id: langcode
           table: node_field_data
@@ -495,6 +413,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: node
+          entity_field: langcode
+          plugin_id: language
           operator: in
           value: {  }
           group: 1
@@ -505,6 +426,8 @@ display:
             description: ''
             use_operator: false
             operator: langcode_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: langcode
             required: false
             remember: false
@@ -514,8 +437,6 @@ display:
               anonymous: '0'
               administrator: '0'
             reduce: false
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -528,51 +449,131 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          plugin_id: language
-          entity_type: node
-          entity_field: langcode
         status_extra:
           id: status_extra
           table: node_field_data
           field: status_extra
+          entity_type: node
+          plugin_id: node_status
           operator: '='
           value: false
-          plugin_id: node_status
           group: 1
-          entity_type: node
           expose:
             operator_limit_selection: false
             operator_list: {  }
-      sorts: {  }
-      title: Content
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          empty: true
-          content: 'No content available.'
-          plugin_id: text_custom
-      arguments: {  }
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          columns:
+            node_bulk_form: node_bulk_form
+            title: title
+            type: type
+            name: name
+            status: status
+            changed: changed
+            edit_node: edit_node
+            delete_node: delete_node
+            dropbutton: dropbutton
+            timestamp: title
+          default: changed
+          info:
+            node_bulk_form:
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            title:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            type:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            name:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            status:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            changed:
+              sortable: true
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            edit_node:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            delete_node:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            dropbutton:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            timestamp:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          override: true
+          sticky: true
+          summary: ''
+          empty_table: true
+          caption: ''
+          description: ''
+      row:
+        type: fields
+      query:
+        type: views_query
       relationships:
         uid:
           id: uid
           table: node_field_data
           field: uid
           admin_label: author
-          required: true
           plugin_id: standard
+          required: true
       show_admin_links: false
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
       display_extenders: {  }
-    display_plugin: default
-    display_title: Master
-    id: default
-    position: 0
     cache_metadata:
+      max-age: 0
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
@@ -581,30 +582,30 @@ display:
         - user
         - 'user.node_grants:view'
         - user.permissions
-      max-age: 0
       tags: {  }
   page_1:
+    id: page_1
+    display_title: Page
+    display_plugin: page
+    position: 1
     display_options:
+      display_extenders: {  }
       path: admin/content/node
       menu:
         type: 'default tab'
         title: Content
         description: ''
-        menu_name: admin
         weight: -10
+        menu_name: admin
         context: ''
       tab_options:
         type: normal
         title: Content
         description: 'Find and manage content'
-        menu_name: admin
         weight: -10
-      display_extenders: {  }
-    display_plugin: page
-    display_title: Page
-    id: page_1
-    position: 1
+        menu_name: admin
     cache_metadata:
+      max-age: 0
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
@@ -613,5 +614,4 @@ display:
         - user
         - 'user.node_grants:view'
         - user.permissions
-      max-age: 0
       tags: {  }
diff --git a/config/views.view.content_recent.yml b/config/views.view.content_recent.yml
index 3bd77e387..aa201be81 100644
--- a/config/views.view.content_recent.yml
+++ b/config/views.view.content_recent.yml
@@ -16,75 +16,34 @@ base_table: node_field_data
 base_field: nid
 display:
   default:
-    display_plugin: default
     id: default
     display_title: Master
+    display_plugin: default
     position: 0
     display_options:
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      cache:
-        type: tag
-        options: {  }
-      query:
-        type: views_query
-        options:
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_comment: ''
-          query_tags: {  }
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      pager:
-        type: some
-        options:
-          items_per_page: 10
-          offset: 0
-      style:
-        type: html_list
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          type: ul
-          wrapper_class: item-list
-          class: ''
-      row:
-        type: fields
+      title: 'Recent content'
       fields:
         title:
           id: title
           table: node_field_data
           field: title
+          relationship: none
+          group_type: group
+          admin_label: ''
           entity_type: node
           entity_field: title
+          plugin_id: field
           label: ''
           exclude: false
           alter:
             alter_text: false
             make_link: false
             absolute: false
-            trim: false
             word_boundary: false
             ellipsis: false
             strip_tags: false
+            trim: false
             html: false
-          hide_empty: false
-          empty_zero: false
-          relationship: none
-          group_type: group
-          admin_label: ''
           element_type: ''
           element_class: ''
           element_label_type: ''
@@ -94,11 +53,12 @@ display:
           element_wrapper_class: ''
           element_default_classes: true
           empty: ''
+          hide_empty: false
+          empty_zero: false
           hide_alter_empty: true
           type: string
           settings:
             link_to_entity: true
-          plugin_id: field
         changed:
           id: changed
           table: node_field_data
@@ -106,6 +66,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: node
+          entity_field: changed
+          plugin_id: field
           label: ''
           exclude: false
           alter:
@@ -160,9 +123,58 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
+      pager:
+        type: some
+        options:
+          offset: 0
+          items_per_page: 10
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      access:
+        type: perm
+        options:
+          perm: 'access content'
+      cache:
+        type: tag
+        options: {  }
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: text_custom
+          empty: true
+          content: 'No content available.'
+          tokenize: false
+      sorts:
+        changed:
+          id: changed
+          table: node_field_data
+          field: changed
+          relationship: none
+          group_type: group
+          admin_label: ''
           entity_type: node
           entity_field: changed
-          plugin_id: field
+          plugin_id: date
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: changed
+          exposed: false
+          granularity: second
+      arguments: {  }
       filters:
         status_extra:
           id: status_extra
@@ -171,6 +183,8 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: node
+          plugin_id: node_status
           operator: '='
           value: false
           group: 1
@@ -181,14 +195,14 @@ display:
             description: ''
             use_operator: false
             operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: ''
             required: false
             remember: false
             multiple: false
             remember_roles:
               authenticated: authenticated
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -201,8 +215,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: node
-          plugin_id: node_status
         langcode:
           id: langcode
           table: node_field_data
@@ -210,6 +222,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: node
+          entity_field: langcode
+          plugin_id: language
           operator: in
           value:
             '***LANGUAGE_language_content***': '***LANGUAGE_language_content***'
@@ -221,6 +236,8 @@ display:
             description: ''
             use_operator: false
             operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: ''
             required: false
             remember: false
@@ -228,8 +245,6 @@ display:
             remember_roles:
               authenticated: authenticated
             reduce: false
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -242,40 +257,25 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: node
-          entity_field: langcode
-          plugin_id: language
-      sorts:
-        changed:
-          id: changed
-          table: node_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          order: DESC
-          exposed: false
-          expose:
-            label: ''
-          granularity: second
-          entity_type: node
-          entity_field: changed
-          plugin_id: date
-      title: 'Recent content'
-      header: {  }
-      footer: {  }
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          empty: true
-          tokenize: false
-          content: 'No content available.'
-          plugin_id: text_custom
+      style:
+        type: html_list
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          type: ul
+          wrapper_class: item-list
+          class: ''
+      row:
+        type: fields
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
       relationships:
         uid:
           id: uid
@@ -284,39 +284,40 @@ display:
           relationship: none
           group_type: group
           admin_label: author
-          required: true
           entity_type: node
           entity_field: uid
           plugin_id: standard
-      arguments: {  }
-      display_extenders: {  }
+          required: true
       use_more: false
       use_more_always: false
       use_more_text: More
-      link_url: ''
       link_display: '0'
+      link_url: ''
+      header: {  }
+      footer: {  }
+      display_extenders: {  }
     cache_metadata:
+      max-age: -1
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
         - user
         - 'user.node_grants:view'
         - user.permissions
-      max-age: -1
       tags: {  }
   block_1:
-    display_plugin: block
     id: block_1
     display_title: Block
+    display_plugin: block
     position: 1
     display_options:
       display_extenders: {  }
     cache_metadata:
+      max-age: -1
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
         - user
         - 'user.node_grants:view'
         - user.permissions
-      max-age: -1
       tags: {  }
diff --git a/config/views.view.files.yml b/config/views.view.files.yml
index a7a61f21d..30d7277ee 100644
--- a/config/views.view.files.yml
+++ b/config/views.view.files.yml
@@ -16,156 +16,34 @@ base_table: file_managed
 base_field: fid
 display:
   default:
-    display_plugin: default
     id: default
     display_title: Master
+    display_plugin: default
     position: 0
     display_options:
-      access:
-        type: perm
-        options:
-          perm: 'access files overview'
-      cache:
-        type: tag
-        options: {  }
-      query:
-        type: views_query
-        options:
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_comment: ''
-          query_tags: {  }
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Filter
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      pager:
-        type: mini
-        options:
-          items_per_page: 50
-          offset: 0
-          id: 0
-          total_pages: 0
-          tags:
-            previous: '‹ Previous'
-            next: 'Next ›'
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          override: true
-          sticky: false
-          caption: ''
-          summary: ''
-          description: ''
-          columns:
-            fid: fid
-            filename: filename
-            filemime: filemime
-            filesize: filesize
-            status: status
-            created: created
-            changed: changed
-            count: count
-          info:
-            fid:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            filename:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            filemime:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-medium
-            filesize:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-low
-            status:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-low
-            created:
-              sortable: true
-              default_sort_order: desc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            changed:
-              sortable: true
-              default_sort_order: desc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            count:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-medium
-          default: changed
-          empty_table: true
-      row:
-        type: fields
+      title: Files
       fields:
         fid:
           id: fid
           table: file_managed
           field: fid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: file
+          entity_field: fid
+          plugin_id: field
+          label: Fid
+          exclude: true
           alter:
             alter_text: false
             make_link: false
             absolute: false
-            trim: false
             word_boundary: false
             ellipsis: false
             strip_tags: false
+            trim: false
             html: false
-          hide_empty: false
-          empty_zero: false
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: Fid
-          exclude: true
           element_type: ''
           element_class: ''
           element_label_type: ''
@@ -175,10 +53,9 @@ display:
           element_wrapper_class: ''
           element_default_classes: true
           empty: ''
+          hide_empty: false
+          empty_zero: false
           hide_alter_empty: true
-          plugin_id: field
-          entity_type: file
-          entity_field: fid
         filename:
           id: filename
           table: file_managed
@@ -186,6 +63,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: file
+          entity_field: filename
+          plugin_id: field
           label: Name
           exclude: false
           alter:
@@ -239,9 +119,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          plugin_id: field
-          entity_type: file
-          entity_field: filename
         filemime:
           id: filemime
           table: file_managed
@@ -249,6 +126,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: file
+          entity_field: filemime
+          plugin_id: field
           label: 'MIME type'
           exclude: false
           alter:
@@ -291,9 +171,6 @@ display:
           empty_zero: false
           hide_alter_empty: true
           type: file_filemime
-          plugin_id: field
-          entity_type: file
-          entity_field: filemime
         filesize:
           id: filesize
           table: file_managed
@@ -301,6 +178,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: file
+          entity_field: filesize
+          plugin_id: field
           label: Size
           exclude: false
           alter:
@@ -343,9 +223,6 @@ display:
           empty_zero: false
           hide_alter_empty: true
           type: file_size
-          plugin_id: field
-          entity_type: file
-          entity_field: filesize
         status:
           id: status
           table: file_managed
@@ -353,6 +230,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: file
+          entity_field: status
+          plugin_id: field
           label: Status
           exclude: false
           alter:
@@ -399,9 +279,6 @@ display:
             format: custom
             format_custom_false: Temporary
             format_custom_true: Permanent
-          plugin_id: field
-          entity_type: file
-          entity_field: status
         created:
           id: created
           table: file_managed
@@ -409,6 +286,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: file
+          entity_field: created
+          plugin_id: field
           label: 'Upload date'
           exclude: false
           alter:
@@ -455,9 +335,6 @@ display:
             date_format: medium
             custom_date_format: ''
             timezone: ''
-          plugin_id: field
-          entity_type: file
-          entity_field: created
         changed:
           id: changed
           table: file_managed
@@ -465,6 +342,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: file
+          entity_field: changed
+          plugin_id: field
           label: 'Changed date'
           exclude: false
           alter:
@@ -511,9 +391,6 @@ display:
             date_format: medium
             custom_date_format: ''
             timezone: ''
-          plugin_id: field
-          entity_type: file
-          entity_field: changed
         count:
           id: count
           table: file_usage
@@ -521,6 +398,7 @@ display:
           relationship: fid
           group_type: sum
           admin_label: ''
+          plugin_id: numeric
           label: 'Used in'
           exclude: false
           alter:
@@ -570,7 +448,51 @@ display:
           format_plural_string: !!binary MSBwbGFjZQNAY291bnQgcGxhY2Vz
           prefix: ''
           suffix: ''
-          plugin_id: numeric
+      pager:
+        type: mini
+        options:
+          offset: 0
+          items_per_page: 50
+          total_pages: 0
+          id: 0
+          tags:
+            next: 'Next ›'
+            previous: '‹ Previous'
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Filter
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      access:
+        type: perm
+        options:
+          perm: 'access files overview'
+      cache:
+        type: tag
+        options: {  }
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          plugin_id: text_custom
+          empty: true
+          content: 'No files available.'
+      sorts: {  }
+      arguments: {  }
       filters:
         filename:
           id: filename
@@ -579,6 +501,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: file
+          entity_field: filename
+          plugin_id: string
           operator: word
           value: ''
           group: 1
@@ -589,6 +514,8 @@ display:
             description: ''
             use_operator: false
             operator: filename_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: filename
             required: false
             remember: false
@@ -597,8 +524,6 @@ display:
               authenticated: authenticated
               anonymous: '0'
               administrator: '0'
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -611,9 +536,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          plugin_id: string
-          entity_type: file
-          entity_field: filename
         filemime:
           id: filemime
           table: file_managed
@@ -621,6 +543,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: file
+          entity_field: filemime
+          plugin_id: string
           operator: word
           value: ''
           group: 1
@@ -631,6 +556,8 @@ display:
             description: ''
             use_operator: false
             operator: filemime_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: filemime
             required: false
             remember: false
@@ -639,8 +566,6 @@ display:
               authenticated: authenticated
               anonymous: '0'
               administrator: '0'
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -653,9 +578,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          plugin_id: string
-          entity_type: file
-          entity_field: filemime
         status:
           id: status
           table: file_managed
@@ -663,6 +585,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: file
+          entity_field: status
+          plugin_id: file_status
           operator: in
           value: {  }
           group: 1
@@ -673,6 +598,8 @@ display:
             description: ''
             use_operator: false
             operator: status_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: status
             required: false
             remember: false
@@ -682,8 +609,6 @@ display:
               anonymous: '0'
               administrator: '0'
             reduce: false
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -696,21 +621,95 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          plugin_id: file_status
-          entity_type: file
-          entity_field: status
-      sorts: {  }
-      title: Files
-      header: {  }
-      footer: {  }
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          empty: true
-          content: 'No files available.'
-          plugin_id: text_custom
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          columns:
+            fid: fid
+            filename: filename
+            filemime: filemime
+            filesize: filesize
+            status: status
+            created: created
+            changed: changed
+            count: count
+          default: changed
+          info:
+            fid:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            filename:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            filemime:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-medium
+            filesize:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            status:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            created:
+              sortable: true
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            changed:
+              sortable: true
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            count:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-medium
+          override: true
+          sticky: false
+          summary: ''
+          empty_table: true
+          caption: ''
+          description: ''
+      row:
+        type: fields
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
       relationships:
         fid:
           id: fid
@@ -720,34 +719,26 @@ display:
           group_type: group
           admin_label: 'File usage'
           required: true
-      arguments: {  }
       group_by: true
       show_admin_links: true
+      header: {  }
+      footer: {  }
       display_extenders: {  }
     cache_metadata:
+      max-age: -1
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
         - url
         - url.query_args
         - user.permissions
-      max-age: -1
       tags: {  }
   page_1:
-    display_plugin: page
     id: page_1
     display_title: 'Files overview'
+    display_plugin: page
     position: 1
     display_options:
-      path: admin/content/files
-      menu:
-        type: tab
-        title: Files
-        description: ''
-        menu_name: admin
-        weight: 0
-        context: ''
-      display_description: ''
       defaults:
         pager: true
         relationships: false
@@ -760,59 +751,32 @@ display:
           group_type: group
           admin_label: 'File usage'
           required: false
+      display_description: ''
       display_extenders: {  }
+      path: admin/content/files
+      menu:
+        type: tab
+        title: Files
+        description: ''
+        weight: 0
+        menu_name: admin
+        context: ''
     cache_metadata:
+      max-age: -1
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
         - url
         - url.query_args
         - user.permissions
-      max-age: -1
       tags: {  }
   page_2:
-    display_plugin: page
     id: page_2
     display_title: 'File usage'
+    display_plugin: page
     position: 2
     display_options:
-      display_description: ''
-      path: admin/content/files/usage/%
-      empty: {  }
-      defaults:
-        empty: false
-        pager: false
-        filters: false
-        filter_groups: false
-        fields: false
-        group_by: false
-        title: false
-        arguments: false
-        style: false
-        row: false
-        relationships: false
-      pager:
-        type: mini
-        options:
-          items_per_page: 10
-          offset: 0
-          id: 0
-          total_pages: 0
-          tags:
-            previous: '‹ Previous'
-            next: 'Next ›'
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      filters: {  }
-      filter_groups:
-        operator: AND
-        groups: {  }
+      title: 'File usage'
       fields:
         entity_label:
           id: entity_label
@@ -821,6 +785,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: entity_label
           label: Entity
           exclude: false
           alter:
@@ -863,7 +828,6 @@ display:
           empty_zero: false
           hide_alter_empty: true
           link_to_entity: true
-          plugin_id: entity_label
         type:
           id: type
           table: file_usage
@@ -871,6 +835,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: standard
           label: 'Entity type'
           exclude: false
           alter:
@@ -912,7 +877,6 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          plugin_id: standard
         module:
           id: module
           table: file_usage
@@ -920,6 +884,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: standard
           label: 'Registering module'
           exclude: false
           alter:
@@ -961,7 +926,6 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          plugin_id: standard
         count:
           id: count
           table: file_usage
@@ -969,6 +933,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: numeric
           label: 'Use count'
           exclude: false
           alter:
@@ -1018,9 +983,25 @@ display:
           format_plural_string: !!binary MQNAY291bnQ=
           prefix: ''
           suffix: ''
-          plugin_id: numeric
-      group_by: false
-      title: 'File usage'
+      pager:
+        type: mini
+        options:
+          offset: 0
+          items_per_page: 10
+          total_pages: 0
+          id: 0
+          tags:
+            next: 'Next ›'
+            previous: '‹ Previous'
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+      empty: {  }
       arguments:
         fid:
           id: fid
@@ -1029,6 +1010,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: file
+          entity_field: fid
+          plugin_id: file_fid
           default_action: 'not found'
           exception:
             value: all
@@ -1043,8 +1027,8 @@ display:
           summary_options:
             base_path: ''
             count: true
-            items_per_page: 25
             override: false
+            items_per_page: 25
           summary:
             sort_order: asc
             number_of_records: 0
@@ -1056,25 +1040,22 @@ display:
           validate_options: {  }
           break_phrase: false
           not: false
-          plugin_id: file_fid
-          entity_type: file
-          entity_field: fid
+      filters: {  }
+      filter_groups:
+        operator: AND
+        groups: {  }
       style:
         type: table
         options:
           grouping: {  }
           row_class: ''
           default_row_class: true
-          override: true
-          sticky: false
-          caption: ''
-          summary: ''
-          description: ''
           columns:
             entity_label: entity_label
             type: type
             module: module
             count: count
+          default: entity_label
           info:
             entity_label:
               sortable: true
@@ -1104,11 +1085,27 @@ display:
               separator: ''
               empty_column: false
               responsive: ''
-          default: entity_label
+          override: true
+          sticky: false
+          summary: ''
           empty_table: true
+          caption: ''
+          description: ''
       row:
         type: fields
         options: {  }
+      defaults:
+        empty: false
+        title: false
+        pager: false
+        group_by: false
+        style: false
+        row: false
+        relationships: false
+        fields: false
+        arguments: false
+        filters: false
+        filter_groups: false
       relationships:
         fid:
           id: fid
@@ -1118,12 +1115,15 @@ display:
           group_type: group
           admin_label: 'File usage'
           required: true
+      group_by: false
+      display_description: ''
       display_extenders: {  }
+      path: admin/content/files/usage/%
     cache_metadata:
+      max-age: -1
       contexts:
         - 'languages:language_interface'
         - url
         - url.query_args
         - user.permissions
-      max-age: -1
       tags: {  }
diff --git a/config/views.view.frontpage.yml b/config/views.view.frontpage.yml
index 5ed09527f..b4e5cad97 100644
--- a/config/views.view.frontpage.yml
+++ b/config/views.view.frontpage.yml
@@ -19,7 +19,44 @@ base_table: node_field_data
 base_field: nid
 display:
   default:
+    id: default
+    display_title: Master
+    display_plugin: default
+    position: 0
     display_options:
+      title: ''
+      fields: {  }
+      pager:
+        type: full
+        options:
+          offset: 0
+          items_per_page: 10
+          total_pages: 0
+          id: 0
+          tags:
+            next: 'Next ›'
+            previous: '‹ Previous'
+            first: '« First'
+            last: 'Last »'
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          quantity: 9
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
       access:
         type: perm
         options:
@@ -29,28 +66,28 @@ display:
         options: {  }
       empty:
         area_text_custom:
-          admin_label: ''
-          content: 'No front page content has been created yet.<br/>Follow the <a target="_blank" href="https://www.drupal.org/docs/user_guide/en/index.html">User Guide</a> to start building your site.'
-          empty: true
+          id: area_text_custom
+          table: views
           field: area_text_custom
+          relationship: none
           group_type: group
-          id: area_text_custom
+          admin_label: ''
+          plugin_id: text_custom
           label: ''
-          relationship: none
-          table: views
+          empty: true
+          content: 'No front page content has been created yet.<br/>Follow the <a target="_blank" href="https://www.drupal.org/docs/user_guide/en/index.html">User Guide</a> to start building your site.'
           tokenize: false
-          plugin_id: text_custom
         node_listing_empty:
-          admin_label: ''
-          empty: true
-          field: node_listing_empty
-          group_type: group
           id: node_listing_empty
-          label: ''
-          relationship: none
           table: node
-          plugin_id: node_listing_empty
+          field: node_listing_empty
+          relationship: none
+          group_type: group
+          admin_label: ''
           entity_type: node
+          plugin_id: node_listing_empty
+          label: ''
+          empty: true
         title:
           id: title
           table: views
@@ -58,74 +95,97 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: title
           label: ''
           empty: true
           title: 'Welcome to [site:name]'
-          plugin_id: title
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
+      sorts:
+        sticky:
+          id: sticky
+          table: node_field_data
+          field: sticky
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: sticky
+          plugin_id: boolean
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: sticky
+          exposed: false
+        created:
+          id: created
+          table: node_field_data
+          field: created
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: created
+          plugin_id: date
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: created
+          exposed: false
+          granularity: second
+      arguments: {  }
       filters:
         promote:
+          id: promote
+          table: node_field_data
+          field: promote
+          relationship: none
+          group_type: group
           admin_label: ''
+          entity_type: node
+          entity_field: promote
+          plugin_id: boolean
+          operator: '='
+          value: '1'
+          group: 1
+          exposed: false
           expose:
-            description: ''
-            identifier: ''
+            operator_id: ''
             label: ''
-            multiple: false
+            description: ''
+            use_operator: false
             operator: ''
-            operator_id: ''
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: ''
+            required: false
             remember: false
+            multiple: false
             remember_roles:
               authenticated: authenticated
-            required: false
-            use_operator: false
-            operator_limit_selection: false
-            operator_list: {  }
-          exposed: false
-          field: promote
-          group: 1
+          is_grouped: false
           group_info:
-            default_group: All
-            default_group_multiple: {  }
+            label: ''
             description: ''
-            group_items: {  }
             identifier: ''
-            label: ''
-            multiple: false
             optional: true
-            remember: false
             widget: select
-          group_type: group
-          id: promote
-          is_grouped: false
-          operator: '='
-          relationship: none
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+        status:
+          id: status
           table: node_field_data
-          value: '1'
-          plugin_id: boolean
+          field: status
           entity_type: node
-          entity_field: promote
-        status:
+          entity_field: status
+          plugin_id: boolean
+          value: '1'
+          group: 1
           expose:
             operator: ''
             operator_limit_selection: false
             operator_list: {  }
-          field: status
-          group: 1
-          id: status
-          table: node_field_data
-          value: '1'
-          plugin_id: boolean
-          entity_type: node
-          entity_field: status
         langcode:
           id: langcode
           table: node_field_data
@@ -133,6 +193,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: node
+          entity_field: langcode
+          plugin_id: language
           operator: in
           value:
             '***LANGUAGE_language_content***': '***LANGUAGE_language_content***'
@@ -144,6 +207,8 @@ display:
             description: ''
             use_operator: false
             operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: ''
             required: false
             remember: false
@@ -151,8 +216,6 @@ display:
             remember_roles:
               authenticated: authenticated
             reduce: false
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -165,146 +228,85 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          plugin_id: language
-          entity_type: node
-          entity_field: langcode
-      pager:
-        type: full
+      style:
+        type: default
         options:
-          items_per_page: 10
-          offset: 0
-          id: 0
-          total_pages: 0
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          tags:
-            previous: '‹ Previous'
-            next: 'Next ›'
-            first: '« First'
-            last: 'Last »'
-          quantity: 9
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          uses_fields: false
+      row:
+        type: 'entity:node'
+        options:
+          view_mode: teaser
       query:
         type: views_query
         options:
+          query_comment: ''
           disable_sql_rewrite: false
           distinct: false
           replica: false
-          query_comment: ''
           query_tags: {  }
-      row:
-        type: 'entity:node'
-        options:
-          view_mode: teaser
-      sorts:
-        sticky:
-          admin_label: ''
-          expose:
-            label: ''
-          exposed: false
-          field: sticky
-          group_type: group
-          id: sticky
-          order: DESC
-          relationship: none
-          table: node_field_data
-          plugin_id: boolean
-          entity_type: node
-          entity_field: sticky
-        created:
-          field: created
-          id: created
-          order: DESC
-          table: node_field_data
-          plugin_id: date
-          relationship: none
-          group_type: group
-          admin_label: ''
-          exposed: false
-          expose:
-            label: ''
-          granularity: second
-          entity_type: node
-          entity_field: created
-      style:
-        type: default
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          uses_fields: false
-      title: ''
+      relationships: {  }
       header: {  }
       footer: {  }
-      relationships: {  }
-      fields: {  }
-      arguments: {  }
       display_extenders: {  }
-    display_plugin: default
-    display_title: Master
-    id: default
-    position: 0
     cache_metadata:
+      max-age: -1
       contexts:
         - 'languages:language_interface'
         - url.query_args
         - 'user.node_grants:view'
         - user.permissions
-      max-age: -1
       tags: {  }
   feed_1:
-    display_plugin: feed
     id: feed_1
     display_title: Feed
+    display_plugin: feed
     position: 2
     display_options:
-      sitename_title: true
-      path: rss.xml
-      displays:
-        page_1: page_1
-        default: ''
       pager:
         type: some
         options:
-          items_per_page: 10
           offset: 0
+          items_per_page: 10
       style:
         type: rss
         options:
-          description: ''
           grouping: {  }
           uses_fields: false
+          description: ''
       row:
         type: node_rss
         options:
           relationship: none
           view_mode: rss
       display_extenders: {  }
+      path: rss.xml
+      sitename_title: true
+      displays:
+        page_1: page_1
+        default: ''
     cache_metadata:
+      max-age: -1
       contexts:
         - 'languages:language_interface'
         - 'user.node_grants:view'
         - user.permissions
-      max-age: -1
       tags: {  }
   page_1:
-    display_options:
-      path: node
-      display_extenders: {  }
-    display_plugin: page
-    display_title: Page
     id: page_1
+    display_title: Page
+    display_plugin: page
     position: 1
+    display_options:
+      display_extenders: {  }
+      path: node
     cache_metadata:
+      max-age: -1
       contexts:
         - 'languages:language_interface'
         - url.query_args
         - 'user.node_grants:view'
         - user.permissions
-      max-age: -1
       tags: {  }
diff --git a/config/views.view.glossary.yml b/config/views.view.glossary.yml
index c2acdc3b5..628bb0b86 100644
--- a/config/views.view.glossary.yml
+++ b/config/views.view.glossary.yml
@@ -23,59 +23,17 @@ display:
     display_plugin: default
     position: 0
     display_options:
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      use_ajax: true
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      cache:
-        type: tag
-        options: {  }
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      pager:
-        type: mini
-        options:
-          items_per_page: 36
-          offset: 0
-          id: 0
-          total_pages: 0
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          tags:
-            previous: ‹‹
-            next: ››
       fields:
         title:
           id: title
           table: node_field_data
           field: title
-          plugin_id: field
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: node
+          entity_field: title
+          plugin_id: field
           label: Title
           exclude: false
           alter:
@@ -117,18 +75,17 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          entity_type: node
-          entity_field: title
         name:
           id: name
           table: users_field_data
           field: name
-          label: Author
           relationship: uid
-          plugin_id: field
-          type: user_name
           group_type: group
           admin_label: ''
+          entity_type: user
+          entity_field: name
+          plugin_id: field
+          label: Author
           exclude: false
           alter:
             alter_text: false
@@ -169,22 +126,18 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          entity_type: user
-          entity_field: name
+          type: user_name
         changed:
           id: changed
           table: node_field_data
           field: changed
-          label: 'Last update'
-          type: timestamp
-          settings:
-            date_format: long
-            custom_date_format: ''
-            timezone: ''
-          plugin_id: field
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: node
+          entity_field: changed
+          plugin_id: field
+          label: 'Last update'
           exclude: false
           alter:
             alter_text: false
@@ -225,90 +178,82 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          entity_type: node
-          entity_field: changed
+          type: timestamp
+          settings:
+            date_format: long
+            custom_date_format: ''
+            timezone: ''
+      pager:
+        type: mini
+        options:
+          offset: 0
+          items_per_page: 36
+          total_pages: 0
+          id: 0
+          tags:
+            next: ››
+            previous: ‹‹
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      access:
+        type: perm
+        options:
+          perm: 'access content'
+      cache:
+        type: tag
+        options: {  }
+      empty: {  }
+      sorts: {  }
       arguments:
         title:
           id: title
           table: node_field_data
           field: title
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: title
+          plugin_id: string
           default_action: default
           exception:
             title_enable: true
+          title_enable: false
+          title: ''
           default_argument_type: fixed
           default_argument_options:
             argument: a
+          default_argument_skip_url: false
+          summary_options: {  }
           summary:
             format: default_summary
           specify_validation: true
+          validate:
+            type: none
+            fail: 'not found'
+          validate_options: {  }
           glossary: true
           limit: 1
           case: upper
           path_case: lower
           transform_dash: false
-          plugin_id: string
-          relationship: none
-          group_type: group
-          admin_label: ''
-          title_enable: false
-          title: ''
-          default_argument_skip_url: false
-          summary_options: {  }
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
           break_phrase: false
-          entity_type: node
-          entity_field: title
-      relationships:
-        uid:
-          id: uid
-          table: node_field_data
-          field: uid
-          plugin_id: standard
-          relationship: none
-          group_type: group
-          admin_label: author
-          required: false
-      style:
-        type: table
-        options:
-          columns:
-            title: title
-            name: name
-            changed: changed
-          default: title
-          info:
-            title:
-              sortable: true
-              separator: ''
-            name:
-              sortable: true
-              separator: ''
-            changed:
-              sortable: true
-              separator: ''
-          override: true
-          sticky: false
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          uses_fields: false
-          order: asc
-          summary: ''
-          empty_table: false
-      row:
-        type: fields
-        options:
-          inline: {  }
-          separator: ''
-          hide_empty: false
-          default_field_elements: true
-      header: {  }
-      footer: {  }
-      empty: {  }
-      sorts: {  }
       filters:
         langcode:
           id: langcode
@@ -317,6 +262,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: node
+          entity_field: langcode
+          plugin_id: language
           operator: in
           value:
             '***LANGUAGE_language_content***': '***LANGUAGE_language_content***'
@@ -328,6 +276,8 @@ display:
             description: ''
             use_operator: false
             operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: ''
             required: false
             remember: false
@@ -335,8 +285,6 @@ display:
             remember_roles:
               authenticated: authenticated
             reduce: false
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -349,11 +297,64 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          plugin_id: language
-          entity_type: node
-          entity_field: langcode
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          uses_fields: false
+          columns:
+            title: title
+            name: name
+            changed: changed
+          default: title
+          info:
+            title:
+              sortable: true
+              separator: ''
+            name:
+              sortable: true
+              separator: ''
+            changed:
+              sortable: true
+              separator: ''
+          override: true
+          sticky: false
+          summary: ''
+          order: asc
+          empty_table: false
+      row:
+        type: fields
+        options:
+          default_field_elements: true
+          inline: {  }
+          separator: ''
+          hide_empty: false
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
+      relationships:
+        uid:
+          id: uid
+          table: node_field_data
+          field: uid
+          relationship: none
+          group_type: group
+          admin_label: author
+          plugin_id: standard
+          required: false
+      use_ajax: true
+      header: {  }
+      footer: {  }
       display_extenders: {  }
     cache_metadata:
+      max-age: -1
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
@@ -361,7 +362,6 @@ display:
         - url.query_args
         - 'user.node_grants:view'
         - user.permissions
-      max-age: -1
       tags: {  }
   attachment_1:
     id: attachment_1
@@ -369,59 +369,60 @@ display:
     display_plugin: attachment
     position: 2
     display_options:
-      query:
-        type: views_query
-        options: {  }
       pager:
         type: none
         options:
           offset: 0
           items_per_page: 0
-      defaults:
-        arguments: false
       arguments:
         title:
           id: title
           table: node_field_data
           field: title
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: title
+          plugin_id: string
           default_action: summary
           exception:
             title_enable: true
+          title_enable: false
+          title: ''
           default_argument_type: fixed
           default_argument_options:
             argument: a
-          summary:
-            format: unformatted_summary
+          default_argument_skip_url: false
           summary_options:
             items_per_page: 25
             inline: true
             separator: ' | '
+          summary:
+            format: unformatted_summary
           specify_validation: true
+          validate:
+            type: none
+            fail: 'not found'
+          validate_options: {  }
           glossary: true
           limit: 1
           case: upper
           path_case: lower
           transform_dash: false
-          plugin_id: string
-          relationship: none
-          group_type: group
-          admin_label: ''
-          title_enable: false
-          title: ''
-          default_argument_skip_url: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
           break_phrase: false
-          entity_type: node
-          entity_field: title
+      query:
+        type: views_query
+        options: {  }
+      defaults:
+        arguments: false
+      display_extenders: {  }
       displays:
         default: default
         page_1: page_1
       inherit_arguments: false
-      display_extenders: {  }
     cache_metadata:
+      max-age: -1
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
@@ -429,7 +430,6 @@ display:
         - url.query_args
         - 'user.node_grants:view'
         - user.permissions
-      max-age: -1
       tags: {  }
   page_1:
     id: page_1
@@ -440,6 +440,7 @@ display:
       query:
         type: views_query
         options: {  }
+      display_extenders: {  }
       path: glossary
       menu:
         type: normal
@@ -447,8 +448,8 @@ display:
         weight: 0
         menu_name: main
         parent: ''
-      display_extenders: {  }
     cache_metadata:
+      max-age: -1
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
@@ -456,5 +457,4 @@ display:
         - url.query_args
         - 'user.node_grants:view'
         - user.permissions
-      max-age: -1
       tags: {  }
diff --git a/config/views.view.media.yml b/config/views.view.media.yml
index 4f2b4795c..a2f1209b0 100644
--- a/config/views.view.media.yml
+++ b/config/views.view.media.yml
@@ -5,8 +5,8 @@ dependencies:
   config:
     - image.style.thumbnail
   module:
-    - image
     - media
+    - svg_image
     - user
 _core:
   default_config_hash: UZP23LgBdE1XbvscbLCdd9uTk5t4qqA1Z56koqbvYP0
@@ -19,122 +19,12 @@ base_table: media_field_data
 base_field: mid
 display:
   default:
-    display_plugin: default
     id: default
     display_title: Master
+    display_plugin: default
     position: 0
     display_options:
-      access:
-        type: perm
-        options:
-          perm: 'access media overview'
-      cache:
-        type: tag
-        options: {  }
-      query:
-        type: views_query
-        options:
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_comment: ''
-          query_tags: {  }
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Filter
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      pager:
-        type: full
-        options:
-          items_per_page: 50
-          offset: 0
-          id: 0
-          total_pages: null
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          tags:
-            previous: '‹ Previous'
-            next: 'Next ›'
-            first: '« First'
-            last: 'Last »'
-          quantity: 9
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          override: true
-          sticky: false
-          caption: ''
-          summary: ''
-          description: ''
-          columns:
-            name: name
-            bundle: bundle
-            changed: changed
-            uid: uid
-            status: status
-            thumbnail__target_id: thumbnail__target_id
-          info:
-            name:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            bundle:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            changed:
-              sortable: true
-              default_sort_order: desc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            uid:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            status:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            thumbnail__target_id:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          default: changed
-          empty_table: true
-      row:
-        type: fields
+      title: Media
       fields:
         media_bulk_form:
           id: media_bulk_form
@@ -143,6 +33,8 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          plugin_id: bulk_form
           label: ''
           exclude: false
           alter:
@@ -187,8 +79,6 @@ display:
           action_title: Action
           include_exclude: exclude
           selected_actions: {  }
-          entity_type: media
-          plugin_id: bulk_form
         thumbnail__target_id:
           id: thumbnail__target_id
           table: media_field_data
@@ -196,6 +86,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          entity_field: thumbnail
+          plugin_id: field
           label: Thumbnail
           exclude: false
           alter:
@@ -240,8 +133,8 @@ display:
           click_sort_column: target_id
           type: image
           settings:
-            image_style: thumbnail
             image_link: ''
+            image_style: thumbnail
           group_column: ''
           group_columns: {  }
           group_rows: true
@@ -252,34 +145,27 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          entity_type: media
-          entity_field: thumbnail
-          plugin_id: field
         name:
           id: name
           table: media_field_data
           field: name
+          relationship: none
+          group_type: group
+          admin_label: ''
           entity_type: media
           entity_field: media
+          plugin_id: field
+          label: 'Media name'
+          exclude: false
           alter:
             alter_text: false
             make_link: false
             absolute: false
-            trim: false
             word_boundary: false
             ellipsis: false
             strip_tags: false
+            trim: false
             html: false
-          hide_empty: false
-          empty_zero: false
-          settings:
-            link_to_entity: true
-          plugin_id: field
-          relationship: none
-          group_type: group
-          admin_label: ''
-          label: 'Media name'
-          exclude: false
           element_type: ''
           element_class: ''
           element_label_type: ''
@@ -289,9 +175,13 @@ display:
           element_wrapper_class: ''
           element_default_classes: true
           empty: ''
+          hide_empty: false
+          empty_zero: false
           hide_alter_empty: true
           click_sort_column: value
           type: string
+          settings:
+            link_to_entity: true
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -309,6 +199,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          entity_field: bundle
+          plugin_id: field
           label: Type
           exclude: false
           alter:
@@ -364,9 +257,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          entity_type: media
-          entity_field: bundle
-          plugin_id: field
         uid:
           id: uid
           table: media_field_data
@@ -374,6 +264,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          entity_field: uid
+          plugin_id: field
           label: Author
           exclude: false
           alter:
@@ -429,9 +322,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          entity_type: media
-          entity_field: uid
-          plugin_id: field
         status:
           id: status
           table: media_field_data
@@ -439,6 +329,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          entity_field: status
+          plugin_id: field
           label: Status
           exclude: false
           alter:
@@ -484,8 +377,8 @@ display:
           type: boolean
           settings:
             format: custom
-            format_custom_true: Published
             format_custom_false: Unpublished
+            format_custom_true: Published
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -496,9 +389,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          entity_type: media
-          entity_field: status
-          plugin_id: field
         changed:
           id: changed
           table: media_field_data
@@ -506,6 +396,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          entity_field: changed
+          plugin_id: field
           label: Updated
           exclude: false
           alter:
@@ -563,9 +456,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          entity_type: media
-          entity_field: changed
-          plugin_id: field
         operations:
           id: operations
           table: media
@@ -573,6 +463,8 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          plugin_id: entity_operations
           label: Operations
           exclude: false
           alter:
@@ -615,8 +507,74 @@ display:
           empty_zero: false
           hide_alter_empty: true
           destination: true
+      pager:
+        type: full
+        options:
+          offset: 0
+          items_per_page: 50
+          total_pages: null
+          id: 0
+          tags:
+            next: 'Next ›'
+            previous: '‹ Previous'
+            first: '« First'
+            last: 'Last »'
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          quantity: 9
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Filter
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      access:
+        type: perm
+        options:
+          perm: 'access media overview'
+      cache:
+        type: tag
+        options: {  }
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: text_custom
+          empty: true
+          content: 'No media available.'
+          tokenize: false
+      sorts:
+        created:
+          id: created
+          table: media_field_data
+          field: created
+          relationship: none
+          group_type: group
+          admin_label: ''
           entity_type: media
-          plugin_id: entity_operations
+          entity_field: created
+          plugin_id: date
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: created
+          exposed: false
+          granularity: second
+      arguments: {  }
       filters:
         name:
           id: name
@@ -625,6 +583,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          entity_field: name
+          plugin_id: string
           operator: contains
           value: ''
           group: 1
@@ -635,6 +596,8 @@ display:
             description: ''
             use_operator: false
             operator: name_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: name
             required: false
             remember: false
@@ -643,8 +606,6 @@ display:
               authenticated: authenticated
               anonymous: '0'
               administrator: '0'
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -657,9 +618,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: media
-          entity_field: name
-          plugin_id: string
         bundle:
           id: bundle
           table: media_field_data
@@ -667,6 +625,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          entity_field: bundle
+          plugin_id: bundle
           operator: in
           value: {  }
           group: 1
@@ -677,6 +638,8 @@ display:
             description: ''
             use_operator: false
             operator: bundle_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: type
             required: false
             remember: false
@@ -686,8 +649,6 @@ display:
               anonymous: '0'
               administrator: '0'
             reduce: false
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -700,9 +661,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: media
-          entity_field: bundle
-          plugin_id: bundle
         status:
           id: status
           table: media_field_data
@@ -710,6 +668,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          entity_field: status
+          plugin_id: boolean
           operator: '='
           value: '1'
           group: 1
@@ -720,14 +681,14 @@ display:
             description: null
             use_operator: false
             operator: status_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: status
             required: true
             remember: false
             multiple: false
             remember_roles:
               authenticated: authenticated
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: true
           group_info:
             label: 'Published status'
@@ -748,9 +709,6 @@ display:
                 title: Unpublished
                 operator: '='
                 value: '0'
-          plugin_id: boolean
-          entity_type: media
-          entity_field: status
         status_extra:
           id: status_extra
           table: media_field_data
@@ -758,6 +716,8 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          plugin_id: media_status
           operator: '='
           value: ''
           group: 1
@@ -788,8 +748,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: media
-          plugin_id: media_status
         langcode:
           id: langcode
           table: media_field_data
@@ -797,6 +755,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          entity_field: langcode
+          plugin_id: language
           operator: in
           value: {  }
           group: 1
@@ -807,6 +768,8 @@ display:
             description: ''
             use_operator: false
             operator: langcode_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: langcode
             required: false
             remember: false
@@ -816,8 +779,6 @@ display:
               anonymous: '0'
               administrator: '0'
             reduce: false
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -830,42 +791,82 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: media
-          entity_field: langcode
-          plugin_id: language
-      sorts:
-        created:
-          id: created
-          table: media_field_data
-          field: created
-          order: DESC
-          entity_type: media
-          entity_field: created
-          plugin_id: date
-          relationship: none
-          group_type: group
-          admin_label: ''
-          exposed: false
-          expose:
-            label: ''
-          granularity: second
-      title: Media
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          columns:
+            name: name
+            bundle: bundle
+            changed: changed
+            uid: uid
+            status: status
+            thumbnail__target_id: thumbnail__target_id
+          default: changed
+          info:
+            name:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            bundle:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            changed:
+              sortable: true
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            uid:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            status:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            thumbnail__target_id:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          override: true
+          sticky: false
+          summary: ''
+          empty_table: true
+          caption: ''
+          description: ''
+      row:
+        type: fields
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
+      relationships: {  }
       header: {  }
       footer: {  }
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          empty: true
-          tokenize: false
-          content: 'No media available.'
-          plugin_id: text_custom
-      relationships: {  }
-      arguments: {  }
       display_extenders: {  }
     cache_metadata:
       max-age: 0
@@ -878,23 +879,23 @@ display:
         - user.permissions
       tags: {  }
   media_page_list:
-    display_plugin: page
     id: media_page_list
     display_title: Media
+    display_plugin: page
     position: 1
     display_options:
+      display_description: ''
       display_extenders: {  }
       path: admin/content/media
       menu:
         type: tab
         title: Media
         description: ''
+        weight: 0
         expanded: false
+        menu_name: main
         parent: ''
-        weight: 0
         context: '0'
-        menu_name: main
-      display_description: ''
     cache_metadata:
       max-age: 0
       contexts:
diff --git a/config/views.view.media_library.yml b/config/views.view.media_library.yml
index 6b5d94376..6d4741bef 100644
--- a/config/views.view.media_library.yml
+++ b/config/views.view.media_library.yml
@@ -5,14 +5,14 @@ dependencies:
   config:
     - core.entity_view_mode.media.media_library
     - image.style.media_library
-  enforced:
-    module:
-      - media_library
   module:
-    - image
     - media
     - media_library
+    - svg_image
     - user
+  enforced:
+    module:
+      - media_library
 _core:
   default_config_hash: dHOSWSHbMJNke0ZBGh1O5KrnwynSOCOpQycITW-pwfs
 id: media_library
@@ -24,67 +24,12 @@ base_table: media_field_data
 base_field: mid
 display:
   default:
-    display_plugin: default
     id: default
     display_title: Master
+    display_plugin: default
     position: 0
     display_options:
-      access:
-        type: perm
-        options:
-          perm: 'access media overview'
-      cache:
-        type: tag
-        options: {  }
-      query:
-        type: views_query
-        options:
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_comment: ''
-          query_tags: {  }
-      exposed_form:
-        type: basic
-        options:
-          submit_button: 'Apply filters'
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: false
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      pager:
-        type: mini
-        options:
-          items_per_page: 24
-          offset: 0
-          id: 0
-          total_pages: null
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '6, 12, 24, 48'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          tags:
-            previous: ‹‹
-            next: ››
-      style:
-        type: default
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-      row:
-        type: fields
-        options:
-          default_field_elements: true
-          inline: {  }
-          separator: ''
-          hide_empty: false
+      title: Media
       fields:
         media_bulk_form:
           id: media_bulk_form
@@ -93,6 +38,8 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          plugin_id: bulk_form
           label: ''
           exclude: false
           alter:
@@ -137,8 +84,6 @@ display:
           action_title: Action
           include_exclude: exclude
           selected_actions: {  }
-          entity_type: media
-          plugin_id: bulk_form
         rendered_entity:
           id: rendered_entity
           table: media
@@ -146,6 +91,8 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          plugin_id: rendered_entity
           label: ''
           exclude: false
           alter:
@@ -188,8 +135,100 @@ display:
           empty_zero: false
           hide_alter_empty: true
           view_mode: media_library
+      pager:
+        type: mini
+        options:
+          offset: 0
+          items_per_page: 24
+          total_pages: null
+          id: 0
+          tags:
+            next: ››
+            previous: ‹‹
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '6, 12, 24, 48'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+      exposed_form:
+        type: basic
+        options:
+          submit_button: 'Apply filters'
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: false
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      access:
+        type: perm
+        options:
+          perm: 'access media overview'
+      cache:
+        type: tag
+        options: {  }
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: text_custom
+          empty: true
+          content: 'No media available.'
+          tokenize: false
+      sorts:
+        created:
+          id: created
+          table: media_field_data
+          field: created
+          relationship: none
+          group_type: group
+          admin_label: ''
           entity_type: media
-          plugin_id: rendered_entity
+          entity_field: created
+          plugin_id: date
+          order: DESC
+          expose:
+            label: 'Newest first'
+            field_identifier: created
+          exposed: true
+          granularity: second
+        name:
+          id: name
+          table: media_field_data
+          field: name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: media
+          entity_field: name
+          plugin_id: standard
+          order: ASC
+          expose:
+            label: 'Name (A-Z)'
+            field_identifier: name
+          exposed: true
+        name_1:
+          id: name_1
+          table: media_field_data
+          field: name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: media
+          entity_field: name
+          plugin_id: standard
+          order: DESC
+          expose:
+            label: 'Name (Z-A)'
+            field_identifier: name_1
+          exposed: true
       filters:
         status:
           id: status
@@ -198,6 +237,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          entity_field: status
+          plugin_id: boolean
           operator: '='
           value: '1'
           group: 1
@@ -208,14 +250,14 @@ display:
             description: null
             use_operator: false
             operator: status_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: status
             required: true
             remember: false
             multiple: false
             remember_roles:
               authenticated: authenticated
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: true
           group_info:
             label: Published
@@ -236,9 +278,6 @@ display:
                 title: Unpublished
                 operator: '='
                 value: '0'
-          plugin_id: boolean
-          entity_type: media
-          entity_field: status
         name:
           id: name
           table: media_field_data
@@ -246,6 +285,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          entity_field: name
+          plugin_id: string
           operator: contains
           value: ''
           group: 1
@@ -256,6 +298,8 @@ display:
             description: ''
             use_operator: false
             operator: name_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: name
             required: false
             remember: false
@@ -264,8 +308,6 @@ display:
               authenticated: authenticated
               anonymous: '0'
               administrator: '0'
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -278,9 +320,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: media
-          entity_field: name
-          plugin_id: string
         bundle:
           id: bundle
           table: media_field_data
@@ -288,6 +327,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          entity_field: bundle
+          plugin_id: bundle
           operator: in
           value: {  }
           group: 1
@@ -298,6 +340,8 @@ display:
             description: ''
             use_operator: false
             operator: bundle_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: type
             required: false
             remember: false
@@ -307,8 +351,6 @@ display:
               anonymous: '0'
               administrator: '0'
             reduce: false
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: 'Media type'
@@ -324,9 +366,6 @@ display:
               1: {  }
               2: {  }
               3: {  }
-          entity_type: media
-          entity_field: bundle
-          plugin_id: bundle
         status_extra:
           id: status_extra
           table: media_field_data
@@ -334,6 +373,8 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          plugin_id: media_status
           operator: '='
           value: ''
           group: 1
@@ -364,8 +405,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: media
-          plugin_id: media_status
         langcode:
           id: langcode
           table: media_field_data
@@ -373,6 +412,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          entity_field: langcode
+          plugin_id: language
           operator: in
           value: {  }
           group: 1
@@ -383,6 +425,8 @@ display:
             description: ''
             use_operator: false
             operator: langcode_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: langcode
             required: false
             remember: false
@@ -392,8 +436,6 @@ display:
               anonymous: '0'
               administrator: '0'
             reduce: false
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -406,98 +448,59 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
+      style:
+        type: default
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+      row:
+        type: fields
+        options:
+          default_field_elements: true
+          inline: {  }
+          separator: ''
+          hide_empty: false
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
+      relationships: {  }
+      css_class: ''
+      use_ajax: true
+      header: {  }
+      footer: {  }
+      display_extenders: {  }
+    cache_metadata:
+      max-age: 0
+      contexts:
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - 'url.query_args:sort_by'
+        - user
+        - user.permissions
+      tags: {  }
+  page:
+    id: page
+    display_title: Page
+    display_plugin: page
+    position: 1
+    display_options:
+      fields:
+        media_bulk_form:
+          id: media_bulk_form
+          table: media
+          field: media_bulk_form
+          relationship: none
+          group_type: group
+          admin_label: ''
           entity_type: media
-          entity_field: langcode
-          plugin_id: language
-      sorts:
-        created:
-          id: created
-          table: media_field_data
-          field: created
-          relationship: none
-          group_type: group
-          admin_label: ''
-          order: DESC
-          exposed: true
-          expose:
-            label: 'Newest first'
-          granularity: second
-          entity_type: media
-          entity_field: created
-          plugin_id: date
-        name:
-          id: name
-          table: media_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          order: ASC
-          exposed: true
-          expose:
-            label: 'Name (A-Z)'
-          entity_type: media
-          entity_field: name
-          plugin_id: standard
-        name_1:
-          id: name_1
-          table: media_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          order: DESC
-          exposed: true
-          expose:
-            label: 'Name (Z-A)'
-          entity_type: media
-          entity_field: name
-          plugin_id: standard
-      title: Media
-      header: {  }
-      footer: {  }
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          empty: true
-          tokenize: false
-          content: 'No media available.'
-          plugin_id: text_custom
-      relationships: {  }
-      display_extenders: {  }
-      use_ajax: true
-      css_class: ''
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - 'url.query_args:sort_by'
-        - user
-        - user.permissions
-      tags: {  }
-  page:
-    display_plugin: page
-    id: page
-    display_title: Page
-    position: 1
-    display_options:
-      display_extenders: {  }
-      path: admin/content/media-grid
-      fields:
-        media_bulk_form:
-          id: media_bulk_form
-          table: media
-          field: media_bulk_form
-          relationship: none
-          group_type: group
-          admin_label: ''
+          plugin_id: bulk_form
           label: ''
           exclude: false
           alter:
@@ -542,8 +545,6 @@ display:
           action_title: Action
           include_exclude: exclude
           selected_actions: {  }
-          entity_type: media
-          plugin_id: bulk_form
         name:
           id: name
           table: media_field_data
@@ -551,6 +552,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          entity_field: name
+          plugin_id: field
           label: ''
           exclude: true
           alter:
@@ -606,9 +610,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          entity_type: media
-          entity_field: name
-          plugin_id: field
         edit_media:
           id: edit_media
           table: media
@@ -616,6 +617,8 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          plugin_id: entity_link_edit
           label: ''
           exclude: false
           alter:
@@ -660,8 +663,6 @@ display:
           text: Edit
           output_url_as_text: false
           absolute: false
-          entity_type: media
-          plugin_id: entity_link_edit
         delete_media:
           id: delete_media
           table: media
@@ -669,6 +670,8 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          plugin_id: entity_link_delete
           label: ''
           exclude: false
           alter:
@@ -713,8 +716,6 @@ display:
           text: Delete
           output_url_as_text: false
           absolute: false
-          entity_type: media
-          plugin_id: entity_link_delete
         rendered_entity:
           id: rendered_entity
           table: media
@@ -722,6 +723,8 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          plugin_id: rendered_entity
           label: ''
           exclude: false
           alter:
@@ -764,10 +767,10 @@ display:
           empty_zero: false
           hide_alter_empty: true
           view_mode: media_library
-          entity_type: media
-          plugin_id: rendered_entity
       defaults:
         fields: false
+      display_extenders: {  }
+      path: admin/content/media-grid
     cache_metadata:
       max-age: 0
       contexts:
@@ -780,13 +783,11 @@ display:
         - user.permissions
       tags: {  }
   widget:
-    display_plugin: page
     id: widget
     display_title: Widget
+    display_plugin: page
     position: 2
     display_options:
-      display_extenders: {  }
-      path: admin/content/media-widget
       fields:
         media_library_select_form:
           id: media_library_select_form
@@ -795,6 +796,8 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          plugin_id: media_library_select_form
           label: ''
           exclude: false
           alter:
@@ -836,8 +839,6 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          entity_type: media
-          plugin_id: media_library_select_form
         rendered_entity:
           id: rendered_entity
           table: media
@@ -845,6 +846,8 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          plugin_id: rendered_entity
           label: ''
           exclude: false
           alter:
@@ -887,21 +890,52 @@ display:
           empty_zero: false
           hide_alter_empty: true
           view_mode: media_library
-          entity_type: media
-          plugin_id: rendered_entity
-      defaults:
-        fields: false
-        access: false
-        filters: false
-        filter_groups: false
-        arguments: false
-        header: false
-        css_class: false
-      display_description: ''
       access:
         type: perm
         options:
           perm: 'view media'
+      arguments:
+        bundle:
+          id: bundle
+          table: media_field_data
+          field: bundle
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: media
+          entity_field: bundle
+          plugin_id: string
+          default_action: ignore
+          exception:
+            value: all
+            title_enable: false
+            title: All
+          title_enable: false
+          title: ''
+          default_argument_type: fixed
+          default_argument_options:
+            argument: ''
+          default_argument_skip_url: false
+          summary_options:
+            base_path: ''
+            count: true
+            override: false
+            items_per_page: 24
+          summary:
+            sort_order: asc
+            number_of_records: 0
+            format: default_summary
+          specify_validation: false
+          validate:
+            type: none
+            fail: 'not found'
+          validate_options: {  }
+          glossary: false
+          limit: 0
+          case: none
+          path_case: none
+          transform_dash: false
+          break_phrase: false
       filters:
         status:
           id: status
@@ -910,6 +944,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          entity_field: status
+          plugin_id: boolean
           operator: '='
           value: '1'
           group: 1
@@ -920,14 +957,14 @@ display:
             description: ''
             use_operator: false
             operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: ''
             required: false
             remember: false
             multiple: false
             remember_roles:
               authenticated: authenticated
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -940,9 +977,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: media
-          entity_field: status
-          plugin_id: boolean
         name:
           id: name
           table: media_field_data
@@ -950,6 +984,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          entity_field: name
+          plugin_id: string
           operator: contains
           value: ''
           group: 1
@@ -960,6 +997,8 @@ display:
             description: ''
             use_operator: false
             operator: name_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: name
             required: false
             remember: false
@@ -968,8 +1007,6 @@ display:
               authenticated: authenticated
               anonymous: '0'
               administrator: '0'
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -982,9 +1019,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: media
-          entity_field: name
-          plugin_id: string
         default_langcode:
           id: default_langcode
           table: media_field_data
@@ -992,6 +1026,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          entity_field: default_langcode
+          plugin_id: boolean
           operator: '='
           value: '1'
           group: 1
@@ -1022,74 +1059,40 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: media
-          entity_field: default_langcode
-          plugin_id: boolean
       filter_groups:
         operator: AND
         groups:
           1: AND
-      arguments:
-        bundle:
-          id: bundle
-          table: media_field_data
-          field: bundle
-          relationship: none
-          group_type: group
-          admin_label: ''
-          default_action: ignore
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: fixed
-          default_argument_options:
-            argument: ''
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            items_per_page: 24
-            override: false
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          glossary: false
-          limit: 0
-          case: none
-          path_case: none
-          transform_dash: false
-          break_phrase: false
-          entity_type: media
-          entity_field: bundle
-          plugin_id: string
+      defaults:
+        access: false
+        css_class: false
+        fields: false
+        arguments: false
+        filters: false
+        filter_groups: false
+        header: false
+      css_class: ''
+      display_description: ''
       header:
         display_link_grid:
           id: display_link_grid
           table: views
           field: display_link
-          display_id: widget
-          label: Grid
           plugin_id: display_link
+          label: Grid
           empty: true
+          display_id: widget
         display_link_table:
           id: display_link_table
           table: views
           field: display_link
-          display_id: widget_table
-          label: Table
           plugin_id: display_link
+          label: Table
           empty: true
-      css_class: ''
+          display_id: widget_table
       rendering_language: '***LANGUAGE_language_interface***'
+      display_extenders: {  }
+      path: admin/content/media-widget
     cache_metadata:
       max-age: -1
       contexts:
@@ -1100,88 +1103,69 @@ display:
         - user.permissions
       tags: {  }
   widget_table:
-    display_plugin: page
     id: widget_table
     display_title: 'Widget (table)'
+    display_plugin: page
     position: 3
     display_options:
-      display_extenders: {  }
-      path: admin/content/media-widget-table
-      style:
-        type: table
-        options:
-          row_class: 'media-library-item media-library-item--table js-media-library-item js-click-to-select'
-          default_row_class: true
-      defaults:
-        style: false
-        row: false
-        fields: false
-        access: false
-        filters: false
-        filter_groups: false
-        arguments: false
-        header: false
-        css_class: false
-      row:
-        type: fields
       fields:
         media_library_select_form:
           id: media_library_select_form
-          label: ''
           table: media
           field: media_library_select_form
           relationship: none
           entity_type: media
           plugin_id: media_library_select_form
-          element_wrapper_class: ''
+          label: ''
           element_class: ''
+          element_wrapper_class: ''
         thumbnail__target_id:
           id: thumbnail__target_id
-          label: Thumbnail
           table: media_field_data
           field: thumbnail__target_id
           relationship: none
-          type: image
           entity_type: media
           entity_field: thumbnail
           plugin_id: field
+          label: Thumbnail
+          type: image
           settings:
-            image_style: media_library
             image_link: ''
+            image_style: media_library
         name:
           id: name
-          label: Name
           table: media_field_data
           field: name
           relationship: none
-          type: string
           entity_type: media
           entity_field: name
           plugin_id: field
+          label: Name
+          type: string
           settings:
             link_to_entity: false
         uid:
           id: uid
-          label: Author
           table: media_field_revision
           field: uid
           relationship: none
-          type: entity_reference_label
           entity_type: media
           entity_field: uid
           plugin_id: field
+          label: Author
+          type: entity_reference_label
           settings:
             link: true
         changed:
           id: changed
-          label: Updated
           table: media_field_data
           field: changed
           relationship: none
-          type: timestamp
           entity_type: media
           entity_field: changed
           plugin_id: field
+          label: Updated
+          type: timestamp
           settings:
             date_format: short
             custom_date_format: ''
@@ -1190,6 +1174,48 @@ display:
         type: perm
         options:
           perm: 'view media'
+      arguments:
+        bundle:
+          id: bundle
+          table: media_field_data
+          field: bundle
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: media
+          entity_field: bundle
+          plugin_id: string
+          default_action: ignore
+          exception:
+            value: all
+            title_enable: false
+            title: All
+          title_enable: false
+          title: ''
+          default_argument_type: fixed
+          default_argument_options:
+            argument: ''
+          default_argument_skip_url: false
+          summary_options:
+            base_path: ''
+            count: true
+            override: false
+            items_per_page: 24
+          summary:
+            sort_order: asc
+            number_of_records: 0
+            format: default_summary
+          specify_validation: false
+          validate:
+            type: none
+            fail: 'not found'
+          validate_options: {  }
+          glossary: false
+          limit: 0
+          case: none
+          path_case: none
+          transform_dash: false
+          break_phrase: false
       filters:
         status:
           id: status
@@ -1198,6 +1224,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          entity_field: status
+          plugin_id: boolean
           operator: '='
           value: '1'
           group: 1
@@ -1208,14 +1237,14 @@ display:
             description: ''
             use_operator: false
             operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: ''
             required: false
             remember: false
             multiple: false
             remember_roles:
               authenticated: authenticated
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -1228,9 +1257,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: media
-          entity_field: status
-          plugin_id: boolean
         name:
           id: name
           table: media_field_data
@@ -1238,6 +1264,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          entity_field: name
+          plugin_id: string
           operator: contains
           value: ''
           group: 1
@@ -1248,6 +1277,8 @@ display:
             description: ''
             use_operator: false
             operator: name_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: name
             required: false
             remember: false
@@ -1256,8 +1287,6 @@ display:
               authenticated: authenticated
               anonymous: '0'
               administrator: '0'
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -1270,9 +1299,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: media
-          entity_field: name
-          plugin_id: string
         default_langcode:
           id: default_langcode
           table: media_field_data
@@ -1280,6 +1306,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: media
+          entity_field: default_langcode
+          plugin_id: boolean
           operator: '='
           value: '1'
           group: 1
@@ -1310,74 +1339,48 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: media
-          entity_field: default_langcode
-          plugin_id: boolean
       filter_groups:
         operator: AND
         groups:
           1: AND
-      arguments:
-        bundle:
-          id: bundle
-          table: media_field_data
-          field: bundle
-          relationship: none
-          group_type: group
-          admin_label: ''
-          default_action: ignore
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: fixed
-          default_argument_options:
-            argument: ''
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            items_per_page: 24
-            override: false
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          glossary: false
-          limit: 0
-          case: none
-          path_case: none
-          transform_dash: false
-          break_phrase: false
-          entity_type: media
-          entity_field: bundle
-          plugin_id: string
+      style:
+        type: table
+        options:
+          row_class: 'media-library-item media-library-item--table js-media-library-item js-click-to-select'
+          default_row_class: true
+      row:
+        type: fields
+      defaults:
+        access: false
+        css_class: false
+        style: false
+        row: false
+        fields: false
+        arguments: false
+        filters: false
+        filter_groups: false
+        header: false
+      css_class: ''
       header:
         display_link_grid:
           id: display_link_grid
           table: views
           field: display_link
-          display_id: widget
-          label: Grid
           plugin_id: display_link
+          label: Grid
           empty: true
+          display_id: widget
         display_link_table:
           id: display_link_table
           table: views
           field: display_link
-          display_id: widget_table
-          label: Table
           plugin_id: display_link
+          label: Table
           empty: true
-      css_class: ''
+          display_id: widget_table
       rendering_language: '***LANGUAGE_language_interface***'
+      display_extenders: {  }
+      path: admin/content/media-widget-table
     cache_metadata:
       max-age: -1
       contexts:
diff --git a/config/views.view.moderated_content.yml b/config/views.view.moderated_content.yml
index 2e5a4c126..a5a8d067a 100644
--- a/config/views.view.moderated_content.yml
+++ b/config/views.view.moderated_content.yml
@@ -2,12 +2,12 @@ uuid: 8cf1242f-1f5c-4161-b081-c2661a1906a3
 langcode: en
 status: true
 dependencies:
-  enforced:
-    module:
-      - content_moderation
   module:
     - node
     - user
+  enforced:
+    module:
+      - content_moderation
 _core:
   default_config_hash: Kjqf5d4F134C3zua0tXV7LA3m5OEeS_Fowa2dP9kk2I
 id: moderated_content
@@ -19,114 +19,12 @@ base_table: node_field_revision
 base_field: vid
 display:
   default:
-    display_plugin: default
     id: default
     display_title: Master
+    display_plugin: default
     position: 0
     display_options:
-      access:
-        type: perm
-        options:
-          perm: 'view any unpublished content'
-      cache:
-        type: tag
-        options: {  }
-      query:
-        type: views_query
-        options:
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_comment: ''
-          query_tags: {  }
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Filter
-          reset_button: true
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      pager:
-        type: full
-        options:
-          items_per_page: 50
-          offset: 0
-          id: 0
-          total_pages: null
-          tags:
-            previous: '‹ Previous'
-            next: 'Next ›'
-            first: '« First'
-            last: 'Last »'
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          quantity: 9
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          override: true
-          sticky: true
-          caption: ''
-          summary: ''
-          description: ''
-          columns:
-            title: title
-            type: type
-            name: name
-            moderation_state: moderation_state
-            changed: changed
-          info:
-            title:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            type:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            name:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            moderation_state:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            changed:
-              sortable: true
-              default_sort_order: desc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          default: changed
-          empty_table: true
-      row:
-        type: fields
+      title: 'Moderated content'
       fields:
         title:
           id: title
@@ -135,6 +33,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: node
+          entity_field: title
+          plugin_id: field
           label: Title
           exclude: false
           alter:
@@ -190,9 +91,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          entity_type: node
-          entity_field: title
-          plugin_id: field
         type:
           id: type
           table: node_field_data
@@ -200,6 +98,9 @@ display:
           relationship: nid
           group_type: group
           admin_label: ''
+          entity_type: node
+          entity_field: type
+          plugin_id: field
           label: 'Content type'
           exclude: false
           alter:
@@ -255,9 +156,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          entity_type: node
-          entity_field: type
-          plugin_id: field
         name:
           id: name
           table: users_field_data
@@ -265,6 +163,9 @@ display:
           relationship: uid
           group_type: group
           admin_label: ''
+          entity_type: user
+          entity_field: name
+          plugin_id: field
           label: Author
           exclude: false
           alter:
@@ -320,9 +221,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          entity_type: user
-          entity_field: name
-          plugin_id: field
         moderation_state:
           id: moderation_state
           table: node_field_revision
@@ -330,6 +228,8 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: node
+          plugin_id: field
           label: 'Moderation state'
           exclude: false
           alter:
@@ -384,8 +284,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          entity_type: node
-          plugin_id: field
         changed:
           id: changed
           table: node_field_revision
@@ -393,6 +291,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: node
+          entity_field: changed
+          plugin_id: field
           label: Updated
           exclude: false
           alter:
@@ -450,9 +351,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          entity_type: node
-          entity_field: changed
-          plugin_id: field
         operations:
           id: operations
           table: node_revision
@@ -460,6 +358,8 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: node
+          plugin_id: entity_operations
           label: Operations
           exclude: false
           alter:
@@ -502,8 +402,58 @@ display:
           empty_zero: false
           hide_alter_empty: true
           destination: true
-          entity_type: node
-          plugin_id: entity_operations
+      pager:
+        type: full
+        options:
+          offset: 0
+          items_per_page: 50
+          total_pages: null
+          id: 0
+          tags:
+            next: 'Next ›'
+            previous: '‹ Previous'
+            first: '« First'
+            last: 'Last »'
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          quantity: 9
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Filter
+          reset_button: true
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      access:
+        type: perm
+        options:
+          perm: 'view any unpublished content'
+      cache:
+        type: tag
+        options: {  }
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: text_custom
+          empty: true
+          content: 'No moderated content available. Only pending versions of content, such as drafts, are listed here.'
+          tokenize: false
+      sorts: {  }
+      arguments: {  }
       filters:
         latest_translation_affected_revision:
           id: latest_translation_affected_revision
@@ -512,6 +462,8 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: node
+          plugin_id: latest_translation_affected_revision
           operator: '='
           value: ''
           group: 1
@@ -522,14 +474,14 @@ display:
             description: ''
             use_operator: false
             operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: ''
             required: false
             remember: false
             multiple: false
             remember_roles:
               authenticated: authenticated
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -542,8 +494,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: node
-          plugin_id: latest_translation_affected_revision
         title:
           id: title
           table: node_field_revision
@@ -551,6 +501,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: node
+          entity_field: title
+          plugin_id: string
           operator: contains
           value: ''
           group: 1
@@ -561,6 +514,8 @@ display:
             description: ''
             use_operator: false
             operator: title_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: title
             required: false
             remember: false
@@ -569,8 +524,6 @@ display:
               authenticated: authenticated
               anonymous: '0'
               administrator: '0'
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -583,9 +536,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: node
-          entity_field: title
-          plugin_id: string
         type:
           id: type
           table: node_field_data
@@ -593,6 +543,9 @@ display:
           relationship: nid
           group_type: group
           admin_label: ''
+          entity_type: node
+          entity_field: type
+          plugin_id: bundle
           operator: in
           value: {  }
           group: 1
@@ -603,6 +556,8 @@ display:
             description: ''
             use_operator: false
             operator: type_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: type
             required: false
             remember: false
@@ -612,8 +567,6 @@ display:
               anonymous: '0'
               administrator: '0'
             reduce: false
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -626,9 +579,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: node
-          entity_field: type
-          plugin_id: bundle
         moderation_state:
           id: moderation_state
           table: node_field_revision
@@ -636,6 +586,8 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: node
+          plugin_id: moderation_state_filter
           operator: in
           value:
             editorial-draft: editorial-draft
@@ -648,6 +600,8 @@ display:
             description: ''
             use_operator: false
             operator: moderation_state_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: moderation_state
             required: false
             remember: false
@@ -657,8 +611,6 @@ display:
               anonymous: '0'
               administrator: '0'
             reduce: true
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -671,8 +623,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: node
-          plugin_id: moderation_state_filter
         langcode:
           id: langcode
           table: node_field_revision
@@ -680,6 +630,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: node
+          entity_field: langcode
+          plugin_id: language
           operator: in
           value: {  }
           group: 1
@@ -690,6 +643,8 @@ display:
             description: ''
             use_operator: false
             operator: langcode_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: langcode
             required: false
             remember: false
@@ -699,8 +654,6 @@ display:
               anonymous: '0'
               administrator: '0'
             reduce: false
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -713,9 +666,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: node
-          entity_field: langcode
-          plugin_id: language
         moderation_state_1:
           id: moderation_state_1
           table: node_field_revision
@@ -723,6 +673,8 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: node
+          plugin_id: moderation_state_filter
           operator: 'not in'
           value:
             editorial-published: editorial-published
@@ -734,6 +686,8 @@ display:
             description: ''
             use_operator: false
             operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: ''
             required: false
             remember: false
@@ -741,8 +695,6 @@ display:
             remember_roles:
               authenticated: authenticated
             reduce: false
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -755,24 +707,75 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: node
-          plugin_id: moderation_state_filter
-      sorts: {  }
-      title: 'Moderated content'
-      header: {  }
-      footer: {  }
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          empty: true
-          tokenize: false
-          content: 'No moderated content available. Only pending versions of content, such as drafts, are listed here.'
-          plugin_id: text_custom
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          columns:
+            title: title
+            type: type
+            name: name
+            moderation_state: moderation_state
+            changed: changed
+          default: changed
+          info:
+            title:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            type:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            name:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            moderation_state:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            changed:
+              sortable: true
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          override: true
+          sticky: true
+          summary: ''
+          empty_table: true
+          caption: ''
+          description: ''
+      row:
+        type: fields
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
       relationships:
         nid:
           id: nid
@@ -781,10 +784,10 @@ display:
           relationship: none
           group_type: group
           admin_label: 'Get the actual content from a content revision.'
-          required: false
           entity_type: node
           entity_field: nid
           plugin_id: standard
+          required: false
         uid:
           id: uid
           table: node_field_revision
@@ -792,16 +795,13 @@ display:
           relationship: none
           group_type: group
           admin_label: User
-          required: false
           entity_type: node
           entity_field: uid
           plugin_id: standard
-      arguments: {  }
+          required: false
+      header: {  }
+      footer: {  }
       display_extenders: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
     cache_metadata:
       max-age: -1
       contexts:
@@ -813,14 +813,14 @@ display:
         - user.permissions
       tags: {  }
   moderated_content:
-    display_plugin: page
     id: moderated_content
     display_title: 'Moderated content'
+    display_plugin: page
     position: 1
     display_options:
+      display_description: ''
       display_extenders: {  }
       path: admin/content/moderated
-      display_description: ''
     cache_metadata:
       max-age: -1
       contexts:
diff --git a/config/views.view.redirect.yml b/config/views.view.redirect.yml
index 7bb7cb6db..474737d52 100644
--- a/config/views.view.redirect.yml
+++ b/config/views.view.redirect.yml
@@ -17,122 +17,12 @@ base_table: redirect
 base_field: rid
 display:
   default:
-    display_plugin: default
     id: default
     display_title: Master
+    display_plugin: default
     position: 0
     display_options:
-      access:
-        type: perm
-        options:
-          perm: 'administer redirects'
-      cache:
-        type: tag
-        options: {  }
-      query:
-        type: views_query
-        options:
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_comment: ''
-          query_tags: {  }
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Filter
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      pager:
-        type: full
-        options:
-          items_per_page: 50
-          offset: 0
-          id: 0
-          total_pages: null
-          tags:
-            previous: '‹ previous'
-            next: 'next ›'
-            first: '« first'
-            last: 'last »'
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          quantity: 9
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          override: true
-          sticky: false
-          caption: ''
-          summary: ''
-          description: ''
-          columns:
-            redirect_source__path: redirect_source__path
-            redirect_redirect__uri: redirect_redirect__uri
-            status_code: status_code
-            language: language
-            created: created
-            operations: operations
-          info:
-            redirect_source__path:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            redirect_redirect__uri:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            status_code:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            language:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            created:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            operations:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          default: created
-          empty_table: false
-      row:
-        type: fields
+      title: Redirect
       fields:
         redirect_bulk_form:
           id: redirect_bulk_form
@@ -141,6 +31,8 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: redirect
+          plugin_id: redirect_bulk_form
           label: ''
           exclude: false
           alter:
@@ -185,8 +77,6 @@ display:
           action_title: 'With selection'
           include_exclude: exclude
           selected_actions: {  }
-          entity_type: redirect
-          plugin_id: redirect_bulk_form
         redirect_source__path:
           id: redirect_source__path
           table: redirect
@@ -194,6 +84,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: redirect
+          entity_field: redirect_source
+          plugin_id: field
           label: From
           exclude: false
           alter:
@@ -248,9 +141,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          entity_type: redirect
-          entity_field: redirect_source
-          plugin_id: field
         redirect_redirect__uri:
           id: redirect_redirect__uri
           table: redirect
@@ -279,6 +169,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: redirect
+          entity_field: created
+          plugin_id: date
           label: Created
           exclude: false
           alter:
@@ -323,15 +216,64 @@ display:
           date_format: fallback
           custom_date_format: ''
           timezone: ''
-          entity_type: redirect
-          entity_field: created
-          plugin_id: date
         operations:
           id: operations
           table: redirect
           field: operations
           entity_type: redirect
           plugin_id: entity_operations
+      pager:
+        type: full
+        options:
+          offset: 0
+          items_per_page: 50
+          total_pages: null
+          id: 0
+          tags:
+            next: 'next ›'
+            previous: '‹ previous'
+            first: '« first'
+            last: 'last »'
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          quantity: 9
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Filter
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      access:
+        type: perm
+        options:
+          perm: 'administer redirects'
+      cache:
+        type: tag
+        options: {  }
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: text_custom
+          empty: true
+          content: 'There is no redirect yet.'
+          tokenize: false
+      sorts: {  }
+      arguments: {  }
       filters:
         redirect_source__path:
           id: redirect_source__path
@@ -340,6 +282,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: redirect
+          entity_field: redirect_source
+          plugin_id: string
           operator: contains
           value: ''
           group: 1
@@ -350,6 +295,8 @@ display:
             description: ''
             use_operator: false
             operator: redirect_source__path_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: redirect_source__path
             required: false
             remember: false
@@ -358,8 +305,6 @@ display:
               authenticated: authenticated
               anonymous: '0'
               administrator: '0'
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -372,9 +317,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: redirect
-          entity_field: redirect_source
-          plugin_id: string
         redirect_redirect__uri:
           id: redirect_redirect__uri
           table: redirect
@@ -382,6 +324,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: redirect
+          entity_field: redirect_redirect
+          plugin_id: string
           operator: contains
           value: ''
           group: 1
@@ -392,6 +337,8 @@ display:
             description: ''
             use_operator: false
             operator: redirect_redirect__uri_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: redirect_redirect__uri
             required: false
             remember: false
@@ -400,8 +347,6 @@ display:
               authenticated: authenticated
               anonymous: '0'
               administrator: '0'
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -414,9 +359,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: redirect
-          entity_field: redirect_redirect
-          plugin_id: string
         status_code:
           id: status_code
           table: redirect
@@ -424,6 +366,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: redirect
+          entity_field: status_code
+          plugin_id: numeric
           operator: '='
           value:
             min: ''
@@ -437,6 +382,8 @@ display:
             description: ''
             use_operator: false
             operator: status_code_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: status_code
             required: false
             remember: false
@@ -445,8 +392,6 @@ display:
               authenticated: authenticated
               anonymous: '0'
               administrator: '0'
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: true
           group_info:
             label: 'Status code'
@@ -463,54 +408,51 @@ display:
                 title: '300 Multiple Choices'
                 operator: '='
                 value:
-                  value: '300'
                   min: ''
                   max: ''
+                  value: '300'
               2:
                 title: '301 Moved Permanently'
                 operator: '='
                 value:
-                  value: '301'
                   min: ''
                   max: ''
+                  value: '301'
               3:
                 title: '302 Found'
                 operator: '='
                 value:
-                  value: '302'
                   min: ''
                   max: ''
+                  value: '302'
               4:
                 title: '303 See Other'
                 operator: '='
                 value:
-                  value: '303'
                   min: ''
                   max: ''
+                  value: '303'
               5:
                 title: '304 Not Modified'
                 operator: '='
                 value:
-                  value: '304'
                   min: ''
                   max: ''
+                  value: '304'
               6:
                 title: '305 Use Proxy'
                 operator: '='
                 value:
-                  value: '305'
                   min: ''
                   max: ''
+                  value: '305'
               7:
                 title: '307 Temporary Redirect'
                 operator: '='
                 value:
-                  value: '307'
                   min: ''
                   max: ''
-          entity_type: redirect
-          entity_field: status_code
-          plugin_id: numeric
+                  value: '307'
         language:
           id: language
           table: redirect
@@ -518,6 +460,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: redirect
+          entity_field: language
+          plugin_id: language
           operator: in
           value: {  }
           group: 1
@@ -528,6 +473,8 @@ display:
             description: ''
             use_operator: false
             operator: language_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: language
             required: false
             remember: false
@@ -537,8 +484,6 @@ display:
               anonymous: '0'
               administrator: '0'
             reduce: false
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -551,57 +496,112 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: redirect
-          entity_field: language
-          plugin_id: language
-      sorts: {  }
-      title: Redirect
-      header: {  }
-      footer: {  }
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          empty: true
-          tokenize: false
-          content: 'There is no redirect yet.'
-          plugin_id: text_custom
-      relationships: {  }
-      arguments: {  }
-      display_extenders: {  }
       filter_groups:
         operator: AND
         groups:
           1: AND
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          columns:
+            redirect_source__path: redirect_source__path
+            redirect_redirect__uri: redirect_redirect__uri
+            status_code: status_code
+            language: language
+            created: created
+            operations: operations
+          default: created
+          info:
+            redirect_source__path:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            redirect_redirect__uri:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            status_code:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            language:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            created:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            operations:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          override: true
+          sticky: false
+          summary: ''
+          empty_table: false
+          caption: ''
+          description: ''
+      row:
+        type: fields
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
+      relationships: {  }
+      header: {  }
+      footer: {  }
+      display_extenders: {  }
     cache_metadata:
+      max-age: 0
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
         - url
         - url.query_args
         - user.permissions
-      cacheable: false
-      max-age: 0
       tags: {  }
+      cacheable: false
   page_1:
-    display_plugin: page
     id: page_1
     display_title: Page
+    display_plugin: page
     position: 1
     display_options:
       display_extenders: {  }
       path: admin/config/search/redirect
     cache_metadata:
+      max-age: 0
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
         - url
         - url.query_args
         - user.permissions
-      cacheable: false
-      max-age: 0
       tags: {  }
+      cacheable: false
diff --git a/config/views.view.taxonomy_term.yml b/config/views.view.taxonomy_term.yml
index d5fc217c9..5e8bb2a72 100644
--- a/config/views.view.taxonomy_term.yml
+++ b/config/views.view.taxonomy_term.yml
@@ -24,38 +24,17 @@ display:
     display_plugin: default
     position: 0
     display_options:
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      cache:
-        type: tag
-        options: {  }
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
+      fields: {  }
       pager:
         type: mini
         options:
-          items_per_page: 10
           offset: 0
-          id: 0
+          items_per_page: 10
           total_pages: 0
+          id: 0
+          tags:
+            next: ››
+            previous: ‹‹
           expose:
             items_per_page: false
             items_per_page_label: 'Items per page'
@@ -64,34 +43,51 @@ display:
             items_per_page_options_all_label: '- All -'
             offset: false
             offset_label: Offset
-          tags:
-            previous: ‹‹
-            next: ››
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      access:
+        type: perm
+        options:
+          perm: 'access content'
+      cache:
+        type: tag
+        options: {  }
+      empty: {  }
       sorts:
         sticky:
           id: sticky
           table: taxonomy_index
           field: sticky
-          order: DESC
-          plugin_id: standard
           relationship: none
           group_type: group
           admin_label: ''
-          exposed: false
+          plugin_id: standard
+          order: DESC
           expose:
             label: ''
+            field_identifier: sticky
+          exposed: false
         created:
           id: created
           table: taxonomy_index
           field: created
-          order: DESC
-          plugin_id: date
           relationship: none
           group_type: group
           admin_label: ''
-          exposed: false
+          plugin_id: date
+          order: DESC
           expose:
             label: ''
+            field_identifier: created
+          exposed: false
           granularity: second
       arguments:
         tid:
@@ -101,6 +97,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: taxonomy_index_tid
           default_action: 'not found'
           exception:
             value: ''
@@ -115,8 +112,8 @@ display:
           summary_options:
             base_path: ''
             count: true
-            items_per_page: 25
             override: false
+            items_per_page: 25
           summary:
             sort_order: asc
             number_of_records: 0
@@ -126,15 +123,14 @@ display:
             type: 'entity:taxonomy_term'
             fail: 'not found'
           validate_options:
+            bundles: {  }
             access: true
             operation: view
             multiple: 0
-            bundles: {  }
           break_phrase: false
           add_table: false
           require_value: false
           reduce_duplicates: false
-          plugin_id: taxonomy_index_tid
       filters:
         langcode:
           id: langcode
@@ -143,6 +139,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: node
+          entity_field: langcode
+          plugin_id: language
           operator: in
           value:
             '***LANGUAGE_language_content***': '***LANGUAGE_language_content***'
@@ -154,6 +153,8 @@ display:
             description: ''
             use_operator: false
             operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: ''
             required: false
             remember: false
@@ -161,8 +162,6 @@ display:
             remember_roles:
               authenticated: authenticated
             reduce: false
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -175,9 +174,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          plugin_id: language
-          entity_type: node
-          entity_field: langcode
         status:
           id: status
           table: taxonomy_index
@@ -185,6 +181,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: boolean
           operator: '='
           value: '1'
           group: 1
@@ -195,14 +192,14 @@ display:
             description: ''
             use_operator: false
             operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: ''
             required: false
             remember: false
             multiple: false
             remember_roles:
               authenticated: authenticated
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -215,7 +212,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          plugin_id: boolean
       style:
         type: default
         options:
@@ -227,6 +223,17 @@ display:
         type: 'entity:node'
         options:
           view_mode: teaser
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
+      relationships: {  }
+      link_display: page_1
+      link_url: ''
       header:
         entity_taxonomy_term:
           id: entity_taxonomy_term
@@ -235,27 +242,22 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: entity
           empty: true
-          tokenize: true
           target: '{{ raw_arguments.tid }}'
           view_mode: full
+          tokenize: true
           bypass_access: false
-          plugin_id: entity
       footer: {  }
-      empty: {  }
-      relationships: {  }
-      fields: {  }
       display_extenders: {  }
-      link_url: ''
-      link_display: page_1
     cache_metadata:
+      max-age: -1
       contexts:
         - 'languages:language_interface'
         - url
         - url.query_args
         - 'user.node_grants:view'
         - user.permissions
-      max-age: -1
       tags: {  }
   feed_1:
     id: feed_1
@@ -263,37 +265,37 @@ display:
     display_plugin: feed
     position: 2
     display_options:
-      query:
-        type: views_query
-        options: {  }
       pager:
         type: some
         options:
-          items_per_page: 10
           offset: 0
-      path: taxonomy/term/%/feed
-      displays:
-        page_1: page_1
-        default: '0'
+          items_per_page: 10
       style:
         type: rss
         options:
-          description: ''
           grouping: {  }
           uses_fields: false
+          description: ''
       row:
         type: node_rss
         options:
           relationship: none
           view_mode: default
+      query:
+        type: views_query
+        options: {  }
       display_extenders: {  }
+      path: taxonomy/term/%/feed
+      displays:
+        page_1: page_1
+        default: '0'
     cache_metadata:
+      max-age: -1
       contexts:
         - 'languages:language_interface'
         - url
         - 'user.node_grants:view'
         - user.permissions
-      max-age: -1
       tags: {  }
   page_1:
     id: page_1
@@ -304,14 +306,14 @@ display:
       query:
         type: views_query
         options: {  }
-      path: taxonomy/term/%
       display_extenders: {  }
+      path: taxonomy/term/%
     cache_metadata:
+      max-age: -1
       contexts:
         - 'languages:language_interface'
         - url
         - url.query_args
         - 'user.node_grants:view'
         - user.permissions
-      max-age: -1
       tags: {  }
diff --git a/config/views.view.user_admin_people.yml b/config/views.view.user_admin_people.yml
index 8d6a04f75..0439ec1a1 100644
--- a/config/views.view.user_admin_people.yml
+++ b/config/views.view.user_admin_people.yml
@@ -15,131 +15,12 @@ base_table: users_field_data
 base_field: uid
 display:
   default:
-    display_plugin: default
     id: default
     display_title: Master
+    display_plugin: default
     position: 0
     display_options:
-      access:
-        type: perm
-        options:
-          perm: 'administer users'
-      cache:
-        type: tag
-      query:
-        type: views_query
-        options:
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_comment: ''
-          query_tags: {  }
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Filter
-          reset_button: true
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      pager:
-        type: full
-        options:
-          items_per_page: 50
-          offset: 0
-          id: 0
-          total_pages: 0
-          tags:
-            previous: '‹ Previous'
-            next: 'Next ›'
-            first: '« First'
-            last: 'Last »'
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          quantity: 9
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          override: true
-          sticky: false
-          summary: ''
-          columns:
-            user_bulk_form: user_bulk_form
-            name: name
-            status: status
-            rid: rid
-            created: created
-            access: access
-            edit_node: edit_node
-            dropbutton: dropbutton
-          info:
-            user_bulk_form:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            name:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            status:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-low
-            rid:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-low
-            created:
-              sortable: true
-              default_sort_order: desc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-low
-            access:
-              sortable: true
-              default_sort_order: desc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-low
-            edit_node:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-low
-            dropbutton:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          default: created
-          empty_table: true
-      row:
-        type: fields
+      title: People
       fields:
         user_bulk_form:
           id: user_bulk_form
@@ -148,6 +29,8 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: user
+          plugin_id: user_bulk_form
           label: 'Bulk update'
           exclude: false
           alter:
@@ -189,8 +72,6 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          plugin_id: user_bulk_form
-          entity_type: user
         name:
           id: name
           table: users_field_data
@@ -198,6 +79,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: user
+          entity_field: name
+          plugin_id: field
           label: Username
           exclude: false
           alter:
@@ -239,10 +123,7 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          plugin_id: field
           type: user_name
-          entity_type: user
-          entity_field: name
         status:
           id: status
           table: users_field_data
@@ -250,6 +131,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: user
+          entity_field: status
+          plugin_id: field
           label: Status
           exclude: false
           alter:
@@ -291,14 +175,11 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          plugin_id: field
           type: boolean
           settings:
             format: custom
-            format_custom_true: Active
             format_custom_false: Blocked
-          entity_type: user
-          entity_field: status
+            format_custom_true: Active
         roles_target_id:
           id: roles_target_id
           table: user__roles
@@ -306,6 +187,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: user_roles
           label: Roles
           exclude: false
           alter:
@@ -349,7 +231,6 @@ display:
           hide_alter_empty: true
           type: ul
           separator: ', '
-          plugin_id: user_roles
         created:
           id: created
           table: users_field_data
@@ -357,6 +238,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: user
+          entity_field: created
+          plugin_id: field
           label: 'Member for'
           exclude: false
           alter:
@@ -403,9 +287,6 @@ display:
             future_format: '@interval'
             past_format: '@interval'
             granularity: 2
-          plugin_id: field
-          entity_type: user
-          entity_field: created
         access:
           id: access
           table: users_field_data
@@ -413,6 +294,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: user
+          entity_field: access
+          plugin_id: field
           label: 'Last access'
           exclude: false
           alter:
@@ -459,9 +343,6 @@ display:
             future_format: '@interval hence'
             past_format: '@interval ago'
             granularity: 2
-          plugin_id: field
-          entity_type: user
-          entity_field: access
         operations:
           id: operations
           table: users
@@ -469,6 +350,8 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: user
+          plugin_id: entity_operations
           label: Operations
           exclude: false
           alter:
@@ -511,8 +394,6 @@ display:
           empty_zero: false
           hide_alter_empty: true
           destination: true
-          entity_type: user
-          plugin_id: entity_operations
         mail:
           id: mail
           table: users_field_data
@@ -520,6 +401,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: user
+          entity_field: mail
+          plugin_id: field
           label: ''
           exclude: true
           alter:
@@ -574,9 +458,72 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          plugin_id: field
+      pager:
+        type: full
+        options:
+          offset: 0
+          items_per_page: 50
+          total_pages: 0
+          id: 0
+          tags:
+            next: 'Next ›'
+            previous: '‹ Previous'
+            first: '« First'
+            last: 'Last »'
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          quantity: 9
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Filter
+          reset_button: true
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      access:
+        type: perm
+        options:
+          perm: 'administer users'
+      cache:
+        type: tag
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: text_custom
+          empty: true
+          content: 'No people available.'
+          tokenize: false
+      sorts:
+        created:
+          id: created
+          table: users_field_data
+          field: created
+          relationship: none
+          group_type: group
+          admin_label: ''
           entity_type: user
-          entity_field: mail
+          entity_field: created
+          plugin_id: date
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: created
+          exposed: false
+          granularity: second
       filters:
         combine:
           id: combine
@@ -585,6 +532,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: combine
           operator: contains
           value: ''
           group: 1
@@ -595,6 +543,8 @@ display:
             description: ''
             use_operator: false
             operator: combine_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: user
             required: false
             remember: false
@@ -603,8 +553,6 @@ display:
               authenticated: authenticated
               anonymous: '0'
               administrator: '0'
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -620,7 +568,6 @@ display:
           fields:
             name: name
             mail: mail
-          plugin_id: combine
         status:
           id: status
           table: users_field_data
@@ -628,6 +575,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: user
+          entity_field: status
+          plugin_id: boolean
           operator: '='
           value: '1'
           group: 1
@@ -638,6 +588,8 @@ display:
             description: ''
             use_operator: false
             operator: status_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: status
             required: false
             remember: false
@@ -646,8 +598,6 @@ display:
               authenticated: authenticated
               anonymous: '0'
               administrator: '0'
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: true
           group_info:
             label: Status
@@ -668,9 +618,6 @@ display:
                 title: Blocked
                 operator: '='
                 value: '0'
-          plugin_id: boolean
-          entity_type: user
-          entity_field: status
         roles_target_id:
           id: roles_target_id
           table: user__roles
@@ -678,6 +625,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: user_roles
           operator: or
           value: {  }
           group: 1
@@ -688,6 +636,8 @@ display:
             description: ''
             use_operator: false
             operator: roles_target_id_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: role
             required: false
             remember: false
@@ -697,8 +647,6 @@ display:
               anonymous: '0'
               administrator: '0'
             reduce: false
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -712,7 +660,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           reduce_duplicates: false
-          plugin_id: user_roles
         permission:
           id: permission
           table: user__roles
@@ -720,6 +667,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: user_permissions
           operator: or
           value: {  }
           group: 1
@@ -730,6 +678,8 @@ display:
             description: ''
             use_operator: false
             operator: permission_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: permission
             required: false
             remember: false
@@ -739,8 +689,6 @@ display:
               anonymous: '0'
               administrator: '0'
             reduce: false
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -754,7 +702,6 @@ display:
             default_group_multiple: {  }
             group_items: {  }
           reduce_duplicates: false
-          plugin_id: user_permissions
         default_langcode:
           id: default_langcode
           table: users_field_data
@@ -762,6 +709,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: user
+          entity_field: default_langcode
+          plugin_id: boolean
           operator: '='
           value: '1'
           group: 1
@@ -772,14 +722,14 @@ display:
             description: ''
             use_operator: false
             operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: ''
             required: false
             remember: false
             multiple: false
             remember_roles:
               authenticated: authenticated
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -792,9 +742,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          entity_type: user
-          entity_field: default_langcode
-          plugin_id: boolean
         uid_raw:
           id: uid_raw
           table: users_field_data
@@ -802,6 +749,8 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: user
+          plugin_id: numeric
           operator: '!='
           value:
             min: ''
@@ -815,14 +764,14 @@ display:
             description: ''
             use_operator: false
             operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: ''
             required: false
             remember: false
             multiple: false
             remember_roles:
               authenticated: authenticated
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -835,92 +784,144 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          plugin_id: numeric
-          entity_type: user
-      sorts:
-        created:
-          id: created
-          table: users_field_data
-          field: created
-          relationship: none
-          group_type: group
-          admin_label: ''
-          order: DESC
-          exposed: false
-          expose:
-            label: ''
-          granularity: second
-          plugin_id: date
-          entity_type: user
-          entity_field: created
-      title: People
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          empty: true
-          tokenize: false
-          content: 'No people available.'
-          plugin_id: text_custom
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          columns:
+            user_bulk_form: user_bulk_form
+            name: name
+            status: status
+            rid: rid
+            created: created
+            access: access
+            edit_node: edit_node
+            dropbutton: dropbutton
+          default: created
+          info:
+            user_bulk_form:
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            name:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            status:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            rid:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            created:
+              sortable: true
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            access:
+              sortable: true
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            edit_node:
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            dropbutton:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          override: true
+          sticky: false
+          summary: ''
+          empty_table: true
+      row:
+        type: fields
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
+      css_class: ''
+      use_ajax: false
+      group_by: false
+      show_admin_links: true
       use_more: false
       use_more_always: false
       use_more_text: more
+      link_display: page_1
+      link_url: ''
       display_comment: ''
-      use_ajax: false
       hide_attachment_summary: false
-      show_admin_links: true
-      group_by: false
-      link_url: ''
-      link_display: page_1
-      css_class: ''
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
       display_extenders: {  }
     cache_metadata:
+      max-age: 0
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
         - url
         - url.query_args
         - user.permissions
-      max-age: 0
       tags: {  }
   page_1:
-    display_plugin: page
     id: page_1
     display_title: Page
+    display_plugin: page
     position: 1
     display_options:
-      path: admin/people/list
+      defaults:
+        show_admin_links: false
       show_admin_links: false
+      display_extenders: {  }
+      path: admin/people/list
       menu:
         type: 'default tab'
         title: List
         description: 'Find and manage people interacting with your site.'
-        menu_name: admin
         weight: -10
+        menu_name: admin
         context: ''
       tab_options:
         type: normal
         title: People
         description: 'Manage user accounts, roles, and permissions.'
-        menu_name: admin
         weight: 0
-      defaults:
-        show_admin_links: false
-      display_extenders: {  }
+        menu_name: admin
     cache_metadata:
+      max-age: 0
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
         - url
         - url.query_args
         - user.permissions
-      max-age: 0
       tags: {  }
diff --git a/config/views.view.who_s_new.yml b/config/views.view.who_s_new.yml
index 307e42ef6..198e734e0 100644
--- a/config/views.view.who_s_new.yml
+++ b/config/views.view.who_s_new.yml
@@ -15,68 +15,34 @@ base_table: users_field_data
 base_field: uid
 display:
   default:
-    display_plugin: default
     id: default
     display_title: Master
+    display_plugin: default
     position: 0
     display_options:
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      cache:
-        type: tag
-        options: {  }
-      query:
-        type: views_query
-        options:
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_comment: ''
-          query_tags: {  }
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      pager:
-        type: some
-        options:
-          items_per_page: 5
-          offset: 0
-      style:
-        type: html_list
-      row:
-        type: fields
+      title: 'Who''s new'
       fields:
         name:
           id: name
           table: users_field_data
           field: name
-          label: ''
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: user
+          entity_field: name
           plugin_id: field
-          type: user_name
+          label: ''
+          exclude: false
           alter:
             alter_text: false
             make_link: false
             absolute: false
-            trim: false
             word_boundary: false
             ellipsis: false
             strip_tags: false
+            trim: false
             html: false
-          hide_empty: false
-          empty_zero: false
-          relationship: none
-          group_type: group
-          admin_label: ''
-          exclude: false
           element_type: ''
           element_class: ''
           element_label_type: ''
@@ -86,23 +52,65 @@ display:
           element_wrapper_class: ''
           element_default_classes: true
           empty: ''
+          hide_empty: false
+          empty_zero: false
           hide_alter_empty: true
+          type: user_name
+      pager:
+        type: some
+        options:
+          offset: 0
+          items_per_page: 5
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      access:
+        type: perm
+        options:
+          perm: 'access content'
+      cache:
+        type: tag
+        options: {  }
+      empty: {  }
+      sorts:
+        created:
+          id: created
+          table: users_field_data
+          field: created
+          relationship: none
+          group_type: group
+          admin_label: ''
           entity_type: user
-          entity_field: name
+          entity_field: created
+          plugin_id: date
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: created
+          exposed: false
+          granularity: second
+      arguments: {  }
       filters:
         status:
-          value: '1'
+          id: status
           table: users_field_data
           field: status
-          id: status
+          entity_type: user
+          entity_field: status
+          plugin_id: boolean
+          value: '1'
+          group: 1
           expose:
             operator: '0'
             operator_limit_selection: false
             operator_list: {  }
-          group: 1
-          plugin_id: boolean
-          entity_type: user
-          entity_field: status
         access:
           id: access
           table: users_field_data
@@ -110,6 +118,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: user
+          entity_field: access
+          plugin_id: date
           operator: '>'
           value:
             min: ''
@@ -124,14 +135,14 @@ display:
             description: ''
             use_operator: false
             operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: ''
             required: false
             remember: false
             multiple: false
             remember_roles:
               authenticated: authenticated
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -144,53 +155,43 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          plugin_id: date
-          entity_type: user
-          entity_field: access
-      sorts:
-        created:
-          id: created
-          table: users_field_data
-          field: created
-          relationship: none
-          group_type: group
-          admin_label: ''
-          order: DESC
-          exposed: false
-          expose:
-            label: ''
-          granularity: second
-          plugin_id: date
-          entity_type: user
-          entity_field: created
-      title: 'Who''s new'
+      style:
+        type: html_list
+      row:
+        type: fields
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
+      relationships: {  }
       header: {  }
       footer: {  }
-      empty: {  }
-      relationships: {  }
-      arguments: {  }
       display_extenders: {  }
     cache_metadata:
+      max-age: -1
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
         - user.permissions
-      max-age: -1
       tags: {  }
   block_1:
-    display_plugin: block
     id: block_1
     display_title: 'Who''s new'
+    display_plugin: block
     position: 1
     display_options:
       display_description: 'A list of new users'
+      display_extenders: {  }
       block_description: 'Who''s new'
       block_category: User
-      display_extenders: {  }
     cache_metadata:
+      max-age: -1
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
         - user.permissions
-      max-age: -1
       tags: {  }
diff --git a/config/views.view.who_s_online.yml b/config/views.view.who_s_online.yml
index d0394f99a..14521d950 100644
--- a/config/views.view.who_s_online.yml
+++ b/config/views.view.who_s_online.yml
@@ -15,75 +15,34 @@ base_table: users_field_data
 base_field: uid
 display:
   default:
-    display_plugin: default
     id: default
     display_title: Master
+    display_plugin: default
     position: 0
     display_options:
-      access:
-        type: perm
-        options:
-          perm: 'access user profiles'
-      cache:
-        type: tag
-        options: {  }
-      query:
-        type: views_query
-        options:
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_comment: ''
-          query_tags: {  }
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      pager:
-        type: some
-        options:
-          items_per_page: 10
-          offset: 0
-      style:
-        type: html_list
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          type: ul
-          wrapper_class: item-list
-          class: ''
-      row:
-        type: fields
+      title: 'Who''s online'
       fields:
         name:
           id: name
           table: users_field_data
           field: name
-          label: ''
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: user
+          entity_field: name
           plugin_id: field
-          type: user_name
+          label: ''
+          exclude: false
           alter:
             alter_text: false
             make_link: false
             absolute: false
-            trim: false
             word_boundary: false
             ellipsis: false
             strip_tags: false
+            trim: false
             html: false
-          hide_empty: false
-          empty_zero: false
-          relationship: none
-          group_type: group
-          admin_label: ''
-          exclude: false
           element_type: ''
           element_class: ''
           element_label_type: ''
@@ -93,23 +52,76 @@ display:
           element_wrapper_class: ''
           element_default_classes: true
           empty: ''
+          hide_empty: false
+          empty_zero: false
           hide_alter_empty: true
+          type: user_name
+      pager:
+        type: some
+        options:
+          offset: 0
+          items_per_page: 10
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      access:
+        type: perm
+        options:
+          perm: 'access user profiles'
+      cache:
+        type: tag
+        options: {  }
+      empty:
+        area_text_custom:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: text_custom
+          empty: true
+          content: 'There are currently 0 users online.'
+          tokenize: false
+      sorts:
+        access:
+          id: access
+          table: users_field_data
+          field: access
+          relationship: none
+          group_type: group
+          admin_label: ''
           entity_type: user
-          entity_field: name
+          entity_field: access
+          plugin_id: date
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: access
+          exposed: false
+          granularity: second
+      arguments: {  }
       filters:
         status:
-          value: '1'
+          id: status
           table: users_field_data
           field: status
-          id: status
+          entity_type: user
+          entity_field: status
+          plugin_id: boolean
+          value: '1'
+          group: 1
           expose:
             operator: '0'
             operator_limit_selection: false
             operator_list: {  }
-          group: 1
-          plugin_id: boolean
-          entity_type: user
-          entity_field: status
         access:
           id: access
           table: users_field_data
@@ -117,6 +129,9 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: user
+          entity_field: access
+          plugin_id: date
           operator: '>='
           value:
             min: ''
@@ -131,6 +146,8 @@ display:
             description: 'A user is considered online for this long after they have last viewed a page.'
             use_operator: false
             operator: access_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: access
             required: false
             remember: false
@@ -139,8 +156,6 @@ display:
               authenticated: authenticated
               anonymous: '0'
               administrator: '0'
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -153,26 +168,26 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          plugin_id: date
-          entity_type: user
-          entity_field: access
-      sorts:
-        access:
-          id: access
-          table: users_field_data
-          field: access
-          order: DESC
-          relationship: none
-          group_type: group
-          admin_label: ''
-          exposed: false
-          expose:
-            label: ''
-          granularity: second
-          plugin_id: date
-          entity_type: user
-          entity_field: access
-      title: 'Who''s online'
+      style:
+        type: html_list
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          type: ul
+          wrapper_class: item-list
+          class: ''
+      row:
+        type: fields
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
+      relationships: {  }
       header:
         result:
           id: result
@@ -181,45 +196,31 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: result
           empty: false
           content: 'There are currently @total users online.'
-          plugin_id: result
       footer: {  }
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          empty: true
-          tokenize: false
-          content: 'There are currently 0 users online.'
-          plugin_id: text_custom
-      relationships: {  }
-      arguments: {  }
       display_extenders: {  }
     cache_metadata:
+      max-age: -1
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
         - user.permissions
-      max-age: -1
       tags: {  }
   who_s_online_block:
-    display_plugin: block
     id: who_s_online_block
     display_title: 'Who''s online'
+    display_plugin: block
     position: 1
     display_options:
-      block_description: 'Who''s online'
       display_description: 'A list of users that are currently logged in.'
       display_extenders: {  }
+      block_description: 'Who''s online'
     cache_metadata:
+      max-age: -1
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
         - user.permissions
-      max-age: -1
       tags: {  }
diff --git a/config/workflows.workflow.announcement.yml b/config/workflows.workflow.announcement.yml
index 5e84b821f..0d0f6f7b2 100644
--- a/config/workflows.workflow.announcement.yml
+++ b/config/workflows.workflow.announcement.yml
@@ -12,20 +12,20 @@ type: content_moderation
 type_settings:
   states:
     archive:
-      published: false
-      default_revision: true
       label: Archived
       weight: 2
+      published: false
+      default_revision: true
     draft:
       label: Draft
+      weight: 0
       published: false
       default_revision: true
-      weight: 0
     published:
       label: Published
+      weight: 1
       published: true
       default_revision: true
-      weight: 1
   transitions:
     archive:
       label: Archive
diff --git a/config/workflows.workflow.blog_post.yml b/config/workflows.workflow.blog_post.yml
index bc1004e17..794dfb417 100644
--- a/config/workflows.workflow.blog_post.yml
+++ b/config/workflows.workflow.blog_post.yml
@@ -13,14 +13,14 @@ type_settings:
   states:
     draft:
       label: Draft
+      weight: 0
       published: false
       default_revision: true
-      weight: 0
     published:
       label: Published
+      weight: 1
       published: true
       default_revision: true
-      weight: 1
   transitions:
     draft:
       label: 'Save as Draft'
diff --git a/config/workflows.workflow.book.yml b/config/workflows.workflow.book.yml
index 50ae32711..d99f97ce3 100644
--- a/config/workflows.workflow.book.yml
+++ b/config/workflows.workflow.book.yml
@@ -13,14 +13,14 @@ type_settings:
   states:
     draft:
       label: Draft
+      weight: 0
       published: false
       default_revision: true
-      weight: 0
     published:
       label: Published
+      weight: 1
       published: true
       default_revision: true
-      weight: 1
   transitions:
     draft:
       label: 'Save as Draft'
diff --git a/config/workflows.workflow.country.yml b/config/workflows.workflow.country.yml
index ff4958912..e03f88fc3 100644
--- a/config/workflows.workflow.country.yml
+++ b/config/workflows.workflow.country.yml
@@ -13,24 +13,24 @@ type_settings:
   states:
     draft:
       label: Draft
+      weight: 0
       published: false
       default_revision: true
-      weight: 0
     normal:
-      published: true
-      default_revision: true
       label: Normal
       weight: 2
-    ongoing:
       published: true
       default_revision: true
+    ongoing:
       label: Ongoing
       weight: 3
+      published: true
+      default_revision: true
     published:
       label: Published
+      weight: 1
       published: true
       default_revision: true
-      weight: 1
   transitions:
     draft:
       label: 'Save as Draft'
diff --git a/config/workflows.workflow.disaster.yml b/config/workflows.workflow.disaster.yml
index 7a93af13a..c9ac2072a 100644
--- a/config/workflows.workflow.disaster.yml
+++ b/config/workflows.workflow.disaster.yml
@@ -12,50 +12,50 @@ type: content_moderation
 type_settings:
   states:
     alert:
-      published: true
-      default_revision: true
       label: Alert
       weight: 2
-    alert_archive:
-      published: false
+      published: true
       default_revision: true
+    alert_archive:
       label: 'Alert Archive'
       weight: 6
-    draft:
-      label: Draft
       published: false
       default_revision: true
+    draft:
+      label: Draft
       weight: 0
-    draft_archive:
       published: false
       default_revision: true
+    draft_archive:
       label: 'Draft Archive'
       weight: 5
-    external:
-      published: true
+      published: false
       default_revision: true
+    external:
       label: External
       weight: 7
-    external_archive:
-      published: false
+      published: true
       default_revision: true
+    external_archive:
       label: 'External Archive'
       weight: 8
-    ongoing:
-      published: true
+      published: false
       default_revision: true
+    ongoing:
       label: Ongoing
       weight: 3
-    past:
       published: true
       default_revision: true
+    past:
       label: 'Past Disaster'
       weight: 4
+      published: true
+      default_revision: true
     published:
       label: Published
+      weight: 1
       published: true
       default_revision: true
-      weight: 1
   transitions:
     alert:
       label: 'Save as Alert'
diff --git a/config/workflows.workflow.job.yml b/config/workflows.workflow.job.yml
index 5e9646724..955d6d68e 100644
--- a/config/workflows.workflow.job.yml
+++ b/config/workflows.workflow.job.yml
@@ -13,39 +13,39 @@ type_settings:
   states:
     draft:
       label: Draft
-      published: false
-      default_revision: true
       weight: 0
-    duplicate:
       published: false
       default_revision: true
+    duplicate:
       label: Duplicate
       weight: 5
-    expired:
       published: false
       default_revision: true
+    expired:
       label: Expired
       weight: 6
-    on_hold:
       published: false
       default_revision: true
+    on_hold:
       label: On-hold
       weight: 3
-    pending:
       published: false
       default_revision: true
+    pending:
       label: Pending
       weight: 2
+      published: false
+      default_revision: true
     published:
       label: Published
+      weight: 1
       published: true
       default_revision: true
-      weight: 1
     refused:
-      published: false
-      default_revision: true
       label: Refused
       weight: 4
+      published: false
+      default_revision: true
   transitions:
     draft:
       label: 'Save as Draft'
diff --git a/config/workflows.workflow.report.yml b/config/workflows.workflow.report.yml
index 4565e222b..ba7e5a87c 100644
--- a/config/workflows.workflow.report.yml
+++ b/config/workflows.workflow.report.yml
@@ -12,45 +12,45 @@ type: content_moderation
 type_settings:
   states:
     archive:
-      published: false
-      default_revision: true
       label: Archived
       weight: 6
-    draft:
-      label: Draft
       published: false
       default_revision: true
+    draft:
+      label: Draft
       weight: 0
-    duplicate:
       published: false
       default_revision: true
+    duplicate:
       label: Duplicate
       weight: 4
-    embargoed:
       published: false
       default_revision: true
+    embargoed:
       label: Embargoed
       weight: 5
-    on_hold:
       published: false
       default_revision: true
+    on_hold:
       label: On-hold
       weight: 2
+      published: false
+      default_revision: true
     published:
       label: Published
+      weight: 1
       published: true
       default_revision: true
-      weight: 1
     reference:
-      published: false
-      default_revision: true
       label: Reference
       weight: 7
-    to_review:
-      published: true
+      published: false
       default_revision: true
+    to_review:
       label: 'To review'
       weight: 3
+      published: true
+      default_revision: true
   transitions:
     archived:
       label: Archive
diff --git a/config/workflows.workflow.source.yml b/config/workflows.workflow.source.yml
index f056b1679..7689b0c5b 100644
--- a/config/workflows.workflow.source.yml
+++ b/config/workflows.workflow.source.yml
@@ -12,40 +12,40 @@ type: content_moderation
 type_settings:
   states:
     active:
-      published: true
-      default_revision: true
       label: Active
       weight: 2
-    archive:
-      published: false
+      published: true
       default_revision: true
+    archive:
       label: Archive
       weight: 4
-    blocked:
       published: false
       default_revision: true
+    blocked:
       label: Blocked
       weight: 5
-    draft:
-      label: Draft
       published: false
       default_revision: true
+    draft:
+      label: Draft
       weight: 0
-    duplicate:
       published: false
       default_revision: true
+    duplicate:
       label: Duplicate
       weight: 6
-    inactive:
-      published: true
+      published: false
       default_revision: true
+    inactive:
       label: Inactive
       weight: 3
+      published: true
+      default_revision: true
     published:
       label: Published
+      weight: 1
       published: true
       default_revision: true
-      weight: 1
   transitions:
     active:
       label: 'Save as Active'
diff --git a/config/workflows.workflow.topic.yml b/config/workflows.workflow.topic.yml
index d4b0a2d88..a7cb01de6 100644
--- a/config/workflows.workflow.topic.yml
+++ b/config/workflows.workflow.topic.yml
@@ -13,14 +13,14 @@ type_settings:
   states:
     draft:
       label: Draft
+      weight: 0
       published: false
       default_revision: true
-      weight: 0
     published:
       label: Published
+      weight: 1
       published: true
       default_revision: true
-      weight: 1
   transitions:
     draft:
       label: 'Save as Draft'
diff --git a/config/workflows.workflow.training.yml b/config/workflows.workflow.training.yml
index 6b06b4040..c42f39ef0 100644
--- a/config/workflows.workflow.training.yml
+++ b/config/workflows.workflow.training.yml
@@ -13,39 +13,39 @@ type_settings:
   states:
     draft:
       label: Draft
-      published: false
-      default_revision: true
       weight: 0
-    duplicate:
       published: false
       default_revision: true
+    duplicate:
       label: Duplicate
       weight: 5
-    expired:
       published: false
       default_revision: true
+    expired:
       label: Expired
       weight: 6
-    on_hold:
       published: false
       default_revision: true
+    on_hold:
       label: On-hold
       weight: 3
-    pending:
       published: false
       default_revision: true
+    pending:
       label: Pending
       weight: 2
+      published: false
+      default_revision: true
     published:
       label: Published
+      weight: 1
       published: true
       default_revision: true
-      weight: 1
     refused:
-      published: false
-      default_revision: true
       label: Refused
       weight: 4
+      published: false
+      default_revision: true
   transitions:
     draft:
       label: 'Save as Draft'
diff --git a/config_dev/dblog.settings.yml b/config_dev/dblog.settings.yml
index cf06e3fa7..fbd17ea50 100644
--- a/config_dev/dblog.settings.yml
+++ b/config_dev/dblog.settings.yml
@@ -1,3 +1,3 @@
-row_limit: 1000
 _core:
   default_config_hash: e883aGsrt1wFrsydlYU584PZONCSfRy0DtkZ9KzHb58
+row_limit: 1000
diff --git a/config_dev/devel.settings.yml b/config_dev/devel.settings.yml
index 76c479229..9a2d3056c 100644
--- a/config_dev/devel.settings.yml
+++ b/config_dev/devel.settings.yml
@@ -1,3 +1,5 @@
+_core:
+  default_config_hash: Aqx6J0yYT6mVqT0fbjeP4JkoL-700nmudVF5d6Pq2Yo
 page_alter: false
 raw_names: false
 error_handlers:
@@ -8,5 +10,3 @@ debug_mail_directory: 'temporary://devel-mails'
 devel_dumper: kint
 debug_logfile: 'temporary://drupal_debug.txt'
 debug_pre: true
-_core:
-  default_config_hash: Aqx6J0yYT6mVqT0fbjeP4JkoL-700nmudVF5d6Pq2Yo
diff --git a/config_dev/devel.toolbar.settings.yml b/config_dev/devel.toolbar.settings.yml
index 4ea562c40..76ada43ce 100644
--- a/config_dev/devel.toolbar.settings.yml
+++ b/config_dev/devel.toolbar.settings.yml
@@ -1,3 +1,5 @@
+_core:
+  default_config_hash: IQjf_ytthngZTAk_MU8-74VecArWD3G5g0oEH6PM6GA
 toolbar_items:
   - devel.admin_settings_link
   - devel.cache_clear
@@ -6,5 +8,3 @@ toolbar_items:
   - devel.reinstall
   - devel.route_info
   - devel.run_cron
-_core:
-  default_config_hash: IQjf_ytthngZTAk_MU8-74VecArWD3G5g0oEH6PM6GA
diff --git a/config_dev/stage_file_proxy.settings.yml b/config_dev/stage_file_proxy.settings.yml
index fc62ff19f..fb1e44150 100644
--- a/config_dev/stage_file_proxy.settings.yml
+++ b/config_dev/stage_file_proxy.settings.yml
@@ -1,7 +1,7 @@
+_core:
+  default_config_hash: wB2h-QBawANCiCVEXy6bJjiDfvZY6EONZ6-wRB_RYQc
 hotlink: false
 origin: 'https://reliefweb.int'
 origin_dir: sites/default/files
 use_imagecache_root: true
 verify: true
-_core:
-  default_config_hash: wB2h-QBawANCiCVEXy6bJjiDfvZY6EONZ6-wRB_RYQc
diff --git a/config_dev/views.view.watchdog.yml b/config_dev/views.view.watchdog.yml
index 347e94a15..3ce44f411 100644
--- a/config_dev/views.view.watchdog.yml
+++ b/config_dev/views.view.watchdog.yml
@@ -16,131 +16,12 @@ base_table: watchdog
 base_field: wid
 display:
   default:
-    display_plugin: default
     id: default
     display_title: Default
+    display_plugin: default
     position: 0
     display_options:
-      access:
-        type: perm
-        options:
-          perm: 'access site reports'
-      cache:
-        type: none
-        options: {  }
-      query:
-        type: views_query
-        options:
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_comment: ''
-          query_tags: {  }
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Filter
-          reset_button: true
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: false
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      pager:
-        type: mini
-        options:
-          items_per_page: 50
-          offset: 0
-          id: 0
-          total_pages: null
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          tags:
-            previous: ‹‹
-            next: ››
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: '{{ type }} {{ severity }}'
-          default_row_class: true
-          override: true
-          sticky: false
-          caption: ''
-          summary: ''
-          description: ''
-          columns:
-            nothing: nothing
-            wid: wid
-            severity: severity
-            type: type
-            timestamp: timestamp
-            message: message
-            name: name
-            link: link
-          info:
-            nothing:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-medium
-            wid:
-              sortable: false
-              default_sort_order: desc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-low
-            severity:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-low
-            type:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-medium
-            timestamp:
-              sortable: true
-              default_sort_order: desc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-low
-            message:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            name:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-medium
-            link:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-low
-          default: wid
-          empty_table: false
-      row:
-        type: fields
+      title: 'Recent log messages'
       fields:
         nothing:
           id: nothing
@@ -149,6 +30,7 @@ display:
           relationship: none
           group_type: group
           admin_label: Icon
+          plugin_id: custom
           label: ''
           exclude: false
           alter:
@@ -190,7 +72,6 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: false
-          plugin_id: custom
         wid:
           id: wid
           table: watchdog
@@ -198,6 +79,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: standard
           label: WID
           exclude: true
           alter:
@@ -239,7 +121,6 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          plugin_id: standard
         severity:
           id: severity
           table: watchdog
@@ -247,6 +128,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: machine_name
           label: Severity
           exclude: true
           alter:
@@ -289,7 +171,6 @@ display:
           empty_zero: false
           hide_alter_empty: true
           machine_name: false
-          plugin_id: machine_name
         type:
           id: type
           table: watchdog
@@ -297,6 +178,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: standard
           label: Type
           exclude: false
           alter:
@@ -338,7 +220,6 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          plugin_id: standard
         timestamp:
           id: timestamp
           table: watchdog
@@ -346,6 +227,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: date
           label: Date
           exclude: false
           alter:
@@ -390,7 +272,6 @@ display:
           date_format: short
           custom_date_format: ''
           timezone: ''
-          plugin_id: date
         message:
           id: message
           table: watchdog
@@ -398,6 +279,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: dblog_message
           label: Message
           exclude: false
           alter:
@@ -440,7 +322,6 @@ display:
           empty_zero: false
           hide_alter_empty: true
           replace_variables: true
-          plugin_id: dblog_message
         name:
           id: name
           table: users_field_data
@@ -448,6 +329,9 @@ display:
           relationship: uid
           group_type: group
           admin_label: ''
+          entity_type: user
+          entity_field: name
+          plugin_id: field
           label: User
           exclude: false
           alter:
@@ -503,9 +387,6 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-          entity_type: user
-          entity_field: name
-          plugin_id: field
         link:
           id: link
           table: watchdog
@@ -513,6 +394,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: dblog_operations
           label: Operations
           exclude: false
           alter:
@@ -554,7 +436,68 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          plugin_id: dblog_operations
+      pager:
+        type: mini
+        options:
+          offset: 0
+          items_per_page: 50
+          total_pages: null
+          id: 0
+          tags:
+            next: ››
+            previous: ‹‹
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Filter
+          reset_button: true
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: false
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      access:
+        type: perm
+        options:
+          perm: 'access site reports'
+      cache:
+        type: none
+        options: {  }
+      empty:
+        area:
+          id: area_text_custom
+          table: views
+          field: area_text_custom
+          relationship: none
+          group_type: group
+          admin_label: 'No log messages available.'
+          plugin_id: text_custom
+          empty: true
+          content: 'No log messages available.'
+          tokenize: false
+      sorts:
+        wid:
+          id: wid
+          table: watchdog
+          field: wid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: standard
+          order: DESC
+          expose:
+            label: ''
+            field_identifier: wid
+          exposed: false
+      arguments: {  }
       filters:
         type:
           id: type
@@ -563,6 +506,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: dblog_types
           operator: in
           value: {  }
           group: 1
@@ -573,6 +517,8 @@ display:
             description: ''
             use_operator: false
             operator: type_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: type
             required: false
             remember: false
@@ -582,8 +528,6 @@ display:
               anonymous: '0'
               administrator: '0'
             reduce: false
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -596,7 +540,6 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          plugin_id: dblog_types
         severity:
           id: severity
           table: watchdog
@@ -604,6 +547,7 @@ display:
           relationship: none
           group_type: group
           admin_label: ''
+          plugin_id: in_operator
           operator: in
           value: {  }
           group: 1
@@ -614,6 +558,8 @@ display:
             description: ''
             use_operator: false
             operator: severity_op
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: severity
             required: false
             remember: false
@@ -623,8 +569,6 @@ display:
               anonymous: '0'
               administrator: '0'
             reduce: false
-            operator_limit_selection: false
-            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -637,35 +581,95 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
-          plugin_id: in_operator
-      sorts:
-        wid:
-          id: wid
-          table: watchdog
-          field: wid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          order: DESC
-          exposed: false
-          expose:
-            label: ''
-          plugin_id: standard
-      title: 'Recent log messages'
-      header: {  }
-      footer: {  }
-      empty:
-        area:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: 'No log messages available.'
-          empty: true
-          tokenize: false
-          content: 'No log messages available.'
-          plugin_id: text_custom
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: '{{ type }} {{ severity }}'
+          default_row_class: true
+          columns:
+            nothing: nothing
+            wid: wid
+            severity: severity
+            type: type
+            timestamp: timestamp
+            message: message
+            name: name
+            link: link
+          default: wid
+          info:
+            nothing:
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-medium
+            wid:
+              sortable: false
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            severity:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            type:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-medium
+            timestamp:
+              sortable: true
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            message:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            name:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-medium
+            link:
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+          override: true
+          sticky: false
+          summary: ''
+          empty_table: false
+          caption: ''
+          description: ''
+      row:
+        type: fields
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
       relationships:
         uid:
           id: uid
@@ -674,15 +678,12 @@ display:
           relationship: none
           group_type: group
           admin_label: User
-          required: false
           plugin_id: standard
-      arguments: {  }
-      display_extenders: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
+          required: false
       css_class: admin-dblog
+      header: {  }
+      footer: {  }
+      display_extenders: {  }
     cache_metadata:
       max-age: -1
       contexts:
@@ -693,9 +694,9 @@ display:
         - user.permissions
       tags: {  }
   page:
-    display_plugin: page
     id: page
     display_title: Page
+    display_plugin: page
     position: 1
     display_options:
       display_extenders: {  }

From 63c7eb60f0fb1aed0b21c81830166f91087d2eae Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 16 Dec 2021 04:22:43 +0000
Subject: [PATCH 307/720] [RW-176] Remove some roles from the roles filter on
 the people page

---
 .../reliefweb_users/src/Form/UserPageFilterForm.php       | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/html/modules/custom/reliefweb_users/src/Form/UserPageFilterForm.php b/html/modules/custom/reliefweb_users/src/Form/UserPageFilterForm.php
index 3e0cbbd56..fd56c23ec 100644
--- a/html/modules/custom/reliefweb_users/src/Form/UserPageFilterForm.php
+++ b/html/modules/custom/reliefweb_users/src/Form/UserPageFilterForm.php
@@ -181,6 +181,14 @@ protected function getRoles() {
       $roles = array_combine(array_keys($role_objects), array_map(function ($a) {
         return $a->label();
       }, $role_objects));
+      // Remove the anonymous and authenticated user roles as they are not
+      // useful to filter the list of user accounts.
+      unset($roles['anonymous']);
+      unset($roles['authenticated']);
+      // Remove the job importer role as it's an internal role used by the
+      // job importer.
+      // @todo remove if we remove the job importer role.
+      unset($roles['job_importer']);
     }
 
     return $roles;

From ef962988c1057290273a9cd7fbcd06e4a4782209 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 16 Dec 2021 07:15:47 +0000
Subject: [PATCH 308/720] [RW-176] Remove create user local task and add
 template to ease styling

---
 .../reliefweb_users/reliefweb_users.module    | 35 +++++++++++++++++++
 .../templates/reliefweb-users-page.html.twig  | 21 +++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 html/modules/custom/reliefweb_users/reliefweb_users.module
 create mode 100644 html/modules/custom/reliefweb_users/templates/reliefweb-users-page.html.twig

diff --git a/html/modules/custom/reliefweb_users/reliefweb_users.module b/html/modules/custom/reliefweb_users/reliefweb_users.module
new file mode 100644
index 000000000..9fdcbf066
--- /dev/null
+++ b/html/modules/custom/reliefweb_users/reliefweb_users.module
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * @file
+ * Module file for reliefweb_users.
+ */
+
+/**
+ * Implements hook_theme().
+ */
+function reliefweb_users_theme() {
+  $themes = [
+    'reliefweb_users_page' => [
+      'variables' => [
+        // Filters form.
+        'filters' => NULL,
+        // Attributes for the filters.
+        'filters_attributes' => NULL,
+        // List of users.
+        'list' => NULL,
+        // Attributes for the list.
+        'list_attributes' => NULL,
+      ],
+    ],
+  ];
+  return $themes;
+}
+
+/**
+ * Implements hook_menu_local_actions_alter().
+ */
+function reliefweb_users_menu_local_actions_alter(&$local_actions) {
+  // Remove the create user action on the "people" page.
+  unset($local_actions['user_admin_create']);
+}
diff --git a/html/modules/custom/reliefweb_users/templates/reliefweb-users-page.html.twig b/html/modules/custom/reliefweb_users/templates/reliefweb-users-page.html.twig
new file mode 100644
index 000000000..a48252b9e
--- /dev/null
+++ b/html/modules/custom/reliefweb_users/templates/reliefweb-users-page.html.twig
@@ -0,0 +1,21 @@
+{#
+
+/**
+ * @file
+ * Template file for the people page's content.
+ *
+ * Available variables:
+ * - filters: form filters.
+ * - list: table with the list of users.
+ */
+
+#}
+<section{{ filters_attributes.addClass('rw-users-filters') }}>
+  <h2 class="visually-hidden">{{ 'Filters'|t }}</h2>
+  {{ filters }}
+</section>
+
+<section{{ list_attributes.addClass('rw-users-list') }}>
+  <h2 class="visually-hidden">{{ 'List'|t }}</h2>
+  {{ list }}
+</section>

From 371eb86dfe2e4cc10433c654b2d2cae797ea0d42 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 16 Dec 2021 07:16:36 +0000
Subject: [PATCH 309/720] [RW-176] Wrap people's page filter button, add reset
 button and create user link

---
 .../src/Form/UserPageFilterForm.php           | 37 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/reliefweb_users/src/Form/UserPageFilterForm.php b/html/modules/custom/reliefweb_users/src/Form/UserPageFilterForm.php
index fd56c23ec..c4b1a0d94 100644
--- a/html/modules/custom/reliefweb_users/src/Form/UserPageFilterForm.php
+++ b/html/modules/custom/reliefweb_users/src/Form/UserPageFilterForm.php
@@ -7,6 +7,7 @@
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Url;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -126,10 +127,34 @@ public function buildForm(array $form, FormStateInterface $form_state, AccountIn
       '#default_value' => isset($filters['mail']) ? $filters['mail'] : '',
     ];
 
-    $form['filters']['submit'] = [
+    $form['actions'] = [
+      '#type' => 'actions',
+      '#theme_wrappers' => [
+        'fieldset' => [
+          '#id' => 'actions',
+          '#title' => $this->t('Form actions'),
+          '#title_display' => 'invisible',
+        ],
+      ],
+      '#weight' => 99,
+    ];
+    $form['actions']['submit'] = [
       '#type' => 'submit',
+      '#name' => 'submit',
       '#value' => $this->t('Filter'),
-      '#attributes' => ['class' => ['form-actions']],
+    ];
+    $form['actions']['reset'] = [
+      '#type' => 'submit',
+      '#name' => 'reset',
+      '#value' => $this->t('Reset'),
+      '#submit' => ['::resetForm'],
+    ];
+    $form['actions']['create'] = [
+      '#type' => 'link',
+      '#url' => Url::fromRoute('user.admin_create', [], [
+        'attributes' => ['target' => '_blank'],
+      ]),
+      '#title' => $this->t('Create user'),
     ];
 
     return $form;
@@ -142,6 +167,14 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
     $form_state->setRebuild();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function resetForm(array &$form, FormStateInterface $form_state) {
+    $form_state->setProgrammed(FALSE);
+    $form_state->setRedirect('<current>');
+  }
+
   /**
    * Get and cache the filters for the users admin page.
    */

From bbe1f3904853b6b0c1e8901b2ab8a6973ba67c38 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 16 Dec 2021 07:17:36 +0000
Subject: [PATCH 310/720] [RW-176] Fix people query when using some filters,
 fix link to source page and use rw-users-page template

---
 .../src/Controller/UserController.php         | 43 +++++++++++--------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/html/modules/custom/reliefweb_users/src/Controller/UserController.php b/html/modules/custom/reliefweb_users/src/Controller/UserController.php
index 18b940d27..b7cdf9060 100644
--- a/html/modules/custom/reliefweb_users/src/Controller/UserController.php
+++ b/html/modules/custom/reliefweb_users/src/Controller/UserController.php
@@ -93,12 +93,16 @@ public function getContent(Request $request) {
     unset($form['form_build_id']);
     unset($form['form_id']);
 
+    $build = [
+      '#theme' => 'reliefweb_users_page',
+    ];
+
     // Filters.
-    $build['filters'] = $form;
+    $build['#filters'] = $form;
 
     // List of users.
     $storage = $form_state->getStorage();
-    $build['list'] = $this->usersAdminList($storage, $request->query->all());
+    $build['#list'] = $this->usersAdminList($storage, $request->query->all());
 
     return $build;
   }
@@ -114,7 +118,7 @@ protected function usersAdminList($storage, $query_parameters) {
     $filters = $storage['filters'] ?? [];
     $roles = $storage['roles'];
     $statuses = $storage['statuses'];
-    $rights = $storage['rights'];
+    $rights = array_flip(array_keys($storage['rights']));
 
     // Table headers.
     $header = [
@@ -147,37 +151,40 @@ protected function usersAdminList($storage, $query_parameters) {
     // Filter the query.
     if (isset($filters['role'])) {
       $query->innerJoin('user__roles', 'ur', 'ur.entity_id = u.uid');
-      $query->condition('ur.roles_target_id', array_keys($filters['role']));
+      $query->condition('ur.roles_target_id', array_keys($filters['role']), 'IN');
     }
     if (isset($filters['status'])) {
-      $query->condition('u.status', $filters['status'] === 'active' ? 1 : 0);
+      $query->condition('u.status', $filters['status'] === 'active' ? 1 : 0, '=');
     }
     if (!empty($filters['name'])) {
-      $query->condition('u.name', '%' . $filters['name'] . '%', 'LIKE');
+      $query->condition('u.name', '%' . $this->database->escapeLike($filters['name']) . '%', 'LIKE');
     }
     if (!empty($filters['mail'])) {
-      $query->condition('u.mail', '%' . $filters['mail'] . '%', 'LIKE');
+      $query->condition('u.mail', '%' . $this->database->escapeLike($filters['mail']) . '%', 'LIKE');
     }
+
+    // Content posted filter.
     if (!empty($filters['posted'])) {
-      $subquery = $this->database->select('node_field_data', 'n')
-        ->fields('n', ['uid'])
-        ->condition('n.type', $filters['posted'], 'IN')
-        ->distinct();
-      $query->innerJoin($subquery, NULL, '%alias.uid = u.uid');
+      $query->innerJoin('node_field_data', 'n', '%alias.uid = u.uid');
+      $query->condition('n.type', array_keys($filters['posted']), 'IN');
     }
+
+    // Posting rights filter.
     if (isset($filters['job_rights']) || isset($filters['training_rights'])) {
       $query->innerJoin('taxonomy_term__field_user_posting_rights', 'fpr', '%alias.field_user_posting_rights_id = u.uid');
       if (isset($filters['job_rights'])) {
-        $query->condition('fpr.field_user_posting_rights_job', array_search($filters['job_rights'], array_keys($rights)));
+        $query->condition('fpr.field_user_posting_rights_job', $rights[$filters['job_rights']], '=');
       }
       if (isset($filters['training_rights'])) {
-        $query->condition('fpr.field_user_posting_rights_training', array_search($filters['training_rights'], array_keys($rights)));
+        $query->condition('fpr.field_user_posting_rights_training', $rights[$filters['training_rights']], '=');
       }
     }
 
     // Set group by.
     $group_by = &$query->getGroupBy();
-    $group_by = $fields;
+    $group_by = array_map(function ($field) {
+      return 'u.' . $field;
+    }, $fields);
 
     // Get the number of users for the query.
     $count_query = $query->countQuery();
@@ -185,8 +192,8 @@ protected function usersAdminList($storage, $query_parameters) {
     // Get the number of users for the query.
     $count = $count_query->execute()->fetchField();
 
-    $currentPage = $this->pagerManager->createPager($count, $items_per_page)->getCurrentPage();
     // Get the users.
+    $currentPage = $this->pagerManager->createPager($count, $items_per_page)->getCurrentPage();
     $query->range($currentPage * $items_per_page, $items_per_page);
     $users = $query->execute()->fetchAllAssoc('uid', \PDO::FETCH_OBJ);
 
@@ -274,7 +281,9 @@ public function getUserSources(array &$users) {
     foreach ($query->execute() as $record) {
       $job = $record->job;
       $training = $record->training;
-      $link = Link::fromTextAndUrl($record->name, URL::fromUserInput('/taxonomy/term/' . $record->tid . '/posting-rights'));
+      $link = Link::fromTextAndUrl($record->name, URL::fromUserInput('/taxonomy/term/' . $record->tid . '/user-posting-rights', [
+        'attributes' => ['target' => '_blank'],
+      ]));
       $row = '<li data-job="' . $job . '" data-training="' . $training . '">' . $link->toString() . '</li>';
       $sources[$record->uid][$record->tid] = $row;
     }

From 769a2dfa012751c83a7563e225df9ec4942df06c Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 16 Dec 2021 07:22:28 +0000
Subject: [PATCH 311/720] [RW-176] Use subtheme for the people page

---
 config/theme_switcher.rule.request_path.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/theme_switcher.rule.request_path.yml b/config/theme_switcher.rule.request_path.yml
index 6a60a96e2..4e89d3e0e 100644
--- a/config/theme_switcher.rule.request_path.yml
+++ b/config/theme_switcher.rule.request_path.yml
@@ -13,4 +13,4 @@ visibility:
   request_path:
     id: request_path
     negate: false
-    pages: "/moderation/content/*\r\n/user/*/edit\r\n/user/*/notifications\r\n/user/*/bookmarks\r\n/user/*/posts\r\n/user/*/contact\r\n/admin/community-topics\r\n/admin/reliefweb_revisions/history/*/*"
+    pages: "/moderation/content/*\r\n/user/*/edit\r\n/user/*/notifications\r\n/user/*/bookmarks\r\n/user/*/posts\r\n/user/*/contact\r\n/admin/community-topics\r\n/admin/reliefweb_revisions/history/*/*\r\n/admin/people"

From c22b0e442eeadabd0248d53599f221abce989fe1 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 16 Dec 2021 13:14:55 +0000
Subject: [PATCH 312/720] [RW-269] Add tabledrag and make widget a bit more
 compact

---
 .../reliefweb_docstore.module                 | 41 ------------
 .../Field/FieldWidget/ReliefWebFile.php       | 29 ++++++--
 .../reliefweb-file-widget-item.html.twig      | 21 ++++--
 .../templates/reliefweb-file-widget.html.twig | 36 ++++++----
 .../components/rw-form/rw-form--widget.css    | 66 +++++++++++++++----
 5 files changed, 116 insertions(+), 77 deletions(-)

diff --git a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
index 817ab3463..12e65bccd 100644
--- a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
+++ b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
@@ -51,47 +51,6 @@ function reliefweb_docstore_theme() {
   ];
 }
 
-/**
- * Implemenents hook_preprocess_HOOK() for "reliefweb_file_widget".
- */
-function reliefweb_docstore_preprocess_reliefweb_file_widget(&$variables) {
-  $element = &$variables['element'];
-
-  if (!isset($element['#attributes'])) {
-    $element['#attributes'] = [];
-  }
-
-  if (!isset($element['#attributes']['id']) && isset($element['#id'])) {
-    $element['#attributes']['id'] = $element['#id'];
-  }
-
-  if (isset($element['#attributes']['id'])) {
-    drupal_attach_tabledrag($element, [
-      'table_id' => $element['#attributes']['id'] . '-table',
-      'action' => 'order',
-      'relationship' => 'sibling',
-      'group' => 'draggable-weight',
-    ]);
-  }
-
-  $variables['attributes'] = $element['#attributes'];
-}
-
-/**
- * Implemenents hook_preprocess_HOOK() for "reliefweb_file_widget_item".
- */
-function reliefweb_docstore_preprocess_reliefweb_file_widget_item(&$variables) {
-  $element = &$variables['element'];
-
-  if (!isset($element['#attributes'])) {
-    $element['#attributes'] = [];
-  }
-
-  if (isset($element['weight'])) {
-    $element['weight']['#attributes']['class'][] = 'draggable-weight';
-  }
-}
-
 /**
  * Implemenents hook_preprocess_HOOK() for "image_style".
  */
diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
index 91bfe550e..6e4a9b54f 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
@@ -227,7 +227,6 @@ protected function formMultipleElements(FieldItemListInterface $items, array &$f
     // Populate the 'array_parents' information in $form_state->get('field')
     // after the form is built, so that we catch changes in the form structure
     // performed in alter() hooks.
-    $elements['#after_build'][] = [static::class, 'afterBuild'];
     $elements['#field_name'] = $field_name;
     $elements['#field_parents'] = $parents;
 
@@ -378,11 +377,11 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
       ];
       $element['preview_rotation'] = [
         '#type' => 'select',
-        '#title' => $this->t('Preview page rotation'),
+        '#title' => $this->t('Page rotation'),
         '#options' => [
           0 => $this->t('none'),
-          90 => $this->t('clockwise'),
-          -90 => $this->t('counterclockwise'),
+          90 => $this->t('right'),
+          -90 => $this->t('left'),
         ],
         '#default_value' => $preview_rotation,
         '#ajax' => $this->getAjaxSettings($this->t('Regenerating preview...'), $field_parents),
@@ -471,7 +470,10 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
       // the delta of the current element.
       '#delta' => $items->count(),
       '#default_value' => $item->_weight ?? $delta,
-      '#weight' => 100,
+      '#weight' => -100,
+      '#attributes' => [
+        'class' => ['draggable-weight'],
+      ],
     ];
 
     // Save the non editable field item values. This needs to happen at the end
@@ -1011,4 +1013,21 @@ public static function rebuildWidgetForm(array &$form, FormStateInterface &$form
     return $response->addCommand(new ReplaceCommand(NULL, $widget));
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public static function afterBuild(array $element, FormStateInterface $form_state) {
+    $element = parent::afterBuild($element, $form_state);
+
+    drupal_attach_tabledrag($element, [
+      'table_id' => $element['#id'] . '-table',
+      'group' => 'draggable-weight',
+      'action' => 'order',
+      'relationship' => 'sibling',
+      'hidden' => FALSE,
+    ]);
+
+    return $element;
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget-item.html.twig b/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget-item.html.twig
index 22c0edf18..42efa8e9a 100644
--- a/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget-item.html.twig
+++ b/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget-item.html.twig
@@ -21,7 +21,11 @@
     '_weight',
   ]
 %}
+{% set attributes = create_attribute(element['#attributes'] ?? {}) %}
 <tr{{ attributes.addClass(['rw-file-widget-item', 'draggable']) }}>
+  <td class="rw-file-widget-item__weight">
+    {{ element._weight }}
+  </td>
   {% if element.preview_page is empty %}
   <td class="rw-file-widget-item__information" colspan="2">
   {% else %}
@@ -37,15 +41,20 @@
   </td>
   {% if element.preview_page is not empty %}
   <td class="rw-file-widget-item__preview">
-    {{ element.preview }}
-    {{ element.preview_page }}
-    {{ element.preview_rotation }}
+    <div class="rw-file-widget-item__preview__content">
+      {% if element.preview %}
+      <div class="rw-file-widget-item__preview__thumbnail">
+        {{ element.preview }}
+      </div>
+      {% endif %}
+      <div class="rw-file-widget-item__preview__options">
+        {{ element.preview_page }}
+        {{ element.preview_rotation }}
+      </div>
+    </div>
   </td>
   {% endif %}
   <td class="rw-file-widget-item__operations">
     {{ element.operations }}
   </td>
-  <td class="rw-file-widget-item__weight">
-    {{ element._weight }}
-  </td>
 </tr>
diff --git a/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget.html.twig b/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget.html.twig
index 58b1817dd..ce8d557e6 100644
--- a/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget.html.twig
+++ b/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget.html.twig
@@ -11,18 +11,28 @@
 #}
 {% set files = element|without(['add_more'])|filter((v, k) => k|first != '#') %}
 {% set add_more = element['add_more'] %}
+{% set attributes = create_attribute(element['#attributes'] ?? {}) %}
 
-<div{{ attributes.addClass('rw-file-widget') }}>
-  {% if files is not empty %}
-  <table id="{{ attributes.id ~ '-table' }}">
-    <thead class="visually-hidden">
-      <tr><th>Information</th><th>Preview</th><th>Operations</th><th>Weight</th></tr>
-    </thead>
-    <tbody>
-      {{ files }}
-    </tbody>
-  </table>
-  {% endif %}
+<fieldset{{ attributes.addClass('rw-file-widget', 'form-wrapper') }}>
+  <legend{{ legend_attributes }}>
+    <span class="fieldset-legend">{{ element['#title'] }}</span>
+  </legend>
 
-  {{ add_more }}
-</div>
+  <div class="fieldset-wrapper">
+    {% if files is not empty %}
+    <table{{ create_attribute().setAttribute('id', element['#id'] ~ '-table').addClass('rw-file-widget__table') }}>
+      <thead class="visually-hidden">
+        <tr><th>Information</th><th>Preview</th><th>Operations</th><th>Weight</th></tr>
+      </thead>
+      <tbody>
+        {{ files }}
+      </tbody>
+    </table>
+    {% endif %}
+
+
+    {{ add_more ? add_more|merge({
+      '#attributes': create_attribute(add_more['#attributes'] ?? {}).addClass('rw-file-widget__add-more'),
+    }) }}
+  </div>
+</fieldset>
diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
index a1e5e6936..8973cbfd0 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
@@ -80,22 +80,53 @@ form .views-field-media-library-select-form .form-type-checkbox:only-of-type {
 }
 
 /* RW docstore */
-form .field--type-reliefweb-file {
-  border: 1px solid var(--cd-reliefweb-brand-grey--light);
+.rw-file-widget .tabledrag-toggle-weight-wrapper {
+  display: none;
 }
-.rw-file-widget {
+.rw-file-widget__add-more {
   padding: 16px;
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
-.rw-file-widget .description {
+.rw-file-widget__table {
   margin-bottom: 1rem;
 }
-.rw-file-widget table {
+.rw-file-widget__table td {
+  padding: 16px;
+}
+.rw-file-widget__table td.rw-file-widget-item__weight {
+  padding: 0;
+  text-align: center;
+}
+.rw-file-widget-item__weight .tabledrag-handle + .form-item {
+  display: none;
+}
+.rw-file-widget-item__weight a.tabledrag-handle {
+  display: flex;
+  float: none;
+  align-items: center;
+  justify-content: center;
+  width: 28px;
+  height: 32px;
+  margin-left: 0;
+}
+.rw-file-widget-item__weight a.tabledrag-handle .handle {
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  padding: 0;
+}
+.rw-file-widget .description {
   margin-bottom: 1rem;
 }
 .rw-file-widget .rw-file-widget-item__preview {
   width: 15rem;
 }
-.rw-file-widget .rw-file-widget-item__preview > div[id$="preview"] {
+.rw-file-widget .rw-file-widget-item__preview__content {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.rw-file-widget .rw-file-widget-item__preview__thumbnail > div {
   display: flex;
   float: left;
   align-items: center;
@@ -106,14 +137,15 @@ form .field--type-reliefweb-file {
   text-align: center;
   border: 1px solid #e6ecef;
 }
-.rw-file-widget .rw-file-widget-item__preview .rw-file-preview {
+.rw-file-widget .rw-file-widget-item__preview__thumbnail .rw-file-preview {
   overflow: hidden;
-  width: 100%;
-  height: 100%;
+  max-width: 100%;
+  max-height: 100%;
+  object-fit: contain;
   font-size: 14px;
 }
-.form-item-field-file-0-preview-page select {
-  width: 6rem;
+.rw-file-widget .rw-file-widget-item__preview__options {
+  width: 7rem;
 }
 
 /* Replace file button */
@@ -150,10 +182,20 @@ form .field--type-reliefweb-file {
   overflow: hidden;
   width: 12px;
   height: 12px;
-  margin-right: 4px;
+  margin-right: 6px;
   content: "";
   background: var(--rw-icons--toggle--down--12--dark-blue);
 }
+.rw-file-widget details[open] > summary {
+  margin-bottom: 8px;
+  padding-bottom: 8px;
+  border-bottom: 1px solid var(--cd-reliefweb-brand-grey--light);
+}
 .rw-file-widget details[open] > summary::before {
   background: var(--rw-icons--toggle--up--12--dark-blue);
 }
+
+/* Warning when re-ordered. */
+.rw-file-widget .warning.tabledrag-changed {
+  color: red;
+}

From 77c683d0e142193d02208ed7dc5450ae8e3f9faf Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 16 Dec 2021 09:00:03 -0700
Subject: [PATCH 313/720] example commit

---
 .../custom/common_design_subtheme/components/rw-form/rw-form.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 542578f3b..1c6ef546b 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -1,6 +1,5 @@
 /**
  * Base form elements.
- *
  * This provides basic styling for form elements in the main-content content area.
  */
 form input,

From 2b8dbf9fbb92fcef2bf599d4a284e568a9ee3fe4 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 16 Dec 2021 09:48:10 -0700
Subject: [PATCH 314/720] lint css

---
 .../reliefweb-guidelines.css                  | 548 +++++++-----------
 1 file changed, 216 insertions(+), 332 deletions(-)

diff --git a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
index 753d7f512..b62e6d824 100644
--- a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
+++ b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
@@ -1,38 +1,35 @@
 .rw-guidelines-list {
-  background-color: #FFFFFF;
-  color: #000;
-  font-family: Verdana, sans-serif;
-  font-size: 14px;
-  margin: 0;
-  padding: 0;
-
   position: absolute;
   top: 0;
-  left: 0;
   right: 0;
   bottom: 0;
-
+  left: 0;
   display: -webkit-flex;
-  -webkit-flex-direction: row;
   display: flex;
+  -webkit-flex-direction: row;
   flex-direction: row;
+  margin: 0;
+  padding: 0;
+  color: #000;
+  background-color: #fff;
+  font-family: Verdana, sans-serif;
+  font-size: 14px;
 }
 
 .rw-guidelines-list > input {
   display: none;
 }
 .rw-guidelines-list aside {
-  background-color: #333;
-  border-right: 1px solid #333;
-  box-shadow: 2px 0px 10px 0px rgba(0,0,0,0.6);
-  color: white;
-  width: 260px;
   z-index: 3;
-
   display: -webkit-flex;
-  -webkit-flex-direction: column;
   display: flex;
+  -webkit-flex-direction: column;
   flex-direction: column;
+  width: 260px;
+  color: white;
+  border-right: 1px solid #333;
+  background-color: #333;
+  box-shadow: 2px 0 10px 0 rgba(0, 0, 0, 0.6);
 }
 .rw-guidelines-list > input:checked + aside {
   margin-left: -250px;
@@ -40,73 +37,72 @@
 .rw-guidelines-list aside > nav {
   overflow-x: hidden;
   overflow-y: auto;
-
   -webkit-flex: 1;
   flex: 1;
 }
 .rw-guidelines-list aside h1 {
+  position: relative;
   -webkit-flex: 0 0 auto;
   flex: 0 0 auto;
+  width: 100%;
   height: 50px;
-  line-height: 50px;
   margin: 0;
-  position: relative;
   text-align: center;
-  text-shadow: 2px 2px 2px rgba(0, 0, 0, 1);
   color: white;
-  width: 100%;
+  text-shadow: 2px 2px 2px rgba(0, 0, 0, 1);
+  line-height: 50px;
 }
 .rw-guidelines-list aside h1:before {
-  background-image: url(./assets/logo.svg);
-  background-repeat: no-repeat;
-  content: "";
-  display: block;
-  margin: 5px;
   position: absolute;
-  height: 40px;
+  display: block;
   width: 40px;
+  height: 40px;
+  margin: 5px;
+  content: "";
   cursor: default;
+  background-image: url(./assets/logo.svg);
+  background-repeat: no-repeat;
 }
 .rw-guidelines-list aside h1 a {
-  font-size: 10px;
-  font-weight: normal;
-  color: #ccc;
   position: absolute;
   right: 10px;
+  color: #ccc;
+  font-size: 10px;
+  font-weight: normal;
 }
 .rw-guidelines-list aside form {
   -webkit-flex: 0 0 auto;
   flex: 0 0 auto;
 }
 .rw-guidelines-list aside form input {
+  box-sizing: border-box;
+  width: 100%;
+  padding: 8px;
   color: #333;
   border: none;
   border-bottom: 1px solid #333;
-  box-shadow: inset 0px 1px 5px 0px rgba(0,0,0,0.5);
-  box-sizing: border-box;
+  box-shadow: inset 0 1px 5px 0 rgba(0, 0, 0, 0.5);
   font-size: 14px;
-  padding: 8px;
-  width: 100%;
 }
 .rw-guidelines-list aside nav label {
-  background-color: #444;
-  border-left: 5px solid #F77462;
-  box-shadow: 0px 1px 5px 0px rgba(0,0,0,0.5);
-  cursor: pointer;
+  position: relative;
   display: block;
-  line-height: 16px;
   padding: 10px;
-  position: relative;
+  cursor: pointer;
+  border-left: 5px solid #f77462;
+  background-color: #444;
+  box-shadow: 0 1px 5px 0 rgba(0, 0, 0, 0.5);
   text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.8);
+  line-height: 16px;
 }
 .rw-guidelines-list aside nav label:before {
-  content: "";
-  border-top: 1px solid #bbb;
-  display: block;
   position: absolute;
   top: 0;
   left: 0;
+  display: block;
   width: 100%;
+  content: "";
+  border-top: 1px solid #bbb;
 }
 .rw-guidelines-list aside nav label:first-child:before {
   border-top: none;
@@ -115,30 +111,32 @@
   display: none;
 }
 .rw-guidelines-list aside nav input + nav {
-  background-color: #ccc;
   display: none;
+  background-color: #ccc;
 }
 .rw-guidelines-list aside nav input:checked + nav {
   display: block;
 }
 .rw-guidelines-list aside nav a {
-  background-color: #f8f8f8;
-  border-top: 1px solid #ccc;
-  color: #333;
   display: block;
   margin-left: 10px;
   padding: 8px;
   text-decoration: none;
+  color: #333;
+  border-top: 1px solid #ccc;
+  background-color: #f8f8f8;
 }
 .rw-guidelines-list aside nav a:first-child {
   border-top: none;
 }
-.rw-guidelines-list aside nav a:active, aside nav a.active {
-  background-color: #94C3F0;
-  border-color: #3E7DD0;
+.rw-guidelines-list aside nav a:active,
+aside nav a.active {
+  border-color: #3e7dd0;
+  background-color: #94c3f0;
 }
-.rw-guidelines-list aside nav a:active + a, aside nav a.active + a {
-  border-top-color: #3E7DD0;
+.rw-guidelines-list aside nav a:active + a,
+aside nav a.active + a {
+  border-top-color: #3e7dd0;
 }
 .rw-guidelines-list aside nav a:focus {
   outline: none;
@@ -147,74 +145,79 @@
 .rw-guidelines-list main {
   position: relative;
   z-index: 1;
-
+  display: -webkit-flex;
+  display: flex;
   -webkit-flex: 1 0 0;
   flex: 1 0 0;
-
-  display: -webkit-flex;
   -webkit-flex-direction: column;
-  display: flex;
   flex-direction: column;
 }
 .rw-guidelines-list main > div {
-  background-color: #fff;
+  position: relative;
   overflow-x: hidden;
   overflow-y: auto;
-  position: relative;
-
   -webkit-flex: 1;
   flex: 1;
+  background-color: #fff;
 }
 .rw-guidelines-list main > div:before {
-  content: '';
-  background-image: url(./assets/logo.svg);
-  background-repeat: no-repeat;
-  width: 400px;
-  height: 400px;
-  -webkit-filter: grayscale(100%);
-  filter: grayscale(100%);
-  opacity: 0.4;
   position: absolute;
+  z-index: 1;
   top: 50%;
   left: 50%;
+  width: 400px;
+  height: 400px;
   margin-top: -200px;
   margin-left: -200px;
-  z-index: 1;
+  content: "";
+  opacity: 0.4;
+  -webkit-filter: grayscale(100%);
+  filter: grayscale(100%);
+  background-image: url(./assets/logo.svg);
+  background-repeat: no-repeat;
 }
 
 .rw-guidelines-list article {
-  background-color: white;
-  display: none;
-  padding: 10px 20px;
   position: relative;
   z-index: 2;
+  display: none;
+  overflow: hidden;
+  padding: 10px 20px;
+  word-wrap: break-word;
+  color: #333;
+  background-color: white;
+  font-family: "Helvetica Neue", Helvetica, "Segoe UI", Arial, freesans, sans-serif;
+  font-size: 16px;
+  line-height: 1.6;
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
 }
 .rw-guidelines-list a:target + article,
 .rw-guidelines-list article:target {
-  box-sizing: border-box;
-  display: block;
   position: absolute;
   top: 0;
-  left: 0;
   right: 0;
-  height: 100%;
+  left: 0;
+  display: block;
   overflow: visible;
+  box-sizing: border-box;
+  height: 100%;
 }
 .rw-guidelines-list article > h2 > a {
-  float: right;
-  font-size: 16px;
-  font-weight: normal;
-  line-height: 40px;
   position: relative;
-  font-size: 0;
+  float: right;
   width: 20px;
   height: 40px;
   background-image: url(../images/trello.svg);
-  background-size: 20px 20px;
-  background-position: 0 10px;
   background-repeat: no-repeat;
+  background-position: 0 10px;
+  background-size: 20px 20px;
+  font-size: 16px;
+  font-size: 0;
+  font-weight: normal;
+  line-height: 40px;
 }
-/*.rw-guidelines-list article > h2 > a:before {
+/* .rw-guidelines-list article > h2 > a:before {
   content: "";
   position: absolute;
   top: 50%;
@@ -223,21 +226,21 @@
   border-style: solid;
   border-color: #4183c4 #4183c4 transparent;
   margin: -8px 0 0;
-}*/
+} */
 .rw-guidelines-list article > h2 {
   margin-top: 0 !important;
 }
 .rw-guidelines-list article > h2 > span:after {
-  content: "";
-  border-top: 5px solid #333;
-  border-right: 5px solid #333;
-  -webkit-transform: rotate(45deg);
-  transform: rotate(45deg);
+  display: inline-block;
   width: 12px;
   height: 12px;
-  display: inline-block;
   margin-right: 5px;
   margin-left: 5px;
+  content: "";
+  -webkit-transform: rotate(45deg);
+  transform: rotate(45deg);
+  border-top: 5px solid #333;
+  border-right: 5px solid #333;
 }
 .rw-guidelines-list article > div {
   padding-bottom: 5px;
@@ -250,31 +253,31 @@
   display: block;
 }
 .rw-guidelines-list #search > div > a > span:after {
-  content: "";
-  border-top: 3px solid #4183c4;
-  border-right: 3px solid #4183c4;
-  -webkit-transform: rotate(45deg);
-  transform: rotate(45deg);
+  display: inline-block;
   width: 8px;
   height: 8px;
-  display: inline-block;
   margin-right: 3px;
   margin-left: 3px;
+  content: "";
+  -webkit-transform: rotate(45deg);
+  transform: rotate(45deg);
+  border-top: 3px solid #4183c4;
+  border-right: 3px solid #4183c4;
 }
 .rw-guidelines-list .highlight.yellow {
-  background-color: #F7D358;
+  background-color: #f7d358;
 }
 .rw-guidelines-list .highlight.red {
-  background-color: #FA5858;
+  background-color: #fa5858;
 }
 .rw-guidelines-list .highlight.green {
-  background-color: #82FA58;
+  background-color: #82fa58;
 }
 .rw-guidelines-list .highlight.blue {
-  background-color: #58ACFA;
+  background-color: #58acfa;
 }
 .rw-guidelines-list .highlight.purple {
-  background-color: #D358F7;
+  background-color: #d358f7;
 }
 
 /**
@@ -282,19 +285,19 @@
  * Only works with webkit based browsers.
  */
 .rw-guidelines-list .scroll::-webkit-scrollbar {
-  background-color: #F5F5F5;
   width: 10px;
+  background-color: #f5f5f5;
 }
 .rw-guidelines-list .scroll::-webkit-scrollbar:horizontal {
   height: 10px;
 }
 .rw-guidelines-list .scroll::-webkit-scrollbar-track {
-  -webkit-box-shadow: inset 0 0 10px rgba(0,0,0,0.3);
-  background-color: #F5F5F5;
+  background-color: #f5f5f5;
+  -webkit-box-shadow: inset 0 0 10px rgba(0, 0, 0, 0.3);
 }
 .rw-guidelines-list .scroll::-webkit-scrollbar-thumb {
-  -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);
   background-color: #bbb;
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
 }
 
 /**
@@ -304,26 +307,18 @@
  */
 @font-face {
   font-family: octicons-anchor;
-  src: url(data:font/woff;charset=utf-8;base64,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) format('woff');
-}
-
-.rw-guidelines-list article {
-  -ms-text-size-adjust: 100%;
-  -webkit-text-size-adjust: 100%;
-  color: #333;
-  overflow: hidden;
-  font-family: "Helvetica Neue", Helvetica, "Segoe UI", Arial, freesans, sans-serif;
-  font-size: 16px;
-  line-height: 1.6;
-  word-wrap: break-word;
+  src: url(data:font/woff;charset=utf-8;base64,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) format("woff");
 }
 
 .rw-guidelines-list article a {
+  text-decoration: none;
+  color: #4183c4;
   background: transparent;
 }
 
 .rw-guidelines-list article a:active,
 .rw-guidelines-list article a:hover {
+  text-decoration: underline;
   outline: 0;
 }
 
@@ -331,53 +326,68 @@
   font-weight: bold;
 }
 
-.rw-guidelines-list article h1 {
-  font-size: 2em;
-  margin: 0.67em 0;
-}
-
 .rw-guidelines-list article img {
+  box-sizing: border-box;
+  max-width: 100%;
+  padding: 10px;
   border: 0;
+  background-color: #fff;
+  -moz-box-shadow: 0 0 5px 0 #ddd;
+  -webkit-box-shadow: 0 0 5px 0 #ddd;
+  box-shadow: 0 0 5px 0 #ddd;
 }
 
 .rw-guidelines-list article hr {
+  display: table;
+  overflow: hidden;
   box-sizing: content-box;
-  height: 0;
+  height: 4px;
+  margin: 16px 0;
+  padding: 0;
+  content: "";
+  border: 0 none;
+  background-color: #e7e7e7;
 }
 
 .rw-guidelines-list article pre {
   overflow: auto;
+  margin-top: 0;
+  margin-bottom: 0;
+  word-wrap: normal;
+  font: 12px Consolas, "Liberation Mono", Menlo, Courier, monospace;
 }
 
 .rw-guidelines-list article code,
 .rw-guidelines-list article kbd,
 .rw-guidelines-list article pre {
-  font-family: monospace, monospace;
+  font-family: monospace;
   font-size: 1em;
 }
 
 .rw-guidelines-list article input {
-  color: inherit;
-  font: inherit;
   margin: 0;
+  color: inherit;
+  font: 13px/1.4 Helvetica, arial, nimbussansl, liberationsans, freesans, clean, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol";
+  line-height: normal;
 }
 
 .rw-guidelines-list article html input[disabled] {
   cursor: default;
 }
 
-.rw-guidelines-list article input {
-  line-height: normal;
-}
-
 .rw-guidelines-list article input[type="checkbox"] {
   box-sizing: border-box;
   padding: 0;
 }
 
 .rw-guidelines-list article table {
-  border-collapse: collapse;
+  display: block;
+  overflow: auto;
+  width: 100%;
   border-spacing: 0;
+  word-break: normal;
+  word-break: keep-all;
+  border-collapse: collapse;
 }
 
 .rw-guidelines-list article td,
@@ -389,34 +399,6 @@
   box-sizing: border-box;
 }
 
-.rw-guidelines-list article input {
-  font: 13px/1.4 Helvetica, arial, nimbussansl, liberationsans, freesans, clean, sans-serif, "Segoe UI Emoji", "Segoe UI Symbol";
-}
-
-.rw-guidelines-list article a {
-  color: #4183c4;
-  text-decoration: none;
-}
-
-.rw-guidelines-list article a:hover,
-.rw-guidelines-list article a:active {
-  text-decoration: underline;
-}
-
-.rw-guidelines-list article hr {
-  height: 0;
-  margin: 15px 0;
-  overflow: hidden;
-  background: transparent;
-  border: 0;
-  border-bottom: 1px solid #ddd;
-}
-
-.rw-guidelines-list article hr:before {
-  display: table;
-  content: "";
-}
-
 .rw-guidelines-list article hr:after {
   display: table;
   clear: both;
@@ -429,44 +411,62 @@
 .rw-guidelines-list article h4,
 .rw-guidelines-list article h5,
 .rw-guidelines-list article h6 {
+  position: relative;
   margin-top: 15px;
+  margin-top: 1em;
   margin-bottom: 15px;
+  margin-bottom: 16px;
+  font-weight: bold;
   line-height: 1.1;
+  line-height: 1.4;
 }
 
 .rw-guidelines-list article h1 {
-  font-size: 30px;
+  margin: 0.67em 0;
+  padding-bottom: 0.3em;
+  border-bottom: 1px solid #eee;
+  font-size: 2.25em;
+  line-height: 1.2;
 }
 
 .rw-guidelines-list article h2 {
-  font-size: 21px;
+  padding-bottom: 0.3em;
+  border-bottom: 1px solid #eee;
+  font-size: 1.75em;
+  line-height: 1.225;
 }
 
 .rw-guidelines-list article h3 {
-  font-size: 16px;
+  font-size: 1.5em;
+  line-height: 1.43;
 }
 
 .rw-guidelines-list article h4 {
-  font-size: 14px;
+  font-size: 1.25em;
 }
 
 .rw-guidelines-list article h5 {
-  font-size: 12px;
+  font-size: 1em;
 }
 
 .rw-guidelines-list article h6 {
-  font-size: 11px;
+  color: #777;
+  font-size: 1em;
 }
 
 .rw-guidelines-list article blockquote {
   margin: 0;
+  padding: 0 15px;
+  color: #777;
+  border-left: 4px solid #ddd;
 }
 
 .rw-guidelines-list article ul,
 .rw-guidelines-list article ol {
-  padding: 0;
   margin-top: 0;
   margin-bottom: 0;
+  padding: 0;
+  padding-left: 2em;
 }
 
 .rw-guidelines-list article ol ol,
@@ -486,44 +486,44 @@
 }
 
 .rw-guidelines-list article code {
+  margin: 0;
+  padding: 0;
+  padding-top: 0.2em;
+  padding-bottom: 0.2em;
+  border-radius: 3px;
+  background-color: rgba(0, 0, 0, 0.04);
   font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
-  font-size: 12px;
-}
-
-.rw-guidelines-list article pre {
-  margin-top: 0;
-  margin-bottom: 0;
-  font: 12px Consolas, "Liberation Mono", Menlo, Courier, monospace;
+  font-size: 85%;
 }
 
 .rw-guidelines-list article .octicon {
-  font: normal normal normal 16px/1 octicons-anchor;
   display: inline-block;
-  text-decoration: none;
-  text-rendering: auto;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
   -webkit-user-select: none;
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
+  text-decoration: none;
+  font: normal normal normal 16px/1 octicons-anchor, monospace;
+  text-rendering: auto;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
 }
 
 .rw-guidelines-list article .octicon-link:before {
-  content: '\f05c';
+  content: "\f05c";
 }
 
-.rw-guidelines-list article>*:first-child {
+.rw-guidelines-list article > *:first-child {
   margin-top: 0 !important;
 }
 
-.rw-guidelines-list article>*:last-child {
+.rw-guidelines-list article > *:last-child {
   margin-bottom: 0 !important;
 }
 
 .rw-guidelines-list article a:not([href]) {
-  color: inherit;
   text-decoration: none;
+  color: inherit;
 }
 
 .rw-guidelines-list article .anchor {
@@ -531,28 +531,15 @@
   top: 0;
   left: 0;
   display: block;
+  margin-left: -30px;
   padding-right: 6px;
   padding-left: 30px;
-  margin-left: -30px;
 }
 
 .rw-guidelines-list article .anchor:focus {
   outline: none;
 }
 
-.rw-guidelines-list article h1,
-.rw-guidelines-list article h2,
-.rw-guidelines-list article h3,
-.rw-guidelines-list article h4,
-.rw-guidelines-list article h5,
-.rw-guidelines-list article h6 {
-  position: relative;
-  margin-top: 1em;
-  margin-bottom: 16px;
-  font-weight: bold;
-  line-height: 1.4;
-}
-
 .rw-guidelines-list article h1 .octicon-link,
 .rw-guidelines-list article h2 .octicon-link,
 .rw-guidelines-list article h3 .octicon-link,
@@ -560,8 +547,8 @@
 .rw-guidelines-list article h5 .octicon-link,
 .rw-guidelines-list article h6 .octicon-link {
   display: none;
-  color: #000;
   vertical-align: middle;
+  color: #000;
 }
 
 .rw-guidelines-list article h1:hover .anchor,
@@ -570,8 +557,8 @@
 .rw-guidelines-list article h4:hover .anchor,
 .rw-guidelines-list article h5:hover .anchor,
 .rw-guidelines-list article h6:hover .anchor {
-  padding-left: 8px;
   margin-left: -30px;
+  padding-left: 8px;
   text-decoration: none;
 }
 
@@ -584,58 +571,26 @@
   display: inline-block;
 }
 
-.rw-guidelines-list article h1 {
-  padding-bottom: 0.3em;
-  font-size: 2.25em;
-  line-height: 1.2;
-  border-bottom: 1px solid #eee;
-}
-
 .rw-guidelines-list article h1 .anchor {
   line-height: 1;
 }
 
-.rw-guidelines-list article h2 {
-  padding-bottom: 0.3em;
-  font-size: 1.75em;
-  line-height: 1.225;
-  border-bottom: 1px solid #eee;
-}
-
 .rw-guidelines-list article h2 .anchor {
   line-height: 1;
 }
 
-.rw-guidelines-list article h3 {
-  font-size: 1.5em;
-  line-height: 1.43;
-}
-
 .rw-guidelines-list article h3 .anchor {
   line-height: 1.2;
 }
 
-.rw-guidelines-list article h4 {
-  font-size: 1.25em;
-}
-
 .rw-guidelines-list article h4 .anchor {
   line-height: 1.2;
 }
 
-.rw-guidelines-list article h5 {
-  font-size: 1em;
-}
-
 .rw-guidelines-list article h5 .anchor {
   line-height: 1.1;
 }
 
-.rw-guidelines-list article h6 {
-  font-size: 1em;
-  color: #777;
-}
-
 .rw-guidelines-list article h6 .anchor {
   line-height: 1.1;
 }
@@ -651,19 +606,6 @@
   margin-bottom: 16px;
 }
 
-.rw-guidelines-list article hr {
-  height: 4px;
-  padding: 0;
-  margin: 16px 0;
-  background-color: #e7e7e7;
-  border: 0 none;
-}
-
-.rw-guidelines-list article ul,
-.rw-guidelines-list article ol {
-  padding-left: 2em;
-}
-
 .rw-guidelines-list article ul ul,
 .rw-guidelines-list article ul ol,
 .rw-guidelines-list article ol ol,
@@ -672,7 +614,7 @@
   margin-bottom: 0;
 }
 
-.rw-guidelines-list article li>p {
+.rw-guidelines-list article li > p {
   margin-top: 16px;
 }
 
@@ -681,40 +623,26 @@
 }
 
 .rw-guidelines-list article dl dt {
-  padding: 0;
   margin-top: 16px;
+  padding: 0;
   font-size: 1em;
-  font-style: italic;
   font-weight: bold;
+  font-style: italic;
 }
 
 .rw-guidelines-list article dl dd {
-  padding: 0 16px;
   margin-bottom: 16px;
+  padding: 0 16px;
 }
 
-.rw-guidelines-list article blockquote {
-  padding: 0 15px;
-  color: #777;
-  border-left: 4px solid #ddd;
-}
-
-.rw-guidelines-list article blockquote>:first-child {
+.rw-guidelines-list article blockquote > :first-child {
   margin-top: 0;
 }
 
-.rw-guidelines-list article blockquote>:last-child {
+.rw-guidelines-list article blockquote > :last-child {
   margin-bottom: 0;
 }
 
-.rw-guidelines-list article table {
-  display: block;
-  width: 100%;
-  overflow: auto;
-  word-break: normal;
-  word-break: keep-all;
-}
-
 .rw-guidelines-list article table th {
   font-weight: bold;
 }
@@ -726,43 +654,28 @@
 }
 
 .rw-guidelines-list article table tr {
-  background-color: #fff;
   border-top: 1px solid #ccc;
+  background-color: #fff;
 }
 
 .rw-guidelines-list article table tr:nth-child(2n) {
   background-color: #f8f8f8;
 }
 
-.rw-guidelines-list article img {
-  max-width: 100%;
-  box-sizing: border-box;
-}
-
-.rw-guidelines-list article code {
-  padding: 0;
-  padding-top: 0.2em;
-  padding-bottom: 0.2em;
-  margin: 0;
-  font-size: 85%;
-  background-color: rgba(0,0,0,0.04);
-  border-radius: 3px;
-}
-
 .rw-guidelines-list article code:before,
 .rw-guidelines-list article code:after {
-  letter-spacing: -0.2em;
   content: "\00a0";
+  letter-spacing: -0.2em;
 }
 
-.rw-guidelines-list article pre>code {
-  padding: 0;
+.rw-guidelines-list article pre > code {
   margin: 0;
-  font-size: 100%;
-  word-break: normal;
+  padding: 0;
   white-space: pre;
-  background: transparent;
+  word-break: normal;
   border: 0;
+  background: transparent;
+  font-size: 100%;
 }
 
 .rw-guidelines-list article .highlight {
@@ -771,12 +684,12 @@
 
 .rw-guidelines-list article .highlight pre,
 .rw-guidelines-list article pre {
-  padding: 16px;
   overflow: auto;
+  padding: 16px;
+  border-radius: 3px;
+  background-color: #f7f7f7;
   font-size: 85%;
   line-height: 1.45;
-  background-color: #f7f7f7;
-  border-radius: 3px;
 }
 
 .rw-guidelines-list article .highlight pre {
@@ -784,20 +697,16 @@
   word-break: normal;
 }
 
-.rw-guidelines-list article pre {
-  word-wrap: normal;
-}
-
 .rw-guidelines-list article pre code {
   display: inline;
+  overflow: initial;
   max-width: initial;
-  padding: 0;
   margin: 0;
-  overflow: initial;
-  line-height: inherit;
+  padding: 0;
   word-wrap: normal;
-  background-color: transparent;
   border: 0;
+  background-color: transparent;
+  line-height: inherit;
 }
 
 .rw-guidelines-list article pre code:before,
@@ -808,15 +717,14 @@
 .rw-guidelines-list article kbd {
   display: inline-block;
   padding: 3px 5px;
-  font-size: 11px;
-  line-height: 10px;
-  color: #555;
   vertical-align: middle;
-  background-color: #fcfcfc;
+  color: #555;
   border: solid 1px #ccc;
-  border-bottom-color: #bbb;
   border-radius: 3px;
+  background-color: #fcfcfc;
   box-shadow: inset 0 -1px 0 #bbb;
+  font: 11px Consolas, "Liberation Mono", Menlo, Courier, monospace;
+  line-height: 10px;
 }
 
 .rw-guidelines-list article .pl-c {
@@ -865,8 +773,8 @@
 }
 
 .rw-guidelines-list article .pl-ii {
-  background-color: #b52a1d;
   color: #f8f8f8;
+  background-color: #b52a1d;
 }
 
 .rw-guidelines-list article .pl-sr .pl-cce {
@@ -900,13 +808,13 @@
 }
 
 .rw-guidelines-list article .pl-md {
-  background-color: #ffecec;
   color: #bd2c00;
+  background-color: #ffecec;
 }
 
 .rw-guidelines-list article .pl-mi1 {
-  background-color: #eaffea;
   color: #55a532;
+  background-color: #eaffea;
 }
 
 .rw-guidelines-list article .pl-mdr {
@@ -918,25 +826,11 @@
   color: #1d3e81;
 }
 
-.rw-guidelines-list article kbd {
-  display: inline-block;
-  padding: 3px 5px;
-  font: 11px Consolas, "Liberation Mono", Menlo, Courier, monospace;
-  line-height: 10px;
-  color: #555;
-  vertical-align: middle;
-  background-color: #fcfcfc;
-  border: solid 1px #ccc;
-  border-bottom-color: #bbb;
-  border-radius: 3px;
-  box-shadow: inset 0 -1px 0 #bbb;
-}
-
 .rw-guidelines-list article .task-list-item {
   list-style-type: none;
 }
 
-.rw-guidelines-list article .task-list-item+.task-list-item {
+.rw-guidelines-list article .task-list-item + .task-list-item {
   margin-top: 3px;
 }
 
@@ -945,18 +839,8 @@
   vertical-align: middle;
 }
 
-.rw-guidelines-list article :checked+.radio-label {
-  z-index: 1;
+.rw-guidelines-list article :checked + .radio-label {
   position: relative;
+  z-index: 1;
   border-color: #4183c4;
 }
-
-/** Additional rule **/
-.rw-guidelines-list article img {
-  background-color: #FFF;
-  box-sizing: border-box;
-  -moz-box-shadow: 0px 0px 5px 0px #DDD;
-  -webkit-box-shadow: 0px 0px 5px 0px #DDD;
-  box-shadow: 0px 0px 5px 0px #DDD;
-  padding: 10px;
-}

From e81212d6d8a38776ab425aca4bd4e812d9404ba8 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 16 Dec 2021 10:11:51 -0700
Subject: [PATCH 315/720] JS lint

---
 .../reliefweb-guidelines-search.js                | 15 ++++++++-------
 .../reliefweb-guidelines/reliefweb-guidelines.js  |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines-search.js b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines-search.js
index efe96d452..5f9089455 100644
--- a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines-search.js
+++ b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines-search.js
@@ -1,13 +1,13 @@
 (function () {
   'use strict';
 
-  window.Searcher = function() {
+  window.Searcher = function () {
     var matchRegexps = [];
     var highlightRegexp = null;
     var matchedColors = {};
     var colors = ['yellow', 'red', 'green', 'blue', 'purple'];
     var colorIndex = 0;
-
+    /* eslint-disable */
     var diacriticsMap = {
       '\u00E0': 'a',  // à => a
       '\u00E1': 'a',  // á => a
@@ -44,16 +44,17 @@
       '\u00FD': 'y',  // ý => y
       '\u00FF': 'y'   // ÿ => y
     };
-    function removeDiacritics(text) {
+    function removeDiacritics (text) {
       return text.replace(/[^\u0000-\u007E]/g, function(a) {
         return diacriticsMap[a] || a;
       });
     }
+    /* eslint-enable */
     function removeQuotes(text) {
       return text.replace(/([a-z])([^a-z \t\r\n_-])([a-z])/g, '$1-$3');
     }
     function escapeRegexp(text) {
-      return text.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+      return text.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
     }
     function cleanText(text) {
       return removeQuotes(removeDiacritics(text.toLowerCase()));
@@ -106,7 +107,7 @@
     }
 
     // Search for the keywords.
-    this.search = function(node) {
+    this.search = function (node) {
       var text = cleanText(node.textContent || node.innerText);
 
       // Skip if there is no text.
@@ -128,7 +129,7 @@
     };
 
     // Remove higlighted text.
-    this.remove = function() {
+    this.remove = function () {
       var tags = document.getElementsByClassName('highlight');
       for (var i = tags.length - 1; i >= 0; i--) {
         var tag = tags[i];
@@ -140,7 +141,7 @@
     };
 
     // Set the the search keywords.
-    this.apply = function(input) {
+    this.apply = function (input) {
       input = cleanInput(input);
 
       // Remove the previous highlighs.
diff --git a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.js b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.js
index debc83f6f..3ff00e4e8 100644
--- a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.js
+++ b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.js
@@ -2,7 +2,7 @@
   'use strict';
 
   // Update the mnenu.
-  document.addEventListener('DOMContentLoaded', function() {
+  document.addEventListener('DOMContentLoaded', function () {
     var sidebar = document.getElementsByTagName('aside')[0];
     var main = document.getElementsByTagName('main')[0];
     var menuLinks = sidebar.querySelectorAll('nav a');
@@ -29,7 +29,7 @@
         var images = article.getElementsByTagName('IMG');
         for (var i = 0, l = images.length; i < l; i++) {
           var image = images[i];
-          if (image.src.indexOf("blank.gif") !== -1) {
+          if (image.src.indexOf('blank.gif') !== -1) {
             image.src = image.getAttribute('data-src');
           }
         }

From c5fa36039f593b8c1143c23f67a5e16102a4e376 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 16 Dec 2021 10:16:02 -0700
Subject: [PATCH 316/720] undo example commit

---
 .../custom/common_design_subtheme/components/rw-form/rw-form.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 1c6ef546b..542578f3b 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -1,5 +1,6 @@
 /**
  * Base form elements.
+ *
  * This provides basic styling for form elements in the main-content content area.
  */
 form input,

From ff0cff3587cc8d9ef98f047368e3010c22186bd4 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 16 Dec 2021 13:01:03 -0700
Subject: [PATCH 317/720] RW-286 define rw-people component, copy rules from
 D7, adjust selectors for D9, attach library to template override

---
 .../common_design_subtheme.libraries.yml      |   5 +
 .../components/rw-people/rw-people.css        | 134 ++++++++++++++++++
 .../form/form--reliefweb-users-form.html.twig |  19 +++
 3 files changed, 158 insertions(+)
 create mode 100644 html/themes/custom/common_design_subtheme/components/rw-people/rw-people.css
 create mode 100644 html/themes/custom/common_design_subtheme/templates/form/form--reliefweb-users-form.html.twig

diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
index 75be3d11d..87bc38658 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
@@ -242,6 +242,11 @@ rw-pager:
     theme:
       components/rw-pager/rw-pager.css: {}
 
+rw-people:
+  css:
+    theme:
+      components/rw-people/rw-people.css: {}
+
 rw-preview:
   css:
     theme:
diff --git a/html/themes/custom/common_design_subtheme/components/rw-people/rw-people.css b/html/themes/custom/common_design_subtheme/components/rw-people/rw-people.css
new file mode 100644
index 000000000..34a049149
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/components/rw-people/rw-people.css
@@ -0,0 +1,134 @@
+/**
+ * User administration form.
+ *
+ * Style the Drupal forms to manage users and permissions.
+ */
+.reliefweb-users-form {
+  padding-top: 24px;
+}
+
+.reliefweb-users-form .form-item-job-rights label:after,
+.reliefweb-users-form .form-item-training-rights label:after {
+  display: inline-block;
+  width: 12px;
+  height: 12px;
+  margin-left: 5px;
+  content: "";
+  vertical-align: middle;
+  border-radius: 4px;
+}
+.reliefweb-users-form .form-item-job-rights input[value="unverified"] + label:after,
+.reliefweb-users-form .form-item-training-rights input[value="unverified"] + label:after {
+  background: #f49e2c;
+}
+.reliefweb-users-form .form-item-job-rights input[value="blocked"] + label:after,
+.reliefweb-users-form .form-item-training-rights input[value="blocked"] + label:after {
+  background: #da190b;
+}
+.reliefweb-users-form .form-item-job-rights input[value="allowed"] + label:after,
+.reliefweb-users-form .form-item-training-rights input[value="allowed"] + label:after {
+  background: #076d96;
+}
+.reliefweb-users-form .form-item-job-rights input[value="trusted"] + label:after,
+.reliefweb-users-form .form-item-training-rights input[value="trusted"] + label:after {
+  background: #88bb09;
+}
+.reliefweb-users-form .form-actions.form-item {
+  margin-top: 16px;
+}
+.reliefweb-users-form .form-actions a {
+  display: inline-block;
+  margin-top: 12px;
+  margin-inline-start: 0.5rem;
+  padding: 4px 8px;
+  text-transform: lowercase;
+  border: 2px solid var(--cd-reliefweb-brand-blue--dark);
+  border-radius: 8px;
+  line-height: 20px;
+}
+
+/* Users table */
+.users-list {
+  margin: 1rem 0 0;
+}
+.users-list th {
+  color: var(--cd-grey--dark);
+  border-bottom: 1px solid var(--cd-reliefweb-brand-grey--light);
+  background: var(--cd-reliefweb-brand-grey--light);
+}
+.users-list th a {
+  word-break: unset;
+}
+.users-list td:nth-child(7),
+.users-list td:nth-child(8) {
+  font-size: 15px;
+}
+.users-list th.is-active {
+  white-space: nowrap;
+}
+.users-list caption {
+  padding: 0;
+  caption-side: top;
+  text-align: center;
+  background: transparent;
+}
+
+.users-list .tablesort {
+  display: inline-block;
+  overflow: hidden;
+  width: 12px;
+  height: 12px;
+  margin-top: -4px;
+  margin-left: 4px;
+  content: "";
+  vertical-align: middle;
+  background: var(--rw-icons--toggle--down--12--dark-blue);
+}
+.users-list .tablesort--desc {
+  background: var(--rw-icons--toggle--up--12--dark-blue);
+}
+
+/* List of users */
+.users-list ol {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+}
+.users-list li {
+  margin-bottom: 0;
+}
+.users-list li a {
+  margin-right: 4px;
+}
+.users-list li + li {
+  border-top: 1px dotted var(--cd-reliefweb-brand-grey--light);
+}
+.users-list li[data-job]:before {
+  display: inline-block;
+  float: right;
+  width: 12px;
+  height: 12px;
+  margin: 4px 16px 0 0;
+  content: "";
+  border-radius: 4px;
+  background: var(--cd-reliefweb-orange);
+  box-shadow: 16px 0 var(--cd-reliefweb-orange);
+}
+.users-list li[data-job="1"]:before {
+  background: var(--cd-reliefweb-red);
+}
+.users-list li[data-job="2"]:before {
+  background: var(--cd-reliefweb-blue);
+}
+.users-list li[data-job="3"]:before {
+  background: var(--cd-reliefweb-green);
+}
+.users-list li[data-training="1"]:before {
+  box-shadow: 16px 0 var(--cd-reliefweb-red);
+}
+.users-list li[data-training="2"]:before {
+  box-shadow: 16px 0 var(--cd-reliefweb-blue);
+}
+.users-list li[data-training="3"]:before {
+  box-shadow: 16px 0 var(--cd-reliefweb-green);
+}
diff --git a/html/themes/custom/common_design_subtheme/templates/form/form--reliefweb-users-form.html.twig b/html/themes/custom/common_design_subtheme/templates/form/form--reliefweb-users-form.html.twig
new file mode 100644
index 000000000..8fb25824b
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/templates/form/form--reliefweb-users-form.html.twig
@@ -0,0 +1,19 @@
+{#
+/**
+ * @file
+ * Theme override for a 'form' element.
+ *
+ * Available variables
+ * - attributes: A list of HTML attributes for the wrapper element.
+ * - children: The child elements of the form.
+ *
+ * @see template_preprocess_form()
+ */
+#}
+
+{{ attach_library('common_design/cd-form') }}
+{{ attach_library('common_design_subtheme/rw-people') }}
+
+<form{{ attributes.addClass('cd-form [ cd-flow ]') }}>
+  {{ children }}
+</form>

From 19d8b4b6268f911efe22cb6fe4b41f3e830c183d Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 16 Dec 2021 13:01:45 -0700
Subject: [PATCH 318/720] RW-286 add override rule for recent addition to
 cd-304-forms base theme branch

---
 .../components/rw-moderation/rw-moderation.css                 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
index d3045568b..73065f9c4 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
@@ -39,6 +39,9 @@
   margin-top: 0;
   vertical-align: middle;
 }
+.rw-moderation-filters .rw-moderation-filter-other .fieldset-wrapper > .form-type-checkbox + .form-type-checkbox {
+  margin-top: 0;
+}
 .rw-moderation-filters .rw-moderation-filter-omnibox .fieldset-wrapper {
   display: table;
 }

From 8e000ba49b29c43a2a0d3b69b8101864ca4cd9fd Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 16 Dec 2021 13:04:27 -0700
Subject: [PATCH 319/720] RW-286 add rw-icons as component dependency

---
 .../common_design_subtheme/common_design_subtheme.libraries.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
index 87bc38658..c67073343 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
@@ -246,6 +246,8 @@ rw-people:
   css:
     theme:
       components/rw-people/rw-people.css: {}
+  dependencies:
+    - common_design_subtheme/rw-icons
 
 rw-preview:
   css:

From a0d12da7358d5ac426ae91b248a3efcb030e7546 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sun, 19 Dec 2021 09:15:27 +0000
Subject: [PATCH 320/720] [RW-276] Make the guidelines images private and use
 directory pattern similar to other images

---
 config/field.field.guideline.field_guideline.field_images.yml | 2 +-
 config/field.storage.guideline.field_images.yml               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/field.field.guideline.field_guideline.field_images.yml b/config/field.field.guideline.field_guideline.field_images.yml
index 3b9109137..8805e2e2d 100644
--- a/config/field.field.guideline.field_guideline.field_images.yml
+++ b/config/field.field.guideline.field_guideline.field_images.yml
@@ -20,7 +20,7 @@ default_value_callback: ''
 settings:
   handler: 'default:file'
   handler_settings: {  }
-  file_directory: 'guidelines/[date:custom:Y]-[date:custom:m]'
+  file_directory: images/guidelines
   file_extensions: 'png gif jpg jpeg'
   max_filesize: ''
   max_resolution: ''
diff --git a/config/field.storage.guideline.field_images.yml b/config/field.storage.guideline.field_images.yml
index 469e39b6a..38d210b0b 100644
--- a/config/field.storage.guideline.field_images.yml
+++ b/config/field.storage.guideline.field_images.yml
@@ -14,7 +14,7 @@ settings:
   target_type: file
   display_field: false
   display_default: false
-  uri_scheme: public
+  uri_scheme: private
   default_image:
     uuid: ''
     alt: ''

From 87b9de3ac895ddcf18d6e2ffb800f95d8988f890 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sun, 19 Dec 2021 09:17:29 +0000
Subject: [PATCH 321/720] [RW-276] Remove unnecessary title and description
 fields for the guideline lists and the description for the field guidelines

---
 ...eline.guideline_list.field_description.yml | 29 -------------------
 ...d.guideline.guideline_list.field_title.yml | 19 ------------
 2 files changed, 48 deletions(-)
 delete mode 100644 config/field.field.guideline.guideline_list.field_description.yml
 delete mode 100644 config/field.field.guideline.guideline_list.field_title.yml

diff --git a/config/field.field.guideline.guideline_list.field_description.yml b/config/field.field.guideline.guideline_list.field_description.yml
deleted file mode 100644
index 221a47bb9..000000000
--- a/config/field.field.guideline.guideline_list.field_description.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 564dfe43-cc34-48dd-b80a-a87f2ec0a0f7
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.guideline.field_description
-    - guidelines.guideline_type.guideline_list
-  module:
-    - allowed_formats
-    - text
-third_party_settings:
-  allowed_formats:
-    guideline: guideline
-    markdown: '0'
-    plain_text: '0'
-    html: '0'
-    token_markdown: '0'
-id: guideline.guideline_list.field_description
-field_name: field_description
-entity_type: guideline
-bundle: guideline_list
-label: Description
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: text_long
diff --git a/config/field.field.guideline.guideline_list.field_title.yml b/config/field.field.guideline.guideline_list.field_title.yml
deleted file mode 100644
index 9d734d5e5..000000000
--- a/config/field.field.guideline.guideline_list.field_title.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-uuid: dd89ed7c-df45-45d7-aa35-8f9793c28755
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.guideline.field_title
-    - guidelines.guideline_type.guideline_list
-id: guideline.guideline_list.field_title
-field_name: field_title
-entity_type: guideline
-bundle: guideline_list
-label: Title
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string

From a3e362461cdf86ae2008058d107844dfff482545 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sun, 19 Dec 2021 09:19:29 +0000
Subject: [PATCH 322/720] [RW-276] Update guidelines form and view displays,
 hiding unnecessary fields

---
 ...play.guideline.field_guideline.default.yml | 51 +++++--------------
 ...splay.guideline.guideline_list.default.yml | 43 ++--------------
 ...splay.guideline.guideline_list.default.yml | 30 +----------
 3 files changed, 18 insertions(+), 106 deletions(-)

diff --git a/config/core.entity_form_display.guideline.field_guideline.default.yml b/config/core.entity_form_display.guideline.field_guideline.default.yml
index 4eeb256d3..8655852e8 100644
--- a/config/core.entity_form_display.guideline.field_guideline.default.yml
+++ b/config/core.entity_form_display.guideline.field_guideline.default.yml
@@ -23,7 +23,7 @@ mode: default
 content:
   field_description:
     type: text_textarea
-    weight: 4
+    weight: 1
     region: content
     settings:
       rows: 5
@@ -31,22 +31,24 @@ content:
     third_party_settings: {  }
   field_field:
     type: guideline_field_target_widget
-    weight: 1
+    weight: 4
     region: content
     settings:
       enabled_entities:
         - node.announcement
+        - node.blog_post
+        - node.book
         - node.job
         - node.report
         - node.topic
         - node.training
         - taxonomy_term.country
         - taxonomy_term.disaster
-        - taxonomy_term.disaster_type
+        - taxonomy_term.source
     third_party_settings: {  }
   field_images:
     type: image_image
-    weight: 5
+    weight: 2
     region: content
     settings:
       progress_indicator: throbber
@@ -54,35 +56,12 @@ content:
     third_party_settings: {  }
   field_links:
     type: link_default
-    weight: 6
+    weight: 3
     region: content
     settings:
       placeholder_url: ''
       placeholder_title: ''
     third_party_settings: {  }
-  field_short_link:
-    type: string_textfield
-    weight: 3
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_title:
-    type: string_textfield
-    weight: 2
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 7
-    region: content
-    settings:
-      include_locked: true
-    third_party_settings: {  }
   name:
     type: string_textfield
     weight: 0
@@ -91,14 +70,8 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  user_id:
-    type: entity_reference_autocomplete
-    weight: 8
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-hidden: {  }
+hidden:
+  field_short_link: true
+  field_title: true
+  langcode: true
+  user_id: true
diff --git a/config/core.entity_form_display.guideline.guideline_list.default.yml b/config/core.entity_form_display.guideline.guideline_list.default.yml
index 75273c515..7896c77f7 100644
--- a/config/core.entity_form_display.guideline.guideline_list.default.yml
+++ b/config/core.entity_form_display.guideline.guideline_list.default.yml
@@ -3,55 +3,20 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.guideline.guideline_list.field_description
-    - field.field.guideline.guideline_list.field_title
     - guidelines.guideline_type.guideline_list
-  module:
-    - text
 id: guideline.guideline_list.default
 targetEntityType: guideline
 bundle: guideline_list
 mode: default
 content:
-  field_description:
-    type: text_textarea
-    weight: 27
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  field_title:
-    type: string_textfield
-    weight: 26
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 2
-    region: content
-    settings:
-      include_locked: true
-    third_party_settings: {  }
   name:
     type: string_textfield
-    weight: -4
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  user_id:
-    type: entity_reference_autocomplete
-    weight: 5
+    weight: 0
     region: content
     settings:
-      match_operator: CONTAINS
-      match_limit: 10
       size: 60
       placeholder: ''
     third_party_settings: {  }
-hidden: {  }
+hidden:
+  langcode: true
+  user_id: true
diff --git a/config/core.entity_view_display.guideline.guideline_list.default.yml b/config/core.entity_view_display.guideline.guideline_list.default.yml
index 41b44f4b4..fc5f7e154 100644
--- a/config/core.entity_view_display.guideline.guideline_list.default.yml
+++ b/config/core.entity_view_display.guideline.guideline_list.default.yml
@@ -3,46 +3,20 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.guideline.guideline_list.field_description
-    - field.field.guideline.guideline_list.field_title
     - guidelines.guideline_type.guideline_list
-  module:
-    - text
-    - user
 id: guideline.guideline_list.default
 targetEntityType: guideline
 bundle: guideline_list
 mode: default
 content:
-  field_description:
-    type: text_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 2
-    region: content
-  field_title:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 1
-    region: content
   name:
     type: string
-    label: above
+    label: hidden
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: -4
-    region: content
-  user_id:
-    type: author
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
     weight: 0
     region: content
 hidden:
   langcode: true
+  user_id: true

From c82ecbf42d9fef2832841db2245a60ae30f00d45 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 20 Dec 2021 02:32:34 +0000
Subject: [PATCH 323/720] [RW-276] Add moderation states to guidelines

---
 config/workflows.workflow.guideline.yml | 59 +++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 config/workflows.workflow.guideline.yml

diff --git a/config/workflows.workflow.guideline.yml b/config/workflows.workflow.guideline.yml
new file mode 100644
index 000000000..538fbb5ce
--- /dev/null
+++ b/config/workflows.workflow.guideline.yml
@@ -0,0 +1,59 @@
+uuid: 410548c2-3480-485d-863e-7a3e0214c9b8
+langcode: en
+status: true
+dependencies:
+  config:
+    - guidelines.guideline_type.field_guideline
+    - guidelines.guideline_type.guideline_list
+  module:
+    - content_moderation
+id: guideline
+label: Guideline
+type: content_moderation
+type_settings:
+  states:
+    archive:
+      label: Archived
+      weight: 2
+      published: false
+      default_revision: true
+    draft:
+      label: Draft
+      weight: 0
+      published: false
+      default_revision: true
+    published:
+      label: Published
+      weight: 1
+      published: true
+      default_revision: true
+  transitions:
+    archive:
+      label: Archive
+      from:
+        - archive
+        - draft
+        - published
+      to: archive
+      weight: 2
+    create_new_draft:
+      label: 'Save as Draft'
+      from:
+        - archive
+        - draft
+        - published
+      to: draft
+      weight: 0
+    publish:
+      label: Publish
+      from:
+        - archive
+        - draft
+        - published
+      to: published
+      weight: 1
+  entity_types:
+    guideline:
+      - field_guideline
+      - guideline_list
+  default_moderation_state: draft

From 65803a69089b2aff168375360bbabae8c3251a5d Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 20 Dec 2021 02:32:55 +0000
Subject: [PATCH 324/720] [RW-276] Add path alias for guidelines

---
 config/pathauto.pattern.guideline.yml | 22 ++++++++++++++++++++++
 config/pathauto.settings.yml          |  3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 config/pathauto.pattern.guideline.yml

diff --git a/config/pathauto.pattern.guideline.yml b/config/pathauto.pattern.guideline.yml
new file mode 100644
index 000000000..885d78688
--- /dev/null
+++ b/config/pathauto.pattern.guideline.yml
@@ -0,0 +1,22 @@
+uuid: 3ae7e220-5128-4910-a7f3-178cce44bf76
+langcode: en
+status: true
+dependencies:
+  module:
+    - guidelines
+id: guideline
+label: Guideline
+type: 'canonical_entities:guideline'
+pattern: 'guideline/[guideline:field_short_link]'
+selection_criteria:
+  39fb1a82-1fd7-4bd8-9356-e0faf35560c3:
+    id: 'entity_bundle:guideline'
+    negate: false
+    uuid: 39fb1a82-1fd7-4bd8-9356-e0faf35560c3
+    context_mapping:
+      guideline: guideline
+    bundles:
+      field_guideline: field_guideline
+selection_logic: and
+weight: -5
+relationships: {  }
diff --git a/config/pathauto.settings.yml b/config/pathauto.settings.yml
index 6fbd46ac7..499e1ba63 100644
--- a/config/pathauto.settings.yml
+++ b/config/pathauto.settings.yml
@@ -1,6 +1,7 @@
 _core:
   default_config_hash: SwvLp8snyPEExF41CaJJYdPUVomofLqtXvwciHc4cPg
-enabled_entity_types: {  }
+enabled_entity_types:
+  - guideline
 punctuation:
   double_quotes: 0
   quotes: 0

From 5f4ef1b9c51dfbdd408029737bb271b75db9c86f Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 20 Dec 2021 02:36:08 +0000
Subject: [PATCH 325/720] [RW-276] Hide moderation status when viewing
 guidelines

---
 ...ore.entity_view_display.guideline.field_guideline.default.yml | 1 +
 ...core.entity_view_display.guideline.guideline_list.default.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/config/core.entity_view_display.guideline.field_guideline.default.yml b/config/core.entity_view_display.guideline.field_guideline.default.yml
index 6670432d2..e071aaa9a 100644
--- a/config/core.entity_view_display.guideline.field_guideline.default.yml
+++ b/config/core.entity_view_display.guideline.field_guideline.default.yml
@@ -38,6 +38,7 @@ content:
     weight: 1
     region: content
 hidden:
+  content_moderation_control: true
   field_field: true
   field_images: true
   field_short_link: true
diff --git a/config/core.entity_view_display.guideline.guideline_list.default.yml b/config/core.entity_view_display.guideline.guideline_list.default.yml
index fc5f7e154..8225b61bd 100644
--- a/config/core.entity_view_display.guideline.guideline_list.default.yml
+++ b/config/core.entity_view_display.guideline.guideline_list.default.yml
@@ -18,5 +18,6 @@ content:
     weight: 0
     region: content
 hidden:
+  content_moderation_control: true
   langcode: true
   user_id: true

From 8e56dd20c8f56459973b3d6ffa4a17bb2a6e3930 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 20 Dec 2021 02:36:42 +0000
Subject: [PATCH 326/720] [RW-276] Use subtheme for guideline forms and
 individual pages

---
 config/theme_switcher.rule.request_path.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/theme_switcher.rule.request_path.yml b/config/theme_switcher.rule.request_path.yml
index 4e89d3e0e..b8d32f29f 100644
--- a/config/theme_switcher.rule.request_path.yml
+++ b/config/theme_switcher.rule.request_path.yml
@@ -13,4 +13,4 @@ visibility:
   request_path:
     id: request_path
     negate: false
-    pages: "/moderation/content/*\r\n/user/*/edit\r\n/user/*/notifications\r\n/user/*/bookmarks\r\n/user/*/posts\r\n/user/*/contact\r\n/admin/community-topics\r\n/admin/reliefweb_revisions/history/*/*\r\n/admin/people"
+    pages: "/moderation/content/*\r\n/user/*/edit\r\n/user/*/notifications\r\n/user/*/bookmarks\r\n/user/*/posts\r\n/user/*/contact\r\n/admin/community-topics\r\n/admin/reliefweb_revisions/history/*/*\r\n/admin/people\r\n/admin/structure/guideline/*"

From 4df4a5f255bda7979a0b2e6f0930e77785d2e37f Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 20 Dec 2021 02:37:20 +0000
Subject: [PATCH 327/720] [RW-276] Fix image renaming handling

---
 .../custom/reliefweb_utility/reliefweb_utility.module | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/html/modules/custom/reliefweb_utility/reliefweb_utility.module b/html/modules/custom/reliefweb_utility/reliefweb_utility.module
index 3c076ae9e..597c2bea2 100644
--- a/html/modules/custom/reliefweb_utility/reliefweb_utility.module
+++ b/html/modules/custom/reliefweb_utility/reliefweb_utility.module
@@ -27,11 +27,11 @@ function reliefweb_utility_preprocess(array &$variables, $hook) {
 }
 
 /**
- * Implements hook_ENTITY_TYPE_update() for files.
+ * Implements hook_ENTITY_TYPE_presave() for files.
  *
  * Change the URI of files to use their UUID.
  */
-function reliefweb_utility_file_update(FileInterface $file) {
+function reliefweb_utility_file_presave(FileInterface $file) {
   $uuid = $file->uuid();
   $uri = $file->getFileUri();
 
@@ -53,7 +53,7 @@ function reliefweb_utility_file_update(FileInterface $file) {
 
     // We use the UUID as filename, preserving only the extension so that
     // the URI is short and predictable.
-    $new_uri = $directory . '/' . $uuid . '.' . $info['extension'];
+    $new_uri = $directory . '/' . $uuid . '.' . strtolower($info['extension']);
 
     // Prepare the destination directory.
     if (!$file_system->prepareDirectory($directory, $file_system::CREATE_DIRECTORY)) {
@@ -71,11 +71,6 @@ function reliefweb_utility_file_update(FileInterface $file) {
     // Update the URI and save the file if the file could be moved.
     else {
       $file->setFileUri($new_uri);
-      // @todo maybe better to only update the relevant table rather than
-      // calling save to avoid hook_file_update() etc. from being called twice.
-      // @todo an alternative could be to move and change the URI before the
-      // original "save" is called.
-      $file->save();
     }
   }
 }

From a62f250419c4f387ca057e0ffa8624042eb597fa Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 20 Dec 2021 02:42:06 +0000
Subject: [PATCH 328/720] [RW-276] Add bundle classes, better handling of short
 id, drush command for migration, simplify templates and various fixes

---
 .../custom/reliefweb_guidelines/README.md     |  50 +-
 .../reliefweb-guidelines/assets/blank.gif     | Bin 0 -> 43 bytes
 .../assets/external-link.svg                  |   4 +
 .../reliefweb-guidelines.css                  |  15 +-
 .../reliefweb-guidelines.js                   |   2 +-
 .../reliefweb_guidelines/drush.services.yml   |   6 +
 .../reliefweb_guidelines.info.yml             |   3 +
 .../reliefweb_guidelines.module               | 415 ++------------
 .../reliefweb_guidelines.routing.yml          |  10 +-
 .../Commands/ReliefWebGuidelinesCommands.php  | 507 ++++++++++++++++++
 .../GuidelineSinglePageController.php         | 279 ++++++----
 .../src/Entity/Guideline.php                  |  93 ++++
 .../src/Entity/GuidelineList.php              |  19 +
 .../src/GuidelinesFromTrello.php              | 170 ------
 .../reliefweb-guidelines-item.html.twig       |  17 -
 .../reliefweb-guidelines-list.html.twig       |  36 +-
 16 files changed, 883 insertions(+), 743 deletions(-)
 create mode 100644 html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/assets/blank.gif
 create mode 100644 html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/assets/external-link.svg
 create mode 100644 html/modules/custom/reliefweb_guidelines/drush.services.yml
 create mode 100644 html/modules/custom/reliefweb_guidelines/src/Commands/ReliefWebGuidelinesCommands.php
 create mode 100644 html/modules/custom/reliefweb_guidelines/src/Entity/Guideline.php
 create mode 100644 html/modules/custom/reliefweb_guidelines/src/Entity/GuidelineList.php
 delete mode 100644 html/modules/custom/reliefweb_guidelines/src/GuidelinesFromTrello.php
 delete mode 100644 html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-item.html.twig

diff --git a/html/modules/custom/reliefweb_guidelines/README.md b/html/modules/custom/reliefweb_guidelines/README.md
index 360fc7bb0..b1d2ae277 100644
--- a/html/modules/custom/reliefweb_guidelines/README.md
+++ b/html/modules/custom/reliefweb_guidelines/README.md
@@ -1,50 +1,10 @@
-# Guidelines
+# ReliefWeb Guidelines
 
-## Todo
+This handles both the import from the Guidelines Trello board and the display
+of the guidelines in a compatible way with the previous guidelines site.
 
-- [x] Extract images from description
-- [x] Add attachment links
-- [ ] Parse and rewrite trello links like `https://trello.com/c/XlpG8tHh/17-country-coverage`
-      Can only be done after importing all lists and cards.
-
-## Fields left to map
-
-- [ ] attachments
-- [ ] original_published_date
-- [ ] disasters
-- [ ] new_comment
-- [ ] information
-- [x] job_location
-- [x] organization
-- [ ] new_comment
-- [ ] information
-- [ ] dates
-- [ ] event_url
-- [x] organization
-- [ ] advertisement_language
-- [ ] course_event_language
-- [ ] training_description
-- [ ] attachments
-- [ ] new_comment
-- [ ] training_categories
-- [ ] category
-- [ ] professional_function
-
-## Testing snippets
-
-### Rest and import
+## Import
 
 ```bash
-drush eval "_reliefweb_guidelines_delete_all()" && drush cim -y && drush eval "reliefweb_guidelines_migrate_from_trello()"
-```
-
-### One list only
-
-```php
-  $lists = [
-    [
-      'name' => 'test',
-      'id' => '5c740dfe91f2b20a384d3c2c',
-    ]
-  ];
+drush rw-guidelines:delete && drush rw-guidelines:migrate
 ```
diff --git a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/assets/blank.gif b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/assets/blank.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f55d454174c86cf2a8bf76baec8c872de08c8992
GIT binary patch
literal 43
rcmZ?wbhEHbWMp7uXkcUjg8%>jEB<5wG8q|kKzxu40~3=EBZD;nzy${b

literal 0
HcmV?d00001

diff --git a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/assets/external-link.svg b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/assets/external-link.svg
new file mode 100644
index 000000000..60aa7b531
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/assets/external-link.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" id="external-link" data-source="external-link" fill="#4183c4">
+  <path d="M35,20.65V42H6V18H22.09l9-9H4.2A2.2,2.2,0,0,0,2,11.2V43.8A2.2,2.2,0,0,0,4.2,46H36.8A2.2,2.2,0,0,0,39,43.8V16.65ZM12.5,12A1.5,1.5,0,1,1,11,13.5,1.5,1.5,0,0,1,12.5,12Zm-5,0A1.5,1.5,0,1,1,6,13.5,1.5,1.5,0,0,1,7.5,12Z"/>
+  <path d="M44,2H23a2,2,0,0,0,0,4H39L16.51,28.52a2.1,2.1,0,0,0,3,3L42,9V25a2,2,0,0,0,4,0V4A2,2,0,0,0,44,2Z"/>
+</svg>
diff --git a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
index b62e6d824..3ffd2e186 100644
--- a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
+++ b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
@@ -338,7 +338,7 @@ aside nav a.active + a {
 }
 
 .rw-guidelines-list article hr {
-  display: table;
+  display: block;
   overflow: hidden;
   box-sizing: content-box;
   height: 4px;
@@ -844,3 +844,16 @@ aside nav a.active + a {
   z-index: 1;
   border-color: #4183c4;
 }
+
+/* External links. Display an icon after the link. */
+.rw-guidelines-list article a[target="_blank"][rel~="noopener"]:after {
+  display: inline-block;
+  overflow: hidden;
+  width: 12px;
+  height: 12px;
+  /* The top margin is to have a better vertical alignment. */
+  margin: -2px 0 0 6px;
+  content: "";
+  vertical-align: middle;
+  background: url(./assets/external-link.svg) 0 0 no-repeat;
+}
diff --git a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.js b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.js
index 3ff00e4e8..08486a0aa 100644
--- a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.js
+++ b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.js
@@ -45,7 +45,7 @@
 
     // Article, card link clicks.
     main.addEventListener('mousedown', function (event) {
-      if (event.target.tagName === 'A' && event.target.getAttribute('href').indexOf('#') === 0) {
+      if (event.target.tagName === 'A' && event.target.getAttribute('href').indexOf('/guidelines#') === 0) {
         setActiveLink(event.target.href);
       }
     });
diff --git a/html/modules/custom/reliefweb_guidelines/drush.services.yml b/html/modules/custom/reliefweb_guidelines/drush.services.yml
new file mode 100644
index 000000000..aeb29a023
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/drush.services.yml
@@ -0,0 +1,6 @@
+services:
+  reliefweb_guidelines.commands:
+    class: \Drupal\reliefweb_guidelines\Commands\ReliefWebGuidelinesCommands
+    arguments: ['@account_switcher', '@config.factory', '@entity_field.manager', '@entity_type.manager', '@file_system', '@http_client']
+    tags:
+      - { name: drush.command }
diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.info.yml b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.info.yml
index 179f4294c..73c7fe592 100644
--- a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.info.yml
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.info.yml
@@ -5,3 +5,6 @@ package: reliefweb
 core_version_requirement: ^9
 dependencies:
   - drupal:guidelines
+  - drupal:reliefweb_moderation
+  - drupal:reliefweb_revision
+  - drupal:reliefweb_utility
diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
index 3668b672f..c537c5e10 100644
--- a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
@@ -5,13 +5,10 @@
  * Contains integration for guidelines.
  */
 
-use Drupal\Component\Utility\Random;
-use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\field\Entity\FieldStorageConfig;
-use Drupal\guidelines\Entity\Guideline;
-use Drupal\guidelines\Entity\GuidelineType;
-use Drupal\reliefweb_guidelines\GuidelinesFromTrello;
+use Drupal\reliefweb_guidelines\Controller\GuidelineSinglePageController;
+use Drupal\reliefweb_guidelines\Entity\Guideline;
+use Drupal\reliefweb_revisions\Services\EntityHistory;
 
 /**
  * Implements hook_theme().
@@ -20,371 +17,39 @@ function reliefweb_guidelines_theme() {
   return [
     'reliefweb_guidelines_list' => [
       'variables' => [
-        'title' => t('ReliefWeb guidelines'),
-        'title_attributes' => NULL,
+        // Wrapper attributes.
+        'attributes' => NULL,
+        // Page title.
+        'title' => t('Guidelines'),
+        // List of guidelines grouped by "parent" with a title and a children
+        // property. The children is an associative array keyed by the guideline
+        // short ID and with a title and description as properties.
         'guidelines' => [],
       ],
     ],
-    'reliefweb_guidelines_item' => [
-      'variables' => [
-        'id' => '',
-        'title' => '',
-        'title_prefix' => '',
-        'description' => '',
-        'children' => [],
-      ],
-    ],
   ];
 }
 
 /**
- * Migrate datas from Trello.
+ * Implements hook_entity_bundle_info_alter().
+ *
+ * Add bundle classes to guideline entities to handle business logic.
  */
-function reliefweb_guidelines_migrate_from_trello() {
-  $shortlinks = [];
-  $config = \Drupal::config('reliefweb_trello.settings');
-  $key = $config->get('key');
-  $token = $config->get('token');
-
-  $trello = new GuidelinesFromTrello($key, $token, \Drupal::service('config.factory'), \Drupal::service('http_client'), \Drupal::service('logger.factory'));
-
-  $lists = $trello->getLists('554c519c9b98caa2495ea5db');
-  foreach ($lists as $weight_list => $list) {
-    // Create guideline.
-    $values = [
-      'type' => 'guideline_list',
-      'name' => $list['name'],
-      'parent' => [],
-      'weight' => $weight_list,
-      'field_title' => $list['name'],
-    ];
-
-    $guideline_list = Guideline::create($values);
-    $guideline_list->save();
-
-    // Get cards.
-    $cards = $trello->getCards($list['id']);
-    foreach ($cards as $weight_card => $card) {
-      $shortlink = [
-        'short_link' => $card['shortLink'],
-        'guideline_id' => 0,
-        'links_found' => reliefweb_guidelines_extract_links($card['desc']),
-      ];
-
-      // Extract and fetch images.
-      $files = guidelines_extract_images($card['desc']);
-
-      // Create guideline, check labels.
-      $values = [
-        'type' => 'field_guideline',
-        'name' => $card['name'],
-        'parent' => [],
-        'weight' => $weight_card,
-        'field_title' => $card['name'],
-        'field_short_link' => $card['shortLink'],
-        'field_description' => [
-          'value' => $card['desc'],
-          'format' => 'guideline',
-        ],
-      ];
-
-      // Add files.
-      if (!empty($files)) {
-        $values['field_images'] = $values['field_images'] ?? [];
-        foreach ($files as $file) {
-          $values['field_images'][] = [
-            'target_id' => $file->id(),
-          ];
-        }
-      }
-
-      // Check labels.
-      $list_name = $guideline_list->label();
-      if (strpos($list_name, 'Posting step-by-step') !== FALSE) {
-        foreach ($card['labels'] as $label) {
-          if (strpos($label['name'], 'form-') === 0) {
-            $bundle = strtolower(explode(' - ', $list_name)[0]);
-            $base_field_name = str_replace('-', '_', substr($label['name'], 5));
-
-            // Fix bundle machine names.
-            switch ($bundle) {
-              case 'jobs':
-                $bundle = 'job';
-                break;
-
-              case 'reports':
-                $bundle = 'report';
-                break;
-
-              case 'topics':
-                $bundle = 'topic';
-                break;
-
-            }
-
-            // Title is a base field, so no config.
-            if ($base_field_name === 'title') {
-              $key = 'node.' . $bundle . '.' . $base_field_name;
-              $values['field_field'] = $values['field_field'] ?? [];
-              $values['field_field'][] = [
-                'value' => $key,
-              ];
-            }
-            else {
-              $found = FALSE;
-              $field_names = guidelines_get_possible_field_names($bundle, $base_field_name);
-              foreach ($field_names as $field_name) {
-                if (FieldStorageConfig::loadByName('node', $field_name)) {
-                  $found = TRUE;
-                  $key = 'node.' . $bundle . '.' . $field_name;
-                  $values['field_field'] = $values['field_field'] ?? [];
-                  $values['field_field'][] = [
-                    'value' => $key,
-                  ];
-                }
-                elseif (FieldStorageConfig::loadByName('taxonomy_term', $field_name)) {
-                  $found = TRUE;
-                  $key = 'taxonomy_term.' . $bundle . '.' . $field_name;
-                  $values['field_field'] = $values['field_field'] ?? [];
-                  $values['field_field'][] = [
-                    'value' => $key,
-                  ];
-                }
-              }
-
-              // Log fields not found.
-              if (!$found) {
-                \Drupal::logger('guilines_trello')->notice($base_field_name . ' NOT FOUND');
-              }
-            }
-          }
-        }
-      }
-
-      // Get attachments.
-      if ($card['badges']['attachments'] > 0) {
-        $attachments = $trello->getCardAttachments($card['id']);
-        foreach ($attachments as $attachment) {
-          // Add external links, skip images.
-          if (empty($attachment['isUpload'])) {
-            $values['field_links'] = $values['field_links'] ?? [];
-            $values['field_links'][] = [
-              'uri' => $attachment['url'],
-              'title' => $attachment['name'],
-            ];
-          }
-        }
-      }
-
-      $guideline = Guideline::create($values);
-      $guideline->setParents([$guideline_list]);
-      $guideline->save();
-
-      $shortlink['guideline_id'] = $guideline->id();
-      $shortlinks[$shortlink['short_link']] = $shortlink;
-    }
-  }
-
-  // Fix shortlinks.
-  foreach ($shortlinks as $shortlink) {
-    if (empty($shortlink['links_found'])) {
-      continue;
-    }
-
-    $guideline = Guideline::load($shortlink['guideline_id']);
-    $text = $guideline->get('field_description')->value;
-    $replaced = FALSE;
-
-    print_r($shortlink);
-    foreach ($shortlink['links_found'] as $link_found) {
-      // Skip if short link is unknown.
-      if (!isset($shortlinks[$link_found['short']])) {
-        continue;
-      }
-
-      // Build new link.
-      $new = implode('', [
-        '[',
-        $link_found['title'] ?? '/admin/structure/guideline/' . $shortlinks[$link_found['short']]['guideline_id'],
-        ']',
-        '(',
-        '/admin/structure/guideline/' . $shortlinks[$link_found['short']]['guideline_id'],
-        ')',
-      ]);
-
-      // Replace it.
-      $text = str_replace($link_found['string'], $new, $text);
-      $replaced = TRUE;
-    }
-
-    if ($replaced) {
-      $guideline->field_description->value = $text;
-      $guideline->save();
-    }
-  }
-}
-
-/**
- * Get possible field names.
- */
-function guidelines_get_possible_field_names($bundle, $field_name) {
-  $candidates = [
-    $field_name,
-    'field_' . $field_name,
-    'field_' . $bundle . '_' . $field_name,
-  ];
-
-  switch ($field_name) {
-    case 'job_description':
-      $candidates[] = 'body';
-      break;
-
-    case 'job_years_of_experience':
-      $candidates[] = 'field_job_experience';
-      break;
-
-    case 'location':
-    case 'job_location':
-      $candidates[] = 'field_country';
-      break;
-
-    case 'organization':
-      $candidates[] = 'field_source';
-      break;
-  }
-
-  return $candidates;
-}
-
-/**
- * Extract and fetch images.
- */
-function guidelines_extract_images(&$description) {
-  $files = [];
-  $pattern = '|(\!\[(.*?)\])(\((http.*?)\))|';
-  $description = preg_replace_callback($pattern, function ($matches) use ($files) {
-    $matches[4] = guidelines_fetch_image($matches[4], $files);
-
-    // Remove non-existing images.
-    if (!$matches[4]) {
-      return '';
-    }
-
-    return $matches[1] . '(' . $matches[4] . ')';
-  }, $description);
-
-  return $files;
-}
-
-/**
- * Fetch external image and save locally.
- */
-function guidelines_fetch_image($url, &$files) {
-  $destination = 'public://guidelines/trello';
-  \Drupal::service('file_system')->prepareDirectory($destination, FileSystemInterface::CREATE_DIRECTORY);
-
-  try {
-    /** @var \Drupal\file\FileInterface $file */
-    $file = system_retrieve_file($url, $destination, TRUE, FileSystemInterface::EXISTS_REPLACE);
-    if (!$file) {
-      \Drupal::logger('guilines_trello')->error($url . ' not fetched');
-      return FALSE;
-    }
-  }
-  catch (\Exception $exception) {
-    \Drupal::logger('guilines_trello')->error($url . ' not accessible');
-    return FALSE;
-  }
-
-  // Add file to collection.
-  $files[] = $file;
-
-  // Return relative url.
-  return $file->createFileUrl();
-}
-
-/**
- * Extract possible shortlinks.
- */
-function reliefweb_guidelines_extract_links($text) {
-  if (empty($text)) {
-    return [];
-  }
-
-  $shortlinks = [];
-  $matches = [];
-
-  // Skip images.
-  $pattern = '/[^!]?\[([^\]]+)\]\((https:\/\/guidelines\.rwdev\.org.*?)\)/i';
-  preg_match_all($pattern, $text, $matches);
-  foreach ($matches[0] as $key => $match) {
-    $shortlinks[] = [
-      'string' => substr($match, 1),
-      'title' => !empty($matches[1][$key]) ? $matches[1][$key] : $matches[2][$key],
-      'url' => $matches[2][$key],
-      'short' => reliefweb_guidelines_extract_shortlink($matches[2][$key]),
-    ];
-  }
-
-  $pattern = '/[^!]?\[([^\]]+)\]\((https:\/\/trello\.com.*?)\)/i';
-  preg_match_all($pattern, $text, $matches);
-  foreach ($matches[0] as $key => $match) {
-    $shortlinks[] = [
-      'string' => substr($match, 1),
-      'title' => !empty($matches[1][$key]) ? $matches[1][$key] : $matches[2][$key],
-      'url' => $matches[2][$key],
-      'short' => reliefweb_guidelines_extract_shortlink($matches[2][$key]),
-    ];
-  }
-
-  return $shortlinks;
-}
-
-/**
- * Extract shortlink.
- */
-function reliefweb_guidelines_extract_shortlink($text) {
-  $matches = [];
-
-  $pattern = '/\/#([0-9A-Z]+)/i';
-  preg_match($pattern, $text, $matches);
-  if ($matches) {
-    return $matches[1];
-  }
-
-  $pattern = '/\/c\/([0-9A-Z]+)/i';
-  preg_match($pattern, $text, $matches);
-  if ($matches) {
-    return $matches[1];
-  }
-
-  return 'not found';
-}
-
-/**
- * Delete all guidelines.
- */
-function _reliefweb_guidelines_delete_all() {
-  $guidelines = Guideline::loadMultiple();
-  foreach ($guidelines as $guideline) {
-    $guideline->delete();
-  }
-
-  $guideline_types = GuidelineType::loadMultiple();
-  foreach ($guideline_types as $guideline_type) {
-    $guideline_type->delete();
-  }
+function reliefweb_guidelines_entity_bundle_info_alter(&$bundles) {
+  $bundles['guideline']['field_guideline']['class'] = '\Drupal\reliefweb_guidelines\Entity\Guideline';
+  $bundles['guideline']['field_guideline']['label'] = 'Guideline';
+  $bundles['guideline']['guideline_list']['class'] = '\Drupal\reliefweb_guidelines\Entity\GuidelineList';
+  $bundles['guideline']['guideline_list']['label'] = 'Guideline List';
 }
 
 /**
  * Implements hook_page_attachments_alter().
  */
 function reliefweb_guidelines_page_attachments_alter(array &$attachments) {
+  // Remove all the attached Drupal libraries for the /guidelines page as it
+  // has its own distinct styling and behaviour.
   if (\Drupal::routeMatch()->getRouteName() === 'reliefweb_guidelines.guidelines') {
-    if (in_array('core/drupal.active-link', $attachments['#attached']['library'])) {
-      $index = array_search('core/drupal.active-link', $attachments['#attached']['library']);
-      unset($attachments['#attached']['library'][$index]);
-    }
+    $attachments['#attached']['library'] = [];
   }
 }
 
@@ -392,40 +57,42 @@ function reliefweb_guidelines_page_attachments_alter(array &$attachments) {
  * Implements hook_page_top().
  */
 function reliefweb_guidelines_page_top(array &$page_top) {
-  $page_top['toolbar']['#access'] = FALSE;
+  $page_top['toolbar']['#cache']['contexts'][] = 'route.name';
+  if (\Drupal::routeMatch()->getRouteName() === 'reliefweb_guidelines.guidelines') {
+    $page_top['toolbar']['#access'] = FALSE;
+  }
 }
 
 /**
  * Implements hook_guideline_json_fields_alter().
  */
 function reliefweb_guidelines_guideline_json_fields_alter(&$description, $guideline, $context) {
-  /** @var Drupal\guidelines\Entity\Guideline $guideline */
-  if ($guideline->hasField('field_short_link')) {
-    $description['link'] = '/guidelines#' . $guideline->field_short_link->value;
+  // Replace the guideline link to the internal link on the guidelines page.
+  if ($guideline instanceof Guideline) {
+    $description['link'] = '/guidelines#' . $guideline->getShortId();
   }
 
-  // Replace links to guidelines.
-  $description['content'] = str_replace('/admin/structure/guideline/', '/guidelines/', $description['content']);
+  // Replace links to the guidelines.
+  if (!empty($description['content'])) {
+    $description['content'] = GuidelineSinglePageController::replaceLinks($description['content']);
+  }
 }
 
 /**
- * Implements hook_form_FROM_ID_alter().
+ * Implements hook_pathauto_alias_alter().
  */
-function reliefweb_guidelines_form_guideline_field_guideline_add_form_alter(array &$form, FormStateInterface $form_state, $form_id) {
-  if (isset($form['field_short_link'])) {
-    if (empty($form['field_short_link']['widget'][0]['value']['#default_value'])) {
-      $random = new Random();
-      $form['field_short_link']['widget'][0]['value']['#default_value'] = $random->name();
-    }
-    else {
-      $form['field_short_link']['#access'] = FALSE;
+function reliefweb_guidelines_pathauto_alias_alter(&$alias, array &$context) {
+  // Use the row shortid instead of the lowercased one.
+  if ($context['module'] === 'guidelines' && isset($context['data']['guideline'])) {
+    if ($context['data']['guideline'] instanceof Guideline) {
+      $alias = '/guideline/' . $context['data']['guideline']->getShortId();
     }
   }
 }
 
 /**
- * Implements hook_form_FROM_ID_alter().
+ * Implements hook_form_HOOK_alter() for "guideline_form".
  */
-function reliefweb_guidelines_form_guideline_field_guideline_edit_form_alter(array &$form, FormStateInterface $form_state, $form_id) {
-  reliefweb_guidelines_form_guideline_field_guideline_add_form_alter($form, $form_state, $form_id);
+function reliefweb_guidelines_form_guideline_form_alter(array &$form, FormStateInterface $form_state, $form_id) {
+  EntityHistory::addHistoryToForm($form, $form_state);
 }
diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.routing.yml b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.routing.yml
index b79457e02..0d76e6032 100644
--- a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.routing.yml
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.routing.yml
@@ -1,15 +1,7 @@
 reliefweb_guidelines.guidelines:
   path: '/guidelines'
   defaults:
-    _title: 'ReliefWeb guidelines'
+    _title: 'Guidelines'
     _controller: '\Drupal\reliefweb_guidelines\Controller\GuidelineSinglePageController::getPageContent'
   requirements:
     _permission: 'access content'
-reliefweb_guidelines.guidelines_redirect:
-  path: '/guidelines/{guideline_id}'
-  defaults:
-    _title: 'ReliefWeb guidelines'
-    _controller: '\Drupal\reliefweb_guidelines\Controller\GuidelineSinglePageController::redirectToPage'
-  requirements:
-    _permission: 'access content'
-    guideline_id: \d+
diff --git a/html/modules/custom/reliefweb_guidelines/src/Commands/ReliefWebGuidelinesCommands.php b/html/modules/custom/reliefweb_guidelines/src/Commands/ReliefWebGuidelinesCommands.php
new file mode 100644
index 000000000..f35b6ded0
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/src/Commands/ReliefWebGuidelinesCommands.php
@@ -0,0 +1,507 @@
+<?php
+
+namespace Drupal\reliefweb_guidelines\Commands;
+
+use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Entity\EntityFieldManagerInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\File\FileSystemInterface;
+use Drupal\Core\Session\AccountSwitcherInterface;
+use Drupal\Core\Url;
+use Drupal\guidelines\Entity\Guideline;
+use Drush\Commands\DrushCommands;
+use GuzzleHttp\ClientInterface;
+use GuzzleHttp\Exception\ClientException;
+
+/**
+ * ReliefWeb migration Drush commandfile.
+ *
+ * @todo remove after the migration from D7 to D9.
+ */
+class ReliefWebGuidelinesCommands extends DrushCommands {
+
+  /**
+   * The account switcher service.
+   *
+   * @var \Drupal\Core\Session\AccountSwitcherInterface
+   */
+  protected $accountSwitcher;
+
+  /**
+   * The entity field manager service.
+   *
+   * @var \Drupal\Core\Entity\EntityFieldManagerInterface
+   */
+  protected $entityFieldManager;
+
+  /**
+   * The entity type manager service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * The file system service.
+   *
+   * @var \Drupal\Core\File\FileSystemInterface
+   */
+  protected $fileSystem;
+
+  /**
+   * The HTTP client service.
+   *
+   * @var \GuzzleHttp\ClientInterface
+   */
+  protected $httpClient;
+
+  /**
+   * ReliefWeb trello config.
+   *
+   * @var \Drupal\Core\Config\ImmutableConfig
+   */
+  protected $trelloConfig;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(
+    AccountSwitcherInterface $account_switcher,
+    ConfigFactoryInterface $config_factory,
+    EntityFieldManagerInterface $entity_field_manager,
+    EntityTypeManagerInterface $entity_type_manager,
+    FileSystemInterface $file_system,
+    ClientInterface $http_client
+  ) {
+    $this->accountSwitcher = $account_switcher;
+    $this->entityFieldManager = $entity_field_manager;
+    $this->entityTypeManager = $entity_type_manager;
+    $this->fileSystem = $file_system;
+    $this->httpClient = $http_client;
+    $this->trelloConfig = $config_factory->get('reliefweb_trello.settings');
+  }
+
+  /**
+   * Migrate the guidelines from Trello.
+   *
+   * @command rw-guidelines:migrate
+   *
+   * @aliases rw-gm,rw-guidelines-migrate
+   *
+   * @usage rw-guidelines:migrate
+   *   Migrate the guidelines from Trello.
+   *
+   * @validate-module-enabled reliefweb_guidelines,reliefweb_utility
+   */
+  public function migrateFromTrello() {
+    $key = $this->trelloConfig->get('key');
+    $token = $this->trelloConfig->get('token');
+    $board_id = $this->trelloConfig->get('board_id');
+
+    if (empty($key) || empty($token) || empty($board_id)) {
+      $this->logger->error('Missing Trello key, token or board id.');
+    }
+
+    // Switch to the system user.
+    $system_user = $this->entityTypeManager->getStorage('user')->load(2);
+    $this->accountSwitcher->switchTo($system_user);
+
+    // Delete all the existing guidelines first.
+    $this->deleteAllGuidelines();
+
+    $shortlinks = [];
+    $field_pattern = '/^field--(?<entity_type_id>[^.]+)\.(?<bundle>[^.]+)\.(?<field_name>[^.]+)$/';
+
+    // Retrieve the data from the Guidelines Trello board.
+    $lists = $this->getLists($board_id);
+    foreach ($lists as $weight_list => $list) {
+      $this->logger->info('List: ' . $list['name']);
+
+      // Create guideline.
+      $values = [
+        'type' => 'guideline_list',
+        'name' => $list['name'],
+        'parent' => [],
+        'weight' => $weight_list,
+        'field_title' => $list['name'],
+      ];
+
+      $guideline_list = Guideline::create($values);
+      $guideline_list->save();
+
+      // Get cards.
+      $cards = $this->getCards($list['id']);
+      foreach ($cards as $weight_card => $card) {
+        $this->logger->info('    Card: ' . $card['name']);
+
+        $shortlink = [
+          'short_link' => $card['shortLink'],
+          'links_found' => $this->extractLinks($card['desc']),
+        ];
+
+        // Extract and fetch images.
+        $images = $this->extractImages($card['desc']);
+
+        // Create guideline.
+        $values = [
+          'type' => 'field_guideline',
+          'name' => $card['name'],
+          'parent' => [],
+          'weight' => $weight_card,
+          'field_short_link' => $card['shortLink'],
+          'field_description' => [
+            'value' => $card['desc'],
+            'format' => 'guideline',
+          ],
+          'field_images' => $images,
+        ];
+
+        // Check if the card has labels associated to form fields.
+        foreach ($card['labels'] as $label) {
+          if (preg_match($field_pattern, $label['name'], $match) === 1) {
+            $entity_type_id = $match['entity_type_id'];
+            $bundle = $match['bundle'];
+            $field_name = $match['field_name'];
+            $key = $entity_type_id . '.' . $bundle . '.' . $field_name;
+
+            try {
+              $field_definitions = $this->entityFieldManager
+                ->getFieldDefinitions($entity_type_id, $bundle);
+
+              if (isset($field_definitions[$field_name])) {
+                $values['field_field'][] = [
+                  'value' => $key,
+                ];
+              }
+              else {
+                throw new \Exception('No field found for ' . $key);
+              }
+            }
+            catch (\Exception $exception) {
+              $this->logger->notice($exception->getMessage());
+            }
+          }
+        }
+
+        // Get attachments.
+        if ($card['badges']['attachments'] > 0) {
+          $attachments = $this->getCardAttachments($card['id']);
+          foreach ($attachments as $attachment) {
+            // Add external links, skip images.
+            if (empty($attachment['isUpload'])) {
+              $values['field_links'][] = [
+                'uri' => $attachment['url'],
+                'title' => $attachment['name'],
+              ];
+            }
+          }
+        }
+
+        $guideline = Guideline::create($values);
+        $guideline->setParents([$guideline_list]);
+        $guideline->save();
+
+        $shortlink['guideline'] = $guideline;
+        $shortlink['guideline_link'] = '/guideline/' . $shortlink['short_link'];
+        $shortlinks[$shortlink['short_link']] = $shortlink;
+      }
+    }
+
+    // Fix shortlinks.
+    foreach ($shortlinks as $shortlink) {
+      // Skip if the guideline doesn't reference other cards.
+      if (empty($shortlink['links_found'])) {
+        continue;
+      }
+
+      $guideline = $shortlink['guideline'];
+      $text = $guideline->field_description->value;
+      $replaced = FALSE;
+
+      foreach ($shortlink['links_found'] as $link => $id) {
+        // Skip if it's not a link to a guideline.
+        if (!isset($shortlinks[$id])) {
+          continue;
+        }
+
+        // Replace the link with the guideline link.
+        $text = str_replace($link, $shortlinks[$id]['guideline_link'], $text);
+
+        $replaced = TRUE;
+      }
+
+      if ($replaced) {
+        $guideline->field_description->value = $text;
+        $guideline->save();
+      }
+    }
+
+    $this->accountSwitcher->switchBack();
+  }
+
+  /**
+   * Delete all guidelines.
+   *
+   * @command rw-guidelines:delete
+   *
+   * @aliases rw-gd,rw-guidelines-delete
+   *
+   * @usage rw-guidelines:delete-all
+   *   Delete all the guidelines.
+   *
+   * @validate-module-enabled reliefweb_guidelines
+   */
+  public function deleteAllGuidelines() {
+    $guidelines = Guideline::loadMultiple();
+    foreach ($guidelines as $guideline) {
+      if ($guideline->hasField('field_images')) {
+        foreach ($guideline->field_images as $item) {
+          $item->entity->delete();
+        }
+      }
+      $guideline->delete();
+    }
+  }
+
+  /**
+   * Extract and fetch images.
+   *
+   * @param string $description
+   *   Card description.
+   *
+   * @return array
+   *   Values for the guideline field_images field.
+   */
+  protected function extractImages(&$description) {
+    $images = [];
+    $pattern = '|(\!\[(.*?)\])(\((http.*?)\))|';
+
+    $description = preg_replace_callback($pattern, function ($matches) use (&$images) {
+      $this->logger->notice('      File: ' . $matches[4]);
+
+      // Download the file and save it a managed file.
+      $file = $this->fetchImage($matches[4]);
+
+      // If we couldn't retrieve the image, keep the original link so that the
+      // editors can update it.
+      if (empty($file)) {
+        return $matches[0];
+      }
+
+      // Add the file ID to the collection.
+      $images[] = ['target_id' => $file->id()];
+
+      // Replace the image URL with ours.
+      return $matches[1] . '(' . $file->createFileUrl() . ')';
+    }, $description);
+
+    return $images;
+  }
+
+  /**
+   * Fetch external image and save locally.
+   *
+   * @param string $url
+   *   Image URL.
+   *
+   * @return string
+   *   Local file URL.
+   */
+  protected function fetchImage($url) {
+    // Keep the images private as it's for internal use only.
+    $destination = 'private://images/guidelines';
+    $this->fileSystem->prepareDirectory($destination, FileSystemInterface::CREATE_DIRECTORY);
+
+    try {
+      /** @var \Drupal\file\FileInterface $file */
+      $file = system_retrieve_file($url, $destination, TRUE, FileSystemInterface::EXISTS_REPLACE);
+      if (!$file) {
+        $this->logger->error($url . ' not fetched');
+        return NULL;
+      }
+    }
+    catch (\Exception $exception) {
+      $this->logger->error($url . ' not accessible');
+      return NULL;
+    }
+
+    return $file;
+  }
+
+  /**
+   * Extract possible shortlinks.
+   *
+   * @param string $text
+   *   Card description.
+   *
+   * @return array
+   *   List of shortlink ids.
+   */
+  protected function extractLinks($text) {
+    if (empty($text)) {
+      return [];
+    }
+
+    $links = [];
+    $matches = [];
+
+    $pattern = '@https?://(?:(?:www.)?trello.com/c/|guidelines.rwdev.org/?#)([0-9a-zA-Z]{8})(?:/[\\p{L}-]*)?@u';
+    if (preg_match_all($pattern, $text, $matches, \PREG_SET_ORDER) !== FALSE) {
+      foreach ($matches as $index => $match) {
+        $links[$matches[$index][0]] = $matches[$index][1];
+      }
+    }
+
+    return $links;
+  }
+
+  /**
+   * Get all boards.
+   *
+   * @return array
+   *   List of trello boards.
+   */
+  protected function getBoards() {
+    $url = 'https://api.trello.com/1/members/me/boards';
+    $parmeters = [
+      'fields' => 'name,url',
+    ];
+
+    return $this->fetchData($url, $parmeters);
+  }
+
+  /**
+   * Get all lists of a board.
+   *
+   * @param string $board_id
+   *   Trello board ID.
+   * @param string $status
+   *   List status.
+   *
+   * @return array
+   *   List of trello lists.
+   */
+  protected function getLists($board_id, $status = 'open') {
+    $url = strtr('https://api.trello.com/1/boards/@id/lists/@status', [
+      '@id' => $board_id,
+      '@status' => $status,
+    ]);
+    $parmeters = [
+      'fields' => 'name,url,pos',
+    ];
+
+    return $this->fetchData($url, $parmeters);
+  }
+
+  /**
+   * Get all cards from a list.
+   *
+   * @param string $list_id
+   *   Trello list ID.
+   *
+   * @return array
+   *   List of trello cards.
+   */
+  protected function getCards($list_id) {
+    $url = strtr('https://api.trello.com/1/lists/@id/cards', [
+      '@id' => $list_id,
+    ]);
+    $parmeters = [
+      'fields' => 'desc,idBoard,idList,idShort,name,shortLink,badges,shortUrl,labels,idAttachmentCover',
+    ];
+
+    return $this->fetchData($url, $parmeters);
+  }
+
+  /**
+   * Get a card.
+   *
+   * @param string $card_id
+   *   Card ID.
+   *
+   * @return array
+   *   Trello card data.
+   */
+  protected function getCard($card_id) {
+    $url = strtr('https://api.trello.com/1/cards/@id', [
+      '@id' => $card_id,
+    ]);
+    $parmeters = [
+      'fields' => 'desc,idBoard,idList,idShort,name,shortLink,badges,shortUrl,labels,idAttachmentCover',
+    ];
+
+    return $this->fetchData($url, $parmeters);
+  }
+
+  /**
+   * Get attachments of a card.
+   *
+   * @param string $card_id
+   *   Card ID.
+   *
+   * @return array
+   *   Trello card attachments.
+   */
+  protected function getCardAttachments($card_id) {
+    $url = strtr('https://api.trello.com/1/cards/@id/attachments', [
+      '@id' => $card_id,
+    ]);
+    $parmeters = [
+      'fields' => 'name,isUpload,url,filename,idBoard,idList',
+    ];
+
+    return $this->fetchData($url, $parmeters);
+  }
+
+  /**
+   * Fetch data from API.
+   *
+   * @param string $url
+   *   Trello API url.
+   * @param array $parameters
+   *   Request parameters.
+   *
+   * @return mixed
+   *   Data from the Trello API.
+   */
+  protected function fetchData($url, array $parameters = []) {
+    $parameters += [
+      'key' => $this->trelloConfig->get('key'),
+      'token' => $this->trelloConfig->get('token'),
+    ];
+
+    $url = Url::fromUri($url, [
+      'query' => $parameters,
+    ])->toUriString();
+
+    try {
+      $response = $this->httpClient->request('GET', $url);
+    }
+    catch (ClientException $exception) {
+      return NULL;
+    }
+
+    // Decode the JSON response.
+    $data = NULL;
+    if ($response->getStatusCode() === 200) {
+      $body = (string) $response->getBody();
+      if (!empty($body)) {
+        // Decode the data, skip if invalid.
+        try {
+          $data = json_decode($body, TRUE, 512, JSON_THROW_ON_ERROR);
+        }
+        catch (\Exception $exception) {
+          $this->logger->notice('Unable to decode json.');
+        }
+      }
+    }
+    else {
+      $this->logger->notice('Unable to retrieve data - response code: @code', [
+        '@code' => $response->getStatusCode(),
+      ]);
+    }
+
+    return $data;
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php b/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
index 20a38e4fb..f2d73d5cc 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
@@ -2,13 +2,10 @@
 
 namespace Drupal\reliefweb_guidelines\Controller;
 
-use Drupal\Component\Utility\Html;
+use Drupal\Component\Render\MarkupInterface;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Render\RendererInterface;
-use Drupal\Core\Session\AccountProxyInterface;
-use Drupal\Core\State\StateInterface;
-use Drupal\reliefweb_api\Services\ReliefWebApiClient;
+use Drupal\Core\Render\Markup;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -16,13 +13,6 @@
  */
 class GuidelineSinglePageController extends ControllerBase {
 
-  /**
-   * The current user.
-   *
-   * @var \Drupal\Core\Session\AccountProxyInterface
-   */
-  protected $currentUser;
-
   /**
    * The entity type manager.
    *
@@ -30,53 +20,14 @@ class GuidelineSinglePageController extends ControllerBase {
    */
   protected $entityTypeManager;
 
-  /**
-   * The ReliefWeb API client.
-   *
-   * @var \Drupal\reliefweb_api\Services\ReliefWebApiClient
-   */
-  protected $reliefWebApiClient;
-
-  /**
-   * The drupal renderer service.
-   *
-   * @var \Drupal\Core\Render\RendererInterface
-   */
-  protected $renderer;
-
-  /**
-   * The state service.
-   *
-   * @var \Drupal\Core\State\StateInterface
-   */
-  protected $state;
-
   /**
    * Constructor.
    *
-   * @param \Drupal\Core\Session\AccountProxyInterface $current_user
-   *   The current user.
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The entity type manager service.
-   * @param \Drupal\reliefweb_api\Services\ReliefWebApiClient $reliefweb_api_client
-   *   The reliefweb api client service.
-   * @param \Drupal\Core\Render\RendererInterface $renderer
-   *   The renderer service.
-   * @param \Drupal\Core\State\StateInterface $state
-   *   The state service.
    */
-  public function __construct(
-    AccountProxyInterface $current_user,
-    EntityTypeManagerInterface $entity_type_manager,
-    ReliefWebApiClient $reliefweb_api_client,
-    RendererInterface $renderer,
-    StateInterface $state
-  ) {
-    $this->currentUser = $current_user;
+  public function __construct(EntityTypeManagerInterface $entity_type_manager) {
     $this->entityTypeManager = $entity_type_manager;
-    $this->reliefWebApiClient = $reliefweb_api_client;
-    $this->renderer = $renderer;
-    $this->state = $state;
   }
 
   /**
@@ -84,35 +35,10 @@ public function __construct(
    */
   public static function create(ContainerInterface $container) {
     return new static(
-      $container->get('current_user'),
-      $container->get('entity_type.manager'),
-      $container->get('reliefweb_api.client'),
-      $container->get('renderer'),
-      $container->get('state')
+      $container->get('entity_type.manager')
     );
   }
 
-  /**
-   * Redirect based on guideline Id.
-   */
-  public function redirectToPage($guideline_id) {
-    $storage = $this->entityTypeManager->getStorage('guideline');
-    /** @var \Drupal\guidelines\Entity\Guideline $guideline */
-    $guideline = $storage->load($guideline_id);
-
-    if (!$guideline) {
-      return $this->redirect('reliefweb_guidelines.guidelines');
-    }
-
-    if ($guideline->hasField('field_short_link')) {
-      return $this->redirect('reliefweb_guidelines.guidelines', [], [
-        'fragment' => $guideline->field_short_link->value,
-      ]);
-    }
-
-    return $this->redirect('reliefweb_guidelines.guidelines');
-  }
-
   /**
    * Get the page content.
    *
@@ -120,68 +46,201 @@ public function redirectToPage($guideline_id) {
    *   Render array for the homepage.
    */
   public function getPageContent() {
+    $list = [];
     $storage = $this->entityTypeManager->getStorage('guideline');
 
     $ids = $storage
       ->getQuery()
-      ->sort('id', 'ASC')
+      ->condition('status', 1)
+      ->sort('type', 'DESC')
+      ->sort('weight', 'ASC')
       ->execute();
 
     /** @var \Drupal\guidelines\Entity\Guideline[] $guidelines */
     $guidelines = $storage->loadMultiple($ids);
 
-    $items = [];
-
+    // Prepare the guideline children.
     foreach ($guidelines as $guideline) {
-      if ($parents = $guideline->getParentIds()) {
-        $items[$parents[0]]['#children'][] = [
-          '#theme' => 'reliefweb_guidelines_item',
-          '#id' => $guideline->hasField('field_short_link') ? $guideline->field_short_link->value : Html::getUniqueId($guideline->field_title->value),
-          '#title' => $guideline->field_title->value,
-          '#title_prefix' => $guidelines[$parents[0]]->field_title->value . ' > ',
-          '#description' => $this->cleanAtags($guideline->hasField('field_description') ? check_markup($guideline->field_description->value, $guideline->field_description->format) : '', $guidelines),
-        ];
+      if ($guideline->bundle() === 'guideline_list') {
+        $list[$guideline->id()]['title'] = $guideline->label();
       }
-      else {
-        $items[$guideline->id()] = [
-          '#theme' => 'reliefweb_guidelines_item',
-          '#id' => $guideline->hasField('field_short_link') ? $guideline->field_short_link->value : Html::getUniqueId($guideline->field_title->value),
-          '#title' => $guideline->field_title->value,
-          '#title_prefix' => '',
-          '#description' => $this->cleanAtags($guideline->hasField('field_description') ? check_markup($guideline->field_description->value, $guideline->field_description->format) : '', $guidelines),
-          '#children' => [],
+      elseif (!empty($guideline->getParentIds())) {
+        $parent = $guideline->getParentIds()[0];
+        $id = $guideline->field_short_link->value;
+        $description = check_markup($guideline->field_description->value, $guideline->field_description->format);
+
+        $list[$parent]['children'][$id] = [
+          'title' => $guideline->label(),
+          'description' => static::replaceLinks($description, 'blank-image'),
         ];
       }
     }
 
     $build = [
       '#theme' => 'reliefweb_guidelines_list',
-      '#title' => $this->t('ReliefWeb guidelines'),
-      '#guidelines' => $items,
+      '#title' => $this->t('Guidelines'),
+      '#guidelines' => array_filter($list, function ($item) {
+        return !empty($item['title']) && !empty($item['children']);
+      }),
       '#cache' => [
         'contexts' => ['user.permissions'],
       ],
+      '#attached' => [
+        'library' => ['reliefweb_guidelines/reliefweb-guidelines'],
+      ],
     ];
 
-    $build['#attached']['library'][] = 'reliefweb_guidelines/reliefweb-guidelines';
-
     return $build;
   }
 
   /**
-   * Clean A-tags.
+   * Replace the internal links to the guidelines.
+   *
+   * @param string|\Drupal\Component\Render\MarkupInterface $html
+   *   HTML text with guidelines links.
+   * @param string|false $lazyloading
+   *   Whether to lazy load the images. Options are 'attribute' to use the
+   *   html 'loading="lazy"' attribute, 'blank-image' to use a blank image
+   *   and let the javascript do the lazy loading or FALSE to disable that.
+   *
+   * @return \Drupal\Component\Render\MarkupInterface
+   *   HTML with links replaced.
    */
-  protected function cleanAtags($text, $guidelines) {
-    if (empty($text)) {
-      return $text;
+  public static function replaceLinks($html, $lazyloading = 'attribute') {
+    static $mapping;
+    static $hosts;
+
+    if (!is_string($html) && !($html instanceof MarkupInterface)) {
+      return '';
     }
 
-    $pattern = '/\/admin\/structure\/guideline\/([0-9]+)/i';
-    $text = preg_replace_callback($pattern, function ($matches) use ($guidelines) {
-      return '#' . $guidelines[$matches[1]]->field_short_link->value;
-    }, $text);
+    // Trim.
+    $html = trim($html);
+    if (empty($html)) {
+      return Markup::create($html);
+    }
+
+    // Load the guideline name and shortlink to use for the link replacements.
+    if (!isset($mapping)) {
+      $query = \Drupal::database()->select('guideline_field_data', 'g');
+      $query->innerJoin('guideline__field_short_link', 'f', 'f.entity_id = g.id');
+      $query->fields('g', ['id', 'name']);
+      $query->addField('f', 'field_short_link_value', 'shortlink');
+      $records = $query->execute() ?? [];
+
+      $mapping = [];
+      foreach ($records as $record) {
+        $mapping[$record->id] = $record;
+        $mapping[$record->shortlink] = $record;
+      }
+    }
+
+    // Get the current host.
+    if (!isset($host)) {
+      $hosts = ['reliefweb.int' => TRUE];
+      $host = \Drupal::request()->getHost();
+      if ($host !== 'reliefweb.int') {
+        $hosts[\Drupal::request()->getHost()] = TRUE;
+      }
+    }
+
+    // Parse the HTML string.
+    $flags = LIBXML_NONET | LIBXML_NOBLANKS | LIBXML_NOERROR | LIBXML_NOWARNING;
+    $meta = '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">';
+    $dom = new \DomDocument();
+    $dom->loadHTML($meta . $html, $flags);
+
+    // Convert links to internal links on the guidelines page.
+    $links = $dom->getElementsByTagName('a');
+    foreach ($links as $link) {
+      // Add attributes to external links.
+      $host = parse_url($link->getAttribute('href'), \PHP_URL_HOST);
+      if (!empty($host) && !isset($hosts[$host])) {
+        $link->setAttribute('target', '_blank');
+        $link->setAttribute('rel', 'noreferrer noopener');
+      }
 
-    return $text;
+      // Get the path to determine if it's an internal link to the guidelines.
+      $path = parse_url($link->getAttribute('href'), \PHP_URL_PATH);
+      if (empty($path)) {
+        continue;
+      }
+
+      // Canonical link.
+      if (preg_match('#^/?admin/structure/guideline/(\d+)$#', $path, $match) === 1) {
+        if (isset($mapping[$match[1]])) {
+          $link->setAttribute('href', '/guidelines#' . $mapping[$match[1]]->shortlink);
+        }
+      }
+      // Alias.
+      if (preg_match('#^/?guideline/([0-9a-zA-Z]{8})$#', $path, $match) === 1) {
+        if (isset($mapping[$match[1]])) {
+          $link->setAttribute('href', '/guidelines#' . $mapping[$match[1]]->shortlink);
+        }
+      }
+
+      $title = $link->textContent;
+      // Canonical link.
+      if (preg_match('#^(\s*)/?admin/structure/guideline/(\d+)(\s*)$#', $title, $match) === 1) {
+        if (isset($mapping[$match[2]])) {
+          $link->textContent = $match[1] . $mapping[$match[2]]->name . $match[3];
+        }
+      }
+      // Alias.
+      if (preg_match('#^(\s*)/?guideline/([0-9a-zA-Z]{8})(\s*)$#', $path, $match) === 1) {
+        if (isset($mapping[$match[2]])) {
+          $link->textContent = $match[1] . $mapping[$match[2]]->name . $match[3];
+        }
+      }
+    }
+
+    // Add the lazy loading attribute to the images.
+    if ($lazyloading === 'attribute' || $lazyloading === 'blank-image') {
+      $images = $dom->getElementsByTagName('img');
+      foreach ($images as $image) {
+        if ($lazyloading === 'blank-image') {
+          $image->setAttribute('data-src', $image->getAttribute('src'));
+          $image->setAttribute('src', static::getBlankGifUrl());
+        }
+        else {
+          $image->setAttribute('laoading', 'lazy');
+        }
+      }
+    }
+
+    // Tiny cleanup of ordered lists...
+    $lists = $dom->getElementsByTagName('ol');
+    foreach ($lists as $list) {
+      if ($list->hasAttribute('start') && $list->getAttribute('start') == 0) {
+        $list->removeAttribute('start');
+      }
+    }
+
+    $html = $dom->saveHTML();
+
+    // Search for the body tag and return its content.
+    $start = mb_strpos($html, '<body>');
+    $end = mb_strrpos($html, '</body>');
+    if ($start !== FALSE && $end !== FALSE) {
+      $start += 6;
+      $html = trim(mb_substr($html, $start, $end - $start));
+    }
+
+    return Markup::create($html);
+  }
+
+  /**
+   * Get the URL to the blank gif image.
+   *
+   * @return string
+   *   URL to the blank gif image.
+   */
+  protected static function getBlankGifUrl() {
+    static $blank_gif_url;
+    if (!isset($blank_gif_url)) {
+      $blank_gif_url = '/' . drupal_get_path('module', 'reliefweb_guidelines') . '/components/reliefweb-guidelines/assets/blank.gif';
+    }
+    return $blank_gif_url;
   }
 
 }
diff --git a/html/modules/custom/reliefweb_guidelines/src/Entity/Guideline.php b/html/modules/custom/reliefweb_guidelines/src/Entity/Guideline.php
new file mode 100644
index 000000000..e3fd08f8d
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/src/Entity/Guideline.php
@@ -0,0 +1,93 @@
+<?php
+
+namespace Drupal\reliefweb_guidelines\Entity;
+
+use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\guidelines\Entity\Guideline as GuidelineBase;
+use Drupal\reliefweb_moderation\EntityModeratedInterface;
+use Drupal\reliefweb_moderation\EntityModeratedTrait;
+use Drupal\reliefweb_revisions\EntityRevisionedInterface;
+use Drupal\reliefweb_revisions\EntityRevisionedTrait;
+
+/**
+ * Bundle class for the guideline pages.
+ */
+class Guideline extends GuidelineBase implements EntityModeratedInterface, EntityRevisionedInterface {
+
+  use EntityModeratedTrait;
+  use EntityRevisionedTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function preSave(EntityStorageInterface $storage) {
+    parent::preSave($storage);
+
+    // Populate the field title with the guideline label.
+    if ($this->hasField('field_title')) {
+      $this->get('field_title')->setValue($this->label());
+    }
+
+    // Generate a unique short ID for the guideline.
+    if ($this->hasField('field_short_link') && $this->get('field_short_link')->isEmpty()) {
+      $this->get('field_short_link')->setValue(static::generateShortId());
+    }
+  }
+
+  /**
+   * Get the guideline short ID.
+   *
+   * @return string
+   *   Guideline's short ID.
+   */
+  public function getShortId() {
+    if ($this->hasField('field_short_link') && !$this->get('field_short_link')->isEmpty()) {
+      return $this->field_short_link->value;
+    }
+    return $this->id();
+  }
+
+  /**
+   * Generate a random unique short ID.
+   *
+   * @return string
+   *   Random unique short ID.
+   */
+  public static function generateShortId() {
+    static $shortids;
+    static $characters;
+
+    if (!isset($shortids)) {
+      $shortids = \Drupal::database()
+        ->select('guideline__field_short_link', 'f')
+        ->fields('f', ['field_short_link_value'])
+        ->distinct()
+        ->execute()
+        ?->fetchCol() ?? [];
+      $shortids = array_flip($shortids);
+    }
+
+    if (!isset($characters)) {
+      // 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.
+      $characters = array_merge(range(48, 57), range(65, 90), range(97, 122));
+    }
+
+    $counter = 0;
+    do {
+      // Prevent unlikely infinite loop.
+      if ($counter === 100) {
+        throw new \RuntimeException('Unable to generate a unique short ID');
+      }
+      $counter++;
+      // Generate a 8 characters long random string.
+      $shortid = '';
+      for ($i = 0; $i < 8; $i++) {
+        $shortid .= chr($characters[mt_rand(0, 61)]);
+      }
+    } while (isset($shortids[$shortid]));
+
+    $shortids[$shortid] = count($shortids);
+    return $shortid;
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_guidelines/src/Entity/GuidelineList.php b/html/modules/custom/reliefweb_guidelines/src/Entity/GuidelineList.php
new file mode 100644
index 000000000..6ab15f214
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/src/Entity/GuidelineList.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Drupal\reliefweb_guidelines\Entity;
+
+use Drupal\guidelines\Entity\Guideline as GuidelineBase;
+use Drupal\reliefweb_moderation\EntityModeratedInterface;
+use Drupal\reliefweb_moderation\EntityModeratedTrait;
+use Drupal\reliefweb_revisions\EntityRevisionedInterface;
+use Drupal\reliefweb_revisions\EntityRevisionedTrait;
+
+/**
+ * Bundle class for the guideline lists.
+ */
+class GuidelineList extends GuidelineBase implements EntityModeratedInterface, EntityRevisionedInterface {
+
+  use EntityModeratedTrait;
+  use EntityRevisionedTrait;
+
+}
diff --git a/html/modules/custom/reliefweb_guidelines/src/GuidelinesFromTrello.php b/html/modules/custom/reliefweb_guidelines/src/GuidelinesFromTrello.php
deleted file mode 100644
index 39601d603..000000000
--- a/html/modules/custom/reliefweb_guidelines/src/GuidelinesFromTrello.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-
-namespace Drupal\reliefweb_guidelines;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Logger\LoggerChannelFactoryInterface;
-use Drupal\Core\Url;
-use GuzzleHttp\ClientInterface;
-use GuzzleHttp\Exception\ClientException;
-
-/**
- * Import trello as guidelines.
- */
-class GuidelinesFromTrello {
-  /**
-   * API Key.
-   *
-   * @var string
-   */
-  protected $key = '';
-
-  /**
-   * API Token.
-   *
-   * @var string
-   */
-  protected $token = '';
-
-  /**
-   * The HTTP client service.
-   *
-   * @var \GuzzleHttp\ClientInterface
-   */
-  protected $httpClient;
-
-  /**
-   * Constructor.
-   *
-   * @param string $key
-   *   Trello key.
-   * @param string $token
-   *   Trello token.
-   * @param Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The config factory service.
-   * @param \GuzzleHttp\ClientInterface $http_client
-   *   The HTTP client service.
-   * @param Drupal\Core\Logger\LoggerChannelFactoryInterface $logger_factory
-   *   The logger factory service.
-   */
-  public function __construct($key, $token, ConfigFactoryInterface $config_factory, ClientInterface $http_client, LoggerChannelFactoryInterface $logger_factory) {
-    $this->key = $key;
-    $this->token = $token;
-    $this->config = $config_factory;
-    $this->httpClient = $http_client;
-    $this->logger = $logger_factory->get('reliefweb_guidelines');
-  }
-
-  /**
-   * Get all boards.
-   */
-  public function getBoards() {
-    $url = 'https://api.trello.com/1/members/me/boards';
-    $parmeters = [
-      'fields' => 'name,url',
-    ];
-
-    return $this->fetchData($url, $parmeters);
-  }
-
-  /**
-   * Get all lists of a board.
-   */
-  public function getLists($board_id, $status = 'open') {
-    $url = strtr('https://api.trello.com/1/boards/@id/lists/@status', [
-      '@id' => $board_id,
-      '@status' => $status,
-    ]);
-    $parmeters = [
-      'fields' => 'name,url,pos',
-    ];
-
-    return $this->fetchData($url, $parmeters);
-  }
-
-  /**
-   * Get all cards from a list.
-   */
-  public function getCards($list_id) {
-    $url = strtr('https://api.trello.com/1/lists/@id/cards', [
-      '@id' => $list_id,
-    ]);
-    $parmeters = [
-      'fields' => 'desc,idBoard,idList,idShort,name,shortLink,badges,shortUrl,labels,idAttachmentCover',
-    ];
-
-    return $this->fetchData($url, $parmeters);
-  }
-
-  /**
-   * Get a card.
-   */
-  public function getCard($card_id) {
-    $url = strtr('https://api.trello.com/1/cards/@id', [
-      '@id' => $card_id,
-    ]);
-    $parmeters = [
-      'fields' => 'desc,idBoard,idList,idShort,name,shortLink,badges,shortUrl,labels,idAttachmentCover',
-    ];
-
-    return $this->fetchData($url, $parmeters);
-  }
-
-  /**
-   * Get attachments of a card.
-   */
-  public function getCardAttachments($card_id) {
-    $url = strtr('https://api.trello.com/1/cards/@id/attachments', [
-      '@id' => $card_id,
-    ]);
-    $parmeters = [
-      'fields' => 'name,isUpload,url,filename,idBoard,idList',
-    ];
-
-    return $this->fetchData($url, $parmeters);
-  }
-
-  /**
-   * Fetch data from API.
-   */
-  protected function fetchData($url, $parameters = []) {
-    $parameters += [
-      'key' => $this->key,
-      'token' => $this->token,
-    ];
-
-    $url = Url::fromUri($url, [
-      'query' => $parameters,
-    ])->toUriString();
-
-    try {
-      $response = $this->httpClient->request('GET', $url);
-    }
-    catch (ClientException $exception) {
-      return NULL;
-    }
-
-    // Decode the JSON response.
-    $data = NULL;
-    if ($response->getStatusCode() === 200) {
-      $body = (string) $response->getBody();
-      if (!empty($body)) {
-        // Decode the data, skip if invalid.
-        try {
-          $data = json_decode($body, TRUE, 512, JSON_THROW_ON_ERROR);
-        }
-        catch (\Exception $exception) {
-          $this->logger->notice('Unable to decode json.');
-        }
-      }
-    }
-    else {
-      $this->logger->notice('Unable to retrieve data - response code: @code', [
-        '@code' => $response->getStatusCode(),
-      ]);
-    }
-
-    return $data;
-  }
-
-}
diff --git a/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-item.html.twig b/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-item.html.twig
deleted file mode 100644
index c68a405b3..000000000
--- a/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-item.html.twig
+++ /dev/null
@@ -1,17 +0,0 @@
-{#
-
-/**
- * @file
- * Template for the ReliefWeb Homepage.
- *
- * Available variables:
- * - attributes: wrapper attributes
- * - item: item.
- */
-
-#}
-
-<article{{ attributes.setAttribute('id', id).addClass('rw-guidelines-item') }}>
-  <h2>{{ title_prefix }}{{ title }}</h2>
-  <div>{{ description }}</div>
-</article>
diff --git a/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-list.html.twig b/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-list.html.twig
index c1d353252..63b213d9b 100644
--- a/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-list.html.twig
+++ b/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-list.html.twig
@@ -2,33 +2,33 @@
 
 /**
  * @file
- * Template for the ReliefWeb Homepage.
+ * Template for the ReliefWeb guideline list.
  *
  * Available variables:
  * - attributes: wrapper attributes
+ * - title: page title
  * - guidelines: list of guidelines for the page. Each section is a render array.
  */
 
 #}
-
+{% set tabindex_counter = 0 %}
 <div{{ attributes.addClass('rw-guidelines-list') }}>
   <aside>
-    <h1>Guidelines</h1>
+    <h1>{{ title }}</h1>
     <form action="#search">
-      <input id="" type="text" placeholder="Search">
+      <input type="text" placeholder="Search">
     </form>
     <nav class="scroll">
-      {% for guideline in guidelines %}
-        <label for="{{ guideline['#id'] }}">{{ guideline['#title'] }}</label>
-        <input id="{{ guideline['#id'] }}" type="checkbox" name="lists">
+      {% for id, guideline in guidelines %}
+        <label for="guideline-list-{{ id }}">{{ guideline.title }}</label>
+        <input id="guideline-list-{{ id }}" type="checkbox" name="lists">
 
-        {% if guideline['#children'] %}
-          <nav>
-          {% for child in guideline['#children'] %}
-            <a href="#{{ child['#id'] }}" tabindex="7" class="">{{ child['#title'] }}</a>
-          {% endfor %}
-          </nav>
-        {% endif %}
+        <nav>
+        {% for shortid, child in guideline.children %}
+          <a href="#{{ shortid }}" tabindex="{{ tabindex_counter }}">{{ child.title }}</a>
+          {% set tabindex_counter = tabindex_counter + 1 %}
+        {% endfor %}
+        </nav>
       {% endfor %}
     </nav>
   </aside>
@@ -36,8 +36,12 @@
   <main>
     <div class="scroll">
       {% for guideline in guidelines %}
-        <a name="{{ guideline['#id'] }}"></a>
-        {{ guideline['#children'] }}
+        {% for shortid, child in guideline.children %}
+          <article id="{{ shortid }}" class="rw-guidelines-item">
+            <h2><span>{{ guideline.title }}</span> {{ child.title }}</h2>
+            <div>{{ child.description }}</div>
+          </article>
+        {% endfor %}
       {% endfor %}
       <article id="search"></article>
     </div>

From 103a00972bbc1e88e6bfb48050c987eeee8e32e4 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 20 Dec 2021 02:50:11 +0000
Subject: [PATCH 329/720] [RW-276] Fix typo in dependencies

---
 .../custom/reliefweb_guidelines/reliefweb_guidelines.info.yml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.info.yml b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.info.yml
index 73c7fe592..7f3dfe694 100644
--- a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.info.yml
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.info.yml
@@ -6,5 +6,5 @@ core_version_requirement: ^9
 dependencies:
   - drupal:guidelines
   - drupal:reliefweb_moderation
-  - drupal:reliefweb_revision
+  - drupal:reliefweb_revisions
   - drupal:reliefweb_utility

From 17c5c3bf9d238bbfee6b9b58f6014fdc612c4258 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 20 Dec 2021 09:14:54 +0000
Subject: [PATCH 330/720] [RW-288] Explicit the routes to redirect legacy files

---
 .../custom/01_legacy_file_redirections.conf   | 206 ++++++++++++------
 1 file changed, 134 insertions(+), 72 deletions(-)

diff --git a/docker/etc/nginx/custom/01_legacy_file_redirections.conf b/docker/etc/nginx/custom/01_legacy_file_redirections.conf
index bfd691be7..002905a16 100644
--- a/docker/etc/nginx/custom/01_legacy_file_redirections.conf
+++ b/docker/etc/nginx/custom/01_legacy_file_redirections.conf
@@ -1,92 +1,154 @@
-# Rewrite the file path.
+## This handles the redirections of the legacy files and images.
+##
+## For the derivative images, we only handle the redirections for the styles
+## used for the end users on the reliefweb.int site or used in the API.
+##
+## Note: we use an internal location `/@legacy-files` and not a named location
+## so that we can have nested locations to determine which lua file to call
+## and extract the necessary variables from the URI.
+
+## Rewrite the file path.
 location /sites/reliefweb.int/files/ {
   rewrite ^/sites/reliefweb.int/files/(.+)$ /sites/default/files/$1 last;
 }
 
-# Handle files.
-location /sites/default/files/ {
-  # Handle attachment redirections.
-  location ~ "^/sites/default/files/resources/(?<attachment_file>[^/]+)$" {
+## Legacy announcement images.
+location /sites/default/files/announcements/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+location /sites/default/files/styles/announcement-homepage/public/announcements/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+
+## Legacy topic icons.
+location /sites/default/files/topic-icons/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+location /sites/default/files/styles/s/public/topic-icons/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+
+## Legacy blog post images.
+location /sites/default/files/blog-post-images/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+location /sites/default/files/styles/m/public/blog-post-images/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+location /sites/default/files/styles/report-large/public/blog-post-images/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+location /sites/default/files/styles/attachment-small/public/blog-post-images/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+location /sites/default/files/styles/attachment-large/public/blog-post-images/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+
+## legacy blog post attached images.
+location /sites/default/files/attached-images/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+location /sites/default/files/styles/m/public/attached-images/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+location /sites/default/files/styles/attachment-small/public/attached-images/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+location /sites/default/files/styles/attachment-large/public/attached-images/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+
+## Legacy headline images.
+location /sites/default/files/headline-images/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+location /sites/default/files/styles/m/public/headline-images/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+location /sites/default/files/styles/report-medium/public/headline-images/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+location /sites/default/files/styles/attachment-small/public/headline-images/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+location /sites/default/files/styles/attachment-large/public/headline-images/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+
+## Legacy report images.
+location /sites/default/files/report-images/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+location /sites/default/files/styles/m/public/report-images/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+location /sites/default/files/styles/report-large/public/report-images/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+location /sites/default/files/styles/attachment-small/public/report-images/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+location /sites/default/files/styles/attachment-large/public/report-images/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+
+## Legacy attachments.
+location /sites/default/files/resources/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+
+## Legacy attachment previews.
+location /sites/default/files/resources-pdf-previews/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+location /sites/default/files/styles/m/public/resources-pdf-previews/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+location /sites/default/files/styles/report-small/public/resources-pdf-previews/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+location /sites/default/files/styles/report-medium/resources-pdf-previews/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+location /sites/default/files/styles/report-large/public/resources-pdf-previews/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+location /sites/default/files/styles/attachment-small/public/resources-pdf-previews/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+location /sites/default/files/styles/attachment-large/public/resources-pdf-previews/ {
+  rewrite ^/sites/default/files/(.+)$ /@legacy-files/$1 last;
+}
+
+## Handle legacy file redirections.
+location /@legacy-files {
+  internal;
+
+  ## Handle legacy attachment redirections.
+  location ~ "^/@legacy-files/resources/(?<attachment_file>[^/]+)$" {
     rewrite_by_lua_file /etc/nginx/custom/lua/01_legacy_attachment_redirections.lua;
   }
 
-  # Handle preview redirections.
-  location ~ "^/sites/default/files/resources-pdf-previews/[0-9]+-(?<image_file>[^/]+).png$" {
+  ## Handle legacy preview redirections.
+  location ~ "^/@legacy-files/resources-pdf-previews/[0-9]+-(?<image_file>[^/]+).png$" {
     rewrite_by_lua_file /etc/nginx/custom/lua/01_legacy_preview_redirections.lua;
   }
 
-  # Handle preview derivative redirections.
-  location ~ "^/sites/default/files/styles/(?<image_style>[^/]+)/public/resources-pdf-previews/[0-9]+-(?<image_file>[^/]+).png$" {
+  ## Handle legacy preview derivative redirections.
+  location ~ "^/@legacy-files/styles/(?<image_style>[^/]+)/public/resources-pdf-previews/[0-9]+-(?<image_file>[^/]+).png$" {
     rewrite_by_lua_file /etc/nginx/custom/lua/01_legacy_preview_derivative_redirections.lua;
   }
 
-  # Handle image redirections.
-  location ~ "^/sites/default/files/(?<image_dir>[^/]+)/(?<image_file>[^/]+)$" {
+  ## Handle legacy image redirections.
+  location ~ "^/@legacy-files/(?<image_dir>[^/]+)/(?<image_file>[^/]+)$" {
     rewrite_by_lua_file /etc/nginx/custom/lua/01_legacy_image_redirections.lua;
   }
 
-  # Handle image derivative redirections.
-  location ~ "^/sites/default/files/styles/(?<image_style>[^/]+)/public/(?<image_dir>[^/]+)/(?<image_file>[^/]+)$" {
+  ## Handle legacy image derivative redirections.
+  location ~ "^/@legacy-files/(?<image_style>[^/]+)/public/(?<image_dir>[^/]+)/(?<image_file>[^/]+)$" {
     rewrite_by_lua_file /etc/nginx/custom/lua/01_legacy_image_derivative_redirections.lua;
   }
 
-  # This notably handles the new URLs using a UUID as file names.
-  # @todo is the `@drupal-legacy-files` necessary?
-  try_files $uri @drupal-legacy-files;
-}
-
-## This is similar to the fastcgi_drupal.conf but using the rewritten $uri
-## instead of the $request_uri. It uses to handle file redirections.
-##
-## Restrict access to the strictly necessary PHP files. Reducing the
-## scope for exploits. Handling of PHP code and the Drupal event loop.
-location @drupal-legacy-files {
-  #-*- mode: nginx; mode: flyspell-prog; ispell-local-dictionary: "american" -*-
-  ### fastcgi configuration for serving private files.
-  ## 1. Parameters.
-  fastcgi_param QUERY_STRING $args;
-  fastcgi_param REQUEST_METHOD $request_method;
-  fastcgi_param CONTENT_TYPE $content_type;
-  fastcgi_param CONTENT_LENGTH $content_length;
-
-  fastcgi_param SCRIPT_NAME /index.php;
-  ## Use the rewritten URI.
-  fastcgi_param REQUEST_URI $uri;
-  fastcgi_param DOCUMENT_URI $document_uri;
-  fastcgi_param DOCUMENT_ROOT $document_root;
-  fastcgi_param SERVER_PROTOCOL $server_protocol;
-
-  fastcgi_param GATEWAY_INTERFACE CGI/1.1;
-  fastcgi_param SERVER_SOFTWARE nginx/$nginx_version;
-
-  fastcgi_param REMOTE_ADDR $remote_addr;
-  fastcgi_param REMOTE_PORT $remote_port;
-  fastcgi_param SERVER_ADDR $server_addr;
-  fastcgi_param SERVER_PORT $server_port;
-  fastcgi_param SERVER_NAME $server_name;
-  ## PHP only, required if PHP was built with --enable-force-cgi-redirect
-  fastcgi_param REDIRECT_STATUS 200;
-  fastcgi_param SCRIPT_FILENAME $document_root/index.php;
-  ## HTTPS 'on' parameter.  This requires Nginx version 1.1.11 or
-  ## later. The if_not_empty flag was introduced in 1.1.11.  See:
-  ## http://nginx.org/en/CHANGES. If using a version that doesn't
-  ## support this comment out the line below.
-  fastcgi_param HTTPS $fastcgi_https if_not_empty;
-  ## For Nginx versions below 1.1.11 uncomment the line below after commenting out the above.
-  #fastcgi_param HTTPS $fastcgi_https;
-
-  ## 2. Nginx FCGI specific directives.
-  fastcgi_buffers 256 4k;
-  fastcgi_intercept_errors on;
-  ## Allow 4 hrs - pass timeout responsibility to upstream.
-  fastcgi_read_timeout 14400;
-  fastcgi_index index.php;
-  ## Hide the Drupal cache headers.
-  fastcgi_hide_header 'X-Drupal-Cache';
-  fastcgi_hide_header 'X-Drupal-Dynamic-Cache';
-  ## Hide the Drupal header X-Generator.
-  fastcgi_hide_header 'X-Generator';
-
-  ## Pass the request.
-  fastcgi_pass phpcgi;
+  return 404;
 }

From e5efd5b9d99874d0fd960819b77b6fd9764d417a Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Mon, 20 Dec 2021 08:39:27 -0700
Subject: [PATCH 331/720] top margin for h2 following list for better vertical
 rhythm

---
 .../components/rw-document/rw-document.css                     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-document/rw-document.css b/html/themes/custom/common_design_subtheme/components/rw-document/rw-document.css
index 0b1db9430..9e56e56c8 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-document/rw-document.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-document/rw-document.css
@@ -108,3 +108,6 @@
 .rw-article__content li:first-child {
   margin: 0;
 }
+.rw-article__content ul + h2 {
+  margin-top: 24px;
+}

From 9ec67b0d6f7ad3ae86e665bfb4100b2fd014ab8c Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Mon, 20 Dec 2021 08:42:54 -0700
Subject: [PATCH 332/720] remove console.log, guessing it is not needed anymore

---
 html/modules/custom/reliefweb_moderation/js/moderation.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/html/modules/custom/reliefweb_moderation/js/moderation.js b/html/modules/custom/reliefweb_moderation/js/moderation.js
index 526551562..ae4364c8d 100644
--- a/html/modules/custom/reliefweb_moderation/js/moderation.js
+++ b/html/modules/custom/reliefweb_moderation/js/moderation.js
@@ -408,8 +408,6 @@
         return active;
       }
 
-      console.log('here I am');
-
       /**
        * Logic.
        */

From ce10c7656d17088b15dd5d6db0c8b9fbe7c99727 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Mon, 20 Dec 2021 10:12:31 -0700
Subject: [PATCH 333/720] update base theme branch with latest commit

---
 composer.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.lock b/composer.lock
index 57192534e..e2408d6f8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -12262,12 +12262,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/UN-OCHA/common_design.git",
-                "reference": "811ad8bc26d8c90eeeebae8ff4efa686c201f9c6"
+                "reference": "022de5d9df32af602dec68109eeb87623e32c469"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/811ad8bc26d8c90eeeebae8ff4efa686c201f9c6",
-                "reference": "811ad8bc26d8c90eeeebae8ff4efa686c201f9c6",
+                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/022de5d9df32af602dec68109eeb87623e32c469",
+                "reference": "022de5d9df32af602dec68109eeb87623e32c469",
                 "shasum": ""
             },
             "require": {
@@ -12282,7 +12282,7 @@
                 "source": "https://github.com/UN-OCHA/common_design/tree/cd-304-forms",
                 "issues": "https://github.com/UN-OCHA/common_design/issues"
             },
-            "time": "2021-12-14T20:22:03+00:00"
+            "time": "2021-12-20T17:04:25+00:00"
         },
         {
             "name": "webflo/drupal-finder",

From 389288fcc04595b1d89a578dddec6b0fe9620da5 Mon Sep 17 00:00:00 2001
From: Andy Footner <andyfootner@netscape.net>
Date: Mon, 3 Jan 2022 12:19:09 +0100
Subject: [PATCH 334/720] [OPS-7738] remove checkComposerVersion

---
 composer.json                      |  6 -----
 scripts/composer/ScriptHandler.php | 37 ------------------------------
 2 files changed, 43 deletions(-)

diff --git a/composer.json b/composer.json
index dc1b9ae10..8421ec831 100644
--- a/composer.json
+++ b/composer.json
@@ -120,12 +120,6 @@
         ]
     },
     "scripts": {
-        "pre-install-cmd": [
-            "DrupalProject\\composer\\ScriptHandler::checkComposerVersion"
-        ],
-        "pre-update-cmd": [
-            "DrupalProject\\composer\\ScriptHandler::checkComposerVersion"
-        ],
         "post-install-cmd": [
             "DrupalProject\\composer\\ScriptHandler::createRequiredFiles",
             "DrupalProject\\composer\\ScriptHandler::removeUnnecessaryFiles",
diff --git a/scripts/composer/ScriptHandler.php b/scripts/composer/ScriptHandler.php
index 8e616e631..255ac3d0d 100644
--- a/scripts/composer/ScriptHandler.php
+++ b/scripts/composer/ScriptHandler.php
@@ -98,41 +98,4 @@ public static function removeUnnecessaryFiles(Event $event) {
     }
   }
 
-  /**
-   * Checks if the installed version of Composer is compatible.
-   *
-   * Composer 1.0.0 and higher consider a `composer install` without having a
-   * lock file present as equal to `composer update`. We do not ship with a lock
-   * file to avoid merge conflicts downstream, meaning that if a project is
-   * installed with an older version of Composer the scaffolding of Drupal will
-   * not be triggered. We check this here instead of in drupal-scaffold to be
-   * able to give immediate feedback to the end user, rather than failing the
-   * installation after going through the lengthy process of compiling and
-   * downloading the Composer dependencies.
-   *
-   * @see https://github.com/composer/composer/pull/5035
-   */
-  public static function checkComposerVersion(Event $event) {
-    $composer = $event->getComposer();
-    $io = $event->getIO();
-
-    $version = $composer::VERSION;
-
-    // The dev-channel of composer uses the git revision as version number,
-    // try to the branch alias instead.
-    if (preg_match('/^[0-9a-f]{40}$/i', $version)) {
-      $version = $composer::BRANCH_ALIAS_VERSION;
-    }
-
-    // If Composer is installed through git we have no easy way to determine if
-    // it is new enough, just display a warning.
-    if ($version === '@package_version@' || $version === '@package_branch_alias_version@') {
-      $io->writeError('<warning>You are running a development version of Composer. If you experience problems, please update Composer to the latest stable version.</warning>');
-    }
-    elseif (Comparator::lessThan($version, '1.0.0')) {
-      $io->writeError('<error>Drupal-project requires Composer version 1.0.0 or higher. Please update your Composer before continuing</error>.');
-      exit(1);
-    }
-  }
-
 }

From 49f82cb9e91ce25ca08489b9c9c2af303f616a88 Mon Sep 17 00:00:00 2001
From: Andy Footner <andyfootner@netscape.net>
Date: Mon, 3 Jan 2022 14:56:47 +0100
Subject: [PATCH 335/720] [RW-294] patch migrate_tools placeholder error

---
 composer.patches.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/composer.patches.json b/composer.patches.json
index ba4d71f7d..125abe725 100644
--- a/composer.patches.json
+++ b/composer.patches.json
@@ -2,6 +2,9 @@
     "patches": {
         "drupal/core" : {
             "https://www.drupal.org/project/drupal/issues/3047110": "patches/core--drupal--3047110-taxonomy-term-moderation-class.patch"
+        },
+        "drupal/migrate_tools" : {
+            "Invalid placeholder: https://www.drupal.org/project/migrate_tools/issues/3256236": "https://www.drupal.org/files/issues/2021-12-28/invalid_placeholder-3256236-3.patch"
         }
     }
 }

From 6d543b047e3e49ab3799697fb57f00ee4d156902 Mon Sep 17 00:00:00 2001
From: Andy Footner <andyfootner@netscape.net>
Date: Mon, 3 Jan 2022 15:11:46 +0100
Subject: [PATCH 336/720] [RW-295] fix small typos

---
 .../custom/reliefweb_docstore/reliefweb_docstore.module   | 2 +-
 .../src/Plugin/Field/FieldType/ReliefWebFile.php          | 8 ++++----
 .../custom/reliefweb_utility/src/Helpers/LegacyHelper.php | 2 +-
 .../reliefweb_utility/src/Response/JsonResponse.php       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
index 12e65bccd..39d4a5d35 100644
--- a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
+++ b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
@@ -124,7 +124,7 @@ function reliefweb_docstore_file_validate_mime_type(File $file, $mime_type) {
 function reliefweb_docstore_reliefweb_utility_file_update_alter(File $file, &$apply) {
   $settings = \Drupal::config('reliefweb_docstore.settings');
 
-  // Get the ttachment and preview directories.
+  // Get the attachment and preview directories.
   $file_directory = $settings->get('file_directory') ?? 'attachments';
   $preview_directory = $settings->get('preview_directory') ?? 'previews';
   $directories = [preg_quote($file_directory), preg_quote($preview_directory)];
diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
index 176ae3701..f5f1116fc 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
@@ -476,12 +476,12 @@ public static function generateSampleValue(FieldDefinitionInterface $field_defin
     $values['uuid'] = static::generateUuid();
     $values['revision_id'] = mt_rand(1111, 9999);
     $values['file_uuid'] = static::generateUuid();
-    $valyes['file_name'] = $random->string(mt_rand(1, 250)) . '.' . $random->string(mt_rand(1, 4));
-    $valyes['file_mime'] = $random->string(mt_rand(32, 128));
-    $valyes['file_size'] = mt_rand(1111, 99999);
+    $values['file_name'] = $random->string(mt_rand(1, 250)) . '.' . $random->string(mt_rand(1, 4));
+    $values['file_mime'] = $random->string(mt_rand(32, 128));
+    $values['file_size'] = mt_rand(1111, 99999);
     $values['language'] = ['en', 'fr', 'sp'][mt_rand(0, 2)];
     $values['description'] = $random->sentences(mt_rand(1, 5));
-    $valyes['page_count'] = mt_rand(1, 100);
+    $values['page_count'] = mt_rand(1, 100);
     $values['preview_uuid'] = static::generateUuid();
     $values['preview_page'] = mt_rand(1, 100);
     $values['preview_rotation'] = mt_rand(0, 2);
diff --git a/html/modules/custom/reliefweb_utility/src/Helpers/LegacyHelper.php b/html/modules/custom/reliefweb_utility/src/Helpers/LegacyHelper.php
index 9c88a11ef..698b3c5d3 100644
--- a/html/modules/custom/reliefweb_utility/src/Helpers/LegacyHelper.php
+++ b/html/modules/custom/reliefweb_utility/src/Helpers/LegacyHelper.php
@@ -50,7 +50,7 @@ public static function generateImageUuid($uri) {
    *   The attachment UUID.
    */
   public static function generateAttachmentUuid($uri) {
-    // We strips the '%' characters for compatibility with the preview URLS.
+    // Strip the '%' characters for compatibility with the preview URLs.
     return static::generateFileUuid(str_replace('%', '', $uri));
   }
 
diff --git a/html/modules/custom/reliefweb_utility/src/Response/JsonResponse.php b/html/modules/custom/reliefweb_utility/src/Response/JsonResponse.php
index 3efc9fa33..deb41e6ee 100644
--- a/html/modules/custom/reliefweb_utility/src/Response/JsonResponse.php
+++ b/html/modules/custom/reliefweb_utility/src/Response/JsonResponse.php
@@ -105,7 +105,7 @@ public function getStatusCode() {
   }
 
   /**
-   * Get the status code.
+   * Get the reason phrase.
    *
    * @return string
    *   The reason phrase accompanying the response status code.

From 0ea87f3662929a33f5b3dec54388ea7ec006e7a8 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 4 Jan 2022 08:34:56 +0000
Subject: [PATCH 337/720] [RW-296] Switch to a base field instead of
 moderation_state entities for the moderation status for better performances
 and to avoid conflict with some transitions not working with the editorial
 workflow

---
 ...play.guideline.field_guideline.default.yml |   1 +
 ...splay.guideline.guideline_list.default.yml |   1 +
 ...ty_form_display.node.blog_post.default.yml |   8 -
 ....entity_form_display.node.book.default.yml |   8 -
 ...e.entity_form_display.node.job.default.yml |  12 +-
 ...ntity_form_display.node.report.default.yml |  16 +-
 ...entity_form_display.node.topic.default.yml |   8 -
 ...ity_form_display.node.training.default.yml |  12 +-
 ..._display.taxonomy_term.country.default.yml |   8 -
 ..._display.taxonomy_term.country.profile.yml |   1 -
 ...display.taxonomy_term.disaster.default.yml |  12 +-
 ...display.taxonomy_term.disaster.profile.yml |   1 -
 ...ay.taxonomy_term.disaster_type.default.yml |   6 -
 ...m_display.taxonomy_term.source.default.yml |  10 +-
 ...xonomy_term.source.user_posting_rights.yml |   1 -
 config/core.extension.yml                     |   1 -
 ...tem.action.user_add_role_action.editor.yml |  14 -
 ...tion.user_add_role_action.job_importer.yml |  14 -
 ....action.user_add_role_action.webmaster.yml |  14 -
 ....action.user_remove_role_action.editor.yml |  14 -
 ...n.user_remove_role_action.job_importer.yml |  14 -
 ...tion.user_remove_role_action.webmaster.yml |  14 -
 config/user.role.authenticated.yml            |   9 -
 config/user.role.editor.yml                   |  56 +-
 .../user.role.external_disaster_manager.yml   |   5 -
 config/user.role.job_importer.yml             |   9 -
 config/user.role.webmaster.yml                |   5 +-
 config/views.view.moderated_content.yml       | 833 ------------------
 config/workflows.workflow.announcement.yml    |  57 --
 config/workflows.workflow.blog_post.yml       |  42 -
 config/workflows.workflow.book.yml            |  42 -
 config/workflows.workflow.country.yml         |  62 --
 config/workflows.workflow.disaster.yml        | 139 ---
 config/workflows.workflow.guideline.yml       |  59 --
 config/workflows.workflow.job.yml             | 115 ---
 config/workflows.workflow.report.yml          | 162 ----
 config/workflows.workflow.source.yml          | 119 ---
 config/workflows.workflow.topic.yml           |  42 -
 config/workflows.workflow.training.yml        | 114 ---
 .../src/Services/ReportFormAlter.php          |  23 +-
 .../ReliefWebEntityReferenceSelect.php        |  43 +-
 .../reliefweb_moderation.info.yml             |   1 -
 .../reliefweb_moderation.install              | 100 +++
 .../reliefweb_moderation.module               |  58 +-
 .../reliefweb_moderation.routing.yml          |   4 +-
 .../src/Controller/ModerationPage.php         |  16 +
 .../src/EntityModeratedInterface.php          |  16 +
 .../src/EntityModeratedTrait.php              |  68 +-
 .../src/Form/ModerationPageFilterForm.php     |  35 +-
 .../src/ModeratedNodeStorageSchema.php        |  61 ++
 .../src/ModeratedTermStorageSchema.php        |  61 ++
 .../src/ModerationServiceBase.php             |  95 +-
 .../src/ModerationServiceInterface.php        |  22 +
 .../src/Services/DisasterModeration.php       |  26 +-
 .../src/Services/JobModeration.php            |  10 +-
 .../src/Services/ReportModeration.php         |  10 +-
 .../src/Services/TrainingModeration.php       |  10 +-
 .../src/ReliefwebSubscriptionsMailer.php      |   8 +-
 .../reliefweb_user_posts.info.yml             |   2 +-
 .../reliefweb_user_posts.routing.yml          |   4 +-
 .../src/Controller/UserPostsPage.php          |   2 +-
 .../src/Services/UserPostsService.php         |   2 +-
 .../rw-moderation-status.css                  |  12 +-
 63 files changed, 535 insertions(+), 2214 deletions(-)
 delete mode 100644 config/system.action.user_add_role_action.editor.yml
 delete mode 100644 config/system.action.user_add_role_action.job_importer.yml
 delete mode 100644 config/system.action.user_add_role_action.webmaster.yml
 delete mode 100644 config/system.action.user_remove_role_action.editor.yml
 delete mode 100644 config/system.action.user_remove_role_action.job_importer.yml
 delete mode 100644 config/system.action.user_remove_role_action.webmaster.yml
 delete mode 100644 config/views.view.moderated_content.yml
 delete mode 100644 config/workflows.workflow.announcement.yml
 delete mode 100644 config/workflows.workflow.blog_post.yml
 delete mode 100644 config/workflows.workflow.book.yml
 delete mode 100644 config/workflows.workflow.country.yml
 delete mode 100644 config/workflows.workflow.disaster.yml
 delete mode 100644 config/workflows.workflow.guideline.yml
 delete mode 100644 config/workflows.workflow.job.yml
 delete mode 100644 config/workflows.workflow.report.yml
 delete mode 100644 config/workflows.workflow.source.yml
 delete mode 100644 config/workflows.workflow.topic.yml
 delete mode 100644 config/workflows.workflow.training.yml
 create mode 100644 html/modules/custom/reliefweb_moderation/reliefweb_moderation.install
 create mode 100644 html/modules/custom/reliefweb_moderation/src/ModeratedNodeStorageSchema.php
 create mode 100644 html/modules/custom/reliefweb_moderation/src/ModeratedTermStorageSchema.php

diff --git a/config/core.entity_form_display.guideline.field_guideline.default.yml b/config/core.entity_form_display.guideline.field_guideline.default.yml
index 8655852e8..15e3b572c 100644
--- a/config/core.entity_form_display.guideline.field_guideline.default.yml
+++ b/config/core.entity_form_display.guideline.field_guideline.default.yml
@@ -74,4 +74,5 @@ hidden:
   field_short_link: true
   field_title: true
   langcode: true
+  path: true
   user_id: true
diff --git a/config/core.entity_form_display.guideline.guideline_list.default.yml b/config/core.entity_form_display.guideline.guideline_list.default.yml
index 7896c77f7..a525da25c 100644
--- a/config/core.entity_form_display.guideline.guideline_list.default.yml
+++ b/config/core.entity_form_display.guideline.guideline_list.default.yml
@@ -19,4 +19,5 @@ content:
     third_party_settings: {  }
 hidden:
   langcode: true
+  path: true
   user_id: true
diff --git a/config/core.entity_form_display.node.blog_post.default.yml b/config/core.entity_form_display.node.blog_post.default.yml
index f24e5992f..216a10132 100644
--- a/config/core.entity_form_display.node.blog_post.default.yml
+++ b/config/core.entity_form_display.node.blog_post.default.yml
@@ -9,9 +9,7 @@ dependencies:
     - field.field.node.blog_post.field_image
     - field.field.node.blog_post.field_tags
     - node.type.blog_post
-    - workflows.workflow.blog_post
   module:
-    - content_moderation
     - media_library
     - path
     - text
@@ -62,12 +60,6 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  moderation_state:
-    type: moderation_state_default
-    weight: 8
-    region: content
-    settings: {  }
-    third_party_settings: {  }
   path:
     type: path
     weight: 9
diff --git a/config/core.entity_form_display.node.book.default.yml b/config/core.entity_form_display.node.book.default.yml
index d107a48a0..153a270c7 100644
--- a/config/core.entity_form_display.node.book.default.yml
+++ b/config/core.entity_form_display.node.book.default.yml
@@ -6,10 +6,8 @@ dependencies:
     - field.field.node.book.body
     - field.field.node.book.field_attached_images
     - node.type.book
-    - workflows.workflow.book
   module:
     - allowed_formats
-    - content_moderation
     - media_library
     - path
     - text
@@ -40,12 +38,6 @@ content:
     settings:
       media_types: {  }
     third_party_settings: {  }
-  moderation_state:
-    type: moderation_state_default
-    weight: 3
-    region: content
-    settings: {  }
-    third_party_settings: {  }
   path:
     type: path
     weight: 5
diff --git a/config/core.entity_form_display.node.job.default.yml b/config/core.entity_form_display.node.job.default.yml
index b31bb61fc..e0379de9f 100644
--- a/config/core.entity_form_display.node.job.default.yml
+++ b/config/core.entity_form_display.node.job.default.yml
@@ -15,10 +15,8 @@ dependencies:
     - field.field.node.job.field_source
     - field.field.node.job.field_theme
     - node.type.job
-    - workflows.workflow.job
   module:
     - allowed_formats
-    - content_moderation
     - path
     - reliefweb_fields
 id: node.job.default
@@ -78,7 +76,7 @@ content:
         'country:default_langcode': '0'
         'country:revision_default': '0'
         'country:revision_translation_affected': '0'
-        'country:moderation_state': '0'
+        'country:moderation_status': '0'
         'country:field_aliases': '0'
         'country:field_appeals_response_plans': '0'
         'country:field_iso3': '0'
@@ -127,7 +125,7 @@ content:
     settings:
       sort: label
       extra_data:
-        'source:moderation_state': 'source:moderation_state'
+        'source:moderation_status': 'source:moderation_status'
         'source:field_shortname': 'source:field_shortname'
         'source:tid': 0
         'source:uuid': 0
@@ -170,12 +168,6 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
-  moderation_state:
-    type: moderation_state_default
-    weight: 12
-    region: content
-    settings: {  }
-    third_party_settings: {  }
   path:
     type: path
     weight: 13
diff --git a/config/core.entity_form_display.node.report.default.yml b/config/core.entity_form_display.node.report.default.yml
index 899877ddd..38700d89e 100644
--- a/config/core.entity_form_display.node.report.default.yml
+++ b/config/core.entity_form_display.node.report.default.yml
@@ -28,9 +28,7 @@ dependencies:
     - field.field.node.report.field_theme
     - field.field.node.report.field_vulnerable_groups
     - node.type.report
-    - workflows.workflow.report
   module:
-    - content_moderation
     - datetime
     - media_library
     - path
@@ -74,7 +72,7 @@ content:
     settings:
       sort: label
       extra_data:
-        'country:moderation_state': 'country:moderation_state'
+        'country:moderation_status': 'country:moderation_status'
         'country:field_shortname': 'country:field_shortname'
         'country:tid': '0'
         'country:uuid': '0'
@@ -110,7 +108,7 @@ content:
     settings:
       sort: id
       extra_data:
-        'disaster:moderation_state': 'disaster:moderation_state'
+        'disaster:moderation_status': 'disaster:moderation_status'
         'disaster:field_country': 'disaster:field_country'
         'disaster:field_disaster_type': 'disaster:field_disaster_type'
         'disaster:field_glide': 'disaster:field_glide'
@@ -254,7 +252,7 @@ content:
     settings:
       sort: label
       extra_data:
-        'country:moderation_state': 'country:moderation_state'
+        'country:moderation_status': 'country:moderation_status'
         'country:field_shortname': 'country:field_shortname'
         'country:tid': '0'
         'country:uuid': '0'
@@ -290,7 +288,7 @@ content:
     settings:
       sort: label
       extra_data:
-        'source:moderation_state': 'source:moderation_state'
+        'source:moderation_status': 'source:moderation_status'
         'source:field_shortname': 'source:field_shortname'
         'source:tid': 0
         'source:uuid': 0
@@ -335,12 +333,6 @@ content:
       sort: label
       extra_data: {  }
     third_party_settings: {  }
-  moderation_state:
-    type: moderation_state_default
-    weight: 100
-    region: content
-    settings: {  }
-    third_party_settings: {  }
   path:
     type: path
     weight: 25
diff --git a/config/core.entity_form_display.node.topic.default.yml b/config/core.entity_form_display.node.topic.default.yml
index e40e697ed..6f5dd6641 100644
--- a/config/core.entity_form_display.node.topic.default.yml
+++ b/config/core.entity_form_display.node.topic.default.yml
@@ -15,10 +15,8 @@ dependencies:
     - field.field.node.topic.field_sections
     - field.field.node.topic.field_training_search
     - node.type.topic
-    - workflows.workflow.topic
   module:
     - allowed_formats
-    - content_moderation
     - media_library
     - path
     - reliefweb_fields
@@ -114,12 +112,6 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
-  moderation_state:
-    type: moderation_state_default
-    weight: 13
-    region: content
-    settings: {  }
-    third_party_settings: {  }
   path:
     type: path
     weight: 14
diff --git a/config/core.entity_form_display.node.training.default.yml b/config/core.entity_form_display.node.training.default.yml
index 772f5a9e4..fd3cdb863 100644
--- a/config/core.entity_form_display.node.training.default.yml
+++ b/config/core.entity_form_display.node.training.default.yml
@@ -20,10 +20,8 @@ dependencies:
     - field.field.node.training.field_training_language
     - field.field.node.training.field_training_type
     - node.type.training
-    - workflows.workflow.training
   module:
     - allowed_formats
-    - content_moderation
     - link
     - path
     - reliefweb_fields
@@ -90,7 +88,7 @@ content:
         'country:default_langcode': '0'
         'country:revision_default': '0'
         'country:revision_translation_affected': '0'
-        'country:moderation_state': '0'
+        'country:moderation_status': '0'
         'country:field_aliases': '0'
         'country:field_appeals_response_plans': '0'
         'country:field_iso3': '0'
@@ -149,7 +147,7 @@ content:
     settings:
       sort: label
       extra_data:
-        'source:moderation_state': 'source:moderation_state'
+        'source:moderation_status': 'source:moderation_status'
         'source:field_shortname': 'source:field_shortname'
         'source:tid': 0
         'source:uuid': 0
@@ -216,12 +214,6 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
-  moderation_state:
-    type: moderation_state_default
-    weight: 18
-    region: content
-    settings: {  }
-    third_party_settings: {  }
   path:
     type: path
     weight: 19
diff --git a/config/core.entity_form_display.taxonomy_term.country.default.yml b/config/core.entity_form_display.taxonomy_term.country.default.yml
index 12004b0f6..423e46c47 100644
--- a/config/core.entity_form_display.taxonomy_term.country.default.yml
+++ b/config/core.entity_form_display.taxonomy_term.country.default.yml
@@ -14,10 +14,8 @@ dependencies:
     - field.field.taxonomy_term.country.field_timezone
     - field.field.taxonomy_term.country.field_useful_links
     - taxonomy.vocabulary.country
-    - workflows.workflow.country
   module:
     - allowed_formats
-    - content_moderation
     - geofield
     - path
     - text
@@ -89,12 +87,6 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
-  moderation_state:
-    type: moderation_state_default
-    weight: 10
-    region: content
-    settings: {  }
-    third_party_settings: {  }
   name:
     type: string_textfield
     weight: 0
diff --git a/config/core.entity_form_display.taxonomy_term.country.profile.yml b/config/core.entity_form_display.taxonomy_term.country.profile.yml
index 4a5d7276a..4342397db 100644
--- a/config/core.entity_form_display.taxonomy_term.country.profile.yml
+++ b/config/core.entity_form_display.taxonomy_term.country.profile.yml
@@ -68,7 +68,6 @@ hidden:
   field_shortname: true
   field_timezone: true
   langcode: true
-  moderation_state: true
   name: true
   path: true
   status: true
diff --git a/config/core.entity_form_display.taxonomy_term.disaster.default.yml b/config/core.entity_form_display.taxonomy_term.disaster.default.yml
index 3a2cd9265..143e0f477 100644
--- a/config/core.entity_form_display.taxonomy_term.disaster.default.yml
+++ b/config/core.entity_form_display.taxonomy_term.disaster.default.yml
@@ -16,10 +16,8 @@ dependencies:
     - field.field.taxonomy_term.disaster.field_timezone
     - field.field.taxonomy_term.disaster.field_useful_links
     - taxonomy.vocabulary.disaster
-    - workflows.workflow.disaster
   module:
     - allowed_formats
-    - content_moderation
     - datetime
     - path
     - reliefweb_fields
@@ -47,7 +45,7 @@ content:
     settings:
       sort: label
       extra_data:
-        'country:moderation_state': 'country:moderation_state'
+        'country:moderation_status: 'country:moderation_status'
         'country:field_shortname': 'country:field_shortname'
         'country:tid': '0'
         'country:uuid': '0'
@@ -113,7 +111,7 @@ content:
     settings:
       sort: label
       extra_data:
-        'country:moderation_state': 'country:moderation_state'
+        'country:moderation_status': 'country:moderation_status'
         'country:field_shortname': 'country:field_shortname'
         'country:tid': '0'
         'country:uuid': '0'
@@ -163,12 +161,6 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
-  moderation_state:
-    type: moderation_state_default
-    weight: 12
-    region: content
-    settings: {  }
-    third_party_settings: {  }
   name:
     type: string_textfield
     weight: 0
diff --git a/config/core.entity_form_display.taxonomy_term.disaster.profile.yml b/config/core.entity_form_display.taxonomy_term.disaster.profile.yml
index 13dd0cd38..c1936c02a 100644
--- a/config/core.entity_form_display.taxonomy_term.disaster.profile.yml
+++ b/config/core.entity_form_display.taxonomy_term.disaster.profile.yml
@@ -72,7 +72,6 @@ hidden:
   field_primary_disaster_type: true
   field_timezone: true
   langcode: true
-  moderation_state: true
   name: true
   path: true
   status: true
diff --git a/config/core.entity_form_display.taxonomy_term.disaster_type.default.yml b/config/core.entity_form_display.taxonomy_term.disaster_type.default.yml
index f3fb7501d..9e0c57421 100644
--- a/config/core.entity_form_display.taxonomy_term.disaster_type.default.yml
+++ b/config/core.entity_form_display.taxonomy_term.disaster_type.default.yml
@@ -32,12 +32,6 @@ content:
       size: 2
       placeholder: ''
     third_party_settings: {  }
-  moderation_state:
-    type: moderation_state_default
-    weight: 100
-    region: content
-    settings: {  }
-    third_party_settings: {  }
   name:
     type: string_textfield
     weight: 0
diff --git a/config/core.entity_form_display.taxonomy_term.source.default.yml b/config/core.entity_form_display.taxonomy_term.source.default.yml
index 8832fd242..8a69330c9 100644
--- a/config/core.entity_form_display.taxonomy_term.source.default.yml
+++ b/config/core.entity_form_display.taxonomy_term.source.default.yml
@@ -23,10 +23,8 @@ dependencies:
     - field.field.taxonomy_term.source.field_user_posting_rights
     - image.style.thumbnail
     - taxonomy.vocabulary.source
-    - workflows.workflow.source
   module:
     - allowed_formats
-    - content_moderation
     - link
     - path
     - reliefweb_fields
@@ -111,7 +109,7 @@ content:
         'country:default_langcode': '0'
         'country:revision_default': '0'
         'country:revision_translation_affected': '0'
-        'country:moderation_state': '0'
+        'country:moderation_status': '0'
         'country:field_aliases': '0'
         'country:field_appeals_response_plans': '0'
         'country:field_iso3': '0'
@@ -198,12 +196,6 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
-  moderation_state:
-    type: moderation_state_default
-    weight: 20
-    region: content
-    settings: {  }
-    third_party_settings: {  }
   name:
     type: string_textfield
     weight: 0
diff --git a/config/core.entity_form_display.taxonomy_term.source.user_posting_rights.yml b/config/core.entity_form_display.taxonomy_term.source.user_posting_rights.yml
index 7738eef23..aa60131da 100644
--- a/config/core.entity_form_display.taxonomy_term.source.user_posting_rights.yml
+++ b/config/core.entity_form_display.taxonomy_term.source.user_posting_rights.yml
@@ -55,7 +55,6 @@ hidden:
   field_shortname: true
   field_spanish_name: true
   langcode: true
-  moderation_state: true
   name: true
   path: true
   status: true
diff --git a/config/core.extension.yml b/config/core.extension.yml
index 0e88362d3..39521413d 100644
--- a/config/core.extension.yml
+++ b/config/core.extension.yml
@@ -11,7 +11,6 @@ module:
   config: 0
   config_split: 0
   contact: 0
-  content_moderation: 0
   ctools: 0
   datetime: 0
   datetime_range: 0
diff --git a/config/system.action.user_add_role_action.editor.yml b/config/system.action.user_add_role_action.editor.yml
deleted file mode 100644
index 6e0c54f18..000000000
--- a/config/system.action.user_add_role_action.editor.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: a035d778-cf79-4138-a4cb-b45a1647569f
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.editor
-  module:
-    - user
-id: user_add_role_action.editor
-label: 'Add the Editor role to the selected user(s)'
-type: user
-plugin: user_add_role_action
-configuration:
-  rid: editor
diff --git a/config/system.action.user_add_role_action.job_importer.yml b/config/system.action.user_add_role_action.job_importer.yml
deleted file mode 100644
index 14ebe8004..000000000
--- a/config/system.action.user_add_role_action.job_importer.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: f10e801b-e289-4f1d-b501-a5fcacc29ca1
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.job_importer
-  module:
-    - user
-id: user_add_role_action.job_importer
-label: 'Add the Job importer role to the selected user(s)'
-type: user
-plugin: user_add_role_action
-configuration:
-  rid: job_importer
diff --git a/config/system.action.user_add_role_action.webmaster.yml b/config/system.action.user_add_role_action.webmaster.yml
deleted file mode 100644
index 6d7233680..000000000
--- a/config/system.action.user_add_role_action.webmaster.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: 9edf1d35-692b-468b-a957-dbfac2fb722a
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.webmaster
-  module:
-    - user
-id: user_add_role_action.webmaster
-label: 'Add the Webmaster role to the selected user(s)'
-type: user
-plugin: user_add_role_action
-configuration:
-  rid: webmaster
diff --git a/config/system.action.user_remove_role_action.editor.yml b/config/system.action.user_remove_role_action.editor.yml
deleted file mode 100644
index 72c893431..000000000
--- a/config/system.action.user_remove_role_action.editor.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: f9b3f8c8-894c-47ef-83c3-d22a10c318e0
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.editor
-  module:
-    - user
-id: user_remove_role_action.editor
-label: 'Remove the Editor role from the selected user(s)'
-type: user
-plugin: user_remove_role_action
-configuration:
-  rid: editor
diff --git a/config/system.action.user_remove_role_action.job_importer.yml b/config/system.action.user_remove_role_action.job_importer.yml
deleted file mode 100644
index b414b0f0b..000000000
--- a/config/system.action.user_remove_role_action.job_importer.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: 171d2c17-9c5a-46a5-8056-c88b67d29408
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.job_importer
-  module:
-    - user
-id: user_remove_role_action.job_importer
-label: 'Remove the Job importer role from the selected user(s)'
-type: user
-plugin: user_remove_role_action
-configuration:
-  rid: job_importer
diff --git a/config/system.action.user_remove_role_action.webmaster.yml b/config/system.action.user_remove_role_action.webmaster.yml
deleted file mode 100644
index 7ce0594ba..000000000
--- a/config/system.action.user_remove_role_action.webmaster.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: 15fac72e-260d-4f1c-a613-276f8ed934cc
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.webmaster
-  module:
-    - user
-id: user_remove_role_action.webmaster
-label: 'Remove the Webmaster role from the selected user(s)'
-type: user
-plugin: user_remove_role_action
-configuration:
-  rid: webmaster
diff --git a/config/user.role.authenticated.yml b/config/user.role.authenticated.yml
index 4af607da9..2bcd173fe 100644
--- a/config/user.role.authenticated.yml
+++ b/config/user.role.authenticated.yml
@@ -8,10 +8,7 @@ dependencies:
     - filter.format.token_markdown
     - node.type.job
     - node.type.training
-    - workflows.workflow.job
-    - workflows.workflow.training
   module:
-    - content_moderation
     - filter
     - media
     - node
@@ -35,15 +32,9 @@ permissions:
   - 'delete own training content'
   - 'manage own subscriptions'
   - 'use enhanced input forms'
-  - 'use job transition draft'
-  - 'use job transition pending'
-  - 'use job transition published'
   - 'use text format markdown'
   - 'use text format markdown_editor'
   - 'use text format token_markdown'
-  - 'use training transition draft'
-  - 'use training transition pending'
-  - 'use training transition published'
   - 'view media'
   - 'view own posts'
   - 'view own unpublished content'
diff --git a/config/user.role.editor.yml b/config/user.role.editor.yml
index 5dcccdfd0..8e6a0e0fc 100644
--- a/config/user.role.editor.yml
+++ b/config/user.role.editor.yml
@@ -21,24 +21,14 @@ dependencies:
     - taxonomy.vocabulary.disaster
     - taxonomy.vocabulary.source
     - taxonomy.vocabulary.tag
-    - workflows.workflow.announcement
-    - workflows.workflow.blog_post
-    - workflows.workflow.book
-    - workflows.workflow.country
-    - workflows.workflow.disaster
-    - workflows.workflow.job
-    - workflows.workflow.report
-    - workflows.workflow.source
-    - workflows.workflow.topic
-    - workflows.workflow.training
   module:
     - book
     - contact
-    - content_moderation
     - filter
     - media
     - node
     - path
+    - reliefweb_docstore
     - reliefweb_fields
     - reliefweb_form
     - reliefweb_homepage
@@ -158,60 +148,16 @@ permissions:
   - 'revert training revisions'
   - 'update any media'
   - 'update media'
-  - 'use announcement transition archive'
-  - 'use announcement transition draft'
-  - 'use announcement transition published'
-  - 'use blog_post transition draft'
-  - 'use blog_post transition published'
-  - 'use book transition draft'
-  - 'use book transition published'
-  - 'use country transition draft'
-  - 'use country transition normal'
-  - 'use country transition ongoing'
-  - 'use disaster transition alert'
-  - 'use disaster transition archive_alert'
-  - 'use disaster transition archive_draft'
-  - 'use disaster transition archive_ongoing'
-  - 'use disaster transition draft'
-  - 'use disaster transition ongoing'
   - 'use enhanced input forms'
-  - 'use job transition draft'
-  - 'use job transition duplicate'
-  - 'use job transition expired'
-  - 'use job transition on_hold'
-  - 'use job transition pending'
-  - 'use job transition published'
-  - 'use job transition refused'
-  - 'use report transition draft'
-  - 'use report transition duplicate'
-  - 'use report transition embargoed'
-  - 'use report transition on_hold'
-  - 'use report transition published'
-  - 'use report transition reference'
-  - 'use report transition to_review'
-  - 'use source transition active'
-  - 'use source transition archive'
-  - 'use source transition blocked'
-  - 'use source transition draft'
-  - 'use source transition duplicate'
-  - 'use source transition inactive'
   - 'use text format html'
   - 'use text format markdown'
-  - 'use topic transition draft'
-  - 'use topic transition published'
-  - 'use training transition duplicate'
-  - 'use training transition expired'
-  - 'use training transition on_hold'
-  - 'use training transition refused'
   - 'view all media revisions'
   - 'view announcement revisions'
   - 'view any content'
-  - 'view any unpublished content'
   - 'view blog_post revisions'
   - 'view book revisions'
   - 'view entity history'
   - 'view job revisions'
-  - 'view latest version'
   - 'view other user posts'
   - 'view own unpublished content'
   - 'view own unpublished media'
diff --git a/config/user.role.external_disaster_manager.yml b/config/user.role.external_disaster_manager.yml
index c0cab3169..e24f9e19c 100644
--- a/config/user.role.external_disaster_manager.yml
+++ b/config/user.role.external_disaster_manager.yml
@@ -4,9 +4,7 @@ status: true
 dependencies:
   config:
     - taxonomy.vocabulary.disaster
-    - workflows.workflow.disaster
   module:
-    - content_moderation
     - taxonomy
 id: external_disaster_manager
 label: 'External disaster manager'
@@ -16,6 +14,3 @@ permissions:
   - 'create terms in disaster'
   - 'delete terms in disaster'
   - 'edit terms in disaster'
-  - 'use disaster transition archive_external'
-  - 'use disaster transition draft'
-  - 'use disaster transition external'
diff --git a/config/user.role.job_importer.yml b/config/user.role.job_importer.yml
index bc9819624..a671e7a73 100644
--- a/config/user.role.job_importer.yml
+++ b/config/user.role.job_importer.yml
@@ -4,9 +4,7 @@ status: true
 dependencies:
   config:
     - node.type.job
-    - workflows.workflow.job
   module:
-    - content_moderation
     - node
 id: job_importer
 label: 'Job importer'
@@ -15,10 +13,3 @@ is_admin: null
 permissions:
   - 'create job content'
   - 'edit own job content'
-  - 'use job transition draft'
-  - 'use job transition duplicate'
-  - 'use job transition expired'
-  - 'use job transition on_hold'
-  - 'use job transition pending'
-  - 'use job transition published'
-  - 'use job transition refused'
diff --git a/config/user.role.webmaster.yml b/config/user.role.webmaster.yml
index f3764c63f..d12c8ff46 100644
--- a/config/user.role.webmaster.yml
+++ b/config/user.role.webmaster.yml
@@ -3,6 +3,7 @@ langcode: en
 status: true
 dependencies:
   config:
+    - filter.format.guideline
     - taxonomy.vocabulary.career_category
     - taxonomy.vocabulary.content_format
     - taxonomy.vocabulary.country
@@ -20,10 +21,9 @@ dependencies:
     - taxonomy.vocabulary.training_format
     - taxonomy.vocabulary.training_type
     - taxonomy.vocabulary.vulnerable_group
-    - workflows.workflow.report
   module:
     - book
-    - content_moderation
+    - filter
     - google_tag
     - taxonomy
     - taxonomy_term_revision
@@ -89,7 +89,6 @@ permissions:
   - 'edit terms in training_type'
   - 'edit terms in vulnerable_group'
   - 'revert term revision'
-  - 'use report transition archived'
   - 'use text format guideline'
   - 'view term revision data'
   - 'view term revision list'
diff --git a/config/views.view.moderated_content.yml b/config/views.view.moderated_content.yml
deleted file mode 100644
index a5a8d067a..000000000
--- a/config/views.view.moderated_content.yml
+++ /dev/null
@@ -1,833 +0,0 @@
-uuid: 8cf1242f-1f5c-4161-b081-c2661a1906a3
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-    - user
-  enforced:
-    module:
-      - content_moderation
-_core:
-  default_config_hash: Kjqf5d4F134C3zua0tXV7LA3m5OEeS_Fowa2dP9kk2I
-id: moderated_content
-label: 'Moderated content'
-module: views
-description: 'Find and moderate content.'
-tag: ''
-base_table: node_field_revision
-base_field: vid
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Moderated content'
-      fields:
-        title:
-          id: title
-          table: node_field_revision
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: field
-          label: Title
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: false
-            ellipsis: false
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        type:
-          id: type
-          table: node_field_data
-          field: type
-          relationship: nid
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: type
-          plugin_id: field
-          label: 'Content type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        name:
-          id: name
-          table: users_field_data
-          field: name
-          relationship: uid
-          group_type: group
-          admin_label: ''
-          entity_type: user
-          entity_field: name
-          plugin_id: field
-          label: Author
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: user_name
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        moderation_state:
-          id: moderation_state
-          table: node_field_revision
-          field: moderation_state
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          plugin_id: field
-          label: 'Moderation state'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: content_moderation_state
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        changed:
-          id: changed
-          table: node_field_revision
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: changed
-          plugin_id: field
-          label: Updated
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: false
-            ellipsis: false
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: short
-            custom_date_format: ''
-            timezone: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        operations:
-          id: operations
-          table: node_revision
-          field: operations
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          plugin_id: entity_operations
-          label: Operations
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          destination: true
-      pager:
-        type: full
-        options:
-          offset: 0
-          items_per_page: 50
-          total_pages: null
-          id: 0
-          tags:
-            next: 'Next ›'
-            previous: '‹ Previous'
-            first: '« First'
-            last: 'Last »'
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          quantity: 9
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Filter
-          reset_button: true
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'view any unpublished content'
-      cache:
-        type: tag
-        options: {  }
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: 'No moderated content available. Only pending versions of content, such as drafts, are listed here.'
-          tokenize: false
-      sorts: {  }
-      arguments: {  }
-      filters:
-        latest_translation_affected_revision:
-          id: latest_translation_affected_revision
-          table: node_revision
-          field: latest_translation_affected_revision
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          plugin_id: latest_translation_affected_revision
-          operator: '='
-          value: ''
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        title:
-          id: title
-          table: node_field_revision
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: string
-          operator: contains
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: title_op
-            label: Title
-            description: ''
-            use_operator: false
-            operator: title_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: title
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        type:
-          id: type
-          table: node_field_data
-          field: type
-          relationship: nid
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: type
-          plugin_id: bundle
-          operator: in
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: type_op
-            label: 'Content type'
-            description: ''
-            use_operator: false
-            operator: type_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: type
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        moderation_state:
-          id: moderation_state
-          table: node_field_revision
-          field: moderation_state
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          plugin_id: moderation_state_filter
-          operator: in
-          value:
-            editorial-draft: editorial-draft
-            editorial-archived: editorial-archived
-          group: 1
-          exposed: true
-          expose:
-            operator_id: moderation_state_op
-            label: 'Moderation state'
-            description: ''
-            use_operator: false
-            operator: moderation_state_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: moderation_state
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-            reduce: true
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        langcode:
-          id: langcode
-          table: node_field_revision
-          field: langcode
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: langcode
-          plugin_id: language
-          operator: in
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: langcode_op
-            label: Language
-            description: ''
-            use_operator: false
-            operator: langcode_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: langcode
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        moderation_state_1:
-          id: moderation_state_1
-          table: node_field_revision
-          field: moderation_state
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          plugin_id: moderation_state_filter
-          operator: 'not in'
-          value:
-            editorial-published: editorial-published
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          columns:
-            title: title
-            type: type
-            name: name
-            moderation_state: moderation_state
-            changed: changed
-          default: changed
-          info:
-            title:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            type:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            name:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            moderation_state:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            changed:
-              sortable: true
-              default_sort_order: desc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: true
-          summary: ''
-          empty_table: true
-          caption: ''
-          description: ''
-      row:
-        type: fields
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        nid:
-          id: nid
-          table: node_field_revision
-          field: nid
-          relationship: none
-          group_type: group
-          admin_label: 'Get the actual content from a content revision.'
-          entity_type: node
-          entity_field: nid
-          plugin_id: standard
-          required: false
-        uid:
-          id: uid
-          table: node_field_revision
-          field: uid
-          relationship: none
-          group_type: group
-          admin_label: User
-          entity_type: node
-          entity_field: uid
-          plugin_id: standard
-          required: false
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  moderated_content:
-    id: moderated_content
-    display_title: 'Moderated content'
-    display_plugin: page
-    position: 1
-    display_options:
-      display_description: ''
-      display_extenders: {  }
-      path: admin/content/moderated
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
diff --git a/config/workflows.workflow.announcement.yml b/config/workflows.workflow.announcement.yml
deleted file mode 100644
index 0d0f6f7b2..000000000
--- a/config/workflows.workflow.announcement.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-uuid: 4623b658-0f0f-47e7-97fa-3c4df0f59aa2
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.announcement
-  module:
-    - content_moderation
-id: announcement
-label: Announcement
-type: content_moderation
-type_settings:
-  states:
-    archive:
-      label: Archived
-      weight: 2
-      published: false
-      default_revision: true
-    draft:
-      label: Draft
-      weight: 0
-      published: false
-      default_revision: true
-    published:
-      label: Published
-      weight: 1
-      published: true
-      default_revision: true
-  transitions:
-    archive:
-      label: Archive
-      from:
-        - archive
-        - draft
-        - published
-      to: archive
-      weight: 2
-    draft:
-      label: 'Save as Draft'
-      from:
-        - archive
-        - draft
-        - published
-      to: draft
-      weight: 0
-    published:
-      label: Publish
-      from:
-        - archive
-        - draft
-        - published
-      to: published
-      weight: 1
-  entity_types:
-    node:
-      - announcement
-  default_moderation_state: draft
diff --git a/config/workflows.workflow.blog_post.yml b/config/workflows.workflow.blog_post.yml
deleted file mode 100644
index 794dfb417..000000000
--- a/config/workflows.workflow.blog_post.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-uuid: cb4b2c24-b1dd-41aa-9d6f-289dd2787ded
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.blog_post
-  module:
-    - content_moderation
-id: blog_post
-label: 'Blog post'
-type: content_moderation
-type_settings:
-  states:
-    draft:
-      label: Draft
-      weight: 0
-      published: false
-      default_revision: true
-    published:
-      label: Published
-      weight: 1
-      published: true
-      default_revision: true
-  transitions:
-    draft:
-      label: 'Save as Draft'
-      from:
-        - draft
-        - published
-      to: draft
-      weight: 0
-    published:
-      label: Publish
-      from:
-        - draft
-        - published
-      to: published
-      weight: 1
-  entity_types:
-    node:
-      - blog_post
-  default_moderation_state: draft
diff --git a/config/workflows.workflow.book.yml b/config/workflows.workflow.book.yml
deleted file mode 100644
index d99f97ce3..000000000
--- a/config/workflows.workflow.book.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-uuid: aca5bd31-efc3-47e2-82c5-6bfdf417e9e2
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.book
-  module:
-    - content_moderation
-id: book
-label: 'Book page'
-type: content_moderation
-type_settings:
-  states:
-    draft:
-      label: Draft
-      weight: 0
-      published: false
-      default_revision: true
-    published:
-      label: Published
-      weight: 1
-      published: true
-      default_revision: true
-  transitions:
-    draft:
-      label: 'Save as Draft'
-      from:
-        - draft
-        - published
-      to: draft
-      weight: 0
-    published:
-      label: Publish
-      from:
-        - draft
-        - published
-      to: published
-      weight: 1
-  entity_types:
-    node:
-      - book
-  default_moderation_state: draft
diff --git a/config/workflows.workflow.country.yml b/config/workflows.workflow.country.yml
deleted file mode 100644
index e03f88fc3..000000000
--- a/config/workflows.workflow.country.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-uuid: f33f0b79-f497-4d84-9647-9896416f0ce2
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.country
-  module:
-    - content_moderation
-id: country
-label: Country
-type: content_moderation
-type_settings:
-  states:
-    draft:
-      label: Draft
-      weight: 0
-      published: false
-      default_revision: true
-    normal:
-      label: Normal
-      weight: 2
-      published: true
-      default_revision: true
-    ongoing:
-      label: Ongoing
-      weight: 3
-      published: true
-      default_revision: true
-    published:
-      label: Published
-      weight: 1
-      published: true
-      default_revision: true
-  transitions:
-    draft:
-      label: 'Save as Draft'
-      from:
-        - draft
-        - normal
-        - ongoing
-      to: draft
-      weight: -2
-    normal:
-      label: 'Save as Normal'
-      from:
-        - draft
-        - normal
-        - ongoing
-      to: normal
-      weight: -1
-    ongoing:
-      label: 'Save as Ongoing'
-      from:
-        - draft
-        - normal
-        - ongoing
-      to: ongoing
-      weight: 0
-  entity_types:
-    taxonomy_term:
-      - country
-  default_moderation_state: normal
diff --git a/config/workflows.workflow.disaster.yml b/config/workflows.workflow.disaster.yml
deleted file mode 100644
index c9ac2072a..000000000
--- a/config/workflows.workflow.disaster.yml
+++ /dev/null
@@ -1,139 +0,0 @@
-uuid: b1ab62d4-a5b1-4e2e-970c-02414f4a616b
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.disaster
-  module:
-    - content_moderation
-id: disaster
-label: Disaster
-type: content_moderation
-type_settings:
-  states:
-    alert:
-      label: Alert
-      weight: 2
-      published: true
-      default_revision: true
-    alert_archive:
-      label: 'Alert Archive'
-      weight: 6
-      published: false
-      default_revision: true
-    draft:
-      label: Draft
-      weight: 0
-      published: false
-      default_revision: true
-    draft_archive:
-      label: 'Draft Archive'
-      weight: 5
-      published: false
-      default_revision: true
-    external:
-      label: External
-      weight: 7
-      published: true
-      default_revision: true
-    external_archive:
-      label: 'External Archive'
-      weight: 8
-      published: false
-      default_revision: true
-    ongoing:
-      label: Ongoing
-      weight: 3
-      published: true
-      default_revision: true
-    past:
-      label: 'Past Disaster'
-      weight: 4
-      published: true
-      default_revision: true
-    published:
-      label: Published
-      weight: 1
-      published: true
-      default_revision: true
-  transitions:
-    alert:
-      label: 'Save as Alert'
-      from:
-        - alert
-        - alert_archive
-        - draft
-        - draft_archive
-        - external
-        - external_archive
-        - ongoing
-        - past
-      to: alert
-      weight: -3
-    archive_alert:
-      label: 'Archive Alert'
-      from:
-        - alert
-      to: alert_archive
-      weight: 1
-    archive_draft:
-      label: 'Archive Draft'
-      from:
-        - draft
-      to: draft_archive
-      weight: 0
-    archive_external:
-      label: 'Archive External'
-      from:
-        - external
-      to: external_archive
-      weight: 3
-    archive_ongoing:
-      label: 'Archive Ongoing'
-      from:
-        - ongoing
-      to: past
-      weight: 2
-    draft:
-      label: 'Save as Draft'
-      from:
-        - alert
-        - alert_archive
-        - draft
-        - draft_archive
-        - external
-        - external_archive
-        - ongoing
-        - past
-      to: draft
-      weight: -4
-    external:
-      label: 'Save as External'
-      from:
-        - alert
-        - alert_archive
-        - draft
-        - draft_archive
-        - external
-        - external_archive
-        - ongoing
-        - past
-      to: external
-      weight: -1
-    ongoing:
-      label: 'Save as Ongoing'
-      from:
-        - alert
-        - alert_archive
-        - draft
-        - draft_archive
-        - external
-        - external_archive
-        - ongoing
-        - past
-      to: ongoing
-      weight: -2
-  entity_types:
-    taxonomy_term:
-      - disaster
-  default_moderation_state: draft
diff --git a/config/workflows.workflow.guideline.yml b/config/workflows.workflow.guideline.yml
deleted file mode 100644
index 538fbb5ce..000000000
--- a/config/workflows.workflow.guideline.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-uuid: 410548c2-3480-485d-863e-7a3e0214c9b8
-langcode: en
-status: true
-dependencies:
-  config:
-    - guidelines.guideline_type.field_guideline
-    - guidelines.guideline_type.guideline_list
-  module:
-    - content_moderation
-id: guideline
-label: Guideline
-type: content_moderation
-type_settings:
-  states:
-    archive:
-      label: Archived
-      weight: 2
-      published: false
-      default_revision: true
-    draft:
-      label: Draft
-      weight: 0
-      published: false
-      default_revision: true
-    published:
-      label: Published
-      weight: 1
-      published: true
-      default_revision: true
-  transitions:
-    archive:
-      label: Archive
-      from:
-        - archive
-        - draft
-        - published
-      to: archive
-      weight: 2
-    create_new_draft:
-      label: 'Save as Draft'
-      from:
-        - archive
-        - draft
-        - published
-      to: draft
-      weight: 0
-    publish:
-      label: Publish
-      from:
-        - archive
-        - draft
-        - published
-      to: published
-      weight: 1
-  entity_types:
-    guideline:
-      - field_guideline
-      - guideline_list
-  default_moderation_state: draft
diff --git a/config/workflows.workflow.job.yml b/config/workflows.workflow.job.yml
deleted file mode 100644
index 955d6d68e..000000000
--- a/config/workflows.workflow.job.yml
+++ /dev/null
@@ -1,115 +0,0 @@
-uuid: e1ab65a5-debf-44c7-9a27-b73a7cf3cbad
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.job
-  module:
-    - content_moderation
-id: job
-label: Job
-type: content_moderation
-type_settings:
-  states:
-    draft:
-      label: Draft
-      weight: 0
-      published: false
-      default_revision: true
-    duplicate:
-      label: Duplicate
-      weight: 5
-      published: false
-      default_revision: true
-    expired:
-      label: Expired
-      weight: 6
-      published: false
-      default_revision: true
-    on_hold:
-      label: On-hold
-      weight: 3
-      published: false
-      default_revision: true
-    pending:
-      label: Pending
-      weight: 2
-      published: false
-      default_revision: true
-    published:
-      label: Published
-      weight: 1
-      published: true
-      default_revision: true
-    refused:
-      label: Refused
-      weight: 4
-      published: false
-      default_revision: true
-  transitions:
-    draft:
-      label: 'Save as Draft'
-      from:
-        - draft
-        - on_hold
-        - pending
-      to: draft
-      weight: 0
-    duplicate:
-      label: 'Mark as Duplicate'
-      from:
-        - draft
-        - duplicate
-        - on_hold
-        - pending
-        - published
-        - refused
-      to: duplicate
-      weight: 5
-    expired:
-      label: 'Mark as Expired'
-      from:
-        - published
-      to: expired
-      weight: 6
-    on_hold:
-      label: 'Put on-hold'
-      from:
-        - draft
-        - on_hold
-        - pending
-        - published
-      to: on_hold
-      weight: 3
-    pending:
-      label: 'Save as Pending'
-      from:
-        - draft
-        - on_hold
-        - pending
-      to: pending
-      weight: 2
-    published:
-      label: Publish
-      from:
-        - draft
-        - on_hold
-        - pending
-        - published
-      to: published
-      weight: 1
-    refused:
-      label: Refuse
-      from:
-        - draft
-        - duplicate
-        - on_hold
-        - pending
-        - published
-        - refused
-      to: refused
-      weight: 4
-  entity_types:
-    node:
-      - job
-  default_moderation_state: draft
diff --git a/config/workflows.workflow.report.yml b/config/workflows.workflow.report.yml
deleted file mode 100644
index ba7e5a87c..000000000
--- a/config/workflows.workflow.report.yml
+++ /dev/null
@@ -1,162 +0,0 @@
-uuid: 6e2d898b-dcf2-4e74-970c-32d96b8e1a4d
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.report
-  module:
-    - content_moderation
-id: report
-label: Report
-type: content_moderation
-type_settings:
-  states:
-    archive:
-      label: Archived
-      weight: 6
-      published: false
-      default_revision: true
-    draft:
-      label: Draft
-      weight: 0
-      published: false
-      default_revision: true
-    duplicate:
-      label: Duplicate
-      weight: 4
-      published: false
-      default_revision: true
-    embargoed:
-      label: Embargoed
-      weight: 5
-      published: false
-      default_revision: true
-    on_hold:
-      label: On-hold
-      weight: 2
-      published: false
-      default_revision: true
-    published:
-      label: Published
-      weight: 1
-      published: true
-      default_revision: true
-    reference:
-      label: Reference
-      weight: 7
-      published: false
-      default_revision: true
-    to_review:
-      label: 'To review'
-      weight: 3
-      published: true
-      default_revision: true
-  transitions:
-    archived:
-      label: Archive
-      from:
-        - archive
-        - draft
-        - duplicate
-        - embargoed
-        - on_hold
-        - published
-        - reference
-        - to_review
-      to: archive
-      weight: 2
-    draft:
-      label: 'Save as Draft'
-      from:
-        - archive
-        - draft
-        - duplicate
-        - embargoed
-        - on_hold
-        - published
-        - reference
-        - to_review
-      to: draft
-      weight: -4
-    duplicate:
-      label: 'Mark as duplicate'
-      from:
-        - archive
-        - draft
-        - duplicate
-        - embargoed
-        - on_hold
-        - published
-        - reference
-        - to_review
-      to: duplicate
-      weight: 0
-    embargoed:
-      label: 'Save as Embargoed'
-      from:
-        - archive
-        - draft
-        - duplicate
-        - embargoed
-        - on_hold
-        - published
-        - reference
-        - to_review
-      to: embargoed
-      weight: 1
-    on_hold:
-      label: 'Put on-hold'
-      from:
-        - archive
-        - draft
-        - duplicate
-        - embargoed
-        - on_hold
-        - published
-        - reference
-        - to_review
-      to: on_hold
-      weight: -1
-    published:
-      label: Publish
-      from:
-        - archive
-        - draft
-        - duplicate
-        - embargoed
-        - on_hold
-        - published
-        - reference
-        - to_review
-      to: published
-      weight: -2
-    reference:
-      label: 'Save as reference'
-      from:
-        - archive
-        - draft
-        - duplicate
-        - embargoed
-        - on_hold
-        - published
-        - reference
-        - to_review
-      to: reference
-      weight: 3
-    to_review:
-      label: 'To review'
-      from:
-        - archive
-        - draft
-        - duplicate
-        - embargoed
-        - on_hold
-        - published
-        - reference
-        - to_review
-      to: to_review
-      weight: -3
-  entity_types:
-    node:
-      - report
-  default_moderation_state: draft
diff --git a/config/workflows.workflow.source.yml b/config/workflows.workflow.source.yml
deleted file mode 100644
index 7689b0c5b..000000000
--- a/config/workflows.workflow.source.yml
+++ /dev/null
@@ -1,119 +0,0 @@
-uuid: c4ec4234-f641-4931-9af7-01bbe5c040b2
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.source
-  module:
-    - content_moderation
-id: source
-label: Source
-type: content_moderation
-type_settings:
-  states:
-    active:
-      label: Active
-      weight: 2
-      published: true
-      default_revision: true
-    archive:
-      label: Archive
-      weight: 4
-      published: false
-      default_revision: true
-    blocked:
-      label: Blocked
-      weight: 5
-      published: false
-      default_revision: true
-    draft:
-      label: Draft
-      weight: 0
-      published: false
-      default_revision: true
-    duplicate:
-      label: Duplicate
-      weight: 6
-      published: false
-      default_revision: true
-    inactive:
-      label: Inactive
-      weight: 3
-      published: true
-      default_revision: true
-    published:
-      label: Published
-      weight: 1
-      published: true
-      default_revision: true
-  transitions:
-    active:
-      label: 'Save as Active'
-      from:
-        - active
-        - archive
-        - blocked
-        - draft
-        - duplicate
-        - inactive
-      to: active
-      weight: 1
-    archive:
-      label: Archive
-      from:
-        - active
-        - archive
-        - blocked
-        - draft
-        - duplicate
-        - inactive
-      to: archive
-      weight: 3
-    blocked:
-      label: Block
-      from:
-        - active
-        - archive
-        - blocked
-        - draft
-        - duplicate
-        - inactive
-      to: blocked
-      weight: 4
-    draft:
-      label: 'Save as Draft'
-      from:
-        - active
-        - archive
-        - blocked
-        - draft
-        - duplicate
-        - inactive
-      to: draft
-      weight: 0
-    duplicate:
-      label: 'Mark as Duplicate'
-      from:
-        - active
-        - archive
-        - blocked
-        - draft
-        - duplicate
-        - inactive
-      to: duplicate
-      weight: 5
-    inactive:
-      label: 'Save as Inactive'
-      from:
-        - active
-        - archive
-        - blocked
-        - draft
-        - duplicate
-        - inactive
-      to: inactive
-      weight: 2
-  entity_types:
-    taxonomy_term:
-      - source
-  default_moderation_state: active
diff --git a/config/workflows.workflow.topic.yml b/config/workflows.workflow.topic.yml
deleted file mode 100644
index a7cb01de6..000000000
--- a/config/workflows.workflow.topic.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-uuid: 24124a88-35a9-48d2-b4cf-649fcdfbe23b
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.topic
-  module:
-    - content_moderation
-id: topic
-label: Topic
-type: content_moderation
-type_settings:
-  states:
-    draft:
-      label: Draft
-      weight: 0
-      published: false
-      default_revision: true
-    published:
-      label: Published
-      weight: 1
-      published: true
-      default_revision: true
-  transitions:
-    draft:
-      label: 'Save as Draft'
-      from:
-        - draft
-        - published
-      to: draft
-      weight: 0
-    published:
-      label: Publish
-      from:
-        - draft
-        - published
-      to: published
-      weight: 1
-  entity_types:
-    node:
-      - topic
-  default_moderation_state: draft
diff --git a/config/workflows.workflow.training.yml b/config/workflows.workflow.training.yml
deleted file mode 100644
index c42f39ef0..000000000
--- a/config/workflows.workflow.training.yml
+++ /dev/null
@@ -1,114 +0,0 @@
-uuid: 343312b6-cb79-46c8-b334-807e0c384502
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.training
-  module:
-    - content_moderation
-id: training
-label: Training
-type: content_moderation
-type_settings:
-  states:
-    draft:
-      label: Draft
-      weight: 0
-      published: false
-      default_revision: true
-    duplicate:
-      label: Duplicate
-      weight: 5
-      published: false
-      default_revision: true
-    expired:
-      label: Expired
-      weight: 6
-      published: false
-      default_revision: true
-    on_hold:
-      label: On-hold
-      weight: 3
-      published: false
-      default_revision: true
-    pending:
-      label: Pending
-      weight: 2
-      published: false
-      default_revision: true
-    published:
-      label: Published
-      weight: 1
-      published: true
-      default_revision: true
-    refused:
-      label: Refused
-      weight: 4
-      published: false
-      default_revision: true
-  transitions:
-    draft:
-      label: 'Save as Draft'
-      from:
-        - draft
-        - on_hold
-        - pending
-      to: draft
-      weight: 0
-    duplicate:
-      label: 'Mark as Duplicate'
-      from:
-        - draft
-        - duplicate
-        - on_hold
-        - pending
-        - published
-        - refused
-      to: duplicate
-      weight: 5
-    expired:
-      label: 'Mark as Expired'
-      from:
-        - published
-      to: expired
-      weight: 6
-    on_hold:
-      label: 'Put on-hold'
-      from:
-        - draft
-        - on_hold
-        - pending
-        - published
-      to: on_hold
-      weight: 3
-    pending:
-      label: 'Save as Pending'
-      from:
-        - draft
-        - on_hold
-        - pending
-      to: pending
-      weight: 2
-    published:
-      label: Publish
-      from:
-        - on_hold
-        - pending
-        - published
-      to: published
-      weight: 1
-    refused:
-      label: Refuse
-      from:
-        - draft
-        - duplicate
-        - on_hold
-        - pending
-        - published
-        - refused
-      to: refused
-      weight: 4
-  entity_types:
-    node:
-      - training
-  default_moderation_state: draft
diff --git a/html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php b/html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php
index 9d2f170e0..3660965a0 100644
--- a/html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php
+++ b/html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php
@@ -334,21 +334,14 @@ public function validateSource(array $form, FormStateInterface &$form_state) {
       $id_field = $taxonomy_term_entity_type->getKey('id');
       $label_field = $taxonomy_term_entity_type->getKey('label');
 
-      $query = $this->getDatabase()->select($table, $table);
-      $query->fields($table, [$label_field]);
-      $query->condition($table . '.' . $id_field, $ids, 'IN');
-
-      // Join the moderation status table to check the status.
-      $status_table = $entity_type_manager
-        ->getStorage('content_moderation_state')
-        ->getEntityType()
-        ->getDataTable();
-
-      $status_alias = $query->innerJoin($status_table, $status_table, "%alias.content_entity_id = {$table}.{$id_field}");
-      $query->condition($status_alias . '.content_entity_type_id', 'taxonomy_term', '=');
-      $query->condition($status_alias . '.moderation_state', 'blocked', '=');
-
-      $sources = $query->execute()?->fetchCol() ?? [];
+      // Retrieve the labels of the selected blocked sources if any.
+      $sources = $this->getDatabase()
+        ->select($table, $table)
+        ->fields($table, [$label_field])
+        ->condition($table . '.' . $id_field, $ids, 'IN')
+        ->condition($table . '.moderation_status', 'blocked', '=')
+        ->execute()
+        ?->fetchCol() ?? [];
 
       if (!empty($sources)) {
         $form_state->setErrorByName('field_source', $this->t('Publications from "@sources" are not allowed.', [
diff --git a/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebEntityReferenceSelect.php b/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebEntityReferenceSelect.php
index f657f7307..a9f2aea20 100644
--- a/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebEntityReferenceSelect.php
+++ b/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebEntityReferenceSelect.php
@@ -190,7 +190,7 @@ protected function getExtraDataAllowedFields() {
         foreach ($field_definitions as $field_name => $field_definition) {
           // The moderation state field is a particular case. We can retrieve it
           // easily so we allow it.
-          if (isset($field_storage_definitions[$field_name]) || $field_name === 'moderation_state') {
+          if (isset($field_storage_definitions[$field_name])) {
             $fields[$bundle . ':' . $field_name] = $this->t('@bundle > @field', [
               '@bundle' => $bundle_label,
               '@field' => $field_definition->getLabel(),
@@ -387,7 +387,7 @@ protected function getExtraDataFields() {
   }
 
   /**
-   * Get the extra data to add as optiona attributes.
+   * Get the extra data to add as optional attributes.
    *
    * @param array $extra_data_fields
    *   Entity fields.
@@ -415,33 +415,18 @@ protected function getExtraData(array $extra_data_fields, array $ids, array $lan
         continue;
       }
 
-      // Special handling of the moderation status as it's not an entity field.
-      if ($field_name === 'moderation_state') {
-        $table = $this->getEntityTypeDataTable('content_moderation_state');
-
-        $query = $this->getDatabase()
-          ->select($table, $table)
-          ->condition($table . '.content_entity_type_id', $entity_type_id, '=')
-          ->condition($table . '.content_entity_id', $ids[$bundle], 'IN')
-          ->condition($table . '.langcode', $langcodes, 'IN');
-        $query->addField($table, 'content_entity_id', 'id');
-        $query->addField($table, 'langcode', 'langcode');
-        $query->addField($table, 'moderation_state', 'value');
-      }
-      else {
-        $column = $definition->getFieldStorageDefinition()->getMainPropertyName();
-        $table = $this->getFieldTableName($entity_type_id, $field_name);
-        $field = $this->getFieldColumnName($entity_type_id, $field_name, $column);
-
-        $query = $this->getDatabase()
-          ->select($table, $table)
-          ->condition($table . '.entity_id', $ids[$bundle], 'IN')
-          ->condition($table . '.langcode', $langcodes, 'IN')
-          ->isNotNull($table . '.' . $field);
-        $query->addField($table, 'entity_id', 'id');
-        $query->addField($table, 'langcode', 'langcode');
-        $query->addField($table, $field, 'value');
-      }
+      $column = $definition->getFieldStorageDefinition()->getMainPropertyName();
+      $table = $this->getFieldTableName($entity_type_id, $field_name);
+      $field = $this->getFieldColumnName($entity_type_id, $field_name, $column);
+
+      $query = $this->getDatabase()
+        ->select($table, $table)
+        ->condition($table . '.entity_id', $ids[$bundle], 'IN')
+        ->condition($table . '.langcode', $langcodes, 'IN')
+        ->isNotNull($table . '.' . $field);
+      $query->addField($table, 'entity_id', 'id');
+      $query->addField($table, 'langcode', 'langcode');
+      $query->addField($table, $field, 'value');
 
       foreach ($query->execute() ?? [] as $record) {
         $data[$bundle][$field_name][$record->langcode][$record->id][] = $record->value;
diff --git a/html/modules/custom/reliefweb_moderation/reliefweb_moderation.info.yml b/html/modules/custom/reliefweb_moderation/reliefweb_moderation.info.yml
index afabd7f08..c8ac26a2e 100644
--- a/html/modules/custom/reliefweb_moderation/reliefweb_moderation.info.yml
+++ b/html/modules/custom/reliefweb_moderation/reliefweb_moderation.info.yml
@@ -4,7 +4,6 @@ description: 'Provides content moderation handling.'
 package: reliefweb
 core_version_requirement: ^9
 dependencies:
-  - drupal:content_moderation
   - drupal:user
   - drupal:reliefweb_form
   - drupal:reliefweb_utility
diff --git a/html/modules/custom/reliefweb_moderation/reliefweb_moderation.install b/html/modules/custom/reliefweb_moderation/reliefweb_moderation.install
new file mode 100644
index 000000000..07155105d
--- /dev/null
+++ b/html/modules/custom/reliefweb_moderation/reliefweb_moderation.install
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * @file
+ * Install file for reliefweb_moderation.
+ */
+
+use Drupal\reliefweb_moderation\ModeratedNodeStorageSchema;
+use Drupal\reliefweb_moderation\ModeratedTermStorageSchema;
+
+/**
+ * Implements hook_install().
+ *
+ * @see https://www.drupal.org/node/2554097
+ * @see https://www.drupal.org/project/drupal/issues/2258347
+ */
+function reliefweb_moderation_install() {
+  reliefweb_moderation_add_moderation_status('node', ModeratedNodeStorageSchema::class);
+  reliefweb_moderation_add_moderation_status('taxonomy_term', ModeratedTermStorageSchema::class);
+}
+
+/**
+ * Add a moderation status base field to an entity type.
+ *
+ * @param string $entity_type_id
+ *   Entity type ID.
+ * @param string $storage_schema_class
+ *   Class to use for the entity type storage schema.
+ */
+function reliefweb_moderation_add_moderation_status($entity_type_id, $storage_schema_class) {
+  $logger = \Drupal::logger('reliefweb_moderation');
+  $manager = \Drupal::entityDefinitionUpdateManager();
+  $entity_type = $manager->getEntityType($entity_type_id);
+
+  // Validate what we need to add the moderation status field.
+  if (empty($entity_type)) {
+    $logger->error(strtr('Moderation status: missing entity type @entity_type_id.', [
+      '@entity_type_id' => $entity_type_id,
+    ]));
+    return;
+  }
+  if (!class_exists($storage_schema_class)) {
+    $logger->error(strtr('Moderation status: missing storage schema class @storage_schema_class.', [
+      '@storage_schema_class' => $storage_schema_class,
+    ]));
+    return;
+  }
+
+  $current_storage_schema_class = $entity_type->getHandlerClass('storage_schema');
+  $storage_schema_class_updated = FALSE;
+
+  // If there is no specific storage schema class, assume it's using the base
+  // one.
+  if (empty($current_storage_schema_class)) {
+    $current_storage_schema_class = '\Drupal\Core\Entity\Sql\SqlContentEntityStorageSchema';
+  }
+
+  // Change the storage handler to something that can add the indexes on the
+  // moderation status.
+  //
+  // This is ridiculous but drupal doesn't provide a hook_entity_schema_alter
+  // that could allow us to simply add the indexes.
+  //
+  // @see https://www.drupal.org/project/drupal/issues/2258347
+  if ($current_storage_schema_class === $storage_schema_class) {
+    $logger->notice(strtr('Moderation status: entity type already using the storage schema class @storage_schema_class', [
+      '@storage_schema_class' => $storage_schema_class,
+    ]));
+  }
+  elseif (!is_subclass_of($storage_schema_class, $current_storage_schema_class)) {
+    $logger->error(strtr('Moderation status: storage schema class @storage_schema_class is not a subclass of @current_storage_schema_class', [
+      '@storage_schema_class' => $storage_schema_class,
+      '@current_storage_schema_class' => $current_storage_schema_class,
+    ]));
+    return;
+  }
+  else {
+    $entity_type->setHandlerClass('storage_schema', $storage_schema_class);
+    $manager->updateEntityType($entity_type);
+    $storage_schema_class_updated = TRUE;
+  }
+
+  // Add the moderation status base field.
+  $definition = $manager->getFieldStorageDefinition('moderation_status', $entity_type_id);
+  if (empty($definition)) {
+    $definition = reliefweb_moderation_get_moderation_status_field_definition();
+
+    // Add the moderation status field, this should trigger an update on the
+    // entity type and add the indexes.
+    $manager->installFieldStorageDefinition('moderation_status', $entity_type_id, $entity_type_id, $definition);
+  }
+  // If the storage schema class was updated, we need to trigger a fake field
+  // update so that the indexes are added.
+  //
+  // @see https://www.drupal.org/node/2554245.
+  // @see https://www.drupal.org/project/drupal/issues/3005447
+  elseif ($storage_schema_class_updated) {
+    $manager->updateFieldStorageDefinition($definition);
+  }
+}
diff --git a/html/modules/custom/reliefweb_moderation/reliefweb_moderation.module b/html/modules/custom/reliefweb_moderation/reliefweb_moderation.module
index 282e79ab2..ca953fa55 100644
--- a/html/modules/custom/reliefweb_moderation/reliefweb_moderation.module
+++ b/html/modules/custom/reliefweb_moderation/reliefweb_moderation.module
@@ -7,9 +7,13 @@
 
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\Render\Markup;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\reliefweb_moderation\EntityModeratedInterface;
+use Drupal\reliefweb_moderation\ModeratedNodeStorageSchema;
+use Drupal\reliefweb_moderation\ModeratedTermStorageSchema;
 use Drupal\reliefweb_moderation\ModerationServiceBase;
 
 /**
@@ -78,13 +82,53 @@ function reliefweb_moderation_theme() {
   return $themes;
 }
 
+/**
+ * Implements hook_entity_base_field_info().
+ */
+function reliefweb_moderation_entity_base_field_info(EntityTypeInterface $entity_type) {
+  $fields = [];
+  if ($entity_type->id() === 'node' || $entity_type->id() === 'taxonomy_term') {
+    $fields['moderation_status'] = reliefweb_moderation_get_moderation_status_field_definition();
+  }
+  return $fields;
+}
+
+/**
+ * Implements hook_entity_type_alter().
+ */
+function reliefweb_moderation_entity_type_alter(array &$entity_types) {
+  if (isset($entity_types['node'])) {
+    $entity_types['node']->setHandlerClass('storage_schema', ModeratedNodeStorageSchema::class);
+  }
+  if (isset($entity_types['taxonomy_term'])) {
+    $entity_types['taxonomy_term']->setHandlerClass('storage_schema', ModeratedTermStorageSchema::class);
+  }
+}
+
+/**
+ * Get the moderation status field definition.
+ *
+ * @return \Drupal\Core\Field\BaseFieldDefinition
+ *   Field definition.
+ */
+function reliefweb_moderation_get_moderation_status_field_definition() {
+  return BaseFieldDefinition::create('string')
+    ->setLabel(t('Moderation Status'))
+    ->setSetting('max_length', 32)
+    ->setRevisionable(TRUE)
+    ->setTranslatable(TRUE)
+    ->setDefaultValue('');
+}
+
 /**
  * Implements hook_entity_access().
  */
 function reliefweb_moderation_entity_access(EntityInterface $entity, $operation, AccountInterface $account) {
-  $service = ModerationServiceBase::getModerationService($entity->bundle());
-  if (!empty($service)) {
-    return $service->entityAccess($entity, $operation, $account);
+  if ($entity instanceof EntityModeratedInterface) {
+    $service = ModerationServiceBase::getModerationService($entity->bundle());
+    if (!empty($service)) {
+      return $service->entityAccess($entity, $operation, $account);
+    }
   }
   // No opinion.
   return AccessResult::neutral();
@@ -94,9 +138,11 @@ function reliefweb_moderation_entity_access(EntityInterface $entity, $operation,
  * Implements hook_entity_presave().
  */
 function reliefweb_moderation_entity_presave(EntityInterface $entity) {
-  $service = ModerationServiceBase::getModerationService($entity->bundle());
-  if (!empty($service)) {
-    $service->entityPresave($entity);
+  if ($entity instanceof EntityModeratedInterface) {
+    $service = ModerationServiceBase::getModerationService($entity->bundle());
+    if (!empty($service)) {
+      $service->entityPresave($entity);
+    }
   }
 }
 
diff --git a/html/modules/custom/reliefweb_moderation/reliefweb_moderation.routing.yml b/html/modules/custom/reliefweb_moderation/reliefweb_moderation.routing.yml
index 580df6b51..818c6ed5b 100644
--- a/html/modules/custom/reliefweb_moderation/reliefweb_moderation.routing.yml
+++ b/html/modules/custom/reliefweb_moderation/reliefweb_moderation.routing.yml
@@ -11,7 +11,7 @@ reliefweb_moderation.content:
         type: reliefweb_moderation_service
   requirements:
     _user_is_logged_in: 'TRUE'
-    _permission: access content moderation backend
+    _custom_access: '\Drupal\reliefweb_moderation\Controller\ModerationPage::checkAccess'
     service: "[a-z0-9_]+"
 
 reliefweb_moderation.content.autocomplete:
@@ -27,6 +27,6 @@ reliefweb_moderation.content.autocomplete:
         type: reliefweb_moderation_service
   requirements:
     _user_is_logged_in: 'TRUE'
-    _permission: access content moderation backend
+    _custom_access: '\Drupal\reliefweb_moderation\Controller\ModerationPage::checkAccess'
     service: "[a-z0-9_]+"
     filter: "[a-z0-9_]+"
diff --git a/html/modules/custom/reliefweb_moderation/src/Controller/ModerationPage.php b/html/modules/custom/reliefweb_moderation/src/Controller/ModerationPage.php
index 6d95508a6..6cedf5331 100644
--- a/html/modules/custom/reliefweb_moderation/src/Controller/ModerationPage.php
+++ b/html/modules/custom/reliefweb_moderation/src/Controller/ModerationPage.php
@@ -5,6 +5,7 @@
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Form\FormBuilderInterface;
 use Drupal\Core\Form\FormState;
+use Drupal\Core\Session\AccountInterface;
 use Drupal\reliefweb_moderation\ModerationServiceInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -132,4 +133,19 @@ public function autocomplete(ModerationServiceInterface $service, $filter) {
     return new JsonResponse($suggestions);
   }
 
+  /**
+   * Check the access to the page.
+   *
+   * @param \Drupal\Core\Session\AccountInterface $account
+   *   User account to check access for.
+   * @param \Drupal\reliefweb_moderation\ModerationServiceInterface $service
+   *   Moderation service.
+   *
+   * @return \Drupal\Core\Access\AccessResultInterface
+   *   The access result.
+   */
+  public function checkAccess(AccountInterface $account, ModerationServiceInterface $service) {
+    return $service->checkModerationPageAccess($account);
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_moderation/src/EntityModeratedInterface.php b/html/modules/custom/reliefweb_moderation/src/EntityModeratedInterface.php
index 96b392b79..5530fb729 100644
--- a/html/modules/custom/reliefweb_moderation/src/EntityModeratedInterface.php
+++ b/html/modules/custom/reliefweb_moderation/src/EntityModeratedInterface.php
@@ -31,6 +31,22 @@ public function getModerationStatus();
    */
   public function getModerationStatusLabel();
 
+  /**
+   * Get the list of allowed statuses for the enitity.
+   *
+   * @return array
+   *   List of moderation statuses keyed by status and with labels as values.
+   */
+  public function getAllowedModerationStatuses();
+
+  /**
+   * Get the moderation service for the entity.
+   *
+   * @return \Drupal\reliefweb_moderation\Services\ModerationServiceInterface|null
+   *   The moderation service for the entity.
+   */
+  public function getModerationService();
+
   /**
    * Get the original revision log message.
    *
diff --git a/html/modules/custom/reliefweb_moderation/src/EntityModeratedTrait.php b/html/modules/custom/reliefweb_moderation/src/EntityModeratedTrait.php
index 70830d9dd..5ae1c29b8 100644
--- a/html/modules/custom/reliefweb_moderation/src/EntityModeratedTrait.php
+++ b/html/modules/custom/reliefweb_moderation/src/EntityModeratedTrait.php
@@ -10,15 +10,31 @@
  */
 trait EntityModeratedTrait {
 
+  /**
+   * Allowed moderation statuses.
+   *
+   * @var array
+   */
+  protected $allowedModerationStatuses;
+
+  /**
+   * The moderation service for the entity.
+   *
+   * @var \Drupal\reliefweb_moderation\Services\ModerationService\Interface
+   */
+  protected $moderationService;
+
   /**
    * Set the moderation status.
    *
    * @see \Drupal\reliefweb_moderation\EntityModeratedInterface::setModerationStatus()
    */
   public function setModerationStatus($status) {
-    if ($this->hasField('moderation_state')) {
-      $this->set('moderation_state', $status, FALSE);
+    $statuses = $this->getAllowedModerationStatuses();
+    if (!isset($statuses[$status])) {
+      throw new \InvalidArgumentException('Status ' . $status . 'is not allowed.');
     }
+    $this->moderation_status->value = $status;
   }
 
   /**
@@ -27,37 +43,49 @@ public function setModerationStatus($status) {
    * @see \Drupal\reliefweb_moderation\EntityModeratedInterface::getModerationStatus()
    */
   public function getModerationStatus() {
-    if ($this->hasField('moderation_state')) {
-      return $this->get('moderation_state')->getString();
-    }
-    return $this->isPublished() ? 'published' : 'unpublished';
+    return $this->moderation_status->value ?? '';
   }
 
   /**
    * Get the moderation status label.
    *
    * @see \Drupal\reliefweb_moderation\EntityModeratedInterface::getModerationStatusLabel()
-   *
-   * @todo review that because this doesn't allow for translation of the status.
    */
   public function getModerationStatusLabel() {
-    if ($this->hasField('moderation_state')) {
-      $status = $this->get('moderation_state')->getString();
+    return $this->getAllowedModerationStatuses()[$this->getModerationStatus()];
+  }
 
-      // The status label is part of the workflow configuration.
-      $config = \Drupal::config('workflows.workflow.' . $this->bundle());
-      if (!empty($config)) {
-        $label = $config->get('type_settings.states.' . $status . '.label');
+  /**
+   * Get the list of allowed statuses for the enitity.
+   *
+   * @see \Drupal\reliefweb_moderation\EntityModeratedInterface::getAllowedModerationStatuses()
+   */
+  public function getAllowedModerationStatuses() {
+    if (!isset($this->allowedModerationStatuses)) {
+      $service = $this->getModerationService();
+      if (isset($service)) {
+        $this->allowedModerationStatuses = $service->getStatuses();
       }
-
-      // If we couldn't find the label, use the moderation status itself.
-      if (empty($label)) {
-        $label = ucfirst(str_replace('_', ' ', $status));
+      else {
+        $this->allowedModerationStatuses = [
+          'draft' => $this->t('Draft'),
+          'published' => $this->t('Published'),
+        ];
       }
+    }
+    return $this->allowedModerationStatuses;
+  }
 
-      return $label;
+  /**
+   * Get the moderation service for the entity.
+   *
+   * @see \Drupal\reliefweb_moderation\EntityModeratedInterface::getModerationService()
+   */
+  public function getModerationService() {
+    if (!isset($this->moderationService)) {
+      $this->moderationService = ModerationServiceBase::getModerationService($this->bundle());
     }
-    return '';
+    return $this->moderationService;
   }
 
   /**
diff --git a/html/modules/custom/reliefweb_moderation/src/Form/ModerationPageFilterForm.php b/html/modules/custom/reliefweb_moderation/src/Form/ModerationPageFilterForm.php
index 8eba9fc9d..34b1f0b45 100644
--- a/html/modules/custom/reliefweb_moderation/src/Form/ModerationPageFilterForm.php
+++ b/html/modules/custom/reliefweb_moderation/src/Form/ModerationPageFilterForm.php
@@ -5,7 +5,6 @@
 use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
 use Drupal\reliefweb_moderation\ModerationServiceInterface;
 
 /**
@@ -238,22 +237,12 @@ public function buildForm(array $form, FormStateInterface $form_state, Moderatio
     $bundle = $service->getBundle();
 
     if (!empty($bundle) && is_string($bundle)) {
-      $url_options = ['attributes' => ['target' => '_blank']];
-      if ($service->getEntityTypeId() === 'taxonomy_term') {
-        $create_url = Url::fromRoute('entity.taxonomy_term.add_form', [
-          'taxonomy_vocabulary' => $bundle,
-        ], $url_options);
-      }
-      else {
-        $create_url = Url::fromRoute('node.add', [
-          'node_type' => $bundle,
-        ], $url_options);
-      }
-
       $form['actions']['create'] = [
         '#type' => 'link',
-        '#url' => $create_url,
-        '#title' => $this->t('Create @bundle', ['@bundle' => $bundle]),
+        '#url' => $service->getBundleCreationUrl($bundle),
+        '#title' => $this->t('Create @bundle', [
+          '@bundle' => static::getBundleLabel($service->getEntityTypeId(), $bundle),
+        ]),
       ];
     }
 
@@ -306,4 +295,20 @@ protected function getAutocompleteUrl(FormStateInterface $form_state, Moderation
     return '/moderation/content/' . $bundle . '/autocomplete/';
   }
 
+  /**
+   * Get a bundle's label.
+   *
+   * @param string $entity_type_id
+   *   Entity type ID.
+   * @param string $bundle
+   *   Entity bundle.
+   *
+   * @return string
+   *   Bundle label.
+   */
+  public static function getBundleLabel($entity_type_id, $bundle) {
+    $bundle_info = \Drupal::service('entity_type.bundle.info')->getBundleInfo($entity_type_id);
+    return $bundle_info[$bundle]['label'] ?? $bundle;
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_moderation/src/ModeratedNodeStorageSchema.php b/html/modules/custom/reliefweb_moderation/src/ModeratedNodeStorageSchema.php
new file mode 100644
index 000000000..5b62081b5
--- /dev/null
+++ b/html/modules/custom/reliefweb_moderation/src/ModeratedNodeStorageSchema.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Drupal\reliefweb_moderation;
+
+use Drupal\Core\Entity\ContentEntityTypeInterface;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\node\NodeStorageSchema;
+
+/**
+ * Defines the node schema handler.
+ */
+class ModeratedNodeStorageSchema extends NodeStorageSchema {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEntitySchema(ContentEntityTypeInterface $entity_type, $reset = FALSE) {
+    $schema = parent::getEntitySchema($entity_type, $reset);
+
+    $tables = [
+      $this->storage->getDataTable(),
+      $this->storage->getRevisionTable(),
+    ];
+
+    foreach ($tables as $table) {
+      if (!empty($table)) {
+        $fields = $schema[$table]['fields'] ?? [];
+        if (isset($fields['type'], $fields['moderation_status'])) {
+          $schema[$table]['indexes'] += [
+            'node__bundle_moderation_status' => [
+              'type',
+              'moderation_status',
+            ],
+          ];
+        }
+      }
+    }
+
+    return $schema;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getSharedTableFieldSchema(FieldStorageDefinitionInterface $storage_definition, $table_name, array $column_mapping) {
+    $schema = parent::getSharedTableFieldSchema($storage_definition, $table_name, $column_mapping);
+    $field_name = $storage_definition->getName();
+
+    switch ($field_name) {
+      case 'moderation_status':
+        $schema['fields']['moderation_status']['type'] = 'varchar_ascii';
+        $schema['fields']['moderation_status']['not null'] = 'TRUE';
+        $schema['fields']['moderation_status']['default'] = '';
+        $this->addSharedTableFieldIndex($storage_definition, $schema, TRUE);
+        break;
+    }
+
+    return $schema;
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_moderation/src/ModeratedTermStorageSchema.php b/html/modules/custom/reliefweb_moderation/src/ModeratedTermStorageSchema.php
new file mode 100644
index 000000000..7e46b7f93
--- /dev/null
+++ b/html/modules/custom/reliefweb_moderation/src/ModeratedTermStorageSchema.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Drupal\reliefweb_moderation;
+
+use Drupal\Core\Entity\ContentEntityTypeInterface;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\taxonomy\TermStorageSchema;
+
+/**
+ * Defines the taxonomy term schema handler.
+ */
+class ModeratedTermStorageSchema extends TermStorageSchema {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEntitySchema(ContentEntityTypeInterface $entity_type, $reset = FALSE) {
+    $schema = parent::getEntitySchema($entity_type, $reset);
+
+    $tables = [
+      $this->storage->getDataTable(),
+      $this->storage->getRevisionTable(),
+    ];
+
+    foreach ($tables as $table) {
+      if (!empty($table)) {
+        $fields = $schema[$table]['fields'] ?? [];
+        if (isset($fields['vid'], $fields['moderation_status'])) {
+          $schema[$table]['indexes'] += [
+            'taxonomy_term__bundle_moderation_status' => [
+              'vid',
+              'moderation_status',
+            ],
+          ];
+        }
+      }
+    }
+
+    return $schema;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getSharedTableFieldSchema(FieldStorageDefinitionInterface $storage_definition, $table_name, array $column_mapping) {
+    $schema = parent::getSharedTableFieldSchema($storage_definition, $table_name, $column_mapping);
+    $field_name = $storage_definition->getName();
+
+    switch ($field_name) {
+      case 'moderation_status':
+        $schema['fields']['moderation_status']['type'] = 'varchar_ascii';
+        $schema['fields']['moderation_status']['not null'] = 'TRUE';
+        $schema['fields']['moderation_status']['default'] = '';
+        $this->addSharedTableFieldIndex($storage_definition, $schema, TRUE);
+        break;
+    }
+
+    return $schema;
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
index 032d4d5fe..cda0ae97c 100644
--- a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
+++ b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
@@ -249,8 +249,6 @@ public function entityPresave(EntityModeratedInterface $entity) {
     }
 
     // Mark as published if the status is viewable by everybody.
-    // @todo check if the status is properly set by the content_moderation
-    // module in which case that may be unnecessary.
     if ($entity instanceof EntityPublishedInterface) {
       if ($this->isViewableStatus($status, new AnonymousUserSession())) {
         $entity->setPublished();
@@ -372,7 +370,6 @@ public function alterEntityForm(array &$form, FormStateInterface $form_state) {
     $status = $entity->getModerationStatus();
 
     // Disable the moderation status widget and the default submit buttons.
-    $form['moderation_state']['#access'] = FALSE;
     $form['actions']['submit']['#access'] = FALSE;
 
     // Move the preview button at the beginning if it exists.
@@ -415,7 +412,7 @@ public function alterEntityForm(array &$form, FormStateInterface $form_state) {
   public function validateEntityStatus(array $element, FormStateInterface $form_state) {
     $triggering_element = $form_state->getTriggeringElement();
     if (isset($triggering_element['#entity_status']) && $triggering_element['#entity_status'] === $element['#entity_status']) {
-      $form_state->setValue(['moderation_state', 0, 'value'], $element['#entity_status']);
+      $form_state->setValue(['moderation_status', 0, 'value'], $element['#entity_status']);
     }
   }
 
@@ -425,9 +422,9 @@ public function validateEntityStatus(array $element, FormStateInterface $form_st
   public function handleEntitySubmission(array $form, FormStateInterface $form_state) {
     // Alter the status based on the rest of the submitted form.
     // @todo review if that should not be done in the entity presave instead.
-    $status = $form_state->getValue(['moderation_state', 0, 'value']);
+    $status = $form_state->getValue(['moderation_status', 0, 'value']);
     $status = $this->alterSubmittedEntityStatus($status, $form_state);
-    $form_state->setValue(['moderation_state', 0, 'value'], $status);
+    $form_state->setValue(['moderation_status', 0, 'value'], $status);
   }
 
   /**
@@ -1102,14 +1099,10 @@ protected function executeQuery(array $filters, $limit = 30) {
     $entity_id_field = $this->getEntityTypeIdField($entity_type_id);
     $entity_bundle_field = $this->getEntityTypeBundleField($entity_type_id);
 
-    // Base table. We use the content moderation state data table so we
-    // can easily give hints on the status to improve performances.
-    $base_table = $this->getEntityTypeDataTable('content_moderation_state');
-
     // Main query.
-    $query = $this->getDatabase()->select($base_table, 'cms')
-      ->fields('cms', ['moderation_state', 'content_entity_id'])
-      ->condition('cms.content_entity_type_id', $entity_type_id, '=');
+    $query = $this->getDatabase()
+      ->select($entity_table, $entity_table)
+      ->fields($entity_table, ['moderation_status', $entity_id_field]);
 
     // We use MySQL variables to store the count of entities per status.
     // This is much faster than executing several count queries with the same
@@ -1117,7 +1110,7 @@ protected function executeQuery(array $filters, $limit = 30) {
     $variables = [];
     foreach (array_keys($this->getStatuses()) as $status) {
       // Statuses are machine names so it's safe to use them directly.
-      $variables['@' . $status] = $status;
+      $variables['@' . strtr($status, '-', '_')] = $status;
     }
 
     // Prepare the case expression to increment the variables.
@@ -1127,18 +1120,15 @@ protected function executeQuery(array $filters, $limit = 30) {
     }
 
     // Add the expression to increment the counters.
-    $query->addExpression("CASE cms.moderation_state {$cases} END");
-
-    // Join the entity data table.
-    $entity_table_alias = $query->innerJoin($entity_table, $entity_table, "%alias.{$entity_id_field} = cms.content_entity_id");
+    $query->addExpression("CASE {$entity_table}.moderation_status {$cases} END");
 
     // Filter for the service entity bundle.
     if (!empty($bundle)) {
       if (is_array($bundle)) {
-        $query->condition($entity_table_alias . '.' . $entity_bundle_field, $bundle, 'IN');
+        $query->condition($entity_table . '.' . $entity_bundle_field, $bundle, 'IN');
       }
       else {
-        $query->condition($entity_table_alias . '.' . $entity_bundle_field, $bundle, '=');
+        $query->condition($entity_table . '.' . $entity_bundle_field, $bundle, '=');
       }
     }
 
@@ -1296,8 +1286,9 @@ protected function getQueryOrderInformation() {
    */
   protected function wrapQuery(Select $query, $limit = 30) {
     $order = $this->getQueryOrderInformation();
-    $base_table_alias = $this->getQueryBaseTableAlias($query);
     $entity_type_id = $this->getEntityTypeId();
+    $entity_table = $this->getEntityTypeDataTable($entity_type_id);
+    $entity_id_field = $this->getEntityTypeIdField($entity_type_id);
 
     // Join the sort field/property table if necessary.
     if (isset($order['type'], $order['table'], $order['field'])) {
@@ -1308,12 +1299,7 @@ protected function wrapQuery(Select $query, $limit = 30) {
       // Check the order type to determine the join condition.
       switch ($order['type']) {
         case 'field':
-          $join_condition = "%alias.entity_id = {$base_table_alias}.content_entity_id";
-          break;
-
-        case 'property':
-          $entity_id_field = $this->getEntityTypeIdField($entity_type_id);
-          $join_condition = "%alias.{$entity_id_field} = {$base_table_alias}.content_entity_id";
+          $join_condition = "%alias.entity_id = {$entity_table}.{$entity_id_field}";
           break;
       }
 
@@ -1333,14 +1319,14 @@ protected function wrapQuery(Select $query, $limit = 30) {
         }
       }
       else {
-        $sort_table_alias = $base_table_alias;
+        $sort_table_alias = $entity_table;
       }
     }
     // Otherwise sort on the entity id.
     else {
-      $sort_field = 'content_entity_id';
+      $sort_field = $entity_id_field;
       $sort_direction = 'desc';
-      $sort_table_alias = $base_table_alias;
+      $sort_table_alias = $entity_table;
     }
 
     // Check the field/property to sort on is already present.
@@ -1359,7 +1345,7 @@ protected function wrapQuery(Select $query, $limit = 30) {
 
     // Wrap the query.
     $wrapper = $this->getDatabase()->select($query, 'subquery');
-    $wrapper->addField('subquery', 'content_entity_id', 'entity_id');
+    $wrapper->addField('subquery', $entity_id_field, 'entity_id');
     $wrapper->addField('subquery', $sort_field_alias, 'sort');
 
     // Keep track of the subquery.
@@ -1380,8 +1366,7 @@ protected function wrapQuery(Select $query, $limit = 30) {
    * Add the filters to the query.
    *
    * @param \Drupal\Core\Database\Query\Select $query
-   *   Main database query. It's a select query against the
-   *   `content_moderation_state` table.
+   *   Main database query. It's a select query against the entity data table.
    * @param array $filters
    *   Filters from which to add conditions to the query.
    */
@@ -1401,9 +1386,6 @@ protected function filterQuery(Select $query, array $filters = []) {
     $entity_base_table = $this->getEntityTypeDataTable($entity_type_id);
     $entity_id_field = $this->getEntityTypeIdField($entity_type_id);
 
-    // The base table alias for the query is the content moderation table.
-    $base_table_alias = $this->getQueryBaseTableAlias($query);
-
     // Available widgets for the filter form.
     $widgets = [
       'autocomplete',
@@ -1432,7 +1414,7 @@ protected function filterQuery(Select $query, array $filters = []) {
         if (count($values) > 0) {
           // Special case for the status filter which is against the base table.
           if ($name === 'status') {
-            $query->condition($base_table_alias . '.moderation_state', $values, 'IN');
+            $query->condition($entity_base_table . '.moderation_status', $values, 'IN');
             continue;
           }
           // Other filters.
@@ -2039,7 +2021,7 @@ protected function getUserAutocompleteSuggestions($filter, $term, $conditions, a
     $revision_user_field = $this->getEntityTypeRevisionUserField($entity_type_id);
     $revision_alias = $query->innerJoin($revision_table, $revision_table, "%alias.{$revision_user_field} = {$alias}.{$id_field}");
 
-    $entity_table = $this->getEntityTypeBaseTable($entity_type_id);
+    $entity_table = $this->getEntityTypeDataTable($entity_type_id);
     $entity_bundle_field = $this->getEntityTypeBundleField($entity_type_id);
     $entity_alias = $query->innerJoin($entity_table, $entity_table, "%alias.{$revision_id_field} = {$revision_alias}.{$revision_id_field}");
     $query->condition($entity_alias . '.' . $entity_bundle_field, $bundle, '=');
@@ -2113,7 +2095,7 @@ public function getUserRoleAutocompleteSuggestions($filter, $term, $conditions,
   public function getGlideAutocompleteSuggestions($filter, $term, $conditions, array $replacements) {
     $bundle = $this->getBundle();
     $entity_type_id = $this->getEntityTypeId();
-    $entity_table = $this->getEntityTypeBaseTable('taxonomy_term');
+    $entity_table = $this->getEntityTypeDataTable('taxonomy_term');
     $entity_id_field = $this->getEntityTypeIdField('taxonomy_term');
     $entity_bundle_field = $this->getEntityTypeBundleField('taxonomy_term');
     $join_condition = "%alias.entity_id = {$entity_table}.{$entity_id_field}";
@@ -2462,4 +2444,39 @@ protected function getCurrentRequest() {
     return $this->requestStack->getCurrentRequest();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function checkModerationPageAccess(AccountInterface $account) {
+    return AccessResult::allowedIfHasPermission($account, 'access content moderation backend');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getBundleCreationUrl($bundle) {
+    $url_options = ['attributes' => ['target' => '_blank']];
+
+    // Nodes are special case not respecting the classic pattern.
+    if ($this->getEntityTypeId() === 'node') {
+      return Url::fromRoute('node.add', [
+        'node_type' => $bundle,
+      ], $url_options);
+    }
+    else {
+      $entity_type_id = $this->getEntityTypeId();
+
+      $bundle_entity_type_id = $this->entityTypeManager
+        ->getDefinition($entity_type_id)
+        ->getBundleEntityType();
+
+      if (!empty($bundle_entity_type_id)) {
+        return Url::fromRoute('entity.' . $entity_type_id . '.add_form', [
+          $bundle_entity_type_id => $bundle,
+        ], $url_options);
+      }
+    }
+    return NULL;
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_moderation/src/ModerationServiceInterface.php b/html/modules/custom/reliefweb_moderation/src/ModerationServiceInterface.php
index 954543648..d1facd02d 100644
--- a/html/modules/custom/reliefweb_moderation/src/ModerationServiceInterface.php
+++ b/html/modules/custom/reliefweb_moderation/src/ModerationServiceInterface.php
@@ -271,4 +271,26 @@ public function getAutocompleteSuggestions($filter);
    */
   public static function getModerationService($bundle);
 
+  /**
+   * Check access to the moderation pages.
+   *
+   * @param \Drupal\Core\Session\AccountInterface $account
+   *   The user accessing the page.
+   *
+   * @return \Drupal\Core\Access\AccessResultInterface
+   *   Access result.
+   */
+  public function checkModerationPageAccess(AccountInterface $account);
+
+  /**
+   * Get the entity creation URL for the bundle.
+   *
+   * @param string $bundle
+   *   The entity bundle for which to get the creation URL.
+   *
+   * @return \Drupal\Core\Url|null
+   *   URL to create an entity of the service's bundle.
+   */
+  public function getBundleCreationUrl($bundle);
+
 }
diff --git a/html/modules/custom/reliefweb_moderation/src/Services/DisasterModeration.php b/html/modules/custom/reliefweb_moderation/src/Services/DisasterModeration.php
index 271851752..1fde55037 100644
--- a/html/modules/custom/reliefweb_moderation/src/Services/DisasterModeration.php
+++ b/html/modules/custom/reliefweb_moderation/src/Services/DisasterModeration.php
@@ -131,10 +131,10 @@ public function getStatuses() {
       'alert' => $this->t('Alert'),
       'ongoing' => $this->t('Ongoing'),
       'past' => $this->t('Past Disaster'),
-      'draft_archive' => $this->t('Draft Archive'),
-      'alert_archive' => $this->t('Alert Archive'),
+      'draft-archive' => $this->t('Draft Archive'),
+      'alert-archive' => $this->t('Alert Archive'),
       'external' => $this->t('External'),
-      'external_archive' => $this->t('External Archive'),
+      'external-archive' => $this->t('External Archive'),
     ];
   }
 
@@ -146,7 +146,7 @@ public function getFilterStatuses() {
     // @todo replace with permission.
     if (!UserHelper::userHasRoles(['external_disaster_manager'])) {
       unset($statuses['external']);
-      unset($statuses['external_archive']);
+      unset($statuses['external-archive']);
     }
     return $statuses;
   }
@@ -209,18 +209,18 @@ public function alterSubmittedEntityStatus($status, FormStateInterface $form_sta
 
       switch ($current_status) {
         case 'draft':
-        case 'draft_archive':
-          $status = 'draft_archive';
+        case 'draft-archive':
+          $status = 'draft-archive';
           break;
 
         case 'alert':
-        case 'alert_archive':
-          $status = 'alert_archive';
+        case 'alert-archive':
+          $status = 'alert-archive';
           break;
 
         case 'external':
-        case 'external_archive':
-          $status = 'external_archive';
+        case 'external-archive':
+          $status = 'external-archive';
           break;
 
         case 'current':
@@ -231,7 +231,7 @@ public function alterSubmittedEntityStatus($status, FormStateInterface $form_sta
 
         // Compatibility with previous archive status.
         default:
-          $status = 'alert_archive';
+          $status = 'alert-archive';
       }
     }
     return $status;
@@ -243,7 +243,7 @@ public function alterSubmittedEntityStatus($status, FormStateInterface $form_sta
   public function isViewableStatus($status, ?AccountInterface $account = NULL) {
     $account = $account ?: $this->currentUser;
     // External disasters are only viewable by "External disaster managers".
-    if ($status === 'external' || $status === 'external_archive') {
+    if ($status === 'external' || $status === 'external-archive') {
       return UserHelper::userHasRoles(['external_disaster_manager'], $account);
     }
     // Editors can view any disaster.
@@ -266,7 +266,7 @@ public function isEditableStatus($status, ?AccountInterface $account = NULL) {
       return FALSE;
     }
     // External disasters are only editable by "External disaster managers".
-    if ($status === 'external' || $status === 'external_archive') {
+    if ($status === 'external' || $status === 'external-archive') {
       return UserHelper::userHasRoles(['external_disaster_manager'], $account);
     }
     // Only Editors are allowed to edit disasters.
diff --git a/html/modules/custom/reliefweb_moderation/src/Services/JobModeration.php b/html/modules/custom/reliefweb_moderation/src/Services/JobModeration.php
index 54760f103..4a4fed21e 100644
--- a/html/modules/custom/reliefweb_moderation/src/Services/JobModeration.php
+++ b/html/modules/custom/reliefweb_moderation/src/Services/JobModeration.php
@@ -146,7 +146,7 @@ public function getStatuses() {
       'draft' => $this->t('Draft'),
       'pending' => $this->t('Pending'),
       'published' => $this->t('Published'),
-      'on_hold' => $this->t('On-hold'),
+      'on-hold' => $this->t('On-hold'),
       'refused' => $this->t('Refused'),
       'duplicate' => $this->t('Duplicate'),
       'expired' => $this->t('Expired'),
@@ -160,7 +160,7 @@ public function isEditableStatus($status, ?AccountInterface $account = NULL) {
     return in_array($status, [
       'draft',
       'pending',
-      'on_hold',
+      'on-hold',
       'published',
       'expired',
     ]);
@@ -198,7 +198,7 @@ public function entityAccess(EntityModeratedInterface $entity, $operation = 'vie
     // Allow deletion of draft, pending and on-hold only or of any documents
     // for editors.
     if ($operation === 'delete') {
-      $statuses = ['draft', 'pending', 'on_hold'];
+      $statuses = ['draft', 'pending', 'on-hold'];
       $access = $account->hasPermission('bypass node access') ||
                 $account->hasPermission('administer nodes') ||
                 ($access && in_array($entity->getModerationStatus(), $statuses));
@@ -215,7 +215,7 @@ public function getEntityFormSubmitButtons($status, EntityModeratedInterface $en
     $new = empty($status) || $status === 'draft' || $entity->isNew();
 
     // Only show save as draft for non-published but editable documents.
-    if ($new || in_array($status, ['draft', 'pending', 'on_hold'])) {
+    if ($new || in_array($status, ['draft', 'pending', 'on-hold'])) {
       $buttons['draft'] = [
         '#value' => $this->t('Save as draft'),
       ];
@@ -227,7 +227,7 @@ public function getEntityFormSubmitButtons($status, EntityModeratedInterface $en
       $buttons['published'] = [
         '#value' => $this->t('Publish'),
       ];
-      $buttons['on_hold'] = [
+      $buttons['on-hold'] = [
         '#value' => $this->t('On hold'),
       ];
       $buttons['duplicate'] = [
diff --git a/html/modules/custom/reliefweb_moderation/src/Services/ReportModeration.php b/html/modules/custom/reliefweb_moderation/src/Services/ReportModeration.php
index 30652e3c5..9a94f81e2 100644
--- a/html/modules/custom/reliefweb_moderation/src/Services/ReportModeration.php
+++ b/html/modules/custom/reliefweb_moderation/src/Services/ReportModeration.php
@@ -199,8 +199,8 @@ public function getRows(array $results) {
   public function getStatuses() {
     return [
       'draft' => $this->t('Draft'),
-      'on_hold' => $this->t('On-hold'),
-      'to_review' => $this->t('To review'),
+      'on-hold' => $this->t('On-hold'),
+      'to-review' => $this->t('To review'),
       'published' => $this->t('Published'),
       'embargoed' => $this->t('Embargoed'),
       'archive' => $this->t('Archived'),
@@ -216,13 +216,13 @@ public function getEntityFormSubmitButtons($status, EntityModeratedInterface $en
       'draft' => [
         '#value' => $this->t('Save as draft'),
       ],
-      'to_review' => [
+      'to-review' => [
         '#value' => $this->t('To review'),
       ],
       'published' => [
         '#value' => $this->t('Publish'),
       ],
-      'on_hold' => [
+      'on-hold' => [
         '#value' => $this->t('On-hold'),
       ],
       'reference' => [
@@ -244,7 +244,7 @@ public function getEntityFormSubmitButtons($status, EntityModeratedInterface $en
    * {@inheritdoc}
    */
   public function isViewableStatus($status, $account = NULL) {
-    return in_array($status, ['to_review', 'published']);
+    return in_array($status, ['to-review', 'published']);
   }
 
   /**
diff --git a/html/modules/custom/reliefweb_moderation/src/Services/TrainingModeration.php b/html/modules/custom/reliefweb_moderation/src/Services/TrainingModeration.php
index 150f57aa0..b1c1ba0ec 100644
--- a/html/modules/custom/reliefweb_moderation/src/Services/TrainingModeration.php
+++ b/html/modules/custom/reliefweb_moderation/src/Services/TrainingModeration.php
@@ -172,7 +172,7 @@ public function getStatuses() {
       'draft' => $this->t('Draft'),
       'pending' => $this->t('Pending'),
       'published' => $this->t('Published'),
-      'on_hold' => $this->t('On-hold'),
+      'on-hold' => $this->t('On-hold'),
       'refused' => $this->t('Refused'),
       'duplicate' => $this->t('Duplicate'),
       'expired' => $this->t('Expired'),
@@ -186,7 +186,7 @@ public function isEditableStatus($status, ?AccountInterface $account = NULL) {
     return in_array($status, [
       'draft',
       'pending',
-      'on_hold',
+      'on-hold',
       'published',
     ]);
   }
@@ -223,7 +223,7 @@ public function entityAccess(EntityModeratedInterface $entity, $operation = 'vie
     // Allow deletion of draft, pending and on-hold only or of any documents
     // for editors.
     if ($operation === 'delete') {
-      $statuses = ['draft', 'pending', 'on_hold'];
+      $statuses = ['draft', 'pending', 'on-hold'];
       $access = $account->hasPermission('bypass node access') ||
                 $account->hasPermission('administer nodes') ||
                 ($access && in_array($entity->getModerationStatus(), $statuses));
@@ -240,7 +240,7 @@ public function getEntityFormSubmitButtons($status, EntityModeratedInterface $en
     $new = empty($status) || $status === 'draft' || $entity->isNew();
 
     // Only show save as draft for non-published but editable documents.
-    if ($new || in_array($status, ['draft', 'pending', 'on_hold'])) {
+    if ($new || in_array($status, ['draft', 'pending', 'on-hold'])) {
       $buttons['draft'] = [
         '#value' => $this->t('Save as draft'),
       ];
@@ -252,7 +252,7 @@ public function getEntityFormSubmitButtons($status, EntityModeratedInterface $en
       $buttons['published'] = [
         '#value' => $this->t('Publish'),
       ];
-      $buttons['on_hold'] = [
+      $buttons['on-hold'] = [
         '#value' => $this->t('On hold'),
       ];
       $buttons['duplicate'] = [
diff --git a/html/modules/custom/reliefweb_subscriptions/src/ReliefwebSubscriptionsMailer.php b/html/modules/custom/reliefweb_subscriptions/src/ReliefwebSubscriptionsMailer.php
index 96e8db7e7..a2411198b 100644
--- a/html/modules/custom/reliefweb_subscriptions/src/ReliefwebSubscriptionsMailer.php
+++ b/html/modules/custom/reliefweb_subscriptions/src/ReliefwebSubscriptionsMailer.php
@@ -2109,7 +2109,7 @@ protected function triggerOchaSitrepNotification(Report $report) {
 
     // For a newly created entity, check the current status.
     if ($report->isNew()) {
-      return in_array($status, ['published', 'to_review']);
+      return in_array($status, ['published', 'to-review']);
     }
     // Otherwise compare with the status of the previous revision.
     else {
@@ -2120,15 +2120,15 @@ protected function triggerOchaSitrepNotification(Report $report) {
 
       // If there is no previous revision, check the current status.
       if ($previous === $report) {
-        return in_array($status, ['published', 'to_review']);
+        return in_array($status, ['published', 'to-review']);
       }
 
       // Queue only if the document was not previously already published to
       // avoid sending multiple times notifications for the document.
       $previous_status = $previous->getModerationStatus();
       return $status !== $previous_status &&
-        in_array($status, ['published', 'to_review']) &&
-        !in_array($previous_status, ['published', 'to_review']);
+        in_array($status, ['published', 'to-review']) &&
+        !in_array($previous_status, ['published', 'to-review']);
     }
 
     return FALSE;
diff --git a/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.info.yml b/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.info.yml
index 6e56a1a4c..e296dea98 100644
--- a/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.info.yml
+++ b/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.info.yml
@@ -4,7 +4,7 @@ description: 'Provides user posts handling.'
 package: reliefweb
 core_version_requirement: ^9
 dependencies:
-  - drupal:content_moderation
   - drupal:user
   - drupal:reliefweb_form
+  - drupal:reliefweb_moderation
   - drupal:reliefweb_utility
diff --git a/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.routing.yml b/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.routing.yml
index f8d4eeb2d..be92baa48 100644
--- a/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.routing.yml
+++ b/html/modules/custom/reliefweb_user_posts/reliefweb_user_posts.routing.yml
@@ -13,7 +13,7 @@ reliefweb_user_posts.content:
         type: reliefweb_moderation_service
   requirements:
     _user_is_logged_in: 'TRUE'
-    _custom_access: '\Drupal\reliefweb_user_posts\Controller\UserPostsPage::checkAccess'
+    _custom_access: '\Drupal\reliefweb_user_posts\Controller\UserPostsPage::checkUserPostsPageAccess'
     user: \d+
 
 reliefweb_user_posts.autocomplete:
@@ -31,6 +31,6 @@ reliefweb_user_posts.autocomplete:
         type: reliefweb_moderation_service
   requirements:
     _user_is_logged_in: 'TRUE'
-    _custom_access: '\Drupal\reliefweb_user_posts\Controller\UserPostsPage::checkAccess'
+    _custom_access: '\Drupal\reliefweb_user_posts\Controller\UserPostsPage::checkUserPostsPageAccess'
     user: \d+
     filter: "[a-z0-9_]+"
diff --git a/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php b/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php
index dd9f64790..ceac707ad 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php
@@ -158,7 +158,7 @@ public function autocomplete(ModerationServiceInterface $service, $filter, UserI
    * @return \Drupal\Core\Access\AccessResultInterface
    *   The access result.
    */
-  public function checkAccess(AccountInterface $account, UserInterface $user) {
+  public function checkUserPostsPageAccess(AccountInterface $account, UserInterface $user) {
     if ($account->id() == $user->id()) {
       return AccessResult::allowedIf($account->hasPermission('view own posts'));
     }
diff --git a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
index 8443c43b0..83ffabcb0 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
@@ -112,7 +112,7 @@ public function getStatuses() {
       'draft' => $this->t('draft'),
       'pending' => $this->t('pending'),
       'published' => $this->t('published'),
-      'on_hold' => $this->t('on-hold'),
+      'on-hold' => $this->t('on-hold'),
       'refused' => $this->t('refused'),
       'expired' => $this->t('expired'),
       'duplicate' => $this->t('duplicate'),
diff --git a/html/themes/custom/common_design_subtheme/components/rw-moderation-status/rw-moderation-status.css b/html/themes/custom/common_design_subtheme/components/rw-moderation-status/rw-moderation-status.css
index bf582857d..7a62815a3 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-moderation-status/rw-moderation-status.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-moderation-status/rw-moderation-status.css
@@ -2,13 +2,13 @@
   border-color: var(--cd-reliefweb-grey--light);
   background-color: var(--cd-reliefweb-grey--light--bg);
 }
-[data-moderation-status="on_hold"],
+[data-moderation-status="on-hold"],
 [data-moderation-status="alert"],
 [data-moderation-status="inactive"] {
   border-color: var(--cd-reliefweb-orange);
   background-color: var(--cd-reliefweb-orange--bg);
 }
-[data-moderation-status="to_review"],
+[data-moderation-status="to-review"],
 [data-moderation-status="external"] {
   border-color: var(--cd-reliefweb-blue);
   background-color: var(--cd-reliefweb-blue--bg);
@@ -29,16 +29,16 @@
 }
 [data-moderation-status="expired"],
 [data-moderation-status="archive"],
-[data-moderation-status="alert_archive"] {
+[data-moderation-status="alert-archive"] {
   border-color: var(--cd-reliefweb-purple);
   background-color: var(--cd-reliefweb-purple--bg);
 }
-[data-moderation-status="draft_archive"] {
+[data-moderation-status="draft-archive"] {
   border-color: var(--cd-reliefweb-grey);
   background-color: var(--cd-reliefweb-grey--bg);
 }
 [data-moderation-status="duplicate"],
-[data-moderation-status="monitoring_archive"] {
+[data-moderation-status="monitoring-archive"] {
   border-color: var(--cd-reliefweb-brown);
   background-color: var(--cd-reliefweb-brown--bg);
 }
@@ -49,7 +49,7 @@
 }
 [data-moderation-status="pending"],
 [data-moderation-status="embargoed"],
-[data-moderation-status="external_archive"] {
+[data-moderation-status="external-archive"] {
   border-color: var(--cd-reliefweb-cyan);
   background-color: var(--cd-reliefweb-cyan--bg);
 }

From 29ca6fc5254d8ed70b6dc039019908a67ed30e0a Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 4 Jan 2022 08:44:40 +0000
Subject: [PATCH 338/720] [RW-297] Fix missing event URL and tags on the
 training pages

---
 .../custom/reliefweb_entities/src/Entity/Training.php    | 2 +-
 .../templates/content/node--training--full.html.twig     | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Training.php b/html/modules/custom/reliefweb_entities/src/Entity/Training.php
index 655cb186a..9dcf5a44e 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Training.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Training.php
@@ -56,7 +56,7 @@ public static function addFieldConstraints(&$fields) {
    */
   public function getEntityMeta() {
     // Event URL.
-    $event_url = $this->field_link->value;
+    $event_url = $this->field_link->uri;
     if (!UrlHelper::isValid($event_url, TRUE)) {
       $event_url = '';
     }
diff --git a/html/themes/custom/common_design_subtheme/templates/content/node--training--full.html.twig b/html/themes/custom/common_design_subtheme/templates/content/node--training--full.html.twig
index 9529016a9..0b6c87f9a 100644
--- a/html/themes/custom/common_design_subtheme/templates/content/node--training--full.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/content/node--training--full.html.twig
@@ -105,7 +105,7 @@
       '#meta': {
         'source': {
           'type': 'taglist',
-          'label': meta.source|length > 1 ? 'Sources'|t : 'Source'|t,
+          'label': meta.source|length > 1 ? 'Organizations'|t : 'Organization'|t,
           'value': meta.source,
           'count': 1,
           'sort': 'shortname',
@@ -135,6 +135,7 @@
         },
         'event-url': {
           'type': 'link',
+          'label': 'Event URL'|t,
           'value': meta.event_url ? {
             'url': meta.event_url,
             'title': 'View event page'|t,
@@ -188,14 +189,14 @@
         },
         'source': {
           'type': 'taglist',
-          'label': meta.source|length > 1 ? 'Sources'|t : 'Source'|t,
+          'label': meta.source|length > 1 ? 'Organizations'|t : 'Organization'|t,
           'value': meta.source,
           'count': null,
           'sort': 'name',
         },
         'category': {
           'type': 'taglist',
-          'label': meta.category|length > 1 ? 'Types'|t : 'Type'|t,
+          'label': meta.category|length > 1 ? 'Categories'|t : 'Category'|t,
           'value': meta.category,
           'count': null,
           'sort': 'name',
@@ -221,7 +222,7 @@
           'count': null,
           'sort': 'name',
         },
-        'category': {
+        'cost': {
           'type': 'taglist',
           'label': 'Cost'|t,
           'value': meta.cost,

From a1c2945adab144ede1a7b4649b61dae90cf4fde6 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 4 Jan 2022 08:45:55 +0000
Subject: [PATCH 339/720] [RW-298] Fix internal link in book form

---
 .../templates/form/node-edit-form--book.html.twig               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/templates/form/node-edit-form--book.html.twig b/html/themes/custom/common_design_subtheme/templates/form/node-edit-form--book.html.twig
index 9d71d47f9..b61224219 100644
--- a/html/themes/custom/common_design_subtheme/templates/form/node-edit-form--book.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/form/node-edit-form--book.html.twig
@@ -41,7 +41,7 @@
 }}
 
 {# Form content. #}
-<fieldset id="content">
+<fieldset id="description">
   <legend>{% trans %}Description{% endtrans %}</legend>
   {{ form.title }}
   {{ form.body }}

From 89ad1e3cfc1026997c78dc8673e8ddf3dfb2c3b7 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 4 Jan 2022 08:49:17 +0000
Subject: [PATCH 340/720] [RW-299] Add moderation status and moderation pages
 for guidelines, add form templates and customizations

---
 .../reliefweb_guidelines.install              |  17 ++
 .../reliefweb_guidelines.links.task.yml       |  13 ++
 .../reliefweb_guidelines.module               |  50 +++++
 .../reliefweb_guidelines.services.yml         |  13 ++
 .../Commands/ReliefWebGuidelinesCommands.php  |   4 +
 .../src/ModeratedGuidelineStorageSchema.php   |  61 ++++++
 .../src/Services/GuidelineFormAlter.php       |  69 ++++++
 .../src/Services/GuidelineListFormAlter.php   |  38 ++++
 .../src/Services/GuidelineListModeration.php  | 194 +++++++++++++++++
 .../src/Services/GuidelineModeration.php      | 199 ++++++++++++++++++
 .../common_design_subtheme.theme              |  20 ++
 ...eline-edit-form--field-guideline.html.twig |  79 +++++++
 ...deline-edit-form--guideline-list.html.twig |  59 ++++++
 .../templates/user/admin-menu.html.twig       |   1 +
 14 files changed, 817 insertions(+)
 create mode 100644 html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.install
 create mode 100644 html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.links.task.yml
 create mode 100644 html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.services.yml
 create mode 100644 html/modules/custom/reliefweb_guidelines/src/ModeratedGuidelineStorageSchema.php
 create mode 100644 html/modules/custom/reliefweb_guidelines/src/Services/GuidelineFormAlter.php
 create mode 100644 html/modules/custom/reliefweb_guidelines/src/Services/GuidelineListFormAlter.php
 create mode 100644 html/modules/custom/reliefweb_guidelines/src/Services/GuidelineListModeration.php
 create mode 100644 html/modules/custom/reliefweb_guidelines/src/Services/GuidelineModeration.php
 create mode 100644 html/themes/custom/common_design_subtheme/templates/form/guideline-edit-form--field-guideline.html.twig
 create mode 100644 html/themes/custom/common_design_subtheme/templates/form/guideline-edit-form--guideline-list.html.twig

diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.install b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.install
new file mode 100644
index 000000000..922af358f
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.install
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @file
+ * Install file for reliefweb_guidelines.
+ */
+
+use Drupal\reliefweb_guidelines\ModeratedGuidelineStorageSchema;
+
+/**
+ * Implements hook_install().
+ *
+ * @see reliefweb_moderation_install()
+ */
+function reliefweb_guidelines_install() {
+  reliefweb_moderation_add_moderation_status('guideline', ModeratedGuidelineStorageSchema::class);
+}
diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.links.task.yml b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.links.task.yml
new file mode 100644
index 000000000..5e4fe5904
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.links.task.yml
@@ -0,0 +1,13 @@
+reliefweb_moderation.content.field_guideline:
+  route_name: reliefweb_moderation.content
+  base_route: reliefweb_moderation.content
+  route_parameters:
+    service: field_guideline
+  title: Guidelines
+
+reliefweb_moderation.content.guideline_list:
+  route_name: reliefweb_moderation.content
+  base_route: reliefweb_moderation.content
+  route_parameters:
+    service: guideline_list
+  title: Guideline Lists
diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
index c537c5e10..65d2e71e1 100644
--- a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
@@ -5,9 +5,13 @@
  * Contains integration for guidelines.
  */
 
+use Drupal\Core\Cache\RefinableCacheableDependencyInterface;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\reliefweb_entities\EntityFormAlterServiceBase;
 use Drupal\reliefweb_guidelines\Controller\GuidelineSinglePageController;
 use Drupal\reliefweb_guidelines\Entity\Guideline;
+use Drupal\reliefweb_guidelines\ModeratedGuidelineStorageSchema;
 use Drupal\reliefweb_revisions\Services\EntityHistory;
 
 /**
@@ -42,6 +46,26 @@ function reliefweb_guidelines_entity_bundle_info_alter(&$bundles) {
   $bundles['guideline']['guideline_list']['label'] = 'Guideline List';
 }
 
+/**
+ * Implements hook_entity_base_field_info().
+ */
+function reliefweb_guidelines_entity_base_field_info(EntityTypeInterface $entity_type) {
+  $fields = [];
+  if ($entity_type->id() === 'guideline') {
+    $fields['moderation_status'] = reliefweb_moderation_get_moderation_status_field_definition();
+  }
+  return $fields;
+}
+
+/**
+ * Implements hook_entity_type_alter().
+ */
+function reliefweb_guidelines_entity_type_alter(array &$entity_types) {
+  if (isset($entity_types['guideline'])) {
+    $entity_types['guideline']->setHandlerClass('storage_schema', ModeratedGuidelineStorageSchema::class);
+  }
+}
+
 /**
  * Implements hook_page_attachments_alter().
  */
@@ -94,5 +118,31 @@ function reliefweb_guidelines_pathauto_alias_alter(&$alias, array &$context) {
  * Implements hook_form_HOOK_alter() for "guideline_form".
  */
 function reliefweb_guidelines_form_guideline_form_alter(array &$form, FormStateInterface $form_state, $form_id) {
+  // Add the form alterations.
+  EntityFormAlterServiceBase::alterEntityForm($form, $form_state);
+
+  // Add the revisions to the bottom of the form.
   EntityHistory::addHistoryToForm($form, $form_state);
 }
+
+/**
+ * Implements hook_menu_local_tasks_alter().
+ */
+function reliefweb_guidelines_menu_local_tasks_alter(&$data, $route_name, RefinableCacheableDependencyInterface &$cacheability) {
+  if ($route_name === 'reliefweb_moderation.content' && isset($data['tabs'][0])) {
+    $tasks = [
+      'reliefweb_moderation.content.field_guideline' => TRUE,
+      'reliefweb_moderation.content.guideline_list' => TRUE,
+    ];
+
+    // Only show the guideline local tasks when on the guideline moderation
+    // pages and remove them on other moderation pages.
+    $service = \Drupal::routeMatch()->getRawParameter('service');
+    if (in_array($service, ['field_guideline', 'guideline_list'])) {
+      $data['tabs'][0] = array_intersect_key($data['tabs'][0], $tasks);
+    }
+    else {
+      $data['tabs'][0] = array_diff_key($data['tabs'][0], $tasks);
+    }
+  }
+}
diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.services.yml b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.services.yml
new file mode 100644
index 000000000..d030a2a8a
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.services.yml
@@ -0,0 +1,13 @@
+services:
+  reliefweb_moderation.field_guideline.moderation:
+    class: Drupal\reliefweb_guidelines\Services\GuidelineModeration
+    arguments: ['@current_user', '@database', '@date.formatter', '@entity_field.manager', '@entity_type.manager', '@pager.manager', '@pager.parameters', '@request_stack', '@string_translation']
+  reliefweb_moderation.guideline_list.moderation:
+    class: Drupal\reliefweb_guidelines\Services\GuidelineListModeration
+    arguments: ['@current_user', '@database', '@date.formatter', '@entity_field.manager', '@entity_type.manager', '@pager.manager', '@pager.parameters', '@request_stack', '@string_translation']
+  reliefweb_entities.field_guideline.form_alter:
+    class: Drupal\reliefweb_guidelines\Services\GuidelineFormAlter
+    arguments: ['@database', '@current_user', '@entity_field.manager', '@entity_type.manager', '@state', '@string_translation']
+  reliefweb_entities.guideline_list.form_alter:
+    class: Drupal\reliefweb_guidelines\Services\GuidelineListFormAlter
+    arguments: ['@database', '@current_user', '@entity_field.manager', '@entity_type.manager', '@state', '@string_translation']
diff --git a/html/modules/custom/reliefweb_guidelines/src/Commands/ReliefWebGuidelinesCommands.php b/html/modules/custom/reliefweb_guidelines/src/Commands/ReliefWebGuidelinesCommands.php
index f35b6ded0..953974808 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Commands/ReliefWebGuidelinesCommands.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Commands/ReliefWebGuidelinesCommands.php
@@ -124,6 +124,8 @@ public function migrateFromTrello() {
         'parent' => [],
         'weight' => $weight_list,
         'field_title' => $list['name'],
+        'moderation_status' => 'published',
+        '_is_migrating' => TRUE,
       ];
 
       $guideline_list = Guideline::create($values);
@@ -154,6 +156,8 @@ public function migrateFromTrello() {
             'format' => 'guideline',
           ],
           'field_images' => $images,
+          'moderation_status' => 'published',
+          '_is_migrating' => TRUE,
         ];
 
         // Check if the card has labels associated to form fields.
diff --git a/html/modules/custom/reliefweb_guidelines/src/ModeratedGuidelineStorageSchema.php b/html/modules/custom/reliefweb_guidelines/src/ModeratedGuidelineStorageSchema.php
new file mode 100644
index 000000000..d73e691b2
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/src/ModeratedGuidelineStorageSchema.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Drupal\reliefweb_guidelines;
+
+use Drupal\Core\Entity\ContentEntityTypeInterface;
+use Drupal\Core\Entity\Sql\SqlContentEntityStorageSchema;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
+
+/**
+ * Defines the guideline schema handler.
+ */
+class ModeratedGuidelineStorageSchema extends SqlContentEntityStorageSchema {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEntitySchema(ContentEntityTypeInterface $entity_type, $reset = FALSE) {
+    $schema = parent::getEntitySchema($entity_type, $reset);
+
+    $tables = [
+      $this->storage->getDataTable(),
+      $this->storage->getRevisionTable(),
+    ];
+
+    foreach ($tables as $table) {
+      if (!empty($table)) {
+        $fields = $schema[$table]['fields'] ?? [];
+        if (isset($fields['type'], $fields['moderation_status'])) {
+          $schema[$table]['indexes'] += [
+            'guideline__bundle_moderation_status' => [
+              'type',
+              'moderation_status',
+            ],
+          ];
+        }
+      }
+    }
+
+    return $schema;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getSharedTableFieldSchema(FieldStorageDefinitionInterface $storage_definition, $table_name, array $column_mapping) {
+    $schema = parent::getSharedTableFieldSchema($storage_definition, $table_name, $column_mapping);
+    $field_name = $storage_definition->getName();
+
+    switch ($field_name) {
+      case 'moderation_status':
+        $schema['fields']['moderation_status']['type'] = 'varchar_ascii';
+        $schema['fields']['moderation_status']['not null'] = 'TRUE';
+        $schema['fields']['moderation_status']['default'] = '';
+        $this->addSharedTableFieldIndex($storage_definition, $schema, TRUE);
+        break;
+    }
+
+    return $schema;
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineFormAlter.php b/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineFormAlter.php
new file mode 100644
index 000000000..12a309d19
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineFormAlter.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Drupal\reliefweb_guidelines\Services;
+
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Link;
+use Drupal\Core\Url;
+use Drupal\reliefweb_entities\EntityFormAlterServiceBase;
+
+/**
+ * Guideline form alteration service.
+ */
+class GuidelineFormAlter extends EntityFormAlterServiceBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function addBundleFormAlterations(array &$form, FormStateInterface $form_state) {
+    // Hide the status field.
+    $form['status']['#access'] = FALSE;
+
+    // Force the new revision.
+    $form['new_revision']['#default_value'] = TRUE;
+    $form['new_revision']['#access'] = FALSE;
+
+    // More space for the description.
+    $form['field_description']['widget'][0]['#rows'] = 20;
+
+    // Change the image field wrapper to a fieldset.
+    $form['field_images']['widget']['#type'] = 'fieldset';
+    $form['field_images']['widget']['#theme_wrappers'] = ['fieldset'];
+
+    // Transform the field selector into a select with autocomplete.
+    $form['field_field']['widget']['#type'] = 'select';
+    $form['field_field']['widget']['#attributes']['data-with-autocomplete'] = '';
+    $form['field_field']['widget']['#description'] = $this->t('Select the node or term field this guideline is for.');
+
+    // Url to create a new guideline list.
+    $new_list_url = Url::fromRoute('entity.guideline.add_form', [
+      'guideline_type' => 'guideline_list',
+    ], [
+      'attributes' => [
+        'target' => '_blank',
+        'rel' => 'noopener noreferrer',
+      ],
+    ]);
+
+    // @todo limit the list to guideline lists and make it mandotory.
+    $form['relations']['#type'] = 'fieldset';
+    $form['relations']['#title_display'] = 'invisible';
+    $form['relations']['parent']['#title'] = $this->t('Guideline list');
+    $form['relations']['parent']['#description'] = $this->t('Select the list this guideline belongs to. @new_list_link.', [
+      '@new_list_link' => Link::fromTextAndUrl($this->t('Create a new list'), $new_list_url)->toString(),
+    ]);
+    $form['relations']['parent']['#attributes']['data-with-autocomplete'] = '';
+    $form['relations']['weight']['#description'] = $this->t('Guidelines are displayed in ascending order by weight.');
+
+    // Hide the url alias.
+    $form['path']['#access'] = FALSE;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getAllowedForms() {
+    return ['default', 'add', 'edit'];
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineListFormAlter.php b/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineListFormAlter.php
new file mode 100644
index 000000000..17e4a3da5
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineListFormAlter.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Drupal\reliefweb_guidelines\Services;
+
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\reliefweb_entities\EntityFormAlterServiceBase;
+
+/**
+ * Guideline list form alteration service.
+ */
+class GuidelineListFormAlter extends EntityFormAlterServiceBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function addBundleFormAlterations(array &$form, FormStateInterface $form_state) {
+    // Hide the status field.
+    $form['status']['#access'] = FALSE;
+
+    // Force the new revision.
+    $form['new_revision']['#default_value'] = TRUE;
+    $form['new_revision']['#access'] = FALSE;
+
+    // Disallow selecting parents for guideline lists.
+    $form['relations']['#access'] = FALSE;
+
+    // Hide the url alias.
+    $form['path']['#access'] = FALSE;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getAllowedForms() {
+    return ['default', 'add', 'edit'];
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineListModeration.php b/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineListModeration.php
new file mode 100644
index 000000000..f8d063027
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineListModeration.php
@@ -0,0 +1,194 @@
+<?php
+
+namespace Drupal\reliefweb_guidelines\Services;
+
+use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\reliefweb_moderation\EntityModeratedInterface;
+use Drupal\reliefweb_moderation\ModerationServiceBase;
+
+/**
+ * Moderation service for the guideline lists.
+ */
+class GuidelineListModeration extends ModerationServiceBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getBundle() {
+    return 'guideline_list';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getEntityTypeId() {
+    return 'guideline';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getTitle() {
+    return $this->t('Guideline Lists');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getHeaders() {
+    return [
+      'edit' => [
+        'label' => '',
+      ],
+      'data' => [
+        'label' => $this->t('Guideline List'),
+        'type' => 'property',
+        'specifier' => 'name',
+        'sortable' => TRUE,
+      ],
+      'date' => [
+        'label' => $this->t('Updated'),
+        'type' => 'property',
+        'specifier' => 'changed',
+        'sortable' => TRUE,
+      ],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRows(array $results) {
+    if (empty($results['entities'])) {
+      return [];
+    }
+
+    /** @var \Drupal\reliefweb_moderation\EntityModeratedInterface[] $entities */
+    $entities = $results['entities'];
+
+    // Prepare the table rows' data from the entities.
+    $rows = [];
+    foreach ($entities as $entity) {
+      $cells = [];
+
+      // Edit link + status cell.
+      $cells['edit'] = $this->getEntityEditAndStatusData($entity);
+
+      // Entity data cell.
+      $data = [];
+
+      // Title.
+      $data['title'] = $entity->toLink()->toString();
+
+      // Revision information.
+      $data['revision'] = $this->getEntityRevisionData($entity);
+
+      // Filter out empty data.
+      $cells['data'] = array_filter($data);
+
+      // Date cell.
+      $cells['date'] = [
+        'date' => $entity->getChangedTime(),
+      ];
+
+      $rows[] = $cells;
+    }
+
+    return $rows;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getStatuses() {
+    return [
+      'draft' => $this->t('Draft'),
+      'published' => $this->t('Published'),
+      'archive' => $this->t('Archived'),
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getEntityFormSubmitButtons($status, EntityModeratedInterface $entity) {
+    return [
+      'draft' => [
+        '#value' => $this->t('Save as draft'),
+      ],
+      'published' => [
+        '#value' => $this->t('Publish'),
+      ],
+      'archive' => [
+        '#value' => $this->t('Archive'),
+      ],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function entityAccess(EntityModeratedInterface $entity, $operation = 'view', ?AccountInterface $account = NULL) {
+    $account = $account ?: $this->currentUser;
+
+    $access = FALSE;
+
+    $status = $entity->getModerationStatus();
+
+    $viewable = $this->isViewableStatus($status, $account);
+
+    $editable = $this->isEditableStatus($status, $account);
+
+    switch ($operation) {
+      case 'view':
+        if ($account->hasPermission('view published guideline entities')) {
+          $access = $viewable || $account->hasPermission('view unpublished guideline entities');
+        }
+        break;
+
+      case 'create':
+        $access = $account->hasPermission('add guideline entities');
+        break;
+
+      case 'update':
+        $access = $account->hasPermission('edit guideline entities') && $editable;
+        break;
+
+      case 'delete':
+        $access = $account->hasPermission('delete guideline entities');
+        break;
+    }
+
+    return $access ? AccessResult::allowed() : AccessResult::forbidden();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function initFilterDefinitions(array $filters = []) {
+    $definitions = parent::initFilterDefinitions([
+      'status',
+      'name',
+      'created',
+    ]);
+    $definitions['changed'] = [
+      'type' => 'property',
+      'field' => 'changed',
+      'label' => $this->t('Modification date'),
+      'shortcut' => 'ch',
+      'form' => 'omnibox',
+      'widget' => 'datepicker',
+    ];
+    return $definitions;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function checkModerationPageAccess(AccountInterface $account) {
+    return parent::checkModerationPageAccess($account)
+      ->andIf(AccessResult::allowedIfHasPermission($account, 'edit guideline entities'));
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineModeration.php b/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineModeration.php
new file mode 100644
index 000000000..a8d2e77ff
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineModeration.php
@@ -0,0 +1,199 @@
+<?php
+
+namespace Drupal\reliefweb_guidelines\Services;
+
+use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\reliefweb_moderation\EntityModeratedInterface;
+use Drupal\reliefweb_moderation\ModerationServiceBase;
+
+/**
+ * Moderation service for the guidelines.
+ */
+class GuidelineModeration extends ModerationServiceBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getBundle() {
+    return 'field_guideline';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getEntityTypeId() {
+    return 'guideline';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getTitle() {
+    return $this->t('Guidelines');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getHeaders() {
+    return [
+      'edit' => [
+        'label' => '',
+      ],
+      'data' => [
+        'label' => $this->t('Guideline'),
+        'type' => 'property',
+        'specifier' => 'name',
+        'sortable' => TRUE,
+      ],
+      'date' => [
+        'label' => $this->t('Updated'),
+        'type' => 'property',
+        'specifier' => 'changed',
+        'sortable' => TRUE,
+      ],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRows(array $results) {
+    if (empty($results['entities'])) {
+      return [];
+    }
+
+    /** @var \Drupal\reliefweb_moderation\EntityModeratedInterface[] $entities */
+    $entities = $results['entities'];
+
+    // Prepare the table rows' data from the entities.
+    $rows = [];
+    foreach ($entities as $entity) {
+      $cells = [];
+
+      // Edit link + status cell.
+      $cells['edit'] = $this->getEntityEditAndStatusData($entity);
+
+      // Entity data cell.
+      $data = [];
+
+      // Title.
+      $data['title'] = $entity->toLink()->toString();
+
+      // Information.
+      $info = [];
+      // @todo add parent guideline list.
+      $data['info'] = array_filter($info);
+
+      // Revision information.
+      $data['revision'] = $this->getEntityRevisionData($entity);
+
+      // Filter out empty data.
+      $cells['data'] = array_filter($data);
+
+      // Date cell.
+      $cells['date'] = [
+        'date' => $entity->getChangedTime(),
+      ];
+
+      $rows[] = $cells;
+    }
+
+    return $rows;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getStatuses() {
+    return [
+      'draft' => $this->t('Draft'),
+      'published' => $this->t('Published'),
+      'archive' => $this->t('Archived'),
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getEntityFormSubmitButtons($status, EntityModeratedInterface $entity) {
+    return [
+      'draft' => [
+        '#value' => $this->t('Save as draft'),
+      ],
+      'published' => [
+        '#value' => $this->t('Publish'),
+      ],
+      'archive' => [
+        '#value' => $this->t('Archive'),
+      ],
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function entityAccess(EntityModeratedInterface $entity, $operation = 'view', ?AccountInterface $account = NULL) {
+    $account = $account ?: $this->currentUser;
+
+    $access = FALSE;
+
+    $status = $entity->getModerationStatus();
+
+    $viewable = $this->isViewableStatus($status, $account);
+
+    $editable = $this->isEditableStatus($status, $account);
+
+    switch ($operation) {
+      case 'view':
+        if ($account->hasPermission('view published guideline entities')) {
+          $access = $viewable || $account->hasPermission('view unpublished guideline entities');
+        }
+        break;
+
+      case 'create':
+        $access = $account->hasPermission('add guideline entities');
+        break;
+
+      case 'update':
+        $access = $account->hasPermission('edit guideline entities') && $editable;
+        break;
+
+      case 'delete':
+        $access = $account->hasPermission('delete guideline entities');
+        break;
+    }
+
+    return $access ? AccessResult::allowed() : AccessResult::forbidden();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function initFilterDefinitions(array $filters = []) {
+    $definitions = parent::initFilterDefinitions([
+      'status',
+      'name',
+      'created',
+    ]);
+    $definitions['changed'] = [
+      'type' => 'property',
+      'field' => 'changed',
+      'label' => $this->t('Modification date'),
+      'shortcut' => 'ch',
+      'form' => 'omnibox',
+      'widget' => 'datepicker',
+    ];
+    return $definitions;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function checkModerationPageAccess(AccountInterface $account) {
+    return parent::checkModerationPageAccess($account)
+      ->andIf(AccessResult::allowedIfHasPermission($account, 'edit guideline entities'));
+  }
+
+}
diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.theme b/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
index d78bc2749..bf9f14f9d 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
@@ -160,3 +160,23 @@ function common_design_subtheme_editor_link_dialog_form_after_build(array $form,
   }
   return $form;
 }
+
+/**
+ * Implements hook_theme().
+ *
+ * Add themes for the guideline edit forms.
+ */
+function common_design_subtheme_theme(array $existing, $type, $theme, $path) {
+  $hooks = [
+    'guideline_edit_form',
+  ];
+
+  return common_design_get_entity_edit_form_themes($hooks, $existing, $theme, $path);
+}
+
+/**
+ * Implements hook_form_node_HOOK_alter().
+ */
+function common_design_subtheme_form_guideline_form_alter(&$form, FormStateInterface $form_state) {
+  common_design_add_entity_edit_form_theme($form, $form_state);
+}
diff --git a/html/themes/custom/common_design_subtheme/templates/form/guideline-edit-form--field-guideline.html.twig b/html/themes/custom/common_design_subtheme/templates/form/guideline-edit-form--field-guideline.html.twig
new file mode 100644
index 000000000..1c350e731
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/templates/form/guideline-edit-form--field-guideline.html.twig
@@ -0,0 +1,79 @@
+{#
+/**
+ * @file
+ * Theme override for a guideline edit form.
+ *
+ * This template will be used when a guideline edit form specifies
+ * 'guideline_edit_form' as its #theme callback.  Otherwise, by default,
+ * guideline add/edit forms will be themed by form.html.twig.
+ *
+ * Available variables:
+ * - form: The guideline add/edit form.
+ *
+ * @todo review revision section.
+ */
+#}
+{{ attach_library('common_design_subtheme/rw-form') }}
+
+{# Table of contents. #}
+{{
+  render_var({
+    '#theme': 'reliefweb_entities_table_of_contents',
+    '#sections': {
+      'fields': {
+        'title': 'Fields'|t,
+        'sections': {
+          'description': 'Description'|t,
+          'images-links': 'Images & Links'|t,
+        },
+      },
+      'submission': {
+        'title': 'Submission'|t,
+        'sections': {
+          'editorial': 'Editorial'|t,
+          'actions': 'Save'|t,
+          'edit-revision-information': 'Revisions'|t,
+        },
+      },
+    },
+  })
+}}
+
+{# Form content. #}
+<fieldset id="description">
+  <legend>{% trans %}Description{% endtrans %}</legend>
+  {{ form.name }}
+  {{ form.field_description }}
+</fieldset>
+
+<fieldset id="images-links">
+  <legend>{% trans %}Images &amp; Links{% endtrans %}</legend>
+  {{ form.field_images }}
+  {{ form.field_links }}
+</fieldset>
+
+<fieldset id="editorial">
+  <legend>{% trans %}Editorial{% endtrans %}</legend>
+  {{ form.relations }}
+  {{ form.field_field }}
+</fieldset>
+
+<fieldset id="actions">
+  <legend class="visually-hidden">{% trans %}Form submission and other actions{% endtrans %}</legend>
+  {{ form.actions }}
+</fieldset>
+
+{{ form.revision_information}}
+
+{{
+  form|without([
+    'name',
+    'field_description',
+    'field_images',
+    'field_links',
+    'field_field',
+    'relations',
+    'revision_information',
+    'actions',
+  ])
+}}
diff --git a/html/themes/custom/common_design_subtheme/templates/form/guideline-edit-form--guideline-list.html.twig b/html/themes/custom/common_design_subtheme/templates/form/guideline-edit-form--guideline-list.html.twig
new file mode 100644
index 000000000..62ae552eb
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/templates/form/guideline-edit-form--guideline-list.html.twig
@@ -0,0 +1,59 @@
+{#
+/**
+ * @file
+ * Theme override for a guideline edit form.
+ *
+ * This template will be used when a guideline edit form specifies
+ * 'guideline_edit_form' as its #theme callback.  Otherwise, by default,
+ * guideline add/edit forms will be themed by form.html.twig.
+ *
+ * Available variables:
+ * - form: The guideline add/edit form.
+ *
+ * @todo review revision section.
+ */
+#}
+{{ attach_library('common_design_subtheme/rw-form') }}
+
+{# Table of contents. #}
+{{
+  render_var({
+    '#theme': 'reliefweb_entities_table_of_contents',
+    '#sections': {
+      'fields': {
+        'title': 'Fields'|t,
+        'sections': {
+          'description': 'Description'|t,
+        },
+      },
+      'submission': {
+        'title': 'Submission'|t,
+        'sections': {
+          'actions': 'Save'|t,
+          'edit-revision-information': 'Revisions'|t,
+        },
+      },
+    },
+  })
+}}
+
+{# Form content. #}
+<fieldset id="description">
+  <legend>{% trans %}Description{% endtrans %}</legend>
+  {{ form.name }}
+</fieldset>
+
+<fieldset id="actions">
+  <legend class="visually-hidden">{% trans %}Form submission and other actions{% endtrans %}</legend>
+  {{ form.actions }}
+</fieldset>
+
+{{ form.revision_information}}
+
+{{
+  form|without([
+    'name',
+    'revision_information',
+    'actions',
+  ])
+}}
diff --git a/html/themes/custom/common_design_subtheme/templates/user/admin-menu.html.twig b/html/themes/custom/common_design_subtheme/templates/user/admin-menu.html.twig
index 69d39278f..9b44d7dc8 100644
--- a/html/themes/custom/common_design_subtheme/templates/user/admin-menu.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/user/admin-menu.html.twig
@@ -48,6 +48,7 @@
               <li><a href="/admin/people">People</a></li>
               <li><a href="/admin/structure/taxonomy">Taxonomy</a></li>
               <li><a href="/admin/community-topics">Community topics</a></li>
+              <li><a href="/moderation/content/field_guideline">Guidelines</a></li>
             </ul>
           </li>
         </ul>

From b87db62426aed9e3b37cb43050c9d620d1fda96c Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 4 Jan 2022 08:53:08 +0000
Subject: [PATCH 341/720] [RW-296] Optimize migrations The base concept is to
 reduce the number of DB queries by regrouping the data to insert or retrieve.

---
 .../migrate_plus.migration.reliefweb_book.yml |  51 ++-
 ...ate_plus.migration.reliefweb_bookmarks.yml |   1 +
 ...migrate_plus.migration.reliefweb_image.yml |   3 -
 ..._plus.migration.reliefweb_node__report.yml |   1 +
 ...plus.migration.reliefweb_subscriptions.yml |   1 +
 ...plus.migration.reliefweb_taxonomy_term.yml |   7 +-
 ...ation.reliefweb_taxonomy_term__country.yml |   2 +-
 ...tion.reliefweb_taxonomy_term__disaster.yml |   2 +-
 ...ration.reliefweb_taxonomy_term__source.yml |   2 +-
 ...ation.reliefweb_taxonomy_term_revision.yml |   2 +-
 ...iefweb_taxonomy_term_revision__country.yml |   2 +-
 ...efweb_taxonomy_term_revision__disaster.yml |   2 +-
 ...liefweb_taxonomy_term_revision__source.yml |   2 +-
 ...ate_plus.migration.reliefweb_url_alias.yml |  13 +-
 .../migrate_plus.migration.reliefweb_user.yml |  12 +-
 ...plus.migration.reliefweb_user__default.yml |   9 +-
 ...e_plus.migration_group.reliefweb_image.yml |  11 +
 ...e_plus.migration_group.reliefweb_media.yml |  11 +-
 ...te_plus.migration_group.reliefweb_node.yml |  23 +-
 ...igration_group.reliefweb_node_revision.yml |  18 +-
 ...te_plus.migration_group.reliefweb_term.yml |  23 +-
 ...igration_group.reliefweb_term_revision.yml |  26 +-
 .../reliefweb_migrate.install                 |  18 +
 .../reliefweb_migrate.module                  |  15 +
 .../src/Entity/AccumulatedFileStorage.php     |  14 +
 .../src/Entity/AccumulatedMediaStorage.php    |  14 +
 .../src/Entity/AccumulatedNodeStorage.php     |  14 +
 .../Entity/AccumulatedPathAliasStorage.php    |  14 +
 .../src/Entity/AccumulatedRedirectStorage.php |  98 +++++
 ...ulatedSqlContentEntityStorageInterface.php |  24 ++
 ...ccumulatedSqlContentEntityStorageTrait.php | 342 ++++++++++++++++++
 .../src/Entity/AccumulatedTermStorage.php     |  27 ++
 .../src/Entity/AccumulatedUserStorage.php     |  27 ++
 .../src/Plugin/Derivative/MigrateEntity.php   |  29 ++
 .../Derivative/MigrateEntityRevision.php      |  29 ++
 .../src/Plugin/IdMapMigratePluginManager.php  |  65 ++++
 .../src/Plugin/migrate/destination/Entity.php | 182 ++++++++++
 .../Plugin/migrate/destination/EntityFile.php | 195 ++++++++++
 .../Plugin/migrate/destination/EntityNode.php | 177 +++++++++
 .../migrate/destination/EntityRedirect.php    |  45 +++
 .../migrate/destination/EntityRevision.php    | 136 +++++++
 .../Plugin/migrate/destination/EntityUser.php | 105 ++++++
 .../src/Plugin/migrate/destination/Image.php  | 130 -------
 .../Plugin/migrate/id_map/AccumulatedSql.php  | 220 +++++++++++
 .../Plugin/migrate/process/Unserialize.php    |   3 +-
 .../src/Plugin/migrate/source/Book.php        |  10 +-
 .../src/Plugin/migrate/source/EntityBase.php  | 193 ++++++++++
 .../migrate/source/FieldableEntityBase.php    | 234 ++++++++++--
 .../src/Plugin/migrate/source/Image.php       |   9 +-
 .../src/Plugin/migrate/source/Media.php       |  25 +-
 .../src/Plugin/migrate/source/Node.php        | 161 ++-------
 .../Plugin/migrate/source/NodeRevision.php    |   4 +-
 .../src/Plugin/migrate/source/Report.php      | 200 ++++++++++
 .../Plugin/migrate/source/TaxonomyTerm.php    |  25 +-
 .../migrate/source/TaxonomyTermRevision.php   | 119 ++++++
 .../src/Plugin/migrate/source/UrlAlias.php    |  52 ++-
 .../src/Plugin/migrate/source/User.php        |  11 +-
 57 files changed, 2782 insertions(+), 408 deletions(-)
 create mode 100644 html/modules/custom/reliefweb_migrate/reliefweb_migrate.module
 create mode 100644 html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedFileStorage.php
 create mode 100644 html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedMediaStorage.php
 create mode 100644 html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedNodeStorage.php
 create mode 100644 html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedPathAliasStorage.php
 create mode 100644 html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedRedirectStorage.php
 create mode 100644 html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedSqlContentEntityStorageInterface.php
 create mode 100644 html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedSqlContentEntityStorageTrait.php
 create mode 100644 html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedTermStorage.php
 create mode 100644 html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedUserStorage.php
 create mode 100644 html/modules/custom/reliefweb_migrate/src/Plugin/Derivative/MigrateEntity.php
 create mode 100644 html/modules/custom/reliefweb_migrate/src/Plugin/Derivative/MigrateEntityRevision.php
 create mode 100644 html/modules/custom/reliefweb_migrate/src/Plugin/IdMapMigratePluginManager.php
 create mode 100644 html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Entity.php
 create mode 100644 html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityFile.php
 create mode 100644 html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityNode.php
 create mode 100644 html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityRedirect.php
 create mode 100644 html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityRevision.php
 create mode 100644 html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityUser.php
 delete mode 100644 html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Image.php
 create mode 100644 html/modules/custom/reliefweb_migrate/src/Plugin/migrate/id_map/AccumulatedSql.php
 create mode 100644 html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
 create mode 100644 html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Report.php

diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_book.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_book.yml
index fb016ec9d..bb1369a04 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_book.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_book.yml
@@ -5,24 +5,45 @@ migration_tags:
   - book
 source:
   plugin: reliefweb_book
+  batch_size: 1000
 destination:
-  plugin: reliefweb_book
+  plugin: table
+  table_name: book
+  id_fields:
+    nid:
+      type: integer
+  fields:
+    nid: nid
+    bid: bid
+    pid: pid
+    has_children: has_children
+    weight: weight
+    depth: depth
+    p1: p1
+    p2: p2
+    p3: p3
+    p4: p4
+    p5: p5
+    p6: p6
+    p7: p7
+    p8: p8
+    p9: p9
 process:
   nid: nid
-  'book/bid': bid
-  'book/weight': weight
-  'book/pid':
-    -
-      plugin: skip_on_empty
-      method: process
-      source: plid
-    -
-      plugin: migration_lookup
-      migration: reliefweb_book
-  # Flag the entity as being migrated.
-  _is_migrating:
-    plugin: default_value
-    default_value: 1
+  bid: bid
+  pid: pid
+  has_children: has_children
+  weight: weight
+  depth: depth
+  p1: p1
+  p2: p2
+  p3: p3
+  p4: p4
+  p5: p5
+  p6: p6
+  p7: p7
+  p8: p8
+  p9: p9
 migration_dependencies:
   required:
     - reliefweb_node__book
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_bookmarks.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_bookmarks.yml
index afa9e6590..d9811eac8 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_bookmarks.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_bookmarks.yml
@@ -11,6 +11,7 @@ source:
       type: integer
     uid:
       type: integer
+  batch_size: 1000
 destination:
   plugin: table
   table_name: reliefweb_bookmarks
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_image.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_image.yml
index 3028777bd..35da31f57 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_image.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_image.yml
@@ -7,9 +7,6 @@ dependencies:
       - reliefweb_migrate
 source:
   plugin: reliefweb_image
-destination:
-  plugin: reliefweb_image
-
 process:
   uuid: uuid
   fid: fid
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node__report.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node__report.yml
index 421e1abdb..36e26d457 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node__report.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node__report.yml
@@ -2,6 +2,7 @@ id: reliefweb_node__report
 label: Migrate ReliefWeb reports.
 migration_group: reliefweb_node
 source:
+  plugin: reliefweb_report
   bundle: report
 process:
   # Fields.
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_subscriptions.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_subscriptions.yml
index 1543b1d43..1db40c601 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_subscriptions.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_subscriptions.yml
@@ -9,6 +9,7 @@ source:
       type: string
     uid:
       type: integer
+  batch_size: 1000
 destination:
   plugin: table
   table_name: reliefweb_subscriptions_subscriptions
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term.yml
index 6efa09361..02cf22466 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term.yml
@@ -19,10 +19,9 @@ source:
     - vulnerable_groups
 process:
   # Moderation status.
-  moderation_state:
-    plugin: skip_on_empty
-    method: process
-    source: field_status/0/value
+  moderation_status:
+    plugin: default_value
+    default_value: published
   status:
     default_value: 1
   # Fields.
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term__country.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term__country.yml
index e076d2635..4517d4d9d 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term__country.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term__country.yml
@@ -5,7 +5,7 @@ source:
   bundle: country
 process:
   # Moderation status.
-  moderation_state:
+  moderation_status:
     default_value: normal
   # Fields.
   field_aliases/value:
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term__disaster.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term__disaster.yml
index d2fa8d335..fc69c8004 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term__disaster.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term__disaster.yml
@@ -5,7 +5,7 @@ source:
   bundle: disaster
 process:
   # Moderation status.
-  moderation_state:
+  moderation_status:
     default_value: draft
   # Fields.
   field_country:
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term__source.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
index 256522736..4f866d0db 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
@@ -5,7 +5,7 @@ source:
   bundle: source
 process:
   # Moderation status.
-  moderation_state:
+  moderation_status:
     default_value: active
   # Fields.
   field_aliases/value:
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term_revision.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term_revision.yml
index c9d28b2fb..eb92fb40f 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term_revision.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term_revision.yml
@@ -19,7 +19,7 @@ source:
     - vulnerable_groups
 process:
   # Moderation status.
-  moderation_state:
+  moderation_status:
     plugin: skip_on_empty
     method: process
     source: field_status/0/value
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term_revision__country.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term_revision__country.yml
index e7fcce92d..6e68b59f4 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term_revision__country.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term_revision__country.yml
@@ -5,7 +5,7 @@ source:
   bundle: country
 process:
   # Moderation status.
-  moderation_state:
+  moderation_status:
     default_value: normal
   # Fields.
   field_aliases/value:
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term_revision__disaster.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term_revision__disaster.yml
index 3ecc6750d..51d6c5118 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term_revision__disaster.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term_revision__disaster.yml
@@ -5,7 +5,7 @@ source:
   bundle: disaster
 process:
   # Moderation status.
-  moderation_state:
+  moderation_status:
     default_value: draft
   # Fields.
   field_country:
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
index 181fd6f15..2c41e9546 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
@@ -5,7 +5,7 @@ source:
   bundle: source
 process:
   # Moderation status.
-  moderation_state:
+  moderation_status:
     default_value: active
   # Fields.
   field_aliases/value:
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_url_alias.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_url_alias.yml
index abe2775c5..ee8863256 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_url_alias.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_url_alias.yml
@@ -3,13 +3,16 @@ label: Migrate ReliefWeb URL aliases
 migration_group: reliefweb_extra
 source:
   plugin: reliefweb_url_alias
+  batch_size: 1000
+  high_water_property:
+    name: pid
+    alias: ua
   constants:
     # Use the user 2 (System user) as default user for the redirects.
     uid: 2
     code: 301
-    prefix: 'internal:/'
 destination:
-  plugin: entity:redirect
+  plugin: reliefweb_entity:redirect
 process:
   # Use the url alias ID as redirect ID, this makes the migration process more
   # predictable.
@@ -17,11 +20,7 @@ process:
   uid: constants/uid
   status_code: constants/code
   redirect_source/path: alias
-  redirect_source/uri:
-    plugin: concat
-    source:
-      - constants/prefix
-      - source
+  redirect_redirect/uri: source
   # Skip the langcode, it will be set to the default language for the entity
   # and bundle, which is "en" in our case.
   #language:
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_user.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_user.yml
index 63f001a38..a1214862b 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_user.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_user.yml
@@ -3,8 +3,9 @@ label: Migrate ReliefWeb users.
 migration_group: reliefweb_base
 source:
   plugin: reliefweb_user
+  batch_size: 1000
 destination:
-  plugin: entity:user
+  plugin: reliefweb_entity:user
 process:
   uid: uid
   name: name
@@ -45,17 +46,10 @@ process:
     plugin: skip_on_empty
     method: process
     source: notes
-  # Disable path alias generation as aliases are already imported.
+  # Disable path alias generation.
   path/pathauto:
     plugin: default_value
     default_value: 0
-  path/alias:
-    -
-      plugin: default_value
-      default_value: ''
-    -
-      plugin: skip_on_empty
-      method: process
   # Flag the entity as being migrated.
   _is_migrating:
     plugin: default_value
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_user__default.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_user__default.yml
index 516742b68..8fcc31008 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_user__default.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_user__default.yml
@@ -54,17 +54,10 @@ process:
   field_notes/value:
     plugin: default_value
     default_value: 'System account used for automated tasks/changes'
-  # Disable path alias generation as aliases are already imported.
+  # Disable path alias generation.
   path/pathauto:
     plugin: default_value
     default_value: 0
-  path/alias:
-    -
-      plugin: default_value
-      default_value: ''
-    -
-      plugin: skip_on_empty
-      method: process
   # Flag the entity as being migrated.
   _is_migrating:
     plugin: default_value
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_image.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_image.yml
index 1000831e2..7cce43086 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_image.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_image.yml
@@ -7,6 +7,17 @@ shared_configuration:
     - image
   source:
     key: rwint7
+    batch_size: 1000
+    high_water_property:
+      name: fid
+      alias: fm
+  destination:
+    plugin: reliefweb_entity:file
+  process:
+    # Disable path alias generation.
+    path/pathauto:
+      plugin: default_value
+      default_value: 0
   migration_dependencies:
     required:
       - reliefweb_user
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_media.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_media.yml
index 161c8b6cd..8d9ba81b3 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_media.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_media.yml
@@ -12,10 +12,15 @@ shared_configuration:
   source:
     key: rwint7
     plugin: reliefweb_media
+    batch_size: 1000
+    high_water_property:
+      name: fid
+      alias: fm
   destination:
-    plugin: entity:media
+    plugin: reliefweb_entity:media
   process:
     mid: fid
+    vid: fid
     uid:
       plugin: static_map
       bypass: true
@@ -40,6 +45,10 @@ shared_configuration:
     field_media_image/target_id: fid
     field_media_image/width: width
     field_media_image/height: height
+    # Disable path alias generation.
+    path/pathauto:
+      plugin: default_value
+      default_value: 0
     # Flag the entity as being migrated.
     _is_migrating:
       plugin: default_value
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_node.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_node.yml
index 7fbf61715..919003c94 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_node.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_node.yml
@@ -14,8 +14,12 @@ shared_configuration:
     plugin: reliefweb_node
     constants:
       format: markdown
+    batch_size: 1000
+    high_water_property:
+      name: vid
+      alias: nr
   destination:
-    plugin: entity:node
+    plugin: reliefweb_entity:node
   process:
     # Base properties.
     nid: nid
@@ -58,7 +62,7 @@ shared_configuration:
         published: 1
         to-review: 1
     # Moderation status.
-    moderation_state:
+    moderation_status:
       plugin: static_map
       source: field_status/0/value
       default_value: draft
@@ -68,14 +72,14 @@ shared_configuration:
         duplicate: duplicate
         expired: expired
         embargoed: embargoed
-        on-hold: on_hold
+        on-hold: on-hold
         pending: pending
         published: published
         reference: reference
         refused: refused
-        to-review: to_review
+        to-review: to-review
     # Revision information.
-    vid: revision_id
+    vid: vid
     revision_uid:
       plugin: static_map
       bypass: true
@@ -101,6 +105,15 @@ shared_configuration:
         markdown: markdown
         plain_text: markdown
         token_markdown: token_markdown
+    # Url alias.
+    url_lias:
+      plugin: skip_on_empty
+      method: process
+      source: url_alias
+    # Disable path alias generation.
+    path/pathauto:
+      plugin: default_value
+      default_value: 0
     # Disable notifications.
     notifications_content_disable:
       plugin: default_value
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_node_revision.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_node_revision.yml
index 0667b84e1..9b81e723b 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_node_revision.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_node_revision.yml
@@ -15,8 +15,12 @@ shared_configuration:
     plugin: reliefweb_node_revision
     constants:
       format: markdown
+    batch_size: 1000
+    high_water_property:
+      name: vid
+      alias: nr
   destination:
-    plugin: entity_revision:node
+    plugin: reliefweb_entity_revision:node
   process:
     # Base properties.
     nid: nid
@@ -47,7 +51,7 @@ shared_configuration:
         published: 1
         to-review: 1
     # Moderation status.
-    moderation_state:
+    moderation_status:
       plugin: static_map
       source: field_status/0/value
       default_value: draft
@@ -57,14 +61,14 @@ shared_configuration:
         duplicate: duplicate
         expired: expired
         embargoed: embargoed
-        on-hold: on_hold
+        on-hold: on-hold
         pending: pending
         published: published
         reference: reference
         refused: refused
-        to-review: to_review
+        to-review: to-review
     # Revision information.
-    vid: revision_id
+    vid: vid
     revision_uid:
       plugin: static_map
       bypass: true
@@ -90,6 +94,10 @@ shared_configuration:
         markdown: markdown
         plain_text: markdown
         token_markdown: token_markdown
+    # Disable path alias generation.
+    path/pathauto:
+      plugin: default_value
+      default_value: 0
     # Disable notifications.
     notifications_content_disable:
       plugin: default_value
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_term.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_term.yml
index fece3cbd7..15d5d8bc3 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_term.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_term.yml
@@ -14,8 +14,12 @@ shared_configuration:
     plugin: reliefweb_taxonomy_term
     constants:
       format: markdown
+    batch_size: 1000
+    high_water_property:
+      name: revision_id
+      alias: tdr
   destination:
-    plugin: entity:taxonomy_term
+    plugin: reliefweb_entity:taxonomy_term
   process:
     tid: tid
     vid:
@@ -58,21 +62,21 @@ shared_configuration:
         ongoing: 1
         past: 1
     # Moderation status.
-    moderation_state:
+    moderation_status:
       plugin: static_map
       source: field_status/0/value
       map:
         active: active
         alert: alert
-        alert-archive: alert_archive
+        alert-archive: alert-archive
         archive: archive
         blocked: blocked
         draft: draft
-        draft-archive: draft_archive
+        draft-archive: draft-archive
         duplicate: duplicate
         current: ongoing
         external: external
-        external-archive: external_archive
+        external-archive: external-archive
         inactive: inactive
         normal: normal
         ongoing: ongoing
@@ -90,6 +94,15 @@ shared_configuration:
     revision_log_message: revision_log_message
     revision_created: revision_created
     revision_default: revision_default
+    # Url alias.
+    url_lias:
+      plugin: skip_on_empty
+      method: process
+      source: url_alias
+    # Disable path alias generation.
+    path/pathauto:
+      plugin: default_value
+      default_value: 0
     # Disable notifications.
     notifications_content_disable:
       plugin: default_value
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_term_revision.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_term_revision.yml
index d860fe468..4412dd5f0 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_term_revision.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration_group.reliefweb_term_revision.yml
@@ -15,8 +15,12 @@ shared_configuration:
     plugin: reliefweb_taxonomy_term_revision
     constants:
       format: markdown
+    batch_size: 1000
+    high_water_property:
+      name: revision_id
+      alias: tdr
   destination:
-    plugin: entity_revision:taxonomy_term
+    plugin: reliefweb_entity_revision:taxonomy_term
   process:
     tid: tid
     vid:
@@ -59,21 +63,21 @@ shared_configuration:
         ongoing: 1
         past: 1
     # Moderation status.
-    moderation_state:
+    moderation_status:
       plugin: static_map
       source: field_status/0/value
       map:
         active: active
         alert: alert
-        alert-archive: alert_archive
+        alert-archive: alert-archive
         archive: archive
         blocked: blocked
         draft: draft
-        draft-archive: draft_archive
+        draft-archive: draft-archive
         duplicate: duplicate
         current: ongoing
         external: external
-        external-archive: external_archive
+        external-archive: external-archive
         inactive: inactive
         normal: normal
         ongoing: ongoing
@@ -89,8 +93,18 @@ shared_configuration:
         0: 2
         1: 2
     revision_log_message: revision_log_message
-    revision_created: revision_created
+    revision_created:
+      plugin: static_map
+      bypass: true
+      source: revision_created
+      # Use the ReliefWeb creation date if we don't have a revision timestamp.
+      map:
+        0: 844128000
     revision_default: revision_default
+    # Disable path alias generation.
+    path/pathauto:
+      plugin: default_value
+      default_value: 0
     # Disable notifications.
     notifications_content_disable:
       plugin: default_value
diff --git a/html/modules/custom/reliefweb_migrate/reliefweb_migrate.install b/html/modules/custom/reliefweb_migrate/reliefweb_migrate.install
index ecc7b62dc..4959d05a6 100644
--- a/html/modules/custom/reliefweb_migrate/reliefweb_migrate.install
+++ b/html/modules/custom/reliefweb_migrate/reliefweb_migrate.install
@@ -13,6 +13,13 @@
 function reliefweb_migrate_schema() {
   $schema['reliefweb_migrate_uri_mapping'] = [
     'fields' => [
+      'id' => [
+        'description' => 'ID (ex: file ID).',
+        'type' => 'int',
+        'unsigned' => TRUE,
+        'not null' => TRUE,
+        'default' => 0,
+      ],
       'new_uri' => [
         'description' => 'New URI',
         'type' => 'varchar',
@@ -29,6 +36,9 @@ function reliefweb_migrate_schema() {
       ],
     ],
     'primary key' => ['new_uri'],
+    'indexes' => [
+      'id' => ['id'],
+    ],
   ];
 
   return $schema;
@@ -55,6 +65,14 @@ function reliefweb_migrate_update_9001() {
  * Uninstall the migration configuration.
  */
 function reliefweb_migrate_uninstall() {
+  $table = 'reliefweb_migrate_uri_mapping';
+  $schema = reliefweb_migrate_schema();
+  $database = \Drupal::database();
+
+  if (isset($schema[$table]) && !$database->schema()->tableExists($table)) {
+    $database->schema()->dropTable($table);
+  }
+
   \Drupal::service('config.manager')->uninstall('module', 'reliefweb_migrate');
 
   drupal_flush_all_caches();
diff --git a/html/modules/custom/reliefweb_migrate/reliefweb_migrate.module b/html/modules/custom/reliefweb_migrate/reliefweb_migrate.module
new file mode 100644
index 000000000..ee9b8bd25
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/reliefweb_migrate.module
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @file
+ * Module file for reliefweb_migrate.
+ */
+
+/**
+ * Implements hook_migrate_id_map_info_alter().
+ */
+function reliefweb_migrate_migrate_id_map_info_alter(array &$info) {
+  if (isset($info['sql'])) {
+    $info['sql']['class'] = 'Drupal\reliefweb_migrate\Plugin\migrate\id_map\AccumulatedSql';
+  }
+}
diff --git a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedFileStorage.php b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedFileStorage.php
new file mode 100644
index 000000000..5a8b308cd
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedFileStorage.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Drupal\reliefweb_migrate\Entity;
+
+use Drupal\file\FileStorage;
+
+/**
+ * File SQL storage for the migrations that regroup queries.
+ */
+class AccumulatedFileStorage extends FileStorage implements AccumulatedSqlContentEntityStorageInterface {
+
+  use AccumulatedSqlContentEntityStorageTrait;
+
+}
diff --git a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedMediaStorage.php b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedMediaStorage.php
new file mode 100644
index 000000000..5a0fd344d
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedMediaStorage.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Drupal\reliefweb_migrate\Entity;
+
+use Drupal\media\MediaStorage;
+
+/**
+ * Media SQL storage for the migrations that regroup queries.
+ */
+class AccumulatedMediaStorage extends MediaStorage implements AccumulatedSqlContentEntityStorageInterface {
+
+  use AccumulatedSqlContentEntityStorageTrait;
+
+}
diff --git a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedNodeStorage.php b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedNodeStorage.php
new file mode 100644
index 000000000..22767e9f6
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedNodeStorage.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Drupal\reliefweb_migrate\Entity;
+
+use Drupal\node\NodeStorage;
+
+/**
+ * Node SQL storage for the migrations that regroup queries.
+ */
+class AccumulatedNodeStorage extends NodeStorage implements AccumulatedSqlContentEntityStorageInterface {
+
+  use AccumulatedSqlContentEntityStorageTrait;
+
+}
diff --git a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedPathAliasStorage.php b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedPathAliasStorage.php
new file mode 100644
index 000000000..b78138e08
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedPathAliasStorage.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Drupal\reliefweb_migrate\Entity;
+
+use Drupal\path_alias\PathAliasStorage;
+
+/**
+ * Path Alias SQL storage for the migrations that regroup queries.
+ */
+class AccumulatedPathAliasStorage extends PathAliasStorage implements AccumulatedSqlContentEntityStorageInterface {
+
+  use AccumulatedSqlContentEntityStorageTrait;
+
+}
diff --git a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedRedirectStorage.php b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedRedirectStorage.php
new file mode 100644
index 000000000..9cbd5d21b
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedRedirectStorage.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace Drupal\reliefweb_migrate\Entity;
+
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Entity\Sql\SqlContentEntityStorage;
+
+/**
+ * Redirect SQL storage for the migrations that regroup queries.
+ */
+class AccumulatedRedirectStorage extends SqlContentEntityStorage implements AccumulatedSqlContentEntityStorageInterface {
+
+  use AccumulatedSqlContentEntityStorageTrait;
+
+  /**
+   * Save the accumulated table data in the database.
+   */
+  public function flushAccumulated() {
+    // Remove duplicate redirects.
+    $this->removeDuplicates();
+
+    // Insert the accumulated data.
+    $this->doFlushAccumulated();
+
+    // Invalidate the entity tags and reset the accumulator.
+    Cache::invalidateTags($this->accumulatedTagsToInvalidate);
+    $this->accumulatedTagsToInvalidate = [];
+
+    // Reset the accumulator.
+    $this->accumulator = [];
+
+    // Reset the accumulation counter.
+    $this->accumulationCounter = 0;
+  }
+
+  /**
+   * Remove duplicate redirects.
+   */
+  protected function removeDuplicates() {
+    if (!empty($this->accumulator)) {
+      $hashes = [];
+
+      // Extract the redirect hashes from the accumulated data and remove
+      // duplicates.
+      foreach ($this->accumulator as $table => $entries) {
+        foreach ($entries as $index_rows => $rows) {
+          foreach ($rows as $index_row => $row) {
+            $hash = is_array($row) ? $row['hash'] : $row->hash;
+            if (isset($hashes[$hash])) {
+              unset($this->accumulator[$table][$index_rows][$index_row]);
+            }
+            else {
+              $hashes[$hash] = $hash;
+            }
+          }
+        }
+      }
+
+      // Retrieve any existing hash.
+      $existing_hashes = $this->getExistingHashes($hashes);
+
+      // Remove the entries if there is already a redirect with the same hash
+      // in the database.
+      if (!empty($existing_hashes)) {
+        foreach ($this->accumulator as $table => $entries) {
+          foreach ($entries as $index_rows => $rows) {
+            foreach ($rows as $index_row => $row) {
+              $hash = is_array($row) ? $row['hash'] : $row->hash;
+              if (isset($existing_hashes[$hash])) {
+                unset($this->accumulator[$table][$index_rows][$index_row]);
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Get the list of existing hashes in the database for the given hashes.
+   *
+   * @param array $hashes
+   *   Current redirect hashes to save in the database.
+   *
+   * @return array
+   *   Existing hashes in the database.
+   */
+  protected function getExistingHashes(array $hashes) {
+    // Retrieve any existing hash.
+    return array_flip($this->database
+      ->select('redirect', 'r')
+      ->fields('r', ['hash'])
+      ->condition('r.hash', $hashes, 'IN')
+      ->execute()
+      ?->fetchCol() ?? []);
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedSqlContentEntityStorageInterface.php b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedSqlContentEntityStorageInterface.php
new file mode 100644
index 000000000..6623dfde4
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedSqlContentEntityStorageInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Drupal\reliefweb_migrate\Entity;
+
+use Drupal\Core\Entity\EntityInterface;
+
+/**
+ * SQL storage for the migrations that regroup queries.
+ */
+interface AccumulatedSqlContentEntityStorageInterface {
+
+  /**
+   * Accumulate the data to save the entity permanently.
+   *
+   * @see Drupal\Core\Entity\ContentEntityStorageBase::save()
+   */
+  public function saveAccumulated(EntityInterface $entity);
+
+  /**
+   * Save the accumulated table data in the database.
+   */
+  public function flushAccumulated();
+
+}
diff --git a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedSqlContentEntityStorageTrait.php b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedSqlContentEntityStorageTrait.php
new file mode 100644
index 000000000..0ff723425
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedSqlContentEntityStorageTrait.php
@@ -0,0 +1,342 @@
+<?php
+
+namespace Drupal\reliefweb_migrate\Entity;
+
+use Drupal\Component\Utility\NestedArray;
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityStorageException;
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\Core\Entity\Sql\SqlContentEntityStorageSchema;
+
+/**
+ * SQL storage for the migrations that regroup queries.
+ */
+trait AccumulatedSqlContentEntityStorageTrait {
+
+  /**
+   * Accumulator of the data to save.
+   *
+   * @var array
+   */
+  protected $accumulator = [];
+
+  /**
+   * Counter to determine when to flush the accumulated insert queries.
+   *
+   * @var int
+   */
+  protected $accumulationCounter = 0;
+
+  /**
+   * Accumalator of the tags to invalidate when flushing.
+   *
+   * @var array
+   */
+  protected $accumulatedTagsToInvalidate = [];
+
+  /**
+   * Accumulate the data to save the entity permanently.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   Entity to save.
+   * @param int $max
+   *   Maximum number of entities to store before flushing.
+   *
+   * @see Drupal\Core\Entity\ContentEntityStorageBase::save()
+   */
+  public function saveAccumulated(EntityInterface $entity, $max = 1000) {
+    try {
+      // Track if this entity is new.
+      $is_new = $entity->isNew();
+
+      // Execute presave logic and invoke the related hooks.
+      $id = $this->doPreSave($entity);
+
+      // Perform the save and reset the static cache for the changed entity.
+      $return = $this->doSaveAccumulated($id, $entity);
+
+      // Execute post save logic and invoke the related hooks.
+      $this->doPostSaveAccumulated($entity, !$is_new);
+
+      // Flush the accumulated data.
+      if ($this->accumulationCounter++ > $max) {
+        $this->flushAccumulated();
+      }
+    }
+    catch (\Exception $exception) {
+      // DEBUG.
+      print_r($exception->getTraceAsString());
+      throw $exception;
+    }
+
+    return $return;
+  }
+
+  /**
+   * Perform post save tasks.
+   *
+   * Note: this regroups the tasks that are useful for the migration,
+   * after analyzing the different content entity postSave methods.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   Entity that was saved.
+   * @param bool $update
+   *   Wether the entity was updated or not.
+   */
+  protected function doPostSaveAccumulated(EntityInterface $entity, $update) {
+    $this->resetCache([$entity->id()]);
+
+    // The entity is no longer new.
+    $entity->enforceIsNew(FALSE);
+
+    // Allow code to run after saving.
+    // Note: we removed the calls to the $entity::postSave().
+    $this->invokeHook($update ? 'update' : 'insert', $entity);
+
+    // After saving, this is now the "original entity", and subsequent saves
+    // will be updates instead of inserts, and updates must always be able to
+    // correctly identify the original entity.
+    $entity->setOriginalId($entity->id());
+    unset($entity->original);
+
+    // The revision is stored, it should no longer be marked as new now.
+    if ($this->entityType->isRevisionable()) {
+      $entity->updateLoadedRevisionId();
+      $entity->setNewRevision(FALSE);
+    }
+
+    // Accumulate the tags to invalidate.
+    $entity_type = $this->getEntityType();
+    $tags = $entity_type->getListCacheTags();
+    if ($entity_type->hasKey('bundle')) {
+      $tags[] = $entity_type->id() . '_list:' . $entity->bundle();
+    }
+    if ($update) {
+      $tags = Cache::mergeTags($tags, $entity->getCacheTagsToInvalidate());
+    }
+    $this->accumulatedTagsToInvalidate = Cache::mergeTags($this->accumulatedTagsToInvalidate, $tags);
+  }
+
+  /**
+   * Save the accumulated table data in the database.
+   */
+  public function flushAccumulated() {
+    // Insert the accumulated data.
+    $this->doFlushAccumulated();
+
+    // Invalidate the entity tags and reset the accumulator.
+    Cache::invalidateTags($this->accumulatedTagsToInvalidate);
+    $this->accumulatedTagsToInvalidate = [];
+
+    // Reset the accumulator.
+    $this->accumulator = [];
+
+    // Reset the accumulation counter.
+    $this->accumulationCounter = 0;
+  }
+
+  /**
+   * Do save the accumulated table data in the database.
+   */
+  public function doFlushAccumulated() {
+    $transaction = $this->database->startTransaction();
+    try {
+      foreach ($this->accumulator as $table => $entries) {
+        $query = $this->database->insert($table);
+        foreach ($entries as $rows) {
+          foreach ($rows as $row) {
+            $row = (array) $row;
+            $query->fields(array_keys($row));
+            $query->values(array_values($row));
+          }
+        }
+        $query->execute();
+      }
+
+      // Ignore replica server temporarily.
+      \Drupal::service('database.replica_kill_switch')->trigger();
+    }
+    catch (\Exception $exception) {
+      $transaction->rollBack();
+      watchdog_exception($this->entityTypeId, $exception);
+      throw new EntityStorageException($exception->getMessage(), $exception->getCode(), $exception);
+    }
+  }
+
+  /**
+   * Accumulate the data to save in the entity and field tables.
+   *
+   * @see Drupal\Core\Entity\ContentEntityStorageBase::doSave()
+   */
+  protected function doSaveAccumulated($id, EntityInterface $entity) {
+    if ($entity->isNew()) {
+      $entity->enforceIsNew();
+      if ($this->entityType->isRevisionable()) {
+        $entity->setNewRevision();
+      }
+      $return = SAVED_NEW;
+    }
+    else {
+      $return = $entity->isDefaultRevision() ? SAVED_UPDATED : FALSE;
+    }
+
+    // Populate the "revision_default" flag. We skip this when we are resaving
+    // the revision because this is only allowed for default revisions, and
+    // these cannot be made non-default.
+    if ($this->entityType->isRevisionable() && $entity->isNewRevision()) {
+      $revision_default_key = $this->entityType->getRevisionMetadataKey('revision_default');
+      $entity->set($revision_default_key, $entity->isDefaultRevision());
+    }
+    $this->doSaveFieldItemsAccumulated($entity);
+    return $return;
+  }
+
+  /**
+   * Accumulate the data to save in the entity and field tables.
+   *
+   * @see Drupal\Core\Entity\Sql\SqlContentEntityStorage::doSaveFieldItems()
+   */
+  protected function doSaveFieldItemsAccumulated(ContentEntityInterface $entity, array $names = []) {
+    $default_revision = $entity->isDefaultRevision();
+
+    if ($default_revision) {
+      $record = $this->mapToStorageRecord($entity, $this->baseTable);
+      $this->accumulator[$this->baseTable][] = [$record];
+    }
+
+    if ($this->revisionTable) {
+      $this->saveRevisionAccumulated($entity);
+    }
+
+    if ($default_revision && $this->dataTable) {
+      $this->saveToSharedTablesAccumulated($entity, $this->dataTable, TRUE);
+    }
+
+    if ($this->revisionDataTable) {
+      $this->saveToSharedTablesAccumulated($entity, $this->revisionDataTable, TRUE);
+    }
+
+    // Update dedicated table records if necessary.
+    $this->saveToDedicatedTablesAccumulated($entity, FALSE);
+  }
+
+  /**
+   * Accumulate the data to save in the revision table.
+   *
+   * @see Drupal\Core\Entity\Sql\SqlContentEntityStorage::saveRevision()
+   */
+  protected function saveRevisionAccumulated(ContentEntityInterface $entity) {
+    $record = $this->mapToStorageRecord($entity, $this->revisionTable);
+
+    $entity->preSaveRevision($this, $record);
+
+    $this->accumulator[$this->revisionTable][] = [$record];
+
+    return $entity->getRevisionId();
+  }
+
+  /**
+   * Accumulate the data to save for the shared tables.
+   *
+   * @see Drupal\Core\Entity\Sql\SqlContentEntityStorage::saveToSharedTable()
+   */
+  protected function saveToSharedTablesAccumulated(ContentEntityInterface $entity, $table_name = NULL, $new_revision = NULL) {
+    $record = $this->mapToDataStorageRecord($entity, $table_name);
+    $this->accumulator[$table_name][] = [$record];
+  }
+
+  /**
+   * Accumulate the data to save for the fields that use dedicated tables.
+   *
+   * @see Drupal\Core\Entity\Sql\SqlContentEntityStorage::saveToDedicatedTables()
+   */
+  protected function saveToDedicatedTablesAccumulated(ContentEntityInterface $entity, $update = TRUE, array $names = []) {
+    $id = $entity->id();
+    $revision_id = $entity->getRevisionId() ?? $id;
+    $bundle = $entity->bundle();
+    $entity_type = $entity->getEntityTypeId();
+    $langcode = $entity->getUntranslated()->language()->getId();
+    $table_mapping = $this->getTableMapping();
+    $default_revision = $entity->isDefaultRevision();
+
+    // Determine which fields should be actually stored.
+    $definitions = $this->entityFieldManager->getFieldDefinitions($entity_type, $bundle);
+
+    foreach ($definitions as $field_name => $field_definition) {
+      $storage_definition = $field_definition->getFieldStorageDefinition();
+      if (!$table_mapping->requiresDedicatedTableStorage($storage_definition)) {
+        continue;
+      }
+
+      $table_name = $table_mapping->getDedicatedDataTableName($storage_definition);
+      $revision_name = $table_mapping->getDedicatedRevisionTableName($storage_definition);
+
+      // Accumulate the field values to store.
+      $delta_count = 0;
+      $items = $entity->get($field_name);
+      $items->filterEmptyItems();
+      foreach ($items as $delta => $item) {
+        $record = [
+          'entity_id' => $id,
+          'revision_id' => $revision_id,
+          'bundle' => $bundle,
+          'delta' => $delta,
+          'langcode' => $langcode,
+        ];
+
+        foreach ($storage_definition->getColumns() as $column => $attributes) {
+          $column_name = $table_mapping->getFieldColumnName($storage_definition, $column);
+          // Serialize the value if specified in the column schema.
+          $value = $item->$column;
+          if (!empty($attributes['serialize'])) {
+            $value = serialize($value);
+          }
+          $record[$column_name] = SqlContentEntityStorageSchema::castValue($attributes, $value);
+        }
+
+        if ($default_revision) {
+          $this->accumulator[$table_name][$revision_id][$delta] = $record;
+        }
+        if ($this->entityType->isRevisionable()) {
+          $this->accumulator[$revision_name][$revision_id][$delta] = $record;
+        }
+
+        if ($storage_definition->getCardinality() != FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED && ++$delta_count == $storage_definition->getCardinality()) {
+          break;
+        }
+      }
+    }
+  }
+
+  /**
+   * Invoke entity hooks that are not blacklisted.
+   *
+   * @param string $hook
+   *   Hook.
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   Entity to pass to the hook implementations.
+   * @param array $blacklist
+   *   List of implementations to ignore.
+   */
+  protected function doInvokeHook($hook, EntityInterface $entity, array $blacklist = []) {
+    $return = [];
+    $implementations = $this->moduleHandler()->getImplementations($hook);
+    foreach ($implementations as $module) {
+      $function = $module . '_' . $hook;
+      if (isset($blacklist[$function])) {
+        continue;
+      }
+      $result = call_user_func_array($function, [$entity]);
+      if (isset($result) && is_array($result)) {
+        $return = NestedArray::mergeDeep($return, $result);
+      }
+      elseif (isset($result)) {
+        $return[] = $result;
+      }
+    }
+    return $return;
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedTermStorage.php b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedTermStorage.php
new file mode 100644
index 000000000..ce2248c72
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedTermStorage.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Drupal\reliefweb_migrate\Entity;
+
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\taxonomy\TermStorage;
+
+/**
+ * Term SQL storage for the migrations that regroup queries.
+ */
+class AccumulatedTermStorage extends TermStorage implements AccumulatedSqlContentEntityStorageInterface {
+
+  use AccumulatedSqlContentEntityStorageTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function invokeHook($hook, EntityInterface $entity) {
+    $blacklist = [
+      'taxonomy_term_revision_entity_presave' => TRUE,
+    ];
+
+    $this->doInvokeHook($this->entityTypeId . '_' . $hook, $entity, $blacklist);
+    $this->doInvokeHook('entity_' . $hook, $entity, $blacklist);
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedUserStorage.php b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedUserStorage.php
new file mode 100644
index 000000000..05418aab8
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedUserStorage.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Drupal\reliefweb_migrate\Entity;
+
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\user\UserStorage;
+
+/**
+ * User SQL storage for the migrations that regroup queries.
+ */
+class AccumulatedUserStorage extends UserStorage implements AccumulatedSqlContentEntityStorageInterface {
+
+  use AccumulatedSqlContentEntityStorageTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function invokeHook($hook, EntityInterface $entity) {
+    $blacklist = [
+      'social_auth_hid_user_insert' => TRUE,
+    ];
+
+    $this->doInvokeHook($this->entityTypeId . '_' . $hook, $entity, $blacklist);
+    $this->doInvokeHook('entity_' . $hook, $entity, $blacklist);
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/Derivative/MigrateEntity.php b/html/modules/custom/reliefweb_migrate/src/Plugin/Derivative/MigrateEntity.php
new file mode 100644
index 000000000..ce31d1f3a
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/Derivative/MigrateEntity.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\reliefweb_migrate\Plugin\Derivative;
+
+use Drupal\migrate\Plugin\Derivative\MigrateEntity as MigrateEntityBase;
+
+/**
+ * Deriver for the reliefweb_migrate reliefweb_entity destinations.
+ */
+class MigrateEntity extends MigrateEntityBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDerivativeDefinitions($base_plugin_definition) {
+    foreach ($this->entityDefinitions as $entity_type => $entity_info) {
+      if (is_subclass_of($entity_info->getClass(), 'Drupal\Core\Entity\ContentEntityInterface')) {
+        $this->derivatives[$entity_type] = [
+          'id' => "reliefweb_entity:$entity_type",
+          'class' => 'Drupal\reliefweb_migrate\Plugin\migrate\destination\Entity',
+          'requirements_met' => 1,
+          'provider' => $entity_info->getProvider(),
+        ];
+      }
+    }
+    return $this->derivatives;
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/Derivative/MigrateEntityRevision.php b/html/modules/custom/reliefweb_migrate/src/Plugin/Derivative/MigrateEntityRevision.php
new file mode 100644
index 000000000..adffc0fe9
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/Derivative/MigrateEntityRevision.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\reliefweb_migrate\Plugin\Derivative;
+
+use Drupal\migrate\Plugin\Derivative\MigrateEntityRevision as MigrateEntityRevisionBase;
+
+/**
+ * Deriver for the reliefweb_migrate reliefweb_entity_revision destinations.
+ */
+class MigrateEntityRevision extends MigrateEntityRevisionBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDerivativeDefinitions($base_plugin_definition) {
+    foreach ($this->entityDefinitions as $entity_type => $entity_info) {
+      if (is_subclass_of($entity_info->getClass(), 'Drupal\Core\Entity\ContentEntityInterface') && $entity_info->getKey('revision')) {
+        $this->derivatives[$entity_type] = [
+          'id' => "reliefweb_entity_revision:$entity_type",
+          'class' => 'Drupal\reliefweb_migrate\Plugin\migrate\destination\EntityRevision',
+          'requirements_met' => 1,
+          'provider' => $entity_info->getProvider(),
+        ];
+      }
+    }
+    return $this->derivatives;
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/IdMapMigratePluginManager.php b/html/modules/custom/reliefweb_migrate/src/Plugin/IdMapMigratePluginManager.php
new file mode 100644
index 000000000..285587c7b
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/IdMapMigratePluginManager.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Drupal\reliefweb_migrate\Plugin;
+
+use Drupal\Component\Plugin\Factory\DefaultFactory;
+use Drupal\Core\Cache\CacheBackendInterface;
+use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\migrate\Plugin\MigratePluginManager;
+
+/**
+ * Manages migrate plugins.
+ *
+ * @see hook_migrate_info_alter()
+ * @see \Drupal\migrate\Annotation\MigrateSource
+ * @see \Drupal\migrate\Plugin\MigrateSourceInterface
+ * @see \Drupal\migrate\Plugin\migrate\source\SourcePluginBase
+ * @see \Drupal\migrate\Annotation\MigrateProcessPlugin
+ * @see \Drupal\migrate\Plugin\MigrateProcessInterface
+ * @see \Drupal\migrate\Plugin\migrate\process\ProcessPluginBase
+ * @see plugin_api
+ *
+ * @ingroup migration
+ */
+class IdMapMigratePluginManager extends MigratePluginManager {
+
+  /**
+   * Constructs a MigratePluginManager object.
+   *
+   * @param string $type
+   *   The type of the plugin: row, source, process, destination, entity_field,
+   *   id_map.
+   * @param \Traversable $namespaces
+   *   An object that implements \Traversable which contains the root paths
+   *   keyed by the corresponding namespace to look for plugin implementations.
+   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
+   *   Cache backend instance to use.
+   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+   *   The module handler to invoke the alter hook with.
+   * @param string $annotation
+   *   (optional) The annotation class name. Defaults to
+   *   'Drupal\Component\Annotation\PluginID'.
+   */
+  public function __construct($type, \Traversable $namespaces, CacheBackendInterface $cache_backend, ModuleHandlerInterface $module_handler, $annotation = 'Drupal\Component\Annotation\PluginID') {
+    parent::__construct("Plugin/reliefweb_migrate/$type", $namespaces, $module_handler, NULL, $annotation);
+    $this->alterInfo('migrate_' . $type . '_info');
+    $this->setCacheBackend($cache_backend, 'migrate_plugins_' . $type);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function createInstance($plugin_id, array $configuration = [], MigrationInterface $migration = NULL) {
+    $plugin_definition = $this->getDefinition($plugin_id);
+    $plugin_class = DefaultFactory::getPluginClass($plugin_id, $plugin_definition);
+    // If the plugin provides a factory method, pass the container to it.
+    if (is_subclass_of($plugin_class, 'Drupal\Core\Plugin\ContainerFactoryPluginInterface')) {
+      $plugin = $plugin_class::create(\Drupal::getContainer(), $configuration, $plugin_id, $plugin_definition, $migration);
+    }
+    else {
+      $plugin = new $plugin_class($configuration, $plugin_id, $plugin_definition, $migration);
+    }
+    return $plugin;
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Entity.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Entity.php
new file mode 100644
index 000000000..c66c1781c
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Entity.php
@@ -0,0 +1,182 @@
+<?php
+
+namespace Drupal\reliefweb_migrate\Plugin\migrate\destination;
+
+use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\Core\Entity\EntityFieldManagerInterface;
+use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Field\FieldTypePluginManagerInterface;
+use Drupal\Core\Session\AccountSwitcherInterface;
+use Drupal\migrate\Event\MigrateImportEvent;
+use Drupal\migrate\Event\ImportAwareInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
+use Drupal\migrate\Plugin\migrate\destination\EntityContentBase;
+use Drupal\migrate\Row;
+use Drupal\reliefweb_migrate\Entity\AccumulatedPathAliasStorage;
+use Drupal\reliefweb_migrate\Entity\AccumulatedSqlContentEntityStorageInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Entity migration destination.
+ *
+ * @MigrateDestination(
+ *   id = "reliefweb_entity",
+ *   deriver = "Drupal\reliefweb_migrate\Plugin\Derivative\MigrateEntity"
+ * )
+ */
+class Entity extends EntityContentBase implements ImportAwareInterface {
+
+  /**
+   * URL aliases accumulator.
+   *
+   * @var array
+   */
+  protected $accumulatedUrlAliases = [];
+
+  /**
+   * The path alias storage.
+   *
+   * @var \Drupal\reliefweb_migrate\Entity\AccumulatedPathAliasStorage
+   */
+  protected $pathAliasStorage;
+
+  /**
+   * Constructs a content entity.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin ID for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
+   *   The migration entity.
+   * @param \Drupal\Core\Entity\EntityStorageInterface $storage
+   *   The storage for this entity type.
+   * @param array $bundles
+   *   The list of bundles this entity type has.
+   * @param \Drupal\Core\Entity\EntityFieldManagerInterface $entity_field_manager
+   *   The entity field manager.
+   * @param \Drupal\Core\Field\FieldTypePluginManagerInterface $field_type_manager
+   *   The field type plugin manager service.
+   * @param \Drupal\Core\Session\AccountSwitcherInterface $account_switcher
+   *   The account switcher service.
+   * @param \Drupal\reliefweb_migrate\Entity\AccumulatedPathAliasStorage $path_alias_storage
+   *   The path alias storage.
+   */
+  public function __construct(
+    array $configuration,
+    $plugin_id,
+    $plugin_definition,
+    MigrationInterface $migration,
+    EntityStorageInterface $storage,
+    array $bundles,
+    EntityFieldManagerInterface $entity_field_manager,
+    FieldTypePluginManagerInterface $field_type_manager,
+    AccountSwitcherInterface $account_switcher = NULL,
+    AccumulatedPathAliasStorage $path_alias_storage
+  ) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $storage, $bundles, $entity_field_manager, $field_type_manager, $account_switcher);
+    $this->pathAliasStorage = $path_alias_storage;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration = NULL) {
+    $entity_type_id = static::getEntityTypeId($plugin_id);
+    $entity_type_manager = $container->get('entity_type.manager');
+    $storage = $entity_type_manager->getStorage($entity_type_id);
+    $entity_type = $storage->getEntityType();
+
+    $storage_class = get_class($storage);
+    $storage_class_name = (new \ReflectionClass($storage_class))->getShortName();
+    $accumulated_storage_class = 'Drupal\reliefweb_migrate\Entity\Accumulated' . $storage_class_name;
+
+    // Use the accumulated storage if for the entity type if available.
+    if (class_exists($accumulated_storage_class) && is_subclass_of($accumulated_storage_class, $storage_class)) {
+      $storage = $accumulated_storage_class::createInstance($container, $entity_type);
+    }
+
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $migration,
+      $storage,
+      array_keys($container->get('entity_type.bundle.info')->getBundleInfo($entity_type_id)),
+      $container->get('entity_field.manager'),
+      $container->get('plugin.manager.field.field_type'),
+      $container->get('account_switcher'),
+      AccumulatedPathAliasStorage::createInstance($container, $entity_type_manager->getDefinition('path_alias'))
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEntity(Row $row, array $old_destination_id_values) {
+    $entity_id = reset($old_destination_id_values) ?: $this->getEntityId($row);
+
+    // Delete the existing entity so we can insert the new one without having
+    // to worry about changes, unwanted new revisions etc.
+    if ($this->migration->getSourcePlugin()->entityExists($entity_id)) {
+      $entity = $this->storage->load($entity_id);
+      if (!empty($entity)) {
+        $entity->delete();
+      }
+    }
+
+    // Attempt to ensure we always have a bundle.
+    if ($bundle = $this->getBundle($row)) {
+      $row->setDestinationProperty($this->getKey('bundle'), $bundle);
+    }
+
+    $entity = $this->storage->create($row->getDestination());
+    $entity->enforceIsNew();
+    $entity->isDefaultRevision(TRUE);
+    if ($entity->getEntityType()->isRevisionable()) {
+      $entity->setNewRevision(TRUE);
+    }
+    return $entity;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function save(ContentEntityInterface $entity, array $old_destination_id_values = []) {
+    if (isset($entity->url_alias)) {
+      $path_alias = $this->pathAliasStorage->create([
+        'path' => '/' . strtr($entity->getEntityTypeId(), '_', '/') . '/' . $entity->id(),
+        'alias' => '/' . trim($entity->url_alias, " \n\r\t\v\0\\/"),
+        'langcode' => $entity->language()->getId(),
+      ]);
+      $this->pathAliasStorage->save($path_alias);
+      unset($entity->url_alias);
+    }
+
+    if ($this->storage instanceof AccumulatedSqlContentEntityStorageInterface) {
+      $this->storage->saveAccumulated($entity, $this->migration->getSourcePlugin()->getBatchSize());
+      return [$entity->id()];
+    }
+    else {
+      return parent::save($entity, $old_destination_id_values);
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function preImport(MigrateImportEvent $event) {
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function postImport(MigrateImportEvent $event) {
+    // Make sure everything is saved.
+    $this->storage->flushAccumulated();
+    $this->pathAliasStorage->flushAccumulated();
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityFile.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityFile.php
new file mode 100644
index 000000000..f49d0ee7f
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityFile.php
@@ -0,0 +1,195 @@
+<?php
+
+namespace Drupal\reliefweb_migrate\Plugin\migrate\destination;
+
+use Drupal\Core\Database\Connection;
+use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\Core\Entity\EntityFieldManagerInterface;
+use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Field\FieldTypePluginManagerInterface;
+use Drupal\Core\Session\AccountSwitcherInterface;
+use Drupal\migrate\Event\MigrateImportEvent;
+use Drupal\migrate\Plugin\MigrationInterface;
+use Drupal\migrate\Row;
+use Drupal\reliefweb_migrate\Entity\AccumulatedPathAliasStorage;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Image migration destination.
+ *
+ * @MigrateDestination(
+ *   id = "reliefweb_entity:file"
+ * )
+ */
+class EntityFile extends Entity {
+
+  /**
+   * The database connection.
+   *
+   * @var \Drupal\Core\Database\Connection
+   */
+  protected $database;
+
+  /**
+   * Acummulator for the new and old image URIs.
+   *
+   * @var array
+   */
+  protected $accumulatedImageUris = [];
+
+  /**
+   * Constructs a content entity.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin ID for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
+   *   The migration entity.
+   * @param \Drupal\Core\Entity\EntityStorageInterface $storage
+   *   The storage for this entity type.
+   * @param array $bundles
+   *   The list of bundles this entity type has.
+   * @param \Drupal\Core\Entity\EntityFieldManagerInterface $entity_field_manager
+   *   The entity field manager.
+   * @param \Drupal\Core\Field\FieldTypePluginManagerInterface $field_type_manager
+   *   The field type plugin manager service.
+   * @param \Drupal\Core\Session\AccountSwitcherInterface $account_switcher
+   *   The account switcher service.
+   * @param \Drupal\reliefweb_migrate\Entity\AccumulatedPathAliasStorage $path_alias_storage
+   *   The path alias storage.
+   * @param \Drupal\Core\Database\Connection $database
+   *   The database connection.
+   */
+  public function __construct(
+    array $configuration,
+    $plugin_id,
+    $plugin_definition,
+    MigrationInterface $migration,
+    EntityStorageInterface $storage,
+    array $bundles,
+    EntityFieldManagerInterface $entity_field_manager,
+    FieldTypePluginManagerInterface $field_type_manager,
+    AccountSwitcherInterface $account_switcher = NULL,
+    AccumulatedPathAliasStorage $path_alias_storage,
+    Connection $database
+  ) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $storage, $bundles, $entity_field_manager, $field_type_manager, $account_switcher, $path_alias_storage);
+    $this->database = $database;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration = NULL) {
+    $entity_type_id = static::getEntityTypeId($plugin_id);
+    $entity_type_manager = $container->get('entity_type.manager');
+    $storage = $entity_type_manager->getStorage($entity_type_id);
+    $entity_type = $storage->getEntityType();
+
+    $storage_class = get_class($storage);
+    $storage_class_name = (new \ReflectionClass($storage_class))->getShortName();
+    $accumulated_storage_class = 'Drupal\reliefweb_migrate\Entity\Accumulated' . $storage_class_name;
+
+    // Use the accumulated storage if for the entity type if available.
+    if (class_exists($accumulated_storage_class) && is_subclass_of($accumulated_storage_class, $storage_class)) {
+      $storage = $accumulated_storage_class::createInstance($container, $entity_type);
+    }
+
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $migration,
+      $storage,
+      array_keys($container->get('entity_type.bundle.info')->getBundleInfo($entity_type_id)),
+      $container->get('entity_field.manager'),
+      $container->get('plugin.manager.field.field_type'),
+      $container->get('account_switcher'),
+      AccumulatedPathAliasStorage::createInstance($container, $entity_type_manager->getDefinition('path_alias')),
+      $container->get('database')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEntity(Row $row, array $old_destination_id_values) {
+    $entity = parent::getEntity($row, $old_destination_id_values);
+    // Store the old ReliefWeb URI so we can store the mapping.
+    $entity->old_uri = $row->getDestinationProperty('old_uri');
+    return $entity;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function save(ContentEntityInterface $entity, array $old_destination_id_values = []) {
+    /** @var \Drupal\file\FileInterface $entity */
+    if (!empty($entity->getFileUri()) && !empty($entity->old_uri)) {
+      $this->accumulatedImageUris[] = [
+        $entity->id(),
+        $entity->getFileUri(),
+        $entity->old_uri,
+      ];
+    }
+
+    if (count($this->accumulatedImageUris) > 1000) {
+      $this->flushAccumulatedImageUris();
+    }
+
+    return parent::save($entity, $old_destination_id_values);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function rollback(array $destination_identifier) {
+    if (!empty($destination_identifier)) {
+      // Delete the URI mapping.
+      \Drupal::database()
+        ->delete('reliefweb_migrate_uri_mapping')
+        ->condition('id', reset($destination_identifier))
+        ->execute();
+    }
+
+    parent::rollback($destination_identifier);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static function getEntityTypeId($plugin_id) {
+    return 'file';
+  }
+
+  /**
+   * Save the accumulated image URIs to the database.
+   */
+  protected function flushAccumulatedImageUris() {
+    if (!empty($this->accumulatedImageUris)) {
+      $query = \Drupal::database()
+        ->insert('reliefweb_migrate_uri_mapping')
+        ->fields(['id', 'new_uri', 'old_uri']);
+
+      foreach ($this->accumulatedImageUris as $values) {
+        $query->values($values);
+      }
+
+      $query->execute();
+    }
+
+    $this->accumulatedImageUris = [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function postImport(MigrateImportEvent $event) {
+    parent::postImport($event);
+    $this->flushAccumulatedImageUris();
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityNode.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityNode.php
new file mode 100644
index 000000000..af04b898d
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityNode.php
@@ -0,0 +1,177 @@
+<?php
+
+namespace Drupal\reliefweb_migrate\Plugin\migrate\destination;
+
+use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\Core\Entity\EntityFieldManagerInterface;
+use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Field\FieldTypePluginManagerInterface;
+use Drupal\Core\Session\AccountSwitcherInterface;
+use Drupal\migrate\Event\MigrateImportEvent;
+use Drupal\migrate\Plugin\MigrationInterface;
+use Drupal\reliefweb_entities\Entity\Report;
+use Drupal\reliefweb_migrate\Entity\AccumulatedFileStorage;
+use Drupal\reliefweb_migrate\Entity\AccumulatedPathAliasStorage;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Entity migration destination.
+ *
+ * @MigrateDestination(
+ *   id = "reliefweb_entity:node",
+ * )
+ */
+class EntityNode extends Entity {
+
+  /**
+   * The file storage.
+   *
+   * @var \Drupal\reliefweb_migrate\Entity\AccumulatedFileStorage
+   */
+  protected $fileStorage;
+
+  /**
+   * Constructs a content entity.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin ID for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
+   *   The migration entity.
+   * @param \Drupal\Core\Entity\EntityStorageInterface $storage
+   *   The storage for this entity type.
+   * @param array $bundles
+   *   The list of bundles this entity type has.
+   * @param \Drupal\Core\Entity\EntityFieldManagerInterface $entity_field_manager
+   *   The entity field manager.
+   * @param \Drupal\Core\Field\FieldTypePluginManagerInterface $field_type_manager
+   *   The field type plugin manager service.
+   * @param \Drupal\Core\Session\AccountSwitcherInterface $account_switcher
+   *   The account switcher service.
+   * @param \Drupal\reliefweb_migrate\Entity\AccumulatedPathAliasStorage $path_alias_storage
+   *   The path alias storage.
+   * @param \Drupal\reliefweb_migrate\Entity\AccumulatedFileStorage $file_storage
+   *   The file storage.
+   */
+  public function __construct(
+    array $configuration,
+    $plugin_id,
+    $plugin_definition,
+    MigrationInterface $migration,
+    EntityStorageInterface $storage,
+    array $bundles,
+    EntityFieldManagerInterface $entity_field_manager,
+    FieldTypePluginManagerInterface $field_type_manager,
+    AccountSwitcherInterface $account_switcher = NULL,
+    AccumulatedPathAliasStorage $path_alias_storage,
+    AccumulatedFileStorage $file_storage
+  ) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $storage, $bundles, $entity_field_manager, $field_type_manager, $account_switcher, $path_alias_storage);
+    $this->fileStorage = $file_storage;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration = NULL) {
+    $entity_type_id = static::getEntityTypeId($plugin_id);
+    $entity_type_manager = $container->get('entity_type.manager');
+    $storage = $entity_type_manager->getStorage($entity_type_id);
+    $entity_type = $storage->getEntityType();
+
+    $storage_class = get_class($storage);
+    $storage_class_name = (new \ReflectionClass($storage_class))->getShortName();
+    $accumulated_storage_class = 'Drupal\reliefweb_migrate\Entity\Accumulated' . $storage_class_name;
+
+    // Use the accumulated storage if for the entity type if available.
+    if (class_exists($accumulated_storage_class) && is_subclass_of($accumulated_storage_class, $storage_class)) {
+      $storage = $accumulated_storage_class::createInstance($container, $entity_type);
+    }
+
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $migration,
+      $storage,
+      array_keys($container->get('entity_type.bundle.info')->getBundleInfo($entity_type_id)),
+      $container->get('entity_field.manager'),
+      $container->get('plugin.manager.field.field_type'),
+      $container->get('account_switcher'),
+      AccumulatedPathAliasStorage::createInstance($container, $entity_type_manager->getDefinition('path_alias')),
+      AccumulatedFileStorage::createInstance($container, $entity_type_manager->getDefinition('file'))
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function save(ContentEntityInterface $entity, array $old_destination_id_values = []) {
+    if ($entity instanceof Report) {
+      $this->saveAttachments($entity);
+    }
+    return parent::save($entity, $old_destination_id_values);
+  }
+
+  /**
+   * Save the file attachments of a report.
+   *
+   * @param \Drupal\reliefweb_entities\Entity\Report $entity
+   *   Report node entity.
+   */
+  protected function saveAttachments(Report $entity) {
+    if (!$entity->get('field_file')->isEmpty()) {
+      // If the entity is not published, we'll mark the files are private.
+      $private = TRUE;
+      if ($entity instanceof EntityPublishedInterface) {
+        $private = !$entity->isPublished();
+      }
+
+      // Create the field item and preview files with the permanent URIs.
+      foreach ($entity->get('field_file') as $item) {
+        if ($item->isEmpty()) {
+          continue;
+        }
+
+        $file = $item->createFile();
+        if (empty($file)) {
+          continue;
+        }
+        $file->setFileUri($item->getPermanentUri($private, FALSE));
+        $file->setSize($item->getFileSize());
+        $file->setPermanent();
+        $file->changed->value = $item->timestamp;
+        $file->created->value = $item->timestamp;
+        $this->fileStorage->saveAccumulated($file);
+        $item->get('file_uuid')->setValue($file->uuid());
+
+        if (!$item->canHavePreview() || empty($item->getPreviewPage())) {
+          continue;
+        }
+        $preview_file = $item->createPreviewFile(FALSE);
+        if (empty($preview_file)) {
+          continue;
+        }
+        $preview_file->setFileUri($item->getPermanentUri($private, TRUE));
+        $preview_file->changed->value = $item->timestamp;
+        $preview_file->created->value = $item->timestamp;
+        $preview_file->setPermanent();
+        $this->fileStorage->saveAccumulated($preview_file);
+        $item->get('preview_uuid')->setValue($preview_file->uuid());
+      }
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function postImport(MigrateImportEvent $event) {
+    parent::postImport($event);
+    // Make sure everything is saved.
+    $this->fileStorage->flushAccumulated();
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityRedirect.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityRedirect.php
new file mode 100644
index 000000000..38eb2c7ac
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityRedirect.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace Drupal\reliefweb_migrate\Plugin\migrate\destination;
+
+use Drupal\migrate\Plugin\MigrationInterface;
+use Drupal\reliefweb_migrate\Entity\AccumulatedPathAliasStorage;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Entity migration destination.
+ *
+ * @MigrateDestination(
+ *   id = "reliefweb_entity:redirect"
+ * )
+ */
+class EntityRedirect extends Entity {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration = NULL) {
+    $entity_type_id = static::getEntityTypeId($plugin_id);
+    $entity_type_manager = $container->get('entity_type.manager');
+    $storage = $entity_type_manager->getStorage($entity_type_id);
+    $entity_type = $storage->getEntityType();
+
+    // Use the accumulated storage if for the entity type if available.
+    $accumulated_storage_class = 'Drupal\reliefweb_migrate\Entity\AccumulatedRedirectStorage';
+    $storage = $accumulated_storage_class::createInstance($container, $entity_type);
+
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $migration,
+      $storage,
+      array_keys($container->get('entity_type.bundle.info')->getBundleInfo($entity_type_id)),
+      $container->get('entity_field.manager'),
+      $container->get('plugin.manager.field.field_type'),
+      $container->get('account_switcher'),
+      AccumulatedPathAliasStorage::createInstance($container, $entity_type_manager->getDefinition('path_alias'))
+    );
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityRevision.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityRevision.php
new file mode 100644
index 000000000..15a688fd2
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityRevision.php
@@ -0,0 +1,136 @@
+<?php
+
+namespace Drupal\reliefweb_migrate\Plugin\migrate\destination;
+
+use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\migrate\Event\MigrateImportEvent;
+use Drupal\migrate\Event\ImportAwareInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
+use Drupal\migrate\Plugin\migrate\destination\EntityRevision as EntityRevisionBase;
+use Drupal\migrate\Row;
+use Drupal\reliefweb_migrate\Entity\AccumulatedSqlContentEntityStorageInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Provides entity revision destination plugin.
+ *
+ * @todo preload all the entities with a loadMultiple so we can reduce the
+ * number of requests.
+ *
+ * @MigrateDestination(
+ *   id = "reliefweb_entity_revision",
+ *   deriver = "Drupal\reliefweb_migrate\Plugin\Derivative\MigrateEntityRevision"
+ * )
+ */
+class EntityRevision extends EntityRevisionBase implements ImportAwareInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration = NULL) {
+    $entity_type_id = static::getEntityTypeId($plugin_id);
+    $entity_type_manager = $container->get('entity_type.manager');
+    $storage = $entity_type_manager->getStorage($entity_type_id);
+    $entity_type = $storage->getEntityType();
+
+    $storage_class = get_class($storage);
+    $storage_class_name = (new \ReflectionClass($storage_class))->getShortName();
+    $accumulated_storage_class = 'Drupal\reliefweb_migrate\Entity\Accumulated' . $storage_class_name;
+
+    // Use the accumulated storage if for the entity type if available.
+    if (class_exists($accumulated_storage_class) && is_subclass_of($accumulated_storage_class, $storage_class)) {
+      $storage = $accumulated_storage_class::createInstance($container, $entity_type);
+    }
+
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $migration,
+      $storage,
+      array_keys($container->get('entity_type.bundle.info')->getBundleInfo($entity_type_id)),
+      $container->get('entity_field.manager'),
+      $container->get('plugin.manager.field.field_type'),
+      $container->get('account_switcher')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEntity(Row $row, array $old_destination_id_values) {
+    $revision_id = reset($old_destination_id_values) ?: $this->getEntityRevisionId($row);
+
+    // Delete the existing revision so we can insert the new one without having
+    // to worry about changes, unwanted new revisions etc.
+    if ($this->migration->getSourcePlugin()->entityExists($revision_id)) {
+      $this->storage->deleteRevision($revision_id);
+    }
+
+    // Attempt to ensure we always have a bundle.
+    if ($bundle = $this->getBundle($row)) {
+      $row->setDestinationProperty($this->getKey('bundle'), $bundle);
+    }
+
+    // We create a "new" entity and mark is a non default revision and non new
+    // so that we can avoid unnecessary loading from the database. The
+    // information should be enough for the storage to fill the revision tables.
+    // @todo we may want to check that the base entity exists in the system.
+    $entity = $this->storage->create($row->getDestination());
+    $entity->original = $entity;
+    $entity->enforceIsNew(FALSE);
+    $entity->isDefaultRevision(FALSE);
+    $entity->setNewRevision(TRUE);
+    return $entity;
+  }
+
+  /**
+   * Get the revision ID of the entity row.
+   *
+   * @param \Drupal\migrate\Row $row
+   *   Migration row.
+   *
+   * @return int
+   *   Revision ID.
+   */
+  protected function getEntityRevisionId(Row $row) {
+    return $row->getDestinationProperty($this->getKey('revision'));
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function save(ContentEntityInterface $entity, array $old_destination_id_values = []) {
+    if (!empty($entity->skip_saving)) {
+      return [$entity->getRevisionId()];
+    }
+    if ($this->storage instanceof AccumulatedSqlContentEntityStorageInterface) {
+      $this->storage->saveAccumulated($entity, $this->migration->getSourcePlugin()->getBatchSize());
+      return [$entity->getRevisionId()];
+    }
+    else {
+      return parent::save($entity, $old_destination_id_values);
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function rollback(array $destination_identifier) {
+    $this->storage->deleteRevision(reset($destination_identifier));
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function preImport(MigrateImportEvent $event) {
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function postImport(MigrateImportEvent $event) {
+    $this->storage->flushAccumulated();
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityUser.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityUser.php
new file mode 100644
index 000000000..ac521d27b
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityUser.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace Drupal\reliefweb_migrate\Plugin\migrate\destination;
+
+use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\migrate\Event\MigrateImportEvent;
+use Drupal\migrate\Event\ImportAwareInterface;
+use Drupal\migrate\Plugin\MigrationInterface;
+use Drupal\migrate\Row;
+use Drupal\reliefweb_migrate\Entity\AccumulatedSqlContentEntityStorageInterface;
+use Drupal\user\Plugin\migrate\destination\EntityUser as EntityUserBase;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Entity migration destination.
+ *
+ * @MigrateDestination(
+ *   id = "reliefweb_entity:user"
+ * )
+ */
+class EntityUser extends EntityUserBase implements ImportAwareInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration = NULL) {
+    $entity_type_id = static::getEntityTypeId($plugin_id);
+    $storage = $container->get('entity_type.manager')->getStorage($entity_type_id);
+    $entity_type = $storage->getEntityType();
+
+    $storage_class = get_class($storage);
+    $storage_class_name = (new \ReflectionClass($storage_class))->getShortName();
+    $accumulated_storage_class = 'Drupal\reliefweb_migrate\Entity\Accumulated' . $storage_class_name;
+
+    // Use the accumulated storage if for the entity type if available.
+    if (class_exists($accumulated_storage_class) && is_subclass_of($accumulated_storage_class, $storage_class)) {
+      $storage = $accumulated_storage_class::createInstance($container, $entity_type);
+    }
+
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $migration,
+      $storage,
+      array_keys($container->get('entity_type.bundle.info')->getBundleInfo($entity_type_id)),
+      $container->get('entity_field.manager'),
+      $container->get('plugin.manager.field.field_type'),
+      $container->get('password'),
+      $container->get('account_switcher')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   *
+   * We use a shortcut here to reduce the number of database requests by
+   * assuming we only create new entities with that migration destination.
+   *
+   * This is supposed to work due to the use of hight water properties to
+   * only deal with new entities.
+   *
+   * @todo review how to handle updates.
+   *
+   * @todo use the preImport event to preload existing entities with a
+   * loadMultiple which should, in theory, be more efficient than several
+   * individual loads.
+   */
+  protected function getEntity(Row $row, array $old_destination_id_values) {
+    // Attempt to ensure we always have a bundle.
+    if ($bundle = $this->getBundle($row)) {
+      $row->setDestinationProperty($this->getKey('bundle'), $bundle);
+    }
+
+    $entity = $this->storage->create($row->getDestination());
+    $entity->enforceIsNew();
+    return $entity;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function save(ContentEntityInterface $entity, array $old_destination_id_values = []) {
+    if ($this->storage instanceof AccumulatedSqlContentEntityStorageInterface) {
+      $this->storage->saveAccumulated($entity, $this->migration->getSourcePlugin()->getBatchSize());
+    }
+    else {
+      $this->storage->save($entity);
+    }
+    return [$entity->id()];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function preImport(MigrateImportEvent $event) {
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function postImport(MigrateImportEvent $event) {
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Image.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Image.php
deleted file mode 100644
index 7f5923e6a..000000000
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Image.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-
-namespace Drupal\reliefweb_migrate\Plugin\migrate\destination;
-
-use Drupal\Core\Database\Connection;
-use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Entity\EntityFieldManagerInterface;
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Field\FieldTypePluginManagerInterface;
-use Drupal\file\Plugin\migrate\destination\EntityFile;
-use Drupal\migrate\Plugin\MigrationInterface;
-use Drupal\migrate\Row;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Image migration destination.
- *
- * @MigrateDestination(
- *   id = "reliefweb_image"
- * )
- */
-class Image extends EntityFile {
-
-  /**
-   * The database connection.
-   *
-   * @var \Drupal\Core\Database\Connection
-   */
-  protected $database;
-
-  /**
-   * Constructs a content entity.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin ID for the plugin instance.
-   * @param mixed $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\migrate\Plugin\MigrationInterface $migration
-   *   The migration entity.
-   * @param \Drupal\Core\Entity\EntityStorageInterface $storage
-   *   The storage for this entity type.
-   * @param array $bundles
-   *   The list of bundles this entity type has.
-   * @param \Drupal\Core\Entity\EntityFieldManagerInterface $entity_field_manager
-   *   The entity field manager.
-   * @param \Drupal\Core\Field\FieldTypePluginManagerInterface $field_type_manager
-   *   The field type plugin manager service.
-   * @param \Drupal\Core\Database\Connection $database
-   *   The database connection.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, EntityStorageInterface $storage, array $bundles, EntityFieldManagerInterface $entity_field_manager, FieldTypePluginManagerInterface $field_type_manager, Connection $database) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $storage, $bundles, $entity_field_manager, $field_type_manager);
-    $this->database = $database;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration = NULL) {
-    $entity_type = static::getEntityTypeId($plugin_id);
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $migration,
-      $container->get('entity_type.manager')->getStorage($entity_type),
-      array_keys($container->get('entity_type.bundle.info')->getBundleInfo($entity_type)),
-      $container->get('entity_field.manager'),
-      $container->get('plugin.manager.field.field_type'),
-      $container->get('database')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getEntity(Row $row, array $old_destination_id_values) {
-    $entity = parent::getEntity($row, $old_destination_id_values);
-    // Store the old ReliefWeb URI so we can store the mapping.
-    $entity->old_uri = $row->getDestinationProperty('old_uri');
-    return $entity;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function save(ContentEntityInterface $entity, array $old_destination_id_values = []) {
-    /** @var \Drupal\file\FileInterface $entity */
-    $uri = $entity->getFileUri();
-    if (!empty($uri) && !empty($entity->old_uri)) {
-      \Drupal::database()
-        ->merge('reliefweb_migrate_uri_mapping')
-        ->keys(['new_uri' => $uri])
-        ->fields(['old_uri' => $entity->old_uri])
-        ->execute();
-    }
-    return parent::save($entity, $old_destination_id_values);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function rollback(array $destination_identifier) {
-    // Delete the specified entity from Drupal if it exists.
-    /** @var \Drupal\file\FileInterface $entity */
-    $entity = $this->storage->load(reset($destination_identifier));
-    if (!empty($entity)) {
-      // Delete the URI mapping.
-      $uri = $entity->getFileUri();
-      if (!empty($uri)) {
-        \Drupal::database()
-          ->delete('reliefweb_migrate_uri_mapping')
-          ->condition('new_uri', $uri)
-          ->execute();
-      }
-
-      $entity->delete();
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static function getEntityTypeId($plugin_id) {
-    return 'file';
-  }
-
-}
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/id_map/AccumulatedSql.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/id_map/AccumulatedSql.php
new file mode 100644
index 000000000..8c7d88275
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/id_map/AccumulatedSql.php
@@ -0,0 +1,220 @@
+<?php
+
+namespace Drupal\reliefweb_migrate\Plugin\migrate\id_map;
+
+use Drupal\migrate\Event\MigrateEvents;
+use Drupal\migrate\Event\MigrateMapSaveEvent;
+use Drupal\migrate\Plugin\migrate\id_map\Sql;
+use Drupal\migrate\Plugin\MigrateIdMapInterface;
+use Drupal\migrate\Row;
+use Drupal\reliefweb_migrate\Plugin\migrate\source\EntityBase;
+
+/**
+ * Migration ID map class that accumulates data before inserting.
+ */
+class AccumulatedSql extends Sql {
+
+  /**
+   * Store the preloaded id mapping.
+   *
+   * @var array
+   */
+  protected $preloadedIdMapping = [];
+
+  /**
+   * Accumulate the data to save in the ID mapping.
+   *
+   * @var arrat
+   */
+  protected $accumulatedIdMapping = [];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getRowBySource(array $source_id_values) {
+    $hash = $this->getSourceIdsHash($source_id_values);
+    if (array_key_exists($hash, $this->preloadedIdMapping)) {
+      return $this->preloadedIdMapping[$hash];
+    }
+    else {
+      return parent::getRowBySource($source_id_values);
+    }
+  }
+
+  /**
+   * Preload source row data from the mapping table.
+   *
+   * @param array $ids
+   *   Source IDs.
+   *
+   * @return array
+   *   The preloaded ID mapping.
+   */
+  public function preloadIdMapping(array $ids) {
+    if (!empty($ids)) {
+      $data = $this->getDatabase()
+        ->select($this->mapTableName(), 'map')
+        ->fields('map')
+        ->condition($this::SOURCE_IDS_HASH, $ids, 'IN')
+        ->execute()
+        ?->fetchAllAssoc($this::SOURCE_IDS_HASH, \PDO::FETCH_ASSOC) ?? [];
+
+      $this->preloadedIdMapping = [];
+      foreach ($ids as $id) {
+        $this->preloadedIdMapping[$id] = $data[$id] ?? NULL;
+      }
+    }
+    return $this->preloadedIdMapping;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function lookupDestinationIds(array $source_id_values) {
+    if (empty($source_id_values)) {
+      return [];
+    }
+
+    $hash = $this->getSourceIdsHash($source_id_values);
+    if (array_key_exists($hash, $this->preloadedIdMapping)) {
+      $data = $this->preloadedIdMapping[$hash];
+      if (empty($data)) {
+        return [];
+      }
+
+      $result = [];
+      foreach ($this->destinationIdFields() as $field) {
+        $result[] = isset($data[$field]) ? [$data[$field]] : [];
+      }
+      return $result;
+    }
+    else {
+      return parent::lookupDestinationIds($source_id_values);
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function saveIdMapping(Row $row, array $destination_id_values, $source_row_status = MigrateIdMapInterface::STATUS_IMPORTED, $rollback_action = MigrateIdMapInterface::ROLLBACK_DELETE) {
+
+    if ($this->migration->getSourcePlugin() instanceof EntityBase) {
+      $this->saveIdMappingAccumulated($row, $destination_id_values, $source_row_status, $rollback_action);
+    }
+    else {
+      parent::saveIdMapping($row, $destination_id_values, $source_row_status, $rollback_action);
+    }
+  }
+
+  /**
+   * Save the accumulated mapping data.
+   *
+   * @see \Drupal\migrate\Plugin\MigrateIdMapInterface::saveIdMapping(),
+   */
+  protected function saveIdMappingAccumulated(Row $row, array $destination_id_values, $source_row_status = MigrateIdMapInterface::STATUS_IMPORTED, $rollback_action = MigrateIdMapInterface::ROLLBACK_DELETE) {
+    // Construct the source key.
+    $source_id_values = $row->getSourceIdValues();
+
+    // Construct the source key and initialize to empty variable keys.
+    $fields = [];
+    foreach ($this->sourceIdFields() as $field_name => $key_name) {
+
+      // A NULL key value is usually an indication of a problem.
+      if (!isset($source_id_values[$field_name])) {
+        $message = $this->t('Did not save to map table due to NULL value for key field @field', [
+          '@field' => $field_name,
+        ]);
+        $this->message->display($message, 'error');
+        return;
+      }
+      $fields[$key_name] = $source_id_values[$field_name];
+    }
+    if (!$fields) {
+      return;
+    }
+    $fields += [
+      'source_row_status' => (int) $source_row_status,
+      'rollback_action' => (int) $rollback_action,
+      'hash' => $row->getHash(),
+    ];
+    $count = 0;
+    foreach ($destination_id_values as $dest_id) {
+      $fields['destid' . ++$count] = $dest_id;
+    }
+    if ($count && $count != count($this->destinationIdFields())) {
+      $message = $this->t('Could not save to map table due to missing destination id values');
+      $this->message->display($message, 'error');
+      return;
+    }
+    if ($this->migration->getTrackLastImported()) {
+      $fields['last_imported'] = time();
+    }
+    $keys = [
+      $this::SOURCE_IDS_HASH => $this->getSourceIdsHash($source_id_values),
+    ];
+
+    // Notify anyone listening of the map row we're about to save.
+    $this->eventDispatcher->dispatch(new MigrateMapSaveEvent($this, $fields), MigrateEvents::MAP_SAVE);
+
+    // Store the data to save in the map table.
+    $this->accumulatedIdMapping[$keys[$this::SOURCE_IDS_HASH]] = $fields;
+
+    // Save the mapping.
+    if (count($this->accumulatedIdMapping) > 1000) {
+      $this->flushAccumulatedIdMapping();
+    }
+  }
+
+  /**
+   * Save the id mapping in the database.
+   */
+  public function flushAccumulatedIdMapping() {
+    if (empty($this->accumulatedIdMapping)) {
+      return;
+    }
+
+    $database = $this->getDatabase();
+    $table = $this->mapTableName();
+    $hash_field = $this::SOURCE_IDS_HASH;
+
+    // Retrieve the list of rows to update.
+    $existing = $database
+      ->select($table, 'map')
+      ->fields('map', [$hash_field])
+      ->condition('map.' . $hash_field, array_keys($this->accumulatedIdMapping), 'IN')
+      ->execute()
+      ?->fetchCol() ?? [];
+    $existing = array_flip($existing);
+
+    $insertions = [];
+    foreach ($this->accumulatedIdMapping as $hash => $fields) {
+      // Update the data.
+      if (isset($existing[$hash])) {
+        $database
+          ->update($table)
+          ->fields($fields)
+          ->condition($hash_field, $hash)
+          ->execute();
+      }
+      else {
+        $insertions[] = [$hash_field => $hash] + $fields;
+      }
+    }
+
+    $count_fields = NULL;
+    if (!empty($insertions)) {
+      $query = $database->insert($table);
+      foreach ($insertions as $values) {
+        if (!isset($count_fields)) {
+          $count_fields = count(array_keys($values));
+        }
+        $query->fields(array_keys($values));
+        $query->values(array_values($values));
+      }
+      $query->execute();
+    }
+
+    $this->accumulatedIdMapping = [];
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/process/Unserialize.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/process/Unserialize.php
index 2d2987967..46d36e9a6 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/process/Unserialize.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/process/Unserialize.php
@@ -28,7 +28,8 @@ public function transform($value, MigrateExecutableInterface $migrate_executable
     if (!is_string($value)) {
       throw new MigrateException(sprintf("Input should be a string, instead it was of type '%s'", gettype($value)));
     }
-    $new_value = NestedArray::getValue(unserialize($value), $this->configuration['index'], $key_exists);
+    $data = unserialize($value);
+    $new_value = NestedArray::getValue($data, $this->configuration['index'], $key_exists);
 
     if (!$key_exists) {
       if (array_key_exists('default', $this->configuration)) {
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Book.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Book.php
index 1da98385e..a118569a7 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Book.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Book.php
@@ -21,8 +21,9 @@ public function query() {
       ->fields('b', ['nid', 'bid']);
 
     $query->join('menu_links', 'ml', 'b.mlid = ml.mlid');
+    $query->addField('ml', 'plid', 'pid');
 
-    $ml_fields = ['mlid', 'plid', 'weight', 'has_children', 'depth'];
+    $ml_fields = ['weight', 'has_children', 'depth'];
     foreach (range(1, 9) as $i) {
       $field = "p$i";
       $ml_fields[] = $field;
@@ -37,8 +38,8 @@ public function query() {
    * {@inheritdoc}
    */
   public function getIds() {
-    $ids['mlid']['type'] = 'integer';
-    $ids['mlid']['alias'] = 'ml';
+    $ids['nid']['type'] = 'integer';
+    $ids['nid']['alias'] = 'b';
     return $ids;
   }
 
@@ -49,8 +50,7 @@ public function fields() {
     return [
       'nid' => $this->t('Node ID'),
       'bid' => $this->t('Book ID'),
-      'mlid' => $this->t('Menu link ID'),
-      'plid' => $this->t('Parent link ID'),
+      'pid' => $this->t('Parent link ID'),
       'weight' => $this->t('Weight'),
       'p1' => $this->t('The first mlid in the materialized path. If N = depth, then pN must equal the mlid. If depth > 1 then p(N-1) must equal the parent link mlid. All pX where X > depth must equal zero. The columns p1 .. p9 are also called the parents.'),
       'p2' => $this->t('The second mlid in the materialized path. See p1.'),
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
new file mode 100644
index 000000000..25cf6b22b
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
@@ -0,0 +1,193 @@
+<?php
+
+namespace Drupal\reliefweb_migrate\Plugin\migrate\source;
+
+use Drupal\migrate\Event\ImportAwareInterface;
+use Drupal\migrate\Event\MigrateImportEvent;
+use Drupal\migrate\Event\MigrateRollbackEvent;
+use Drupal\migrate\Event\RollbackAwareInterface;
+use Drupal\migrate\Plugin\migrate\source\SqlBase;
+use Drupal\reliefweb_migrate\Plugin\migrate\id_map\AccumulatedSql;
+
+/**
+ * Base entity source plugin for reliefweb migrations.
+ */
+abstract class EntityBase extends SqlBase implements ImportAwareInterface, RollbackAwareInterface {
+
+  /**
+   * Entity type.
+   *
+   * @var string
+   */
+  protected $entityType;
+
+  /**
+   * Id field.
+   *
+   * @var string
+   */
+  protected $idField;
+
+  /**
+   * Bundle field.
+   *
+   * @var string
+   */
+  protected $bundleField;
+
+  /**
+   * Revision id field.
+   *
+   * @var string
+   */
+  protected $revisionIdField = 'revision_id';
+
+  /**
+   * Flag indicating whether to pass the revision id to get the fields.
+   *
+   * When TRUE, this will load the data from the field revision tables.
+   *
+   * @var bool
+   */
+  protected $useRevisionId = FALSE;
+
+  /**
+   * Stored high water mark property.
+   *
+   * @var mixed
+   */
+  protected $storedHighWater;
+
+  /**
+   * Map of already migrated content.
+   *
+   * @var array
+   */
+  protected $migratedEntities = [];
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function initializeIterator() {
+    $iterator = parent::initializeIterator();
+
+    if (!empty($this->batchSize)) {
+      $this->preloadIdMapping($iterator);
+    }
+
+    return $iterator;
+  }
+
+  /**
+   * Preload the ID mapping.
+   *
+   * @param \IteratorIterator $iterator
+   *   The iterator over the records returned from the database query.
+   */
+  protected function preloadIdMapping(\IteratorIterator $iterator) {
+    // Pre-compute the ID of the row to be created.
+    if ($this->idMap instanceof AccumulatedSql && $iterator->count() > 0) {
+      $use_revision_id = $this->useRevisionId && !empty($this->revisionIdField);
+
+      $iterator->rewind();
+
+      $source_ids = $this->getIds();
+
+      $source_id_hashes = [];
+      foreach ($iterator as $record) {
+        if ($use_revision_id) {
+          $id = $record[$this->revisionIdField];
+        }
+        else {
+          $id = $record[$this->idField];
+        }
+
+        $source_id_values = array_merge($source_ids, array_intersect_key($record, $source_ids));
+        $source_id_hashes[$this->idMap->getSourceIdsHash($source_id_values)] = $id;
+      }
+
+      $preloaded = $this->idMap->preloadIdMapping(array_keys($source_id_hashes));
+      foreach ($preloaded as $hash => $data) {
+        $this->migratedEntities[$source_id_hashes[$hash]] = !empty($data);
+      }
+
+      $iterator->rewind();
+    }
+  }
+
+  /**
+   * Check if an entity was already migrated.
+   *
+   * @param int $id
+   *   Entity id.
+   *
+   * @return bool
+   *   TRUE if the entity already exists.
+   */
+  public function entityExists($id) {
+    $exists = !empty($this->migratedEntities[$id]);
+    unset($this->migratedEntities[$id]);
+    return $exists;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function saveHighWater($high_water) {
+    // To avoid excessive database usage, we store the the high water and we'll
+    // save it only after the import.
+    $this->storedHighWater = $high_water;
+  }
+
+  /**
+   * Do save the hight water property.
+   */
+  protected function doSaveHighWater() {
+    if (isset($this->storedHighWater)) {
+      $this->getHighWaterStorage()->set($this->migration->id(), $this->storedHighWater);
+      $this->storedHighWater = NULL;
+    }
+  }
+
+  /**
+   * Get the batch size.
+   *
+   * @return int
+   *   Batch size.
+   */
+  public function getBatchSize() {
+    return $this->batchSize;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function preImport(MigrateImportEvent $event) {
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function postImport(MigrateImportEvent $event) {
+    if ($this->idMap instanceof AccumulatedSql) {
+      $this->idMap->flushAccumulatedIdMapping();
+    }
+
+    $this->doSaveHighWater();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function preRollback(MigrateRollbackEvent $event) {
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function postRollback(MigrateRollbackEvent $event) {
+    // Unset the hight water value after a rollback.
+    $this->getHighWaterStorage()->set($this->migration->id(), NULL);
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/FieldableEntityBase.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/FieldableEntityBase.php
index 5da45bc75..06cc795e4 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/FieldableEntityBase.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/FieldableEntityBase.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\reliefweb_migrate\Plugin\migrate\source;
 
-use Drupal\migrate\Plugin\migrate\source\SqlBase;
 use Drupal\migrate\Row;
 
 /**
@@ -10,68 +9,247 @@
  *
  * @see \Drupal\migrate_drupal\Plugin\migrate\source\d7\FieldableEntity.
  */
-abstract class FieldableEntityBase extends SqlBase {
+abstract class FieldableEntityBase extends EntityBase {
 
   /**
-   * Entity type.
+   * Store the field instance data per entity types and bundles.
    *
-   * @var string
+   * @var array
    */
-  protected $entityType;
+  protected $fieldInstances = [];
 
   /**
-   * Id field.
+   * Preloaded field values when a batch size is used.
    *
-   * @var string
+   * @var array
    */
-  protected $idField;
+  protected $preloadedFieldValues = [];
 
   /**
-   * Revision id field.
+   * Preloaded url aliases when a batch size is used.
    *
-   * @var string
+   * @var array
+   */
+  protected $preloadedUrlAliases = [];
+
+  /**
+   * {@inheritdoc}
    */
-  protected $revisionIdField = 'revision_id';
+  protected function initializeIterator() {
+    $iterator = parent::initializeIterator();
 
+    // Preload the raw field values if we are processing the entities in batch
+    // to reduce the number of database requests.
+    if (!empty($this->batchSize)) {
+      $this->preloadFields($iterator);
+    }
+
+    return $iterator;
+  }
 
   /**
-   * Bundle field.
+   * Preload the raw field values for the entity records.
    *
-   * @var string
+   * @param \IteratorIterator $iterator
+   *   Iterator of the database statement with the query results.
    */
-  protected $bundleField;
+  protected function preloadFields(\IteratorIterator $iterator) {
+    $iterator->rewind();
+
+    if ($iterator->count() > 0) {
+      // Clear the previously preloaded values and aliases.
+      $this->preloadedFieldValues = [];
+      $this->preloadedUrlAliases = [];
+
+      $use_revision_id = $this->useRevisionId && !empty($this->revisionIdField);
+
+      // Extract the entity ids or revision ids.
+      $bundles = [];
+      foreach ($iterator as $record) {
+        if ($use_revision_id) {
+          $id = $record[$this->revisionIdField];
+        }
+        else {
+          $id = $record[$this->idField];
+        }
+        $bundles[$record[$this->bundleField]][$id] = $id;
+      }
+
+      $iterator->rewind();
+
+      // Retrieve the field values.
+      foreach ($bundles as $bundle => $ids) {
+        foreach ($this->getFields($this->entityType, $bundle) as $field_name => $field) {
+          $this->preloadedFieldValues[$bundle][$field_name] = $this->getAllFieldValues($this->entityType, $field_name, $ids, $use_revision_id);
+        }
+      }
+
+      // Preload the URL aliases.
+      $this->preloadUrlAliases($bundles);
+    }
+  }
 
   /**
-   * Flag indicating whether to pass the revision id to get the fields.
+   * Preload URL aliases.
    *
-   * When TRUE, this will load the data from the field revision tables.
+   * @param array $bundles
+   *   List of entity ids grouped by bundles.
+   */
+  protected function preloadUrlAliases(array $bundles) {
+    // Ignore aliases for revisions.
+    if (!empty($this->useRevisionId)) {
+      return;
+    }
+    // There are only aliases for nodes and terms in ReliefWeb Drupal 7.
+    if ($this->entityType !== 'node' && $this->entityType !== 'taxonomy_term') {
+      return;
+    }
+
+    $base = strtr($this->entityType, '_', '/') . '/';
+
+    $sources = [];
+    foreach ($bundles as $ids) {
+      foreach ($ids as $id) {
+        $sources[$id] = $base . $id;
+      }
+    }
+
+    // Order by pid ASC to get the most recent URL aliases for the entities.
+    $records = $this->select('url_alias', 'u')
+      ->fields('u', ['pid', 'source', 'alias'])
+      ->condition('u.source', $sources, 'IN')
+      ->orderBy('u.pid', 'ASC')
+      ->execute();
+
+    $aliases = [];
+    foreach ($records as $record) {
+      $aliases[$record['source']] = $record['alias'];
+    }
+
+    foreach ($sources as $id => $source) {
+      if (isset($aliases[$source])) {
+        $this->preloadedUrlAliases[$id] = '/' . $aliases[$source];
+      }
+    }
+  }
+
+  /**
+   * Get an entity URL alias.
    *
-   * @var bool
+   * @param int $id
+   *   Entity id.
    */
-  protected $useRevisionId = FALSE;
+  protected function getUrlAlias($id) {
+    $source = strtr($this->entityType, '_', '/') . '/' . $id;
+
+    // Order by pid ASC to get the most recent URL alias for the entity.
+    $records = $this->select('url_alias', 'u')
+      ->fields('u', ['pid', 'source', 'alias'])
+      ->condition('u.source', $source, '=')
+      ->orderBy('u.pid', 'ASC')
+      ->execute();
+
+    $aliases = [];
+    foreach ($records as $record) {
+      $aliases[$record['source']] = $record['alias'];
+    }
+
+    return $aliases[$source] ?? NULL;
+  }
 
   /**
-   * Store the field instance data per entity types and bundles.
+   * Retrieves field values for a single field of a single entity.
    *
-   * @var array
+   * @param string $entity_type
+   *   The entity type.
+   * @param string $field
+   *   The field name.
+   * @param array $ids
+   *   The entity IDs or revision IDs.
+   * @param bool $use_revision_id
+   *   Whether the ids are revision ids or entity ids.
+   * @param string $language
+   *   (optional) The field language.
+   *
+   * @return array
+   *   The raw field values, keyed by entity or revision id, then delta.
    */
-  protected $fieldInstances = [];
+  protected function getAllFieldValues($entity_type, $field, array $ids, $use_revision_id = FALSE, $language = NULL) {
+    if (!$use_revision_id) {
+      $table = 'field_data_' . $field;
+      $id_field = 'entity_id';
+    }
+    else {
+      $table = 'field_revision_' . $field;
+      $id_field = 'revision_id';
+    }
+
+    $query = $this->select($table, 't')
+      ->fields('t')
+      ->condition('entity_type', $entity_type)
+      ->condition($id_field, $ids, 'IN')
+      ->condition('deleted', 0);
+
+    // Add 'language' as a query condition if it has been defined by Entity
+    // Translation.
+    if ($language) {
+      $query->condition('language', $language);
+    }
+    $values = [];
+    foreach ($query->execute() as $row) {
+      $id = $row[$id_field];
+      foreach ($row as $key => $value) {
+        $delta = $row['delta'];
+        if (strpos($key, $field) === 0) {
+          $column = substr($key, strlen($field) + 1);
+          $values[$id][$delta][$column] = $value;
+        }
+      }
+    }
+    return $values;
+  }
 
   /**
    * {@inheritdoc}
    */
   public function prepareRow(Row $row) {
-    $id = $row->getSourceProperty($this->idField);
     $bundle = $row->getSourceProperty($this->bundleField);
 
-    $revision_id = NULL;
-    if ($this->useRevisionId && !empty($this->revisionIdField)) {
-      $revision_id = $row->getSourceProperty($this->revisionIdField);
+    if (!empty($this->batchSize)) {
+      if ($this->useRevisionId && !empty($this->revisionIdField)) {
+        $id = $row->getSourceProperty($this->revisionIdField);
+      }
+      else {
+        $id = $row->getSourceProperty($this->idField);
+      }
+
+      foreach ($this->getFields($this->entityType, $bundle) as $field_name => $field) {
+        if (isset($this->preloadedFieldValues[$bundle][$field_name][$id])) {
+          $row->setSourceProperty($field_name, $this->preloadedFieldValues[$bundle][$field_name][$id]);
+          unset($this->preloadedFieldValues[$bundle][$field_name][$id]);
+        }
+      }
+
+      if (!empty($this->preloadedUrlAliases[$id])) {
+        $row->setDestinationProperty('url_alias', $this->preloadedUrlAliases[$id]);
+      }
     }
+    else {
+      $id = $row->getSourceProperty($this->idField);
 
-    // Get Field API field values.
-    foreach ($this->getFields($this->entityType, $bundle) as $field_name => $field) {
-      $row->setSourceProperty($field_name, $this->getFieldValues($this->entityType, $field_name, $id, $revision_id));
+      $revision_id = NULL;
+      if ($this->useRevisionId && !empty($this->revisionIdField)) {
+        $revision_id = $row->getSourceProperty($this->revisionIdField);
+      }
+
+      foreach ($this->getFields($this->entityType, $bundle) as $field_name => $field) {
+        $row->setSourceProperty($field_name, $this->getFieldValues($this->entityType, $field_name, $id, $revision_id));
+      }
+
+      $url_alias = $this->getUrlAlias($id);
+      if (!empty($url_alias)) {
+        $row->setDestinationProperty('url_alias', $url_alias);
+      }
     }
 
     return parent::prepareRow($row);
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Image.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Image.php
index 7e1323546..e560026ff 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Image.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Image.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\reliefweb_migrate\Plugin\migrate\source;
 
-use Drupal\migrate\Plugin\migrate\source\SqlBase;
 use Drupal\migrate\Row;
 use Drupal\reliefweb_utility\Helpers\LegacyHelper;
 
@@ -13,7 +12,12 @@
  *   id = "reliefweb_image"
  * )
  */
-class Image extends SqlBase {
+class Image extends EntityBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $idField = 'fid';
 
   /**
    * Directory replacements.
@@ -105,6 +109,7 @@ public function query() {
     $query->innerJoin('file_usage', 'fu', 'fu.fid = fm.fid');
     $query->condition('fu.count', 0, '>');
 
+    $query->orderBy('fm.fid', 'ASC');
     return $query->distinct();
   }
 
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Media.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Media.php
index bcacd00fc..4848f5008 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Media.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Media.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\reliefweb_migrate\Plugin\migrate\source;
 
-use Drupal\migrate\Plugin\migrate\source\SqlBase;
+use Drupal\migrate\Event\MigrateImportEvent;
 
 /**
  * Retrieve image medias from the Drupal 7 database.
@@ -14,7 +14,12 @@
  *   id = "reliefweb_media"
  * )
  */
-class Media extends SqlBase {
+class Media extends EntityBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $idField = 'fid';
 
   /**
    * {@inheritdoc}
@@ -51,6 +56,7 @@ public function query() {
     $query->addField('f', $field . '_width', 'width');
     $query->addField('f', $field . '_height', 'height');
 
+    $query->orderBy('fm.fid', 'ASC');
     return $query->distinct();
   }
 
@@ -80,4 +86,19 @@ public function getIds() {
     return $ids;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function postImport(MigrateImportEvent $event) {
+    parent::postImport($event);
+
+    // Update the no-thumbnail media icon to prevent file ID clash with
+    // attachments.
+    $this->database
+      ->update('file_managed')
+      ->fields(['fid' => 1, 'uid' => 2])
+      ->condition('uri', 'public://media-icons/generic/no-thumbnail.png', '=')
+      ->execute();
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Node.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Node.php
index c62c6c019..d159d0a9f 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Node.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Node.php
@@ -2,9 +2,6 @@
 
 namespace Drupal\reliefweb_migrate\Plugin\migrate\source;
 
-use Drupal\migrate\Row;
-use Drupal\reliefweb_utility\Helpers\LegacyHelper;
-
 /**
  * Retrieve nodes from the Drupal 7 database.
  *
@@ -36,6 +33,11 @@ class Node extends FieldableEntityBase {
    */
   protected $bundleField = 'type';
 
+  /**
+   * {@inheritdoc}
+   */
+  protected $revisionIdField = 'vid';
+
   /**
    * {@inheritdoc}
    */
@@ -60,14 +62,22 @@ public function query() {
     // Base fields.
     $query->addField('n', 'nid', 'nid');
     $query->addField('n', 'type', 'type');
-    $query->addField('n', 'title', 'title');
     $query->addField('n', 'uid', 'uid');
     $query->addField('n', 'created', 'created');
     $query->addField('n', 'changed', 'changed');
-    $query->addField('n', 'status', 'status');
 
-    // Revision fields.
-    $query->addField('nr', 'vid', 'revision_id');
+    if (!$this->useRevisionId) {
+      $query->addField('n', 'title', 'title');
+      $query->addField('n', 'status', 'status');
+    }
+    else {
+      $query->addField('nr', 'title', 'title');
+      $query->addField('nr', 'status', 'status');
+    }
+
+    // Revision fields. We need to keep the "vid" name instead of "revision_id"
+    // for the revision ID so that we can use the high water mark property.
+    $query->addField('nr', 'vid', 'vid');
     $query->addField('nr', 'log', 'revision_log_message');
     $query->addField('nr', 'uid', 'revision_user');
     $query->addField('nr', 'timestamp', 'revision_created');
@@ -83,139 +93,11 @@ public function query() {
       $query->range(0, 1000);
       $query->orderBy('n.nid', 'DESC');
     }
-
-    return $query;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function prepareRow(Row $row) {
-    if (parent::prepareRow($row) === FALSE) {
-      return FALSE;
-    }
-
-    $bundle = $row->getSourceProperty('type');
-    if ($bundle === 'report') {
-      $nid = $row->getSourceProperty('nid');
-
-      // Generate the UUID based on the URI.
-      $uuid = LegacyHelper::generateDocumentUuid($nid);
-
-      // Set the node UUID.
-      $row->setDestinationProperty('uuid', $uuid);
-
-      // Prepare the file data to be added to the created/updated node.
-      $this->prepareAttachments($row);
-    }
-  }
-
-  /**
-   * Prepare the attachments to add to a report node.
-   *
-   * @param \Drupal\migrate\Row $row
-   *   Migration row.
-   */
-  protected function prepareAttachments(Row $row) {
-    // Skip if it's a revision as we cannot migrate file revisions because tere
-    // is no usable data anymore and in theory, the editorial workflow is to
-    // delete previous files when uploading a replacement. In that case, there
-    // is already a message in the revision log that will be migrated so we
-    // normally don't have anything to.
-    if ($this instanceof NodeRevision) {
-      return;
-    }
-
-    $field_file = $row->getSourceProperty('field_file');
-    if (empty($field_file)) {
-      return;
-    }
-
-    $items = [];
-    foreach ($field_file as $item) {
-      $items[$item['fid']] = $this->parseAttachmentDescription($item['description'] ?? '');
-    }
-    if (empty($items)) {
-      return;
-    }
-
-    // Load the data from the file_managed table.
-    $records = $this->select('file_managed', 'fm')
-      ->fields('fm', ['fid', 'uri', 'filename', 'filemime', 'filesize'])
-      ->condition('fm.status', 1, '=')
-      ->condition('fm.fid', array_keys($items), 'IN')
-      ->execute()
-      ?->fetchAll(\PDO::FETCH_OBJ) ?? [];
-
-    $attachments = [];
-    foreach ($records as $record) {
-      if (empty($record->uri)) {
-        continue;
-      }
-      $item = $items[$record->fid];
-      $item['uuid'] = LegacyHelper::generateAttachmentUuid($record->uri);
-      $item['file_uuid'] = LegacyHelper::generateAttachmentFileUuid($item['uuid'], $record->fid);
-      if (!empty($item['preview_page'])) {
-        $item['preview_uuid'] = LegacyHelper::generateAttachmentPreviewUuid($item['uuid'], $item['file_uuid']);
-      }
-      $item['file_name'] = $record->filename;
-      $item['file_mime'] = $record->filemime;
-      $item['file_size'] = $record->filesize;
-      // The revision ID will be updated when running the file migration script.
-      $item['revision_id'] = 0;
-      $attachments[$record->fid] = $item;
-    }
-
-    if (!empty($attachments)) {
-      $row->setDestinationProperty('field_file', $attachments);
-    }
-  }
-
-  /**
-   * Parse an attachment's description.
-   *
-   * @param string $description
-   *   File description.
-   *
-   * @return array
-   *   Array containing the optional description, language, preview page and
-   *   preview rotation.
-   */
-  protected function parseAttachmentDescription($description) {
-    if (empty($description)) {
-      return [];
+    else {
+      $query->orderBy('nr.vid', 'ASC');
     }
 
-    $result = [];
-
-    // Extract the preview page and rotation from the description.
-    if (preg_match('/\|(?P<page>\d+)\|(?P<rotation>0|90|-90)$/', $description, $matches) === 1) {
-      if ($matches['page'] > 0) {
-        $result['preview_page'] = $matches['page'];
-        $result['preview_rotation'] = $matches['rotation'];
-      }
-    }
-    $description = preg_replace('/\|(\d+)\|(0|90|-90)$/', '', $description);
-
-    // Extract the language from the description.
-    if (!empty($description)) {
-      $languages = reliefweb_docstore_get_languages();
-      $versions = [];
-      $version_pattern = [];
-      foreach ($languages as $code => $label) {
-        $version_pattern[] = preg_quote($label . ' version');
-        $versions[$label . ' version'] = $code;
-      }
-      $version_pattern = implode('|', $version_pattern);
-      if (!empty($version_pattern) && preg_match('/( - )?(?P<version>' . $version_pattern . ')$/i', $description, $matches) === 1) {
-        $result['language'] = $versions[$matches['version']];
-        $description = mb_substr($description, 0, -mb_strlen($matches[0]));
-      }
-    }
-
-    $result['description'] = $description;
-
-    return $result;
+    return $query;
   }
 
   /**
@@ -232,11 +114,12 @@ public function fields() {
       'created' => $this->t('Created timestamp'),
       'changed' => $this->t('Modified timestamp'),
       'status' => $this->t('Publication status'),
-      'revision_id' => $this->t('The node revision ID.'),
+      'vid' => $this->t('The node revision ID.'),
       'revision_log_message' => $this->t('The node revision log message.'),
       'revision_user' => $this->t('The node revision user id.'),
       'revision_created' => $this->t('The node revision creation timestamp.'),
       'revision_default' => $this->t('The node revision default status.'),
+      'moderation_status' => $this->t('The moderation status'),
     ];
     return $fields;
   }
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/NodeRevision.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/NodeRevision.php
index 3cfd0f75c..36839fed4 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/NodeRevision.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/NodeRevision.php
@@ -21,12 +21,12 @@ class NodeRevision extends Node {
   /**
    * {@inheritdoc}
    */
-  protected $join = 'n.nid = nr.nid AND n.vid <> nr.vid';
+  protected $useRevisionId = TRUE;
 
   /**
    * {@inheritdoc}
    */
-  protected $useRevisionId = TRUE;
+  protected $join = 'n.nid = nr.nid AND n.vid <> nr.vid';
 
   /**
    * {@inheritdoc}
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Report.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Report.php
new file mode 100644
index 000000000..47f56d829
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Report.php
@@ -0,0 +1,200 @@
+<?php
+
+namespace Drupal\reliefweb_migrate\Plugin\migrate\source;
+
+use Drupal\migrate\Row;
+use Drupal\reliefweb_utility\Helpers\LegacyHelper;
+
+/**
+ * Retrieve report nodes from the Drupal 7 database.
+ *
+ * Available configuration keys:
+ * - bundle: (optional) The node type (machine name) to filter nodes
+ *   retrieved from the source - can be a string or an array. If omitted, all
+ *   nodes are retrieved.
+ *
+ * @see \Drupal\node\Plugin\migrate\source\d7\Node
+ *
+ * @MigrateSource(
+ *   id = "reliefweb_report"
+ * )
+ */
+class Report extends Node {
+
+  /**
+   * Store the list of duplicate reports.
+   *
+   * @var array
+   */
+  protected $duplicateReports;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function query() {
+    $query = parent::query();
+
+    // Retrieve duplicate reports. We cannot easily identify all the duplicates
+    // but those with attachments are easy enough to find and are the
+    // problematic ones.
+    if (!isset($this->duplicateReports)) {
+      $duplicate_query = $this->select('field_data_field_file', 'f');
+      $duplicate_query->addField('f', 'field_file_fid', 'fid');
+      $duplicate_query->addExpression('COUNT(f.field_file_fid)', 'total');
+      $duplicate_query->addExpression('GROUP_CONCAT(f.entity_id ORDER BY f.entity_id)', 'ids');
+      $duplicate_query->groupBy('f.field_file_fid');
+      $duplicate_query->having('total > 1');
+
+      $this->duplicateReports = [];
+      foreach ($duplicate_query->execute() ?? [] as $record) {
+        $ids = explode(',', $record['ids']);
+        if (min($ids) !== max($ids)) {
+          $this->duplicateReports = array_merge($this->duplicateReports, array_slice($ids, 0, -1));
+        }
+      }
+    }
+
+    if (!empty($this->duplicateReports)) {
+      $query->condition('n.nid', $this->duplicateReports, 'NOT IN');
+    }
+
+    return $query;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function initializeIterator() {
+    $iterator = parent::initializeIterator();
+
+    if (!empty($this->preloadedFieldValues['report']['field_file'])) {
+      // Extract information from the D7 field_file description field.
+      $items = [];
+      foreach ($this->preloadedFieldValues['report']['field_file'] as $entity_id => $field_items) {
+        foreach ($field_items as $delta => $item) {
+          if (isset($item['fid'])) {
+            $data = $this->parseAttachmentDescription($item['description'] ?? '');
+            $data['entity_id'] = $entity_id;
+            $data['delta'] = $delta;
+            $items[$item['fid']] = $data;
+          }
+        }
+      }
+
+      $attachments = [];
+      if (!empty($items)) {
+        // Load the data from the file_managed table.
+        $records = $this->select('file_managed', 'fm')
+          ->fields('fm')
+          ->condition('fm.status', 1, '=')
+          ->condition('fm.fid', array_keys($items), 'IN')
+          ->execute()
+          ?->fetchAll(\PDO::FETCH_OBJ) ?? [];
+
+        // Prepare the D9 field_file data.
+        $attachments = [];
+        foreach ($records as $record) {
+          if (empty($record->uri)) {
+            continue;
+          }
+          if (strtolower(pathinfo($record->filename, PATHINFO_EXTENSION)) === 'pdf') {
+            $record->filemime = 'application/pdf';
+          }
+          $item = $items[$record->fid];
+          $item['uuid'] = LegacyHelper::generateAttachmentUuid($record->uri);
+          $item['file_uuid'] = LegacyHelper::generateAttachmentFileUuid($item['uuid'], $record->fid);
+          if (!empty($item['preview_page'])) {
+            $item['preview_uuid'] = LegacyHelper::generateAttachmentPreviewUuid($item['uuid'], $item['file_uuid']);
+          }
+          $item['file_name'] = $record->filename;
+          $item['file_mime'] = $record->filemime;
+          $item['file_size'] = $record->filesize;
+          // The revision ID will be updated when running the file migration
+          // script.
+          $item['revision_id'] = 0;
+          $item['timestamp'] = $record->timestamp;
+
+          $delta = $item['delta'];
+          $entity_id = $item['entity_id'];
+          unset($item['delta'], $item['entity_id']);
+
+          $attachments[$entity_id][$delta] = $item;
+        }
+      }
+      $this->preloadedFieldValues['report']['field_file'] = $attachments;
+    }
+
+    return $iterator;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function prepareRow(Row $row) {
+    if (parent::prepareRow($row) === FALSE) {
+      return FALSE;
+    }
+
+    $nid = $row->getSourceProperty('nid');
+
+    // Generate the UUID based on the URI.
+    $uuid = LegacyHelper::generateDocumentUuid($nid);
+
+    // Set the node UUID.
+    $row->setDestinationProperty('uuid', $uuid);
+
+    // Set the attachments.
+    $field_file = $row->getSourceProperty('field_file');
+    if (!empty($field_file)) {
+      $row->setDestinationProperty('field_file', array_values($field_file));
+    }
+  }
+
+  /**
+   * Parse an attachment's description.
+   *
+   * @param string $description
+   *   File description.
+   *
+   * @return array
+   *   Array containing the optional description, language, preview page and
+   *   preview rotation.
+   */
+  protected function parseAttachmentDescription($description) {
+    if (empty($description)) {
+      return [];
+    }
+
+    $result = [];
+
+    // Extract the preview page and rotation from the description.
+    if (preg_match('/\|(?P<page>\d+)\|(?P<rotation>0|90|-90)$/', $description, $matches) === 1) {
+      if ($matches['page'] > 0) {
+        $result['preview_page'] = $matches['page'];
+        $result['preview_rotation'] = $matches['rotation'];
+      }
+    }
+    $description = preg_replace('/\|(\d+)\|(0|90|-90)$/', '', $description);
+
+    // Extract the language from the description.
+    if (!empty($description)) {
+      $languages = reliefweb_docstore_get_languages();
+      $versions = [];
+      $version_pattern = [];
+      foreach ($languages as $code => $label) {
+        $version_pattern[] = preg_quote($label . ' version');
+        $versions[strtolower($label . ' version')] = $code;
+      }
+      $version_pattern = implode('|', $version_pattern);
+      if (!empty($version_pattern) && preg_match('/( - )?(?P<version>' . $version_pattern . ')$/i', $description, $matches) === 1) {
+        $result['language'] = $versions[strtolower($matches['version'])];
+        $description = mb_substr($description, 0, -mb_strlen($matches[0]));
+      }
+    }
+
+    $result['description'] = $description;
+
+    return $result;
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/TaxonomyTerm.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/TaxonomyTerm.php
index e5c309516..3a40839cb 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/TaxonomyTerm.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/TaxonomyTerm.php
@@ -33,6 +33,11 @@ class TaxonomyTerm extends FieldableEntityBase {
    */
   protected $bundleField = 'vid';
 
+  /**
+   * {@inheritdoc}
+   */
+  protected $revisionIdField = 'revision_id';
+
   /**
    * {@inheritdoc}
    */
@@ -59,10 +64,20 @@ public function query() {
 
     // Base fields.
     $query->addField('td', 'tid', 'tid');
-    $query->addField('td', 'name', 'name');
-    $query->addField('td', 'description', 'description');
-    $query->addField('td', 'format', 'format');
-    $query->addField('td', 'weight', 'weight');
+
+    if (!$this->useRevisionId) {
+      $query->addField('td', 'name', 'name');
+      $query->addField('td', 'description', 'description');
+      $query->addField('td', 'format', 'format');
+      $query->addField('td', 'weight', 'weight');
+
+    }
+    else {
+      $query->addField('tdr', 'name', 'name');
+      $query->addField('tdr', 'description', 'description');
+      $query->addField('tdr', 'format', 'format');
+      $query->addField('tdr', 'weight', 'weight');
+    }
 
     // Use the vocabulary machine name for the `vid` as expected by D9.
     $query->addField('tv', 'machine_name', 'vid');
@@ -79,6 +94,7 @@ public function query() {
       $query->condition('tv.machine_name', (array) $this->configuration['bundle'], 'IN');
     }
 
+    $query->orderBy('tdr.revision_id', 'ASC');
     return $query;
   }
 
@@ -100,6 +116,7 @@ public function fields() {
       'revision_user' => $this->t('The term revision user id.'),
       'revision_created' => $this->t('The term revision creation timestamp.'),
       'revision_default' => $this->t('The term revision default status.'),
+      'moderation_status' => $this->t('The moderation status'),
     ];
     return $fields;
   }
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/TaxonomyTermRevision.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/TaxonomyTermRevision.php
index 5149d4729..98b3262d4 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/TaxonomyTermRevision.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/TaxonomyTermRevision.php
@@ -2,6 +2,8 @@
 
 namespace Drupal\reliefweb_migrate\Plugin\migrate\source;
 
+use Drupal\migrate\Row;
+
 /**
  * Retrieve taxonomy term revisions from the Drupal 7 database.
  *
@@ -28,6 +30,123 @@ class TaxonomyTermRevision extends TaxonomyTerm {
    */
   protected $join = 'td.tid = tdr.tid AND td.revision_id <> tdr.revision_id';
 
+  /**
+   * {@inheritdoc}
+   */
+  public function prepareRow(Row $row) {
+    $log = $row->getSourceProperty('revision_log_message');
+    if (strpos($log, 'Automatic update of') === 0) {
+      $row->setDestinationProperty('skip_saving', TRUE);
+    }
+    return parent::prepareRow($row);
+  }
+
+  /**
+   * Preload the raw field values for the entity records.
+   *
+   * @param \IteratorIterator $iterator
+   *   Iterator of the database statement with the query results.
+   */
+  protected function preloadFields(\IteratorIterator $iterator) {
+    $iterator->rewind();
+
+    if ($iterator->count() > 0) {
+      // Clear the previously preloaded values and aliases.
+      $this->preloadedFieldValues = [];
+      $this->preloadedUrlAliases = [];
+
+      $use_revision_id = $this->useRevisionId && !empty($this->revisionIdField);
+
+      // Extract the entity ids or revision ids.
+      $bundles = [];
+      foreach ($iterator as $record) {
+        // The entries with such a log message are skipped in ::prepareRow()
+        // so no need to load the field data.
+        if (strpos($record['revision_log_message'], 'Automatic update of') === 0) {
+          continue;
+        }
+        if ($use_revision_id) {
+          $id = $record[$this->revisionIdField];
+        }
+        else {
+          $id = $record[$this->idField];
+        }
+        $bundles[$record[$this->bundleField]][$id] = $id;
+      }
+
+      $iterator->rewind();
+
+      // Retrieve the field values.
+      foreach ($bundles as $bundle => $ids) {
+        foreach ($this->getFields($this->entityType, $bundle) as $field_name => $field) {
+          $this->preloadedFieldValues[$bundle][$field_name] = $this->getAllFieldValues($this->entityType, $field_name, $ids, $use_revision_id);
+        }
+      }
+
+      // Preload the URL aliases.
+      $this->preloadUrlAliases($bundles);
+    }
+  }
+
+  /**
+   * Retrieves field values for a single field of a single entity.
+   *
+   * @param string $entity_type
+   *   The entity type.
+   * @param string $field
+   *   The field name.
+   * @param array $ids
+   *   The entity IDs or revision IDs.
+   * @param bool $use_revision_id
+   *   Whether the ids are revision ids or entity ids.
+   * @param string $language
+   *   (optional) The field language.
+   *
+   * @return array
+   *   The raw field values, keyed by entity or revision id, then delta.
+   */
+  protected function getAllFieldValues($entity_type, $field, array $ids, $use_revision_id = FALSE, $language = NULL) {
+    if (!$use_revision_id) {
+      $table = 'field_data_' . $field;
+      $id_field = 'entity_id';
+    }
+    else {
+      $table = 'field_revision_' . $field;
+      $id_field = 'revision_id';
+    }
+
+    $query = $this->select($table, 't')
+      ->fields('t')
+      ->condition('entity_type', $entity_type)
+      ->condition($id_field, $ids, 'IN')
+      ->condition('deleted', 0);
+
+    // Skip inactive key content and appeals or response plans in the revisions
+    // because it's too heavy and of little use. The latest revision has all
+    // the data.
+    if ($field === 'field_key_content' || $field === 'field_appeals_response_plans') {
+      $query->condition('t.' . $field . '_active', 1, '=');
+    }
+
+    // Add 'language' as a query condition if it has been defined by Entity
+    // Translation.
+    if ($language) {
+      $query->condition('language', $language);
+    }
+    $values = [];
+    foreach ($query->execute() as $row) {
+      $id = $row[$id_field];
+      foreach ($row as $key => $value) {
+        $delta = $row['delta'];
+        if (strpos($key, $field) === 0) {
+          $column = substr($key, strlen($field) + 1);
+          $values[$id][$delta][$column] = $value;
+        }
+      }
+    }
+    return $values;
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/UrlAlias.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/UrlAlias.php
index 6bdd8e3a9..d278eb45b 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/UrlAlias.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/UrlAlias.php
@@ -2,8 +2,7 @@
 
 namespace Drupal\reliefweb_migrate\Plugin\migrate\source;
 
-use Drupal\Core\Database\Query\Condition;
-use Drupal\migrate\Plugin\migrate\source\SqlBase;
+use Drupal\migrate\Row;
 
 /**
  * Retrieve url aliases from the Drupal 7 database.
@@ -12,24 +11,46 @@
  *   id = "reliefweb_url_alias"
  * )
  */
-class UrlAlias extends SqlBase {
+class UrlAlias extends EntityBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $idField = 'pid';
 
   /**
    * {@inheritdoc}
    */
   public function query() {
-    $condition = new Condition('OR');
-    $condition->condition('ua.source', 'node/%', 'LIKE');
-    $condition->condition('ua.source', 'taxonomy/term/%', 'LIKE');
-
-    // The order of the migration is significant since
-    // \Drupal\path_alias\AliasRepository::lookupPathAlias() orders by pid
-    // before returning a result. Postgres does not automatically order by
-    // primary key therefore we need to add a specific order by.
-    return $this->select('url_alias', 'ua')
-      ->fields('ua')
-      ->where($condition)
-      ->orderBy('pid');
+    $subquery = $this->select('url_alias', 'ua2');
+    $subquery->addField('ua2', 'source', 'source');
+    $subquery->addExpression('MAX(ua2.pid)', 'pid');
+    $subquery->groupBy('ua2.source');
+    $subquery->having('COUNT(ua2.pid) > 1');
+
+    $query = $this->select('url_alias', 'ua');
+    $query->fields('ua', ['pid', 'source', 'alias']);
+    $query->innerJoin($subquery, 'sq', 'ua.source  = %alias.source AND ua.pid <> %alias.pid');
+    $query->orderBy('ua.pid', 'ASC');
+
+    return $query;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function prepareRow(Row $row) {
+    if (parent::prepareRow($row) === FALSE) {
+      return FALSE;
+    }
+
+    $source = $row->getSourceProperty('source');
+    if (strpos($source, 'node/') === 0 || strpos($source, 'taxonomy/term/') === 0) {
+      $row->setSourceProperty('source', 'entity:/' . $source);
+    }
+    else {
+      $row->setSourceProperty('source', 'internal:/' . $source);
+    }
   }
 
   /**
@@ -38,7 +59,6 @@ public function query() {
   public function fields() {
     return [
       'pid' => $this->t('The numeric identifier of the path alias.'),
-      'language' => $this->t('The language code of the URL alias.'),
       'source' => $this->t('The internal system path.'),
       'alias' => $this->t('The path alias.'),
     ];
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php
index 6aa81b9a6..f74cba80b 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\reliefweb_migrate\Plugin\migrate\source;
 
-use Drupal\migrate\Plugin\migrate\source\SqlBase;
 use Drupal\migrate\Row;
 
 /**
@@ -12,7 +11,12 @@
  *   id = "reliefweb_user"
  * )
  */
-class User extends SqlBase {
+class User extends EntityBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected $idField = 'uid';
 
   /**
    * {@inheritdoc}
@@ -66,8 +70,7 @@ public function query() {
 
     $query->innerJoin($subquery, 'subquery', 'subquery.uid = u.uid');
 
-    return $query
-      ->orderBy('uid');
+    return $query->orderBy('u.uid', 'ASC');
   }
 
   /**

From 9060f194592b48411ca4432a5bbc6323aee4ad9d Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 4 Jan 2022 08:54:34 +0000
Subject: [PATCH 342/720] [RW-296] Synchronize migration config

---
 .../migrate_plus.migration.reliefweb_book.yml | 54 +++++++++++++------
 ...ate_plus.migration.reliefweb_bookmarks.yml |  5 +-
 ...migrate_plus.migration.reliefweb_image.yml |  7 ++-
 ...on.reliefweb_media__image_announcement.yml |  2 +-
 ...image_blog_post__field_attached_images.yml |  2 +-
 ...eb_media__image_blog_post__field_image.yml |  2 +-
 ...ia__image_report__field_headline_image.yml |  2 +-
 ...efweb_media__image_report__field_image.yml |  2 +-
 ...migration.reliefweb_media__image_topic.yml |  2 +-
 ....migration.reliefweb_menu_link__footer.yml |  2 +-
 ...us.migration.reliefweb_menu_link__main.yml |  2 +-
 ...migration.reliefweb_node__announcement.yml |  2 +-
 ...us.migration.reliefweb_node__blog_post.yml |  2 +-
 ...te_plus.migration.reliefweb_node__book.yml |  2 +-
 ...ate_plus.migration.reliefweb_node__job.yml | 11 ++--
 ..._plus.migration.reliefweb_node__report.yml |  5 +-
 ...e_plus.migration.reliefweb_node__topic.yml |  2 +-
 ...lus.migration.reliefweb_node__training.yml | 11 ++--
 ....reliefweb_node_revision__announcement.yml |  2 +-
 ...ion.reliefweb_node_revision__blog_post.yml |  2 +-
 ...igration.reliefweb_node_revision__book.yml |  2 +-
 ...migration.reliefweb_node_revision__job.yml | 11 ++--
 ...ration.reliefweb_node_revision__report.yml |  2 +-
 ...gration.reliefweb_node_revision__topic.yml |  2 +-
 ...tion.reliefweb_node_revision__training.yml | 11 ++--
 ...plus.migration.reliefweb_subscriptions.yml |  5 +-
 ...plus.migration.reliefweb_taxonomy_term.yml | 11 ++--
 ...ation.reliefweb_taxonomy_term__country.yml |  6 +--
 ...tion.reliefweb_taxonomy_term__disaster.yml |  6 +--
 ...ration.reliefweb_taxonomy_term__source.yml |  6 +--
 ...ation.reliefweb_taxonomy_term_revision.yml |  6 +--
 ...iefweb_taxonomy_term_revision__country.yml |  6 +--
 ...efweb_taxonomy_term_revision__disaster.yml |  6 +--
 ...liefweb_taxonomy_term_revision__source.yml |  6 +--
 ...ate_plus.migration.reliefweb_url_alias.yml | 17 +++---
 .../migrate_plus.migration.reliefweb_user.yml | 14 ++---
 ...plus.migration.reliefweb_user__default.yml | 11 +---
 ...te_plus.migration_group.reliefweb_base.yml |  2 +-
 ...e_plus.migration_group.reliefweb_extra.yml |  2 +-
 ...e_plus.migration_group.reliefweb_image.yml | 14 ++++-
 ...e_plus.migration_group.reliefweb_media.yml | 14 +++--
 ...te_plus.migration_group.reliefweb_node.yml | 25 ++++++---
 ...igration_group.reliefweb_node_revision.yml | 21 +++++---
 ...te_plus.migration_group.reliefweb_term.yml | 25 ++++++---
 ...igration_group.reliefweb_term_revision.yml | 28 +++++++---
 45 files changed, 234 insertions(+), 146 deletions(-)

diff --git a/config/migrate_plus.migration.reliefweb_book.yml b/config/migrate_plus.migration.reliefweb_book.yml
index f46f6fd83..98d75e792 100644
--- a/config/migrate_plus.migration.reliefweb_book.yml
+++ b/config/migrate_plus.migration.reliefweb_book.yml
@@ -1,9 +1,9 @@
-uuid: 1646cd3e-f46d-43bd-b774-7f40e1e23964
+uuid: cc36c7c3-1517-4c17-a2c3-5d9725f75533
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: 7G6aoPHopmiA75w1-6a7F-CF5QTtZtf-gU2V6XHhND8
+  default_config_hash: CvCOIME_Vzd6F5oLfPyMYj1dGSGUdTFbh3m1N5gCnqs
 id: reliefweb_book
 class: null
 field_plugin_method: null
@@ -14,23 +14,45 @@ migration_group: reliefweb_extra
 label: 'Migrate ReliefWeb book menus.'
 source:
   plugin: reliefweb_book
+  batch_size: 1000
 process:
   nid: nid
-  book/bid: bid
-  book/weight: weight
-  book/pid:
-    -
-      plugin: skip_on_empty
-      method: process
-      source: plid
-    -
-      plugin: migration_lookup
-      migration: reliefweb_book
-  _is_migrating:
-    plugin: default_value
-    default_value: 1
+  bid: bid
+  pid: pid
+  has_children: has_children
+  weight: weight
+  depth: depth
+  p1: p1
+  p2: p2
+  p3: p3
+  p4: p4
+  p5: p5
+  p6: p6
+  p7: p7
+  p8: p8
+  p9: p9
 destination:
-  plugin: reliefweb_book
+  plugin: table
+  table_name: book
+  id_fields:
+    nid:
+      type: integer
+  fields:
+    nid: nid
+    bid: bid
+    pid: pid
+    has_children: has_children
+    weight: weight
+    depth: depth
+    p1: p1
+    p2: p2
+    p3: p3
+    p4: p4
+    p5: p5
+    p6: p6
+    p7: p7
+    p8: p8
+    p9: p9
 migration_dependencies:
   required:
     - reliefweb_node__book
diff --git a/config/migrate_plus.migration.reliefweb_bookmarks.yml b/config/migrate_plus.migration.reliefweb_bookmarks.yml
index 6c58f4625..be48e76f3 100644
--- a/config/migrate_plus.migration.reliefweb_bookmarks.yml
+++ b/config/migrate_plus.migration.reliefweb_bookmarks.yml
@@ -1,9 +1,9 @@
-uuid: 4094dbbe-bb82-4fff-b801-e1335ddc84a2
+uuid: e53c95ee-879e-422c-9c8f-b4619eb2e579
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: t2o1jqXhMnHbfpAWuBnDcw61QVdsmL9qKHR9HHYb4pk
+  default_config_hash: nZevgegYdmXQrztFpHIgSg9dDILj1n-DuwhuotVxLOo
 id: reliefweb_bookmarks
 class: null
 field_plugin_method: null
@@ -21,6 +21,7 @@ source:
       type: integer
     uid:
       type: integer
+  batch_size: 1000
 process:
   entity_type: entity_type
   entity_id: entity_id
diff --git a/config/migrate_plus.migration.reliefweb_image.yml b/config/migrate_plus.migration.reliefweb_image.yml
index 52c16523f..49491e4dc 100644
--- a/config/migrate_plus.migration.reliefweb_image.yml
+++ b/config/migrate_plus.migration.reliefweb_image.yml
@@ -1,4 +1,4 @@
-uuid: 3d7f4bff-488f-46fb-b8b4-bf9bc79e8d7c
+uuid: f79acdb6-6866-4f98-9756-467bdb2182b7
 langcode: en
 status: true
 dependencies:
@@ -6,7 +6,7 @@ dependencies:
     module:
       - reliefweb_migrate
 _core:
-  default_config_hash: twvBZjEDiO5BANdmbjQ6BxoLL5VFbllmhVgdCCg1-jQ
+  default_config_hash: 99T4XTqmYnnSefOAYJXhB3d6CIUBW6ixnFAZ-vhEARY
 id: reliefweb_image
 class: null
 field_plugin_method: null
@@ -37,6 +37,5 @@ process:
   _is_migrating:
     plugin: default_value
     default_value: 1
-destination:
-  plugin: reliefweb_image
+destination: null
 migration_dependencies: null
diff --git a/config/migrate_plus.migration.reliefweb_media__image_announcement.yml b/config/migrate_plus.migration.reliefweb_media__image_announcement.yml
index ba22fa6fb..bd416b837 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_announcement.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_announcement.yml
@@ -1,4 +1,4 @@
-uuid: bdb3efda-43ac-4c3f-9aba-473770f2b931
+uuid: 0606ef3b-df0e-4c9a-8e8a-f6ed791923ac
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_attached_images.yml b/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_attached_images.yml
index f9c40f160..52312a2c8 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_attached_images.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_attached_images.yml
@@ -1,4 +1,4 @@
-uuid: 874de9ee-66bf-4061-8689-1fee00185364
+uuid: da9257e1-367e-49e5-8a0d-28bbda5b2ce1
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_image.yml b/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_image.yml
index f86dd6f5e..91bab3ad6 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_image.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_image.yml
@@ -1,4 +1,4 @@
-uuid: 90f625db-3f7a-4192-b71c-743d08db840e
+uuid: c9c5fc9d-6778-4c91-852a-c352ff9f5ad3
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_media__image_report__field_headline_image.yml b/config/migrate_plus.migration.reliefweb_media__image_report__field_headline_image.yml
index 4bbc4688e..bc8ba3789 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_report__field_headline_image.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_report__field_headline_image.yml
@@ -1,4 +1,4 @@
-uuid: f50ef71d-b326-4386-9a49-0e9479afa6fc
+uuid: d4740786-483b-44bb-ac5f-963bb11b3ee4
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_media__image_report__field_image.yml b/config/migrate_plus.migration.reliefweb_media__image_report__field_image.yml
index 63b07e996..017eff35f 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_report__field_image.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_report__field_image.yml
@@ -1,4 +1,4 @@
-uuid: 5c116de4-7c04-4cdc-8022-bff825a11531
+uuid: 4ca49517-0cf4-49a6-8ecb-d9b33ab65739
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_media__image_topic.yml b/config/migrate_plus.migration.reliefweb_media__image_topic.yml
index e93b29240..f4a3c23d0 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_topic.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_topic.yml
@@ -1,4 +1,4 @@
-uuid: ddbd8ee7-0d99-4e0f-87c6-ba2cd1b0167a
+uuid: 7a795a20-ab61-488b-aa65-510cca58701b
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_menu_link__footer.yml b/config/migrate_plus.migration.reliefweb_menu_link__footer.yml
index 0569f298b..85121800f 100644
--- a/config/migrate_plus.migration.reliefweb_menu_link__footer.yml
+++ b/config/migrate_plus.migration.reliefweb_menu_link__footer.yml
@@ -1,4 +1,4 @@
-uuid: 1ac4d375-50bc-4cc1-a8c4-17e20a722a32
+uuid: 85145fb4-0429-4290-974a-68e538d21c4d
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_menu_link__main.yml b/config/migrate_plus.migration.reliefweb_menu_link__main.yml
index 8ee0b17c8..784176191 100644
--- a/config/migrate_plus.migration.reliefweb_menu_link__main.yml
+++ b/config/migrate_plus.migration.reliefweb_menu_link__main.yml
@@ -1,4 +1,4 @@
-uuid: 4e12188e-2b57-4a0e-8c26-239e6b51f2e1
+uuid: df6e9233-a957-464e-b498-1f176c542881
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_node__announcement.yml b/config/migrate_plus.migration.reliefweb_node__announcement.yml
index f862e4969..924599c27 100644
--- a/config/migrate_plus.migration.reliefweb_node__announcement.yml
+++ b/config/migrate_plus.migration.reliefweb_node__announcement.yml
@@ -1,4 +1,4 @@
-uuid: 64e2a05f-55bf-437f-b089-ff813dbde7ec
+uuid: cf6c6b25-d864-43aa-a77c-7c49e59270b6
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node__blog_post.yml b/config/migrate_plus.migration.reliefweb_node__blog_post.yml
index 3f8836d15..2a5a30042 100644
--- a/config/migrate_plus.migration.reliefweb_node__blog_post.yml
+++ b/config/migrate_plus.migration.reliefweb_node__blog_post.yml
@@ -1,4 +1,4 @@
-uuid: 2578e934-9f1c-44c8-83be-a3ac0c6c35f1
+uuid: 937f25a1-31ba-4616-814c-30b5f04110a0
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node__book.yml b/config/migrate_plus.migration.reliefweb_node__book.yml
index 35515c681..5d927a967 100644
--- a/config/migrate_plus.migration.reliefweb_node__book.yml
+++ b/config/migrate_plus.migration.reliefweb_node__book.yml
@@ -1,4 +1,4 @@
-uuid: b54658f1-01ea-4f3f-9433-e869e7e33452
+uuid: 7b7d17c3-3e2b-410b-bff2-9dca32b2b852
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node__job.yml b/config/migrate_plus.migration.reliefweb_node__job.yml
index f88a15efa..3861ea88d 100644
--- a/config/migrate_plus.migration.reliefweb_node__job.yml
+++ b/config/migrate_plus.migration.reliefweb_node__job.yml
@@ -1,9 +1,9 @@
-uuid: d8a3be85-0e17-469c-affa-38b124f1783e
+uuid: 9afde1f4-9201-483c-b3f2-affe4ca33e19
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: 2K5i6FmC8Lgq4-t0_fbwD3_VA48FcdhjFeKPQccXAas
+  default_config_hash: 8DBBZFIvaJTfF8GdHcHMVgjIKK9lTpcfv_QmhIvVZhk
 id: reliefweb_node__job
 class: null
 field_plugin_method: null
@@ -14,6 +14,9 @@ label: 'Migrate ReliefWeb jobs.'
 source:
   bundle: job
 process:
+  body/format:
+    plugin: default_value
+    default_value: markdown_editor
   field_career_categories/value:
     plugin: sub_process
     source: field_career_categories
@@ -32,7 +35,9 @@ process:
     plugin: skip_on_empty
     method: process
     source: field_how_to_apply/0/value
-  field_how_to_apply/format: constants/format
+  field_how_to_apply/format:
+    plugin: default_value
+    default_value: markdown_editor
   field_job_closing_date:
     -
       plugin: skip_on_empty
diff --git a/config/migrate_plus.migration.reliefweb_node__report.yml b/config/migrate_plus.migration.reliefweb_node__report.yml
index 2a7f6e824..bfe27d87f 100644
--- a/config/migrate_plus.migration.reliefweb_node__report.yml
+++ b/config/migrate_plus.migration.reliefweb_node__report.yml
@@ -1,9 +1,9 @@
-uuid: 1d92446b-fd19-43d5-8cbd-a19851d9bd06
+uuid: 859c5e3b-3fb4-46f4-84a7-6987ee35e724
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: 1IPKr_4_rPu3U5vC5daMAfl2BDkKnRCcLRD971fWOXM
+  default_config_hash: IWA-TYJmq7W_mFwnCmi8gQ6STI-seT8Oc2ntc00_jBI
 id: reliefweb_node__report
 class: null
 field_plugin_method: null
@@ -12,6 +12,7 @@ migration_tags: null
 migration_group: reliefweb_node
 label: 'Migrate ReliefWeb reports.'
 source:
+  plugin: reliefweb_report
   bundle: report
 process:
   field_bury/value:
diff --git a/config/migrate_plus.migration.reliefweb_node__topic.yml b/config/migrate_plus.migration.reliefweb_node__topic.yml
index 77245323a..04961d46e 100644
--- a/config/migrate_plus.migration.reliefweb_node__topic.yml
+++ b/config/migrate_plus.migration.reliefweb_node__topic.yml
@@ -1,4 +1,4 @@
-uuid: 12cbb75f-cedb-482d-a6d7-fb668bc32a71
+uuid: 05776e0d-cbd2-456a-8931-282eea382dac
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node__training.yml b/config/migrate_plus.migration.reliefweb_node__training.yml
index c27a2198a..443b0489c 100644
--- a/config/migrate_plus.migration.reliefweb_node__training.yml
+++ b/config/migrate_plus.migration.reliefweb_node__training.yml
@@ -1,9 +1,9 @@
-uuid: 252f9efd-d153-4f47-8df7-6a823a6dd8ac
+uuid: 1c22d05e-93f8-404d-b5fe-f9a82131a410
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: UaO8PaZNdJlxV9r8v0fMwy0rdod637dj96uNR6irLpY
+  default_config_hash: JAPBYw8MeZgqoLftDwBKMOYWGhlnRa8YpPcsoLJjdNY
 id: reliefweb_node__training
 class: null
 field_plugin_method: null
@@ -14,6 +14,9 @@ label: 'Migrate ReliefWeb training ads.'
 source:
   bundle: training
 process:
+  body/format:
+    plugin: default_value
+    default_value: markdown_editor
   field_career_categories/value:
     plugin: sub_process
     source: field_career_categories
@@ -40,7 +43,9 @@ process:
     plugin: skip_on_empty
     method: process
     source: field_how_to_apply/0/value
-  field_how_to_register/format: constants/format
+  field_how_to_register/format:
+    plugin: default_value
+    default_value: markdown_editor
   field_language:
     plugin: sub_process
     source: field_language
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__announcement.yml b/config/migrate_plus.migration.reliefweb_node_revision__announcement.yml
index ec444436f..f2d778387 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__announcement.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__announcement.yml
@@ -1,4 +1,4 @@
-uuid: b89d82da-f439-4b14-aa4f-dfc75ba10033
+uuid: 2a515f5d-afe8-490c-968b-1bceeaa4fa98
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__blog_post.yml b/config/migrate_plus.migration.reliefweb_node_revision__blog_post.yml
index c6ae17484..bb3972a94 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__blog_post.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__blog_post.yml
@@ -1,4 +1,4 @@
-uuid: b300de40-028d-45d5-b20c-7f77700494a1
+uuid: c08354b8-555e-4a4e-b616-3aeeeb2261d0
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__book.yml b/config/migrate_plus.migration.reliefweb_node_revision__book.yml
index 65bfb1ce6..8214819e5 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__book.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__book.yml
@@ -1,4 +1,4 @@
-uuid: cecdefc6-16a2-497e-8aa1-34a36b7aaf66
+uuid: 5cfa6d89-4d5d-43bd-a0d8-fb2ca9abfc95
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__job.yml b/config/migrate_plus.migration.reliefweb_node_revision__job.yml
index d83431b31..9c5c76cee 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__job.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__job.yml
@@ -1,9 +1,9 @@
-uuid: 048e3d6f-cfd6-4c86-b00f-634e761f47d8
+uuid: 14dea863-6183-450c-8f09-27937a0821a8
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: NNDXTHeboJSQRaQd11L6YZKIGO0_E6kEk1qb1Qirejk
+  default_config_hash: zUZbQwbkZXq5R7OYr3FMFJ0wFKalJ6iUkzCREDqCMV4
 id: reliefweb_node_revision__job
 class: null
 field_plugin_method: null
@@ -14,6 +14,9 @@ label: 'Migrate ReliefWeb job revisions.'
 source:
   bundle: job
 process:
+  body/format:
+    plugin: default_value
+    default_value: markdown_editor
   field_career_categories/value:
     plugin: sub_process
     source: field_career_categories
@@ -32,7 +35,9 @@ process:
     plugin: skip_on_empty
     method: process
     source: field_how_to_apply/0/value
-  field_how_to_apply/format: constants/format
+  field_how_to_apply/format:
+    plugin: default_value
+    default_value: markdown_editor
   field_job_closing_date:
     -
       plugin: skip_on_empty
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__report.yml b/config/migrate_plus.migration.reliefweb_node_revision__report.yml
index 6409ee23e..25dbb08b7 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__report.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__report.yml
@@ -1,4 +1,4 @@
-uuid: 0ea59b66-e569-4e5d-bbff-75903d18b480
+uuid: 8ee3eb82-99ca-4497-9cb3-df0f42950c93
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__topic.yml b/config/migrate_plus.migration.reliefweb_node_revision__topic.yml
index e53261a67..e79fca945 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__topic.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__topic.yml
@@ -1,4 +1,4 @@
-uuid: fcf08fa7-fc1d-49a9-8eae-64c9f39448fe
+uuid: 2c16b4f9-fa27-4612-8b50-fa3b6e214674
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__training.yml b/config/migrate_plus.migration.reliefweb_node_revision__training.yml
index bc22eb681..1c326d593 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__training.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__training.yml
@@ -1,9 +1,9 @@
-uuid: 10cada7c-aef8-4415-80f1-9dbba6aeecdd
+uuid: 449a5ee8-8dab-4e67-8765-d18801f23fd1
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: gA4d2zju51IuVcuSKQX6T80_kGIlP4FyBQ3L6Q6BbHs
+  default_config_hash: lETZJat6fv3IIz05H7qS_1DYmwITJXrqaftjy0ylO7s
 id: reliefweb_node_revision__training
 class: null
 field_plugin_method: null
@@ -14,6 +14,9 @@ label: 'Migrate ReliefWeb training revisions.'
 source:
   bundle: training
 process:
+  body/format:
+    plugin: default_value
+    default_value: markdown_editor
   field_career_categories/value:
     plugin: sub_process
     source: field_career_categories
@@ -40,7 +43,9 @@ process:
     plugin: skip_on_empty
     method: process
     source: field_how_to_register/0/value
-  field_how_to_register/format: constants/format
+  field_how_to_register/format:
+    plugin: default_value
+    default_value: markdown_editor
   field_language:
     plugin: sub_process
     source: field_language
diff --git a/config/migrate_plus.migration.reliefweb_subscriptions.yml b/config/migrate_plus.migration.reliefweb_subscriptions.yml
index 5eeaa0e5d..8af32cf62 100644
--- a/config/migrate_plus.migration.reliefweb_subscriptions.yml
+++ b/config/migrate_plus.migration.reliefweb_subscriptions.yml
@@ -1,9 +1,9 @@
-uuid: 1b93fdfe-478a-494a-8104-9d9578dfad20
+uuid: 18024c82-18f1-4b83-a744-533298c40905
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: BVGj3jE1igU5o-CdyPFDYaS99ZWd59pn47hNx6uWWr4
+  default_config_hash: 2LT8u5LEmF3VMoguNvTbJ_m9zokBpf-2oVXcNB_0qCs
 id: reliefweb_subscriptions
 class: null
 field_plugin_method: null
@@ -19,6 +19,7 @@ source:
       type: string
     uid:
       type: integer
+  batch_size: 1000
 process:
   sid: sid
   uid: uid
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term.yml
index d830e56bc..85c4fb215 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term.yml
@@ -1,9 +1,9 @@
-uuid: 098a6293-f0fd-42a9-b8cc-fff80c758058
+uuid: 94998ae3-b66e-4060-aa9f-74ac323dffe6
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: CHuAfTYrRUQ7tv0PAQVaBOHVL2PI1UHlbZQP_-F0nwQ
+  default_config_hash: q-Enq2gN5WEmdNZtrnOOEFbvHSN81Wel_j-vb8bmTxA
 id: reliefweb_taxonomy_term
 class: null
 field_plugin_method: null
@@ -28,10 +28,9 @@ source:
     - training_type
     - vulnerable_groups
 process:
-  moderation_state:
-    plugin: skip_on_empty
-    method: process
-    source: field_status/0/value
+  moderation_status:
+    plugin: default_value
+    default_value: published
   status:
     default_value: 1
   field_disaster_type_code/value:
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term__country.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term__country.yml
index 4edc260cc..fa5774bac 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term__country.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term__country.yml
@@ -1,9 +1,9 @@
-uuid: 59f8539a-ba85-4636-bec6-72b86c2124de
+uuid: fde2f6ea-42c0-47dd-839c-8e5f2aa0759d
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: sFolnH-YiMmaAMMfspP6IJkwOKKJlIcvdV7FLHsXkM0
+  default_config_hash: 9pCOPc64dPvM1-4TaBORImZPn2JSJ3cBlY5bCVL_uUA
 id: reliefweb_taxonomy_term__country
 class: null
 field_plugin_method: null
@@ -14,7 +14,7 @@ label: 'Migrate ReliefWeb country taxonomy terms.'
 source:
   bundle: country
 process:
-  moderation_state:
+  moderation_status:
     default_value: normal
   field_aliases/value:
     plugin: skip_on_empty
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term__disaster.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term__disaster.yml
index 4fab26199..7231fad98 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term__disaster.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term__disaster.yml
@@ -1,9 +1,9 @@
-uuid: d8a24712-b455-480a-b935-458986ba8068
+uuid: 933bec73-1b9b-4170-847e-7d4037602ba4
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: 4LHpVOxB1UsQTDa2vlOXvwTrW0-1QR3hOQn6l_9EZ1o
+  default_config_hash: 1Z85MpEb_b1od-Wt2nbnSGlAV6C73eZoq4AopSZ1nvg
 id: reliefweb_taxonomy_term__disaster
 class: null
 field_plugin_method: null
@@ -14,7 +14,7 @@ label: 'Migrate ReliefWeb disaster taxonomy terms.'
 source:
   bundle: disaster
 process:
-  moderation_state:
+  moderation_status:
     default_value: draft
   field_country:
     plugin: sub_process
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term__source.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
index 6f9c273ba..f3db38101 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
@@ -1,9 +1,9 @@
-uuid: e0f70e41-5967-44fa-96f1-0913b7a55860
+uuid: 3846abcb-1a29-4f78-9b5c-b62dfc6caf7b
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: gMGIbbFHxgM9F8d7a0y8Ziz6X9Qwc9ttjWpU5FUtIJg
+  default_config_hash: hzBiWDw0PdtLdr8LLeKgeSsoTj3jkSA2FAqHEKmo_do
 id: reliefweb_taxonomy_term__source
 class: null
 field_plugin_method: null
@@ -14,7 +14,7 @@ label: 'Migrate ReliefWeb source taxonomy terms.'
 source:
   bundle: source
 process:
-  moderation_state:
+  moderation_status:
     default_value: active
   field_aliases/value:
     plugin: skip_on_empty
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision.yml
index 31c457dd0..97947f5ee 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision.yml
@@ -1,9 +1,9 @@
-uuid: 1af6f14e-1788-4dd6-89be-dccf27861fdc
+uuid: 3b2c15a8-abc5-4931-a87f-3e0cd3f6a5d6
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: pUAXb-jawtDLreM83zTBkIp68pW4-eAGUNijLc3LfMU
+  default_config_hash: 7YSNhGfqh-wclm6nhEzkgJiL5Id-KKqA_d6FzRvyiXI
 id: reliefweb_taxonomy_term_revision
 class: null
 field_plugin_method: null
@@ -28,7 +28,7 @@ source:
     - training_type
     - vulnerable_groups
 process:
-  moderation_state:
+  moderation_status:
     plugin: skip_on_empty
     method: process
     source: field_status/0/value
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__country.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__country.yml
index 8f521994c..7b10f8f04 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__country.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__country.yml
@@ -1,9 +1,9 @@
-uuid: 5bcd0285-7dc0-4004-ac8d-d6f3ddfc9c1e
+uuid: c1e3d618-c811-4948-9477-02e0a0ee6604
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: sPh7-xrymqxi-SAP-IKsEKX3dDu-GYMcT81CDbhpE9M
+  default_config_hash: cJ-aWpPlgTYmdcZT-6Xl2DHKI1SBHeTv8HaM0bCNhTA
 id: reliefweb_taxonomy_term_revision__country
 class: null
 field_plugin_method: null
@@ -14,7 +14,7 @@ label: 'Migrate ReliefWeb country taxonomy term revisions.'
 source:
   bundle: country
 process:
-  moderation_state:
+  moderation_status:
     default_value: normal
   field_aliases/value:
     plugin: skip_on_empty
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__disaster.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__disaster.yml
index 8e837ff0e..036e89bf6 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__disaster.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__disaster.yml
@@ -1,9 +1,9 @@
-uuid: a918d492-3e58-430c-b022-da6c8c6a5a4c
+uuid: 2ce69121-d5d3-433b-964e-8950141e7be8
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: 28hKbSSm2NXGzfz6wF5A1u0yv_mDqf6Jf_jijb8scms
+  default_config_hash: gZG9cXwinvrvvcDM-RylXOVTHnUloZQjwPsmKlBbMA0
 id: reliefweb_taxonomy_term_revision__disaster
 class: null
 field_plugin_method: null
@@ -14,7 +14,7 @@ label: 'Migrate ReliefWeb disaster taxonomy term revisions.'
 source:
   bundle: disaster
 process:
-  moderation_state:
+  moderation_status:
     default_value: draft
   field_country:
     plugin: sub_process
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
index 017df8742..7b3b9f21b 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
@@ -1,9 +1,9 @@
-uuid: 6490d4b1-0b1f-4454-81e6-73be2cf07c09
+uuid: b93a4bf5-51fc-4153-9908-3059502fdb51
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: R4SXF45VNLJ90348a0j4CKMFpiN7gMK0oD4vs-MHO1k
+  default_config_hash: o1xB-M9-1wTw0Nti_A7qxkdCHidV95AEaWCmaoViT-c
 id: reliefweb_taxonomy_term_revision__source
 class: null
 field_plugin_method: null
@@ -14,7 +14,7 @@ label: 'Migrate ReliefWeb source taxonomy term revisions.'
 source:
   bundle: source
 process:
-  moderation_state:
+  moderation_status:
     default_value: active
   field_aliases/value:
     plugin: skip_on_empty
diff --git a/config/migrate_plus.migration.reliefweb_url_alias.yml b/config/migrate_plus.migration.reliefweb_url_alias.yml
index 2155bc5da..6c6747277 100644
--- a/config/migrate_plus.migration.reliefweb_url_alias.yml
+++ b/config/migrate_plus.migration.reliefweb_url_alias.yml
@@ -1,9 +1,9 @@
-uuid: de2982fa-3ab6-4b7e-82f1-657457ae3a77
+uuid: 66722e83-e241-4c15-bb2c-014e3456580d
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: _GCe7Mu0jNiOJst3TKuIrod_nvHxh7MUZg13XUip6Ug
+  default_config_hash: yaEa6hREcnWMiVS9iBJig_q-1U8A1e86k9zqmUuhHpQ
 id: reliefweb_url_alias
 class: null
 field_plugin_method: null
@@ -13,20 +13,19 @@ migration_group: reliefweb_extra
 label: 'Migrate ReliefWeb URL aliases'
 source:
   plugin: reliefweb_url_alias
+  batch_size: 1000
+  high_water_property:
+    name: pid
+    alias: ua
   constants:
     uid: 2
     code: 301
-    prefix: 'internal:/'
 process:
   rid: pid
   uid: constants/uid
   status_code: constants/code
   redirect_source/path: alias
-  redirect_source/uri:
-    plugin: concat
-    source:
-      - constants/prefix
-      - source
+  redirect_redirect/uri: source
 destination:
-  plugin: 'entity:redirect'
+  plugin: 'reliefweb_entity:redirect'
 migration_dependencies: null
diff --git a/config/migrate_plus.migration.reliefweb_user.yml b/config/migrate_plus.migration.reliefweb_user.yml
index 3ff7b3a27..6c0a1a9e5 100644
--- a/config/migrate_plus.migration.reliefweb_user.yml
+++ b/config/migrate_plus.migration.reliefweb_user.yml
@@ -1,9 +1,9 @@
-uuid: 926aff0a-4c9e-4938-940c-659f5d26e0e2
+uuid: d2f38ad9-9090-4e3e-9c77-7aa7a649e8f2
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: rk6D_FRAxYaKHhr232_MMhbhu-P6w8zRyzS8hlUVVIE
+  default_config_hash: WpWV1_VgPthitZiI-lKB2ZcXSbkIgJZU8MvbVsSSvEw
 id: reliefweb_user
 class: null
 field_plugin_method: null
@@ -13,6 +13,7 @@ migration_group: reliefweb_base
 label: 'Migrate ReliefWeb users.'
 source:
   plugin: reliefweb_user
+  batch_size: 1000
 process:
   uid: uid
   name: name
@@ -55,18 +56,11 @@ process:
   path/pathauto:
     plugin: default_value
     default_value: 0
-  path/alias:
-    -
-      plugin: default_value
-      default_value: ''
-    -
-      plugin: skip_on_empty
-      method: process
   _is_migrating:
     plugin: default_value
     default_value: 1
 destination:
-  plugin: 'entity:user'
+  plugin: 'reliefweb_entity:user'
 migration_dependencies:
   required:
     - reliefweb_user__default
diff --git a/config/migrate_plus.migration.reliefweb_user__default.yml b/config/migrate_plus.migration.reliefweb_user__default.yml
index 3e766f596..63dac5220 100644
--- a/config/migrate_plus.migration.reliefweb_user__default.yml
+++ b/config/migrate_plus.migration.reliefweb_user__default.yml
@@ -1,9 +1,9 @@
-uuid: 03005d77-0e66-4896-a5a9-255101da3cd1
+uuid: d0154e6a-eba8-47ca-aedc-28742f86e1db
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: pZ7qJ6cbQfCCSZP7EOGTse1bg6aRM2UU0dYmWH3TOgY
+  default_config_hash: GzwU2vMPN3ymyhwifiPNhnJAGCLyvssCnisf-3WtrIg
 id: reliefweb_user__default
 class: null
 field_plugin_method: null
@@ -61,13 +61,6 @@ process:
   path/pathauto:
     plugin: default_value
     default_value: 0
-  path/alias:
-    -
-      plugin: default_value
-      default_value: ''
-    -
-      plugin: skip_on_empty
-      method: process
   _is_migrating:
     plugin: default_value
     default_value: 1
diff --git a/config/migrate_plus.migration_group.reliefweb_base.yml b/config/migrate_plus.migration_group.reliefweb_base.yml
index e280f7bdc..c03188d87 100644
--- a/config/migrate_plus.migration_group.reliefweb_base.yml
+++ b/config/migrate_plus.migration_group.reliefweb_base.yml
@@ -1,4 +1,4 @@
-uuid: 02f55b0d-2072-47dc-ba18-992a9d088ecf
+uuid: bdab39d5-b403-44ed-a451-554be2f1ba33
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration_group.reliefweb_extra.yml b/config/migrate_plus.migration_group.reliefweb_extra.yml
index d8080ae94..39c17f16c 100644
--- a/config/migrate_plus.migration_group.reliefweb_extra.yml
+++ b/config/migrate_plus.migration_group.reliefweb_extra.yml
@@ -1,4 +1,4 @@
-uuid: 14d16946-ace1-42d5-9676-2ea6b5023eed
+uuid: bb0c9da0-8401-4ddb-8bfa-1cf30a6ab4a1
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration_group.reliefweb_image.yml b/config/migrate_plus.migration_group.reliefweb_image.yml
index c497296c2..37c741ce0 100644
--- a/config/migrate_plus.migration_group.reliefweb_image.yml
+++ b/config/migrate_plus.migration_group.reliefweb_image.yml
@@ -1,4 +1,4 @@
-uuid: 536ba631-2080-44f0-8d82-de6c0329772e
+uuid: b5edf931-2609-49da-8be6-d5ba8b81619e
 langcode: en
 status: true
 dependencies:
@@ -6,7 +6,7 @@ dependencies:
     module:
       - reliefweb_migrate
 _core:
-  default_config_hash: H_TNCXbGUv2Uy06WpNUFqazC_cTpkjRlp5TR-6sC7EY
+  default_config_hash: 5BcRiIy1tnleEtT7Yq9RcCnrlOtwDzmwlHUjFbULqGs
 id: reliefweb_image
 label: 'ReliefWeb Migration - Images'
 description: 'Migrate ReliefWeb images from Drupal 7 to Drupal 9.'
@@ -17,6 +17,16 @@ shared_configuration:
     - image
   source:
     key: rwint7
+    batch_size: 1000
+    high_water_property:
+      name: fid
+      alias: fm
+  destination:
+    plugin: 'reliefweb_entity:file'
+  process:
+    path/pathauto:
+      plugin: default_value
+      default_value: 0
   migration_dependencies:
     required:
       - reliefweb_user
diff --git a/config/migrate_plus.migration_group.reliefweb_media.yml b/config/migrate_plus.migration_group.reliefweb_media.yml
index dca844fbf..3518e447e 100644
--- a/config/migrate_plus.migration_group.reliefweb_media.yml
+++ b/config/migrate_plus.migration_group.reliefweb_media.yml
@@ -1,4 +1,4 @@
-uuid: 72c0270d-548c-488d-8720-83e5423ae7ee
+uuid: cd32f0b9-dc11-4030-a286-2f02a2b2f0c5
 langcode: en
 status: true
 dependencies:
@@ -6,7 +6,7 @@ dependencies:
     module:
       - reliefweb_migrate
 _core:
-  default_config_hash: L6_sg27m91gBcxKOGkqOiwdIyFPLTojsv65mEGO7k_E
+  default_config_hash: YXn9HzKY2JkQuzZzsjGSxgcIFOocreRVuMsoxUMu3nA
 id: reliefweb_media
 label: 'ReliefWeb Migration - Media'
 description: 'Migrate ReliefWeb media from Drupal 7 to Drupal 9.'
@@ -22,10 +22,15 @@ shared_configuration:
   source:
     key: rwint7
     plugin: reliefweb_media
+    batch_size: 1000
+    high_water_property:
+      name: fid
+      alias: fm
   destination:
-    plugin: 'entity:media'
+    plugin: 'reliefweb_entity:media'
   process:
     mid: fid
+    vid: fid
     uid:
       plugin: static_map
       bypass: true
@@ -40,6 +45,9 @@ shared_configuration:
     field_media_image/target_id: fid
     field_media_image/width: width
     field_media_image/height: height
+    path/pathauto:
+      plugin: default_value
+      default_value: 0
     _is_migrating:
       plugin: default_value
       default_value: 1
diff --git a/config/migrate_plus.migration_group.reliefweb_node.yml b/config/migrate_plus.migration_group.reliefweb_node.yml
index 8d0ef8e0b..2aacc2c85 100644
--- a/config/migrate_plus.migration_group.reliefweb_node.yml
+++ b/config/migrate_plus.migration_group.reliefweb_node.yml
@@ -1,4 +1,4 @@
-uuid: 349a350e-3b52-4bae-9017-ae0457963267
+uuid: c152fd81-e585-47e7-ad71-9859c9a547bf
 langcode: en
 status: true
 dependencies:
@@ -6,7 +6,7 @@ dependencies:
     module:
       - reliefweb_migrate
 _core:
-  default_config_hash: t-QfEMMoEpg5sxIwXCODzkJWRIdu_QEhE2KSMAFgcWM
+  default_config_hash: Zubd0GT9xBrCL5X0C6M0BgFqDCARbZwcZGToILm0lG4
 id: reliefweb_node
 label: 'ReliefWeb Migration - Nodes'
 description: 'Migrate ReliefWeb nodes from Drupal 7 to Drupal 9.'
@@ -24,8 +24,12 @@ shared_configuration:
     plugin: reliefweb_node
     constants:
       format: markdown
+    batch_size: 1000
+    high_water_property:
+      name: vid
+      alias: nr
   destination:
-    plugin: 'entity:node'
+    plugin: 'reliefweb_entity:node'
   process:
     nid: nid
     uid:
@@ -58,7 +62,7 @@ shared_configuration:
       map:
         published: 1
         to-review: 1
-    moderation_state:
+    moderation_status:
       plugin: static_map
       source: field_status/0/value
       default_value: draft
@@ -68,13 +72,13 @@ shared_configuration:
         duplicate: duplicate
         expired: expired
         embargoed: embargoed
-        on-hold: on_hold
+        on-hold: on-hold
         pending: pending
         published: published
         reference: reference
         refused: refused
-        to-review: to_review
-    vid: revision_id
+        to-review: to-review
+    vid: vid
     revision_uid:
       plugin: static_map
       bypass: true
@@ -98,6 +102,13 @@ shared_configuration:
         markdown: markdown
         plain_text: markdown
         token_markdown: token_markdown
+    url_lias:
+      plugin: skip_on_empty
+      method: process
+      source: url_alias
+    path/pathauto:
+      plugin: default_value
+      default_value: 0
     notifications_content_disable:
       plugin: default_value
       default_value: 1
diff --git a/config/migrate_plus.migration_group.reliefweb_node_revision.yml b/config/migrate_plus.migration_group.reliefweb_node_revision.yml
index 0efd5030c..e79bbb1b9 100644
--- a/config/migrate_plus.migration_group.reliefweb_node_revision.yml
+++ b/config/migrate_plus.migration_group.reliefweb_node_revision.yml
@@ -1,4 +1,4 @@
-uuid: 875c6b64-5775-4c4e-8a32-0ad217700cd8
+uuid: 42111702-3459-44d3-b916-fdcc8d2f5519
 langcode: en
 status: true
 dependencies:
@@ -6,7 +6,7 @@ dependencies:
     module:
       - reliefweb_migrate
 _core:
-  default_config_hash: IwIiajH_CASgynt3y6aKz3SU5V9u3lewcFnYmx4Holc
+  default_config_hash: 3f_FAERYfXmQSZl-6GcYq__xTZddEHc3cDddioXgBbo
 id: reliefweb_node_revision
 label: 'ReliefWeb Migration - Node revisions'
 description: 'Migrate ReliefWeb node revisions from Drupal 7 to Drupal 9.'
@@ -25,8 +25,12 @@ shared_configuration:
     plugin: reliefweb_node_revision
     constants:
       format: markdown
+    batch_size: 1000
+    high_water_property:
+      name: vid
+      alias: nr
   destination:
-    plugin: 'entity_revision:node'
+    plugin: 'reliefweb_entity_revision:node'
   process:
     nid: nid
     uid:
@@ -47,7 +51,7 @@ shared_configuration:
       map:
         published: 1
         to-review: 1
-    moderation_state:
+    moderation_status:
       plugin: static_map
       source: field_status/0/value
       default_value: draft
@@ -57,13 +61,13 @@ shared_configuration:
         duplicate: duplicate
         expired: expired
         embargoed: embargoed
-        on-hold: on_hold
+        on-hold: on-hold
         pending: pending
         published: published
         reference: reference
         refused: refused
-        to-review: to_review
-    vid: revision_id
+        to-review: to-review
+    vid: vid
     revision_uid:
       plugin: static_map
       bypass: true
@@ -87,6 +91,9 @@ shared_configuration:
         markdown: markdown
         plain_text: markdown
         token_markdown: token_markdown
+    path/pathauto:
+      plugin: default_value
+      default_value: 0
     notifications_content_disable:
       plugin: default_value
       default_value: 1
diff --git a/config/migrate_plus.migration_group.reliefweb_term.yml b/config/migrate_plus.migration_group.reliefweb_term.yml
index 2b10b02f1..7611ef1a7 100644
--- a/config/migrate_plus.migration_group.reliefweb_term.yml
+++ b/config/migrate_plus.migration_group.reliefweb_term.yml
@@ -1,4 +1,4 @@
-uuid: 6c99bc54-fbd5-48f4-a760-b4513c6dfae6
+uuid: 8abe2435-7024-4085-851d-53026abe567c
 langcode: en
 status: true
 dependencies:
@@ -6,7 +6,7 @@ dependencies:
     module:
       - reliefweb_migrate
 _core:
-  default_config_hash: wZ1IaGKvr9y87bD8zGnu6Tr2fvpHu7VF2IDZnp7BJA8
+  default_config_hash: h8KWWXno6IxOKxWqxJ3Em-Vn-kxb4cwPS2Wqn6AUjlo
 id: reliefweb_term
 label: 'ReliefWeb Migration - Terms'
 description: 'Migrate ReliefWeb terms from Drupal 7 to Drupal 9.'
@@ -24,8 +24,12 @@ shared_configuration:
     plugin: reliefweb_taxonomy_term
     constants:
       format: markdown
+    batch_size: 1000
+    high_water_property:
+      name: revision_id
+      alias: tdr
   destination:
-    plugin: 'entity:taxonomy_term'
+    plugin: 'reliefweb_entity:taxonomy_term'
   process:
     tid: tid
     vid:
@@ -66,21 +70,21 @@ shared_configuration:
         normal: 1
         ongoing: 1
         past: 1
-    moderation_state:
+    moderation_status:
       plugin: static_map
       source: field_status/0/value
       map:
         active: active
         alert: alert
-        alert-archive: alert_archive
+        alert-archive: alert-archive
         archive: archive
         blocked: blocked
         draft: draft
-        draft-archive: draft_archive
+        draft-archive: draft-archive
         duplicate: duplicate
         current: ongoing
         external: external
-        external-archive: external_archive
+        external-archive: external-archive
         inactive: inactive
         normal: normal
         ongoing: ongoing
@@ -96,6 +100,13 @@ shared_configuration:
     revision_log_message: revision_log_message
     revision_created: revision_created
     revision_default: revision_default
+    url_lias:
+      plugin: skip_on_empty
+      method: process
+      source: url_alias
+    path/pathauto:
+      plugin: default_value
+      default_value: 0
     notifications_content_disable:
       plugin: default_value
       default_value: 1
diff --git a/config/migrate_plus.migration_group.reliefweb_term_revision.yml b/config/migrate_plus.migration_group.reliefweb_term_revision.yml
index d11a708ff..bfa2040f4 100644
--- a/config/migrate_plus.migration_group.reliefweb_term_revision.yml
+++ b/config/migrate_plus.migration_group.reliefweb_term_revision.yml
@@ -1,4 +1,4 @@
-uuid: a0fe1416-f8b8-4a80-901a-c05e98db44d0
+uuid: 66588acc-69ec-4629-a0f0-c28bec39896b
 langcode: en
 status: true
 dependencies:
@@ -6,7 +6,7 @@ dependencies:
     module:
       - reliefweb_migrate
 _core:
-  default_config_hash: U0W5uKe8dAmeukdwCwGA-8GQN-Ki4rbq6tRGEAWHqeI
+  default_config_hash: tS_31Bhvno2adarJKEFtU7i1eLpEST0eBF3f5-B_pt8
 id: reliefweb_term_revision
 label: 'ReliefWeb Migration - Term revisions'
 description: 'Migrate ReliefWeb term revisions from Drupal 7 to Drupal 9.'
@@ -25,8 +25,12 @@ shared_configuration:
     plugin: reliefweb_taxonomy_term_revision
     constants:
       format: markdown
+    batch_size: 1000
+    high_water_property:
+      name: revision_id
+      alias: tdr
   destination:
-    plugin: 'entity_revision:taxonomy_term'
+    plugin: 'reliefweb_entity_revision:taxonomy_term'
   process:
     tid: tid
     vid:
@@ -67,21 +71,21 @@ shared_configuration:
         normal: 1
         ongoing: 1
         past: 1
-    moderation_state:
+    moderation_status:
       plugin: static_map
       source: field_status/0/value
       map:
         active: active
         alert: alert
-        alert-archive: alert_archive
+        alert-archive: alert-archive
         archive: archive
         blocked: blocked
         draft: draft
-        draft-archive: draft_archive
+        draft-archive: draft-archive
         duplicate: duplicate
         current: ongoing
         external: external
-        external-archive: external_archive
+        external-archive: external-archive
         inactive: inactive
         normal: normal
         ongoing: ongoing
@@ -95,8 +99,16 @@ shared_configuration:
         - 2
         - 2
     revision_log_message: revision_log_message
-    revision_created: revision_created
+    revision_created:
+      plugin: static_map
+      bypass: true
+      source: revision_created
+      map:
+        - 844128000
     revision_default: revision_default
+    path/pathauto:
+      plugin: default_value
+      default_value: 0
     notifications_content_disable:
       plugin: default_value
       default_value: 1

From 4bf045b56ceffcbcc9302c2da1a7f319c1331771 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 4 Jan 2022 08:56:01 +0000
Subject: [PATCH 343/720] [RW-300] Do not show archived links for the profile
 links in the revisions

---
 .../reliefweb_revisions/src/Services/EntityHistory.php     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_revisions/src/Services/EntityHistory.php b/html/modules/custom/reliefweb_revisions/src/Services/EntityHistory.php
index f3231408a..888791c2e 100644
--- a/html/modules/custom/reliefweb_revisions/src/Services/EntityHistory.php
+++ b/html/modules/custom/reliefweb_revisions/src/Services/EntityHistory.php
@@ -686,7 +686,12 @@ protected function formatReliefWebLinksFieldDiff(FieldDefinitionInterface $field
     }
 
     $categories = [
-      'added' => array_diff_key($current, $previous),
+      // Filter the links to only show the added active links as there is not
+      // much interest in showing the list of archived links in the revisions
+      // and it can be really heavy for some entities.
+      'added' => array_filter(array_diff_key($current, $previous), function ($item) {
+        return $item['active'] == 1;
+      }),
       'removed' => array_diff_key($previous, $current),
       'modified-title' => [],
       'modified-image' => [],

From 153af5a3ed1706c6a30b8447424983d0e6d47e18 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 4 Jan 2022 08:57:19 +0000
Subject: [PATCH 344/720] [RW-296] Do not transform file uris for default media
 icons as Drupal expects a specific uris

---
 .../custom/reliefweb_utility/reliefweb_utility.module        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/html/modules/custom/reliefweb_utility/reliefweb_utility.module b/html/modules/custom/reliefweb_utility/reliefweb_utility.module
index 8136fb688..3db39120b 100644
--- a/html/modules/custom/reliefweb_utility/reliefweb_utility.module
+++ b/html/modules/custom/reliefweb_utility/reliefweb_utility.module
@@ -35,6 +35,11 @@ function reliefweb_utility_file_presave(FileInterface $file) {
   $uuid = $file->uuid();
   $uri = $file->getFileUri();
 
+  // Skip the media icons.
+  if (strpos($uri, 'public://media-icons/') === 0) {
+    return;
+  }
+
   // Let other modules decide if this should apply.
   $apply = TRUE;
   $clone = clone $file;

From 8b3f8c48d8df72ea00fe7e134cc13029b306ba7d Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 4 Jan 2022 08:58:17 +0000
Subject: [PATCH 345/720] [RW-301] Add autolink extension for markdown
 extension

---
 .../custom/reliefweb_utility/src/Plugin/Filter/Markdown.php   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/html/modules/custom/reliefweb_utility/src/Plugin/Filter/Markdown.php b/html/modules/custom/reliefweb_utility/src/Plugin/Filter/Markdown.php
index 42f3d77af..cde2d4c7c 100644
--- a/html/modules/custom/reliefweb_utility/src/Plugin/Filter/Markdown.php
+++ b/html/modules/custom/reliefweb_utility/src/Plugin/Filter/Markdown.php
@@ -6,6 +6,7 @@
 use Drupal\filter\Plugin\FilterBase;
 use League\CommonMark\Environment;
 use League\CommonMark\Extension\Attributes\AttributesExtension;
+use League\CommonMark\Extension\Autolink\AutolinkExtension;
 use League\CommonMark\Extension\ExternalLink\ExternalLinkExtension;
 use League\CommonMark\Extension\Table\TableExtension;
 use League\CommonMark\MarkdownConverter;
@@ -53,6 +54,9 @@ public function process($text, $langcode) {
     // Add the extension to convert ID attributes.
     $environment->addExtension(new AttributesExtension());
 
+    // Add the extension to convert links.
+    $environment->addExtension(new AutolinkExtension());
+
     // Add the extension to convert the tables.
     $environment->addExtension(new TableExtension());
 

From 716bacbe07815265a9e271c5b2a53960b06166d7 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 4 Jan 2022 08:59:17 +0000
Subject: [PATCH 346/720] [RW-296] Adjust reliefweb_file field type to do not
 create the files during the migration as it's handled elsewhere

---
 .../Field/FieldType/ReliefWebFileList.php     | 36 ++-----------------
 1 file changed, 2 insertions(+), 34 deletions(-)

diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php
index 5ef3cb9bd..83cff53ca 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\reliefweb_docstore\Plugin\Field\FieldType;
 
-use Drupal\Core\Entity\EntityPublishedInterface;
 use Drupal\Core\Field\FieldItemList;
 use Drupal\reliefweb_utility\Traits\EntityDatabaseInfoTrait;
 
@@ -43,39 +42,8 @@ public function preSave() {
     // Files migration is handled separately.
     // @todo remove when removing `reliefweb_migrate`.
     if (!empty($entity->_is_migrating)) {
-      // If the entity is not published, we'll mark the files are private.
-      $private = TRUE;
-      if ($entity instanceof EntityPublishedInterface) {
-        $private = !$entity->isPublished();
-      }
-
-      // Create the field item and preview files with the permanent URIs.
-      foreach ($this->list as $item) {
-        if ($item->isEmpty()) {
-          continue;
-        }
-
-        $file = $item->createFile();
-        if (empty($file)) {
-          continue;
-        }
-        $file->setFileUri($item->getPermanentUri($private, FALSE));
-        $file->setPermanent();
-        $file->save();
-        $item->get('file_uuid')->setValue($file->uuid());
-
-        if (!$item->canHavePreview() || empty($item->getPreviewPage())) {
-          continue;
-        }
-        $preview_file = $item->createPreviewFile(FALSE);
-        if (empty($preview_file)) {
-          continue;
-        }
-        $preview_file->setFileUri($item->getPermanentUri($private, TRUE));
-        $preview_file->setPermanent();
-        $preview_file->save();
-        $item->get('preview_uuid')->setValue($preview_file->uuid());
-      }
+      // The file creation is handled by the migration destination.
+      // @see \Drupal\reliefweb_migrate\Plugin\migrate\destination\EntityNode::save()
       return;
     }
 

From aa74084156b7e536540527a261dab0dccfa5bf3d Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 4 Jan 2022 09:38:59 +0000
Subject: [PATCH 347/720] [RW-296] Fix typo in config

---
 .../core.entity_form_display.taxonomy_term.disaster.default.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/core.entity_form_display.taxonomy_term.disaster.default.yml b/config/core.entity_form_display.taxonomy_term.disaster.default.yml
index 143e0f477..343b457d0 100644
--- a/config/core.entity_form_display.taxonomy_term.disaster.default.yml
+++ b/config/core.entity_form_display.taxonomy_term.disaster.default.yml
@@ -45,7 +45,7 @@ content:
     settings:
       sort: label
       extra_data:
-        'country:moderation_status: 'country:moderation_status'
+        'country:moderation_status': 'country:moderation_status'
         'country:field_shortname': 'country:field_shortname'
         'country:tid': '0'
         'country:uuid': '0'

From 16fc5db6d6813362de5d966cb0553b32c59b5530 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 4 Jan 2022 11:15:29 +0100
Subject: [PATCH 348/720] OPS-7989: HID

---
 composer.json |  2 +-
 composer.lock | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/composer.json b/composer.json
index dc1b9ae10..82096aabd 100644
--- a/composer.json
+++ b/composer.json
@@ -71,7 +71,7 @@
         "drupal/pathauto": "^1.8",
         "drupal/redirect": "^1.7",
         "drupal/redis": "^1.5",
-        "drupal/social_auth_hid": "^2.7",
+        "drupal/social_auth_hid": "^3.0",
         "drupal/svg_image": "^1.15",
         "drupal/taxonomy_term_revision": "1.x-dev",
         "drupal/theme_switcher": "^1.2",
diff --git a/composer.lock b/composer.lock
index e2408d6f8..be9cde1f2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "467886a9d48d0f0fa17f498a73a6cdc3",
+    "content-hash": "3584d429cee31a0427f1b0d726881acf",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -3821,28 +3821,28 @@
         },
         {
             "name": "drupal/social_auth_hid",
-            "version": "2.7.0",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/social_auth_hid.git",
-                "reference": "8.x-2.7"
+                "reference": "8.x-3.0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/social_auth_hid-8.x-2.7.zip",
-                "reference": "8.x-2.7",
-                "shasum": "f9c8384fb81b3fcfd2df50450dcb25161672622b"
+                "url": "https://ftp.drupal.org/files/projects/social_auth_hid-8.x-3.0.zip",
+                "reference": "8.x-3.0",
+                "shasum": "2d7f88dbdc3e5ec780735788901915facfeda10d"
             },
             "require": {
-                "drupal/core": "^8.8 || ^9",
+                "drupal/core": "^9 || ^10",
                 "drupal/social_auth": "^3.0",
                 "un-ocha/oauth2-hid": "^1.0.2"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-2.7",
-                    "datestamp": "1629377857",
+                    "version": "8.x-3.0",
+                    "datestamp": "1641290573",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"

From 95700f36b25ca88b36e4b482666b329adfd52bf7 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 4 Jan 2022 11:04:53 +0000
Subject: [PATCH 349/720] [RW-296] Fix default value for moderation status

---
 .../reliefweb_entities/src/Entity/Source.php  |  7 ++++
 .../reliefweb_guidelines.install              |  2 +-
 .../reliefweb_guidelines.module               |  2 +-
 .../src/Entity/Guideline.php                  |  7 ++++
 .../src/Entity/GuidelineList.php              |  7 ++++
 .../src/ModeratedGuidelineStorageSchema.php   |  1 -
 .../reliefweb_moderation.install              | 10 +++--
 .../reliefweb_moderation.module               | 39 +++++++++++++++++--
 .../src/EntityModeratedInterface.php          |  8 ++++
 .../src/EntityModeratedTrait.php              |  9 +++++
 .../src/ModeratedNodeStorageSchema.php        |  1 -
 .../src/ModeratedTermStorageSchema.php        |  1 -
 12 files changed, 81 insertions(+), 13 deletions(-)

diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Source.php b/html/modules/custom/reliefweb_entities/src/Entity/Source.php
index bc83afb0c..c3ef8b380 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Source.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Source.php
@@ -237,4 +237,11 @@ protected function getOrganizationSocialMediaLinks() {
     return [];
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getDefaultModerationStatus() {
+    return 'active';
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.install b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.install
index 922af358f..216347cc3 100644
--- a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.install
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.install
@@ -13,5 +13,5 @@ use Drupal\reliefweb_guidelines\ModeratedGuidelineStorageSchema;
  * @see reliefweb_moderation_install()
  */
 function reliefweb_guidelines_install() {
-  reliefweb_moderation_add_moderation_status('guideline', ModeratedGuidelineStorageSchema::class);
+  reliefweb_moderation_add_moderation_status('guideline', ModeratedGuidelineStorageSchema::class, 'published');
 }
diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
index 65d2e71e1..8221cf90e 100644
--- a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
@@ -52,7 +52,7 @@ function reliefweb_guidelines_entity_bundle_info_alter(&$bundles) {
 function reliefweb_guidelines_entity_base_field_info(EntityTypeInterface $entity_type) {
   $fields = [];
   if ($entity_type->id() === 'guideline') {
-    $fields['moderation_status'] = reliefweb_moderation_get_moderation_status_field_definition();
+    $fields['moderation_status'] = reliefweb_moderation_get_moderation_status_field_definition('published');
   }
   return $fields;
 }
diff --git a/html/modules/custom/reliefweb_guidelines/src/Entity/Guideline.php b/html/modules/custom/reliefweb_guidelines/src/Entity/Guideline.php
index e3fd08f8d..9a6aac3a6 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Entity/Guideline.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Entity/Guideline.php
@@ -90,4 +90,11 @@ public static function generateShortId() {
     return $shortid;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getDefaultModerationStatus() {
+    return 'published';
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_guidelines/src/Entity/GuidelineList.php b/html/modules/custom/reliefweb_guidelines/src/Entity/GuidelineList.php
index 6ab15f214..7777c94dd 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Entity/GuidelineList.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Entity/GuidelineList.php
@@ -16,4 +16,11 @@ class GuidelineList extends GuidelineBase implements EntityModeratedInterface, E
   use EntityModeratedTrait;
   use EntityRevisionedTrait;
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getDefaultModerationStatus() {
+    return 'published';
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_guidelines/src/ModeratedGuidelineStorageSchema.php b/html/modules/custom/reliefweb_guidelines/src/ModeratedGuidelineStorageSchema.php
index d73e691b2..84d5a1b92 100644
--- a/html/modules/custom/reliefweb_guidelines/src/ModeratedGuidelineStorageSchema.php
+++ b/html/modules/custom/reliefweb_guidelines/src/ModeratedGuidelineStorageSchema.php
@@ -50,7 +50,6 @@ protected function getSharedTableFieldSchema(FieldStorageDefinitionInterface $st
       case 'moderation_status':
         $schema['fields']['moderation_status']['type'] = 'varchar_ascii';
         $schema['fields']['moderation_status']['not null'] = 'TRUE';
-        $schema['fields']['moderation_status']['default'] = '';
         $this->addSharedTableFieldIndex($storage_definition, $schema, TRUE);
         break;
     }
diff --git a/html/modules/custom/reliefweb_moderation/reliefweb_moderation.install b/html/modules/custom/reliefweb_moderation/reliefweb_moderation.install
index 07155105d..edd8fab45 100644
--- a/html/modules/custom/reliefweb_moderation/reliefweb_moderation.install
+++ b/html/modules/custom/reliefweb_moderation/reliefweb_moderation.install
@@ -15,8 +15,8 @@ use Drupal\reliefweb_moderation\ModeratedTermStorageSchema;
  * @see https://www.drupal.org/project/drupal/issues/2258347
  */
 function reliefweb_moderation_install() {
-  reliefweb_moderation_add_moderation_status('node', ModeratedNodeStorageSchema::class);
-  reliefweb_moderation_add_moderation_status('taxonomy_term', ModeratedTermStorageSchema::class);
+  reliefweb_moderation_add_moderation_status('node', ModeratedNodeStorageSchema::class, 'draft');
+  reliefweb_moderation_add_moderation_status('taxonomy_term', ModeratedTermStorageSchema::class, 'published');
 }
 
 /**
@@ -26,8 +26,10 @@ function reliefweb_moderation_install() {
  *   Entity type ID.
  * @param string $storage_schema_class
  *   Class to use for the entity type storage schema.
+ * @param string $default_status
+ *   The default moderation status value.
  */
-function reliefweb_moderation_add_moderation_status($entity_type_id, $storage_schema_class) {
+function reliefweb_moderation_add_moderation_status($entity_type_id, $storage_schema_class, $default_status = 'draft') {
   $logger = \Drupal::logger('reliefweb_moderation');
   $manager = \Drupal::entityDefinitionUpdateManager();
   $entity_type = $manager->getEntityType($entity_type_id);
@@ -83,7 +85,7 @@ function reliefweb_moderation_add_moderation_status($entity_type_id, $storage_sc
   // Add the moderation status base field.
   $definition = $manager->getFieldStorageDefinition('moderation_status', $entity_type_id);
   if (empty($definition)) {
-    $definition = reliefweb_moderation_get_moderation_status_field_definition();
+    $definition = reliefweb_moderation_get_moderation_status_field_definition($default_status);
 
     // Add the moderation status field, this should trigger an update on the
     // entity type and add the indexes.
diff --git a/html/modules/custom/reliefweb_moderation/reliefweb_moderation.module b/html/modules/custom/reliefweb_moderation/reliefweb_moderation.module
index ca953fa55..b98a675a6 100644
--- a/html/modules/custom/reliefweb_moderation/reliefweb_moderation.module
+++ b/html/modules/custom/reliefweb_moderation/reliefweb_moderation.module
@@ -9,6 +9,7 @@ use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Render\Markup;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\reliefweb_moderation\EntityModeratedInterface;
@@ -87,9 +88,17 @@ function reliefweb_moderation_theme() {
  */
 function reliefweb_moderation_entity_base_field_info(EntityTypeInterface $entity_type) {
   $fields = [];
-  if ($entity_type->id() === 'node' || $entity_type->id() === 'taxonomy_term') {
-    $fields['moderation_status'] = reliefweb_moderation_get_moderation_status_field_definition();
+
+  switch ($entity_type->id()) {
+    case 'node':
+      $fields['moderation_status'] = reliefweb_moderation_get_moderation_status_field_definition('draft');
+      break;
+
+    case 'taxonomy_term':
+      $fields['moderation_status'] = reliefweb_moderation_get_moderation_status_field_definition('published');
+      break;
   }
+
   return $fields;
 }
 
@@ -108,16 +117,38 @@ function reliefweb_moderation_entity_type_alter(array &$entity_types) {
 /**
  * Get the moderation status field definition.
  *
+ * @param string $default_status
+ *   The default moderation status value.
+ *
  * @return \Drupal\Core\Field\BaseFieldDefinition
  *   Field definition.
  */
-function reliefweb_moderation_get_moderation_status_field_definition() {
+function reliefweb_moderation_get_moderation_status_field_definition($default_status = 'draft') {
   return BaseFieldDefinition::create('string')
     ->setLabel(t('Moderation Status'))
     ->setSetting('max_length', 32)
     ->setRevisionable(TRUE)
     ->setTranslatable(TRUE)
-    ->setDefaultValue('');
+    ->setDefaultValue($default_status)
+    ->setDefaultValueCallback('reliefweb_moderation_moderation_status_value_callback');
+}
+
+/**
+ * Moderation status default value callback.
+ *
+ * @param \Drupal\Core\Entity\EntityInterface $entity
+ *   The entity.
+ * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
+ *   The moderation status field definition for the entity.
+ *
+ * @return string|null
+ *   The moderation status if applicable for the
+ */
+function reliefweb_moderation_moderation_status_value_callback(EntityInterface $entity, FieldDefinitionInterface $field_definition) {
+  if ($entity instanceof EntityModeratedInterface) {
+    return $entity->getDefaultModerationStatus();
+  }
+  return $field_definition->getDefaultValueLiteral();
 }
 
 /**
diff --git a/html/modules/custom/reliefweb_moderation/src/EntityModeratedInterface.php b/html/modules/custom/reliefweb_moderation/src/EntityModeratedInterface.php
index 5530fb729..5b45c6f3d 100644
--- a/html/modules/custom/reliefweb_moderation/src/EntityModeratedInterface.php
+++ b/html/modules/custom/reliefweb_moderation/src/EntityModeratedInterface.php
@@ -39,6 +39,14 @@ public function getModerationStatusLabel();
    */
   public function getAllowedModerationStatuses();
 
+  /**
+   * Get the default moderation status.
+   *
+   * @return string
+   *   The default moderation status.
+   */
+  public function getDefaultModerationStatus();
+
   /**
    * Get the moderation service for the entity.
    *
diff --git a/html/modules/custom/reliefweb_moderation/src/EntityModeratedTrait.php b/html/modules/custom/reliefweb_moderation/src/EntityModeratedTrait.php
index 5ae1c29b8..21c6c7ccd 100644
--- a/html/modules/custom/reliefweb_moderation/src/EntityModeratedTrait.php
+++ b/html/modules/custom/reliefweb_moderation/src/EntityModeratedTrait.php
@@ -76,6 +76,15 @@ public function getAllowedModerationStatuses() {
     return $this->allowedModerationStatuses;
   }
 
+  /**
+   * Get the default moderation status.
+   *
+   * @see \Drupal\reliefweb_moderation\EntityModeratedInterface::getDefaultModerationStatus()
+   */
+  public function getDefaultModerationStatus() {
+    return 'draft';
+  }
+
   /**
    * Get the moderation service for the entity.
    *
diff --git a/html/modules/custom/reliefweb_moderation/src/ModeratedNodeStorageSchema.php b/html/modules/custom/reliefweb_moderation/src/ModeratedNodeStorageSchema.php
index 5b62081b5..f39c51bea 100644
--- a/html/modules/custom/reliefweb_moderation/src/ModeratedNodeStorageSchema.php
+++ b/html/modules/custom/reliefweb_moderation/src/ModeratedNodeStorageSchema.php
@@ -50,7 +50,6 @@ protected function getSharedTableFieldSchema(FieldStorageDefinitionInterface $st
       case 'moderation_status':
         $schema['fields']['moderation_status']['type'] = 'varchar_ascii';
         $schema['fields']['moderation_status']['not null'] = 'TRUE';
-        $schema['fields']['moderation_status']['default'] = '';
         $this->addSharedTableFieldIndex($storage_definition, $schema, TRUE);
         break;
     }
diff --git a/html/modules/custom/reliefweb_moderation/src/ModeratedTermStorageSchema.php b/html/modules/custom/reliefweb_moderation/src/ModeratedTermStorageSchema.php
index 7e46b7f93..b4ca45218 100644
--- a/html/modules/custom/reliefweb_moderation/src/ModeratedTermStorageSchema.php
+++ b/html/modules/custom/reliefweb_moderation/src/ModeratedTermStorageSchema.php
@@ -50,7 +50,6 @@ protected function getSharedTableFieldSchema(FieldStorageDefinitionInterface $st
       case 'moderation_status':
         $schema['fields']['moderation_status']['type'] = 'varchar_ascii';
         $schema['fields']['moderation_status']['not null'] = 'TRUE';
-        $schema['fields']['moderation_status']['default'] = '';
         $this->addSharedTableFieldIndex($storage_definition, $schema, TRUE);
         break;
     }

From 902e53f71d8b508d397f6d4785e67cc093fefc5b Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 7 Jan 2022 08:18:26 +0000
Subject: [PATCH 350/720] [RW-296] Prevent hooks from running when migrating
 url aliases

---
 .../install/migrate_plus.migration.reliefweb_url_alias.yml    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_url_alias.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_url_alias.yml
index ee8863256..5e983a199 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_url_alias.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_url_alias.yml
@@ -27,3 +27,7 @@ process:
   #  plugin: default_value
   #  source: language
   #  default_value: 'en'
+  # Flag the entity as being migrated.
+  _is_migrating:
+    plugin: default_value
+    default_value: 1

From b2bae6caa5a2d0afefd4edf8fc322dfb0fe6c27a Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 7 Jan 2022 08:19:17 +0000
Subject: [PATCH 351/720] [RW-296] Ensure flushing is synchronized with
 batch_size

---
 .../src/Entity/AccumulatedSqlContentEntityStorageTrait.php      | 2 +-
 .../src/Plugin/migrate/id_map/AccumulatedSql.php                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedSqlContentEntityStorageTrait.php b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedSqlContentEntityStorageTrait.php
index 0ff723425..fa84021b6 100644
--- a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedSqlContentEntityStorageTrait.php
+++ b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedSqlContentEntityStorageTrait.php
@@ -61,7 +61,7 @@ public function saveAccumulated(EntityInterface $entity, $max = 1000) {
       $this->doPostSaveAccumulated($entity, !$is_new);
 
       // Flush the accumulated data.
-      if ($this->accumulationCounter++ > $max) {
+      if ($this->accumulationCounter++ >= $max) {
         $this->flushAccumulated();
       }
     }
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/id_map/AccumulatedSql.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/id_map/AccumulatedSql.php
index 8c7d88275..4cd6c698e 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/id_map/AccumulatedSql.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/id_map/AccumulatedSql.php
@@ -160,7 +160,7 @@ protected function saveIdMappingAccumulated(Row $row, array $destination_id_valu
     $this->accumulatedIdMapping[$keys[$this::SOURCE_IDS_HASH]] = $fields;
 
     // Save the mapping.
-    if (count($this->accumulatedIdMapping) > 1000) {
+    if (count($this->accumulatedIdMapping) >= 1000) {
       $this->flushAccumulatedIdMapping();
     }
   }

From 9636efa912c8a4928bc0c697a16caafa26ffb577 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 7 Jan 2022 08:19:55 +0000
Subject: [PATCH 352/720] [RW-296] Prevent running some hooks when rolling back

---
 .../src/Plugin/migrate/destination/Entity.php        |  1 +
 .../src/Plugin/migrate/destination/EntityUser.php    | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Entity.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Entity.php
index c66c1781c..e983acd08 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Entity.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Entity.php
@@ -123,6 +123,7 @@ protected function getEntity(Row $row, array $old_destination_id_values) {
     if ($this->migration->getSourcePlugin()->entityExists($entity_id)) {
       $entity = $this->storage->load($entity_id);
       if (!empty($entity)) {
+        $entity->_is_migrating = TRUE;
         $entity->delete();
       }
     }
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityUser.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityUser.php
index ac521d27b..0e81351be 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityUser.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityUser.php
@@ -67,6 +67,18 @@ public static function create(ContainerInterface $container, array $configuratio
    * individual loads.
    */
   protected function getEntity(Row $row, array $old_destination_id_values) {
+    $entity_id = reset($old_destination_id_values) ?: $this->getEntityId($row);
+
+    // Delete the existing entity so we can insert the new one without having
+    // to worry about changes, unwanted new revisions etc.
+    if ($this->migration->getSourcePlugin()->entityExists($entity_id)) {
+      $entity = $this->storage->load($entity_id);
+      if (!empty($entity)) {
+        $entity->_is_migrating = TRUE;
+        $entity->delete();
+      }
+    }
+
     // Attempt to ensure we always have a bundle.
     if ($bundle = $this->getBundle($row)) {
       $row->setDestinationProperty($this->getKey('bundle'), $bundle);

From c8bb096c68119bba8ed9d3aeaf52b2c8ea31f0c7 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 7 Jan 2022 08:20:24 +0000
Subject: [PATCH 353/720] [RW-296] Ensure we get the proper high water

---
 .../src/Plugin/migrate/source/EntityBase.php           | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
index 25cf6b22b..5f71d712a 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
@@ -130,6 +130,16 @@ public function entityExists($id) {
     return $exists;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function getHighWater() {
+    if (isset($this->storedHighWater)) {
+      return $this->storedHighWater;
+    }
+    return parent::getHighWater();
+  }
+
   /**
    * {@inheritdoc}
    */

From d33487977a996cc46693cfed75f2572751c9eae9 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 7 Jan 2022 08:21:16 +0000
Subject: [PATCH 354/720] [RW-296] Make sure all the attachments are migrated

---
 .../migrate/source/FieldableEntityBase.php    |  49 +++++--
 .../src/Plugin/migrate/source/Report.php      | 123 ++++++++++--------
 2 files changed, 104 insertions(+), 68 deletions(-)

diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/FieldableEntityBase.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/FieldableEntityBase.php
index 06cc795e4..38f670280 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/FieldableEntityBase.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/FieldableEntityBase.php
@@ -57,10 +57,6 @@ protected function preloadFields(\IteratorIterator $iterator) {
     $iterator->rewind();
 
     if ($iterator->count() > 0) {
-      // Clear the previously preloaded values and aliases.
-      $this->preloadedFieldValues = [];
-      $this->preloadedUrlAliases = [];
-
       $use_revision_id = $this->useRevisionId && !empty($this->revisionIdField);
 
       // Extract the entity ids or revision ids.
@@ -223,16 +219,9 @@ public function prepareRow(Row $row) {
         $id = $row->getSourceProperty($this->idField);
       }
 
-      foreach ($this->getFields($this->entityType, $bundle) as $field_name => $field) {
-        if (isset($this->preloadedFieldValues[$bundle][$field_name][$id])) {
-          $row->setSourceProperty($field_name, $this->preloadedFieldValues[$bundle][$field_name][$id]);
-          unset($this->preloadedFieldValues[$bundle][$field_name][$id]);
-        }
-      }
+      $this->setRowSourceFields($id, $bundle, $row);
 
-      if (!empty($this->preloadedUrlAliases[$id])) {
-        $row->setDestinationProperty('url_alias', $this->preloadedUrlAliases[$id]);
-      }
+      $this->setRowDestinationUrlAlias($id, $row);
     }
     else {
       $id = $row->getSourceProperty($this->idField);
@@ -255,6 +244,40 @@ public function prepareRow(Row $row) {
     return parent::prepareRow($row);
   }
 
+  /**
+   * Set the row source field properties based on the preloaded field data.
+   *
+   * @param int $id
+   *   Entity ID or revision ID.
+   * @param string $bundle
+   *   Entity bundle.
+   * @param \Drupal\migrate\Row $row
+   *   Migration row.
+   */
+  protected function setRowSourceFields($id, $bundle, Row $row) {
+    foreach ($this->getFields($this->entityType, $bundle) as $field_name => $field) {
+      if (isset($this->preloadedFieldValues[$bundle][$field_name][$id])) {
+        $row->setSourceProperty($field_name, $this->preloadedFieldValues[$bundle][$field_name][$id]);
+        unset($this->preloadedFieldValues[$bundle][$field_name][$id]);
+      }
+    }
+  }
+
+  /**
+   * Set the row destination url alias from the preloaded URL aliases.
+   *
+   * @param int $id
+   *   Entity ID or revision ID.
+   * @param \Drupal\migrate\Row $row
+   *   Migration row.
+   */
+  protected function setRowDestinationUrlAlias($id, Row $row) {
+    if (!empty($this->preloadedUrlAliases[$id])) {
+      $row->setDestinationProperty('url_alias', $this->preloadedUrlAliases[$id]);
+      unset($this->preloadedUrlAliases[$id]);
+    }
+  }
+
   /**
    * Returns all non-deleted field instances attached to a specific entity type.
    *
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Report.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Report.php
index 47f56d829..9f13202cb 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Report.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Report.php
@@ -28,6 +28,13 @@ class Report extends Node {
    */
   protected $duplicateReports;
 
+  /**
+   * Preloaded attachment data.
+   *
+   * @var array
+   */
+  protected $preloadedAttachments = [];
+
   /**
    * {@inheritdoc}
    */
@@ -66,65 +73,70 @@ public function query() {
    */
   protected function initializeIterator() {
     $iterator = parent::initializeIterator();
+    $this->convertFileFieldData();
+    return $iterator;
+  }
+
+  /**
+   * Convert the field file data.
+   */
+  protected function convertFileFieldData() {
+    // Skip if empty.
+    if (empty($this->preloadedFieldValues['report']['field_file'])) {
+      return;
+    }
 
-    if (!empty($this->preloadedFieldValues['report']['field_file'])) {
-      // Extract information from the D7 field_file description field.
-      $items = [];
-      foreach ($this->preloadedFieldValues['report']['field_file'] as $entity_id => $field_items) {
-        foreach ($field_items as $delta => $item) {
-          if (isset($item['fid'])) {
-            $data = $this->parseAttachmentDescription($item['description'] ?? '');
-            $data['entity_id'] = $entity_id;
-            $data['delta'] = $delta;
-            $items[$item['fid']] = $data;
-          }
+    // Extract information from the D7 field_file description field.
+    $items = [];
+    foreach ($this->preloadedFieldValues['report']['field_file'] as $entity_id => $field_items) {
+      foreach ($field_items as $delta => $item) {
+        if (isset($item['fid'])) {
+          $data = $this->parseAttachmentDescription($item['description'] ?? '');
+          $data['entity_id'] = $entity_id;
+          $data['delta'] = $delta;
+          $items[$item['fid']] = $data;
         }
       }
+    }
 
-      $attachments = [];
-      if (!empty($items)) {
-        // Load the data from the file_managed table.
-        $records = $this->select('file_managed', 'fm')
-          ->fields('fm')
-          ->condition('fm.status', 1, '=')
-          ->condition('fm.fid', array_keys($items), 'IN')
-          ->execute()
-          ?->fetchAll(\PDO::FETCH_OBJ) ?? [];
-
-        // Prepare the D9 field_file data.
-        $attachments = [];
-        foreach ($records as $record) {
-          if (empty($record->uri)) {
-            continue;
-          }
-          if (strtolower(pathinfo($record->filename, PATHINFO_EXTENSION)) === 'pdf') {
-            $record->filemime = 'application/pdf';
-          }
-          $item = $items[$record->fid];
-          $item['uuid'] = LegacyHelper::generateAttachmentUuid($record->uri);
-          $item['file_uuid'] = LegacyHelper::generateAttachmentFileUuid($item['uuid'], $record->fid);
-          if (!empty($item['preview_page'])) {
-            $item['preview_uuid'] = LegacyHelper::generateAttachmentPreviewUuid($item['uuid'], $item['file_uuid']);
-          }
-          $item['file_name'] = $record->filename;
-          $item['file_mime'] = $record->filemime;
-          $item['file_size'] = $record->filesize;
-          // The revision ID will be updated when running the file migration
-          // script.
-          $item['revision_id'] = 0;
-          $item['timestamp'] = $record->timestamp;
-
-          $delta = $item['delta'];
-          $entity_id = $item['entity_id'];
-          unset($item['delta'], $item['entity_id']);
-
-          $attachments[$entity_id][$delta] = $item;
+    if (!empty($items)) {
+      // Load the data from the file_managed table.
+      $records = $this->select('file_managed', 'fm')
+        ->fields('fm')
+        ->condition('fm.status', 1, '=')
+        ->condition('fm.fid', array_keys($items), 'IN')
+        ->execute()
+        ?->fetchAll(\PDO::FETCH_OBJ) ?? [];
+
+      // Prepare the D9 field_file data.
+      foreach ($records as $record) {
+        if (empty($record->uri)) {
+          continue;
         }
+        if (strtolower(pathinfo($record->filename, PATHINFO_EXTENSION)) === 'pdf') {
+          $record->filemime = 'application/pdf';
+        }
+        $item = $items[$record->fid];
+        $item['uuid'] = LegacyHelper::generateAttachmentUuid($record->uri);
+        $item['file_uuid'] = LegacyHelper::generateAttachmentFileUuid($item['uuid'], $record->fid);
+        if (!empty($item['preview_page'])) {
+          $item['preview_uuid'] = LegacyHelper::generateAttachmentPreviewUuid($item['uuid'], $item['file_uuid']);
+        }
+        $item['file_name'] = $record->filename;
+        $item['file_mime'] = $record->filemime;
+        $item['file_size'] = $record->filesize;
+        // The revision ID will be updated when running the file migration
+        // script.
+        $item['revision_id'] = 0;
+        $item['timestamp'] = $record->timestamp;
+
+        $delta = $item['delta'];
+        $entity_id = $item['entity_id'];
+        unset($item['delta'], $item['entity_id']);
+
+        $this->preloadedAttachments[$entity_id][$delta] = $item;
       }
-      $this->preloadedFieldValues['report']['field_file'] = $attachments;
     }
-
-    return $iterator;
   }
 
   /**
@@ -144,9 +156,10 @@ public function prepareRow(Row $row) {
     $row->setDestinationProperty('uuid', $uuid);
 
     // Set the attachments.
-    $field_file = $row->getSourceProperty('field_file');
-    if (!empty($field_file)) {
-      $row->setDestinationProperty('field_file', array_values($field_file));
+    // @todo handle cases where the batch_size is empty?
+    if (!empty($this->preloadedAttachments[$nid])) {
+      $row->setDestinationProperty('field_file', array_values($this->preloadedAttachments[$nid]));
+      unset($this->preloadedAttachments[$nid]);
     }
   }
 

From 3877afe688c66cb9315d4325b780377759350793 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 7 Jan 2022 08:22:22 +0000
Subject: [PATCH 355/720] [RW-101] Convert profile field thumbnail urls

---
 .../Plugin/migrate/source/TaxonomyTerm.php    | 91 +++++++++++++++++++
 .../migrate/source/TaxonomyTermRevision.php   |  7 --
 2 files changed, 91 insertions(+), 7 deletions(-)

diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/TaxonomyTerm.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/TaxonomyTerm.php
index 3a40839cb..b0115eb8b 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/TaxonomyTerm.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/TaxonomyTerm.php
@@ -2,6 +2,10 @@
 
 namespace Drupal\reliefweb_migrate\Plugin\migrate\source;
 
+use Drupal\migrate\Row;
+use Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile;
+use Drupal\reliefweb_utility\Helpers\LegacyHelper;
+
 /**
  * Retrieve taxonomy terms from the Drupal 7 database.
  *
@@ -98,6 +102,93 @@ public function query() {
     return $query;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function initializeIterator() {
+    $iterator = parent::initializeIterator();
+    $this->convertProfileFieldImageUrls();
+    return $iterator;
+  }
+
+  /**
+   * Convert the profile field image URLS to the new UUID-based pattern.
+   */
+  protected function convertProfileFieldImageUrls() {
+    if (!isset($this->configuration['bundle']) || !is_string($this->configuration['bundle'])) {
+      return;
+    }
+    $bundle = $this->configuration['bundle'];
+
+    $field_names = [
+      'field_key_content',
+      'field_appeals_response_plans',
+    ];
+
+    $nids = [];
+    foreach ($field_names as $field_name) {
+      if (empty($this->preloadedFieldValues[$bundle][$field_name])) {
+        continue;
+      }
+
+      foreach ($this->preloadedFieldValues[$bundle][$field_name] as $entity_id => $items) {
+        foreach ($items as $delta => $item) {
+          $nid = str_replace('/node/', '', $item['url']);
+          $nids[$nid] = $nid;
+        }
+      }
+    }
+
+    $image_uris = [];
+    if (!empty($nids)) {
+      $query = $this->select('file_managed', 'fm');
+      $query->innerJoin('field_data_field_file', 'f', '%alias.field_file_fid = fm.fid');
+      $query->addField('f', 'entity_id', 'nid');
+      $query->addField('fm', 'uri', 'uri');
+      $query->condition('f.delta', 0, '=');
+      $query->condition('f.entity_type', 'node', '=');
+      $query->condition('f.entity_id', $nids, 'IN');
+      foreach ($query->execute() ?? [] as $record) {
+        $uuid = LegacyHelper::generateAttachmentUuid($record['uri']);
+        $image_uris['/node/' . $record['nid']] = ReliefWebFile::getFileUriFromUuid($uuid, 'png', FALSE, TRUE);
+      }
+    }
+
+    if (!empty($image_uris)) {
+      foreach ($field_names as $field_name) {
+        if (empty($this->preloadedFieldValues[$bundle][$field_name])) {
+          continue;
+        }
+
+        foreach ($this->preloadedFieldValues[$bundle][$field_name] as $entity_id => $items) {
+          foreach ($items as $delta => $item) {
+            $item['image'] = $image_uris[$item['url']] ?? '';
+            $items[$delta] = $item;
+          }
+          $this->preloadedFieldValues[$bundle][$field_name][$entity_id] = $items;
+        }
+      }
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function prepareRow(Row $row) {
+    if (parent::prepareRow($row) === FALSE) {
+      return FALSE;
+    }
+
+    // Basic Glide fix.
+    if ($row->hasSourceProperty('field_glide')) {
+      $glide = $row->getSourceProperty('field_glide');
+      foreach ($glide as $delta => $item) {
+        $glide[$delta]['value'] = preg_replace('#(Glide Number|GLIDE|\s)#i', '', $item['value']);
+      }
+      $row->setSourceProperty('field_glide', $glide);
+    }
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/TaxonomyTermRevision.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/TaxonomyTermRevision.php
index 98b3262d4..50372ed17 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/TaxonomyTermRevision.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/TaxonomyTermRevision.php
@@ -51,10 +51,6 @@ protected function preloadFields(\IteratorIterator $iterator) {
     $iterator->rewind();
 
     if ($iterator->count() > 0) {
-      // Clear the previously preloaded values and aliases.
-      $this->preloadedFieldValues = [];
-      $this->preloadedUrlAliases = [];
-
       $use_revision_id = $this->useRevisionId && !empty($this->revisionIdField);
 
       // Extract the entity ids or revision ids.
@@ -82,9 +78,6 @@ protected function preloadFields(\IteratorIterator $iterator) {
           $this->preloadedFieldValues[$bundle][$field_name] = $this->getAllFieldValues($this->entityType, $field_name, $ids, $use_revision_id);
         }
       }
-
-      // Preload the URL aliases.
-      $this->preloadUrlAliases($bundles);
     }
   }
 

From 749efa4d74466679783cc4fc936c80d855dfb731 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 7 Jan 2022 10:17:57 +0000
Subject: [PATCH 356/720] [RW-296] Fix issue with media post import task

---
 .../reliefweb_migrate/src/Plugin/migrate/source/Media.php      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Media.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Media.php
index 4848f5008..92d37c85a 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Media.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Media.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\reliefweb_migrate\Plugin\migrate\source;
 
+use Drupal\Core\Database\Database;
 use Drupal\migrate\Event\MigrateImportEvent;
 
 /**
@@ -94,7 +95,7 @@ public function postImport(MigrateImportEvent $event) {
 
     // Update the no-thumbnail media icon to prevent file ID clash with
     // attachments.
-    $this->database
+    Database::getConnection('default', 'default')
       ->update('file_managed')
       ->fields(['fid' => 1, 'uid' => 2])
       ->condition('uri', 'public://media-icons/generic/no-thumbnail.png', '=')

From 25522e0b5ee233fbc22c52ed8acd52a4fba6783e Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Mon, 10 Jan 2022 10:20:20 +0100
Subject: [PATCH 357/720] RW-237: Fine tune permissions for bookmarks and
 subscriptions

---
 .../reliefweb_bookmarks.permissions.yml       |  3 +++
 .../reliefweb_bookmarks.routing.yml           |  4 ++--
 .../Controller/UserBookmarksController.php    | 20 ++++++++++++++++++-
 .../reliefweb_subscriptions.permissions.yml   |  5 ++++-
 .../reliefweb_subscriptions.routing.yml       |  2 +-
 .../src/Controller/UnsubscribeController.php  | 20 +++++++++++++++++++
 6 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/html/modules/custom/reliefweb_bookmarks/reliefweb_bookmarks.permissions.yml b/html/modules/custom/reliefweb_bookmarks/reliefweb_bookmarks.permissions.yml
index 870cdb9a4..fcb503b3d 100644
--- a/html/modules/custom/reliefweb_bookmarks/reliefweb_bookmarks.permissions.yml
+++ b/html/modules/custom/reliefweb_bookmarks/reliefweb_bookmarks.permissions.yml
@@ -1,3 +1,6 @@
 bookmark content:
   title: 'Bookmark content'
   description: 'Allow users to bookmark content.'
+see other bookmarks:
+  title: 'See bookmarks from others'
+  description: 'Allow user to see other bookmarks.'
diff --git a/html/modules/custom/reliefweb_bookmarks/reliefweb_bookmarks.routing.yml b/html/modules/custom/reliefweb_bookmarks/reliefweb_bookmarks.routing.yml
index 9a67aeb9a..1a62af1db 100644
--- a/html/modules/custom/reliefweb_bookmarks/reliefweb_bookmarks.routing.yml
+++ b/html/modules/custom/reliefweb_bookmarks/reliefweb_bookmarks.routing.yml
@@ -13,7 +13,7 @@ reliefweb_bookmarks.user:
     _title: 'My bookmarks'
   requirements:
     _user_is_logged_in: 'TRUE'
-    _permission: 'bookmark content'
+    _custom_access: '\Drupal\reliefweb_bookmarks\Controller\UserBookmarksController::checkUserAccess'
     user: \d+
 
 reliefweb_bookmarks.user.type:
@@ -23,7 +23,7 @@ reliefweb_bookmarks.user.type:
     _title: 'My bookmarks'
   requirements:
     _user_is_logged_in: 'TRUE'
-    _permission: 'bookmark content'
+    _custom_access: '\Drupal\reliefweb_bookmarks\Controller\UserBookmarksController::checkUserAccess'
     user: \d+
 
 reliefweb_bookmarks.add_node:
diff --git a/html/modules/custom/reliefweb_bookmarks/src/Controller/UserBookmarksController.php b/html/modules/custom/reliefweb_bookmarks/src/Controller/UserBookmarksController.php
index 523c3438e..5a25a3ce1 100644
--- a/html/modules/custom/reliefweb_bookmarks/src/Controller/UserBookmarksController.php
+++ b/html/modules/custom/reliefweb_bookmarks/src/Controller/UserBookmarksController.php
@@ -7,6 +7,7 @@
  * Contains \Drupal\reliefweb_bookmarks\Controller\UserBookmarksController.
  */
 
+use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Database\Connection;
@@ -31,7 +32,6 @@ class UserBookmarksController extends ControllerBase implements ContainerInjecti
    */
   protected $account;
 
-
   /**
    * Config factory..
    *
@@ -400,4 +400,22 @@ protected function getEntityCount($entity_type, $bundle, $uid) {
     return $query->countQuery()->execute()->fetchField();
   }
 
+  /**
+   * Check the access to the page.
+   *
+   * @param \Drupal\Core\Session\AccountInterface $account
+   *   User account to check access for.
+   * @param \Drupal\user\UserInterface $user
+   *   User account for the user posts page.
+   *
+   * @return \Drupal\Core\Access\AccessResultInterface
+   *   The access result.
+   */
+  public function checkUserAccess(AccountInterface $account, UserInterface $user) {
+    if ($account->id() == $user->id()) {
+      return AccessResult::allowedIf($account->hasPermission('bookmark content'));
+    }
+    return AccessResult::allowedIf($account->hasPermission('see other bookmarks'));
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_subscriptions/reliefweb_subscriptions.permissions.yml b/html/modules/custom/reliefweb_subscriptions/reliefweb_subscriptions.permissions.yml
index 3d59e3342..4345c0496 100644
--- a/html/modules/custom/reliefweb_subscriptions/reliefweb_subscriptions.permissions.yml
+++ b/html/modules/custom/reliefweb_subscriptions/reliefweb_subscriptions.permissions.yml
@@ -1,6 +1,9 @@
 administer subscriptions:
   title: 'Administer subscriptions'
-  description: 'Administer subscriptions any user.'
+  description: 'Administer subscriptions settings.'
 manage own subscriptions:
   title: 'Manage own subscriptions'
   description: 'Create, delete or edit own subscriptions.'
+manage other subscriptions:
+  title: 'Manage other subscriptions'
+  description: 'Create, delete or edit subscriptions from others.'
diff --git a/html/modules/custom/reliefweb_subscriptions/reliefweb_subscriptions.routing.yml b/html/modules/custom/reliefweb_subscriptions/reliefweb_subscriptions.routing.yml
index 5745e3a1a..a4e1322a7 100644
--- a/html/modules/custom/reliefweb_subscriptions/reliefweb_subscriptions.routing.yml
+++ b/html/modules/custom/reliefweb_subscriptions/reliefweb_subscriptions.routing.yml
@@ -9,7 +9,7 @@ reliefweb_subscriptions.subscription_form:
         type: 'entity:user'
   requirements:
     _user_is_logged_in: 'TRUE'
-    _permission: manage own subscriptions
+    _custom_access: '\Drupal\reliefweb_subscriptions\Controller\UnsubscribeController::checkUserAccess'
     user: \d+
 reliefweb_subscriptions.unsubscribe:
   path: '/notifications/unsubscribe/user/{user}'
diff --git a/html/modules/custom/reliefweb_subscriptions/src/Controller/UnsubscribeController.php b/html/modules/custom/reliefweb_subscriptions/src/Controller/UnsubscribeController.php
index 58f47b074..f0674b02f 100644
--- a/html/modules/custom/reliefweb_subscriptions/src/Controller/UnsubscribeController.php
+++ b/html/modules/custom/reliefweb_subscriptions/src/Controller/UnsubscribeController.php
@@ -7,8 +7,10 @@
  * Unsubscribe controller.
  */
 
+use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Session\AccountInterface;
+use Drupal\user\UserInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
@@ -70,4 +72,22 @@ public function unsubscribe(AccountInterface $user) {
     throw new AccessDeniedHttpException();
   }
 
+  /**
+   * Check the access to the page.
+   *
+   * @param \Drupal\Core\Session\AccountInterface $account
+   *   User account to check access for.
+   * @param \Drupal\user\UserInterface $user
+   *   User account for the user posts page.
+   *
+   * @return \Drupal\Core\Access\AccessResultInterface
+   *   The access result.
+   */
+  public function checkUserAccess(AccountInterface $account, UserInterface $user) {
+    if ($account->id() == $user->id()) {
+      return AccessResult::allowedIf($account->hasPermission('manage own subscriptions'));
+    }
+    return AccessResult::allowedIf($account->hasPermission('manage other subscriptions') || $account->hasPermission('administer subscriptions'));
+  }
+
 }

From a190dd501931a0d145f08f35c9fa259ee269fe6a Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 11 Jan 2022 09:05:47 +0100
Subject: [PATCH 358/720] RW-111: Show message

---
 .../reliefweb_subscriptions/src/Form/SubscriptionForm.php     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/html/modules/custom/reliefweb_subscriptions/src/Form/SubscriptionForm.php b/html/modules/custom/reliefweb_subscriptions/src/Form/SubscriptionForm.php
index 5c8f0781c..a1442acb0 100644
--- a/html/modules/custom/reliefweb_subscriptions/src/Form/SubscriptionForm.php
+++ b/html/modules/custom/reliefweb_subscriptions/src/Form/SubscriptionForm.php
@@ -7,6 +7,7 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Session\AccountInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\Core\Messenger\MessengerInterface;
 
 /**
  * Manage subscription for user.
@@ -147,6 +148,9 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
         $this->subscribe($form_state->getValue('uid'), $sid);
       }
     }
+
+    // Show the user a message.
+    $this->messenger()->addMessage('You have successfully updated your subscriptions', MessengerInterface::TYPE_STATUS);
   }
 
   /**

From f4d7a32f6e32755599fa30a2e81472d9cade73f2 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 11 Jan 2022 09:08:32 +0100
Subject: [PATCH 359/720] RW-111: Show translated message

---
 .../reliefweb_subscriptions/src/Form/SubscriptionForm.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_subscriptions/src/Form/SubscriptionForm.php b/html/modules/custom/reliefweb_subscriptions/src/Form/SubscriptionForm.php
index a1442acb0..89e92215b 100644
--- a/html/modules/custom/reliefweb_subscriptions/src/Form/SubscriptionForm.php
+++ b/html/modules/custom/reliefweb_subscriptions/src/Form/SubscriptionForm.php
@@ -150,7 +150,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
     }
 
     // Show the user a message.
-    $this->messenger()->addMessage('You have successfully updated your subscriptions', MessengerInterface::TYPE_STATUS);
+    $this->messenger()->addMessage($this->t('You have successfully updated your subscriptions'), MessengerInterface::TYPE_STATUS);
   }
 
   /**

From b3a5da1c760175d3293c70a772726d0273f68d40 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Tue, 11 Jan 2022 09:12:26 +0100
Subject: [PATCH 360/720] RW-111: Show translated message

---
 .../reliefweb_subscriptions/src/Form/UnsubscribeForm.php       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/html/modules/custom/reliefweb_subscriptions/src/Form/UnsubscribeForm.php b/html/modules/custom/reliefweb_subscriptions/src/Form/UnsubscribeForm.php
index ce2a4c3c6..75e8b6654 100644
--- a/html/modules/custom/reliefweb_subscriptions/src/Form/UnsubscribeForm.php
+++ b/html/modules/custom/reliefweb_subscriptions/src/Form/UnsubscribeForm.php
@@ -176,6 +176,9 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
       }
     }
 
+    // Show the user a message.
+    $this->messenger()->addMessage($this->t('You have successfully updated your subscriptions'), MessengerInterface::TYPE_STATUS);
+
     $form_state->setRedirect('<front>');
   }
 

From 7a8973b073a3914653717acd49f792999cfaeaaf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 15 Jan 2022 07:38:49 +0000
Subject: [PATCH 361/720] Bump follow-redirects in
 /html/themes/custom/common_design_subtheme

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.3 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.3...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../common_design_subtheme/package-lock.json  | 135 +++++-------------
 1 file changed, 38 insertions(+), 97 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/package-lock.json b/html/themes/custom/common_design_subtheme/package-lock.json
index b61f30c60..e5cfa99f2 100644
--- a/html/themes/custom/common_design_subtheme/package-lock.json
+++ b/html/themes/custom/common_design_subtheme/package-lock.json
@@ -1133,7 +1133,6 @@
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
       "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
-      "dev": true,
       "requires": {
         "ajv": "^6.12.4",
         "debug": "^4.1.1",
@@ -1150,7 +1149,6 @@
           "version": "6.12.6",
           "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
           "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
             "fast-json-stable-stringify": "^2.0.0",
@@ -1162,7 +1160,6 @@
           "version": "13.11.0",
           "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
           "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
-          "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
           }
@@ -1170,20 +1167,17 @@
         "ignore": {
           "version": "4.0.6",
           "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-          "dev": true
+          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
         },
         "json-schema-traverse": {
           "version": "0.4.1",
           "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
         },
         "type-fest": {
           "version": "0.20.2",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-          "dev": true
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="
         }
       }
     },
@@ -1206,7 +1200,6 @@
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
       "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
-      "dev": true,
       "requires": {
         "@humanwhocodes/object-schema": "^1.2.0",
         "debug": "^4.1.1",
@@ -1216,8 +1209,7 @@
     "@humanwhocodes/object-schema": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz",
-      "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==",
-      "dev": true
+      "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w=="
     },
     "@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
@@ -1705,8 +1697,7 @@
     "acorn": {
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
     },
     "acorn-globals": {
       "version": "6.0.0",
@@ -1721,8 +1712,7 @@
     "acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="
     },
     "acorn-walk": {
       "version": "7.2.0",
@@ -1753,8 +1743,7 @@
     "ansi-colors": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-      "dev": true
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="
     },
     "ansi-escapes": {
       "version": "4.3.2",
@@ -1799,7 +1788,6 @@
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
       "requires": {
         "sprintf-js": "~1.0.2"
       }
@@ -2988,8 +2976,7 @@
     "deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
     },
     "deepmerge": {
       "version": "4.2.2",
@@ -3088,7 +3075,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
       "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
       "requires": {
         "esutils": "^2.0.2"
       }
@@ -3198,7 +3184,6 @@
       "version": "2.3.6",
       "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
       "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-      "dev": true,
       "requires": {
         "ansi-colors": "^4.1.1"
       }
@@ -3340,7 +3325,6 @@
       "version": "7.32.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
       "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
-      "dev": true,
       "requires": {
         "@babel/code-frame": "7.12.11",
         "@eslint/eslintrc": "^0.4.3",
@@ -3388,7 +3372,6 @@
           "version": "7.12.11",
           "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
           "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-          "dev": true,
           "requires": {
             "@babel/highlight": "^7.10.4"
           }
@@ -3397,7 +3380,6 @@
           "version": "6.12.6",
           "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
           "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
             "fast-json-stable-stringify": "^2.0.0",
@@ -3409,7 +3391,6 @@
           "version": "7.0.3",
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
           "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-          "dev": true,
           "requires": {
             "path-key": "^3.1.0",
             "shebang-command": "^2.0.0",
@@ -3419,14 +3400,12 @@
         "escape-string-regexp": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-          "dev": true
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
         },
         "globals": {
           "version": "13.11.0",
           "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
           "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
-          "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
           }
@@ -3434,26 +3413,22 @@
         "ignore": {
           "version": "4.0.6",
           "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-          "dev": true
+          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
         },
         "json-schema-traverse": {
           "version": "0.4.1",
           "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
         },
         "path-key": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-          "dev": true
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
         },
         "semver": {
           "version": "7.3.5",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
           "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
           }
@@ -3462,7 +3437,6 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
           "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-          "dev": true,
           "requires": {
             "shebang-regex": "^3.0.0"
           }
@@ -3470,20 +3444,17 @@
         "shebang-regex": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-          "dev": true
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
         },
         "type-fest": {
           "version": "0.20.2",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-          "dev": true
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="
         },
         "which": {
           "version": "2.0.2",
           "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
           "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-          "dev": true,
           "requires": {
             "isexe": "^2.0.0"
           }
@@ -3494,7 +3465,6 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
       "requires": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
@@ -3504,7 +3474,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
       "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
-      "dev": true,
       "requires": {
         "eslint-visitor-keys": "^1.1.0"
       },
@@ -3512,22 +3481,19 @@
         "eslint-visitor-keys": {
           "version": "1.3.0",
           "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-          "dev": true
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="
         }
       }
     },
     "eslint-visitor-keys": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-      "dev": true
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="
     },
     "espree": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
       "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
-      "dev": true,
       "requires": {
         "acorn": "^7.4.0",
         "acorn-jsx": "^5.3.1",
@@ -3537,22 +3503,19 @@
         "eslint-visitor-keys": {
           "version": "1.3.0",
           "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-          "dev": true
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="
         }
       }
     },
     "esprima": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
     },
     "esquery": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
       "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-      "dev": true,
       "requires": {
         "estraverse": "^5.1.0"
       },
@@ -3560,8 +3523,7 @@
         "estraverse": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-          "dev": true
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="
         }
       }
     },
@@ -3569,7 +3531,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
       "requires": {
         "estraverse": "^5.2.0"
       },
@@ -3577,22 +3538,19 @@
         "estraverse": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-          "dev": true
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="
         }
       }
     },
     "estraverse": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
     },
     "esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
     },
     "exec-sh": {
       "version": "0.3.6",
@@ -3848,14 +3806,12 @@
     "fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
     },
     "fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
     },
     "fast-safe-stringify": {
       "version": "2.1.1",
@@ -3976,9 +3932,9 @@
       "dev": true
     },
     "follow-redirects": {
-      "version": "1.14.3",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.3.tgz",
-      "integrity": "sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw==",
+      "version": "1.14.7",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",
+      "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==",
       "dev": true
     },
     "for-in": {
@@ -4069,8 +4025,7 @@
     "functional-red-black-tree": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
     },
     "gensync": {
       "version": "1.0.0-beta.2",
@@ -5784,7 +5739,6 @@
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
       "requires": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -5863,8 +5817,7 @@
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "dev": true
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
     },
     "json-stringify-safe": {
       "version": "5.0.1",
@@ -5954,7 +5907,6 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
       "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
       "requires": {
         "prelude-ls": "^1.2.1",
         "type-check": "~0.4.0"
@@ -6017,8 +5969,7 @@
     "lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
     },
     "lodash.sortby": {
       "version": "4.7.0",
@@ -6375,8 +6326,7 @@
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
     },
     "nice-try": {
       "version": "1.0.5",
@@ -6646,7 +6596,6 @@
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
       "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-      "dev": true,
       "requires": {
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
@@ -7393,8 +7342,7 @@
     "prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="
     },
     "pretty-format": {
       "version": "26.6.2",
@@ -7428,8 +7376,7 @@
     "progress": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-      "dev": true
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
     },
     "prompts": {
       "version": "2.4.1",
@@ -7650,8 +7597,7 @@
     "regexpp": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-      "dev": true
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="
     },
     "regexpu-core": {
       "version": "4.7.1",
@@ -8486,8 +8432,7 @@
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
     },
     "sshpk": {
       "version": "1.16.1",
@@ -8648,8 +8593,7 @@
     "strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
     },
     "style-search": {
       "version": "0.1.0",
@@ -9242,8 +9186,7 @@
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
     },
     "throat": {
       "version": "5.0.0",
@@ -9401,7 +9344,6 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
       "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
       "requires": {
         "prelude-ls": "^1.2.1"
       }
@@ -9963,8 +9905,7 @@
     "word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
     },
     "wrap-ansi": {
       "version": "7.0.0",

From 0399c80010c262a0ce1bb7a1c27dfe1f52b6960e Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Mon, 17 Jan 2022 11:28:57 -0700
Subject: [PATCH 362/720] [RW-132] adjust drush command for accuracy

---
 html/modules/custom/reliefweb_subscriptions/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_subscriptions/README.md b/html/modules/custom/reliefweb_subscriptions/README.md
index 85c4b707a..5210885bb 100644
--- a/html/modules/custom/reliefweb_subscriptions/README.md
+++ b/html/modules/custom/reliefweb_subscriptions/README.md
@@ -22,7 +22,7 @@ fin drush reliefweb_subscriptions:send --verbose
 fin drush reliefweb_subscriptions:queue training --verbose
 fin drush reliefweb_subscriptions:send --verbose
 
-fin drush reliefweb_subscriptions:queue disaster --verbose --entity_type=disaster --entity_id=42169
+fin drush reliefweb_subscriptions:queue disaster --verbose --entity_type=taxonomy_term --entity_id=42169
 fin drush reliefweb_subscriptions:send --verbose
 
 fin drush reliefweb_subscriptions:queue ocha_sitrep --verbose

From 7ad63aa6877db4cc9f56932b7311bb8ae0db160c Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 18 Jan 2022 04:05:20 +0000
Subject: [PATCH 363/720] [RW-296] Update migration config to use custom
 plugins

---
 .../install/migrate_plus.migration.reliefweb_bookmarks.yml    | 4 ++--
 ...migrate_plus.migration.reliefweb_node_revision__report.yml | 1 +
 .../migrate_plus.migration.reliefweb_subscriptions.yml        | 4 ++--
 .../config/install/migrate_plus.migration.reliefweb_user.yml  | 4 ++++
 .../migrate_plus.migration.reliefweb_user__default.yml        | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_bookmarks.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_bookmarks.yml
index d9811eac8..f5a671dab 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_bookmarks.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_bookmarks.yml
@@ -2,7 +2,7 @@ id: reliefweb_bookmarks
 label: Migrate ReliefWeb bookmarks.
 migration_group: reliefweb_extra
 source:
-  plugin: table
+  plugin: reliefweb_table
   table_name: reliefweb_bookmarks_favorites
   id_fields:
     entity_type:
@@ -13,7 +13,7 @@ source:
       type: integer
   batch_size: 1000
 destination:
-  plugin: table
+  plugin: reliefweb_table
   table_name: reliefweb_bookmarks
   id_fields:
     entity_type:
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__report.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__report.yml
index ed92dd8c5..7189df537 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__report.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__report.yml
@@ -2,6 +2,7 @@ id: reliefweb_node_revision__report
 label: Migrate ReliefWeb report revisions.
 migration_group: reliefweb_node_revision
 source:
+  plugin: reliefweb_report_revision
   bundle: report
 process:
   # Fields.
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_subscriptions.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_subscriptions.yml
index 1db40c601..0b870b63b 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_subscriptions.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_subscriptions.yml
@@ -2,7 +2,7 @@ id: reliefweb_subscriptions
 label: Migrate ReliefWeb Subscriptions.
 migration_group: reliefweb_extra
 source:
-  plugin: table
+  plugin: reliefweb_table
   table_name: reliefweb_subscriptions_subscriptions
   id_fields:
     sid:
@@ -11,7 +11,7 @@ source:
       type: integer
   batch_size: 1000
 destination:
-  plugin: table
+  plugin: reliefweb_table
   table_name: reliefweb_subscriptions_subscriptions
   id_fields:
     sid:
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_user.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_user.yml
index a1214862b..2c680df58 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_user.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_user.yml
@@ -4,8 +4,12 @@ migration_group: reliefweb_base
 source:
   plugin: reliefweb_user
   batch_size: 1000
+  high_water_property:
+    name: uid
+    alias: u
 destination:
   plugin: reliefweb_entity:user
+  delete_before_import: true
 process:
   uid: uid
   name: name
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_user__default.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_user__default.yml
index 8fcc31008..f7b66ad23 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_user__default.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_user__default.yml
@@ -19,7 +19,7 @@ source:
     uid:
       type: integer
 destination:
-  plugin: entity:user
+  plugin: reliefweb_entity:user
 process:
   uid: uid
   name: name

From 5fe7c40f11334ebb8600aa77047d2be425ebf750 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 18 Jan 2022 04:08:40 +0000
Subject: [PATCH 364/720] [RW-296] Add drush commands to get a better migration
 overview and to check the attachment migration

---
 .../reliefweb_migrate/drush.services.yml      |   2 +-
 .../src/Commands/ReliefWebMigrateCommands.php | 349 +++++++++++++++++-
 .../source/SourceMigrationStatusInterface.php |  19 +
 3 files changed, 368 insertions(+), 2 deletions(-)
 create mode 100644 html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/SourceMigrationStatusInterface.php

diff --git a/html/modules/custom/reliefweb_migrate/drush.services.yml b/html/modules/custom/reliefweb_migrate/drush.services.yml
index b487464bd..2036ab689 100644
--- a/html/modules/custom/reliefweb_migrate/drush.services.yml
+++ b/html/modules/custom/reliefweb_migrate/drush.services.yml
@@ -1,6 +1,6 @@
 services:
   reliefweb_migrate.commands:
     class: \Drupal\reliefweb_migrate\Commands\ReliefWebMigrateCommands
-    arguments: ['@config.installer', '@config.manager']
+    arguments: ['@config.installer', '@config.manager', '@date.formatter', '@entity_type.manager', '@keyvalue', '@plugin.manager.migration']
     tags:
       - { name: drush.command }
diff --git a/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php b/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
index d18fd3c73..5bbebc87f 100644
--- a/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
+++ b/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
@@ -2,10 +2,21 @@
 
 namespace Drupal\reliefweb_migrate\Commands;
 
+use Consolidation\OutputFormatters\StructuredData\RowsOfFields;
 use Consolidation\SiteAlias\SiteAliasManagerAwareInterface;
 use Consolidation\SiteAlias\SiteAliasManagerAwareTrait;
+use Drupal\Component\Plugin\Exception\PluginNotFoundException;
 use Drupal\Core\Config\ConfigInstallerInterface;
 use Drupal\Core\Config\ConfigManager;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Datetime\DateFormatter;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\KeyValueStore\KeyValueFactoryInterface;
+use Drupal\migrate\Exception\RequirementsException;
+use Drupal\migrate\Plugin\MigrationPluginManager;
+use Drupal\migrate\Plugin\RequirementsInterface;
+use Drupal\reliefweb_migrate\Plugin\migrate\source\SourceMigrationStatusInterface;
+use Drupal\reliefweb_utility\Helpers\LegacyHelper;
 use Drush\Commands\DrushCommands;
 
 /**
@@ -29,12 +40,52 @@ class ReliefWebMigrateCommands extends DrushCommands implements SiteAliasManager
    */
   protected $configManager;
 
+  /**
+   * Date formatter service.
+   *
+   * @var \Drupal\Core\Datetime\DateFormatter
+   */
+  protected $dateFormatter;
+
+  /**
+   * Entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * Key-value store service.
+   *
+   * @var \Drupal\Core\KeyValueStore\KeyValueFactoryInterface
+   */
+  protected $keyValue;
+
+  /**
+   * Migration plugin manager service.
+   *
+   * @var \Drupal\migrate\Plugin\MigrationPluginManager
+   */
+  protected $migrationPluginManager;
+
   /**
    * {@inheritdoc}
    */
-  public function __construct(ConfigInstallerInterface $config_installer, ConfigManager $config_manager) {
+  public function __construct(
+    ConfigInstallerInterface $config_installer,
+    ConfigManager $config_manager,
+    DateFormatter $date_formatter,
+    EntityTypeManagerInterface $entity_type_manager,
+    KeyValueFactoryInterface $key_value,
+    MigrationPluginManager $migration_plugin_manager
+  ) {
+    parent::__construct();
     $this->configInstaller = $config_installer;
     $this->configManager = $config_manager;
+    $this->dateFormatter = $date_formatter;
+    $this->entityTypeManager = $entity_type_manager;
+    $this->keyValue = $key_value;
+    $this->migrationPluginManager = $migration_plugin_manager;
   }
 
   /**
@@ -59,4 +110,300 @@ public function reloadConfiguration() {
     return TRUE;
   }
 
+  /**
+   * List all migrations with current status.
+   *
+   * @command rw-migrate:status
+   *
+   * @option group A comma-separated list of migration groups to list
+   * @option tag Name of the migration tag to list
+   *
+   * @default $options []
+   *
+   * @usage rw-migrate:status
+   *   Retrieve status for all migrations
+   * @usage rw-migrate:status beer_term,beer_node
+   *   Retrieve status for specific migrations
+   * @usage rw-migrate:status --group=beer
+   *   Retrieve status for all migrations in a given group
+   * @usage migrate:status --tag=user
+   *   Retrieve status for all migrations with a given tag
+   *
+   * @validate-module-enabled reliefweb_migrate
+   *
+   * @aliases rw-ms, rw-migrate-status
+   *
+   * @field-labels
+   *   group: Group
+   *   id: Migration ID
+   *   status: Status
+   *   total: Total
+   *   imported: Imported
+   *   unchanged: Unchanged
+   *   new: New
+   *   updated: Updated
+   *   deleted: Deleted
+   *   last_imported: Last Imported
+   * @default-fields group,id,status,total,imported,unchanged,new,updated,deleted,last_imported
+   *
+   * @return \Consolidation\OutputFormatters\StructuredData\RowsOfFields
+   *   Migrations status formatted as table.
+   */
+  public function status($migration_names = '', array $options = [
+    'group' => '',
+    'tag' => '',
+  ]) {
+    $migrations = $this->migrationsList($migration_names, $options);
+
+    $table = [];
+    // Take it one group at a time, listing the migrations within each group.
+    foreach ($migrations as $group_id => $migration_list) {
+      /** @var \Drupal\migrate_plus\Entity\MigrationGroup $group */
+      $group = $this->entityTypeManager->getStorage('migration_group')->load($group_id);
+      $group_name = !empty($group) ? "{$group->label()} ({$group->id()})" : $group_id;
+
+      foreach ($migration_list as $migration_id => $migration) {
+        $source_plugin = $migration->getSourcePlugin();
+
+        if ($source_plugin instanceof SourceMigrationStatusInterface) {
+          extract($source_plugin->getMigrationStatus());
+        }
+        else {
+          $total = dt('N/A');
+          $imported = dt('N/A');
+          $new = dt('N/A');
+          $unchanged = dt('N/A');
+          $deleted = dt('N/A');
+          $updated = dt('N/A');
+
+          $map = $migration->getIdMap();
+          $imported = $map->importedCount();
+          $total = $source_plugin->count();
+          // -1 indicates uncountable sources.
+          if ($total == -1) {
+            $total = dt('N/A');
+            $imported = dt('N/A');
+          }
+          else {
+            $new = $total - $map->processedCount();
+          }
+        }
+
+        $status = $migration->getStatusLabel();
+
+        $migrate_last_imported_store = $this->keyValue->get(
+          'migrate_last_imported'
+        );
+        $last_imported = $migrate_last_imported_store->get(
+          $migration->id(),
+          FALSE
+        );
+        if ($last_imported) {
+          $last_imported = $this->dateFormatter->format(
+            $last_imported / 1000,
+            'custom',
+            'Y-m-d H:i:s'
+          );
+        }
+        else {
+          $last_imported = '';
+        }
+        $table[] = [
+          'group' => $group_name,
+          'id' => $migration_id,
+          'status' => $status,
+          'total' => $total,
+          'imported' => $imported,
+          'unchanged' => $unchanged,
+          'new' => $new,
+          'updated' => $updated,
+          'deleted' => $deleted,
+          'last_imported' => $last_imported,
+        ];
+      }
+
+      // Add empty row to separate groups, for readability.
+      end($migrations);
+      if ($group_id !== key($migrations)) {
+        $table[] = [];
+      }
+    }
+
+    return new RowsOfFields($table);
+  }
+
+  /**
+   * Retrieve a list of active migrations.
+   *
+   * @param string $migration_ids
+   *   Comma-separated list of migrations -
+   *   if present, return only these migrations.
+   * @param array $options
+   *   Command options.
+   *
+   * @return \Drupal\migrate\Plugin\MigrationInterface[][]
+   *   An array keyed by migration group, each value containing an array of
+   *   migrations or an empty array if no migrations match the input criteria.
+   */
+  protected function migrationsList($migration_ids = '', array $options = []) {
+    // Filter keys must match the migration configuration property name.
+    $filter['migration_group'] = explode(',', $options['group']);
+    $filter['migration_tags'] = explode(',', $options['tag']);
+
+    $manager = $this->migrationPluginManager;
+
+    $matched_migrations = [];
+
+    if (empty($migration_ids)) {
+      // Get all migrations.
+      $plugins = $manager->createInstances([]);
+      $matched_migrations = $plugins;
+    }
+    else {
+      // Get the requested migrations.
+      $migration_ids = explode(',', mb_strtolower($migration_ids));
+
+      $definitions = $manager->getDefinitions();
+
+      foreach ($migration_ids as $given_migration_id) {
+        if (isset($definitions[$given_migration_id])) {
+          $matched_migrations[$given_migration_id] = $manager->createInstance($given_migration_id);
+        }
+        else {
+          $error_message = dt('Migration @id does not exist', ['@id' => $given_migration_id]);
+          throw new \Exception($error_message);
+        }
+
+      }
+    }
+
+    // Do not return any migrations which fail to meet requirements.
+    /** @var \Drupal\migrate\Plugin\Migration $migration */
+    foreach ($matched_migrations as $id => $migration) {
+      try {
+        if ($migration->getSourcePlugin() instanceof RequirementsInterface) {
+          $migration->getSourcePlugin()->checkRequirements();
+        }
+      }
+      catch (RequirementsException $e) {
+        unset($matched_migrations[$id]);
+      }
+      catch (PluginNotFoundException $exception) {
+        throw $exception;
+      }
+    }
+
+    // Filters the matched migrations if a group or a tag has been input.
+    if (!empty($filter['migration_group']) || !empty($filter['migration_tags'])) {
+      // Get migrations in any of the specified groups and with any of the
+      // specified tags.
+      foreach ($filter as $property => $values) {
+        if (!empty($values)) {
+          $filtered_migrations = [];
+          foreach ($values as $search_value) {
+            foreach ($matched_migrations as $id => $migration) {
+              // Cast to array because migration_tags can be an array.
+              $definition = $migration->getPluginDefinition();
+              $configured_values = (array) ($definition[$property] ?? NULL);
+              $configured_id = in_array($search_value, $configured_values, TRUE) ? $search_value : 'default';
+              if (empty($search_value) || $search_value === $configured_id) {
+                if (empty($migration_ids) || in_array(
+                    mb_strtolower($id),
+                    $migration_ids,
+                    TRUE
+                  )) {
+                  $filtered_migrations[$id] = $migration;
+                }
+              }
+            }
+          }
+          $matched_migrations = $filtered_migrations;
+        }
+      }
+    }
+
+    // Sort the matched migrations by group.
+    if (!empty($matched_migrations)) {
+      foreach ($matched_migrations as $id => $migration) {
+        $configured_group_id = empty($migration->migration_group) ? 'default' : $migration->migration_group;
+        $migrations[$configured_group_id][$id] = $migration;
+      }
+    }
+    return $migrations ?? [];
+  }
+
+  /**
+   * Check if the attachments are migrated properly.
+   *
+   * DEBUG.
+   *
+   * @command rw-mcf
+   *
+   * @validate-module-enabled reliefweb_migrate
+   */
+  public function checkFiles() {
+    $d7_db = Database::getConnection('default', 'rwint7');
+    $d9_db = Database::getConnection('default', 'default');
+
+    $d7_query = $d7_db->select('field_data_field_file', 'f');
+    $d7_query->innerJoin('file_managed', 'fm', '%alias.fid = f.field_file_fid');
+    $d7_query->fields('fm', ['fid', 'uri', 'filename']);
+    $d7_query->fields('f', ['entity_id', 'field_file_description']);
+    $d7_query->distinct();
+
+    $d7_files = [];
+    foreach ($d7_query->execute() ?? [] as $record) {
+      $uuid = LegacyHelper::generateAttachmentUuid($record->uri);
+      $file_uuid = LegacyHelper::generateAttachmentFileUuid($uuid, $record->fid);
+
+      $d7_files[$uuid] = [
+        'field_file_uuid' => $uuid,
+        'field_file_file_uuid' => $file_uuid,
+      ];
+
+      if (
+        preg_match('/\|(\d+)\|(0|90|-90)$/', $record->field_file_description) === 1 &&
+        strtolower(pathinfo($record->filename, PATHINFO_EXTENSION)) === 'pdf'
+      ) {
+        $d7_files[$uuid]['field_file_preview_uuid'] = LegacyHelper::generateAttachmentPreviewUuid($uuid, $file_uuid);
+      }
+    }
+
+    $d9_files = $d9_db->select('node__field_file', 'f')
+      ->fields('f', [
+        'field_file_uuid',
+        'field_file_file_uuid',
+        'field_file_preview_uuid',
+      ])
+      ->distinct()
+      ->execute()
+      ->fetchAllAssoc('field_file_uuid', \PDO::FETCH_ASSOC);
+
+    $d9_file_query = $d9_db->select('file_managed', 'fm');
+    $d9_file_query->innerJoin('node__field_file', 'f', '%alias.field_file_file_uuid = fm.uuid');
+    $d9_file_query->addExpression('COUNT(fm.fid)', 'total');
+    $d9_file_count = $d9_file_query->execute()?->fetchField() ?? 'ERROR';
+
+    $d9_preview_query = $d9_db->select('file_managed', 'fm');
+    $d9_preview_query->innerJoin('node__field_file', 'f', '%alias.field_file_preview_uuid = fm.uuid');
+    $d9_preview_query->condition('f.field_file_file_mime', 'application/pdf');
+    $d9_preview_query->addExpression('COUNT(fm.fid)', 'total');
+    $d9_preview_count = $d9_preview_query->execute()?->fetchField() ?? 'ERROR';
+
+    print_r([
+      'd7' => count($d7_files),
+      'd9' => count($d9_files),
+      'diff_d7_d9' => array_diff_key($d7_files, $d9_files),
+      'diff_d9_d7' => array_diff_key($d9_files, $d7_files),
+      'd9_file_count' => $d9_file_count,
+      'd9_preview_count' => $d9_preview_count,
+      'd7_file_preview_count' => count(array_filter($d7_files, function ($item) {
+        return !empty($item['field_file_preview_uuid']);
+      })),
+      'd9_file_preview_count' => count(array_filter($d9_files, function ($item) {
+        return !empty($item['field_file_preview_uuid']);
+      })),
+    ]);
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/SourceMigrationStatusInterface.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/SourceMigrationStatusInterface.php
new file mode 100644
index 000000000..b0c97f2ee
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/SourceMigrationStatusInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Drupal\reliefweb_migrate\Plugin\migrate\source;
+
+/**
+ * Base entity source plugin for reliefweb migrations.
+ */
+interface SourceMigrationStatusInterface {
+
+  /**
+   * Get the number of imported, updated, deleted and unprocessed entities.
+   *
+   * @return array
+   *   Associative array with the number of importable, imported, new, updated
+   *   and deleted entities.
+   */
+  public function getMigrationStatus();
+
+}

From 48875f95e5626c22ddc3f423f824699a70ea4ada Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 18 Jan 2022 04:14:46 +0000
Subject: [PATCH 365/720] [RW-296] Update the accumulated entity storage to do
 some kind of bulk upsert by deleting existing data before inserting new one.
 Also wipe out the users before migrating them to handle updates.

---
 .../Entity/AccumulatedPathAliasStorage.php    |  30 +++
 .../src/Entity/AccumulatedRedirectStorage.php |   3 +
 ...ulatedSqlContentEntityStorageInterface.php |   5 +
 ...ccumulatedSqlContentEntityStorageTrait.php | 236 +++++++++++++++++-
 .../src/Entity/AccumulatedUserStorage.php     |  76 ++++++
 5 files changed, 349 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedPathAliasStorage.php b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedPathAliasStorage.php
index b78138e08..8bb5c1cf9 100644
--- a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedPathAliasStorage.php
+++ b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedPathAliasStorage.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\reliefweb_migrate\Entity;
 
+use Drupal\Core\Entity\EntityInterface;
 use Drupal\path_alias\PathAliasStorage;
 
 /**
@@ -11,4 +12,33 @@ class AccumulatedPathAliasStorage extends PathAliasStorage implements Accumulate
 
   use AccumulatedSqlContentEntityStorageTrait;
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function accumulateEntityId(EntityInterface $entity) {
+    $this->accumulatedEntityIds[$entity->uuid()] = $entity->uuid();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getExistingEntitiesDeletionCondition() {
+    $ids = [];
+    if (!empty($this->accumulatedEntityIds)) {
+      $ids = $this->database
+        ->select($this->baseTable, 't')
+        ->fields('t', [$this->idKey])
+        ->condition('t.uuid', $this->accumulatedEntityIds, 'IN')
+        ->execute()
+        ?->fetchAllKeyed(0, 0) ?? [];
+    }
+
+    return [
+      'base_table_field' => $this->idKey,
+      'field_table_field' => '',
+      'revision_only' => FALSE,
+      'ids' => $ids,
+    ];
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedRedirectStorage.php b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedRedirectStorage.php
index 9cbd5d21b..ed52f1b77 100644
--- a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedRedirectStorage.php
+++ b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedRedirectStorage.php
@@ -29,6 +29,9 @@ public function flushAccumulated() {
     // Reset the accumulator.
     $this->accumulator = [];
 
+    // Reset the entity id accumulator.
+    $this->accumulatedEntityIds = [];
+
     // Reset the accumulation counter.
     $this->accumulationCounter = 0;
   }
diff --git a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedSqlContentEntityStorageInterface.php b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedSqlContentEntityStorageInterface.php
index 6623dfde4..155f2fb53 100644
--- a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedSqlContentEntityStorageInterface.php
+++ b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedSqlContentEntityStorageInterface.php
@@ -21,4 +21,9 @@ public function saveAccumulated(EntityInterface $entity);
    */
   public function flushAccumulated();
 
+  /**
+   * Truncate the base, revision and data tables for the entity type.
+   */
+  public function deleteAll();
+
 }
diff --git a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedSqlContentEntityStorageTrait.php b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedSqlContentEntityStorageTrait.php
index fa84021b6..f109a0d6c 100644
--- a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedSqlContentEntityStorageTrait.php
+++ b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedSqlContentEntityStorageTrait.php
@@ -22,6 +22,13 @@ trait AccumulatedSqlContentEntityStorageTrait {
    */
   protected $accumulator = [];
 
+  /**
+   * Store the IDs of the accumulated entities that needs to be updated.
+   *
+   * @var array
+   */
+  protected $accumulatedEntityIds = [];
+
   /**
    * Counter to determine when to flush the accumulated insert queries.
    *
@@ -48,6 +55,9 @@ trait AccumulatedSqlContentEntityStorageTrait {
    */
   public function saveAccumulated(EntityInterface $entity, $max = 1000) {
     try {
+      // Store the ID (and revision ID in case of a non default revision).
+      $this->accumulateEntityId($entity);
+
       // Track if this entity is new.
       $is_new = $entity->isNew();
 
@@ -61,7 +71,8 @@ public function saveAccumulated(EntityInterface $entity, $max = 1000) {
       $this->doPostSaveAccumulated($entity, !$is_new);
 
       // Flush the accumulated data.
-      if ($this->accumulationCounter++ >= $max) {
+      $this->accumulationCounter++;
+      if ($this->accumulationCounter >= $max) {
         $this->flushAccumulated();
       }
     }
@@ -74,6 +85,33 @@ public function saveAccumulated(EntityInterface $entity, $max = 1000) {
     return $return;
   }
 
+  /**
+   * Store the IDs of existing entities.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   Existing entity.
+   */
+  protected function accumulateEntityId(EntityInterface $entity) {
+    // Store the ID (and revision ID in case of a non default revision) if the
+    // entity already exists so we can delete the data before inserting
+    // the new one.
+    if (!empty($entity->_exists)) {
+      if ($this->entityType->isRevisionable()) {
+        if ($entity->isDefaultRevision()) {
+          // We'll retrieve the revision IDs in a single query when flushing
+          // the accumulated content.
+          $this->accumulatedEntityIds[$entity->id()] = NULL;
+        }
+        else {
+          $this->accumulatedEntityIds[$entity->getRevisionId()] = $entity->getRevisionId();
+        }
+      }
+      else {
+        $this->accumulatedEntityIds[$entity->id()] = $entity->id();
+      }
+    }
+  }
+
   /**
    * Perform post save tasks.
    *
@@ -133,6 +171,9 @@ public function flushAccumulated() {
     // Reset the accumulator.
     $this->accumulator = [];
 
+    // Reset the entity id accumulator.
+    $this->accumulatedEntityIds = [];
+
     // Reset the accumulation counter.
     $this->accumulationCounter = 0;
   }
@@ -143,11 +184,16 @@ public function flushAccumulated() {
   public function doFlushAccumulated() {
     $transaction = $this->database->startTransaction();
     try {
+      // First delete the existing content.
+      $this->deleteExistingEntities();
+
+      // Then insert the new content.
       foreach ($this->accumulator as $table => $entries) {
         $query = $this->database->insert($table);
         foreach ($entries as $rows) {
           foreach ($rows as $row) {
             $row = (array) $row;
+            $this->processRowBeforeInsertion($table, $row);
             $query->fields(array_keys($row));
             $query->values(array_values($row));
           }
@@ -165,6 +211,18 @@ public function doFlushAccumulated() {
     }
   }
 
+  /**
+   * Provide a last way to modify data being inserted before it's inserted.
+   *
+   * @param string $table
+   *   Name of the table.
+   * @param array $row
+   *   Row to be inserted.
+   */
+  protected function processRowBeforeInsertion($table, array &$row) {
+    // Nothing to do.
+  }
+
   /**
    * Accumulate the data to save in the entity and field tables.
    *
@@ -339,4 +397,180 @@ protected function doInvokeHook($hook, EntityInterface $entity, array $blacklist
     return $return;
   }
 
+  /**
+   * Get the field and list of ids to use as condition to delete existing data.
+   *
+   * @return array
+   *   Array with the base table field, field table field, list of entity ids
+   *   and whether to only update the revision tables or all the tables.
+   */
+  protected function getExistingEntitiesDeletionCondition() {
+    $revisionable = $this->entityType->isRevisionable();
+    $revision_only = FALSE;
+
+    // Get the entity IDs or revision IDs to delete.
+    if ($revisionable) {
+      $ids = [];
+      $base_table_field = $this->revisionKey;
+      $field_table_field = 'revision_id';
+
+      $revision_ids_to_load = [];
+      foreach ($this->accumulatedEntityIds as $id => $revision_id) {
+        if (isset($revision_id)) {
+          $ids[$revision_id] = $revision_id;
+        }
+        else {
+          $revision_ids_to_load[$id] = $id;
+        }
+      }
+
+      // Retrieve the latest revision IDs of the default revisions.
+      if (!empty($revision_ids_to_load)) {
+        $records = $this->database
+          ->select($this->baseTable, 't')
+          ->fields('t', [$this->revisionKey])
+          ->condition('t.' . $this->idKey, $revision_ids_to_load, 'IN')
+          ->execute() ?? [];
+        foreach ($records as $record) {
+          $ids[$record->{$this->revisionKey}] = $record->{$this->revisionKey};
+        }
+      }
+      else {
+        $revision_only = TRUE;
+      }
+    }
+    else {
+      $ids = $this->accumulatedEntityIds;
+      $base_table_field = $this->idKey;
+      $field_table_field = 'entity_id';
+    }
+
+    return [
+      'base_table_field' => $base_table_field,
+      'field_table_field' => $field_table_field,
+      'revision_only' => $revision_only,
+      'ids' => $ids,
+    ];
+  }
+
+  /**
+   * Delete all data from the database for the entities to insert.
+   */
+  protected function deleteExistingEntities() {
+    if (empty($this->accumulatedEntityIds)) {
+      return;
+    }
+
+    $revisionable = $this->entityType->isRevisionable();
+
+    // Get the base table field, field table field, ids and revision_only flag.
+    extract($this->getExistingEntitiesDeletionCondition());
+
+    // Nothing to do.
+    if (empty($ids)) {
+      return;
+    }
+
+    // Delete the data from the base tables.
+    if (!$revision_only) {
+      $this->database
+        ->delete($this->baseTable)
+        ->condition($base_table_field, $ids, 'IN')
+        ->execute();
+    }
+
+    if ($revisionable && $this->revisionTable) {
+      $this->database
+        ->delete($this->revisionTable)
+        ->condition($base_table_field, $ids, 'IN')
+        ->execute();
+    }
+
+    if (!$revision_only && $this->dataTable) {
+      $this->database
+        ->delete($this->dataTable)
+        ->condition($base_table_field, $ids, 'IN')
+        ->execute();
+    }
+
+    if ($revisionable && $this->revisionDataTable) {
+      $this->database
+        ->delete($this->revisionDataTable)
+        ->condition($base_table_field, $ids, 'IN')
+        ->execute();
+    }
+
+    // Delete the field data.
+    if (!empty($field_table_field)) {
+      $table_mapping = $this->getTableMapping();
+      foreach ($this->fieldStorageDefinitions as $storage_definition) {
+        if (!$table_mapping->requiresDedicatedTableStorage($storage_definition)) {
+          continue;
+        }
+        $table_name = $table_mapping->getDedicatedDataTableName($storage_definition);
+        $revision_name = $table_mapping->getDedicatedRevisionTableName($storage_definition);
+
+        if (!$revision_only) {
+          $this->database
+            ->delete($table_name)
+            ->condition($field_table_field, $ids, 'IN')
+            ->execute();
+        }
+
+        if ($this->entityType->isRevisionable()) {
+          $this->database
+            ->delete($revision_name)
+            ->condition($field_table_field, $ids, 'IN')
+            ->execute();
+        }
+      }
+    }
+  }
+
+  /**
+   * Truncate the base, revision and data tables for the entity type.
+   */
+  public function deleteAll() {
+    $transaction = $this->database->startTransaction();
+    try {
+      $this->database->truncate($this->baseTable)->execute();
+      if ($this->revisionTable) {
+        $this->database->truncate($this->revisionTable)->execute();
+      }
+      if ($this->dataTable) {
+        $this->database->truncate($this->dataTable)->execute();
+      }
+      if ($this->revisionDataTable) {
+        $this->database->truncate($this->revisionDataTable)->execute();
+      }
+      $this->deleteAllFromDedicatedTables();
+    }
+    catch (\Exception $exception) {
+      $transaction->rollBack();
+      watchdog_exception($this->entityTypeId, $exception);
+      throw new EntityStorageException($exception->getMessage(), $exception->getCode(), $exception);
+    }
+  }
+
+  /**
+   * Truncate the field tables for the entity type.
+   */
+  protected function deleteAllFromDedicatedTables() {
+    $table_mapping = $this->getTableMapping();
+
+    foreach ($this->fieldStorageDefinitions as $storage_definition) {
+      if (!$table_mapping->requiresDedicatedTableStorage($storage_definition)) {
+        continue;
+      }
+
+      $table_name = $table_mapping->getDedicatedDataTableName($storage_definition);
+      $revision_name = $table_mapping->getDedicatedRevisionTableName($storage_definition);
+
+      $this->database->truncate($table_name)->execute();
+      if ($this->entityType->isRevisionable()) {
+        $this->database->truncate($revision_name)->execute();
+      }
+    }
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedUserStorage.php b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedUserStorage.php
index 05418aab8..021c0e7df 100644
--- a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedUserStorage.php
+++ b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedUserStorage.php
@@ -3,6 +3,7 @@
 namespace Drupal\reliefweb_migrate\Entity;
 
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityStorageException;
 use Drupal\user\UserStorage;
 
 /**
@@ -12,12 +13,87 @@ class AccumulatedUserStorage extends UserStorage implements AccumulatedSqlConten
 
   use AccumulatedSqlContentEntityStorageTrait;
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function processRowBeforeInsertion($table, array &$row) {
+    // Remove the password.
+    if ($table === $this->dataTable && isset($row['pass'])) {
+      $row['pass'] = NULL;
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function deleteAll() {
+    $transaction = $this->database->startTransaction();
+    try {
+      $this->database
+        ->delete($this->baseTable)
+        ->condition($this->idKey, 2, '>')
+        ->execute();
+      if ($this->revisionTable) {
+        $this->database
+          ->delete($this->revisionTable)
+          ->condition($this->idKey, 2, '>')
+          ->execute();
+      }
+      if ($this->dataTable) {
+        $this->database
+          ->delete($this->dataTable)
+          ->condition($this->idKey, 2, '>')
+          ->execute();
+      }
+      if ($this->revisionDataTable) {
+        $this->database
+          ->delete($this->revisionDataTable)
+          ->condition($this->idKey, 2, '>')
+          ->execute();
+      }
+      $this->deleteAllFromDedicatedTables();
+    }
+    catch (\Exception $exception) {
+      $transaction->rollBack();
+      watchdog_exception($this->entityTypeId, $exception);
+      throw new EntityStorageException($exception->getMessage(), $exception->getCode(), $exception);
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function deleteAllFromDedicatedTables() {
+    $table_mapping = $this->getTableMapping();
+
+    foreach ($this->fieldStorageDefinitions as $storage_definition) {
+      if (!$table_mapping->requiresDedicatedTableStorage($storage_definition)) {
+        continue;
+      }
+
+      $table_name = $table_mapping->getDedicatedDataTableName($storage_definition);
+      $revision_name = $table_mapping->getDedicatedRevisionTableName($storage_definition);
+
+      $this->database
+        ->delete($table_name)
+        ->condition('entity_id', 2, '>')
+        ->execute();
+      if ($this->entityType->isRevisionable()) {
+        $this->database
+          ->delete($revision_name)
+          ->condition('entity_id', 2, '>')
+          ->execute();
+      }
+    }
+  }
+
   /**
    * {@inheritdoc}
    */
   protected function invokeHook($hook, EntityInterface $entity) {
     $blacklist = [
       'social_auth_hid_user_insert' => TRUE,
+      'social_auth_hid_user_presave' => TRUE,
     ];
 
     $this->doInvokeHook($this->entityTypeId . '_' . $hook, $entity, $blacklist);

From 2fc2ac47a1c0a64b15f1a6f12909f54945c24796 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 18 Jan 2022 04:16:49 +0000
Subject: [PATCH 366/720] [RW-296] Update the id mapping service for the
 migration to be able to remove deleted entities

---
 .../Plugin/migrate/id_map/AccumulatedSql.php  | 48 +++++++++++++++++--
 1 file changed, 43 insertions(+), 5 deletions(-)

diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/id_map/AccumulatedSql.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/id_map/AccumulatedSql.php
index 4cd6c698e..ce0c46bf8 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/id_map/AccumulatedSql.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/id_map/AccumulatedSql.php
@@ -59,7 +59,6 @@ public function preloadIdMapping(array $ids) {
         ->execute()
         ?->fetchAllAssoc($this::SOURCE_IDS_HASH, \PDO::FETCH_ASSOC) ?? [];
 
-      $this->preloadedIdMapping = [];
       foreach ($ids as $id) {
         $this->preloadedIdMapping[$id] = $data[$id] ?? NULL;
       }
@@ -86,6 +85,7 @@ public function lookupDestinationIds(array $source_id_values) {
       foreach ($this->destinationIdFields() as $field) {
         $result[] = isset($data[$field]) ? [$data[$field]] : [];
       }
+      unset($this->preloadedIdMapping[$hash]);
       return $result;
     }
     else {
@@ -201,13 +201,9 @@ public function flushAccumulatedIdMapping() {
       }
     }
 
-    $count_fields = NULL;
     if (!empty($insertions)) {
       $query = $database->insert($table);
       foreach ($insertions as $values) {
-        if (!isset($count_fields)) {
-          $count_fields = count(array_keys($values));
-        }
         $query->fields(array_keys($values));
         $query->values(array_values($values));
       }
@@ -217,4 +213,46 @@ public function flushAccumulatedIdMapping() {
     $this->accumulatedIdMapping = [];
   }
 
+  /**
+   * Delete the item from the id mapping with the given source ids.
+   *
+   * Note: this is specific to the RW migrations where we use a single ID
+   * as source migration ids and the source and destination ids are the same.
+   *
+   * @param array $ids
+   *   List of imported ids.
+   */
+  public function deleteFromSourceIds(array $ids) {
+    if (empty($ids)) {
+      return;
+    }
+
+    $hashes = $this->getDatabase()
+      ->select($this->mapTableName(), 'map')
+      ->fields('map', [$this::SOURCE_IDS_HASH])
+      ->condition('sourceid1', $ids, 'IN')
+      ->execute()
+      ?->fetchCol() ?? [];
+
+    if (!empty($hashes)) {
+      $this->getDatabase()
+        ->delete($this->mapTableName())
+        ->condition($this::SOURCE_IDS_HASH, $hashes, 'IN')
+        ->execute();
+
+      $this->getDatabase()
+        ->delete($this->messageTableName())
+        ->condition($this::SOURCE_IDS_HASH, $hashes, 'IN')
+        ->execute();
+    }
+  }
+
+  /**
+   * Truncate the id mapping tables.
+   */
+  public function deleteIdMapping() {
+    $this->getDatabase()->truncate($this->mapTableName())->execute();
+    $this->getDatabase()->truncate($this->messageTableName())->execute();
+  }
+
 }

From f3dc2908b76999e438969e29125a595b1a7f7388 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 18 Jan 2022 04:21:12 +0000
Subject: [PATCH 367/720] [RW-296] Fixed and improved the source and
 destination migration plugins to be able to handle updates and deletions

---
 .../src/Plugin/migrate/destination/Entity.php | 137 ++++++-
 .../Plugin/migrate/destination/EntityFile.php |   6 +-
 .../Plugin/migrate/destination/EntityNode.php |   8 +
 .../migrate/destination/EntityRedirect.php    |  10 +
 .../migrate/destination/EntityRevision.php    |  12 +-
 .../Plugin/migrate/destination/EntityUser.php | 104 +-----
 .../src/Plugin/migrate/destination/Table.php  |  46 +++
 .../src/Plugin/migrate/source/EntityBase.php  | 340 ++++++++++++++++--
 .../migrate/source/FieldableEntityBase.php    |  12 +-
 .../src/Plugin/migrate/source/Image.php       |  42 +++
 .../src/Plugin/migrate/source/Media.php       |  81 +++++
 .../src/Plugin/migrate/source/Node.php        |  47 +++
 .../Plugin/migrate/source/NodeRevision.php    |  50 +++
 .../src/Plugin/migrate/source/Report.php      |  39 +-
 .../Plugin/migrate/source/ReportRevision.php  |  32 ++
 .../migrate/source/SourceReportTrait.php      |  51 +++
 .../src/Plugin/migrate/source/Table.php       |  60 ++++
 .../Plugin/migrate/source/TaxonomyTerm.php    |  64 ++++
 .../migrate/source/TaxonomyTermRevision.php   |  76 ++++
 .../src/Plugin/migrate/source/UrlAlias.php    |  49 +++
 .../src/Plugin/migrate/source/User.php        |  43 +++
 21 files changed, 1130 insertions(+), 179 deletions(-)
 create mode 100644 html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Table.php
 create mode 100644 html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/ReportRevision.php
 create mode 100644 html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/SourceReportTrait.php
 create mode 100644 html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Table.php

diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Entity.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Entity.php
index e983acd08..e07708c5f 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Entity.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Entity.php
@@ -14,7 +14,10 @@
 use Drupal\migrate\Row;
 use Drupal\reliefweb_migrate\Entity\AccumulatedPathAliasStorage;
 use Drupal\reliefweb_migrate\Entity\AccumulatedSqlContentEntityStorageInterface;
+use Drupal\reliefweb_migrate\Plugin\migrate\id_map\AccumulatedSql;
+use Drupal\reliefweb_migrate\Plugin\migrate\source\EntityBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\Uid\Uuid;
 
 /**
  * Entity migration destination.
@@ -40,6 +43,13 @@ class Entity extends EntityContentBase implements ImportAwareInterface {
    */
   protected $pathAliasStorage;
 
+  /**
+   * Batch size.
+   *
+   * @var int
+   */
+  protected $batchSize;
+
   /**
    * Constructs a content entity.
    *
@@ -118,14 +128,15 @@ public static function create(ContainerInterface $container, array $configuratio
   protected function getEntity(Row $row, array $old_destination_id_values) {
     $entity_id = reset($old_destination_id_values) ?: $this->getEntityId($row);
 
-    // Delete the existing entity so we can insert the new one without having
-    // to worry about changes, unwanted new revisions etc.
-    if ($this->migration->getSourcePlugin()->entityExists($entity_id)) {
-      $entity = $this->storage->load($entity_id);
-      if (!empty($entity)) {
-        $entity->_is_migrating = TRUE;
-        $entity->delete();
-      }
+    $source_plugin = $this->migration->getSourcePlugin();
+    if ($source_plugin instanceof EntityBase) {
+      $exists = $this->migration->getSourcePlugin()->entityExists($entity_id);
+    }
+    elseif ($original = $this->storage->load($entity_id)) {
+      $exists = TRUE;
+    }
+    else {
+      $exists = FALSE;
     }
 
     // Attempt to ensure we always have a bundle.
@@ -133,31 +144,65 @@ protected function getEntity(Row $row, array $old_destination_id_values) {
       $row->setDestinationProperty($this->getKey('bundle'), $bundle);
     }
 
+    // When the entity already exists, we still create a new entity with the new
+    // data rather than trying to update the revious data to make sure
+    // everything is properly overridden.
     $entity = $this->storage->create($row->getDestination());
-    $entity->enforceIsNew();
     $entity->isDefaultRevision(TRUE);
     if ($entity->getEntityType()->isRevisionable()) {
       $entity->setNewRevision(TRUE);
     }
+
+    if ($exists) {
+      $entity->enforceIsNew(FALSE);
+      $entity->original = $this->storage->load($entity_id);
+      $entity->original->_is_migrating = TRUE;
+      $entity->_exists = TRUE;
+    }
+    else {
+      $entity->enforceIsNew(TRUE);
+    }
     return $entity;
   }
 
+  /**
+   * Get the destination entity bundle if any.
+   *
+   * @return string|null
+   *   Destination entity bundle.
+   */
+  public function getDestinationBundle() {
+    return $this->configuration['default_bundle'] ?? NULL;
+  }
+
+  /**
+   * Delete all the previously imported content.
+   */
+  public function deleteImported() {
+    // Truncate all the database tables.
+    if ($this->storage instanceof AccumulatedSqlContentEntityStorageInterface) {
+      $this->storage->deleteAll();
+    }
+    // Remove the migration mapping.
+    $id_map = $this->migration->getIdMap();
+    if ($id_map instanceof AccumulatedSql) {
+      $id_map->deleteIdMapping();
+    }
+    // Remove the high water if any.
+    $source_plugin = $this->migration->getSourcePlugin();
+    if ($source_plugin instanceof EntityBase) {
+      $source_plugin->resetHighWater();
+    }
+  }
+
   /**
    * {@inheritdoc}
    */
   protected function save(ContentEntityInterface $entity, array $old_destination_id_values = []) {
-    if (isset($entity->url_alias)) {
-      $path_alias = $this->pathAliasStorage->create([
-        'path' => '/' . strtr($entity->getEntityTypeId(), '_', '/') . '/' . $entity->id(),
-        'alias' => '/' . trim($entity->url_alias, " \n\r\t\v\0\\/"),
-        'langcode' => $entity->language()->getId(),
-      ]);
-      $this->pathAliasStorage->save($path_alias);
-      unset($entity->url_alias);
-    }
+    $this->saveUrlAlias($entity);
 
     if ($this->storage instanceof AccumulatedSqlContentEntityStorageInterface) {
-      $this->storage->saveAccumulated($entity, $this->migration->getSourcePlugin()->getBatchSize());
+      $this->storage->saveAccumulated($entity, $this->getBatchSize());
       return [$entity->id()];
     }
     else {
@@ -165,6 +210,60 @@ protected function save(ContentEntityInterface $entity, array $old_destination_i
     }
   }
 
+  /**
+   * Get the migration batch size.
+   *
+   * @return int
+   *   The migration batch size.
+   */
+  protected function getBatchSize() {
+    if (!isset($this->batchSize)) {
+      $source_plugin = $this->migration->getSourcePlugin();
+      if ($source_plugin instanceof EntityBase) {
+        $this->batchSize = $this->migration->getSourcePlugin()->getBatchSize();
+      }
+      else {
+        $this->batchSize = 1000;
+      }
+    }
+    return $this->batchSize;
+  }
+
+  /**
+   * Save the url alias for the entity.
+   *
+   * @param \Drupal\Core\Entity\ContentEntityInterface $entity
+   *   Entity.
+   */
+  protected function saveUrlAlias(ContentEntityInterface $entity) {
+    if (isset($entity->url_alias) && isset($this->pathAliasStorage)) {
+      $path = '/' . strtr($entity->getEntityTypeId(), '_', '/') . '/' . $entity->id();
+      $alias = '/' . trim($entity->url_alias['alias'], " \n\r\t\v\0\\/");
+      $uuid = Uuid::v3(Uuid::fromString(Uuid::NAMESPACE_URL), 'https://reliefweb.int' . $path)->toRfc4122();
+      $path_alias = $this->pathAliasStorage->create([
+        'id' => $entity->url_alias['id'],
+        'uuid' => $uuid,
+        'path' => $path,
+        'alias' => $alias,
+        'langcode' => $entity->language()->getId(),
+      ]);
+      $this->pathAliasStorage->saveAccumulated($path_alias);
+      unset($entity->url_alias);
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function rollback(array $destination_identifier) {
+    // Delete the specified entity from Drupal if it exists.
+    $entity = $this->storage->load(reset($destination_identifier));
+    if ($entity) {
+      $entity->_is_migrating = TRUE;
+      $entity->delete();
+    }
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityFile.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityFile.php
index f49d0ee7f..b6fc48068 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityFile.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityFile.php
@@ -136,7 +136,7 @@ protected function save(ContentEntityInterface $entity, array $old_destination_i
       ];
     }
 
-    if (count($this->accumulatedImageUris) > 1000) {
+    if (count($this->accumulatedImageUris) >= 1000) {
       $this->flushAccumulatedImageUris();
     }
 
@@ -149,7 +149,7 @@ protected function save(ContentEntityInterface $entity, array $old_destination_i
   public function rollback(array $destination_identifier) {
     if (!empty($destination_identifier)) {
       // Delete the URI mapping.
-      \Drupal::database()
+      $this->database
         ->delete('reliefweb_migrate_uri_mapping')
         ->condition('id', reset($destination_identifier))
         ->execute();
@@ -170,7 +170,7 @@ protected static function getEntityTypeId($plugin_id) {
    */
   protected function flushAccumulatedImageUris() {
     if (!empty($this->accumulatedImageUris)) {
-      $query = \Drupal::database()
+      $query = $this->database
         ->insert('reliefweb_migrate_uri_mapping')
         ->fields(['id', 'new_uri', 'old_uri']);
 
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityNode.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityNode.php
index af04b898d..d9a6279fc 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityNode.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityNode.php
@@ -4,6 +4,7 @@
 
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\EntityFieldManagerInterface;
+use Drupal\Core\Entity\EntityPublishedInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Field\FieldTypePluginManagerInterface;
 use Drupal\Core\Session\AccountSwitcherInterface;
@@ -130,6 +131,12 @@ protected function saveAttachments(Report $entity) {
         $private = !$entity->isPublished();
       }
 
+      // Delete any previous files before adding the new ones to ensure we have
+      // the latest version.
+      if (!empty($entity->original) && !$entity->original->get('field_file')->isEmpty()) {
+        $entity->original->get('field_file')->delete();
+      }
+
       // Create the field item and preview files with the permanent URIs.
       foreach ($entity->get('field_file') as $item) {
         if ($item->isEmpty()) {
@@ -149,6 +156,7 @@ protected function saveAttachments(Report $entity) {
         $item->get('file_uuid')->setValue($file->uuid());
 
         if (!$item->canHavePreview() || empty($item->getPreviewPage())) {
+          $item->get('preview_uuid')->setValue(NULL);
           continue;
         }
         $preview_file = $item->createPreviewFile(FALSE);
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityRedirect.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityRedirect.php
index 38eb2c7ac..53471c95b 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityRedirect.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityRedirect.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\reliefweb_migrate\Plugin\migrate\destination;
 
+use Drupal\migrate\Event\MigrateImportEvent;
 use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\reliefweb_migrate\Entity\AccumulatedPathAliasStorage;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -42,4 +43,13 @@ public static function create(ContainerInterface $container, array $configuratio
     );
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function preImport(MigrateImportEvent $event) {
+    // Safer to reimport all the redirects as deleting nodes and terms during
+    // their migration may remove some redirects.
+    $this->deleteImported();
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityRevision.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityRevision.php
index 15a688fd2..f6b284ca1 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityRevision.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityRevision.php
@@ -59,14 +59,13 @@ public static function create(ContainerInterface $container, array $configuratio
    * {@inheritdoc}
    */
   protected function getEntity(Row $row, array $old_destination_id_values) {
-    $revision_id = reset($old_destination_id_values) ?: $this->getEntityRevisionId($row);
-
-    // Delete the existing revision so we can insert the new one without having
-    // to worry about changes, unwanted new revisions etc.
-    if ($this->migration->getSourcePlugin()->entityExists($revision_id)) {
-      $this->storage->deleteRevision($revision_id);
+    if (!($this->storage instanceof AccumulatedSqlContentEntityStorageInterface)) {
+      return parent::getEntity($row, $old_destination_id_values);
     }
 
+    $revision_id = reset($old_destination_id_values) ?: $this->getEntityRevisionId($row);
+    $exists = $this->migration->getSourcePlugin()->entityExists($revision_id);
+
     // Attempt to ensure we always have a bundle.
     if ($bundle = $this->getBundle($row)) {
       $row->setDestinationProperty($this->getKey('bundle'), $bundle);
@@ -81,6 +80,7 @@ protected function getEntity(Row $row, array $old_destination_id_values) {
     $entity->enforceIsNew(FALSE);
     $entity->isDefaultRevision(FALSE);
     $entity->setNewRevision(TRUE);
+    $entity->_exists = $exists;
     return $entity;
   }
 
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityUser.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityUser.php
index 0e81351be..e9e8516fa 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityUser.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityUser.php
@@ -2,14 +2,7 @@
 
 namespace Drupal\reliefweb_migrate\Plugin\migrate\destination;
 
-use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\migrate\Event\MigrateImportEvent;
-use Drupal\migrate\Event\ImportAwareInterface;
-use Drupal\migrate\Plugin\MigrationInterface;
-use Drupal\migrate\Row;
-use Drupal\reliefweb_migrate\Entity\AccumulatedSqlContentEntityStorageInterface;
-use Drupal\user\Plugin\migrate\destination\EntityUser as EntityUserBase;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Entity migration destination.
@@ -18,100 +11,19 @@
  *   id = "reliefweb_entity:user"
  * )
  */
-class EntityUser extends EntityUserBase implements ImportAwareInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration = NULL) {
-    $entity_type_id = static::getEntityTypeId($plugin_id);
-    $storage = $container->get('entity_type.manager')->getStorage($entity_type_id);
-    $entity_type = $storage->getEntityType();
-
-    $storage_class = get_class($storage);
-    $storage_class_name = (new \ReflectionClass($storage_class))->getShortName();
-    $accumulated_storage_class = 'Drupal\reliefweb_migrate\Entity\Accumulated' . $storage_class_name;
-
-    // Use the accumulated storage if for the entity type if available.
-    if (class_exists($accumulated_storage_class) && is_subclass_of($accumulated_storage_class, $storage_class)) {
-      $storage = $accumulated_storage_class::createInstance($container, $entity_type);
-    }
-
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $migration,
-      $storage,
-      array_keys($container->get('entity_type.bundle.info')->getBundleInfo($entity_type_id)),
-      $container->get('entity_field.manager'),
-      $container->get('plugin.manager.field.field_type'),
-      $container->get('password'),
-      $container->get('account_switcher')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * We use a shortcut here to reduce the number of database requests by
-   * assuming we only create new entities with that migration destination.
-   *
-   * This is supposed to work due to the use of hight water properties to
-   * only deal with new entities.
-   *
-   * @todo review how to handle updates.
-   *
-   * @todo use the preImport event to preload existing entities with a
-   * loadMultiple which should, in theory, be more efficient than several
-   * individual loads.
-   */
-  protected function getEntity(Row $row, array $old_destination_id_values) {
-    $entity_id = reset($old_destination_id_values) ?: $this->getEntityId($row);
-
-    // Delete the existing entity so we can insert the new one without having
-    // to worry about changes, unwanted new revisions etc.
-    if ($this->migration->getSourcePlugin()->entityExists($entity_id)) {
-      $entity = $this->storage->load($entity_id);
-      if (!empty($entity)) {
-        $entity->_is_migrating = TRUE;
-        $entity->delete();
-      }
-    }
-
-    // Attempt to ensure we always have a bundle.
-    if ($bundle = $this->getBundle($row)) {
-      $row->setDestinationProperty($this->getKey('bundle'), $bundle);
-    }
-
-    $entity = $this->storage->create($row->getDestination());
-    $entity->enforceIsNew();
-    return $entity;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function save(ContentEntityInterface $entity, array $old_destination_id_values = []) {
-    if ($this->storage instanceof AccumulatedSqlContentEntityStorageInterface) {
-      $this->storage->saveAccumulated($entity, $this->migration->getSourcePlugin()->getBatchSize());
-    }
-    else {
-      $this->storage->save($entity);
-    }
-    return [$entity->id()];
-  }
+class EntityUser extends Entity {
 
   /**
    * {@inheritdoc}
    */
   public function preImport(MigrateImportEvent $event) {
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function postImport(MigrateImportEvent $event) {
+    // We don't have an easy way to detect changes made to user entities and
+    // updating or rolling back is really slow and has unwanted consequences
+    // due to some entity hooks. So we "simply" delete all the users from the
+    // database and re-import everything.
+    if (!empty($this->configuration['delete_before_import'])) {
+      $this->deleteImported();
+    }
   }
 
 }
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Table.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Table.php
new file mode 100644
index 000000000..075c20f9d
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Table.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace Drupal\reliefweb_migrate\Plugin\migrate\destination;
+
+use Drupal\migrate\Event\MigrateImportEvent;
+use Drupal\migrate_plus\Plugin\migrate\destination\Table as TableBase;
+use Drupal\reliefweb_migrate\Plugin\migrate\id_map\AccumulatedSql;
+
+/**
+ * Table migration destination.
+ *
+ * @MigrateDestination(
+ *   id = "reliefweb_table"
+ * )
+ */
+class Table extends TableBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function preImport(MigrateImportEvent $event) {
+    // Wipe out the table before inserting the new data. This is much faster
+    // than trying to see what changed.
+    $this->dbConnection->truncate($this->tableName)->execute();
+
+    // Remove the migration mapping.
+    $id_map = $this->migration->getIdMap();
+    if ($id_map instanceof AccumulatedSql) {
+      $id_map->deleteIdMapping();
+    }
+  }
+
+  /**
+   * Get the IDs from the destination table.
+   *
+   * @return array
+   *   List of IDs from the destination table.
+   */
+  public function getDestinationIds() {
+    return $this->dbConnection->select($this->tableName, 't')
+      ->fields('t', array_keys($this->idFields))
+      ->execute()
+      ?->fetchAll(\PDO::FETCH_ASSOC) ?? [];
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
index 5f71d712a..16c06d06a 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
@@ -2,17 +2,19 @@
 
 namespace Drupal\reliefweb_migrate\Plugin\migrate\source;
 
+use Drupal\Core\Database\Database;
 use Drupal\migrate\Event\ImportAwareInterface;
 use Drupal\migrate\Event\MigrateImportEvent;
 use Drupal\migrate\Event\MigrateRollbackEvent;
 use Drupal\migrate\Event\RollbackAwareInterface;
 use Drupal\migrate\Plugin\migrate\source\SqlBase;
+use Drupal\migrate\Row;
 use Drupal\reliefweb_migrate\Plugin\migrate\id_map\AccumulatedSql;
 
 /**
  * Base entity source plugin for reliefweb migrations.
  */
-abstract class EntityBase extends SqlBase implements ImportAwareInterface, RollbackAwareInterface {
+abstract class EntityBase extends SqlBase implements ImportAwareInterface, RollbackAwareInterface, SourceMigrationStatusInterface {
 
   /**
    * Entity type.
@@ -40,7 +42,7 @@ abstract class EntityBase extends SqlBase implements ImportAwareInterface, Rollb
    *
    * @var string
    */
-  protected $revisionIdField = 'revision_id';
+  protected $revisionIdField;
 
   /**
    * Flag indicating whether to pass the revision id to get the fields.
@@ -65,19 +67,118 @@ abstract class EntityBase extends SqlBase implements ImportAwareInterface, Rollb
    */
   protected $migratedEntities = [];
 
+  /**
+   * Initialize the batch size.
+   */
+  protected function initializeBatchSize() {
+    if ($this->batchSize == 0 && isset($this->configuration['batch_size'])) {
+      // Valid batch sizes are integers >= 0.
+      if (is_int($this->configuration['batch_size']) && ($this->configuration['batch_size']) >= 0) {
+        $this->batchSize = $this->configuration['batch_size'];
+      }
+      else {
+        throw new MigrateException("batch_size must be greater than or equal to zero");
+      }
+    }
+  }
+
   /**
    * {@inheritdoc}
    */
   protected function initializeIterator() {
-    $iterator = parent::initializeIterator();
+    $this->initializeBatchSize();
+    if (empty($this->batchSize)) {
+      return parent::initializeIterator();
+    }
+
+    // If a batch has run the query is already setup.
+    if ($this->batch == 0) {
+      $this->prepareQuery();
+    }
 
-    if (!empty($this->batchSize)) {
-      $this->preloadIdMapping($iterator);
+    if ($this->getHighWaterProperty()) {
+      $high_water_field = $this->getHighWaterField();
+      $high_water = $this->getHighWater();
+      // We check against NULL because 0 is an acceptable value for the high
+      // water mark.
+      if ($high_water !== NULL) {
+        $this->query->condition($high_water_field, $high_water, '>');
+      }
+      // Always sort by the high water field, to ensure that the first run
+      // (before we have a high water value) also has the results in a
+      // consistent order.
+      $this->query->orderBy($high_water_field);
+      $this->query->range(0, 1000);
+    }
+    else {
+      $this->query->range($this->batch * $this->batchSize, $this->batchSize);
     }
 
+    // Wrap the query result in an iterator.
+    $statement = $this->query->execute();
+    $statement->setFetchMode(\PDO::FETCH_ASSOC);
+    $iterator = new \IteratorIterator($statement);
+
+    // Preload the ID mapping and the list of migrated entities for the results.
+    $this->preloadIdMapping($iterator);
+    $this->preloadExisting($iterator);
+
+    // Rewind the iterator just in case.
+    $iterator->rewind();
+
     return $iterator;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function next() {
+    $this->currentSourceIds = NULL;
+    $this->currentRow = NULL;
+
+    // In order to find the next row we want to process, we ask the source
+    // plugin for the next possible row.
+    while (!isset($this->currentRow) && $this->getIterator()->valid()) {
+
+      $row_data = $this->getIterator()->current() + $this->configuration;
+      $row = new Row($row_data, $this->getIds());
+
+      // Populate the source key for this row.
+      $this->currentSourceIds = $row->getSourceIdValues();
+
+      // Pick up the existing map row, if any, unless fetchNextRow() did it.
+      if (!$this->mapRowAdded && ($id_map = $this->idMap->getRowBySource($this->currentSourceIds))) {
+        $row->setIdMap($id_map);
+      }
+
+      // Clear any previous messages for this row before potentially adding
+      // new ones.
+      if (!empty($this->currentSourceIds)) {
+        $this->idMap->delete($this->currentSourceIds, TRUE);
+      }
+
+      // Preparing the row gives source plugins the chance to skip.
+      if ($this->prepareRow($row) !== FALSE) {
+        // Check whether the row needs processing.
+        // 1. This row has not been imported yet.
+        // 2. Explicitly set to update.
+        // 3. The row is newer than the current high-water mark.
+        // 4. If no such property exists then try by checking the hash of the
+        //    row.
+        if (!$row->getIdMap() || $row->needsUpdate() || $this->aboveHighWater($row) || $this->rowChanged($row)) {
+          $this->currentRow = $row->freezeSource();
+        }
+
+        // @todo This should probably be updated even when skipping the row.
+        if ($this->getHighWaterProperty()) {
+          $this->saveHighWater($row->getSourceProperty($this->highWaterProperty['name']));
+        }
+      }
+
+      $this->fetchNextRow();
+    }
+  }
+
   /**
    * Preload the ID mapping.
    *
@@ -87,37 +188,96 @@ protected function initializeIterator() {
   protected function preloadIdMapping(\IteratorIterator $iterator) {
     // Pre-compute the ID of the row to be created.
     if ($this->idMap instanceof AccumulatedSql && $iterator->count() > 0) {
-      $use_revision_id = $this->useRevisionId && !empty($this->revisionIdField);
-
       $iterator->rewind();
 
       $source_ids = $this->getIds();
 
       $source_id_hashes = [];
+      foreach ($iterator as $record) {
+        $source_id_values = array_merge($source_ids, array_intersect_key($record, $source_ids));
+        $source_id_hashes[] = $this->idMap->getSourceIdsHash($source_id_values);
+      }
+
+      $this->idMap->preloadIdMapping($source_id_hashes);
+
+      $iterator->rewind();
+    }
+  }
+
+  /**
+   * Check if any of the entities to load are already in the databse.
+   *
+   * @param \IteratorIterator $iterator
+   *   The iterator over the records returned from the database query.
+   */
+  protected function preloadExisting(\IteratorIterator $iterator) {
+    $ids = $this->getEntityIdsFromIterator($iterator);
+    if (!empty($ids)) {
+      foreach ($this->doPreloadExisting($ids) as $id) {
+        $this->migratedEntities[$id] = TRUE;
+      }
+    }
+  }
+
+  /**
+   * Get the list of existing entities in the database.
+   *
+   * @param array $ids
+   *   List of entity IDs to check.
+   *
+   * @return array
+   *   List of existing IDs.
+   */
+  abstract protected function doPreloadExisting(array $ids);
+
+  /**
+   * Get the destination database connection.
+   *
+   * @return \Drupal\Core\Database\Connection
+   *   The database connection of the drupal 9 site.
+   */
+  protected function getDatabaseConnection() {
+    return Database::getConnection('default', 'default');
+  }
+
+  /**
+   * Get the entity ids from the iterator.
+   *
+   * @param \IteratorIterator $iterator
+   *   The iterator over the records returned from the database query.
+   *
+   * @return array
+   *   List of entity ids.
+   */
+  protected function getEntityIdsFromIterator(\IteratorIterator $iterator) {
+    $ids = [];
+    if ($iterator->count() > 0) {
+      $iterator->rewind();
+
+      $use_revision_id = $this->useRevisionId && !empty($this->revisionIdField);
+
       foreach ($iterator as $record) {
         if ($use_revision_id) {
-          $id = $record[$this->revisionIdField];
+          $ids[] = $record[$this->revisionIdField];
         }
         else {
-          $id = $record[$this->idField];
+          $ids[] = $record[$this->idField];
         }
-
-        $source_id_values = array_merge($source_ids, array_intersect_key($record, $source_ids));
-        $source_id_hashes[$this->idMap->getSourceIdsHash($source_id_values)] = $id;
-      }
-
-      $preloaded = $this->idMap->preloadIdMapping(array_keys($source_id_hashes));
-      foreach ($preloaded as $hash => $data) {
-        $this->migratedEntities[$source_id_hashes[$hash]] = !empty($data);
       }
 
       $iterator->rewind();
     }
+
+    return $ids;
   }
 
   /**
    * Check if an entity was already migrated.
    *
+   * Note: we "consume" the entity in the migratedEntities array to release
+   * some memory. This works because this method is only called in
+   * Drupal\reliefweb_migrate\Plugin\migrate\destination\Entity::getEntity().
+   *
    * @param int $id
    *   Entity id.
    *
@@ -125,7 +285,7 @@ protected function preloadIdMapping(\IteratorIterator $iterator) {
    *   TRUE if the entity already exists.
    */
   public function entityExists($id) {
-    $exists = !empty($this->migratedEntities[$id]);
+    $exists = isset($this->migratedEntities[$id]);
     unset($this->migratedEntities[$id]);
     return $exists;
   }
@@ -159,6 +319,137 @@ protected function doSaveHighWater() {
     }
   }
 
+  /**
+   * Reset the high water.
+   */
+  public function resetHighWater() {
+    $this->getHighWaterStorage()->set($this->migration->id(), NULL);
+  }
+
+  /**
+   * Remove the entities from the D9 site that don't exist in the D7 site.
+   */
+  protected function removeDeletedEntities() {
+    $destination_plugin = $this->migration->getDestinationPlugin();
+
+    $ids_list = $this->getDestinationEntityIds();
+    if (empty($ids_list)) {
+      return;
+    }
+
+    foreach (array_chunk($ids_list, 1000) as $ids) {
+      $ids_to_delete = $this->getDestinationEntityIdsToDelete($ids);
+      if (!empty($ids_to_delete)) {
+        foreach ($ids_to_delete as $id) {
+          $destination_plugin->rollback([$id]);
+        }
+        $this->idMap->deleteFromSourceIds($ids_to_delete);
+      }
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getMigrationStatus() {
+    $destination_ids = $this->getDestinationEntityIds();
+    $source_ids = $this->getSourceEntityIds();
+    $imported_ids = array_intersect($destination_ids, $source_ids);
+
+    $total = count($source_ids);
+    $imported = count($destination_ids);
+    $unchanged = count(array_intersect_assoc($source_ids, $destination_ids));
+    $new = count(array_diff($source_ids, $imported_ids));
+    $deleted = count(array_diff($destination_ids, $source_ids));
+    $updated = count(array_diff_assoc($imported_ids, $source_ids));
+
+    return [
+      'total' => $total,
+      'imported' => $imported,
+      'unchanged' => $unchanged,
+      'new' => $new,
+      'deleted' => $deleted,
+      'updated' => $updated,
+    ];
+  }
+
+  /**
+   * Get the list if source ids that can be imported.
+   *
+   * @return array
+   *   Associative array keyed by revision ids if available, otherwise keyed by
+   *   entity ids and with the entity ids as values.
+   */
+  protected function getSourceEntityIds() {
+    $query = $this->query();
+
+    // ID and revision fields.
+    $id_fields = [$this->idField => TRUE];
+    if (isset($this->revisionIdField)) {
+      $id_fields[$this->revisionIdField] = TRUE;
+    }
+
+    // Get the fields used for grouping. We need to preserve them.
+    $group_by = $query->getGroupBy();
+
+    // Remove all the unnecessary fields.
+    $fields = &$query->getFields();
+    foreach ($fields as $alias => $field) {
+      $table_and_field = $field['table'] . '.' . $field['field'];
+
+      if (isset($id_fields[$field['field']])) {
+        $id_fields[$field['field']] = $alias;
+      }
+      elseif (!isset($group_by[$alias]) && !isset($group_by[$table_and_field])) {
+        unset($fields[$alias]);
+      }
+    }
+
+    // No need to sort.
+    $order = &$query->getOrderBy();
+    $order = [];
+
+    $records = $query->execute() ?? [];
+
+    $ids = [];
+    foreach ($records as $record) {
+      $id = $record[$this->idField];
+      if (isset($this->revisionIdField)) {
+        $revision_id = $record[$this->revisionIdField];
+        if (empty($this->useRevisionId)) {
+          $ids[$revision_id] = $id;
+        }
+        else {
+          $ids[$revision_id] = $revision_id;
+        }
+      }
+      else {
+        $ids[$id] = $id;
+      }
+    }
+
+    return $ids;
+  }
+
+  /**
+   * Get the entity ids from the offset and limit.
+   *
+   * @return array
+   *   Destination entity ids.
+   */
+  abstract protected function getDestinationEntityIds();
+
+  /**
+   * Get the entity ids from the offset and limit.
+   *
+   * @param array $ids
+   *   Entity ids.
+   *
+   * @return array
+   *   Entity ids to delete.
+   */
+  abstract protected function getDestinationEntityIdsToDelete(array $ids);
+
   /**
    * Get the batch size.
    *
@@ -179,11 +470,20 @@ public function preImport(MigrateImportEvent $event) {
    * {@inheritdoc}
    */
   public function postImport(MigrateImportEvent $event) {
+    // Just in case, ensure the destination postImport is run before the source
+    // one so that the database has all the entity data.
+    $destination_plugin = $this->migration->getDestinationPlugin();
+    if ($destination_plugin instanceof ImportAwareInterface) {
+      $destination_plugin->postImport($event);
+    }
+
     if ($this->idMap instanceof AccumulatedSql) {
       $this->idMap->flushAccumulatedIdMapping();
     }
 
     $this->doSaveHighWater();
+
+    $this->removeDeletedEntities();
   }
 
   /**
@@ -196,8 +496,8 @@ public function preRollback(MigrateRollbackEvent $event) {
    * {@inheritdoc}
    */
   public function postRollback(MigrateRollbackEvent $event) {
-    // Unset the hight water value after a rollback.
-    $this->getHighWaterStorage()->set($this->migration->id(), NULL);
+    // Unset the high water value after a rollback.
+    $this->resetHighWater();
   }
 
 }
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/FieldableEntityBase.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/FieldableEntityBase.php
index 38f670280..ae7ffb275 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/FieldableEntityBase.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/FieldableEntityBase.php
@@ -119,12 +119,15 @@ protected function preloadUrlAliases(array $bundles) {
 
     $aliases = [];
     foreach ($records as $record) {
-      $aliases[$record['source']] = $record['alias'];
+      $aliases[$record['source']] = [
+        'id' => $record['pid'],
+        'alias' => $record['alias'],
+      ];
     }
 
     foreach ($sources as $id => $source) {
       if (isset($aliases[$source])) {
-        $this->preloadedUrlAliases[$id] = '/' . $aliases[$source];
+        $this->preloadedUrlAliases[$id] = $aliases[$source];
       }
     }
   }
@@ -147,7 +150,10 @@ protected function getUrlAlias($id) {
 
     $aliases = [];
     foreach ($records as $record) {
-      $aliases[$record['source']] = $record['alias'];
+      $aliases[$record['source']] = [
+        'id' => $record['pid'],
+        'alias' => $record['alias'],
+      ];
     }
 
     return $aliases[$source] ?? NULL;
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Image.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Image.php
index e560026ff..ff2b840df 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Image.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Image.php
@@ -163,6 +163,48 @@ public function prepareRow(Row $row) {
     return parent::prepareRow($row);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function doPreloadExisting(array $ids) {
+    if (!empty($ids)) {
+      return $this->getDatabaseConnection()
+        ->select('file_managed', 'fm')
+        ->fields('fm', ['fid'])
+        ->condition('fm.fid', $ids, 'IN')
+        ->execute()
+        ?->fetchCol() ?? [];
+    }
+    return [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getDestinationEntityIds() {
+    return $this->getDatabaseConnection()
+      ->select('file_managed', 'fm')
+      ->fields('fm', ['fid'])
+      ->condition('fm.uri', 'public://images/%', 'LIKE')
+      ->orderBy('fm.fid', 'ASC')
+      ->execute()
+      ?->fetchAllKeyed(0, 0) ?? [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getDestinationEntityIdsToDelete(array $ids) {
+    if (!empty($ids)) {
+      return array_diff($ids, $this->select('file_managed', 'fm')
+        ->fields('fm', ['fid'])
+        ->condition('fm.fid', $ids, 'IN')
+        ->execute()
+        ?->fetchCol() ?? []);
+    }
+    return [];
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Media.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Media.php
index 92d37c85a..8591c6ca0 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Media.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Media.php
@@ -61,6 +61,87 @@ public function query() {
     return $query->distinct();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function doPreloadExisting(array $ids) {
+    if (!empty($ids)) {
+      return $this->getDatabaseConnection()
+        ->select('media', 'm')
+        ->fields('m', ['mid'])
+        ->condition('m.mid', $ids, 'IN')
+        ->execute()
+        ?->fetchCol() ?? [];
+    }
+    return [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getMigrationStatus() {
+    // We cannot differentiate report and blog post medias as we consolidate
+    // them in D9. So to be able to get the propert destination ids for the
+    // the current migration we need to use the id map.
+    $id_map = $this->migration->getIdMap();
+    $id_map_ids = $id_map->getDatabase()
+      ->select($id_map->mapTableName(), 'map')
+      ->fields('map', ['destid1'])
+      ->execute()
+      ?->fetchAllKeyed(0, 0) ?? [];
+
+    $destination_ids = array_intersect_assoc($id_map_ids, $this->getDestinationEntityIds());
+    $source_ids = $this->getSourceEntityIds();
+    $imported_ids = array_intersect($destination_ids, $source_ids);
+
+    $total = count($source_ids);
+    $imported = count($destination_ids);
+    $unchanged = count(array_intersect_assoc($source_ids, $destination_ids));
+    $new = count(array_diff($source_ids, $imported_ids));
+    $deleted = count(array_diff($destination_ids, $source_ids));
+    $updated = count(array_diff_assoc($imported_ids, $source_ids));
+
+    return [
+      'total' => $total,
+      'imported' => $imported,
+      'unchanged' => $unchanged,
+      'new' => $new,
+      'deleted' => $deleted,
+      'updated' => $updated,
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getDestinationEntityIds() {
+    $bundle = $this->migration
+      ->getDestinationPlugin()
+      ->getDestinationBundle();
+
+    return $this->getDatabaseConnection()
+      ->select('media', 'm')
+      ->fields('m', ['mid'])
+      ->condition('m.bundle', $bundle, '=')
+      ->orderBy('m.mid', 'ASC')
+      ->execute()
+      ?->fetchAllKeyed(0, 0) ?? [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getDestinationEntityIdsToDelete(array $ids) {
+    if (!empty($ids)) {
+      return array_diff($ids, $this->select('file_managed', 'fm')
+        ->fields('fm', ['fid'])
+        ->condition('fm.fid', $ids, 'IN')
+        ->execute()
+        ?->fetchCol() ?? []);
+    }
+    return [];
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Node.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Node.php
index d159d0a9f..794653712 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Node.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Node.php
@@ -100,6 +100,53 @@ public function query() {
     return $query;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function doPreloadExisting(array $ids) {
+    if (!empty($ids)) {
+      return $this->getDatabaseConnection()
+        ->select('node', 'n')
+        ->fields('n', ['nid'])
+        ->condition('n.nid', $ids, 'IN')
+        ->execute()
+        ?->fetchCol() ?? [];
+    }
+    return [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getDestinationEntityIds() {
+    $bundle = $this->configuration['bundle'];
+    if ($bundle === 'topics') {
+      $bundle = 'topic';
+    }
+
+    return $this->getDatabaseConnection()
+      ->select('node', 'n')
+      ->fields('n', ['vid', 'nid'])
+      ->condition('n.type', $bundle, '=')
+      ->orderBy('n.nid', 'ASC')
+      ->execute()
+      ?->fetchAllKeyed(0, 1) ?? [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getDestinationEntityIdsToDelete(array $ids) {
+    if (!empty($ids)) {
+      return array_diff($ids, $this->select('node', 'n')
+        ->fields('n', ['nid'])
+        ->condition('n.nid', $ids, 'IN')
+        ->execute()
+        ?->fetchCol() ?? []);
+    }
+    return [];
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/NodeRevision.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/NodeRevision.php
index 36839fed4..280512ffe 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/NodeRevision.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/NodeRevision.php
@@ -28,6 +28,56 @@ class NodeRevision extends Node {
    */
   protected $join = 'n.nid = nr.nid AND n.vid <> nr.vid';
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function doPreloadExisting(array $ids) {
+    if (!empty($ids)) {
+      return $this->getDatabaseConnection()
+        ->select('node_revision', 'nr')
+        ->fields('nr', ['vid'])
+        ->condition('nr.vid', $ids, 'IN')
+        ->execute()
+        ?->fetchCol() ?? [];
+    }
+    return [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getDestinationEntityIds() {
+    $bundle = $this->configuration['bundle'];
+    if ($bundle === 'topics') {
+      $bundle = 'topic';
+    }
+
+    $query = $this->getDatabaseConnection()
+      ->select('node_revision', 'nr')
+      ->fields('nr', ['vid'])
+      ->orderBy('nr.vid', 'ASC');
+
+    $query->innerJoin('node', 'n', 'n.nid = nr.nid AND n.vid <> nr.vid');
+    $query->condition('n.type', $bundle, '=');
+
+    return $query->execute()
+      ?->fetchAllKeyed(0, 0) ?? [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getDestinationEntityIdsToDelete(array $ids) {
+    if (!empty($ids)) {
+      return array_diff($ids, $this->select('node_revision', 'nr')
+        ->fields('nr', ['vid'])
+        ->condition('nr.vid', $ids, 'IN')
+        ->execute()
+        ?->fetchCol() ?? []);
+    }
+    return [];
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Report.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Report.php
index 9f13202cb..b89aab186 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Report.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Report.php
@@ -21,12 +21,7 @@
  */
 class Report extends Node {
 
-  /**
-   * Store the list of duplicate reports.
-   *
-   * @var array
-   */
-  protected $duplicateReports;
+  use SourceReportTrait;
 
   /**
    * Preloaded attachment data.
@@ -40,31 +35,7 @@ class Report extends Node {
    */
   public function query() {
     $query = parent::query();
-
-    // Retrieve duplicate reports. We cannot easily identify all the duplicates
-    // but those with attachments are easy enough to find and are the
-    // problematic ones.
-    if (!isset($this->duplicateReports)) {
-      $duplicate_query = $this->select('field_data_field_file', 'f');
-      $duplicate_query->addField('f', 'field_file_fid', 'fid');
-      $duplicate_query->addExpression('COUNT(f.field_file_fid)', 'total');
-      $duplicate_query->addExpression('GROUP_CONCAT(f.entity_id ORDER BY f.entity_id)', 'ids');
-      $duplicate_query->groupBy('f.field_file_fid');
-      $duplicate_query->having('total > 1');
-
-      $this->duplicateReports = [];
-      foreach ($duplicate_query->execute() ?? [] as $record) {
-        $ids = explode(',', $record['ids']);
-        if (min($ids) !== max($ids)) {
-          $this->duplicateReports = array_merge($this->duplicateReports, array_slice($ids, 0, -1));
-        }
-      }
-    }
-
-    if (!empty($this->duplicateReports)) {
-      $query->condition('n.nid', $this->duplicateReports, 'NOT IN');
-    }
-
+    $this->removeDuplicateReports($query);
     return $query;
   }
 
@@ -119,9 +90,13 @@ protected function convertFileFieldData() {
         $item = $items[$record->fid];
         $item['uuid'] = LegacyHelper::generateAttachmentUuid($record->uri);
         $item['file_uuid'] = LegacyHelper::generateAttachmentFileUuid($item['uuid'], $record->fid);
-        if (!empty($item['preview_page'])) {
+        if (!empty($item['preview_page']) && $record->filemime = 'application/pdf') {
           $item['preview_uuid'] = LegacyHelper::generateAttachmentPreviewUuid($item['uuid'], $item['file_uuid']);
         }
+        else {
+          unset($item['preview_page']);
+          unset($item['preview_rotation']);
+        }
         $item['file_name'] = $record->filename;
         $item['file_mime'] = $record->filemime;
         $item['file_size'] = $record->filesize;
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/ReportRevision.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/ReportRevision.php
new file mode 100644
index 000000000..aaaa1e020
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/ReportRevision.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Drupal\reliefweb_migrate\Plugin\migrate\source;
+
+/**
+ * Retrieve report node revisions from the Drupal 7 database.
+ *
+ * Available configuration keys:
+ * - bundle: (optional) The node type (machine name) to filter nodes
+ *   retrieved from the source - can be a string or an array. If omitted, all
+ *   nodes are retrieved.
+ *
+ * @see \Drupal\node\Plugin\migrate\source\d7\NodeRevision
+ *
+ * @MigrateSource(
+ *   id = "reliefweb_report_revision"
+ * )
+ */
+class ReportRevision extends NodeRevision {
+
+  use SourceReportTrait;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function query() {
+    $query = parent::query();
+    $this->removeDuplicateReports($query);
+    return $query;
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/SourceReportTrait.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/SourceReportTrait.php
new file mode 100644
index 000000000..fccfa8be4
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/SourceReportTrait.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Drupal\reliefweb_migrate\Plugin\migrate\source;
+
+use Drupal\Core\Database\Query\Select;
+
+/**
+ * Trait to add a method to remove duplicate reports.
+ */
+trait SourceReportTrait {
+
+  /**
+   * Store the list of duplicate reports.
+   *
+   * @var array
+   */
+  protected $duplicateReports;
+
+  /**
+   * Add a condition to the give query to ignore duplicate reports.
+   *
+   * @param \Drupal\Core\Database\Query\Select $query
+   *   Select query.
+   */
+  public function removeDuplicateReports(Select $query) {
+    // Retrieve duplicate reports. We cannot easily identify all the duplicates
+    // but those with attachments are easy enough to find and are the
+    // problematic ones.
+    if (!isset($this->duplicateReports)) {
+      $duplicate_query = $this->select('field_data_field_file', 'f');
+      $duplicate_query->addField('f', 'field_file_fid', 'fid');
+      $duplicate_query->addExpression('COUNT(f.field_file_fid)', 'total');
+      $duplicate_query->addExpression('GROUP_CONCAT(f.entity_id ORDER BY f.entity_id)', 'ids');
+      $duplicate_query->groupBy('f.field_file_fid');
+      $duplicate_query->having('total > 1');
+
+      $this->duplicateReports = [];
+      foreach ($duplicate_query->execute() ?? [] as $record) {
+        $ids = explode(',', $record['ids']);
+        if (min($ids) !== max($ids)) {
+          $this->duplicateReports = array_merge($this->duplicateReports, array_slice($ids, 0, -1));
+        }
+      }
+    }
+
+    if (!empty($this->duplicateReports)) {
+      $query->condition('n.nid', $this->duplicateReports, 'NOT IN');
+    }
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Table.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Table.php
new file mode 100644
index 000000000..75d57c8d7
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Table.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Drupal\reliefweb_migrate\Plugin\migrate\source;
+
+use Drupal\migrate_plus\Plugin\migrate\source\Table as TableBase;
+
+/**
+ * Table migration source.
+ *
+ * @MigrateSource(
+ *   id = "reliefweb_table"
+ * )
+ */
+class Table extends TableBase implements SourceMigrationStatusInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getMigrationStatus() {
+    $source_ids = $this->select($this->tableName, 't')
+      ->fields('t', array_keys($this->idFields))
+      ->execute()
+      ?->fetchAll(\PDO::FETCH_ASSOC) ?? [];
+
+    // We take a huge shortcut there assuming the destination plugin is a
+    // Drupal\reliefweb_migrate\Plugin\migrate\destination\Table.
+    // This works for RW because this source plugin is only used for the
+    // bookmarks and subscriptions where the source and destination tables
+    // have the same ID fields.
+    $destination_ids = $this->migration
+      ->getDestinationPlugin()
+      ->getDestinationIds();
+
+    $source_ids = array_map(function ($item) {
+      return implode('###', $item);
+    }, $source_ids);
+
+    $destination_ids = array_map(function ($item) {
+      return implode('###', $item);
+    }, $destination_ids);
+
+    $total = count($source_ids);
+    $imported = count($destination_ids);
+    $unchanged = count(array_intersect($source_ids, $destination_ids));
+    $new = count(array_diff($source_ids, $destination_ids));
+    $deleted = count(array_diff($destination_ids, $source_ids));
+    // There is no notion of update in the case of bookmarks and subscriptions.
+    $updated = 0;
+
+    return [
+      'total' => $total,
+      'imported' => $imported,
+      'unchanged' => $unchanged,
+      'new' => $new,
+      'deleted' => $deleted,
+      'updated' => $updated,
+    ];
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/TaxonomyTerm.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/TaxonomyTerm.php
index b0115eb8b..bb05210ce 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/TaxonomyTerm.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/TaxonomyTerm.php
@@ -102,6 +102,70 @@ public function query() {
     return $query;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function doPreloadExisting(array $ids) {
+    if (!empty($ids)) {
+      return $this->getDatabaseConnection()
+        ->select('taxonomy_term_data', 'td')
+        ->fields('td', ['tid'])
+        ->condition('td.tid', $ids, 'IN')
+        ->execute()
+        ?->fetchCol() ?? [];
+    }
+    return [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getDestinationEntityIds() {
+    $vocabularies = [
+      'career_categories' => 'career_category',
+      'content_format' => 'content_format',
+      'country' => 'country',
+      'disaster' => 'disaster',
+      'disaster_type' => 'disaster_type',
+      'feature' => 'feature',
+      'job_experience' => 'job_experience',
+      'job_type' => 'job_type',
+      'language' => 'language',
+      'ocha_product' => 'ocha_product',
+      'organization_type' => 'organization_type',
+      'source' => 'source',
+      'tags' => 'tag',
+      'theme' => 'theme',
+      'training_format' => 'training_format',
+      'training_type' => 'training_type',
+      'vulnerable_groups' => 'vulnerable_group',
+    ];
+
+    $bundles = array_intersect_key($vocabularies, array_flip((array) $this->configuration['bundle']));
+
+    return $this->getDatabaseConnection()
+      ->select('taxonomy_term_data', 'td')
+      ->fields('td', ['revision_id', 'tid'])
+      ->condition('td.vid', $bundles, 'IN')
+      ->orderBy('td.tid', 'ASC')
+      ->execute()
+      ?->fetchAllKeyed(0, 1) ?? [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getDestinationEntityIdsToDelete(array $ids) {
+    if (!empty($ids)) {
+      return array_diff($ids, $this->select('taxonomy_term_data', 'td')
+        ->fields('td', ['tid'])
+        ->condition('td.tid', $ids, 'IN')
+        ->execute()
+        ?->fetchCol() ?? []);
+    }
+    return [];
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/TaxonomyTermRevision.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/TaxonomyTermRevision.php
index 50372ed17..534bb4d2f 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/TaxonomyTermRevision.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/TaxonomyTermRevision.php
@@ -30,6 +30,82 @@ class TaxonomyTermRevision extends TaxonomyTerm {
    */
   protected $join = 'td.tid = tdr.tid AND td.revision_id <> tdr.revision_id';
 
+  /**
+   * {@inheritdoc}
+   */
+  public function query() {
+    $query = parent::query();
+    $query->condition('tdr.log', 'Automatic update of%', 'NOT LIKE');
+    return $query;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function doPreloadExisting(array $ids) {
+    if (!empty($ids)) {
+      return $this->getDatabaseConnection()
+        ->select('taxonomy_term_revision', 'tdr')
+        ->fields('tdr', ['revision_id'])
+        ->condition('tdr.revision_id', $ids, 'IN')
+        ->execute()
+        ?->fetchCol() ?? [];
+    }
+    return [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getDestinationEntityIds() {
+    $vocabularies = [
+      'career_categories' => 'career_category',
+      'content_format' => 'content_format',
+      'country' => 'country',
+      'disaster' => 'disaster',
+      'disaster_type' => 'disaster_type',
+      'feature' => 'feature',
+      'job_experience' => 'job_experience',
+      'job_type' => 'job_type',
+      'language' => 'language',
+      'ocha_product' => 'ocha_product',
+      'organization_type' => 'organization_type',
+      'source' => 'source',
+      'tags' => 'tag',
+      'theme' => 'theme',
+      'training_format' => 'training_format',
+      'training_type' => 'training_type',
+      'vulnerable_groups' => 'vulnerable_group',
+    ];
+
+    $bundles = array_intersect_key($vocabularies, array_flip((array) $this->configuration['bundle']));
+
+    $query = $this->getDatabaseConnection()
+      ->select('taxonomy_term_revision', 'tdr')
+      ->fields('tdr', ['revision_id'])
+      ->orderBy('tdr.revision_id', 'ASC');
+
+    $query->innerJoin('taxonomy_term_data', 'td', 'td.tid = tdr.tid AND td.revision_id <> tdr.revision_id');
+    $query->condition('td.vid', $bundles, 'IN');
+
+    return $query->execute()
+      ?->fetchAllKeyed(0, 0) ?? [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getDestinationEntityIdsToDelete(array $ids) {
+    if (!empty($ids)) {
+      return array_diff($ids, $this->select('taxonomy_term_data_revision', 'tdr')
+        ->fields('tdr', ['revision_id'])
+        ->condition('tdr.revision_id', $ids, 'IN')
+        ->execute()
+        ?->fetchCol() ?? []);
+    }
+    return [];
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/UrlAlias.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/UrlAlias.php
index d278eb45b..cf93e7c38 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/UrlAlias.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/UrlAlias.php
@@ -32,10 +32,59 @@ public function query() {
     $query->fields('ua', ['pid', 'source', 'alias']);
     $query->innerJoin($subquery, 'sq', 'ua.source  = %alias.source AND ua.pid <> %alias.pid');
     $query->orderBy('ua.pid', 'ASC');
+    $query->groupBy('ua.alias');
 
     return $query;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function doPreloadExisting(array $ids) {
+    if (!empty($ids)) {
+      return $this->getDatabaseConnection()
+        ->select('redirect', 'r')
+        ->fields('r', ['rid'])
+        ->condition('r.rid', $ids, 'IN')
+        ->execute()
+        ?->fetchCol() ?? [];
+    }
+    return [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getDestinationEntityIds() {
+    return $this->getDatabaseConnection()
+      ->select('redirect', 'r')
+      ->fields('r', ['rid'])
+      ->orderBy('r.rid', 'ASC')
+      ->execute()
+      ?->fetchAllKeyed(0, 0) ?? [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getDestinationEntityIdsToDelete(array $ids) {
+    if (!empty($ids)) {
+      return array_diff($ids, $this->select('url_alias', 'ua')
+        ->fields('ua', ['pid'])
+        ->condition('ua.pid', $ids, 'IN')
+        ->execute()
+        ?->fetchCol() ?? []);
+    }
+    return [];
+  }
+
+  /**
+   * Remove the entities from the D9 site that don't exist in the D7 site.
+   */
+  protected function removeDeletedEntities() {
+    // Skip because, we do a full re-import when running this migration.
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php
index f74cba80b..09fe84d3d 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php
@@ -73,6 +73,49 @@ public function query() {
     return $query->orderBy('u.uid', 'ASC');
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function doPreloadExisting(array $ids) {
+    if (!empty($ids)) {
+      return $this->getDatabaseConnection()
+        ->select('users', 'u')
+        ->fields('u', ['uid'])
+        ->condition('u.uid', $ids, 'IN')
+        ->execute()
+        ?->fetchCol() ?? [];
+    }
+    return [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getDestinationEntityIds() {
+    return $this->getDatabaseConnection()
+      ->select('users', 'u')
+      ->fields('u', ['uid'])
+      // Skip the anonymous, admin and system users.
+      ->condition('u.uid', 2, '>')
+      ->orderBy('u.uid', 'ASC')
+      ->execute()
+      ?->fetchAllKeyed(0, 0) ?? [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getDestinationEntityIdsToDelete(array $ids) {
+    if (!empty($ids)) {
+      return array_diff($ids, $this->select('users', 'u')
+        ->fields('u', ['uid'])
+        ->condition('u.uid', $ids, 'IN')
+        ->execute()
+        ?->fetchCol() ?? []);
+    }
+    return [];
+  }
+
   /**
    * {@inheritdoc}
    */

From c04eda598962e28b9ee9b0215c50ec15025ffdab Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 18 Jan 2022 04:22:27 +0000
Subject: [PATCH 368/720] [RW-296] Save updated migration config files

---
 config/migrate_plus.migration.reliefweb_book.yml          | 2 +-
 config/migrate_plus.migration.reliefweb_bookmarks.yml     | 8 ++++----
 config/migrate_plus.migration.reliefweb_image.yml         | 2 +-
 ...plus.migration.reliefweb_media__image_announcement.yml | 2 +-
 ...fweb_media__image_blog_post__field_attached_images.yml | 2 +-
 ...tion.reliefweb_media__image_blog_post__field_image.yml | 2 +-
 ...eliefweb_media__image_report__field_headline_image.yml | 2 +-
 ...gration.reliefweb_media__image_report__field_image.yml | 2 +-
 ...igrate_plus.migration.reliefweb_media__image_topic.yml | 2 +-
 ...migrate_plus.migration.reliefweb_menu_link__footer.yml | 2 +-
 .../migrate_plus.migration.reliefweb_menu_link__main.yml  | 2 +-
 ...igrate_plus.migration.reliefweb_node__announcement.yml | 2 +-
 .../migrate_plus.migration.reliefweb_node__blog_post.yml  | 2 +-
 config/migrate_plus.migration.reliefweb_node__book.yml    | 2 +-
 config/migrate_plus.migration.reliefweb_node__job.yml     | 2 +-
 config/migrate_plus.migration.reliefweb_node__report.yml  | 2 +-
 config/migrate_plus.migration.reliefweb_node__topic.yml   | 2 +-
 .../migrate_plus.migration.reliefweb_node__training.yml   | 2 +-
 ...us.migration.reliefweb_node_revision__announcement.yml | 2 +-
 ..._plus.migration.reliefweb_node_revision__blog_post.yml | 2 +-
 ...grate_plus.migration.reliefweb_node_revision__book.yml | 2 +-
 ...igrate_plus.migration.reliefweb_node_revision__job.yml | 2 +-
 ...ate_plus.migration.reliefweb_node_revision__report.yml | 5 +++--
 ...rate_plus.migration.reliefweb_node_revision__topic.yml | 2 +-
 ...e_plus.migration.reliefweb_node_revision__training.yml | 2 +-
 config/migrate_plus.migration.reliefweb_subscriptions.yml | 8 ++++----
 config/migrate_plus.migration.reliefweb_taxonomy_term.yml | 2 +-
 ...te_plus.migration.reliefweb_taxonomy_term__country.yml | 2 +-
 ...e_plus.migration.reliefweb_taxonomy_term__disaster.yml | 2 +-
 ...ate_plus.migration.reliefweb_taxonomy_term__source.yml | 2 +-
 ...te_plus.migration.reliefweb_taxonomy_term_revision.yml | 2 +-
 ...igration.reliefweb_taxonomy_term_revision__country.yml | 2 +-
 ...gration.reliefweb_taxonomy_term_revision__disaster.yml | 2 +-
 ...migration.reliefweb_taxonomy_term_revision__source.yml | 2 +-
 config/migrate_plus.migration.reliefweb_url_alias.yml     | 7 +++++--
 config/migrate_plus.migration.reliefweb_user.yml          | 8 ++++++--
 config/migrate_plus.migration.reliefweb_user__default.yml | 6 +++---
 config/migrate_plus.migration_group.reliefweb_base.yml    | 2 +-
 config/migrate_plus.migration_group.reliefweb_extra.yml   | 2 +-
 config/migrate_plus.migration_group.reliefweb_image.yml   | 2 +-
 config/migrate_plus.migration_group.reliefweb_media.yml   | 2 +-
 config/migrate_plus.migration_group.reliefweb_node.yml    | 2 +-
 ...grate_plus.migration_group.reliefweb_node_revision.yml | 2 +-
 config/migrate_plus.migration_group.reliefweb_term.yml    | 2 +-
 ...grate_plus.migration_group.reliefweb_term_revision.yml | 2 +-
 45 files changed, 64 insertions(+), 56 deletions(-)

diff --git a/config/migrate_plus.migration.reliefweb_book.yml b/config/migrate_plus.migration.reliefweb_book.yml
index 98d75e792..ed00bf7e8 100644
--- a/config/migrate_plus.migration.reliefweb_book.yml
+++ b/config/migrate_plus.migration.reliefweb_book.yml
@@ -1,4 +1,4 @@
-uuid: cc36c7c3-1517-4c17-a2c3-5d9725f75533
+uuid: a2cf5189-d165-4139-965d-974473e22d98
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_bookmarks.yml b/config/migrate_plus.migration.reliefweb_bookmarks.yml
index be48e76f3..0d1695d04 100644
--- a/config/migrate_plus.migration.reliefweb_bookmarks.yml
+++ b/config/migrate_plus.migration.reliefweb_bookmarks.yml
@@ -1,9 +1,9 @@
-uuid: e53c95ee-879e-422c-9c8f-b4619eb2e579
+uuid: 4bfeab78-c57a-479f-bd2f-388e7df606bb
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: nZevgegYdmXQrztFpHIgSg9dDILj1n-DuwhuotVxLOo
+  default_config_hash: m6p-WwqWv0PWN96g_PKm8jOAktBTE6vWutUGwmvkKyc
 id: reliefweb_bookmarks
 class: null
 field_plugin_method: null
@@ -12,7 +12,7 @@ migration_tags: null
 migration_group: reliefweb_extra
 label: 'Migrate ReliefWeb bookmarks.'
 source:
-  plugin: table
+  plugin: reliefweb_table
   table_name: reliefweb_bookmarks_favorites
   id_fields:
     entity_type:
@@ -27,7 +27,7 @@ process:
   entity_id: entity_id
   uid: uid
 destination:
-  plugin: table
+  plugin: reliefweb_table
   table_name: reliefweb_bookmarks
   id_fields:
     entity_type:
diff --git a/config/migrate_plus.migration.reliefweb_image.yml b/config/migrate_plus.migration.reliefweb_image.yml
index 49491e4dc..72e0bfb03 100644
--- a/config/migrate_plus.migration.reliefweb_image.yml
+++ b/config/migrate_plus.migration.reliefweb_image.yml
@@ -1,4 +1,4 @@
-uuid: f79acdb6-6866-4f98-9756-467bdb2182b7
+uuid: fe3a0f2e-b059-42eb-bbc0-f4cf694d15a4
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_media__image_announcement.yml b/config/migrate_plus.migration.reliefweb_media__image_announcement.yml
index bd416b837..556e4fac3 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_announcement.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_announcement.yml
@@ -1,4 +1,4 @@
-uuid: 0606ef3b-df0e-4c9a-8e8a-f6ed791923ac
+uuid: 1b6e1a4c-26bd-4627-8781-7ce88a2b95b8
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_attached_images.yml b/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_attached_images.yml
index 52312a2c8..dbf444044 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_attached_images.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_attached_images.yml
@@ -1,4 +1,4 @@
-uuid: da9257e1-367e-49e5-8a0d-28bbda5b2ce1
+uuid: 1279f2fb-eb7a-4db6-a587-561092e9b775
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_image.yml b/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_image.yml
index 91bab3ad6..c0e0bfc6a 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_image.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_image.yml
@@ -1,4 +1,4 @@
-uuid: c9c5fc9d-6778-4c91-852a-c352ff9f5ad3
+uuid: 5233e4de-5b62-4d43-851c-5e4f617e6758
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_media__image_report__field_headline_image.yml b/config/migrate_plus.migration.reliefweb_media__image_report__field_headline_image.yml
index bc8ba3789..883dc7f56 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_report__field_headline_image.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_report__field_headline_image.yml
@@ -1,4 +1,4 @@
-uuid: d4740786-483b-44bb-ac5f-963bb11b3ee4
+uuid: 7b7c27ab-2681-4100-a85e-9b4a9fb02827
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_media__image_report__field_image.yml b/config/migrate_plus.migration.reliefweb_media__image_report__field_image.yml
index 017eff35f..5648b4398 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_report__field_image.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_report__field_image.yml
@@ -1,4 +1,4 @@
-uuid: 4ca49517-0cf4-49a6-8ecb-d9b33ab65739
+uuid: fd0578db-cfd5-4190-abb2-8234a8a42186
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_media__image_topic.yml b/config/migrate_plus.migration.reliefweb_media__image_topic.yml
index f4a3c23d0..a499fdd7b 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_topic.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_topic.yml
@@ -1,4 +1,4 @@
-uuid: 7a795a20-ab61-488b-aa65-510cca58701b
+uuid: c8ba73c4-6865-4a17-aefc-fdb32d9282ae
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_menu_link__footer.yml b/config/migrate_plus.migration.reliefweb_menu_link__footer.yml
index 85121800f..f5cc9092f 100644
--- a/config/migrate_plus.migration.reliefweb_menu_link__footer.yml
+++ b/config/migrate_plus.migration.reliefweb_menu_link__footer.yml
@@ -1,4 +1,4 @@
-uuid: 85145fb4-0429-4290-974a-68e538d21c4d
+uuid: 24243ef1-e11a-411c-a2a7-c9384135d8cc
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_menu_link__main.yml b/config/migrate_plus.migration.reliefweb_menu_link__main.yml
index 784176191..7208f87d5 100644
--- a/config/migrate_plus.migration.reliefweb_menu_link__main.yml
+++ b/config/migrate_plus.migration.reliefweb_menu_link__main.yml
@@ -1,4 +1,4 @@
-uuid: df6e9233-a957-464e-b498-1f176c542881
+uuid: 0b69a6a8-79ce-4bd1-aa1d-6d66633b8bf1
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_node__announcement.yml b/config/migrate_plus.migration.reliefweb_node__announcement.yml
index 924599c27..7ba31b125 100644
--- a/config/migrate_plus.migration.reliefweb_node__announcement.yml
+++ b/config/migrate_plus.migration.reliefweb_node__announcement.yml
@@ -1,4 +1,4 @@
-uuid: cf6c6b25-d864-43aa-a77c-7c49e59270b6
+uuid: d0dff5cc-e5b9-43e3-b78f-1f7f23e1d4f4
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node__blog_post.yml b/config/migrate_plus.migration.reliefweb_node__blog_post.yml
index 2a5a30042..7791d805a 100644
--- a/config/migrate_plus.migration.reliefweb_node__blog_post.yml
+++ b/config/migrate_plus.migration.reliefweb_node__blog_post.yml
@@ -1,4 +1,4 @@
-uuid: 937f25a1-31ba-4616-814c-30b5f04110a0
+uuid: 509dba0d-dd79-45fb-8ab1-0cd91b06d112
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node__book.yml b/config/migrate_plus.migration.reliefweb_node__book.yml
index 5d927a967..f7dde28d7 100644
--- a/config/migrate_plus.migration.reliefweb_node__book.yml
+++ b/config/migrate_plus.migration.reliefweb_node__book.yml
@@ -1,4 +1,4 @@
-uuid: 7b7d17c3-3e2b-410b-bff2-9dca32b2b852
+uuid: 0fa9dcca-9385-438a-993c-39f3754057bc
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node__job.yml b/config/migrate_plus.migration.reliefweb_node__job.yml
index 3861ea88d..905f3c041 100644
--- a/config/migrate_plus.migration.reliefweb_node__job.yml
+++ b/config/migrate_plus.migration.reliefweb_node__job.yml
@@ -1,4 +1,4 @@
-uuid: 9afde1f4-9201-483c-b3f2-affe4ca33e19
+uuid: 097b9e33-a302-4131-914a-40779705799b
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node__report.yml b/config/migrate_plus.migration.reliefweb_node__report.yml
index bfe27d87f..31acf8490 100644
--- a/config/migrate_plus.migration.reliefweb_node__report.yml
+++ b/config/migrate_plus.migration.reliefweb_node__report.yml
@@ -1,4 +1,4 @@
-uuid: 859c5e3b-3fb4-46f4-84a7-6987ee35e724
+uuid: 63704fd9-e6c5-451d-973c-e2cc95b16fa0
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node__topic.yml b/config/migrate_plus.migration.reliefweb_node__topic.yml
index 04961d46e..e1086621f 100644
--- a/config/migrate_plus.migration.reliefweb_node__topic.yml
+++ b/config/migrate_plus.migration.reliefweb_node__topic.yml
@@ -1,4 +1,4 @@
-uuid: 05776e0d-cbd2-456a-8931-282eea382dac
+uuid: d8b5c6b0-37d9-4307-b5fd-e895a2460ad8
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node__training.yml b/config/migrate_plus.migration.reliefweb_node__training.yml
index 443b0489c..dea2d0f67 100644
--- a/config/migrate_plus.migration.reliefweb_node__training.yml
+++ b/config/migrate_plus.migration.reliefweb_node__training.yml
@@ -1,4 +1,4 @@
-uuid: 1c22d05e-93f8-404d-b5fe-f9a82131a410
+uuid: 50a1ef37-04a7-4ff2-9bbd-4a64fdb84cd3
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__announcement.yml b/config/migrate_plus.migration.reliefweb_node_revision__announcement.yml
index f2d778387..a3a6dbda9 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__announcement.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__announcement.yml
@@ -1,4 +1,4 @@
-uuid: 2a515f5d-afe8-490c-968b-1bceeaa4fa98
+uuid: c064a1f5-224e-4951-adfb-0eacc767b955
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__blog_post.yml b/config/migrate_plus.migration.reliefweb_node_revision__blog_post.yml
index bb3972a94..439fc0632 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__blog_post.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__blog_post.yml
@@ -1,4 +1,4 @@
-uuid: c08354b8-555e-4a4e-b616-3aeeeb2261d0
+uuid: d58bf523-8946-4c38-acb1-fa08fadc764c
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__book.yml b/config/migrate_plus.migration.reliefweb_node_revision__book.yml
index 8214819e5..d6f04509f 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__book.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__book.yml
@@ -1,4 +1,4 @@
-uuid: 5cfa6d89-4d5d-43bd-a0d8-fb2ca9abfc95
+uuid: 53969726-12fb-43f2-b9c9-439926a98f4a
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__job.yml b/config/migrate_plus.migration.reliefweb_node_revision__job.yml
index 9c5c76cee..d5ca91e5c 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__job.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__job.yml
@@ -1,4 +1,4 @@
-uuid: 14dea863-6183-450c-8f09-27937a0821a8
+uuid: d4027b2e-bdb4-4ef9-9435-e1df72f19703
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__report.yml b/config/migrate_plus.migration.reliefweb_node_revision__report.yml
index 25dbb08b7..41f47abd5 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__report.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__report.yml
@@ -1,9 +1,9 @@
-uuid: 8ee3eb82-99ca-4497-9cb3-df0f42950c93
+uuid: 67465dc7-629b-4b31-b310-4d38afe8e397
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: JsMSGIm78KUI-PJACDl-2zaDqZ00m-b3vYJb7CXt34U
+  default_config_hash: kRoIg6lXYMvd9WGRAY1xtIR2nrwkkqjIr9BsjMW6WXM
 id: reliefweb_node_revision__report
 class: null
 field_plugin_method: null
@@ -12,6 +12,7 @@ migration_tags: null
 migration_group: reliefweb_node_revision
 label: 'Migrate ReliefWeb report revisions.'
 source:
+  plugin: reliefweb_report_revision
   bundle: report
 process:
   field_bury/value:
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__topic.yml b/config/migrate_plus.migration.reliefweb_node_revision__topic.yml
index e79fca945..894bfbd81 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__topic.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__topic.yml
@@ -1,4 +1,4 @@
-uuid: 2c16b4f9-fa27-4612-8b50-fa3b6e214674
+uuid: 4aa3a8e5-3891-40f2-9f70-26179faf275a
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__training.yml b/config/migrate_plus.migration.reliefweb_node_revision__training.yml
index 1c326d593..197f97b85 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__training.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__training.yml
@@ -1,4 +1,4 @@
-uuid: 449a5ee8-8dab-4e67-8765-d18801f23fd1
+uuid: ddc534e4-9f4f-4647-8fdf-3ba021821d00
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_subscriptions.yml b/config/migrate_plus.migration.reliefweb_subscriptions.yml
index 8af32cf62..7dceb39ba 100644
--- a/config/migrate_plus.migration.reliefweb_subscriptions.yml
+++ b/config/migrate_plus.migration.reliefweb_subscriptions.yml
@@ -1,9 +1,9 @@
-uuid: 18024c82-18f1-4b83-a744-533298c40905
+uuid: 2e8b6c7f-2609-4bc8-b1e5-7b3329d05af5
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: 2LT8u5LEmF3VMoguNvTbJ_m9zokBpf-2oVXcNB_0qCs
+  default_config_hash: M5sG73MLs0vPeFKwmI6t9lDVg5F_rSeZLpa3h3h3v_s
 id: reliefweb_subscriptions
 class: null
 field_plugin_method: null
@@ -12,7 +12,7 @@ migration_tags: null
 migration_group: reliefweb_extra
 label: 'Migrate ReliefWeb Subscriptions.'
 source:
-  plugin: table
+  plugin: reliefweb_table
   table_name: reliefweb_subscriptions_subscriptions
   id_fields:
     sid:
@@ -24,7 +24,7 @@ process:
   sid: sid
   uid: uid
 destination:
-  plugin: table
+  plugin: reliefweb_table
   table_name: reliefweb_subscriptions_subscriptions
   id_fields:
     sid:
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term.yml
index 85c4fb215..e90ea4bb9 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term.yml
@@ -1,4 +1,4 @@
-uuid: 94998ae3-b66e-4060-aa9f-74ac323dffe6
+uuid: ffd31f51-9d96-4f37-a716-57f83c14a649
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term__country.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term__country.yml
index fa5774bac..0f08a03de 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term__country.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term__country.yml
@@ -1,4 +1,4 @@
-uuid: fde2f6ea-42c0-47dd-839c-8e5f2aa0759d
+uuid: a0071ecb-dbb5-4bf9-89f7-c5e0c36cc93e
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term__disaster.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term__disaster.yml
index 7231fad98..01d4695de 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term__disaster.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term__disaster.yml
@@ -1,4 +1,4 @@
-uuid: 933bec73-1b9b-4170-847e-7d4037602ba4
+uuid: 38ae6300-940c-4f96-85de-f68be2705e44
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term__source.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
index f3db38101..f54a88478 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
@@ -1,4 +1,4 @@
-uuid: 3846abcb-1a29-4f78-9b5c-b62dfc6caf7b
+uuid: e941f073-9036-4ba7-8253-89e28a8d3306
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision.yml
index 97947f5ee..9c958fa1a 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision.yml
@@ -1,4 +1,4 @@
-uuid: 3b2c15a8-abc5-4931-a87f-3e0cd3f6a5d6
+uuid: 1a83a7d0-1166-4c90-a5bc-f67ee29f923c
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__country.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__country.yml
index 7b10f8f04..d7d47b5e4 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__country.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__country.yml
@@ -1,4 +1,4 @@
-uuid: c1e3d618-c811-4948-9477-02e0a0ee6604
+uuid: f8f863bf-f287-4729-9063-dbe0430ac505
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__disaster.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__disaster.yml
index 036e89bf6..ef65ca35d 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__disaster.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__disaster.yml
@@ -1,4 +1,4 @@
-uuid: 2ce69121-d5d3-433b-964e-8950141e7be8
+uuid: b0923017-e48b-4829-9aa3-d1bf822374c0
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
index 7b3b9f21b..3c220547b 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
@@ -1,4 +1,4 @@
-uuid: b93a4bf5-51fc-4153-9908-3059502fdb51
+uuid: 54ed3f4c-9aef-4abf-bb47-70f0e5090224
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_url_alias.yml b/config/migrate_plus.migration.reliefweb_url_alias.yml
index 6c6747277..d45e7d83f 100644
--- a/config/migrate_plus.migration.reliefweb_url_alias.yml
+++ b/config/migrate_plus.migration.reliefweb_url_alias.yml
@@ -1,9 +1,9 @@
-uuid: 66722e83-e241-4c15-bb2c-014e3456580d
+uuid: 55d65fa9-909b-4c34-a307-05087549eb1b
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: yaEa6hREcnWMiVS9iBJig_q-1U8A1e86k9zqmUuhHpQ
+  default_config_hash: hqlEXveIRd7Ce5p3pbrAQjHGjn5Amgy8xMvbxdIfM3Y
 id: reliefweb_url_alias
 class: null
 field_plugin_method: null
@@ -26,6 +26,9 @@ process:
   status_code: constants/code
   redirect_source/path: alias
   redirect_redirect/uri: source
+  _is_migrating:
+    plugin: default_value
+    default_value: 1
 destination:
   plugin: 'reliefweb_entity:redirect'
 migration_dependencies: null
diff --git a/config/migrate_plus.migration.reliefweb_user.yml b/config/migrate_plus.migration.reliefweb_user.yml
index 6c0a1a9e5..9056181f8 100644
--- a/config/migrate_plus.migration.reliefweb_user.yml
+++ b/config/migrate_plus.migration.reliefweb_user.yml
@@ -1,9 +1,9 @@
-uuid: d2f38ad9-9090-4e3e-9c77-7aa7a649e8f2
+uuid: a4f93ba0-ae62-42ed-b436-0b430ef5609d
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: WpWV1_VgPthitZiI-lKB2ZcXSbkIgJZU8MvbVsSSvEw
+  default_config_hash: jESFPB_fwV5UixfvnPM5yIxRabKijJQFLu1l_716aRo
 id: reliefweb_user
 class: null
 field_plugin_method: null
@@ -14,6 +14,9 @@ label: 'Migrate ReliefWeb users.'
 source:
   plugin: reliefweb_user
   batch_size: 1000
+  high_water_property:
+    name: uid
+    alias: u
 process:
   uid: uid
   name: name
@@ -61,6 +64,7 @@ process:
     default_value: 1
 destination:
   plugin: 'reliefweb_entity:user'
+  delete_before_import: true
 migration_dependencies:
   required:
     - reliefweb_user__default
diff --git a/config/migrate_plus.migration.reliefweb_user__default.yml b/config/migrate_plus.migration.reliefweb_user__default.yml
index 63dac5220..73c2c86d5 100644
--- a/config/migrate_plus.migration.reliefweb_user__default.yml
+++ b/config/migrate_plus.migration.reliefweb_user__default.yml
@@ -1,9 +1,9 @@
-uuid: d0154e6a-eba8-47ca-aedc-28742f86e1db
+uuid: 30436a79-27d5-4d8c-bf2b-6f6f11742cab
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: GzwU2vMPN3ymyhwifiPNhnJAGCLyvssCnisf-3WtrIg
+  default_config_hash: q3ya8yi8jYW5n39sZe3hkP9Ydrr7gflI9WsD0TZpOeQ
 id: reliefweb_user__default
 class: null
 field_plugin_method: null
@@ -65,7 +65,7 @@ process:
     plugin: default_value
     default_value: 1
 destination:
-  plugin: 'entity:user'
+  plugin: 'reliefweb_entity:user'
 migration_dependencies:
   optional:
     - language
diff --git a/config/migrate_plus.migration_group.reliefweb_base.yml b/config/migrate_plus.migration_group.reliefweb_base.yml
index c03188d87..10cce8827 100644
--- a/config/migrate_plus.migration_group.reliefweb_base.yml
+++ b/config/migrate_plus.migration_group.reliefweb_base.yml
@@ -1,4 +1,4 @@
-uuid: bdab39d5-b403-44ed-a451-554be2f1ba33
+uuid: f2c70d6a-d56e-4ab2-96a0-25e7bff039d6
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration_group.reliefweb_extra.yml b/config/migrate_plus.migration_group.reliefweb_extra.yml
index 39c17f16c..8e3e69fdc 100644
--- a/config/migrate_plus.migration_group.reliefweb_extra.yml
+++ b/config/migrate_plus.migration_group.reliefweb_extra.yml
@@ -1,4 +1,4 @@
-uuid: bb0c9da0-8401-4ddb-8bfa-1cf30a6ab4a1
+uuid: f209c294-8bed-467e-b8c9-843bc0bb143f
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration_group.reliefweb_image.yml b/config/migrate_plus.migration_group.reliefweb_image.yml
index 37c741ce0..85eb86710 100644
--- a/config/migrate_plus.migration_group.reliefweb_image.yml
+++ b/config/migrate_plus.migration_group.reliefweb_image.yml
@@ -1,4 +1,4 @@
-uuid: b5edf931-2609-49da-8be6-d5ba8b81619e
+uuid: ae9ca388-b004-4f26-a334-187fce42f705
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration_group.reliefweb_media.yml b/config/migrate_plus.migration_group.reliefweb_media.yml
index 3518e447e..5dcf44abf 100644
--- a/config/migrate_plus.migration_group.reliefweb_media.yml
+++ b/config/migrate_plus.migration_group.reliefweb_media.yml
@@ -1,4 +1,4 @@
-uuid: cd32f0b9-dc11-4030-a286-2f02a2b2f0c5
+uuid: ff264b53-bd2d-462b-9b38-ec692b303c50
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration_group.reliefweb_node.yml b/config/migrate_plus.migration_group.reliefweb_node.yml
index 2aacc2c85..b83d05968 100644
--- a/config/migrate_plus.migration_group.reliefweb_node.yml
+++ b/config/migrate_plus.migration_group.reliefweb_node.yml
@@ -1,4 +1,4 @@
-uuid: c152fd81-e585-47e7-ad71-9859c9a547bf
+uuid: 8f854d39-623d-4410-9df6-29b1d8c9af7c
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration_group.reliefweb_node_revision.yml b/config/migrate_plus.migration_group.reliefweb_node_revision.yml
index e79bbb1b9..af8ac013f 100644
--- a/config/migrate_plus.migration_group.reliefweb_node_revision.yml
+++ b/config/migrate_plus.migration_group.reliefweb_node_revision.yml
@@ -1,4 +1,4 @@
-uuid: 42111702-3459-44d3-b916-fdcc8d2f5519
+uuid: 24779588-23ad-4531-bdb3-49ca71774a57
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration_group.reliefweb_term.yml b/config/migrate_plus.migration_group.reliefweb_term.yml
index 7611ef1a7..0e78add23 100644
--- a/config/migrate_plus.migration_group.reliefweb_term.yml
+++ b/config/migrate_plus.migration_group.reliefweb_term.yml
@@ -1,4 +1,4 @@
-uuid: 8abe2435-7024-4085-851d-53026abe567c
+uuid: a4eb8c3c-faa0-4887-9612-d9f43a91d49a
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration_group.reliefweb_term_revision.yml b/config/migrate_plus.migration_group.reliefweb_term_revision.yml
index bfa2040f4..e2ff9b8b3 100644
--- a/config/migrate_plus.migration_group.reliefweb_term_revision.yml
+++ b/config/migrate_plus.migration_group.reliefweb_term_revision.yml
@@ -1,4 +1,4 @@
-uuid: 66588acc-69ec-4629-a0f0-c28bec39896b
+uuid: 5a562e56-04f9-48f3-9f78-75fd43bbaf38
 langcode: en
 status: true
 dependencies:

From 3018f241c89057b3100910e4a24034117db1f189 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 18 Jan 2022 04:25:01 +0000
Subject: [PATCH 369/720] [RW-296] Hide status field on moderated entity forms
 and return default moderation status

---
 .../reliefweb_moderation/src/EntityModeratedTrait.php       | 2 +-
 .../reliefweb_moderation/src/ModerationServiceBase.php      | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_moderation/src/EntityModeratedTrait.php b/html/modules/custom/reliefweb_moderation/src/EntityModeratedTrait.php
index 21c6c7ccd..95cd22c40 100644
--- a/html/modules/custom/reliefweb_moderation/src/EntityModeratedTrait.php
+++ b/html/modules/custom/reliefweb_moderation/src/EntityModeratedTrait.php
@@ -43,7 +43,7 @@ public function setModerationStatus($status) {
    * @see \Drupal\reliefweb_moderation\EntityModeratedInterface::getModerationStatus()
    */
   public function getModerationStatus() {
-    return $this->moderation_status->value ?? '';
+    return $this->moderation_status->value ?? $this->getDefaultModerationStatus();
   }
 
   /**
diff --git a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
index cda0ae97c..dc7d08466 100644
--- a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
+++ b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
@@ -369,6 +369,12 @@ public function alterEntityForm(array &$form, FormStateInterface $form_state) {
     $entity = $form_state->getFormObject()->getEntity();
     $status = $entity->getModerationStatus();
 
+    // Hide the status field as it's controlled by the selection of a moderation
+    // status.
+    if (isset($form['status'])) {
+      $form['status']['#access'] = FALSE;
+    }
+
     // Disable the moderation status widget and the default submit buttons.
     $form['actions']['submit']['#access'] = FALSE;
 

From 904fdad0af8602db1952028b986fffc384eb71e9 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 18 Jan 2022 04:26:15 +0000
Subject: [PATCH 370/720] [RW-296] Add script to run all the content migrations
 in order

---
 scripts/migrate.sh | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100755 scripts/migrate.sh

diff --git a/scripts/migrate.sh b/scripts/migrate.sh
new file mode 100755
index 000000000..5e624c4e7
--- /dev/null
+++ b/scripts/migrate.sh
@@ -0,0 +1,29 @@
+#!/bin/sh -e
+
+docker exec -it -u appuser rwint9-site drush -v -d mim --group=reliefweb_base
+docker exec -it -u appuser rwint9-site drush -v -d mim --group=reliefweb_image
+docker exec -it -u appuser rwint9-site drush -v -d mim --group=reliefweb_media
+docker exec -it -u appuser rwint9-site drush -v -d mim --group=reliefweb_term
+
+docker exec -it -u appuser rwint9-site drush -v -d mim reliefweb_node__announcement
+docker exec -it -u appuser rwint9-site drush -v -d mim reliefweb_node__blog_post
+docker exec -it -u appuser rwint9-site drush -v -d mim reliefweb_node__book
+docker exec -it -u appuser rwint9-site drush -v -d mim reliefweb_node__topic
+docker exec -it -u appuser rwint9-site drush -v -d mim reliefweb_node__training
+docker exec -it -u appuser rwint9-site drush -v -d mim reliefweb_node__job
+docker exec -it -u appuser rwint9-site drush -v -d mim reliefweb_node__report
+
+docker exec -it -u appuser rwint9-site drush -v -d mim --group=reliefweb_extra
+
+docker exec -it -u appuser rwint9-site drush -v -d mim reliefweb_node_revision__announcement
+docker exec -it -u appuser rwint9-site drush -v -d mim reliefweb_node_revision__blog_post
+docker exec -it -u appuser rwint9-site drush -v -d mim reliefweb_node_revision__book
+docker exec -it -u appuser rwint9-site drush -v -d mim reliefweb_node_revision__topic
+docker exec -it -u appuser rwint9-site drush -v -d mim reliefweb_node_revision__training
+docker exec -it -u appuser rwint9-site drush -v -d mim reliefweb_node_revision__job
+docker exec -it -u appuser rwint9-site drush -v -d mim reliefweb_node_revision__report
+
+docker exec -it -u appuser rwint9-site drush -v -d mim reliefweb_taxonomy_term_revision
+docker exec -it -u appuser rwint9-site drush -v -d mim reliefweb_taxonomy_term_revision__country
+docker exec -it -u appuser rwint9-site drush -v -d mim reliefweb_taxonomy_term_revision__disaster
+docker exec -it -u appuser rwint9-site drush -v -d mim reliefweb_taxonomy_term_revision__source

From ad7343ed0825862e7dd7b967e11f2cdc5f0a532a Mon Sep 17 00:00:00 2001
From: Peter Lieverdink <lieverdink@reliefweb.int>
Date: Tue, 18 Jan 2022 16:51:07 +1100
Subject: [PATCH 371/720] [OPS-8023] Ensure we load the correct blocklist.conf
 file, as the other one no longer exists.

---
 docker/etc/nginx/nginx.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/etc/nginx/nginx.conf b/docker/etc/nginx/nginx.conf
index fb86919c4..c4b709397 100644
--- a/docker/etc/nginx/nginx.conf
+++ b/docker/etc/nginx/nginx.conf
@@ -142,8 +142,8 @@ http {
   ## Include the map to block HTTP methods.
   include /etc/nginx/map_block_http_methods.conf;
 
-  ## Include blacklist for bad bot and referer blocking.
-  include /etc/nginx/blacklist.conf;
+  ## Include blocklist for bad bot and referer blocking.
+  include /etc/nginx/blocklist.conf;
 
   ## Rate limiting. Limits are per remote IP address per backend.
   include /etc/nginx/ratelimit.conf;

From 9077a826eb969be7a3434d9cee7393dc76df8d8f Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 18 Jan 2022 11:28:27 -0700
Subject: [PATCH 372/720] RW-314 rule to override external link icon in pseudo
 element on map icon

---
 .../components/rw-disaster-map/rw-disaster-map.css            | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-disaster-map/rw-disaster-map.css b/html/themes/custom/common_design_subtheme/components/rw-disaster-map/rw-disaster-map.css
index 44332c976..d995e00f1 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-disaster-map/rw-disaster-map.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-disaster-map/rw-disaster-map.css
@@ -336,6 +336,10 @@
   background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 21 21'%3E%3Cpath d='M10.5 1.25c-5.11 0-9.25 4.15-9.25 9.25s4.15 9.25 9.25 9.25 9.25-4.15 9.25-9.25c0-5.11-4.14-9.25-9.25-9.25zm4.39 11.53c-1.93 1.93-4.78 2.31-6.7 2.31-.7 0-1.41-.05-2.1-.16 0 0-1.02-5.64 2.14-8.81a4.4 4.4 0 013.13-1.28c1.27 0 2.49.51 3.39 1.42 1.84 1.84 1.89 4.75.14 6.52z' opacity='.9' fill='%23fff'/%3E%3Cpath d='M10.5 0C4.7 0 0 4.71 0 10.5S4.7 21 10.5 21 21 16.3 21 10.5C20.99 4.71 16.3 0 10.5 0zm0 19.75c-5.11 0-9.25-4.15-9.25-9.25s4.14-9.26 9.25-9.26 9.25 4.15 9.25 9.25c0 5.13-4.14 9.26-9.25 9.26z' opacity='.35'/%3E%3Cpath d='M14.74 6.26c-1.84-1.84-4.76-1.9-6.51-.15-3.16 3.17-2.14 8.81-2.14 8.81s5.64 1.02 8.81-2.14c1.74-1.77 1.69-4.68-.16-6.52zm-2.27 4.09l-.91 1.87-.9-1.87-1.86-.91 1.86-.9.9-1.87.91 1.87 1.86.9z' opacity='.35'/%3E%3Cpath opacity='.9' fill='%23fff' d='M11.56 12.22l-.9-1.87-1.86-.91 1.86-.9.9-1.87.91 1.87 1.86.9-1.86.91z'/%3E%3C/svg%3E");
   background-repeat: no-repeat;
 }
+/* Override external link icon */
+.js .rw-disaster-map[data-map-enabled] a.mapboxgl-ctrl-logo::after {
+  content: none;
+}
 
 /**
  * Button to close the disaster description popup.

From e6051d3ba3dc706ad5a8025487aad4762ae42834 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 18 Jan 2022 11:41:42 -0700
Subject: [PATCH 373/720] RW-315 use rgb css custom property for active menu
 background on mobile menu items, so rgba applies

---
 html/themes/custom/common_design_subtheme/css/styles.css    | 2 +-
 .../common_design_subtheme/sass/cd/cd-header/_cd-nav.scss   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/css/styles.css b/html/themes/custom/common_design_subtheme/css/styles.css
index e195b652a..f41053d74 100644
--- a/html/themes/custom/common_design_subtheme/css/styles.css
+++ b/html/themes/custom/common_design_subtheme/css/styles.css
@@ -1 +1 @@
-@import"https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400%3B500%3B700&display=swap";@import"https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,300%3B0,400%3B0,500%3B0,700%3B0,900%3B1,400%3B1,700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400%3B700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@400%3B700&display=swap";:root{--cd-reliefweb-brand-blue: #0988bb;--cd-reliefweb-brand-red: #f65c51;--cd-reliefweb-brand-blue--dark: #055372;--cd-reliefweb-brand-red--dark: #eb1405;--cd-reliefweb-brand-grey--dark: #2e3436;--cd-reliefweb-brand-grey--mid: #4d5254;--cd-reliefweb-brand-grey--light: #e6ecef;--cd-rgb-reliefweb-brand-blue: 9, 136, 187;--cd-rgb-reliefweb-brand-red: 246, 92, 81;--cd-rgb-reliefweb-brand-blue--dark: 4, 82, 112;--cd-rgb-reliefweb-brand-red--dark: 235, 20, 5;--cd-rgb-reliefweb-brand-grey--dark: 46, 52, 54;--cd-rgb-reliefweb-brand-grey--light: 230, 236, 239;--cd-reliefweb-grey--light: #d9d9d9;--cd-reliefweb-grey--light--bg: rgba(217, 217, 217, 0.2);--cd-reliefweb-orange: #f49e2c;--cd-reliefweb-orange--bg: rgba(244, 158, 44, 0.2);--cd-reliefweb-blue: #076d96;--cd-reliefweb-blue--bg: rgba(7, 109, 150, 0.2);--cd-reliefweb-green: #88bb09;--cd-reliefweb-green--bg: rgba(136, 187, 9, 0.2);--cd-reliefweb-red: #da190b;--cd-reliefweb-red--bg: rgba(218, 25, 11, 0.2);--cd-reliefweb-purple: #9509bb;--cd-reliefweb-purple--bg: rgba(149, 9, 187, 0.2);--cd-reliefweb-grey: #4b4b4b;--cd-reliefweb-grey--bg: rgba(75, 75, 75, 0.2);--cd-reliefweb-brown: #8f5507;--cd-reliefweb-brown--bg: rgba(143, 85, 7, 0.2);--cd-reliefweb-yellow: #f5cb2f;--cd-reliefweb-yellow--bg: rgba(245, 203, 47, 0.2);--cd-reliefweb-cyan: #56c9f7;--cd-reliefweb-cyan--bg: rgba(86, 201, 247, 0.2);--cd-reliefweb-orange--alert: #eb8705;--cd-reliefweb-pink: rgba(246, 92, 81, 0.2);--cd-reliefweb-grey--disable: rgba(230, 236, 239, 0.5);--cd-ocha-blue: #1f69b3;--cd-blue--dark: #144372;--cd-blue--bright: #82b5e9;--cd-blue--light: #d4e5f7;--cd-highlight-red: #e56a54;--cd-contrast-red: #e00000;--cd-white: #fff;--cd-grey--light: #f2f2f2;--cd-grey--mid: #595959;--cd-grey--dark: #4a4a4a;--cd-default-text-color: var(--cd-grey--dark);--cd-black: #000;--cd-blue-grey: #e6ecf1;--cd-blue-grey--dark: #d3dde5;--cd-blue-grey--light: #ebf0f4;--cd-rgb-ocha-blue: 2, 108, 182;--cd-rgb-grey--mid: 89, 89, 89;--cd-rgb-grey--dark: 74, 74, 74;--cd-rgb-highlight-red: 229, 106, 84;--cd-rgb-blue-grey--dark: 211, 221, 229;--cd-max-content-width: 820px;--cd-max-body-width: 1400px;--cd-max-width: 1220px;--cd-container-padding: 0.75rem;--cd-container-padding-tablet: 1.5rem;--cd-container-padding-xlarge: 2.5rem;--cd-flow-space: 1rem;--cd-bumper-space: 1rem;--cd-footer-row-number: 5;--cd-red: #cd3a1f;--cd-red--light: #f8d8d3;--cd-orange: #db7b18;--cd-orange--light: #fae6d1;--cd-yellow: #d5de26;--cd-yellow--light: #f7f8d3;--cd-green: #7fb92f;--cd-green--light: #e8f5d6;--cd-font-size--tiny: 0.75rem;--cd-font-size--small: 0.875rem;--cd-font-size--base: 1.125rem;--cd-font-size--medium: 1.375rem;--cd-font-size--large: 1.625rem;--cd-font-size--2xbase: 1.875rem;--cd-font-size--2xmedium: 2.375rem;--cd-font-size--2xlarge: 2.875rem;--cd-font: helvetica, arial, sans-serif;--cd-font--system: system-ui;--cd-font--noto: "Noto Sans", sans-serif;--cd-font--noto-kufi: "Noto Kufi Arabic", sans-serif;--cd-font--roboto: "Roboto", helvetica, arial, sans-serif;--cd-font--roboto-condensed: "Roboto Condensed", helvetica, arial, sans-serif;--cd-font--roboto-slab: "Roboto Slab", helvetica, arial, sans-serif}@supports(display: grid){@media(min-width: 768px){.cd-layout-container{grid-template-rows:151px auto 1fr auto}}}@media(min-width: 768px){.cd-layout-container .cd-layout-content-wrapper{display:flex;flex-wrap:wrap}}@media(min-width: 768px){.cd-layout-content{flex-basis:0;flex-grow:999}}.cd-global-header__dropdown{background:var(--cd-reliefweb-brand-blue--dark)}.cd-global-header button[aria-expanded=true]::before{border-color:transparent transparent var(--cd-reliefweb-brand-blue--dark)}@media(max-width: 767px){.cd-global-header button[aria-expanded] span[class*=__btn-label]{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}.cd-header button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header{background:var(--cd-reliefweb-brand-blue--dark);background-image:linear-gradient(-180deg, var(--cd-reliefweb-brand-blue--dark) 67%, #04415a 97%)}@supports(display: grid){.cd-site-header__inner{grid-template-columns:52px 1fr}@media(min-width: 768px){.cd-site-header__inner{grid-template-columns:186px 1fr}}}.cd-language-switcher__btn:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-user-menu__dropdown li a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-site-logo{width:52px}.cd-site-logo:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}@media(max-width: 767px){.cd-site-logo{background:url("../img/logos/rw-logo-mobile.svg") center no-repeat;background:linear-gradient(transparent, transparent),url("../img/logos/rw-logo-mobile.svg") center no-repeat}}@media(min-width: 768px){.cd-site-logo{width:140px}}.menu--main button[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red--dark)}.cd-nav__btn[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red--dark)}.cd-nav__btn[aria-expanded=true]::before{background:var(--cd-reliefweb-brand-red--dark)}@media(max-width: 1023px){.cd-site-header__nav-holder .cd-nav>ul>li>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>button.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>button.is-active::before{background:rgba(var(--cd-reliefweb-brand-red--dark), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-brand-red--dark), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-reliefweb-brand-red--dark), 0.6)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}}@media(min-width: 1024px){.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail button::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a:focus::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button:focus::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul a.is-active,.cd-site-header__nav-holder .cd-nav>.menu>li>ul button.is-active{border-left:3px solid var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul>li.menu-item--active-trail .is-active{border-left:3px solid var(--cd-reliefweb-brand-red--dark)}}.cd-ocha-dropdown__link a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-search__btn{color:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn svg{fill:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn:hover,.cd-search__btn:focus{color:#04415a}.cd-search__btn:hover svg,.cd-search__btn:focus svg{fill:#04415a}.cd-search__btn:focus{color:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn:focus svg{fill:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn[aria-expanded=true]{color:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn[aria-expanded=true] svg{fill:var(--cd-reliefweb-brand-red--dark)}.cd-search__submit:focus{background-color:var(--cd-reliefweb-brand-red--dark)}.cd-user-menu--no-language-switcher li:last-child a,.cd-user-menu--no-language-switcher li:last-child button{padding-right:0}.cd-user-menu--no-language-switcher li:last-child a::after,.cd-user-menu--no-language-switcher li:last-child button::after{content:none}.cd-user-menu__item:focus,.cd-global-header .menu>li a:focus,.cd-global-header .menu>li button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button{padding-right:0}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a::after,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button::after{content:none}@media(max-width: 767px){.cd-global-header__user-menu a svg+span{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}[dir=ltr] .admin-menu__btn svg+span{margin-left:10px}[dir=rtl] .admin-menu__btn svg+span{margin-right:10px}.admin-menu__btn .cd-icon:not(.cd-icon--arrow-down){display:inline-block;width:14px;height:14px;vertical-align:middle;fill:var(--cd-white)}.cd-footer{background:var(--cd-reliefweb-brand-blue--dark)}.cd-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-footer-copyright{display:block;margin-top:0;text-align:right;color:#fff;font-size:12px;font-weight:lighter}.cd-footer-copyright p{margin:0}.cd-footer-copyright a{display:inline-block;overflow:hidden;width:140px;height:60px;margin:0 0 -4px 0;padding:0 0 0 140px;background:url(../img/logos/rw-logo-sprite.png) 0 -60px no-repeat;background:rgba(0,0,0,0) url(../img/logos/rw-logo-sprite.svg) 0 -60px no-repeat}.cd-footer-copyright a:hover,.cd-footer-copyright a:active,.cd-footer-copyright a:focus{opacity:.8}@media all and (max-width: 1023px){.cd-footer-copyright{width:100%;text-align:center}}.cd-soft-footer{background:rgba(var(--cd-rgb-ocha-blue), 0.9)}.cd-soft-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}a{color:var(--cd-reliefweb-brand-blue--dark)}a:hover,a:focus{color:var(--cd-reliefweb-brand-blue--dark)}h1,h2{margin:0 0 24px 0;letter-spacing:.5px;font-size:24px;font-weight:bold;line-height:1.3}@media screen and (min-width: 480px){h1,h2{font-size:var(--cd-font-size--2xbase)}}h3{margin:0 0 16px 0;letter-spacing:.5px;font-size:20px;font-weight:bold;line-height:1.3}h4{margin:0 0 16px 0;letter-spacing:.5px;font-size:18px;font-weight:bold;line-height:1.3}h5{margin:0 0 16px 0;letter-spacing:.5px;font-size:17px;font-weight:bold;font-style:italic}h6{margin:0 0 16px 0;letter-spacing:.5px;font-size:16px;font-weight:bold}.rw-article__content *+h3,.rw-article__content *+h4,.rw-article__content *+h5,.rw-article__content *+h6{margin-top:16px}@media all and (max-width: 479px){#main h2{font-size:24px}}p{margin:1rem 0;line-height:1.6}p:first-child{margin-top:0}p:last-child{margin-bottom:0}input[type=search]{-moz-appearance:none;-webkit-appearance:none;appearance:none}input::-webkit-search-decoration{-webkit-appearance:none}input:-ms-input-placeholder{opacity:.7;color:inherit;font-style:italic}input::-moz-placeholder{opacity:.7;color:inherit;font-style:italic}input::placeholder{opacity:.7;color:inherit;font-style:italic}select{max-width:100%}select:not([multitple]){-moz-appearance:menulist-button;-webkit-appearance:menulist-button}fieldset{min-inline-size:auto}table{width:100%;border-collapse:collapse}table caption{margin:12px 0;font-weight:bold}table th,table td{padding:8px;border:1px solid var(--cd-reliefweb-brand-grey--light)}table th{border-left-color:#fff;background:var(--cd-reliefweb-brand-grey--light)}table thead th{border-left-color:#fff}th.field-label>h4.label{margin:0}table thead th:first-child{border-left-color:var(--cd-reliefweb-brand-grey--light)}table tbody th{border-top-color:#fff}table tbody th:first-child{border-top-color:var(--cd-reliefweb-brand-grey--light)}code{padding:2px;background:var(--cd-reliefweb-brand-grey--light);font-family:monospace}
+@import"https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400%3B500%3B700&display=swap";@import"https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,300%3B0,400%3B0,500%3B0,700%3B0,900%3B1,400%3B1,700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400%3B700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@400%3B700&display=swap";:root{--cd-reliefweb-brand-blue: #0988bb;--cd-reliefweb-brand-red: #f65c51;--cd-reliefweb-brand-blue--dark: #055372;--cd-reliefweb-brand-red--dark: #eb1405;--cd-reliefweb-brand-grey--dark: #2e3436;--cd-reliefweb-brand-grey--mid: #4d5254;--cd-reliefweb-brand-grey--light: #e6ecef;--cd-rgb-reliefweb-brand-blue: 9, 136, 187;--cd-rgb-reliefweb-brand-red: 246, 92, 81;--cd-rgb-reliefweb-brand-blue--dark: 4, 82, 112;--cd-rgb-reliefweb-brand-red--dark: 235, 20, 5;--cd-rgb-reliefweb-brand-grey--dark: 46, 52, 54;--cd-rgb-reliefweb-brand-grey--light: 230, 236, 239;--cd-reliefweb-grey--light: #d9d9d9;--cd-reliefweb-grey--light--bg: rgba(217, 217, 217, 0.2);--cd-reliefweb-orange: #f49e2c;--cd-reliefweb-orange--bg: rgba(244, 158, 44, 0.2);--cd-reliefweb-blue: #076d96;--cd-reliefweb-blue--bg: rgba(7, 109, 150, 0.2);--cd-reliefweb-green: #88bb09;--cd-reliefweb-green--bg: rgba(136, 187, 9, 0.2);--cd-reliefweb-red: #da190b;--cd-reliefweb-red--bg: rgba(218, 25, 11, 0.2);--cd-reliefweb-purple: #9509bb;--cd-reliefweb-purple--bg: rgba(149, 9, 187, 0.2);--cd-reliefweb-grey: #4b4b4b;--cd-reliefweb-grey--bg: rgba(75, 75, 75, 0.2);--cd-reliefweb-brown: #8f5507;--cd-reliefweb-brown--bg: rgba(143, 85, 7, 0.2);--cd-reliefweb-yellow: #f5cb2f;--cd-reliefweb-yellow--bg: rgba(245, 203, 47, 0.2);--cd-reliefweb-cyan: #56c9f7;--cd-reliefweb-cyan--bg: rgba(86, 201, 247, 0.2);--cd-reliefweb-orange--alert: #eb8705;--cd-reliefweb-pink: rgba(246, 92, 81, 0.2);--cd-reliefweb-grey--disable: rgba(230, 236, 239, 0.5);--cd-ocha-blue: #1f69b3;--cd-blue--dark: #144372;--cd-blue--bright: #82b5e9;--cd-blue--light: #d4e5f7;--cd-highlight-red: #e56a54;--cd-contrast-red: #e00000;--cd-white: #fff;--cd-grey--light: #f2f2f2;--cd-grey--mid: #595959;--cd-grey--dark: #4a4a4a;--cd-default-text-color: var(--cd-grey--dark);--cd-black: #000;--cd-blue-grey: #e6ecf1;--cd-blue-grey--dark: #d3dde5;--cd-blue-grey--light: #ebf0f4;--cd-rgb-ocha-blue: 2, 108, 182;--cd-rgb-grey--mid: 89, 89, 89;--cd-rgb-grey--dark: 74, 74, 74;--cd-rgb-highlight-red: 229, 106, 84;--cd-rgb-blue-grey--dark: 211, 221, 229;--cd-max-content-width: 820px;--cd-max-body-width: 1400px;--cd-max-width: 1220px;--cd-container-padding: 0.75rem;--cd-container-padding-tablet: 1.5rem;--cd-container-padding-xlarge: 2.5rem;--cd-flow-space: 1rem;--cd-bumper-space: 1rem;--cd-footer-row-number: 5;--cd-red: #cd3a1f;--cd-red--light: #f8d8d3;--cd-orange: #db7b18;--cd-orange--light: #fae6d1;--cd-yellow: #d5de26;--cd-yellow--light: #f7f8d3;--cd-green: #7fb92f;--cd-green--light: #e8f5d6;--cd-font-size--tiny: 0.75rem;--cd-font-size--small: 0.875rem;--cd-font-size--base: 1.125rem;--cd-font-size--medium: 1.375rem;--cd-font-size--large: 1.625rem;--cd-font-size--2xbase: 1.875rem;--cd-font-size--2xmedium: 2.375rem;--cd-font-size--2xlarge: 2.875rem;--cd-font: helvetica, arial, sans-serif;--cd-font--system: system-ui;--cd-font--noto: "Noto Sans", sans-serif;--cd-font--noto-kufi: "Noto Kufi Arabic", sans-serif;--cd-font--roboto: "Roboto", helvetica, arial, sans-serif;--cd-font--roboto-condensed: "Roboto Condensed", helvetica, arial, sans-serif;--cd-font--roboto-slab: "Roboto Slab", helvetica, arial, sans-serif}@supports(display: grid){@media(min-width: 768px){.cd-layout-container{grid-template-rows:151px auto 1fr auto}}}@media(min-width: 768px){.cd-layout-container .cd-layout-content-wrapper{display:flex;flex-wrap:wrap}}@media(min-width: 768px){.cd-layout-content{flex-basis:0;flex-grow:999}}.cd-global-header__dropdown{background:var(--cd-reliefweb-brand-blue--dark)}.cd-global-header button[aria-expanded=true]::before{border-color:transparent transparent var(--cd-reliefweb-brand-blue--dark)}@media(max-width: 767px){.cd-global-header button[aria-expanded] span[class*=__btn-label]{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}.cd-header button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header{background:var(--cd-reliefweb-brand-blue--dark);background-image:linear-gradient(-180deg, var(--cd-reliefweb-brand-blue--dark) 67%, #04415a 97%)}@supports(display: grid){.cd-site-header__inner{grid-template-columns:52px 1fr}@media(min-width: 768px){.cd-site-header__inner{grid-template-columns:186px 1fr}}}.cd-language-switcher__btn:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-user-menu__dropdown li a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-site-logo{width:52px}.cd-site-logo:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}@media(max-width: 767px){.cd-site-logo{background:url("../img/logos/rw-logo-mobile.svg") center no-repeat;background:linear-gradient(transparent, transparent),url("../img/logos/rw-logo-mobile.svg") center no-repeat}}@media(min-width: 768px){.cd-site-logo{width:140px}}.menu--main button[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red--dark)}.cd-nav__btn[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red--dark)}.cd-nav__btn[aria-expanded=true]::before{background:var(--cd-reliefweb-brand-red--dark)}@media(max-width: 1023px){.cd-site-header__nav-holder .cd-nav>ul>li>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>button.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>button.is-active::before{background:rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.6)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}}@media(min-width: 1024px){.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail button::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a:focus::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button:focus::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul a.is-active,.cd-site-header__nav-holder .cd-nav>.menu>li>ul button.is-active{border-left:3px solid var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul>li.menu-item--active-trail .is-active{border-left:3px solid var(--cd-reliefweb-brand-red--dark)}}.cd-ocha-dropdown__link a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-search__btn{color:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn svg{fill:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn:hover,.cd-search__btn:focus{color:#04415a}.cd-search__btn:hover svg,.cd-search__btn:focus svg{fill:#04415a}.cd-search__btn:focus{color:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn:focus svg{fill:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn[aria-expanded=true]{color:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn[aria-expanded=true] svg{fill:var(--cd-reliefweb-brand-red--dark)}.cd-search__submit:focus{background-color:var(--cd-reliefweb-brand-red--dark)}.cd-user-menu--no-language-switcher li:last-child a,.cd-user-menu--no-language-switcher li:last-child button{padding-right:0}.cd-user-menu--no-language-switcher li:last-child a::after,.cd-user-menu--no-language-switcher li:last-child button::after{content:none}.cd-user-menu__item:focus,.cd-global-header .menu>li a:focus,.cd-global-header .menu>li button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button{padding-right:0}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a::after,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button::after{content:none}@media(max-width: 767px){.cd-global-header__user-menu a svg+span{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}[dir=ltr] .admin-menu__btn svg+span{margin-left:10px}[dir=rtl] .admin-menu__btn svg+span{margin-right:10px}.admin-menu__btn .cd-icon:not(.cd-icon--arrow-down){display:inline-block;width:14px;height:14px;vertical-align:middle;fill:var(--cd-white)}.cd-footer{background:var(--cd-reliefweb-brand-blue--dark)}.cd-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-footer-copyright{display:block;margin-top:0;text-align:right;color:#fff;font-size:12px;font-weight:lighter}.cd-footer-copyright p{margin:0}.cd-footer-copyright a{display:inline-block;overflow:hidden;width:140px;height:60px;margin:0 0 -4px 0;padding:0 0 0 140px;background:url(../img/logos/rw-logo-sprite.png) 0 -60px no-repeat;background:rgba(0,0,0,0) url(../img/logos/rw-logo-sprite.svg) 0 -60px no-repeat}.cd-footer-copyright a:hover,.cd-footer-copyright a:active,.cd-footer-copyright a:focus{opacity:.8}@media all and (max-width: 1023px){.cd-footer-copyright{width:100%;text-align:center}}.cd-soft-footer{background:rgba(var(--cd-rgb-ocha-blue), 0.9)}.cd-soft-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}a{color:var(--cd-reliefweb-brand-blue--dark)}a:hover,a:focus{color:var(--cd-reliefweb-brand-blue--dark)}h1,h2{margin:0 0 24px 0;letter-spacing:.5px;font-size:24px;font-weight:bold;line-height:1.3}@media screen and (min-width: 480px){h1,h2{font-size:var(--cd-font-size--2xbase)}}h3{margin:0 0 16px 0;letter-spacing:.5px;font-size:20px;font-weight:bold;line-height:1.3}h4{margin:0 0 16px 0;letter-spacing:.5px;font-size:18px;font-weight:bold;line-height:1.3}h5{margin:0 0 16px 0;letter-spacing:.5px;font-size:17px;font-weight:bold;font-style:italic}h6{margin:0 0 16px 0;letter-spacing:.5px;font-size:16px;font-weight:bold}.rw-article__content *+h3,.rw-article__content *+h4,.rw-article__content *+h5,.rw-article__content *+h6{margin-top:16px}@media all and (max-width: 479px){#main h2{font-size:24px}}p{margin:1rem 0;line-height:1.6}p:first-child{margin-top:0}p:last-child{margin-bottom:0}input[type=search]{-moz-appearance:none;-webkit-appearance:none;appearance:none}input::-webkit-search-decoration{-webkit-appearance:none}input:-ms-input-placeholder{opacity:.7;color:inherit;font-style:italic}input::-moz-placeholder{opacity:.7;color:inherit;font-style:italic}input::placeholder{opacity:.7;color:inherit;font-style:italic}select{max-width:100%}select:not([multitple]){-moz-appearance:menulist-button;-webkit-appearance:menulist-button}fieldset{min-inline-size:auto}table{width:100%;border-collapse:collapse}table caption{margin:12px 0;font-weight:bold}table th,table td{padding:8px;border:1px solid var(--cd-reliefweb-brand-grey--light)}table th{border-left-color:#fff;background:var(--cd-reliefweb-brand-grey--light)}table thead th{border-left-color:#fff}th.field-label>h4.label{margin:0}table thead th:first-child{border-left-color:var(--cd-reliefweb-brand-grey--light)}table tbody th{border-top-color:#fff}table tbody th:first-child{border-top-color:var(--cd-reliefweb-brand-grey--light)}code{padding:2px;background:var(--cd-reliefweb-brand-grey--light);font-family:monospace}
diff --git a/html/themes/custom/common_design_subtheme/sass/cd/cd-header/_cd-nav.scss b/html/themes/custom/common_design_subtheme/sass/cd/cd-header/_cd-nav.scss
index 1764b0cb8..085c13c9d 100644
--- a/html/themes/custom/common_design_subtheme/sass/cd/cd-header/_cd-nav.scss
+++ b/html/themes/custom/common_design_subtheme/sass/cd/cd-header/_cd-nav.scss
@@ -28,7 +28,7 @@
       &.menu-item--expanded {
         > a.is-active::before,
         > button.is-active::before {
-          background: rgba($implementation-highlight, 0.2);
+          background: rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.2);
         }
       }
 
@@ -36,7 +36,7 @@
         a,
         button {
           &::before {
-            background: rgba($implementation-highlight, 0.2);
+            background: rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.2);
           }
 
           &.is-active::before {
@@ -48,7 +48,7 @@
       > ul > li.menu-item--active-trail {
         a::before,
         button::before {
-          background: rgba($implementation-highlight, 0.6);
+          background: rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.6);
         }
 
         a.is-active::before,

From 558b5f135268ce8fa7f57b50f757d3026fa0c886 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 19 Jan 2022 10:38:03 +0000
Subject: [PATCH 374/720] [RW-251] Add code to index entities in the ReliefWeb
 API.

---
 .../config/install/reliefweb_api.settings.yml |   4 +-
 .../config/schema/reliefweb_api.schema.yml    |   5 +-
 .../custom/reliefweb_api/drush.services.yml   |   6 +
 .../reliefweb_api/reliefweb_api.api.php       |  23 ++
 .../custom/reliefweb_api/reliefweb_api.module | 186 ++++++++++++
 .../src/Commands/ReliefWebApiCommands.php     | 276 ++++++++++++++++++
 6 files changed, 498 insertions(+), 2 deletions(-)
 create mode 100644 html/modules/custom/reliefweb_api/drush.services.yml
 create mode 100644 html/modules/custom/reliefweb_api/reliefweb_api.api.php
 create mode 100644 html/modules/custom/reliefweb_api/reliefweb_api.module
 create mode 100644 html/modules/custom/reliefweb_api/src/Commands/ReliefWebApiCommands.php

diff --git a/html/modules/custom/reliefweb_api/config/install/reliefweb_api.settings.yml b/html/modules/custom/reliefweb_api/config/install/reliefweb_api.settings.yml
index d5f6c0174..c1e7e7ec9 100644
--- a/html/modules/custom/reliefweb_api/config/install/reliefweb_api.settings.yml
+++ b/html/modules/custom/reliefweb_api/config/install/reliefweb_api.settings.yml
@@ -8,5 +8,7 @@ appname: reliefweb.int
 cache_enabled: true
 # Verify the SSL certificate of the API query performing requests.
 verify_ssl: true
-# URL of the elaticsearch instance for indexing.
+# URL of the elasticsearch instance for indexing.
 elasticsearch: http://elasticsearch:7200
+# Index base name in elasticsearch.
+index_base_name: reliefweb
diff --git a/html/modules/custom/reliefweb_api/config/schema/reliefweb_api.schema.yml b/html/modules/custom/reliefweb_api/config/schema/reliefweb_api.schema.yml
index 6f1edefaf..b74c4dd14 100644
--- a/html/modules/custom/reliefweb_api/config/schema/reliefweb_api.schema.yml
+++ b/html/modules/custom/reliefweb_api/config/schema/reliefweb_api.schema.yml
@@ -19,4 +19,7 @@ reliefweb_api.settings:
       label: 'Verify the SSL certificate of the API query performing requests.'
     elasticsearch:
       type: string
-      label: 'URL of the elaticsearch instance for indexing.'
+      label: 'URL of the elasticsearch instance for indexing.'
+    index_base_name:
+      type: string
+      label: 'Index base name in elasticsearch.'
diff --git a/html/modules/custom/reliefweb_api/drush.services.yml b/html/modules/custom/reliefweb_api/drush.services.yml
new file mode 100644
index 000000000..7d90e197b
--- /dev/null
+++ b/html/modules/custom/reliefweb_api/drush.services.yml
@@ -0,0 +1,6 @@
+services:
+  reliefweb_api.commands:
+    class: \Drupal\reliefweb_api\Commands\ReliefWebApiCommands
+    arguments: ['@config.factory', '@module_handler', '@state']
+    tags:
+      - { name: drush.command }
diff --git a/html/modules/custom/reliefweb_api/reliefweb_api.api.php b/html/modules/custom/reliefweb_api/reliefweb_api.api.php
new file mode 100644
index 000000000..5cfd59d70
--- /dev/null
+++ b/html/modules/custom/reliefweb_api/reliefweb_api.api.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * @file
+ * ReliefWeb API hooks.
+ */
+
+/**
+ * Perform operations after an entity has been indexed.
+ *
+ * Note: the database may not available anymore at this point.
+ *
+ * @param string $entity_type_id
+ *   The entity type ID (ex: node).
+ * @param string $bundle
+ *   The entity bundle.
+ * @param int|null $entity_id
+ *   The entity id.
+ */
+function hook_reliefweb_api_post_indexing($entity_type_id, $bundle, $entity_id = NULL) {
+  // Clear the cache for the bundle.
+  \Drupal::cache()->invalidateTags([$entity_type_id . '_list:' . $bundle]);
+}
diff --git a/html/modules/custom/reliefweb_api/reliefweb_api.module b/html/modules/custom/reliefweb_api/reliefweb_api.module
new file mode 100644
index 000000000..2badfd8ac
--- /dev/null
+++ b/html/modules/custom/reliefweb_api/reliefweb_api.module
@@ -0,0 +1,186 @@
+<?php
+
+/**
+ * @file
+ * Module file for reliefweb_api.
+ */
+
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Entity\EntityInterface;
+use RWAPIIndexer\Bundles;
+use RWAPIIndexer\Manager;
+
+/**
+ * Implements hook_entity_insert().
+ */
+function reliefweb_api_entity_insert(EntityInterface $entity) {
+  // @todo remove when removing `reliefweb_migrate`.
+  if (!empty($entity->_is_migrating)) {
+    return;
+  }
+  reliefweb_api_handle_entity($entity);
+}
+
+/**
+ * Implements hook_entity_update().
+ */
+function reliefweb_api_entity_update(EntityInterface $entity) {
+  // @todo remove when removing `reliefweb_migrate`.
+  if (!empty($entity->_is_migrating)) {
+    return;
+  }
+  reliefweb_api_handle_entity($entity);
+}
+
+/**
+ * Implements hook_entity_delete().
+ */
+function reliefweb_api_entity_delete(EntityInterface $entity) {
+  // @todo remove when removing `reliefweb_migrate`.
+  if (!empty($entity->_is_migrating)) {
+    return;
+  }
+  reliefweb_api_handle_entity($entity, TRUE);
+}
+
+/**
+ * Handle entity indexing or deletion.
+ *
+ * @param \Drupal\Core\Entity\EntityInterface $entity
+ *   Entity to index or delete.
+ * @param bool $delete
+ *   Whether to delete the entity from the index or not.
+ */
+function reliefweb_api_handle_entity(EntityInterface $entity, $delete = FALSE) {
+  // Extract the entity information.
+  $entity_id = $entity->id();
+  $bundle = $entity->bundle();
+  $entity_type_id = $entity->getEntityTypeId();
+
+  // We only index nodes and terms.
+  if ($entity_type_id !== 'node' && $entity_type_id !== 'taxonomy_term') {
+    return;
+  }
+
+  // Check if the Indexer if available.
+  if (!reliefweb_api_indexer_available()) {
+    return;
+  }
+
+  // Skip unsupported entity bundles.
+  if (!Bundles::has($bundle)) {
+    return;
+  }
+
+  // Indexing options.
+  $options = reliefweb_api_get_indexer_base_options();
+  $options += [
+    'bundle' => $bundle,
+    'limit' => 1,
+    'offset' => 0,
+    'chunk-size' => 1,
+    'id' => $entity_id,
+    'remove' => $delete,
+    'tag' => \Drupal::state()->get('reliefweb_api_index_tag_' . $bundle, ''),
+  ];
+
+  // Register the actual indexing or deletion to run on script shutdown.
+  drupal_register_shutdown_function('reliefweb_api_execute', $options, $entity_type_id);
+}
+
+/**
+ * Get the base options to pass to the indexer.
+ *
+ * @return array
+ *   Indexer options.
+ */
+function reliefweb_api_get_indexer_base_options() {
+  $connection_info = Database::getConnectionInfo('default');
+  if (!isset($connection_info['default'])) {
+    throw new \Exception('ReliefWeb API: Unable to retrieve database information');
+  }
+
+  // Drupal database.
+  $database = $connection_info['default'];
+
+  // State.
+  $state = \Drupal::state();
+
+  // Indexing options to index all reports.
+  $options = [
+    'elasticsearch' => $state->get('reliefweb_api_elasticsearch', 'http://elasticsearch:9200'),
+    'mysql-host' => $database['host'],
+    'mysql-port' => !empty($database['port']) ? $database['port'] : 3306,
+    'mysql-user' => $database['username'],
+    'mysql-pass' => $database['password'],
+    'database' => $database['database'],
+    'base-index-name' => $database['database'],
+    'website' => $state->get('reliefweb_api_website', 'https://reliefweb.int'),
+  ];
+  return $options;
+}
+
+/**
+ * Shutdown callback that performs the actual indexing or deletion.
+ *
+ * This ensures that the entity has been saved or removed from the database.
+ *
+ * @param array $options
+ *   Indexing options.
+ * @param string $entity_type_id
+ *   Entity type ID.
+ */
+function reliefweb_api_execute(array $options, $entity_type_id) {
+  try {
+    // Create the indexing manager.
+    $manager = new Manager($options);
+
+    // Index or delete based on the provided options.
+    $manager->execute();
+
+    // Allow other modules to perform actions after the indexing.
+    // Note that the database connection has been closed though.
+    \Drupal::moduleHandler()->invokeAll('reliefweb_api_post_indexing', [
+      $entity_type_id,
+      $options['bundle'],
+      $options['id'],
+    ]);
+  }
+  catch (\Exception $exception) {
+  }
+}
+
+/**
+ * Implements hook_reliefweb_api_post_indexing().
+ *
+ * Clear the API queries cache entries.
+ *
+ * Note: we are assuming that the cache backend is not the database
+ * because it may not available anymore at this point.
+ */
+function reliefweb_api_reliefweb_api_post_indexing($entity_type_id, $bundle, $entity_id = NULL) {
+  // For taxonomy terms we clear all the cached API queries because
+  // many different entities may reference the updated term.
+  if ($entity_type_id === 'taxonomy_term') {
+    Cache::invalidateTags(['taxonomy_term_list']);
+  }
+  // Otherwise we clear the cache for this node type only.
+  elseif ($entity_type_id === 'node') {
+    Cache::invalidateTags(['node_list:' . $bundle]);
+  }
+}
+
+/**
+ * Check if the ReliefWeb API Indexer is available.
+ *
+ * @return bool
+ *   TRUE if the indexer is available.
+ */
+function reliefweb_api_indexer_available() {
+  if (!class_exists('\RWAPIIndexer\Manager')) {
+    \Drupal::logger('reliefweb_api')->warning('ReliefWeb API Indexer class missing.');
+    return FALSE;
+  }
+  return TRUE;
+}
diff --git a/html/modules/custom/reliefweb_api/src/Commands/ReliefWebApiCommands.php b/html/modules/custom/reliefweb_api/src/Commands/ReliefWebApiCommands.php
new file mode 100644
index 000000000..b339d3bdd
--- /dev/null
+++ b/html/modules/custom/reliefweb_api/src/Commands/ReliefWebApiCommands.php
@@ -0,0 +1,276 @@
+<?php
+
+namespace Drupal\reliefweb_api\Commands;
+
+use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Database\Database;
+use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\State\StateInterface;
+use Drush\Commands\DrushCommands;
+use RWAPIIndexer\Manager;
+use RWAPIIndexer\Bundles;
+
+/**
+ * ReliefWeb migration Drush commandfile.
+ *
+ * @todo remove after the migration from D7 to D9.
+ */
+class ReliefWebApiCommands extends DrushCommands {
+
+  /**
+   * ReliefWeb API config.
+   *
+   * @var \Drupal\Core\Config\ImmutableConfig
+   */
+  protected $apiConfig;
+
+  /**
+   * Module handler.
+   *
+   * @var \Drupal\Core\Extension\ModuleHandlerInterface
+   */
+  protected $moduleHandler;
+
+  /**
+   * The state service.
+   *
+   * @var \Drupal\Core\State\StateInterface
+   */
+  protected $state;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(
+    ConfigFactoryInterface $config_factory,
+    ModuleHandlerInterface $module_handler,
+    StateInterface $state
+  ) {
+    $this->apiConfig = $config_factory->get('reliefweb_api.settings');
+    $this->moduleHandler = $module_handler;
+    $this->state = $state;
+  }
+
+  /**
+   * Index content in the ReliefWeb API.
+   *
+   * Wrapper around ReliefWeb API Indexer.
+   *
+   * @param string $bundle
+   *   Entity bundle to index.
+   * @param array $options
+   *   Additional options for the command.
+   *
+   * @command reliefweb-api:index
+   *
+   * @option elasticsearch Elasticsearch URL (http://host:port), defaults to
+   *   reliefweb_api_elasticsearch variable.
+   * @option base-index-name Base index name, deaults to database name.
+   * @option limit Maximum number of entities to index, defaults to 0 (all).
+   * @option offset ID of the entity from which to start the indexing, defaults
+   *   to the most recent one.
+   * @option filter Filter documents to index. Format:
+   *   'field1:value1,value2+field2:value1,value2'.
+   * @option chunk-size Number of entities to index at one time, defaults to
+   *   500.
+   * @option tag Tag appended to the index name, defaults to the
+   *   reliefweb_api_index_tag variable for this bundle.
+   * @option id Id of an entity item to index, defaults to 0 (none).
+   * @option remove Removes an entity if id is provided or the index for the
+   *   given entity bundle.
+   * @option alias Set up the alias for the index after the indexing, ignored if
+   *   id is provided.
+   * @option alias-only Set up the alias for the index without indexing, ignored
+   *   if id is provided.
+   * @option replace Replace the old index if tag is provided and different than
+   *   the current one, ignored if id is provided.
+   *
+   * @default $options []
+   *
+   * @usage reliefweb-api:index --id=123 report
+   *   Index the report with ID 123.
+   * @usagereliefweb-api:index --limit=10 report
+   *   Index latest 10 reports.
+   * @usage reliefweb-api:index --tag=20140802 --alias report
+   *   Index all reports into index tagged with 20140802 and set the index alias
+   *   to point at it.
+   * @usage reliefweb-api:index --tag=20140915 --replace report
+   *   Index all reports into a new index tagged with 20140915 and use it to
+   *   replace the old one.
+   * @usage reliefweb-api:index --tag=20140802 --remove report
+   *   Remove the report index tagged with 20140802.
+   *
+   * @validate-module-enabled reliefweb_api
+   *
+   * @aliases rw-api:index, rw-api:i, rwapi-i, rapi-i
+   */
+  public function index($bundle = '', array $options = [
+    'elasticsearch' => '',
+    'base-index-name' => '',
+    'limit' => 0,
+    'offset' => 0,
+    'filter' => '',
+    'chunk-size' => 500,
+    'tag' => '',
+    'id' => 0,
+    'remove' => FALSE,
+    'replace' => FALSE,
+    'alias' => FALSE,
+    'alias-only' => FALSE,
+    'log' => 'echo',
+  ]) {
+    // Index all the references at once when the special 'references' bundle
+    // is passed to the command.
+    if ($bundle === 'references') {
+      $references = explode(',', $this->state->get('reliefweb_api_references', ''));
+      foreach ($references as $reference) {
+        $this->index($reference, $options);
+      }
+      return;
+    }
+
+    $tag = $this->state->get('reliefweb_api_index_tag_' . $bundle, '');
+    $replace = !empty($options['replace']);
+
+    // Retrieve the index base name from the config and default to the database
+    // name if not set.
+    $index_base_name = $this->apiConfig->get('index_base_name') ?? '';
+    if (empty($index_base_name)) {
+      $connection_info = Database::getConnectionInfo('default');
+      if (isset($connection_info['default']['database'])) {
+        $index_base_name = $connection_info['default']['database'];
+      }
+    }
+
+    // Retrieve the elasticsearch URL.
+    $elasticsearch = $this->apiConfig->get('elasticsearch') ?? '';
+
+    // Index indexing options.
+    $indexing_options = reliefweb_api_get_indexer_base_options();
+    $indexing_options['bundle'] = $bundle;
+    $indexing_options['elasticsearch'] = $options['elasticsearch'] ?: $elasticsearch;
+    $indexing_options['base-index-name'] = $options['base-index-name'] ?: $index_base_name;
+    $indexing_options['limit'] = (int) ($options['limit'] ?: 0);
+    $indexing_options['offset'] = (int) ($options['offset'] ?: 0);
+    $indexing_options['filter'] = $options['filter'] ?: '';
+    $indexing_options['chunk-size'] = (int) ($options['chunk-size'] ?: 500);
+    $indexing_options['tag'] = $options['tag'] ?: $tag;
+    $indexing_options['id'] = (int) ($options['id'] ?: 0);
+    $indexing_options['remove'] = !empty($options['remove']);
+    $indexing_options['alias'] = !empty($options['alias']);
+    $indexing_options['alias-only'] = !empty($options['alias-only']);
+    $indexing_options['log'] = 'echo';
+
+    // Make sure there is enough memory.
+    ini_set('memory_limit', '512M');
+
+    // Launch the indexing or index removal.
+    try {
+      // Create a new Indexing manager.
+      $manager = new Manager($indexing_options);
+      // Perform indexing or index removal.
+      $manager->execute();
+
+      // Print the time and memory usage.
+      echo $manager->getMetrics();
+
+      // Reconnect to the Drupal database as connection may have ended.
+      Database::closeConnection();
+      Database::getConnection('default', 'default');
+
+      // Replace the old index by the new one.
+      if (empty($indexing_options['id']) && !empty($replace)) {
+        $this->replace($bundle, $indexing_options['tag'], $tag);
+      }
+    }
+    catch (\Exception $exception) {
+      $this->logger->error('(' . $exception->getCode() . ') ' . $exception->getMessage());
+    }
+  }
+
+  /**
+   * Replace an index.
+   *
+   * Replace an old index by a new one, setting the index alias to point at the
+   * new one. Indexes must exist.
+   *
+   * @param string $bundle
+   *   Entity bundle of the index.
+   * @param string $newtag
+   *   New index tag.
+   * @param string|null $oldtag
+   *   Old index tag, defaults to the reliefweb_api_index_tag variable for the
+   *   bundle.
+   *
+   * @command reliefweb-api:replace
+   *
+   * @usage reliefweb-api:replace report 20141015 20140802
+   *   Replace the index tagged with 20140802 by the index tagged with 20141015.
+   *
+   * @validate-module-enabled reliefweb_api
+   *
+   * @aliases rw-api:replace, rw-api:r, rwapi-r
+   */
+  public function replace($bundle, $newtag, $oldtag = NULL) {
+    if (!isset($oldtag)) {
+      $oldtag = $this->state->get('reliefweb_api_index_tag_' . $bundle, '');
+    }
+
+    if ($newtag === $oldtag) {
+      $this->logger->info('Same tags, nothing to update. Skipping');
+    }
+    else {
+      $base_options = reliefweb_api_get_indexer_base_options();
+
+      try {
+        // Set the alias for the new index.
+        $indexing_options = $base_options + [
+          'bundle' => $bundle,
+          'tag' => $newtag,
+          'alias-only' => TRUE,
+        ];
+        $manager = new Manager($indexing_options);
+        $manager->execute();
+      }
+      catch (\Exception $exception) {
+        $this->logger->error('(' . $exception->getCode() . ') ' . $exception->getMessage());
+        return;
+      }
+
+      try {
+        // Remove the old index.
+        $indexing_options = $base_options + [
+          'bundle' => $bundle,
+          'tag' => $oldtag,
+          'remove' => TRUE,
+        ];
+        $manager = new Manager($indexing_options);
+        $manager->execute();
+      }
+      catch (\Exception $exception) {
+        $message = $exception->getMessage();
+        // Ignore index not found message.
+        if (strpos($message, 'IndexNotFoundException') !== 0) {
+          $this->logger->error('(' . $exception->getCode() . ') ' . $message);
+          return;
+        }
+      }
+
+      // Set the new tag.
+      $this->state->set('reliefweb_api_index_tag_' . $bundle, $newtag);
+    }
+
+    // Allow other modules to perform actions after the indexing.
+    if (isset(Bundles::$bundles[$bundle]['type'])) {
+      $entity_type_id = Bundles::$bundles[$bundle]['type'];
+
+      $this->moduleHandler->invokeAll('reliefweb_api_post_indexing', [
+        $entity_type_id,
+        $bundle,
+      ]);
+
+      $this->logger->info('Performed post indexing tasks.');
+    }
+  }
+
+}

From 9986ca2d40659b458a6b9637f83395d40a363162 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 19 Jan 2022 11:22:43 +0000
Subject: [PATCH 375/720] [RW-251] Add api-indexer library

---
 composer.json |  5 +++++
 composer.lock | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index dc1b9ae10..eeb9f5761 100644
--- a/composer.json
+++ b/composer.json
@@ -40,6 +40,10 @@
                 }
             }
         },
+        {
+            "type": "vcs",
+            "url": "https://github.com/UN-OCHA/rwint-api-indexer.git"
+        },
         {
             "type": "vcs",
             "url": "https://github.com/UN-OCHA/common_design.git"
@@ -81,6 +85,7 @@
         "league/commonmark": "^1.6",
         "league/html-to-markdown": "^5.0",
         "pelago/emogrifier": "^6.0",
+        "reliefweb/api-indexer": "^v2.0.0",
         "reliefweb/simple-autocomplete": "^v1.3.0",
         "reliefweb/simple-datepicker": "^v1.3.1",
         "symfony/flex": "^2.0",
diff --git a/composer.lock b/composer.lock
index e2408d6f8..1725bb5b7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "467886a9d48d0f0fa17f498a73a6cdc3",
+    "content-hash": "46c9ae95d6aa86693968221fc7b01df7",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -7553,6 +7553,62 @@
             },
             "time": "2020-05-12T15:16:56+00:00"
         },
+        {
+            "name": "reliefweb/api-indexer",
+            "version": "v2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/UN-OCHA/rwint-api-indexer.git",
+                "reference": "fac34f94354d255bdcd0db03b8dec75c3ae87b37"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/UN-OCHA/rwint-api-indexer/zipball/fac34f94354d255bdcd0db03b8dec75c3ae87b37",
+                "reference": "fac34f94354d255bdcd0db03b8dec75c3ae87b37",
+                "shasum": ""
+            },
+            "require": {
+                "league/commonmark": "^1.6",
+                "php": ">=8.0"
+            },
+            "require-dev": {
+                "drupal/coder": "^8.3",
+                "phpunit/phpunit": "^9.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "RWAPIIndexer\\": "src/RWAPIIndexer"
+                }
+            },
+            "scripts": {
+                "post-install-cmd": [
+                    "@phpcs-install",
+                    "@git-hooks"
+                ],
+                "post-update-cmd": [
+                    "@phpcs-install",
+                    "@git-hooks"
+                ],
+                "phpcs-install": [
+                    "./composer-phpcs-install.sh || exit 0"
+                ],
+                "git-hooks": [
+                    "test -d .git && git config core.hooksPath git-hooks || exit 0"
+                ]
+            },
+            "description": "Standalone library to index the RW database into the API elasticsearch indexes.",
+            "keywords": [
+                "api",
+                "elasticsearch",
+                "reliefweb"
+            ],
+            "support": {
+                "source": "https://github.com/UN-OCHA/rwint-api-indexer/tree/v2.0.0",
+                "issues": "https://github.com/UN-OCHA/rwint-api-indexer/issues"
+            },
+            "time": "2022-01-19T06:31:35+00:00"
+        },
         {
             "name": "reliefweb/simple-autocomplete",
             "version": "v1.3.0",

From c070eba54c68c2c60daf9265443ddd61457867e1 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 19 Jan 2022 12:28:14 +0000
Subject: [PATCH 376/720] [RW-251] Fix API query caching

---
 .../reliefweb_api/src/Services/ReliefWebApiClient.php     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/html/modules/custom/reliefweb_api/src/Services/ReliefWebApiClient.php b/html/modules/custom/reliefweb_api/src/Services/ReliefWebApiClient.php
index 506927e4f..caa75102c 100644
--- a/html/modules/custom/reliefweb_api/src/Services/ReliefWebApiClient.php
+++ b/html/modules/custom/reliefweb_api/src/Services/ReliefWebApiClient.php
@@ -54,7 +54,7 @@ class ReliefWebApiClient {
    *
    * @var array
    */
-  protected $cacheTags = [
+  protected static $cacheTags = [
     'reports' => ['node_list:report'],
     'jobs' => ['node_list:job'],
     'training' => ['node_list:training'],
@@ -136,7 +136,7 @@ public function requestMultiple(array $queries, $decode = TRUE, $timeout = 5, $c
     $results = [];
     $api_url = $this->config->get('api_url');
     $appname = $this->config->get('appname') ?: 'reliefweb.int';
-    $cache_enabled = $cache_enabled && ($this->config->get('cache_enabled') ?: TRUE);
+    $cache_enabled = $cache_enabled && ($this->config->get('cache_enabled') ?? TRUE);
     $verify_ssl = $this->config->get('verify_ssl');
 
     // Initialize the result array and retrieve the data for the cached queries.
@@ -236,8 +236,8 @@ public function requestMultiple(array $queries, $decode = TRUE, $timeout = 5, $c
 
       // Cache the data unless cache is disabled or there was an issue with the
       // request in which case $data is NULL.
-      if (isset($cache, $cache_ids[$index])) {
-        $tags = static::getCacheTags($query['resource']);
+      if (isset($cache, $cache_ids[$index], $queries[$index]['resource'])) {
+        $tags = static::getCacheTags($queries[$index]['resource']);
         $this->cache->set($cache_ids[$index], $data, $this->cache::CACHE_PERMANENT, $tags);
       }
 

From d3e550ebcd1946075ffb5e23f47e395e79ce9885 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 19 Jan 2022 16:16:12 -0700
Subject: [PATCH 377/720] [RW-316] move pager element outside section

---
 .../templates/reliefweb-rivers-river.html.twig               | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/reliefweb_rivers/templates/reliefweb-rivers-river.html.twig b/html/modules/custom/reliefweb_rivers/templates/reliefweb-rivers-river.html.twig
index 2c1804f6d..4440288d0 100644
--- a/html/modules/custom/reliefweb_rivers/templates/reliefweb-rivers-river.html.twig
+++ b/html/modules/custom/reliefweb_rivers/templates/reliefweb-rivers-river.html.twig
@@ -63,7 +63,8 @@
     <footer class="rw-river__view-more view-more">
       <a href="{{ more.url }}">{{ more.label ?? ('View more'|t) }}</a>
     </footer>
-  {% elseif entities is not empty and pager is not empty %}
-    {{ pager }}
   {% endif %}
 </section>
+{% if entities is not empty and pager is not empty %}
+  {{ pager }}
+{% endif %}

From 9b188c10c86260438f95be8fb9344d0f21adfdf7 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 19 Jan 2022 16:18:13 -0700
Subject: [PATCH 378/720] [RW-316] change heading to h2 for pager

---
 .../common_design_subtheme/templates/navigation/pager.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/templates/navigation/pager.html.twig b/html/themes/custom/common_design_subtheme/templates/navigation/pager.html.twig
index 91e0b149c..196ba285f 100644
--- a/html/themes/custom/common_design_subtheme/templates/navigation/pager.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/navigation/pager.html.twig
@@ -33,7 +33,7 @@
 {{ attach_library('common_design_subtheme/rw-pager') }}
 {% if items %}
   <nav class="pager" role="navigation" aria-labelledby="{{ heading_id }}">
-    <h3 id="{{ heading_id }}" class="visually-hidden">{{ 'Pagination'|t }}</h3>
+    <h2 id="{{ heading_id }}" class="visually-hidden">{{ 'Pagination'|t }}</h2>
     <ul class="cd-pager__items js-pager__items">
       {# Print first item if we are not on the first page. #}
       {% if items.first %}

From 1770525491772cff624cc9cd7086fdaf5de606c1 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 19 Jan 2022 16:18:56 -0700
Subject: [PATCH 379/720] [RW-316] remove rule that centers pager and extends
 its width beyond its parent container

---
 .../components/rw-pager/rw-pager.css               | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-pager/rw-pager.css b/html/themes/custom/common_design_subtheme/components/rw-pager/rw-pager.css
index b6f7ee7cc..0975839c5 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-pager/rw-pager.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-pager/rw-pager.css
@@ -54,17 +54,3 @@
 .pager li.cd-pager__item--ellipsis:after {
   margin-left: 16px;
 }
-/* So the pager nav element expands the entire width of the cd-layout-content area. */
-@media screen and (min-width: 768px) {
-  .rw-river-page--with-advanced-search .pager {
-    width: calc(100% + 340px);
-    margin-left: -340px;
-  }
-}
-
-@media screen and (min-width: 1024px) {
-  .rw-river-page--with-advanced-search .pager {
-    width: calc(100% + 360px);
-    margin-left: -360px;
-  }
-}

From abf162d3c0bb28cef5bb0fdc127e34eb84c8e5b1 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 19 Jan 2022 16:20:06 -0700
Subject: [PATCH 380/720] [RW-316] add bottom margins for vertical rhythm since
 top margin on pager collapses due to preceding float

---
 .../common_design_subtheme/components/rw-river/rw-river.css     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-river/rw-river.css b/html/themes/custom/common_design_subtheme/components/rw-river/rw-river.css
index 2038fb5f5..9e3bd5a2d 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-river/rw-river.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-river/rw-river.css
@@ -19,10 +19,12 @@
   .rw-river-page--with-advanced-search .rw-advanced-search {
     float: left;
     width: 300px;
+    margin-bottom: 32px;
   }
   .rw-river-page--with-advanced-search .rw-river--river-list {
     float: right;
     width: calc(100% - 340px);
+    margin-bottom: 32px;
   }
   /* Clear the floating above. */
   .rw-river-page--with-advanced-search #list:after {

From 83130f8ccb34fe7cf0eec7da08c6fc4258df712f Mon Sep 17 00:00:00 2001
From: Peter Lieverdink <lieverdink@reliefweb.int>
Date: Thu, 20 Jan 2022 10:47:18 +1100
Subject: [PATCH 381/720] [OPS-8026] Double the drush process timeout, so demo
 database import can finish.

---
 composer.patches.json                 |  3 +++
 patches/drush--timeout-override.patch | 13 +++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 patches/drush--timeout-override.patch

diff --git a/composer.patches.json b/composer.patches.json
index 125abe725..d08a5214e 100644
--- a/composer.patches.json
+++ b/composer.patches.json
@@ -5,6 +5,9 @@
         },
         "drupal/migrate_tools" : {
             "Invalid placeholder: https://www.drupal.org/project/migrate_tools/issues/3256236": "https://www.drupal.org/files/issues/2021-12-28/invalid_placeholder-3256236-3.patch"
+        },
+        "drush/drush": {
+            "https://humanitarian.atlassian.net/browse/OPS-8026": "patches/drush--timeout-override.patch"
         }
     }
 }
diff --git a/patches/drush--timeout-override.patch b/patches/drush--timeout-override.patch
new file mode 100644
index 000000000..ec57891e4
--- /dev/null
+++ b/patches/drush--timeout-override.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Drush.php b/src/Drush.php
+index 111116952..e9a7fb69b 100644
+--- a/src/Drush.php
++++ b/src/Drush.php
+@@ -68,7 +68,7 @@ class Drush
+      *
+      * @var int
+      */
+-    protected const TIMEOUT = 14400;
++    protected const TIMEOUT = 28800;
+ 
+     public static function getTimeout(): int
+     {

From 97c76850a0df5e548ff915d5ee107241791abdbe Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 20 Jan 2022 01:06:54 +0000
Subject: [PATCH 382/720] [RW-308] Adjust river render cache

---
 .../src/Controller/SearchResults.php          | 14 +++++++++
 .../reliefweb_rivers/src/RiverServiceBase.php | 30 +++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/html/modules/custom/reliefweb_rivers/src/Controller/SearchResults.php b/html/modules/custom/reliefweb_rivers/src/Controller/SearchResults.php
index f352f9c4c..e63c3e981 100644
--- a/html/modules/custom/reliefweb_rivers/src/Controller/SearchResults.php
+++ b/html/modules/custom/reliefweb_rivers/src/Controller/SearchResults.php
@@ -129,6 +129,17 @@ public function getPageContent() {
       '#search' => $this->getSearch(),
       '#totals' => $totals,
       '#sections' => $sections,
+      '#cache' => [
+        'contexts' => [
+          'url.query_args',
+        ],
+        'tags' => [
+          'node_list:job',
+          'node_list:report',
+          'node_list:training',
+          'taxonomy_term_list',
+        ],
+      ],
     ];
   }
 
@@ -190,6 +201,9 @@ public function getSearch() {
       '#path' => '/search/results',
       '#label' => $this->t('Search ReliefWeb'),
       '#query' => $this->getSearchQuery(),
+      '#cache' => [
+        'max-age' => 0,
+      ],
     ];
   }
 
diff --git a/html/modules/custom/reliefweb_rivers/src/RiverServiceBase.php b/html/modules/custom/reliefweb_rivers/src/RiverServiceBase.php
index b4c686282..870f99293 100644
--- a/html/modules/custom/reliefweb_rivers/src/RiverServiceBase.php
+++ b/html/modules/custom/reliefweb_rivers/src/RiverServiceBase.php
@@ -193,6 +193,15 @@ public function getPageContent() {
       '#advanced_search' => $this->getRiverAdvancedSearch(),
       '#content' => $this->getRiverContent(),
       '#links' => $this->getRiverLinks(),
+      '#cache' => [
+        'contexts' => [
+          'url.query_args',
+        ],
+        'tags' => [
+          $this->getEntityTypeId() . '_list:' . $this->getBundle(),
+          'taxonomy_term_list',
+        ],
+      ],
     ];
   }
 
@@ -285,6 +294,9 @@ public function getRiverViews() {
     return [
       '#theme' => 'reliefweb_rivers_views',
       '#views' => $views,
+      '#cache' => [
+        'max-age' => 0,
+      ],
     ];
   }
 
@@ -315,6 +327,9 @@ public function getRiverSearch() {
         '@river' => $this->getRiver(),
       ]),
       '#query' => $search,
+      '#cache' => [
+        'max-age' => 0,
+      ],
     ];
   }
 
@@ -337,6 +352,9 @@ public function getRiverAdvancedSearch() {
       '#selection' => $advanced_search->getSelection(),
       '#remove' => $advanced_search->getClearUrl(),
       '#settings' => $advanced_search->getSettings(),
+      '#cache' => [
+        'max-age' => 0,
+      ],
     ];
   }
 
@@ -355,6 +373,9 @@ public function getRiverContent() {
       '#entities' => $entities,
       '#pager' => $this->getRiverPager(),
       '#empty' => $this->t('No results found. Please modify your search or filter selection.'),
+      '#cache' => [
+        'max-age' => 0,
+      ],
     ];
   }
 
@@ -383,6 +404,9 @@ public function getRiverResults($count) {
       '#total' => $total,
       '#start' => $start,
       '#end' => $end,
+      '#cache' => [
+        'max-age' => 0,
+      ],
     ];
   }
 
@@ -392,6 +416,9 @@ public function getRiverResults($count) {
   public function getRiverPager() {
     return [
       '#type' => 'pager',
+      '#cache' => [
+        'max-age' => 0,
+      ],
     ];
   }
 
@@ -402,6 +429,9 @@ public function getRiverLinks() {
     return [
       '#theme' => 'reliefweb_rivers_links',
       '#links' => [],
+      '#cache' => [
+        'max-age' => 0,
+      ],
     ];
   }
 

From e0b4694d029b505fbd51578f65a972c68c447710 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 20 Jan 2022 02:35:27 +0000
Subject: [PATCH 383/720] [RW-251] Fix elasticsearch port

---
 config/reliefweb_api.settings.yml                               | 2 +-
 .../reliefweb_api/config/install/reliefweb_api.settings.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/reliefweb_api.settings.yml b/config/reliefweb_api.settings.yml
index 0bd4feae0..339616b79 100644
--- a/config/reliefweb_api.settings.yml
+++ b/config/reliefweb_api.settings.yml
@@ -5,4 +5,4 @@ api_url_external: 'https://api.reliefweb.int/v1'
 appname: reliefweb.int
 cache_enabled: true
 verify_ssl: true
-elasticsearch: 'http://elasticsearch:7200'
+elasticsearch: 'http://elasticsearch:9200'
diff --git a/html/modules/custom/reliefweb_api/config/install/reliefweb_api.settings.yml b/html/modules/custom/reliefweb_api/config/install/reliefweb_api.settings.yml
index c1e7e7ec9..c8c5e6375 100644
--- a/html/modules/custom/reliefweb_api/config/install/reliefweb_api.settings.yml
+++ b/html/modules/custom/reliefweb_api/config/install/reliefweb_api.settings.yml
@@ -9,6 +9,6 @@ cache_enabled: true
 # Verify the SSL certificate of the API query performing requests.
 verify_ssl: true
 # URL of the elasticsearch instance for indexing.
-elasticsearch: http://elasticsearch:7200
+elasticsearch: http://elasticsearch:9200
 # Index base name in elasticsearch.
 index_base_name: reliefweb

From 613ea1cffe1063a63e344fd5f63c2864b2769569 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 20 Jan 2022 06:17:02 +0000
Subject: [PATCH 384/720] [RW-251] Fix indexing options

---
 config/reliefweb_api.settings.yml             |  2 +
 .../config/install/reliefweb_api.settings.yml |  4 +-
 .../config/schema/reliefweb_api.schema.yml    |  7 ++-
 .../custom/reliefweb_api/reliefweb_api.module | 11 ++--
 .../src/Commands/ReliefWebApiCommands.php     | 60 +++++++++++--------
 5 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/config/reliefweb_api.settings.yml b/config/reliefweb_api.settings.yml
index 339616b79..90a1b0683 100644
--- a/config/reliefweb_api.settings.yml
+++ b/config/reliefweb_api.settings.yml
@@ -6,3 +6,5 @@ appname: reliefweb.int
 cache_enabled: true
 verify_ssl: true
 elasticsearch: 'http://elasticsearch:9200'
+base_index_name: reliefweb
+website: 'https://reliefweb.int'
diff --git a/html/modules/custom/reliefweb_api/config/install/reliefweb_api.settings.yml b/html/modules/custom/reliefweb_api/config/install/reliefweb_api.settings.yml
index c8c5e6375..1e6ee67cc 100644
--- a/html/modules/custom/reliefweb_api/config/install/reliefweb_api.settings.yml
+++ b/html/modules/custom/reliefweb_api/config/install/reliefweb_api.settings.yml
@@ -11,4 +11,6 @@ verify_ssl: true
 # URL of the elasticsearch instance for indexing.
 elasticsearch: http://elasticsearch:9200
 # Index base name in elasticsearch.
-index_base_name: reliefweb
+base_index_name: reliefweb
+# Scheme and host to use as base for the URLs in the indexed content.
+website: https://reliefweb.int
diff --git a/html/modules/custom/reliefweb_api/config/schema/reliefweb_api.schema.yml b/html/modules/custom/reliefweb_api/config/schema/reliefweb_api.schema.yml
index b74c4dd14..901775c4b 100644
--- a/html/modules/custom/reliefweb_api/config/schema/reliefweb_api.schema.yml
+++ b/html/modules/custom/reliefweb_api/config/schema/reliefweb_api.schema.yml
@@ -20,6 +20,9 @@ reliefweb_api.settings:
     elasticsearch:
       type: string
       label: 'URL of the elasticsearch instance for indexing.'
-    index_base_name:
+    base_index_name:
       type: string
-      label: 'Index base name in elasticsearch.'
+      label: 'Base index name in elasticsearch.'
+    website:
+      type: string
+      label: 'Scheme and host to use as base for the URLs in the indexed content.'
diff --git a/html/modules/custom/reliefweb_api/reliefweb_api.module b/html/modules/custom/reliefweb_api/reliefweb_api.module
index 2badfd8ac..0235117e3 100644
--- a/html/modules/custom/reliefweb_api/reliefweb_api.module
+++ b/html/modules/custom/reliefweb_api/reliefweb_api.module
@@ -104,20 +104,21 @@ function reliefweb_api_get_indexer_base_options() {
   // Drupal database.
   $database = $connection_info['default'];
 
-  // State.
-  $state = \Drupal::state();
+  // Config.
+  $config = \Drupal::config('reliefweb_api.settings');
 
   // Indexing options to index all reports.
   $options = [
-    'elasticsearch' => $state->get('reliefweb_api_elasticsearch', 'http://elasticsearch:9200'),
+    'elasticsearch' => $config->get('elasticsearch') ?? 'http://elasticsearch:9200',
     'mysql-host' => $database['host'],
     'mysql-port' => !empty($database['port']) ? $database['port'] : 3306,
     'mysql-user' => $database['username'],
     'mysql-pass' => $database['password'],
     'database' => $database['database'],
-    'base-index-name' => $database['database'],
-    'website' => $state->get('reliefweb_api_website', 'https://reliefweb.int'),
+    'base-index-name' => $config->get('base_index_name') ?? $database['database'],
+    'website' => $config->get('website') ?? 'https://' . \Drupal::request()->getHost(),
   ];
+
   return $options;
 }
 
diff --git a/html/modules/custom/reliefweb_api/src/Commands/ReliefWebApiCommands.php b/html/modules/custom/reliefweb_api/src/Commands/ReliefWebApiCommands.php
index b339d3bdd..99c06bae1 100644
--- a/html/modules/custom/reliefweb_api/src/Commands/ReliefWebApiCommands.php
+++ b/html/modules/custom/reliefweb_api/src/Commands/ReliefWebApiCommands.php
@@ -64,8 +64,13 @@ public function __construct(
    * @command reliefweb-api:index
    *
    * @option elasticsearch Elasticsearch URL (http://host:port), defaults to
-   *   reliefweb_api_elasticsearch variable.
-   * @option base-index-name Base index name, deaults to database name.
+   *   the 'reliefweb_api.settings:elasticsearch' setting or
+   *   'http://elasticsearch:9200'.
+   * @option base-index-name Base index name, deaults to the
+   *   'reliefweb_api.settings:base_index_name' setting or the database name.
+   * @option website Site scheme and hostname to use as base for the URLs,
+   *   defaults to the 'reliefweb_api.settings:website' setting or
+   *   'https://reliefweb.int'.
    * @option limit Maximum number of entities to index, defaults to 0 (all).
    * @option offset ID of the entity from which to start the indexing, defaults
    *   to the most recent one.
@@ -84,6 +89,7 @@ public function __construct(
    *   if id is provided.
    * @option replace Replace the old index if tag is provided and different than
    *   the current one, ignored if id is provided.
+   * @option memory_limit PHP memory limit, defaults to 512M.
    *
    * @default $options []
    *
@@ -107,6 +113,7 @@ public function __construct(
   public function index($bundle = '', array $options = [
     'elasticsearch' => '',
     'base-index-name' => '',
+    'website' => '',
     'limit' => 0,
     'offset' => 0,
     'filter' => '',
@@ -118,6 +125,7 @@ public function index($bundle = '', array $options = [
     'alias' => FALSE,
     'alias-only' => FALSE,
     'log' => 'echo',
+    'memory_limit' => '512M',
   ]) {
     // Index all the references at once when the special 'references' bundle
     // is passed to the command.
@@ -132,24 +140,12 @@ public function index($bundle = '', array $options = [
     $tag = $this->state->get('reliefweb_api_index_tag_' . $bundle, '');
     $replace = !empty($options['replace']);
 
-    // Retrieve the index base name from the config and default to the database
-    // name if not set.
-    $index_base_name = $this->apiConfig->get('index_base_name') ?? '';
-    if (empty($index_base_name)) {
-      $connection_info = Database::getConnectionInfo('default');
-      if (isset($connection_info['default']['database'])) {
-        $index_base_name = $connection_info['default']['database'];
-      }
-    }
-
-    // Retrieve the elasticsearch URL.
-    $elasticsearch = $this->apiConfig->get('elasticsearch') ?? '';
-
     // Index indexing options.
     $indexing_options = reliefweb_api_get_indexer_base_options();
     $indexing_options['bundle'] = $bundle;
-    $indexing_options['elasticsearch'] = $options['elasticsearch'] ?: $elasticsearch;
-    $indexing_options['base-index-name'] = $options['base-index-name'] ?: $index_base_name;
+    $indexing_options['elasticsearch'] = $options['elasticsearch'] ?: $indexing_options['elasticsearch'];
+    $indexing_options['base-index-name'] = $options['base-index-name'] ?: $indexing_options['base-index-name'];
+    $indexing_options['website'] = $options['website'] ?: $indexing_options['website'];
     $indexing_options['limit'] = (int) ($options['limit'] ?: 0);
     $indexing_options['offset'] = (int) ($options['offset'] ?: 0);
     $indexing_options['filter'] = $options['filter'] ?: '';
@@ -162,7 +158,7 @@ public function index($bundle = '', array $options = [
     $indexing_options['log'] = 'echo';
 
     // Make sure there is enough memory.
-    ini_set('memory_limit', '512M');
+    ini_set('memory_limit', $options['memory_limit'] ?: '512MB');
 
     // Launch the indexing or index removal.
     try {
@@ -180,7 +176,7 @@ public function index($bundle = '', array $options = [
 
       // Replace the old index by the new one.
       if (empty($indexing_options['id']) && !empty($replace)) {
-        $this->replace($bundle, $indexing_options['tag'], $tag);
+        $this->replace($bundle, $indexing_options['tag'], $tag, $options);
       }
     }
     catch (\Exception $exception) {
@@ -201,6 +197,14 @@ public function index($bundle = '', array $options = [
    * @param string|null $oldtag
    *   Old index tag, defaults to the reliefweb_api_index_tag variable for the
    *   bundle.
+   * @param array $options
+   *   Additional options for the command.
+   *
+   * @option elasticsearch Elasticsearch URL (http://host:port), defaults to
+   *   the 'reliefweb_api.settings:elasticsearch' setting or
+   *   'http://elasticsearch:9200'.
+   * @option base-index-name Base index name, deaults to the
+   *   'reliefweb_api.settings:base_index_name' setting or the database name.
    *
    * @command reliefweb-api:replace
    *
@@ -211,7 +215,10 @@ public function index($bundle = '', array $options = [
    *
    * @aliases rw-api:replace, rw-api:r, rwapi-r
    */
-  public function replace($bundle, $newtag, $oldtag = NULL) {
+  public function replace($bundle, $newtag, $oldtag = NULL, array $options = [
+    'elasticsearch' => '',
+    'base-index-name' => '',
+  ]) {
     if (!isset($oldtag)) {
       $oldtag = $this->state->get('reliefweb_api_index_tag_' . $bundle, '');
     }
@@ -221,14 +228,16 @@ public function replace($bundle, $newtag, $oldtag = NULL) {
     }
     else {
       $base_options = reliefweb_api_get_indexer_base_options();
+      $base_options['bundle'] = $bundle;
+      $base_options['elasticsearch'] = $options['elasticsearch'] ?: $base_options['elasticsearch'];
+      $base_options['base-index-name'] = $options['base-index-name'] ?: $base_options['base-index-name'];
 
       try {
         // Set the alias for the new index.
-        $indexing_options = $base_options + [
-          'bundle' => $bundle,
+        $indexing_options = array_merge($base_options, [
           'tag' => $newtag,
           'alias-only' => TRUE,
-        ];
+        ]);
         $manager = new Manager($indexing_options);
         $manager->execute();
       }
@@ -239,11 +248,10 @@ public function replace($bundle, $newtag, $oldtag = NULL) {
 
       try {
         // Remove the old index.
-        $indexing_options = $base_options + [
-          'bundle' => $bundle,
+        $indexing_options = array_merge($base_options, [
           'tag' => $oldtag,
           'remove' => TRUE,
-        ];
+        ]);
         $manager = new Manager($indexing_options);
         $manager->execute();
       }

From 81c0df368128dccc696d6ab9549fcd09ddaaf89b Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 20 Jan 2022 09:21:26 +0000
Subject: [PATCH 385/720] [RW-317] Fix indexing of images

---
 composer.json |  2 +-
 composer.lock | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index f0525cad0..c240fc560 100644
--- a/composer.json
+++ b/composer.json
@@ -85,7 +85,7 @@
         "league/commonmark": "^1.6",
         "league/html-to-markdown": "^5.0",
         "pelago/emogrifier": "^6.0",
-        "reliefweb/api-indexer": "^v2.0.0",
+        "reliefweb/api-indexer": "^v2.0.1",
         "reliefweb/simple-autocomplete": "^v1.3.0",
         "reliefweb/simple-datepicker": "^v1.3.1",
         "symfony/flex": "^2.0",
diff --git a/composer.lock b/composer.lock
index 6f60b7621..72d1ab38f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "5fe945c165ef2fed1d34089dd31640d7",
+    "content-hash": "16145c8179f5d726205afd4e4f3d190d",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -7539,16 +7539,16 @@
         },
         {
             "name": "reliefweb/api-indexer",
-            "version": "v2.0.0",
+            "version": "v2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/UN-OCHA/rwint-api-indexer.git",
-                "reference": "fac34f94354d255bdcd0db03b8dec75c3ae87b37"
+                "reference": "3cdba48b388b78239481dcd688f2added5298c73"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/UN-OCHA/rwint-api-indexer/zipball/fac34f94354d255bdcd0db03b8dec75c3ae87b37",
-                "reference": "fac34f94354d255bdcd0db03b8dec75c3ae87b37",
+                "url": "https://api.github.com/repos/UN-OCHA/rwint-api-indexer/zipball/3cdba48b388b78239481dcd688f2added5298c73",
+                "reference": "3cdba48b388b78239481dcd688f2added5298c73",
                 "shasum": ""
             },
             "require": {
@@ -7588,10 +7588,10 @@
                 "reliefweb"
             ],
             "support": {
-                "source": "https://github.com/UN-OCHA/rwint-api-indexer/tree/v2.0.0",
+                "source": "https://github.com/UN-OCHA/rwint-api-indexer/tree/v2.0.1",
                 "issues": "https://github.com/UN-OCHA/rwint-api-indexer/issues"
             },
-            "time": "2022-01-19T06:31:35+00:00"
+            "time": "2022-01-20T09:17:43+00:00"
         },
         {
             "name": "reliefweb/simple-autocomplete",

From b8fc5e760d7bd83b3e0f2c37921cc9330a8ccbe6 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 21 Jan 2022 03:19:32 +0000
Subject: [PATCH 386/720] [RW-251] Add simulate option to indexing and replica
 setting

---
 composer.json                                      |  2 +-
 composer.lock                                      | 14 +++++++-------
 config/reliefweb_api.settings.yml                  |  1 +
 .../config/install/reliefweb_api.settings.yml      |  2 ++
 .../config/schema/reliefweb_api.schema.yml         |  3 +++
 .../custom/reliefweb_api/reliefweb_api.module      |  1 +
 .../src/Commands/ReliefWebApiCommands.php          | 12 +++++++++---
 7 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/composer.json b/composer.json
index c240fc560..d4307fd18 100644
--- a/composer.json
+++ b/composer.json
@@ -85,7 +85,7 @@
         "league/commonmark": "^1.6",
         "league/html-to-markdown": "^5.0",
         "pelago/emogrifier": "^6.0",
-        "reliefweb/api-indexer": "^v2.0.1",
+        "reliefweb/api-indexer": "^v2.0.2",
         "reliefweb/simple-autocomplete": "^v1.3.0",
         "reliefweb/simple-datepicker": "^v1.3.1",
         "symfony/flex": "^2.0",
diff --git a/composer.lock b/composer.lock
index 72d1ab38f..9e9549616 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "16145c8179f5d726205afd4e4f3d190d",
+    "content-hash": "2ef39829c863e7c11ea3dffe8974e54a",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -7539,16 +7539,16 @@
         },
         {
             "name": "reliefweb/api-indexer",
-            "version": "v2.0.1",
+            "version": "v2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/UN-OCHA/rwint-api-indexer.git",
-                "reference": "3cdba48b388b78239481dcd688f2added5298c73"
+                "reference": "4af6ed40f253dc5f5a0f67ce41666f505da2cc0b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/UN-OCHA/rwint-api-indexer/zipball/3cdba48b388b78239481dcd688f2added5298c73",
-                "reference": "3cdba48b388b78239481dcd688f2added5298c73",
+                "url": "https://api.github.com/repos/UN-OCHA/rwint-api-indexer/zipball/4af6ed40f253dc5f5a0f67ce41666f505da2cc0b",
+                "reference": "4af6ed40f253dc5f5a0f67ce41666f505da2cc0b",
                 "shasum": ""
             },
             "require": {
@@ -7588,10 +7588,10 @@
                 "reliefweb"
             ],
             "support": {
-                "source": "https://github.com/UN-OCHA/rwint-api-indexer/tree/v2.0.1",
+                "source": "https://github.com/UN-OCHA/rwint-api-indexer/tree/v2.0.2",
                 "issues": "https://github.com/UN-OCHA/rwint-api-indexer/issues"
             },
-            "time": "2022-01-20T09:17:43+00:00"
+            "time": "2022-01-21T03:15:17+00:00"
         },
         {
             "name": "reliefweb/simple-autocomplete",
diff --git a/config/reliefweb_api.settings.yml b/config/reliefweb_api.settings.yml
index 90a1b0683..b795db9d8 100644
--- a/config/reliefweb_api.settings.yml
+++ b/config/reliefweb_api.settings.yml
@@ -8,3 +8,4 @@ verify_ssl: true
 elasticsearch: 'http://elasticsearch:9200'
 base_index_name: reliefweb
 website: 'https://reliefweb.int'
+no_replica: false
diff --git a/html/modules/custom/reliefweb_api/config/install/reliefweb_api.settings.yml b/html/modules/custom/reliefweb_api/config/install/reliefweb_api.settings.yml
index 1e6ee67cc..b3aacdc22 100644
--- a/html/modules/custom/reliefweb_api/config/install/reliefweb_api.settings.yml
+++ b/html/modules/custom/reliefweb_api/config/install/reliefweb_api.settings.yml
@@ -14,3 +14,5 @@ elasticsearch: http://elasticsearch:9200
 base_index_name: reliefweb
 # Scheme and host to use as base for the URLs in the indexed content.
 website: https://reliefweb.int
+# Whether to disable the index replica or not.
+no_replica: false
diff --git a/html/modules/custom/reliefweb_api/config/schema/reliefweb_api.schema.yml b/html/modules/custom/reliefweb_api/config/schema/reliefweb_api.schema.yml
index 901775c4b..3715b40d6 100644
--- a/html/modules/custom/reliefweb_api/config/schema/reliefweb_api.schema.yml
+++ b/html/modules/custom/reliefweb_api/config/schema/reliefweb_api.schema.yml
@@ -26,3 +26,6 @@ reliefweb_api.settings:
     website:
       type: string
       label: 'Scheme and host to use as base for the URLs in the indexed content.'
+    no_replica:
+      type: boolean
+      label: 'Whether to disable the index replica or not.'
diff --git a/html/modules/custom/reliefweb_api/reliefweb_api.module b/html/modules/custom/reliefweb_api/reliefweb_api.module
index 0235117e3..53e444e2d 100644
--- a/html/modules/custom/reliefweb_api/reliefweb_api.module
+++ b/html/modules/custom/reliefweb_api/reliefweb_api.module
@@ -117,6 +117,7 @@ function reliefweb_api_get_indexer_base_options() {
     'database' => $database['database'],
     'base-index-name' => $config->get('base_index_name') ?? $database['database'],
     'website' => $config->get('website') ?? 'https://' . \Drupal::request()->getHost(),
+    'no-replica' => $config->get('no_replica') ?? FALSE,
   ];
 
   return $options;
diff --git a/html/modules/custom/reliefweb_api/src/Commands/ReliefWebApiCommands.php b/html/modules/custom/reliefweb_api/src/Commands/ReliefWebApiCommands.php
index 99c06bae1..0c7a96816 100644
--- a/html/modules/custom/reliefweb_api/src/Commands/ReliefWebApiCommands.php
+++ b/html/modules/custom/reliefweb_api/src/Commands/ReliefWebApiCommands.php
@@ -89,6 +89,8 @@ public function __construct(
    *   if id is provided.
    * @option replace Replace the old index if tag is provided and different than
    *   the current one, ignored if id is provided.
+   * @option count-only Get the number of indexable entities for the
+   *   options, defaults to FALSE.
    * @option memory_limit PHP memory limit, defaults to 512M.
    *
    * @default $options []
@@ -125,7 +127,8 @@ public function index($bundle = '', array $options = [
     'alias' => FALSE,
     'alias-only' => FALSE,
     'log' => 'echo',
-    'memory_limit' => '512M',
+    'count-only' => FALSE,
+    'memory-limit' => '512M',
   ]) {
     // Index all the references at once when the special 'references' bundle
     // is passed to the command.
@@ -155,10 +158,13 @@ public function index($bundle = '', array $options = [
     $indexing_options['remove'] = !empty($options['remove']);
     $indexing_options['alias'] = !empty($options['alias']);
     $indexing_options['alias-only'] = !empty($options['alias-only']);
+    // It looks like "simulate" is a reserved drush option so we need another
+    // name for the option, thus "count-only"...
+    $indexing_options['simulate'] = !empty($options['count-only']);
     $indexing_options['log'] = 'echo';
 
     // Make sure there is enough memory.
-    ini_set('memory_limit', $options['memory_limit'] ?: '512MB');
+    ini_set('memory_limit', $options['memory-limit'] ?: '512MB');
 
     // Launch the indexing or index removal.
     try {
@@ -175,7 +181,7 @@ public function index($bundle = '', array $options = [
       Database::getConnection('default', 'default');
 
       // Replace the old index by the new one.
-      if (empty($indexing_options['id']) && !empty($replace)) {
+      if (empty($indexing_options['id']) && !empty($replace) && empty($indexing_options['simulate'])) {
         $this->replace($bundle, $indexing_options['tag'], $tag, $options);
       }
     }

From 843c3e2a3314c3e8b575a729bcc046ef336608e5 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 21 Jan 2022 03:21:33 +0000
Subject: [PATCH 387/720] [RW-251] Fix API image URL transformation

---
 html/modules/custom/reliefweb_utility/src/Helpers/UrlHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_utility/src/Helpers/UrlHelper.php b/html/modules/custom/reliefweb_utility/src/Helpers/UrlHelper.php
index a1fce4069..718277ff1 100644
--- a/html/modules/custom/reliefweb_utility/src/Helpers/UrlHelper.php
+++ b/html/modules/custom/reliefweb_utility/src/Helpers/UrlHelper.php
@@ -133,7 +133,7 @@ public static function getImageUriFromUrl($uri, $preserve_style = FALSE) {
       }
 
       // Return the URI with the public scheme.
-      return str_replace('/sites/default/files/', 'public://', $path);
+      return preg_replace('#/sites/[^/]+/files/#', 'public://', $path);
     }
 
     // Extract the style if any.

From 402440bbd544e1e2406336c3445b3577ceae18f4 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 21 Jan 2022 03:47:07 +0000
Subject: [PATCH 388/720] [RW-291] Add image migration

---
 .../reliefweb_migrate/drush.services.yml      |   2 +-
 .../src/Commands/ReliefWebMigrateCommands.php | 186 ++++++++++++++++++
 2 files changed, 187 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_migrate/drush.services.yml b/html/modules/custom/reliefweb_migrate/drush.services.yml
index 2036ab689..1f9763f9d 100644
--- a/html/modules/custom/reliefweb_migrate/drush.services.yml
+++ b/html/modules/custom/reliefweb_migrate/drush.services.yml
@@ -1,6 +1,6 @@
 services:
   reliefweb_migrate.commands:
     class: \Drupal\reliefweb_migrate\Commands\ReliefWebMigrateCommands
-    arguments: ['@config.installer', '@config.manager', '@date.formatter', '@entity_type.manager', '@keyvalue', '@plugin.manager.migration']
+    arguments: ['@config.installer', '@config.manager', '@database', '@date.formatter', '@entity_type.manager', '@file_system', '@keyvalue', '@plugin.manager.migration']
     tags:
       - { name: drush.command }
diff --git a/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php b/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
index 5bbebc87f..576680ce5 100644
--- a/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
+++ b/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
@@ -6,11 +6,14 @@
 use Consolidation\SiteAlias\SiteAliasManagerAwareInterface;
 use Consolidation\SiteAlias\SiteAliasManagerAwareTrait;
 use Drupal\Component\Plugin\Exception\PluginNotFoundException;
+use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\Config\ConfigInstallerInterface;
 use Drupal\Core\Config\ConfigManager;
+use Drupal\Core\Database\Connection;
 use Drupal\Core\Database\Database;
 use Drupal\Core\Datetime\DateFormatter;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\KeyValueStore\KeyValueFactoryInterface;
 use Drupal\migrate\Exception\RequirementsException;
 use Drupal\migrate\Plugin\MigrationPluginManager;
@@ -18,6 +21,7 @@
 use Drupal\reliefweb_migrate\Plugin\migrate\source\SourceMigrationStatusInterface;
 use Drupal\reliefweb_utility\Helpers\LegacyHelper;
 use Drush\Commands\DrushCommands;
+use GuzzleHttp\Psr7\Utils;
 
 /**
  * ReliefWeb migration Drush commandfile.
@@ -40,6 +44,13 @@ class ReliefWebMigrateCommands extends DrushCommands implements SiteAliasManager
    */
   protected $configManager;
 
+  /**
+   * The database.
+   *
+   * @var \Drupal\Core\Database\Connection
+   */
+  protected $database;
+
   /**
    * Date formatter service.
    *
@@ -54,6 +65,13 @@ class ReliefWebMigrateCommands extends DrushCommands implements SiteAliasManager
    */
   protected $entityTypeManager;
 
+  /**
+   * The file system.
+   *
+   * @var \Drupal\Core\File\FileSystemInterface
+   */
+  protected $fileSystem;
+
   /**
    * Key-value store service.
    *
@@ -74,16 +92,20 @@ class ReliefWebMigrateCommands extends DrushCommands implements SiteAliasManager
   public function __construct(
     ConfigInstallerInterface $config_installer,
     ConfigManager $config_manager,
+    Connection $database,
     DateFormatter $date_formatter,
     EntityTypeManagerInterface $entity_type_manager,
+    FileSystemInterface $file_system,
     KeyValueFactoryInterface $key_value,
     MigrationPluginManager $migration_plugin_manager
   ) {
     parent::__construct();
     $this->configInstaller = $config_installer;
     $this->configManager = $config_manager;
+    $this->database = $database;
     $this->dateFormatter = $date_formatter;
     $this->entityTypeManager = $entity_type_manager;
+    $this->fileSystem = $file_system;
     $this->keyValue = $key_value;
     $this->migrationPluginManager = $migration_plugin_manager;
   }
@@ -332,6 +354,170 @@ protected function migrationsList($migration_ids = '', array $options = []) {
     return $migrations ?? [];
   }
 
+  /**
+   * Migrate the images.
+   *
+   * @command rw-migrate:migrate-images
+   *
+   * @option base_url The base url of the site from which to retrieve the files.
+   * @option batch_size Number of reports with images to process at once.
+   * @option limit Maximum number of reports with non migrated files to process,
+   *   0 means process everything.
+   * @option delete Delete the old -> new uri mapping.
+   *
+   * @default options [
+   *   'base_url' => 'https://reliefweb.int',
+   *   'batch_size' => 1000,
+   *   'limit' => 0,
+   *   'delete' => FALSE,
+   * ]
+   *
+   * @aliases rw-mmi,rw-migrate-migrate-images
+   *
+   * @usage rw-migrate:migrate-images
+   *   Download the images.
+   *
+   * @validate-module-enabled reliefweb_migrate
+   */
+  public function migrateImages($options = [
+    'base_url' => 'https://reliefweb.int',
+    'batch_size' => 1000,
+    'limit' => 0,
+    'delete' => FALSE,
+  ]) {
+    $base_url = $options['base_url'];
+    $batch_size = (int) $options['batch_size'];
+    $limit = (int) $options['limit'];
+
+    if (preg_match('#^https?://[^/]+$#', $base_url) !== 1) {
+      $this->logger()->error(dt('The base url must be in the form http(s)://example.test.'));
+      return FALSE;
+    }
+    if ($batch_size < 1 || $batch_size > 1000) {
+      $this->logger()->error(dt('The batch size must be within 1 and 1000.'));
+      return FALSE;
+    }
+    if ($limit < 0) {
+      $this->logger()->error(dt('The limit must be equal or superior to 0.'));
+      return FALSE;
+    }
+
+    // Get the attachment field table.
+    $table = 'reliefweb_migrate_uri_mapping';
+
+    // Retrieve the most recent report node with attachments.
+    $query = $this->database->select($table, $table);
+    $query->addExpression('MAX(' . $table . '.id)');
+    $last = $query->execute()?->fetchField();
+
+    if (empty($last)) {
+      $this->logger()->info(dt('No images to download found.'));
+      return TRUE;
+    }
+
+    $last = $last + 1;
+    $count_images = 0;
+    $count_downloaded = 0;
+
+    while ($last !== NULL) {
+      $records = $this->database
+        ->select($table, $table)
+        ->fields($table, ['id', 'new_uri', 'old_uri'])
+        ->orderBy('id', 'DESC')
+        ->condition('id', $last, '<')
+        ->range(0, $limit > 0 ? min($limit - $count_images, $batch_size) : $batch_size)
+        ->execute()
+        ?->fetchAllAssoc('id', \PDO::FETCH_ASSOC) ?? [];
+
+      if (!empty($records)) {
+        $last = array_key_last($records);
+        $count_images += count($records);
+
+        foreach ($records as $record) {
+          $source = str_replace('public://', '', $record['old_uri']);
+          $source = UrlHelper::encodePath($source);
+          $source = $base_url . '/sites/default/files/' . $source;
+          $result = $this->downloadFile($source, $record['new_uri']);
+          $count_downloaded += $result ? 1 : 0;
+        }
+
+        // Remove the entries form the url mapping.
+        // @todo check if there is a different way to mark files as downloaded.
+        if (!empty($options['delete'])) {
+          $this->database->delete($table)
+            ->condition('id', array_keys($records), 'IN')
+            ->execute();
+        }
+      }
+      else {
+        $last = NULL;
+        break;
+      }
+
+      if ($limit > 0 && $count_images >= $limit) {
+        break;
+      }
+    }
+
+    $this->logger()->info(dt('Successfully downloaded @count_downloaded out of @count_images images.', [
+      '@count_downloaded' => $count_downloaded,
+      '@count_images' => $count_images,
+    ]));
+    return TRUE;
+  }
+
+  /**
+   * Download a file to its local location.
+   *
+   * @param string $source
+   *   Source file URI.
+   * @param string $destination
+   *   Destination file URI.
+   *
+   * @return bool
+   *   TRUE if the file could be downloaded.
+   */
+  protected function downloadFile($source, $destination) {
+    // Try to download the file.
+    $success = FALSE;
+    $directory = dirname($destination);
+    if ($this->fileSystem->prepareDirectory($directory, $this->fileSystem::CREATE_DIRECTORY)) {
+      try {
+        $input = Utils::TryFopen($source, 'r');
+        $output = Utils::TryFopen($destination, 'w');
+        $success = stream_copy_to_stream($input, $output);
+      }
+      catch (\Exception $exception) {
+        $this->logger()->error(dt('Unable to download file @source to @destination: @message.', [
+          '@source' => $source,
+          '@destination' => $destination,
+          '@message' => $exception->getMessage(),
+        ]));
+        return FALSE;
+      }
+    }
+    else {
+      $this->logger()->error(dt('Unable to create directory for @destination.', [
+        '@destination' => $destination,
+      ]));
+      return FALSE;
+    }
+
+    if (empty($success)) {
+      $this->logger()->error(dt('Unable to download file @source to @destination.', [
+        '@source' => $source,
+        '@destination' => $destination,
+      ]));
+    }
+    else {
+      $this->logger()->info(dt('Successfully downloaded file @source to @destination.', [
+        '@source' => $source,
+        '@destination' => $destination,
+      ]));
+    }
+    return $success;
+  }
+
   /**
    * Check if the attachments are migrated properly.
    *

From 168a15355ea0203c19513771bd7c3085a74dfac1 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 21 Jan 2022 04:30:11 +0000
Subject: [PATCH 389/720] [RW-296] Download PDF preview when migrating files

---
 .../reliefweb_docstore.module                 |  2 +-
 .../Commands/ReliefWebDocstoreCommands.php    | 78 ++++++++++++++++++-
 2 files changed, 78 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
index 39d4a5d35..0ca6e0d3b 100644
--- a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
+++ b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
@@ -151,7 +151,7 @@ function reliefweb_docstore_entity_revision_delete(EntityInterface $entity) {
   //
   // Check if the entity has any reliefweb_file field, in which case we
   // invoke ::updateRemoteDocumentFileReferences() to update remote file
-  // references in the remote document resource associated with the resource.
+  // references in the remote document resource associated with the entity.
   foreach ($entity as $field) {
     if ($field instanceof ReliefWebFileList) {
       $field->updateRemoteDocumentFileReferences();
diff --git a/html/modules/custom/reliefweb_docstore/src/Commands/ReliefWebDocstoreCommands.php b/html/modules/custom/reliefweb_docstore/src/Commands/ReliefWebDocstoreCommands.php
index 26eac2fb5..6ba097a65 100644
--- a/html/modules/custom/reliefweb_docstore/src/Commands/ReliefWebDocstoreCommands.php
+++ b/html/modules/custom/reliefweb_docstore/src/Commands/ReliefWebDocstoreCommands.php
@@ -11,6 +11,7 @@
 use Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile;
 use Drupal\reliefweb_docstore\Services\DocstoreClient;
 use Drupal\reliefweb_utility\Helpers\LegacyHelper;
+use Drupal\reliefweb_utility\Helpers\UrlHelper;
 use Drupal\reliefweb_utility\Traits\EntityDatabaseInfoTrait;
 use Drush\Commands\DrushCommands;
 use GuzzleHttp\Psr7\Utils;
@@ -195,7 +196,7 @@ public function migrateAttachments($options = [
   protected function migrateFiles(array $ids, $base_url, $local = FALSE) {
     $query = Database::getConnection('default', 'rwint7')
       ->select('field_data_field_file', 'f')
-      ->fields('f', ['entity_id'])
+      ->fields('f', ['entity_id', 'field_file_description'])
       ->condition('f.entity_type', 'node', '=')
       ->condition('f.entity_id', $ids, 'IN');
 
@@ -258,6 +259,7 @@ protected function prepareFileData(array $record, $base_url) {
       $file['file_uuid'] = $file_uuid;
       $file['url'] = $url;
       $file['private'] = strpos($file['uri'], 'private://') === 0;
+      $file['preview_url'] = $this->getPreviewUrl($record, $base_url);
     }
     else {
       $this->logger()->error(dt('No database entry found for file @uri.', [
@@ -267,6 +269,27 @@ protected function prepareFileData(array $record, $base_url) {
     return $file;
   }
 
+  /**
+   * Get the preview URL for the file record.
+   *
+   * @param array $record
+   *   D7 file record.
+   * @param string $base_url
+   *   The base url of the site from which to retrieve the files.
+   *
+   * @return string
+   *   D7 preview URL.
+   */
+  protected function getPreviewUrl(array $record, $base_url) {
+    if (preg_match('/\|\d+\|(0|90|-90)$/', $record['field_file_description']) === 1) {
+      $filename = basename(urldecode($record['filename']), '.pdf');
+      $filename = str_replace('%', '', $filename);
+      $filename = UrlHelper::encodePath($record['fid'] . '-' . $filename . '.png');
+      return $base_url . '/sites/reliefweb.int/files/resources-pdf-previews/' . $filename;
+    }
+    return '';
+  }
+
   /**
    * Migrate files to their local storage.
    *
@@ -283,6 +306,8 @@ protected function migrateLocalFiles(array $entities) {
       foreach ($files as $file) {
         if ($this->downloadLocalFile($file)) {
           $count++;
+          // Try to download the file preview.
+          $this->downloadFilePreview($file);
         }
       }
     }
@@ -307,6 +332,8 @@ protected function migrateRemoteFiles(array $entities) {
         $uuid = $this->createOrUpdateRemoteFile($file);
         if ($uuid !== FALSE) {
           $uuids[] = $uuid;
+          // Try to download the file preview.
+          $this->downloadFilePreview($file);
         }
       }
       $this->updateOrCreateRemoteDocument($entity_id, $uuids);
@@ -371,6 +398,55 @@ protected function downloadLocalFile(array $file) {
     return $success;
   }
 
+  /**
+   * Download an attachment's preview file to its local location.
+   *
+   * @param array $file
+   *   Legacy file data.
+   */
+  protected function downloadFilePreview(array $file) {
+    if (!empty($file['preview_url'])) {
+      $uri = str_replace('/attachments/', '/previews/', $file['uri']);
+      $uri = preg_replace('#\.pdf$#i', '.png', $uri);
+      $url = $file['preview_url'];
+
+      if (ReliefWebFile::prepareDirectory($uri)) {
+        try {
+          $input = Utils::TryFopen($url, 'r');
+          $output = Utils::TryFopen($uri, 'w');
+          $success = stream_copy_to_stream($input, $output);
+        }
+        catch (\Exception $exception) {
+          $this->logger()->error(dt('Unable to download preview file @url to @uri: @message.', [
+            '@url' => $url,
+            '@uri' => $uri,
+            '@message' => $exception->getMessage(),
+          ]));
+          return FALSE;
+        }
+      }
+      else {
+        $this->logger()->error(dt('Unable to create preview directory for @uri.', [
+          '@uri' => $uri,
+        ]));
+        return FALSE;
+      }
+
+      if (empty($success)) {
+        $this->logger()->error(dt('Unable to download preview file @url to @uri.', [
+          '@url' => $url,
+          '@uri' => $uri,
+        ]));
+      }
+      else {
+        $this->logger()->info(dt('Successfully downloaded preview file @url to @uri.', [
+          '@url' => $url,
+          '@uri' => $uri,
+        ]));
+      }
+    }
+  }
+
   /**
    * Create or update a remote file with the database file data.
    *

From 6d10c40baef75b6eed1f1dc059295005f6bcbf5d Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 21 Jan 2022 12:09:05 +0000
Subject: [PATCH 390/720] [RW-319] Add guidelines config

---
 config/reliefweb_guidelines.settings.yml             |  3 +++
 .../optional/reliefweb_guidelines.settings.yml       |  6 ++++++
 .../src/Commands/ReliefWebGuidelinesCommands.php     | 12 ++++++------
 3 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 config/reliefweb_guidelines.settings.yml
 create mode 100644 html/modules/custom/reliefweb_guidelines/config/optional/reliefweb_guidelines.settings.yml

diff --git a/config/reliefweb_guidelines.settings.yml b/config/reliefweb_guidelines.settings.yml
new file mode 100644
index 000000000..09af15f2a
--- /dev/null
+++ b/config/reliefweb_guidelines.settings.yml
@@ -0,0 +1,3 @@
+trello_key: null
+trello_token: null
+trello_board_id: null
diff --git a/html/modules/custom/reliefweb_guidelines/config/optional/reliefweb_guidelines.settings.yml b/html/modules/custom/reliefweb_guidelines/config/optional/reliefweb_guidelines.settings.yml
new file mode 100644
index 000000000..dcf14e41e
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/config/optional/reliefweb_guidelines.settings.yml
@@ -0,0 +1,6 @@
+# Trello API key.
+trello_key:
+# Trello API token.
+trello_token:
+# Trello Guidelines board id.
+trello_board_id:
diff --git a/html/modules/custom/reliefweb_guidelines/src/Commands/ReliefWebGuidelinesCommands.php b/html/modules/custom/reliefweb_guidelines/src/Commands/ReliefWebGuidelinesCommands.php
index 953974808..cb08ca6ed 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Commands/ReliefWebGuidelinesCommands.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Commands/ReliefWebGuidelinesCommands.php
@@ -78,7 +78,7 @@ public function __construct(
     $this->entityTypeManager = $entity_type_manager;
     $this->fileSystem = $file_system;
     $this->httpClient = $http_client;
-    $this->trelloConfig = $config_factory->get('reliefweb_trello.settings');
+    $this->trelloConfig = $config_factory->get('reliefweb_guidelines.settings');
   }
 
   /**
@@ -94,9 +94,9 @@ public function __construct(
    * @validate-module-enabled reliefweb_guidelines,reliefweb_utility
    */
   public function migrateFromTrello() {
-    $key = $this->trelloConfig->get('key');
-    $token = $this->trelloConfig->get('token');
-    $board_id = $this->trelloConfig->get('board_id');
+    $key = $this->trelloConfig->get('trello_key');
+    $token = $this->trelloConfig->get('trello_token');
+    $board_id = $this->trelloConfig->get('trello_board_id');
 
     if (empty($key) || empty($token) || empty($board_id)) {
       $this->logger->error('Missing Trello key, token or board id.');
@@ -470,8 +470,8 @@ protected function getCardAttachments($card_id) {
    */
   protected function fetchData($url, array $parameters = []) {
     $parameters += [
-      'key' => $this->trelloConfig->get('key'),
-      'token' => $this->trelloConfig->get('token'),
+      'key' => $this->trelloConfig->get('trello_key'),
+      'token' => $this->trelloConfig->get('trello_token'),
     ];
 
     $url = Url::fromUri($url, [

From 6a95bf5e6f96cd558e32d4c124155f9e30e34f2f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 22 Jan 2022 03:39:43 +0000
Subject: [PATCH 391/720] Bump nanoid in
 /html/themes/custom/common_design_subtheme

Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.25 to 3.2.0.
- [Release notes](https://github.com/ai/nanoid/releases)
- [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ai/nanoid/compare/3.1.25...3.2.0)

---
updated-dependencies:
- dependency-name: nanoid
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 html/themes/custom/common_design_subtheme/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/package-lock.json b/html/themes/custom/common_design_subtheme/package-lock.json
index e5cfa99f2..1f0fb068d 100644
--- a/html/themes/custom/common_design_subtheme/package-lock.json
+++ b/html/themes/custom/common_design_subtheme/package-lock.json
@@ -6300,9 +6300,9 @@
       "dev": true
     },
     "nanoid": {
-      "version": "3.1.25",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz",
-      "integrity": "sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q=="
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz",
+      "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA=="
     },
     "nanomatch": {
       "version": "1.2.13",

From 35a10d3a915fd062da5fc3b192260133fc622998 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jan 2022 14:41:38 +0000
Subject: [PATCH 392/720] Bump node-fetch in
 /html/themes/custom/common_design_subtheme

Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.2 to 2.6.7.
- [Release notes](https://github.com/node-fetch/node-fetch/releases)
- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.2...v2.6.7)

---
updated-dependencies:
- dependency-name: node-fetch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../common_design_subtheme/package-lock.json  | 35 ++++++++++++++++---
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/package-lock.json b/html/themes/custom/common_design_subtheme/package-lock.json
index 1f0fb068d..76284a530 100644
--- a/html/themes/custom/common_design_subtheme/package-lock.json
+++ b/html/themes/custom/common_design_subtheme/package-lock.json
@@ -6335,10 +6335,37 @@
       "dev": true
     },
     "node-fetch": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.2.tgz",
-      "integrity": "sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA==",
-      "dev": true
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "dev": true,
+      "requires": {
+        "whatwg-url": "^5.0.0"
+      },
+      "dependencies": {
+        "tr46": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+          "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
+          "dev": true
+        },
+        "webidl-conversions": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+          "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=",
+          "dev": true
+        },
+        "whatwg-url": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+          "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+          "dev": true,
+          "requires": {
+            "tr46": "~0.0.3",
+            "webidl-conversions": "^3.0.0"
+          }
+        }
+      }
     },
     "node-int64": {
       "version": "0.4.0",

From 4cdb7e00eeca7910d4ffbe85482ecee92714321c Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 26 Jan 2022 19:39:17 -0700
Subject: [PATCH 393/720] RW-285 set rule for display of field in safari only
 so div respects top margin instead of collapsing due to preceding hidden div

---
 .../components/rw-form/rw-form.css                       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index b0a9584ed..f2d292c3f 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -404,6 +404,15 @@ form #edit-organization #edit-field-source-allowed .form-item:last-child {
   margin: 0;
 }
 
+/* Source Origin field Safari hack
+This is needed because the preceding field: field--name-field-ocha-product
+is hidden and in Safari the margin collapses unless its display is inline-block */
+@media not all and (min-resolution:.001dpcm) { @media {
+  form > * .form-wrapper.field--name-field-origin {
+    display: inline-block
+  }
+}}
+
 /* Term form Disable Notifications checkbox is inside #actions fieldset */
 form > #actions legend + .form-type-checkbox.form-item-notifications-content-disable,
 .form-item-notifications-content-disable + .form-actions {

From 250c10da5b9f6a66ef37985dcfbd9d1772b86b3a Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 26 Jan 2022 19:41:32 -0700
Subject: [PATCH 394/720] RW-323 guideline form vertical rhythm

---
 .../common_design_subtheme/components/rw-toc/rw-toc.css       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css b/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
index 9f4d22480..89d5bebe4 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-toc/rw-toc.css
@@ -80,6 +80,7 @@
 .rw-sectioned-content > form > .form-wrapper,
 .rw-sectioned-content > form > .form-item,
 .node-form > fieldset,
+.guideline-form > fieldset,
 .taxonomy-term-form > fieldset,
 .taxonomy-term-form > .form-wrapper {
   position: relative;
@@ -92,6 +93,7 @@
 .rw-sectioned-content > form > .form-wrapper:first-child,
 .rw-sectioned-content > form > .form-item:first-child,
 .node-form > fieldset:first-child,
+.guideline-form > fieldset:first-child,
 .taxonomy-term-form > .form-wrapper:first-child {
   padding-top: 0;
 }
@@ -100,6 +102,7 @@
 .rw-sectioned-content > form > .form-wrapper:last-child,
 .rw-sectioned-content > form > .form-item:last-child,
 .node-form > fieldset:last-child,
+.guideline-form > fieldset:last-child,
 .taxonomy-term-form > fieldset:last-child {
   padding-bottom: 0;
   border-bottom: none;
@@ -237,6 +240,7 @@
 
 /* Reset flow on TOC elements so there is no gap between them */
 .node-form fieldset,
+.guideline-form fieldset,
 .taxonomy-term-form fieldset,
 .taxonomy-term-form .field--name-field-job-import-feed.form-wrapper {
   margin-top: 0;

From f535b8bf1e897b644922483ec5a95fd1593e520f Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 26 Jan 2022 19:44:36 -0700
Subject: [PATCH 395/720] RW-324 set height of select for omnibox and special
 rule to remove background on Safari, and replace arrow icons which
 -webkit-appearance: none removes

---
 .../components/rw-moderation/rw-moderation.css     | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
index 73065f9c4..b988aae23 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
@@ -57,8 +57,20 @@
 }
 .rw-moderation-filters .rw-moderation-filter-omnibox .fieldset-wrapper select {
   width: auto;
-  /* height: 100%; */
+  height: 46px;
 }
+
+/* stylelint-disable */
+/* Safari hack to remove browser style and reinstate arrows */
+@media not all and (min-resolution: 0.001dpcm) { @media {
+  .rw-moderation-filters .rw-moderation-filter-omnibox .fieldset-wrapper select {
+    background: url(data:image/svg+xml;base64,PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0Ljk1IDEwIj48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6I2ZmZjt9LmNscy0ye2ZpbGw6IzQ0NDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPmFycm93czwvdGl0bGU+PHJlY3QgY2xhc3M9ImNscy0xIiB3aWR0aD0iNC45NSIgaGVpZ2h0PSIxMCIvPjxwb2x5Z29uIGNsYXNzPSJjbHMtMiIgcG9pbnRzPSIxLjQxIDQuNjcgMi40OCAzLjE4IDMuNTQgNC42NyAxLjQxIDQuNjciLz48cG9seWdvbiBjbGFzcz0iY2xzLTIiIHBvaW50cz0iMy41NCA1LjMzIDIuNDggNi44MiAxLjQxIDUuMzMgMy41NCA1LjMzIi8+PC9zdmc+) no-repeat 95% 50%;
+    -webkit-appearance: none;
+    appearance: none;
+  }
+}}
+/* stylelint-enable */
+
 .rw-moderation-filters .rw-moderation-filter-omnibox div[data-autocomplete] > input {
   border-right: 2px solid var(--cd-reliefweb-brand-grey--light);
 }

From caed1b427de1834324660a39ea0322f55c8d4b10 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 26 Jan 2022 19:47:19 -0700
Subject: [PATCH 396/720] RW-285 stylelint disable rule

---
 .../common_design_subtheme/components/rw-form/rw-form.css       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index f2d292c3f..0222e4fca 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -404,6 +404,7 @@ form #edit-organization #edit-field-source-allowed .form-item:last-child {
   margin: 0;
 }
 
+/* stylelint-disable */
 /* Source Origin field Safari hack
 This is needed because the preceding field: field--name-field-ocha-product
 is hidden and in Safari the margin collapses unless its display is inline-block */
@@ -412,6 +413,7 @@ is hidden and in Safari the margin collapses unless its display is inline-block
     display: inline-block
   }
 }}
+/* stylelint-enable */
 
 /* Term form Disable Notifications checkbox is inside #actions fieldset */
 form > #actions legend + .form-type-checkbox.form-item-notifications-content-disable,

From 347644b1d9115509720a4f8670570d40c720faa2 Mon Sep 17 00:00:00 2001
From: "Peter Droogmans (attiks)" <peter@attiks.com>
Date: Thu, 27 Jan 2022 09:13:45 +0100
Subject: [PATCH 397/720] RW-326: Update guidelines

---
 composer.lock | 14 +++++++-------
 symfony.lock  |  3 +++
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/composer.lock b/composer.lock
index 9e9549616..bedbff1f3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2972,17 +2972,17 @@
         },
         {
             "name": "drupal/guidelines",
-            "version": "1.0.0",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/guidelines.git",
-                "reference": "1.0.0"
+                "reference": "1.0.2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/guidelines-1.0.0.zip",
-                "reference": "1.0.0",
-                "shasum": "2ccc48898982e03c993b46b00e06daff8900e34c"
+                "url": "https://ftp.drupal.org/files/projects/guidelines-1.0.2.zip",
+                "reference": "1.0.2",
+                "shasum": "686ad25f09f144d774df014f0565c4ccfd61e93c"
             },
             "require": {
                 "drupal/core": "^9"
@@ -2990,8 +2990,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "1.0.0",
-                    "datestamp": "1639049991",
+                    "version": "1.0.2",
+                    "datestamp": "1643270618",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
diff --git a/symfony.lock b/symfony.lock
index 5a6ffa6ca..35165cb3c 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -418,6 +418,9 @@
     "react/promise": {
         "version": "v2.8.0"
     },
+    "reliefweb/api-indexer": {
+        "version": "v2.0.2"
+    },
     "reliefweb/simple-autocomplete": {
         "version": "v1.3.0"
     },

From 428bcb3d560acdd28524301c1ef87105f6b7d1ff Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 27 Jan 2022 09:58:57 -0700
Subject: [PATCH 398/720] RW-321 remove zero margin so vertical rhythm applies

---
 .../common_design_subtheme/components/rw-search/rw-search.css    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css b/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css
index 2d13e0d15..5adc0b3d4 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css
@@ -102,7 +102,6 @@
 
 /* Search Results page */
 .rw-search-results .rw-river-search {
-  margin: 0;
   padding-bottom: 0;
   border-bottom: none;
 }

From 5512c5274765d23c633641fccec9f7d5ac1f96a9 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 27 Jan 2022 15:00:34 -0700
Subject: [PATCH 399/720] RW-324 remove radius on select elements so it matches
 neighbour, add min-width to ensure labels fit

---
 .../components/rw-moderation/rw-moderation.css                  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
index b988aae23..aa260bfcb 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
@@ -57,6 +57,7 @@
 }
 .rw-moderation-filters .rw-moderation-filter-omnibox .fieldset-wrapper select {
   width: auto;
+  min-width: 180px;
   height: 46px;
 }
 
@@ -67,6 +68,7 @@
     background: url(data:image/svg+xml;base64,PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0Ljk1IDEwIj48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6I2ZmZjt9LmNscy0ye2ZpbGw6IzQ0NDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPmFycm93czwvdGl0bGU+PHJlY3QgY2xhc3M9ImNscy0xIiB3aWR0aD0iNC45NSIgaGVpZ2h0PSIxMCIvPjxwb2x5Z29uIGNsYXNzPSJjbHMtMiIgcG9pbnRzPSIxLjQxIDQuNjcgMi40OCAzLjE4IDMuNTQgNC42NyAxLjQxIDQuNjciLz48cG9seWdvbiBjbGFzcz0iY2xzLTIiIHBvaW50cz0iMy41NCA1LjMzIDIuNDggNi44MiAxLjQxIDUuMzMgMy41NCA1LjMzIi8+PC9zdmc+) no-repeat 95% 50%;
     -webkit-appearance: none;
     appearance: none;
+    border-radius: 0;
   }
 }}
 /* stylelint-enable */

From fbedd8c3689b38b976dfebcebfde30ee0ad7037b Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 27 Jan 2022 15:05:11 -0700
Subject: [PATCH 400/720] RW-322 rule to clear autocomplete input after float
 on label with guideline icon

---
 .../components/rw-guidelines/rw-guidelines.css               | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
index faa18de38..c9890b45a 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
@@ -116,3 +116,8 @@ form[data-with-guidelines] .rw-guideline > div > .content {
 form[data-with-guidelines] .rw-guideline > div > .rw-guideline__content img {
   border: 4px solid var(--cd-reliefweb-brand-grey--light);
 }
+
+/* Clear the float on preceding label to prevent extra height on the div */
+form[data-with-guidelines] .rw-autocomplete--with-show-all {
+  clear: both;
+}

From 7f73983ec817be3124913e6c6f51a4f2f42cd539 Mon Sep 17 00:00:00 2001
From: Peter Lieverdink <lieverdink@reliefweb.int>
Date: Fri, 28 Jan 2022 11:16:14 +1100
Subject: [PATCH 401/720] [OPS-8024] Allow lua access to an extra env var
 without a custom config file or global config changes.

---
 docker/Dockerfile           |   5 +-
 docker/etc/nginx/nginx.conf | 156 ------------------------------------
 2 files changed, 3 insertions(+), 158 deletions(-)
 delete mode 100644 docker/etc/nginx/nginx.conf

diff --git a/docker/Dockerfile b/docker/Dockerfile
index fe0051d08..87e7cccc9 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -59,7 +59,9 @@ RUN mkdir -p /etc/nginx/custom && \
     cd /tmp && \
     git clone --branch=0.0.7 https://github.com/thibaultcha/lua-resty-jit-uuid.git && \
     cp lua-resty-jit-uuid/lib/resty/jit-uuid.lua /usr/share/lua/common/resty/ && \
-    rm -rf /tmp/lua-resty-jit-uuid
+    rm -rf /tmp/lua-resty-jit-uuid && \
+    # Permit nginx access to the X_DOCSTORE_PROVIDER_UUID env variable.
+    sed -i 's/env NGINX_OVERRIDE_PROTOCOL;/env NGINX_OVERRIDE_PROTOCOL;\n\n## Allow retrieval of a particular file version from the docstore.\nenv X_DOCSTORE_PROVIDER_UUID;/' /etc/nginx/nginx.conf
 
 COPY --from=builder /srv/www/config /srv/www/config/
 COPY --from=builder /srv/www/html /srv/www/html/
@@ -70,7 +72,6 @@ COPY --from=builder /srv/www/composer.lock /srv/www/composer.lock
 COPY --from=builder /srv/www/symfony.lock /srv/www/symfony.lock
 COPY --from=builder /srv/www/patches /srv/www/patches
 COPY --from=builder /srv/www/scripts /srv/www/scripts
-COPY --from=builder /srv/www/docker/etc/nginx/nginx.conf /etc/nginx/nginx.conf
 COPY --from=builder /srv/www/docker/etc/nginx/apps/drupal/fastcgi_drupal.conf /etc/nginx/apps/drupal/fastcgi_drupal.conf
 COPY --from=builder /srv/www/docker/etc/nginx/apps/drupal/drupal.conf /etc/nginx/apps/drupal/drupal.conf
 COPY --from=builder /srv/www/docker/etc/nginx/custom /etc/nginx/custom/
diff --git a/docker/etc/nginx/nginx.conf b/docker/etc/nginx/nginx.conf
deleted file mode 100644
index c4b709397..000000000
--- a/docker/etc/nginx/nginx.conf
+++ /dev/null
@@ -1,156 +0,0 @@
-# -*- mode: nginx; mode: flyspell-prog;  ispell-local-dictionary: "american" -*-
-#
-# This is a "standard" nginx php-fpm config for UN-OCHA sites. It serves the site that lives
-# in /srv/www/html on port 80.
-#
-# This config is based on the Perusio nginx config, but excludes all SSL and microcache config.
-
-user appuser;
-
-worker_processes 1;
-worker_rlimit_nofile 8192;
-
-error_log   /var/log/nginx/error.log warn;
-pid         /var/run/nginx.pid;
-
-# specified in the run script
-# daemon off;
-
-## Enforce the canonical hostname passed as env var.
-## This is used in the default virtual host definition.
-env NGINX_SERVERNAME;
-
-## Allow protocol redirect bypass.
-env NGINX_OVERRIDE_PROTOCOL;
-
-## Allow retrieving a particular file version from the docstore.
-env X_DOCSTORE_PROVIDER_UUID;
-
-## Need LUA to determine the correct server_name.
-load_module /var/lib/nginx/modules/ndk_http_module.so;
-load_module /var/lib/nginx/modules/ngx_http_lua_module.so;
-
-events {
-  worker_connections 1024;
-  multi_accept on;
-}
-
-
-http {
-  include /etc/nginx/mime.types;
-  default_type application/octet-stream;
-
-  log_format main '$remote_addr - $remote_user [$time_local] "$request" '
-    '$status $body_bytes_sent "$http_referer" '
-    '"$http_user_agent" "$http_x_forwarded_for"';
-
-  log_format logstash '$remote_addr - $remote_user [$time_local] "$request" '
-    '$status $body_bytes_sent "$http_referer" "$http_user_agent" $request_time '
-    '$http_host $http_x_forwarded_proto';
-
-  access_log /var/log/nginx/access.log logstash;
-  error_log   /var/log/nginx/error.log;
-
-  ## Use sendfile() syscall to speed up I/O operations and speed up
-  ## static file serving.
-  sendfile on;
-
-  ## Strip local/private IPs from requests via RealIP.
-  set_real_ip_from 127.0.0.1;
-  set_real_ip_from 10.0.0.0/8;
-  set_real_ip_from 172.16.0.0/12;
-  set_real_ip_from 192.168.0.0/16;
-  # The remote IP is forwarded from the load balancer/proxy.
-  real_ip_header X-Forwarded-For;
-  # Enable RealIP recursion.
-  real_ip_recursive on;
-
-  types_hash_max_size 1024;
-  types_hash_bucket_size 512;
-
-  server_names_hash_bucket_size 64;
-  server_names_hash_max_size 512;
-
-  ## Timeouts.
-  client_body_timeout 60;
-  client_header_timeout 60;
-  keepalive_timeout 10 10;
-  send_timeout 60;
-
-  ## Reset lingering timed out connections. Deflect DDoS.
-  reset_timedout_connection on;
-
-  ## Body size.
-  client_max_body_size 100m;
-
-  ## TCP options.
-  tcp_nodelay on;
-  ## Optimization of socket handling when using sendfile.
-  tcp_nopush on;
-
-  ## Compression.
-  gzip on;
-  gzip_buffers 16 8k;
-  gzip_comp_level 1;
-  gzip_http_version 1.1;
-  gzip_min_length 10;
-  gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript image/x-icon application/vnd.ms-fontobject font/opentype application/x-font-ttf image/svg+xml;
-  gzip_vary on;
-  gzip_proxied any; # Compression for all requests.
-  ## No need for regexps.
-  ## See http://wiki.nginx.org/NginxHttpGzipModule#gzip_disable
-  gzip_disable msie6;
-
-  ## Hide the Nginx version number.
-  server_tokens off;
-
-  ## Excluded SSL config.
-
-  ## DNS resolver.
-  ## We use the docker one, which points at the AWS one, so we get internal resolution.
-  resolver 127.0.0.11 ipv6=off;
-
-  ## Enable the builtin cross-site scripting (XSS) filter available
-  ## in modern browsers.  Usually enabled by default we just
-  ## reinstate in case it has been somehow disabled for this
-  ## particular server instance.
-  ## https://www.owasp.org/index.php/List_of_useful_HTTP_headers.
-  map $upstream_http_x_xss_protection $xssprotection {
-      default   $upstream_http_x_xss_protection;
-      ""        "1; mode=block";
-   }
-   add_header X-XSS-Protection $xssprotection;
-
-  ## Block MIME type sniffing on IE.
-  add_header X-Content-Options nosniff;
-
-  ## FastCGI.
-  include /etc/nginx/fastcgi.conf;
-
-  ## Include the upstream servers for PHP FastCGI handling
-  ## configuration. This setup uses UNIX sockets for talking with the
-  ## upstream.
-  include /etc/nginx/upstream_phpcgi_unix.conf;
-
-  ## Support the X-Forwarded-Proto header for fastcgi.
-  map $http_x_forwarded_proto $fastcgi_https {
-    default $https;
-    http '';
-    https on;
-  }
-
-  ## Include the map to block HTTP methods.
-  include /etc/nginx/map_block_http_methods.conf;
-
-  ## Include blocklist for bad bot and referer blocking.
-  include /etc/nginx/blocklist.conf;
-
-  ## Rate limiting. Limits are per remote IP address per backend.
-  include /etc/nginx/ratelimit.conf;
-
-  ## Include the caching setup. Needed for using Drupal with an external cache.
-  include apps/drupal/map_cache.conf;
-
-  ## Include all vhosts.
-  include /etc/nginx/sites-enabled/*.conf;
-}

From 1376bb718e3b57794370c139b87c4c586ac66e0c Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 1 Feb 2022 07:55:13 +0000
Subject: [PATCH 402/720] [RW-265] Add contrib-to-be cloning module

---
 .../custom/content_entity_clone/LICENSE.txt   | 339 ++++++++++++++++++
 .../custom/content_entity_clone/README.md     |  46 +++
 .../custom/content_entity_clone/composer.json |  17 +
 .../schema/content_entity_clone.settings.yml  |  38 ++
 .../content_entity_clone.api.php              |  31 ++
 .../content_entity_clone.info.yml             |   5 +
 .../content_entity_clone.links.menu.yml       |   5 +
 .../content_entity_clone.module               | 253 +++++++++++++
 .../content_entity_clone.permissions.yml      |   7 +
 .../content_entity_clone.routing.yml          |  25 ++
 .../content_entity_clone.services.yml         |   9 +
 .../ContentEntityCloneFieldProcessor.php      |  54 +++
 .../src/Controller/Overview.php               | 116 ++++++
 .../src/Form/BundleSettingsForm.php           | 275 ++++++++++++++
 .../ParamConverter/EntityTypeConverter.php    |  54 +++
 .../src/Plugin/FieldProcessorPluginBase.php   |  30 ++
 .../Plugin/FieldProcessorPluginInterface.php  |  40 +++
 .../Plugin/FieldProcessorPluginManager.php    |  61 ++++
 .../FieldProcessorPluginManagerInterface.php  |  31 ++
 .../FieldProcessor/CopyValues.php             |  26 ++
 .../FieldProcessor/EntityLabelCloneSuffix.php |  65 ++++
 21 files changed, 1527 insertions(+)
 create mode 100644 html/modules/custom/content_entity_clone/LICENSE.txt
 create mode 100644 html/modules/custom/content_entity_clone/README.md
 create mode 100644 html/modules/custom/content_entity_clone/composer.json
 create mode 100644 html/modules/custom/content_entity_clone/config/schema/content_entity_clone.settings.yml
 create mode 100644 html/modules/custom/content_entity_clone/content_entity_clone.api.php
 create mode 100644 html/modules/custom/content_entity_clone/content_entity_clone.info.yml
 create mode 100644 html/modules/custom/content_entity_clone/content_entity_clone.links.menu.yml
 create mode 100644 html/modules/custom/content_entity_clone/content_entity_clone.module
 create mode 100644 html/modules/custom/content_entity_clone/content_entity_clone.permissions.yml
 create mode 100644 html/modules/custom/content_entity_clone/content_entity_clone.routing.yml
 create mode 100644 html/modules/custom/content_entity_clone/content_entity_clone.services.yml
 create mode 100644 html/modules/custom/content_entity_clone/src/Annotation/ContentEntityCloneFieldProcessor.php
 create mode 100644 html/modules/custom/content_entity_clone/src/Controller/Overview.php
 create mode 100644 html/modules/custom/content_entity_clone/src/Form/BundleSettingsForm.php
 create mode 100644 html/modules/custom/content_entity_clone/src/ParamConverter/EntityTypeConverter.php
 create mode 100644 html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginBase.php
 create mode 100644 html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginInterface.php
 create mode 100644 html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginManager.php
 create mode 100644 html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginManagerInterface.php
 create mode 100644 html/modules/custom/content_entity_clone/src/Plugin/content_entity_clone/FieldProcessor/CopyValues.php
 create mode 100644 html/modules/custom/content_entity_clone/src/Plugin/content_entity_clone/FieldProcessor/EntityLabelCloneSuffix.php

diff --git a/html/modules/custom/content_entity_clone/LICENSE.txt b/html/modules/custom/content_entity_clone/LICENSE.txt
new file mode 100644
index 000000000..d159169d1
--- /dev/null
+++ b/html/modules/custom/content_entity_clone/LICENSE.txt
@@ -0,0 +1,339 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/html/modules/custom/content_entity_clone/README.md b/html/modules/custom/content_entity_clone/README.md
new file mode 100644
index 000000000..54fde1cc7
--- /dev/null
+++ b/html/modules/custom/content_entity_clone/README.md
@@ -0,0 +1,46 @@
+Content Entity Clone
+====================
+
+This module enables "cloning" content entities.
+
+In the context of this module, cloning means prepopulating an entity creation
+from with the field values of an existing entity.
+
+Features
+--------
+
+This module provides an overview of the content entity types and their bundles
+that can be cloned at /admin/config/content_entity_clone.
+
+This overview has links to configure cloning for a bundle (or entity type) and
+manage how to process the fields (ex: skip, copy or something else). See below.
+
+This module also adds a "clone" local task link for entities for which cloning
+has been enabled.
+
+Field processing
+----------------
+
+A simple field processor plugin system is provided that allow to tranform
+a field's values before it is copied to the new entity to be created.
+
+See `\Drupal\content_entity_clone\Plugin\FieldProcessorInterface`.
+
+Compatibility
+-------------
+
+This module should work with any entity type implementing the
+`\Drupal\Core\Entity\ContentEntityTypeInterface` and with an entity creation
+form.
+
+Alternatives
+------------
+
+- [Quick node clone](https://www.drupal.org/project/quick_node_clone)
+- [Entity Clone](https://www.drupal.org/project/entity_clone)
+
+TODO
+----
+
+- [ ] Add form to add settings to the plugins.
+- [ ] Add tests.
diff --git a/html/modules/custom/content_entity_clone/composer.json b/html/modules/custom/content_entity_clone/composer.json
new file mode 100644
index 000000000..04d42bf3c
--- /dev/null
+++ b/html/modules/custom/content_entity_clone/composer.json
@@ -0,0 +1,17 @@
+{
+  "name": "drupal/content_entity_clone",
+  "description": "Provides cloning of content entity types.",
+  "type": "drupal-module",
+  "homepage": "https://www.drupal.org/project/content_entity_clone",
+  "authors": [
+    {
+      "name": "orakili",
+      "homepage": "https://www.drupal.org/u/orakili"
+    }
+  ],
+  "support": {
+    "issues": "https://www.drupal.org/project/issues/content_entity_clone",
+    "source": "https://git.drupal.org/project/content_entity_clone.git"
+  },
+  "license": "GPL-2.0+"
+}
diff --git a/html/modules/custom/content_entity_clone/config/schema/content_entity_clone.settings.yml b/html/modules/custom/content_entity_clone/config/schema/content_entity_clone.settings.yml
new file mode 100644
index 000000000..ce7d1ed9e
--- /dev/null
+++ b/html/modules/custom/content_entity_clone/config/schema/content_entity_clone.settings.yml
@@ -0,0 +1,38 @@
+content_entity_clone.bundle.settings.*.*:
+  type: config_object
+  label: 'Content entity clone field settings for the bundle.'
+  mapping:
+    enabled:
+      type: boolean
+      label: 'Enable cloning for this bundle.'
+    local_task_label:
+      type: string
+      translatable: true
+      label: 'Text of the local task link label.'
+    fields:
+      type: sequence
+      label: 'List of fields and their processor.'
+      sequence:
+        type: mapping
+        label: 'Field settings.'
+        mapping:
+          processor:
+            type: mapping
+            label: 'Field processor ID and settings.'
+            mapping:
+              id:
+                type: string
+                label: 'Field processor plugin ID.'
+              settings:
+                type: content_entity_clone.field_processor.settings.[%parent.id]
+                label: 'Plugin settings.'
+
+
+# Example of a plugin settings.
+content_entity_clone.field_processor.settings.add_suffix:
+  type: mapping
+  label: 'Add suffix settings.'
+  mapping:
+    suffix:
+      type: string
+      label: 'Suffix.'
diff --git a/html/modules/custom/content_entity_clone/content_entity_clone.api.php b/html/modules/custom/content_entity_clone/content_entity_clone.api.php
new file mode 100644
index 000000000..2a5f7a4ae
--- /dev/null
+++ b/html/modules/custom/content_entity_clone/content_entity_clone.api.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * @file
+ * Content entity clone hooks.
+ */
+
+/**
+ * Alter the field processor plugin definitions.
+ *
+ * @param array $definitions
+ *   The field processor plugin definitions.
+ *
+ * @see Drupal\content_entity_clone\Annotation\ContentEntityCloneFieldProcessor
+ * @see Drupal\content_entity_clone\Plugin\FieldProcessorPluginInterface
+ */
+function hook_content_entity_clone_field_processor_info_alter(array &$definitions) {
+  // Add an uppercase field processor.
+  //
+  // This is just to illustrate the available properties. Processors should be
+  // added in "Drupal\mymodule\Plugin\content_entity_clone\FieldProcessor" and
+  // use the "@ContentEntityCloneFieldProcessor" plugin annotation.
+  $definitions['uppercase'] = [
+    "fieldTypes" => ['text', 'string'],
+    "id" => "uppercase",
+    "label" => t('Uppercase'),
+    "description" => t('Make the field values uppercase.'),
+    "class" => "Drupal\mymodule\Plugin\content_entity_clone\FieldProcessor\Uppercase",
+    "provider" => "mymodule",
+  ];
+}
diff --git a/html/modules/custom/content_entity_clone/content_entity_clone.info.yml b/html/modules/custom/content_entity_clone/content_entity_clone.info.yml
new file mode 100644
index 000000000..bbd851a8f
--- /dev/null
+++ b/html/modules/custom/content_entity_clone/content_entity_clone.info.yml
@@ -0,0 +1,5 @@
+type: module
+name: Content Entity Clone
+description: 'Provides content entity cloning.'
+package: reliefweb
+core_version_requirement: ^9
diff --git a/html/modules/custom/content_entity_clone/content_entity_clone.links.menu.yml b/html/modules/custom/content_entity_clone/content_entity_clone.links.menu.yml
new file mode 100644
index 000000000..9ba360c26
--- /dev/null
+++ b/html/modules/custom/content_entity_clone/content_entity_clone.links.menu.yml
@@ -0,0 +1,5 @@
+content_entity_clone.overview:
+  title: 'Entity cloning'
+  parent: system.admin_config_content
+  description: 'Configure which content entity type and bundle can be cloned.'
+  route_name: content_entity_clone.overview
diff --git a/html/modules/custom/content_entity_clone/content_entity_clone.module b/html/modules/custom/content_entity_clone/content_entity_clone.module
new file mode 100644
index 000000000..13711f6ea
--- /dev/null
+++ b/html/modules/custom/content_entity_clone/content_entity_clone.module
@@ -0,0 +1,253 @@
+<?php
+
+/**
+ * @file
+ * Content entity clone module file.
+ */
+
+use Drupal\Core\Cache\RefinableCacheableDependencyInterface;
+use Drupal\Core\Entity\ContentEntityInterface;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Url;
+use Symfony\Component\Routing\Exception\RouteNotFoundException;
+
+/**
+ * Implements hook_help().
+ */
+function content_entity_clone_help($route_name, RouteMatchInterface $route_match) {
+  if ($route_name === 'help.page.content_entity_clone') {
+    $output = '<h3>' . t('About') . '</h3>';
+    $output .= '<p>' . t('This module enables cloning content entities.') . '</p>';
+    return $output;
+  }
+}
+
+/**
+ * Implements hook_entity_prepare_form().
+ */
+function content_entity_clone_entity_prepare_form(EntityInterface $entity, $operation, FormStateInterface $form_state) {
+  // Skip if the user doesn't have the permission to clone entities.
+  if (!\Drupal::currentUser()->hasPermission('clone content entities')) {
+    return;
+  }
+
+  // Skip if there is no request parameter to get the original entity.
+  $original_entity_id = \Drupal::request()->get('content_entity_clone');
+  if (empty($original_entity_id)) {
+    return;
+  }
+
+  // Skip if th entity is not valid or is not new.
+  if (empty($entity) || !($entity instanceof ContentEntityInterface) || !$entity->isNew()) {
+    return;
+  }
+
+  // Skip if cloning is not enabled for this entity type bundle.
+  $config = \Drupal::config('content_entity_clone.bundle.settings.' . $entity->getEntityTypeId() . '.' . $entity->bundle());
+  if (!isset($config) || $config->isNew() || empty($config->get('enabled'))) {
+    return;
+  }
+
+  // Skip if there is no field to clone.
+  $fields = $config->get('fields');
+  if (empty($fields)) {
+    return;
+  }
+
+  // Load the entity to clone and skip if none was found.
+  $original = \Drupal::entityTypeManager()
+    ->getStorage($entity->getEntityTypeId())
+    ->load($original_entity_id);
+  if (empty($original)) {
+    return;
+  }
+
+  // Get the field processor plugin manager.
+  $plugin_manager = \Drupal::service('plugin.manager.content_entity_clone.field_processor');
+
+  /** @var \Drupal\Core\Field\FieldItemListInterfac $field */
+  foreach ($original as $field_name => $field) {
+    if (!empty($fields[$field_name]['id'])) {
+      // We clone the field to avoid changing the original entity.
+      $cloned_field = clone $field;
+      // Process the field.
+      $plugin_manager->processField($fields[$field_name]['id'], $cloned_field);
+      // Copy the processed field values to the new entity.
+      $entity->get($field_name)->setValue($cloned_field->getValue());
+    }
+  }
+
+}
+
+/**
+ * Implements hook_module_implements_alter().
+ *
+ * Try to ensure that the content_entity_clone's hook_entity_prepare_form() hook
+ * implementation runs first so that other modules implementing this hook
+ * can operate on the entity with the clone field values.
+ */
+function content_entity_clone_module_implements_alter(&$implementations, $hook) {
+  if ($hook == 'entity_prepare_form' && isset($implementations['content_entity_clone'])) {
+    $implementations = [
+      'content_entity_clone' => $implementations['content_entity_clone'],
+    ] + $implementations;
+  }
+}
+
+/**
+ * Implements hook_menu_local_tasks_alter().
+ */
+function content_entity_clone_menu_local_tasks_alter(&$data, $route_name, RefinableCacheableDependencyInterface &$cacheability) {
+  $user = \Drupal::currentUser();
+
+  // Skip if there are not local tasks.
+  if (empty($data['tabs'][0])) {
+    return;
+  }
+
+  // Skip if the user doesn't have the permission to clone entities.
+  if (!$user->hasPermission('clone content entities')) {
+    return;
+  }
+
+  // Try find the entity type id from the local tasks.
+  foreach ($data['tabs'][0] as $key => $link) {
+    if (preg_match('#^entity.(?<entity_type_id>[^.]+).canonical$#', $key, $matches) !== 1) {
+      continue;
+    }
+
+    // Skip as we cannot retrieve the entity if the canonical link is not
+    // defined properly.
+    if (!isset($link['#link']['url']) || !($link['#link']['url'] instanceof Url)) {
+      return;
+    }
+
+    $entity_type_id = $matches['entity_type_id'];
+    $parameters = $link['#link']['url']->getRouteParameters();
+
+    // Skip as we cannot retrieve the entity if there is no entity id.
+    if (!isset($parameters[$entity_type_id]) || !is_numeric($parameters[$entity_type_id])) {
+      return;
+    }
+
+    $entity = \drupal::entityTypeManager()
+      ->getStorage($entity_type_id)
+      ->load($parameters[$entity_type_id]);
+  }
+  if (!isset($entity) || !($entity instanceof ContentEntityInterface)) {
+    return;
+  }
+
+  // Retrieve the cloning config for the entity bundle if any.
+  $config = \Drupal::config('content_entity_clone.bundle.settings.' . $entity->getEntityTypeId() . '.' . $entity->bundle());
+  if (!isset($config) || $config->isNew() || empty($config->get('enabled'))) {
+    return;
+  }
+
+  // Ensure the local tasks can be refreshed if the configuration changes.
+  $cacheability->addCacheableDependency($config);
+
+  // Get the entity creation route from the entity type.
+  $entity_creation_route_name = content_entity_clone_get_entity_creation_route_name($entity->getEntityType());
+  if (!isset($entity_creation_route_name)) {
+    return;
+  }
+
+  // Pass the entity bundle as route parameter if necessary.
+  $entity_creation_route_parameters = [];
+  $bundle_entity_type_id = $entity->getEntityType()->getBundleEntityType();
+  if (!empty($bundle_entity_type_id)) {
+    $entity_creation_route_parameters = [
+      $bundle_entity_type_id => $entity->bundle(),
+    ];
+  }
+
+  // Check if the user has access to the entity creation route.
+  $access = \Drupal::accessManager()->checkNamedRoute(
+    $entity_creation_route_name,
+    $entity_creation_route_parameters,
+    $user,
+    TRUE
+  );
+
+  // The link is only accesible if the user can also edit the current entity.
+  $access = $access->andIf($entity->access('update', $user, TRUE));
+
+  // Ensure the cacheability is up to date.
+  $cacheability->addCacheableDependency($access);
+
+  // Add a local task to clone the entity.
+  $data['tabs'][0]['content_entity_clone.clone'] = [
+    '#theme' => 'menu_local_task',
+    '#link' => [
+      'title' => $config->get('local_task_label') ?? t('Clone'),
+      'url' => Url::fromRoute($entity_creation_route_name, $entity_creation_route_parameters),
+      'localized_options' => [
+        'query' => [
+          'content_entity_clone' => $entity->id(),
+        ],
+      ],
+    ],
+    '#access' => $access,
+  ];
+}
+
+/**
+ * Retrieve the creation link for the given entity type.
+ *
+ * Note: there is no consistent way to get the route to an entity's creation
+ * form. Nodes for example don't have an `add_form` route or `add-form` link
+ * template. So this methods tries to infer the route from different options.
+ *
+ * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
+ *   Entity type.
+ *
+ * @return string|null
+ *   The route name to create a new entity of the given type.
+ */
+function content_entity_clone_get_entity_creation_route_name(EntityTypeInterface $entity_type) {
+  $entity_type_id = $entity_type->id();
+  $route_provider = \Drupal::service('router.route_provider');
+
+  // First check if there is an add-form route for the entity.
+  try {
+    $route = $route_provider->getRouteByName('entity.' . $entity_type_id . '.add_form');
+    return 'entity.' . $entity_type_id . '.add_form';
+  }
+  // If none, try to get the route from the 'add-form', 'create' or 'collection'
+  // links.
+  catch (RouteNotFoundException $exception) {
+    $bundle_entity_type_id = $entity_type->getBundleEntityType();
+
+    $create_path = '';
+    if ($entity_type->hasLinkTemplate('add-form')) {
+      $create_path = $entity_type->getLinkTemplate('add-form');
+    }
+    elseif ($entity_type->hasLinkTemplate('create')) {
+      $create_path = $entity_type->getLinkTemplate('create') . '/add';
+      if (!empty($bundle_entity_type_id)) {
+        $create_path .= '/{' . $bundle_entity_type_id . '}';
+      }
+    }
+    elseif ($entity_type->hasLinkTemplate('collection')) {
+      $create_path = $entity_type->getLinkTemplate('collection') . '/add';
+      if (!empty($bundle_entity_type_id)) {
+        $create_path .= '/{' . $bundle_entity_type_id . '}';
+      }
+    }
+
+    // Try to get the route matching this creation path.
+    if (!empty($create_path)) {
+      $routes = $route_provider->getRoutesByPattern($create_path);
+      foreach ($routes->getIterator() as $name => $route) {
+        if ($route->getPath() === $create_path) {
+          return $name;
+        }
+      }
+    }
+  }
+  return NULL;
+}
diff --git a/html/modules/custom/content_entity_clone/content_entity_clone.permissions.yml b/html/modules/custom/content_entity_clone/content_entity_clone.permissions.yml
new file mode 100644
index 000000000..51bc45caa
--- /dev/null
+++ b/html/modules/custom/content_entity_clone/content_entity_clone.permissions.yml
@@ -0,0 +1,7 @@
+administer entity cloning:
+  title: 'Administer entity cloning'
+  description: 'Allow users to administer which content entity type can be cloned.'
+
+clone content entities:
+  title: 'Clone content entities'
+  description: 'Allow users to clone content entities.'
diff --git a/html/modules/custom/content_entity_clone/content_entity_clone.routing.yml b/html/modules/custom/content_entity_clone/content_entity_clone.routing.yml
new file mode 100644
index 000000000..77a7dcd25
--- /dev/null
+++ b/html/modules/custom/content_entity_clone/content_entity_clone.routing.yml
@@ -0,0 +1,25 @@
+content_entity_clone.overview:
+  path: '/admin/config/content_entity_clone'
+  options:
+    _admin_route: TRUE
+  defaults:
+    _title: 'Entity Cloning: Overview'
+    _controller: '\Drupal\content_entity_clone\Controller\Overview::getPageContent'
+  requirements:
+    _permission: 'administer entity cloning'
+
+content_entity_clone.bundle.field_settings:
+  path: '/admin/config/content_entity_clone/field_settings/{entity_type}/{bundle}'
+  options:
+    _admin_route: TRUE
+    parameters:
+      entity_type:
+        type: content_entity_clone:entity_type
+  defaults:
+    _title: 'Entity Cloning: Bundle field settings'
+    _title_callback: '\Drupal\content_entity_clone\Form\BundleSettingsForm::getPageTitle'
+    _form: '\Drupal\content_entity_clone\Form\BundleSettingsForm'
+  requirements:
+    _permission: 'administer entity cloning'
+    entity_type: "[a-z0-9_]+"
+    bundle: "[a-z0-9_]+"
diff --git a/html/modules/custom/content_entity_clone/content_entity_clone.services.yml b/html/modules/custom/content_entity_clone/content_entity_clone.services.yml
new file mode 100644
index 000000000..ba08ba63b
--- /dev/null
+++ b/html/modules/custom/content_entity_clone/content_entity_clone.services.yml
@@ -0,0 +1,9 @@
+services:
+  content_entity_clone.service.param_converter:
+    class: Drupal\content_entity_clone\ParamConverter\EntityTypeConverter
+    arguments: ['@entity_type.manager']
+    tags:
+      - { name: paramconverter }
+  plugin.manager.content_entity_clone.field_processor:
+    class: Drupal\content_entity_clone\Plugin\FieldProcessorPluginManager
+    parent: default_plugin_manager
diff --git a/html/modules/custom/content_entity_clone/src/Annotation/ContentEntityCloneFieldProcessor.php b/html/modules/custom/content_entity_clone/src/Annotation/ContentEntityCloneFieldProcessor.php
new file mode 100644
index 000000000..b3302231c
--- /dev/null
+++ b/html/modules/custom/content_entity_clone/src/Annotation/ContentEntityCloneFieldProcessor.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Drupal\content_entity_clone\Annotation;
+
+use Drupal\Component\Annotation\Plugin;
+
+/**
+ * Defines a content entity clone field processor plugin annotation object.
+ *
+ * Plugin Namespace: Plugin\content_entity_clone\FieldProcessor.
+ *
+ * @see \Drupal\content_entity_clone\Plugin\FieldProcessorInterface
+ * @see \Drupal\content_entity_clone\Plugin\FieldProcessorPluginBase
+ * @see \Drupal\content_entity_clone\Plugin\FieldProcessorPluginManager
+ * @see plugin_api
+ *
+ * @Annotation
+ */
+class ContentEntityCloneFieldProcessor extends Plugin {
+
+  /**
+   * The plugin ID.
+   *
+   * @var string
+   */
+  public $id;
+
+  /**
+   * The human-readable name of the field processor.
+   *
+   * @var \Drupal\Core\Annotation\Translation
+   * @ingroup plugin_translatable
+   */
+  public $label;
+
+
+  /**
+   * A short description of the field processor.
+   *
+   * @var \Drupal\Core\Annotation\Translation
+   * @ingroup plugin_translatable
+   */
+  public $description;
+
+  /**
+   * An array of field types the field processor supports.
+   *
+   * If empty, then it applies to all the field types.
+   *
+   * @var array
+   */
+  public $fieldTypes = [];
+
+}
diff --git a/html/modules/custom/content_entity_clone/src/Controller/Overview.php b/html/modules/custom/content_entity_clone/src/Controller/Overview.php
new file mode 100644
index 000000000..6290be119
--- /dev/null
+++ b/html/modules/custom/content_entity_clone/src/Controller/Overview.php
@@ -0,0 +1,116 @@
+<?php
+
+namespace Drupal\content_entity_clone\Controller;
+
+use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\Entity\ContentEntityTypeInterface;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Link;
+use Drupal\Core\Url;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Overview of the content entities with cloning enabled.
+ */
+class Overview extends ControllerBase {
+
+  /**
+   * The config factory.
+   *
+   * @var \Drupal\Core\Config\ConfigFactoryInterface
+   */
+  protected $configFactory;
+
+  /**
+   * The bundle info service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface
+   */
+  protected $bundleInfo;
+
+  /**
+   * The entity type manager service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(
+    ConfigFactoryInterface $config_factory,
+    EntityTypeBundleInfoInterface $bundle_info,
+    EntityTypeManagerInterface $entity_type_manager
+  ) {
+    $this->configFactory = $config_factory;
+    $this->bundleInfo = $bundle_info;
+    $this->entityTypeManager = $entity_type_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('config.factory'),
+      $container->get('entity_type.bundle.info'),
+      $container->get('entity_type.manager')
+    );
+  }
+
+  /**
+   * Get the overview render array.
+   *
+   * @return array
+   *   Render array.
+   */
+  public function getPageContent() {
+    $rows = [];
+    foreach ($this->bundleInfo->getAllBundleInfo() as $entity_type_id => $bundles) {
+      $entity_type = $this->entityTypeManager->getDefinition($entity_type_id);
+      if (!($entity_type instanceof ContentEntityTypeInterface)) {
+        continue;
+      }
+
+      foreach ($bundles as $bundle => $info) {
+        $row = [];
+
+        // Entity label.
+        $row[] = $entity_type->getLabel();
+
+        // Bundle label.
+        $row[] = $info['label'] ?? ucfirst(strtr($bundle, '_', ' '));
+
+        // Status.
+        $id = 'content_entity_clone.bundle.settings.' . $entity_type_id . '.' . $bundle;
+        $config = $this->configFactory->get($id);
+        $enabled = !empty($config) && !empty($config->get('enabled'));
+        $row[] = $enabled ? $this->t('Enabled') : '';
+
+        // Link to edit the cloning setting for the bundle.
+        $url = Url::fromRoute('content_entity_clone.bundle.field_settings', [
+          'entity_type' => $entity_type_id,
+          'bundle' => $bundle,
+        ]);
+        $row[] = Link::fromTextAndUrl($this->t('Edit'), $url);
+
+        $rows[] = $row;
+      }
+    }
+
+    return [
+      '#theme' => 'table',
+      '#header' => [
+        $this->t('Entity Type'),
+        $this->t('Bundle'),
+        $this->t('Status'),
+        $this->t('Field settings'),
+      ],
+      '#rows' => $rows,
+    ];
+  }
+
+}
diff --git a/html/modules/custom/content_entity_clone/src/Form/BundleSettingsForm.php b/html/modules/custom/content_entity_clone/src/Form/BundleSettingsForm.php
new file mode 100644
index 000000000..06510acf7
--- /dev/null
+++ b/html/modules/custom/content_entity_clone/src/Form/BundleSettingsForm.php
@@ -0,0 +1,275 @@
+<?php
+
+namespace Drupal\content_entity_clone\Form;
+
+use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Entity\ContentEntityTypeInterface;
+use Drupal\Core\Entity\EntityFieldManagerInterface;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
+use Drupal\Core\Form\FormBase;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\content_entity_clone\Plugin\FieldProcessorPluginManagerInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+/**
+ * Cotent entity clone - bundle settings form handler.
+ */
+class BundleSettingsForm extends FormBase {
+
+  /**
+   * The config factory.
+   *
+   * @var \Drupal\Core\Config\ConfigFactoryInterface
+   */
+  protected $configFactory;
+
+  /**
+   * The bundle info service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface
+   */
+  protected $bundleInfo;
+
+  /**
+   * The entity field manager service.
+   *
+   * @var \Drupal\Core\Entity\EntityFieldManagerInterface
+   */
+  protected $entityFieldManager;
+
+  /**
+   * The content entity clone field processor plugin manager.
+   *
+   * @var \Drupal\content_entity_clone\Plugin\FieldProcessorPluginManagerInterface
+   */
+  protected $fieldProcessorManager;
+
+  /**
+   * The entity type for this form.
+   *
+   * @var \Drupal\Core\Entity\ContentEntityTypeInferface
+   */
+  protected $entityType;
+
+  /**
+   * The entity bundle for this form.
+   *
+   * @var string
+   */
+  protected $bundle;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(
+    ConfigFactoryInterface $config_factory,
+    EntityTypeBundleInfoInterface $bundle_info,
+    EntityFieldManagerInterface $entity_field_manager,
+    FieldProcessorPluginManagerInterface $field_processor_manager
+  ) {
+    $this->configFactory = $config_factory;
+    $this->bundleInfo = $bundle_info;
+    $this->entityFieldManager = $entity_field_manager;
+    $this->fieldProcessorManager = $field_processor_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('config.factory'),
+      $container->get('entity_type.bundle.info'),
+      $container->get('entity_field.manager'),
+      $container->get('plugin.manager.content_entity_clone.field_processor')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'content_entity_clone_bundle_settings_form';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state, ContentEntityTypeInterface $entity_type = NULL, $bundle = NULL) {
+    $bundle_info = $this->getBundleInfo($entity_type, $bundle);
+    if (empty($bundle_info)) {
+      throw new NotFoundHttpException();
+    }
+
+    // Store the entity type and bundle.
+    $this->entityType = $entity_type;
+    $this->bundle = $bundle;
+
+    // Get the cloning configuration for this bundle.
+    $config = $this->configFactory->get($this->getConfigId());
+
+    // Get the field settings from the configuraton.
+    $defaults = [];
+    foreach ($config->get('fields') ?? [] as $field_name => $info) {
+      if (!empty($info['id'])) {
+        $defaults[$field_name] = $info['id'];
+      }
+    }
+
+    // Get the list of available fields for the bundle and generate a table
+    // with the editable fields and optional processors.
+    $field_definitions = $this->entityFieldManager
+      ->getFieldDefinitions($entity_type->id(), $bundle);
+
+    $form['enabled'] = [
+      '#type' => 'checkbox',
+      '#title' => $this->t('Enable cloning'),
+      '#default_value' => $config->get('enabled') ?? FALSE,
+    ];
+
+    $form['local_task_label'] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Clone local task label'),
+      '#default_value' => $config->get('local_task_label') ?? FALSE,
+    ];
+
+    $form['fields'] = [
+      '#type' => 'table',
+      '#caption' => $this->t('Clonable fields'),
+      '#header' => [
+        $this->t('Field'),
+        $this->t('Processor'),
+      ],
+    ];
+
+    foreach ($field_definitions as $field_name => $field_definition) {
+      if ($field_definition->isInternal() || $field_definition->isComputed() || $field_definition->isReadOnly()) {
+        continue;
+      }
+
+      // Field label.
+      $form['fields'][$field_name]['label'] = [
+        '#plain_text' => $field_definition->getLabel(),
+      ];
+
+      // List of processing plugins.
+      $plugins = $this->fieldProcessorManager->getAvailablePlugins($field_definition);
+      if (empty($plugins)) {
+        $form['fields'][$field_name]['processor'] = [
+          '#plain_text' => $this->t('No processor available'),
+        ];
+      }
+      else {
+        $options = ['' => $this->t('Skip field')];
+        foreach ($plugins as $plugin) {
+          $options[$plugin->getPluginId()] = $plugin->getPluginLabel();
+        }
+
+        $form['fields'][$field_name]['processor'] = [
+          '#type' => 'select',
+          '#title' => $this->t('Processor'),
+          '#title_display' => 'invisible',
+          '#options' => $options,
+          '#default_value' => $defaults[$field_name] ?? NULL,
+        ];
+      }
+    }
+
+    // Add the submit button.
+    $form['actions'] = [
+      '#type' => 'actions',
+      '#theme_wrappers' => [
+        'fieldset' => [
+          '#id' => 'actions',
+          '#title' => $this->t('Actions'),
+          '#title_display' => 'invisible',
+        ],
+      ],
+      '#weight' => 99,
+    ];
+    $form['actions']['submit'] = [
+      '#type' => 'submit',
+      '#name' => 'submit',
+      '#value' => $this->t('Save'),
+    ];
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    $config = $this->configFactory->getEditable($this->getConfigId());
+
+    if (empty($form_state->getValue('enabled'))) {
+      $config->delete();
+    }
+    else {
+      $fields = [];
+      foreach ($form_state->getValue('fields') as $field_name => $data) {
+        if (!empty($data['processor'])) {
+          $fields[$field_name]['id'] = $data['processor'];
+        }
+      }
+      $config->set('enabled', TRUE);
+      $config->set('local_task_label', $form_state->getValue('local_task_label'));
+      $config->set('fields', $fields);
+      $config->save();
+    }
+  }
+
+  /**
+   * Get the config ID.
+   *
+   * @return string
+   *   Config ID.
+   */
+  protected function getConfigId() {
+    return 'content_entity_clone.bundle.settings.' . $this->entityType->id() . '.' . $this->bundle;
+  }
+
+  /**
+   * Validate the entity type and bundle.
+   *
+   * @param \Drupal\Core\Entity\ContentEntityTypeInterface $entity_type
+   *   Entity type.
+   * @param string $bundle
+   *   Entity bundle.
+   *
+   * @return array|false
+   *   FALSE if the entity type or bundle are not valid or the bundle info
+   *   otherwise.
+   */
+  protected function getBundleInfo(ContentEntityTypeInterface $entity_type = NULL, $bundle = NULL) {
+    if (!empty($entity_type)) {
+      $bundles = $this->bundleInfo->getBundleInfo($entity_type->id());
+      return $bundles[$bundle] ?? FALSE;
+    }
+    return FALSE;
+  }
+
+  /**
+   * Get the form title.
+   *
+   * @param \Drupal\Core\Entity\ContentEntityTypeInterface $entity_type
+   *   Entity type.
+   * @param string $bundle
+   *   Entity bundle.
+   *
+   * @return string
+   *   The page title.
+   */
+  public function getPageTitle(ContentEntityTypeInterface $entity_type = NULL, $bundle = NULL) {
+    $bundle_info = $this->getBundleInfo($entity_type, $bundle);
+    if (!empty($bundle_info)) {
+      return $this->t('Entity Cloning Settings: @entity_type - @bundle', [
+        '@entity_type' => $entity_type->getLabel(),
+        '@bundle' => $bundle_info['label'] ?? ucfirst(strtr($bundle, '_', ' ')),
+      ]);
+    }
+    return '';
+  }
+
+}
diff --git a/html/modules/custom/content_entity_clone/src/ParamConverter/EntityTypeConverter.php b/html/modules/custom/content_entity_clone/src/ParamConverter/EntityTypeConverter.php
new file mode 100644
index 000000000..55ed3a4c1
--- /dev/null
+++ b/html/modules/custom/content_entity_clone/src/ParamConverter/EntityTypeConverter.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Drupal\content_entity_clone\ParamConverter;
+
+use Drupal\Core\Entity\ContentEntityTypeInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\ParamConverter\ParamConverterInterface;
+use Symfony\Component\Routing\Route;
+
+/**
+ * Convert an entity bundle into the corresponding moderation service.
+ */
+class EntityTypeConverter implements ParamConverterInterface {
+
+  /**
+   * The entity type manager service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * Constructor.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager service.
+   */
+  public function __construct(
+    EntityTypeManagerInterface $entity_type_manager
+  ) {
+    $this->entityTypeManager = $entity_type_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function convert($value, $definition, $name, array $defaults) {
+    if (!empty($value)) {
+      $entity_type = $this->entityTypeManager->getDefinition($value);
+      if ($entity_type instanceof ContentEntityTypeInterface) {
+        return $entity_type;
+      }
+    }
+    return NULL;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function applies($definition, $name, Route $route) {
+    return !empty($definition['type']) && $definition['type'] == 'content_entity_clone:entity_type';
+  }
+
+}
diff --git a/html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginBase.php b/html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginBase.php
new file mode 100644
index 000000000..e5d6312d6
--- /dev/null
+++ b/html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginBase.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Drupal\content_entity_clone\Plugin;
+
+use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\Core\Plugin\PluginBase;
+
+/**
+ * Base field processor plugin.
+ */
+abstract class FieldProcessorPluginBase extends PluginBase implements FieldProcessorPluginInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getPluginLabel() {
+    $definition = $this->getPluginDefinition();
+    return $definition['label'] ?? $this->getPluginId();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function supports(FieldDefinitionInterface $field_definition) {
+    $type = $field_definition->getType();
+    $definition = $this->getPluginDefinition();
+    return empty($definition['types']) || in_array($type, $definition['types']);
+  }
+
+}
diff --git a/html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginInterface.php b/html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginInterface.php
new file mode 100644
index 000000000..23a7985f8
--- /dev/null
+++ b/html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginInterface.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Drupal\content_entity_clone\Plugin;
+
+use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\Core\Field\FieldItemListInterface;
+
+/**
+ * Interface for the content entity clone field processor plugins.
+ */
+interface FieldProcessorPluginInterface {
+
+  /**
+   * Get the plugin label.
+   *
+   * @return string
+   *   The plugin label.
+   */
+  public function getPluginLabel();
+
+  /**
+   * Check if the plugin can be used for the given field.
+   *
+   * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
+   *   Field definition.
+   *
+   * @return bool
+   *   TRUE if the plugin supports the given field type.
+   */
+  public function supports(FieldDefinitionInterface $field_definition);
+
+  /**
+   * Do something with the given field.
+   *
+   * @param \Drupal\Core\Field\FieldItemListInterface $field
+   *   Field.
+   */
+  public function process(FieldItemListInterface $field);
+
+}
diff --git a/html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginManager.php b/html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginManager.php
new file mode 100644
index 000000000..205bc00a6
--- /dev/null
+++ b/html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginManager.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Drupal\content_entity_clone\Plugin;
+
+use Drupal\Core\Cache\CacheBackendInterface;
+use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Plugin\DefaultPluginManager;
+
+/**
+ * Plugin manager for the content entity clone field processor plugins.
+ */
+class FieldProcessorPluginManager extends DefaultPluginManager implements FieldProcessorPluginManagerInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(
+    \Traversable $namespaces,
+    CacheBackendInterface $cache_backend,
+    ModuleHandlerInterface $module_handler
+  ) {
+    parent::__construct(
+      'Plugin/content_entity_clone/FieldProcessor',
+      $namespaces,
+      $module_handler,
+      'Drupal\content_entity_clone\Plugin\FieldProcessorPluginInterface',
+      'Drupal\content_entity_clone\Annotation\ContentEntityCloneFieldProcessor'
+    );
+
+    $this->setCacheBackend($cache_backend, 'content_entity_clone_field_processor_plugins');
+    $this->alterInfo('content_entity_clone_field_processor_info');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getAvailablePlugins(FieldDefinitionInterface $field_definition) {
+    $plugins = [];
+    foreach ($this->getDefinitions() as $plugin_id => $plugin_definition) {
+      $plugin = $this->createInstance($plugin_id, $plugin_definition);
+      if ($plugin->supports($field_definition)) {
+        $plugins[] = $plugin;
+      }
+    }
+    return $plugins;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function processField($plugin_id, FieldItemListInterface $field) {
+    $plugin_definition = $this->getDefinition($plugin_id, FALSE);
+    if (!empty($plugin_definition)) {
+      $plugin = $this->createInstance($plugin_id, $plugin_definition);
+      $plugin->process($field);
+    }
+  }
+
+}
diff --git a/html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginManagerInterface.php b/html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginManagerInterface.php
new file mode 100644
index 000000000..46b617bce
--- /dev/null
+++ b/html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginManagerInterface.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Drupal\content_entity_clone\Plugin;
+
+use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\Core\Field\FieldItemListInterface;
+
+/**
+ * Interface for the field processor plugin manager.
+ */
+interface FieldProcessorPluginManagerInterface {
+
+  /**
+   * Get the available field processor plugins for the given field definition.
+   *
+   * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
+   *   Field definition.
+   */
+  public function getAvailablePlugins(FieldDefinitionInterface $field_definition);
+
+  /**
+   * Process a field with the given field processor plugin.
+   *
+   * @param string $plugin_id
+   *   Field processor plugin id.
+   * @param \Drupal\Core\Field\FieldItemListInterface $field
+   *   Field to process.
+   */
+  public function processField($plugin_id, FieldItemListInterface $field);
+
+}
diff --git a/html/modules/custom/content_entity_clone/src/Plugin/content_entity_clone/FieldProcessor/CopyValues.php b/html/modules/custom/content_entity_clone/src/Plugin/content_entity_clone/FieldProcessor/CopyValues.php
new file mode 100644
index 000000000..8b0f07fe7
--- /dev/null
+++ b/html/modules/custom/content_entity_clone/src/Plugin/content_entity_clone/FieldProcessor/CopyValues.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Drupal\content_entity_clone\Plugin\content_entity_clone\FieldProcessor;
+
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\content_entity_clone\Plugin\FieldProcessorPluginBase;
+
+/**
+ * Simple field processor that copies the field values in the entity clone.
+ *
+ * @ContentEntityCloneFieldProcessor(
+ *   id = "copy_values",
+ *   label = @Translation("Copy values"),
+ *   description = @Translation("Copy a field's values."),
+ * )
+ */
+class CopyValues extends FieldProcessorPluginBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function process(FieldItemListInterface $field) {
+    // No processing to do.
+  }
+
+}
diff --git a/html/modules/custom/content_entity_clone/src/Plugin/content_entity_clone/FieldProcessor/EntityLabelCloneSuffix.php b/html/modules/custom/content_entity_clone/src/Plugin/content_entity_clone/FieldProcessor/EntityLabelCloneSuffix.php
new file mode 100644
index 000000000..d4114989b
--- /dev/null
+++ b/html/modules/custom/content_entity_clone/src/Plugin/content_entity_clone/FieldProcessor/EntityLabelCloneSuffix.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace Drupal\content_entity_clone\Plugin\content_entity_clone\FieldProcessor;
+
+use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\content_entity_clone\Plugin\FieldProcessorPluginBase;
+
+/**
+ * Field processor that adds a ' [CLONE]' suffix to a the entity label field.
+ *
+ * @ContentEntityCloneFieldProcessor(
+ *   id = "entity_label_clone_suffix",
+ *   label = @Translation("Add [CLONE] suffix"),
+ *   description = @Translation("Add a ' [CLONE]' suffix to the entity label."),
+ *   fieldTypes = {
+ *     "text",
+ *     "text_long",
+ *     "text_with_summary",
+ *     "string",
+ *     "string_long",
+ *   }
+ * )
+ */
+class EntityLabelCloneSuffix extends FieldProcessorPluginBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function process(FieldItemListInterface $field) {
+    $entity_type_id = $field->getEntity()->getEntityTypeId();
+    $label_field = static::getEntityTypeLabelField($entity_type_id);
+    if ($field->getFieldDefinition()->getName() === $label_field) {
+      $field->value .= ' [CLONE]';
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function supports(FieldDefinitionInterface $field_definition) {
+    if (!parent::supports($field_definition)) {
+      return FALSE;
+    }
+    $entity_type_id = $field_definition->getTargetEntityTypeId();
+    $label_field = static::getEntityTypeLabelField($entity_type_id);
+    return $field_definition->getName() === $label_field;
+  }
+
+  /**
+   * Get the label field name for the entity type.
+   *
+   * @param string $entity_type_id
+   *   Entity type ID.
+   *
+   * @return string
+   *   The entity type label key.
+   */
+  protected function getEntityTypeLabelField($entity_type_id) {
+    return \Drupal::entityTypeManager()
+      ->getDefinition($entity_type_id)
+      ?->getKey('label') ?? '';
+  }
+
+}

From 580f287eee87310ec20577040bacc4d7e9d3344e Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 1 Feb 2022 08:29:53 +0000
Subject: [PATCH 403/720] [RW-265] Add configuration for the entity cloning
 module

---
 ...tity_clone.bundle.settings.node.report.yml | 25 +++++++++++++
 ...ty_clone.bundle.settings.node.training.yml | 37 +++++++++++++++++++
 config/core.extension.yml                     |  1 +
 config/user.role.authenticated.yml            |  4 ++
 4 files changed, 67 insertions(+)
 create mode 100644 config/content_entity_clone.bundle.settings.node.report.yml
 create mode 100644 config/content_entity_clone.bundle.settings.node.training.yml

diff --git a/config/content_entity_clone.bundle.settings.node.report.yml b/config/content_entity_clone.bundle.settings.node.report.yml
new file mode 100644
index 000000000..791e48fd4
--- /dev/null
+++ b/config/content_entity_clone.bundle.settings.node.report.yml
@@ -0,0 +1,25 @@
+enabled: true
+local_task_label: 'Clone report'
+fields:
+  title:
+    id: entity_label_clone_suffix
+  field_content_format:
+    id: copy_values
+  field_country:
+    id: copy_values
+  field_disaster:
+    id: copy_values
+  field_disaster_type:
+    id: copy_values
+  field_language:
+    id: copy_values
+  field_ocha_product:
+    id: copy_values
+  field_primary_country:
+    id: copy_values
+  field_source:
+    id: copy_values
+  field_theme:
+    id: copy_values
+  field_vulnerable_groups:
+    id: copy_values
diff --git a/config/content_entity_clone.bundle.settings.node.training.yml b/config/content_entity_clone.bundle.settings.node.training.yml
new file mode 100644
index 000000000..d9bba6565
--- /dev/null
+++ b/config/content_entity_clone.bundle.settings.node.training.yml
@@ -0,0 +1,37 @@
+enabled: true
+local_task_label: 'Make a copy of this advertisement'
+fields:
+  title:
+    id: copy_values
+  body:
+    id: copy_values
+  field_career_categories:
+    id: copy_values
+  field_city:
+    id: copy_values
+  field_cost:
+    id: copy_values
+  field_country:
+    id: copy_values
+  field_fee_information:
+    id: copy_values
+  field_how_to_register:
+    id: copy_values
+  field_language:
+    id: copy_values
+  field_link:
+    id: copy_values
+  field_registration_deadline:
+    id: copy_values
+  field_source:
+    id: copy_values
+  field_theme:
+    id: copy_values
+  field_training_date:
+    id: copy_values
+  field_training_format:
+    id: copy_values
+  field_training_language:
+    id: copy_values
+  field_training_type:
+    id: copy_values
diff --git a/config/core.extension.yml b/config/core.extension.yml
index 39521413d..bdb9042eb 100644
--- a/config/core.extension.yml
+++ b/config/core.extension.yml
@@ -11,6 +11,7 @@ module:
   config: 0
   config_split: 0
   contact: 0
+  content_entity_clone: 0
   ctools: 0
   datetime: 0
   datetime_range: 0
diff --git a/config/user.role.authenticated.yml b/config/user.role.authenticated.yml
index 2bcd173fe..a8c4ebc5c 100644
--- a/config/user.role.authenticated.yml
+++ b/config/user.role.authenticated.yml
@@ -9,6 +9,7 @@ dependencies:
     - node.type.job
     - node.type.training
   module:
+    - content_entity_clone
     - filter
     - media
     - node
@@ -26,10 +27,13 @@ is_admin: false
 permissions:
   - 'access content'
   - 'bookmark content'
+  - 'clone content entities'
   - 'create job content'
   - 'create training content'
   - 'delete own job content'
   - 'delete own training content'
+  - 'edit own job content'
+  - 'edit own training content'
   - 'manage own subscriptions'
   - 'use enhanced input forms'
   - 'use text format markdown'

From f7c76396e55a5672330d82fda96da3d935897b6c Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 1 Feb 2022 09:20:36 -0700
Subject: [PATCH 404/720] RW-285 remove safari-specific rule in favour of
 moving the drupal state to container field

---
 .../components/rw-form/rw-form.css                    | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 0222e4fca..b0a9584ed 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -404,17 +404,6 @@ form #edit-organization #edit-field-source-allowed .form-item:last-child {
   margin: 0;
 }
 
-/* stylelint-disable */
-/* Source Origin field Safari hack
-This is needed because the preceding field: field--name-field-ocha-product
-is hidden and in Safari the margin collapses unless its display is inline-block */
-@media not all and (min-resolution:.001dpcm) { @media {
-  form > * .form-wrapper.field--name-field-origin {
-    display: inline-block
-  }
-}}
-/* stylelint-enable */
-
 /* Term form Disable Notifications checkbox is inside #actions fieldset */
 form > #actions legend + .form-type-checkbox.form-item-notifications-content-disable,
 .form-item-notifications-content-disable + .form-actions {

From 8a07f7f9d02cf3b350b27ca1638b1532c5cca65a Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 1 Feb 2022 12:34:09 -0700
Subject: [PATCH 405/720] RW-324 remove specific safari rule to style select in
 favour of browser default

---
 .../components/rw-moderation/rw-moderation.css       | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
index aa260bfcb..c638b97f5 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
@@ -61,18 +61,6 @@
   height: 46px;
 }
 
-/* stylelint-disable */
-/* Safari hack to remove browser style and reinstate arrows */
-@media not all and (min-resolution: 0.001dpcm) { @media {
-  .rw-moderation-filters .rw-moderation-filter-omnibox .fieldset-wrapper select {
-    background: url(data:image/svg+xml;base64,PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0Ljk1IDEwIj48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6I2ZmZjt9LmNscy0ye2ZpbGw6IzQ0NDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPmFycm93czwvdGl0bGU+PHJlY3QgY2xhc3M9ImNscy0xIiB3aWR0aD0iNC45NSIgaGVpZ2h0PSIxMCIvPjxwb2x5Z29uIGNsYXNzPSJjbHMtMiIgcG9pbnRzPSIxLjQxIDQuNjcgMi40OCAzLjE4IDMuNTQgNC42NyAxLjQxIDQuNjciLz48cG9seWdvbiBjbGFzcz0iY2xzLTIiIHBvaW50cz0iMy41NCA1LjMzIDIuNDggNi44MiAxLjQxIDUuMzMgMy41NCA1LjMzIi8+PC9zdmc+) no-repeat 95% 50%;
-    -webkit-appearance: none;
-    appearance: none;
-    border-radius: 0;
-  }
-}}
-/* stylelint-enable */
-
 .rw-moderation-filters .rw-moderation-filter-omnibox div[data-autocomplete] > input {
   border-right: 2px solid var(--cd-reliefweb-brand-grey--light);
 }

From 6c5a2b17ee48ff99cfd826f6f599840759707c1c Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 1 Feb 2022 14:48:17 -0700
Subject: [PATCH 406/720] RW-234 get latest commit from base theme branch

---
 composer.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.lock b/composer.lock
index 9e9549616..f39f185b6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -12302,12 +12302,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/UN-OCHA/common_design.git",
-                "reference": "022de5d9df32af602dec68109eeb87623e32c469"
+                "reference": "1d101edc8e39ad4cdc35e3d9a55eb7d5feb77850"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/022de5d9df32af602dec68109eeb87623e32c469",
-                "reference": "022de5d9df32af602dec68109eeb87623e32c469",
+                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/1d101edc8e39ad4cdc35e3d9a55eb7d5feb77850",
+                "reference": "1d101edc8e39ad4cdc35e3d9a55eb7d5feb77850",
                 "shasum": ""
             },
             "require": {
@@ -12322,7 +12322,7 @@
                 "source": "https://github.com/UN-OCHA/common_design/tree/cd-304-forms",
                 "issues": "https://github.com/UN-OCHA/common_design/issues"
             },
-            "time": "2021-12-20T17:04:25+00:00"
+            "time": "2022-02-01T20:19:59+00:00"
         },
         {
             "name": "webflo/drupal-finder",

From bdb635aee857132af7eb1cb91fb188ab90e8f4b1 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 2 Feb 2022 01:04:28 +0000
Subject: [PATCH 407/720] [RW-265] Fix typos in content entity form module

---
 html/modules/custom/content_entity_clone/README.md              | 2 +-
 .../custom/content_entity_clone/content_entity_clone.module     | 2 +-
 .../custom/content_entity_clone/src/Form/BundleSettingsForm.php | 2 +-
 .../FieldProcessor/EntityLabelCloneSuffix.php                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/html/modules/custom/content_entity_clone/README.md b/html/modules/custom/content_entity_clone/README.md
index 54fde1cc7..6c018e35e 100644
--- a/html/modules/custom/content_entity_clone/README.md
+++ b/html/modules/custom/content_entity_clone/README.md
@@ -21,7 +21,7 @@ has been enabled.
 Field processing
 ----------------
 
-A simple field processor plugin system is provided that allow to tranform
+A simple field processor plugin system is provided that allows tranforming
 a field's values before it is copied to the new entity to be created.
 
 See `\Drupal\content_entity_clone\Plugin\FieldProcessorInterface`.
diff --git a/html/modules/custom/content_entity_clone/content_entity_clone.module b/html/modules/custom/content_entity_clone/content_entity_clone.module
index 13711f6ea..f1c4a5838 100644
--- a/html/modules/custom/content_entity_clone/content_entity_clone.module
+++ b/html/modules/custom/content_entity_clone/content_entity_clone.module
@@ -68,7 +68,7 @@ function content_entity_clone_entity_prepare_form(EntityInterface $entity, $oper
   // Get the field processor plugin manager.
   $plugin_manager = \Drupal::service('plugin.manager.content_entity_clone.field_processor');
 
-  /** @var \Drupal\Core\Field\FieldItemListInterfac $field */
+  /** @var \Drupal\Core\Field\FieldItemListInterface $field */
   foreach ($original as $field_name => $field) {
     if (!empty($fields[$field_name]['id'])) {
       // We clone the field to avoid changing the original entity.
diff --git a/html/modules/custom/content_entity_clone/src/Form/BundleSettingsForm.php b/html/modules/custom/content_entity_clone/src/Form/BundleSettingsForm.php
index 06510acf7..062ecd475 100644
--- a/html/modules/custom/content_entity_clone/src/Form/BundleSettingsForm.php
+++ b/html/modules/custom/content_entity_clone/src/Form/BundleSettingsForm.php
@@ -13,7 +13,7 @@
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
- * Cotent entity clone - bundle settings form handler.
+ * Content entity clone - bundle settings form handler.
  */
 class BundleSettingsForm extends FormBase {
 
diff --git a/html/modules/custom/content_entity_clone/src/Plugin/content_entity_clone/FieldProcessor/EntityLabelCloneSuffix.php b/html/modules/custom/content_entity_clone/src/Plugin/content_entity_clone/FieldProcessor/EntityLabelCloneSuffix.php
index d4114989b..1455985b4 100644
--- a/html/modules/custom/content_entity_clone/src/Plugin/content_entity_clone/FieldProcessor/EntityLabelCloneSuffix.php
+++ b/html/modules/custom/content_entity_clone/src/Plugin/content_entity_clone/FieldProcessor/EntityLabelCloneSuffix.php
@@ -7,7 +7,7 @@
 use Drupal\content_entity_clone\Plugin\FieldProcessorPluginBase;
 
 /**
- * Field processor that adds a ' [CLONE]' suffix to a the entity label field.
+ * Field processor that adds a ' [CLONE]' suffix to the entity label field.
  *
  * @ContentEntityCloneFieldProcessor(
  *   id = "entity_label_clone_suffix",

From d21f2f615198b2faff3af45f8321758523d7ccc5 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 2 Feb 2022 01:46:55 +0000
Subject: [PATCH 408/720] [RW-265] Get the content_entity_clone module from
 drupal.org via composer

---
 composer.json                                 |  13 +-
 composer.lock                                 |  47 ++-
 .../custom/content_entity_clone/LICENSE.txt   | 339 ------------------
 .../custom/content_entity_clone/README.md     |  46 ---
 .../custom/content_entity_clone/composer.json |  17 -
 .../schema/content_entity_clone.settings.yml  |  38 --
 .../content_entity_clone.api.php              |  31 --
 .../content_entity_clone.info.yml             |   5 -
 .../content_entity_clone.links.menu.yml       |   5 -
 .../content_entity_clone.module               | 253 -------------
 .../content_entity_clone.permissions.yml      |   7 -
 .../content_entity_clone.routing.yml          |  25 --
 .../content_entity_clone.services.yml         |   9 -
 .../ContentEntityCloneFieldProcessor.php      |  54 ---
 .../src/Controller/Overview.php               | 116 ------
 .../src/Form/BundleSettingsForm.php           | 275 --------------
 .../ParamConverter/EntityTypeConverter.php    |  54 ---
 .../src/Plugin/FieldProcessorPluginBase.php   |  30 --
 .../Plugin/FieldProcessorPluginInterface.php  |  40 ---
 .../Plugin/FieldProcessorPluginManager.php    |  61 ----
 .../FieldProcessorPluginManagerInterface.php  |  31 --
 .../FieldProcessor/CopyValues.php             |  26 --
 .../FieldProcessor/EntityLabelCloneSuffix.php |  65 ----
 symfony.lock                                  |   3 +
 24 files changed, 61 insertions(+), 1529 deletions(-)
 delete mode 100644 html/modules/custom/content_entity_clone/LICENSE.txt
 delete mode 100644 html/modules/custom/content_entity_clone/README.md
 delete mode 100644 html/modules/custom/content_entity_clone/composer.json
 delete mode 100644 html/modules/custom/content_entity_clone/config/schema/content_entity_clone.settings.yml
 delete mode 100644 html/modules/custom/content_entity_clone/content_entity_clone.api.php
 delete mode 100644 html/modules/custom/content_entity_clone/content_entity_clone.info.yml
 delete mode 100644 html/modules/custom/content_entity_clone/content_entity_clone.links.menu.yml
 delete mode 100644 html/modules/custom/content_entity_clone/content_entity_clone.module
 delete mode 100644 html/modules/custom/content_entity_clone/content_entity_clone.permissions.yml
 delete mode 100644 html/modules/custom/content_entity_clone/content_entity_clone.routing.yml
 delete mode 100644 html/modules/custom/content_entity_clone/content_entity_clone.services.yml
 delete mode 100644 html/modules/custom/content_entity_clone/src/Annotation/ContentEntityCloneFieldProcessor.php
 delete mode 100644 html/modules/custom/content_entity_clone/src/Controller/Overview.php
 delete mode 100644 html/modules/custom/content_entity_clone/src/Form/BundleSettingsForm.php
 delete mode 100644 html/modules/custom/content_entity_clone/src/ParamConverter/EntityTypeConverter.php
 delete mode 100644 html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginBase.php
 delete mode 100644 html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginInterface.php
 delete mode 100644 html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginManager.php
 delete mode 100644 html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginManagerInterface.php
 delete mode 100644 html/modules/custom/content_entity_clone/src/Plugin/content_entity_clone/FieldProcessor/CopyValues.php
 delete mode 100644 html/modules/custom/content_entity_clone/src/Plugin/content_entity_clone/FieldProcessor/EntityLabelCloneSuffix.php

diff --git a/composer.json b/composer.json
index d4307fd18..77f6fe88c 100644
--- a/composer.json
+++ b/composer.json
@@ -59,6 +59,7 @@
         "drupal/allowed_formats": "^1.3",
         "drupal/components": "^2.4",
         "drupal/config_split": "^2.0.0-beta5",
+        "drupal/content_entity_clone": "^1.0.0",
         "drupal/core-composer-scaffold": "^9.3",
         "drupal/core-dev": "^9.3",
         "drupal/core-recommended": "^9.3",
@@ -117,7 +118,17 @@
     "prefer-stable": true,
     "config": {
         "bin-dir": "vendor/bin/",
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "composer/installers": true,
+            "cweagans/composer-patches": true,
+            "drupal-composer/preserve-paths": true,
+            "drupal/core-composer-scaffold": true,
+            "drupal/core-project-message": true,
+            "drupal/console-extend-plugin": true,
+            "oomphinc/composer-installers-extender": true,
+            "symfony/flex": true
+        }
     },
     "autoload": {
         "classmap": [
diff --git a/composer.lock b/composer.lock
index 9e9549616..8cac1c291 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "2ef39829c863e7c11ea3dffe8974e54a",
+    "content-hash": "89fc98596f8aead5736ff6b779ba4b3b",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -2324,6 +2324,51 @@
                 "slack": "https://drupal.slack.com/archives/C45342CDD"
             }
         },
+        {
+            "name": "drupal/content_entity_clone",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupalcode.org/project/content_entity_clone.git",
+                "reference": "1.0.0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/content_entity_clone-1.0.0.zip",
+                "reference": "1.0.0",
+                "shasum": "7c8f919d0fd86f3effa753c6d061e8990d1cb8e3"
+            },
+            "require": {
+                "drupal/core": "^9"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "drupal": {
+                    "version": "1.0.0",
+                    "datestamp": "1643765349",
+                    "security-coverage": {
+                        "status": "not-covered",
+                        "message": "Project has not opted into security advisory coverage!"
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0+"
+            ],
+            "authors": [
+                {
+                    "name": "orakili",
+                    "homepage": "https://www.drupal.org/u/orakili"
+                }
+            ],
+            "description": "Provides cloning of content entity types.",
+            "homepage": "https://www.drupal.org/project/content_entity_clone",
+            "support": {
+                "source": "https://git.drupal.org/project/content_entity_clone.git",
+                "issues": "https://www.drupal.org/project/issues/content_entity_clone"
+            }
+        },
         {
             "name": "drupal/core",
             "version": "9.3.0",
diff --git a/html/modules/custom/content_entity_clone/LICENSE.txt b/html/modules/custom/content_entity_clone/LICENSE.txt
deleted file mode 100644
index d159169d1..000000000
--- a/html/modules/custom/content_entity_clone/LICENSE.txt
+++ /dev/null
@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/html/modules/custom/content_entity_clone/README.md b/html/modules/custom/content_entity_clone/README.md
deleted file mode 100644
index 6c018e35e..000000000
--- a/html/modules/custom/content_entity_clone/README.md
+++ /dev/null
@@ -1,46 +0,0 @@
-Content Entity Clone
-====================
-
-This module enables "cloning" content entities.
-
-In the context of this module, cloning means prepopulating an entity creation
-from with the field values of an existing entity.
-
-Features
---------
-
-This module provides an overview of the content entity types and their bundles
-that can be cloned at /admin/config/content_entity_clone.
-
-This overview has links to configure cloning for a bundle (or entity type) and
-manage how to process the fields (ex: skip, copy or something else). See below.
-
-This module also adds a "clone" local task link for entities for which cloning
-has been enabled.
-
-Field processing
-----------------
-
-A simple field processor plugin system is provided that allows tranforming
-a field's values before it is copied to the new entity to be created.
-
-See `\Drupal\content_entity_clone\Plugin\FieldProcessorInterface`.
-
-Compatibility
--------------
-
-This module should work with any entity type implementing the
-`\Drupal\Core\Entity\ContentEntityTypeInterface` and with an entity creation
-form.
-
-Alternatives
-------------
-
-- [Quick node clone](https://www.drupal.org/project/quick_node_clone)
-- [Entity Clone](https://www.drupal.org/project/entity_clone)
-
-TODO
-----
-
-- [ ] Add form to add settings to the plugins.
-- [ ] Add tests.
diff --git a/html/modules/custom/content_entity_clone/composer.json b/html/modules/custom/content_entity_clone/composer.json
deleted file mode 100644
index 04d42bf3c..000000000
--- a/html/modules/custom/content_entity_clone/composer.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "name": "drupal/content_entity_clone",
-  "description": "Provides cloning of content entity types.",
-  "type": "drupal-module",
-  "homepage": "https://www.drupal.org/project/content_entity_clone",
-  "authors": [
-    {
-      "name": "orakili",
-      "homepage": "https://www.drupal.org/u/orakili"
-    }
-  ],
-  "support": {
-    "issues": "https://www.drupal.org/project/issues/content_entity_clone",
-    "source": "https://git.drupal.org/project/content_entity_clone.git"
-  },
-  "license": "GPL-2.0+"
-}
diff --git a/html/modules/custom/content_entity_clone/config/schema/content_entity_clone.settings.yml b/html/modules/custom/content_entity_clone/config/schema/content_entity_clone.settings.yml
deleted file mode 100644
index ce7d1ed9e..000000000
--- a/html/modules/custom/content_entity_clone/config/schema/content_entity_clone.settings.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-content_entity_clone.bundle.settings.*.*:
-  type: config_object
-  label: 'Content entity clone field settings for the bundle.'
-  mapping:
-    enabled:
-      type: boolean
-      label: 'Enable cloning for this bundle.'
-    local_task_label:
-      type: string
-      translatable: true
-      label: 'Text of the local task link label.'
-    fields:
-      type: sequence
-      label: 'List of fields and their processor.'
-      sequence:
-        type: mapping
-        label: 'Field settings.'
-        mapping:
-          processor:
-            type: mapping
-            label: 'Field processor ID and settings.'
-            mapping:
-              id:
-                type: string
-                label: 'Field processor plugin ID.'
-              settings:
-                type: content_entity_clone.field_processor.settings.[%parent.id]
-                label: 'Plugin settings.'
-
-
-# Example of a plugin settings.
-content_entity_clone.field_processor.settings.add_suffix:
-  type: mapping
-  label: 'Add suffix settings.'
-  mapping:
-    suffix:
-      type: string
-      label: 'Suffix.'
diff --git a/html/modules/custom/content_entity_clone/content_entity_clone.api.php b/html/modules/custom/content_entity_clone/content_entity_clone.api.php
deleted file mode 100644
index 2a5f7a4ae..000000000
--- a/html/modules/custom/content_entity_clone/content_entity_clone.api.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * @file
- * Content entity clone hooks.
- */
-
-/**
- * Alter the field processor plugin definitions.
- *
- * @param array $definitions
- *   The field processor plugin definitions.
- *
- * @see Drupal\content_entity_clone\Annotation\ContentEntityCloneFieldProcessor
- * @see Drupal\content_entity_clone\Plugin\FieldProcessorPluginInterface
- */
-function hook_content_entity_clone_field_processor_info_alter(array &$definitions) {
-  // Add an uppercase field processor.
-  //
-  // This is just to illustrate the available properties. Processors should be
-  // added in "Drupal\mymodule\Plugin\content_entity_clone\FieldProcessor" and
-  // use the "@ContentEntityCloneFieldProcessor" plugin annotation.
-  $definitions['uppercase'] = [
-    "fieldTypes" => ['text', 'string'],
-    "id" => "uppercase",
-    "label" => t('Uppercase'),
-    "description" => t('Make the field values uppercase.'),
-    "class" => "Drupal\mymodule\Plugin\content_entity_clone\FieldProcessor\Uppercase",
-    "provider" => "mymodule",
-  ];
-}
diff --git a/html/modules/custom/content_entity_clone/content_entity_clone.info.yml b/html/modules/custom/content_entity_clone/content_entity_clone.info.yml
deleted file mode 100644
index bbd851a8f..000000000
--- a/html/modules/custom/content_entity_clone/content_entity_clone.info.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-type: module
-name: Content Entity Clone
-description: 'Provides content entity cloning.'
-package: reliefweb
-core_version_requirement: ^9
diff --git a/html/modules/custom/content_entity_clone/content_entity_clone.links.menu.yml b/html/modules/custom/content_entity_clone/content_entity_clone.links.menu.yml
deleted file mode 100644
index 9ba360c26..000000000
--- a/html/modules/custom/content_entity_clone/content_entity_clone.links.menu.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-content_entity_clone.overview:
-  title: 'Entity cloning'
-  parent: system.admin_config_content
-  description: 'Configure which content entity type and bundle can be cloned.'
-  route_name: content_entity_clone.overview
diff --git a/html/modules/custom/content_entity_clone/content_entity_clone.module b/html/modules/custom/content_entity_clone/content_entity_clone.module
deleted file mode 100644
index f1c4a5838..000000000
--- a/html/modules/custom/content_entity_clone/content_entity_clone.module
+++ /dev/null
@@ -1,253 +0,0 @@
-<?php
-
-/**
- * @file
- * Content entity clone module file.
- */
-
-use Drupal\Core\Cache\RefinableCacheableDependencyInterface;
-use Drupal\Core\Entity\ContentEntityInterface;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Drupal\Core\Url;
-use Symfony\Component\Routing\Exception\RouteNotFoundException;
-
-/**
- * Implements hook_help().
- */
-function content_entity_clone_help($route_name, RouteMatchInterface $route_match) {
-  if ($route_name === 'help.page.content_entity_clone') {
-    $output = '<h3>' . t('About') . '</h3>';
-    $output .= '<p>' . t('This module enables cloning content entities.') . '</p>';
-    return $output;
-  }
-}
-
-/**
- * Implements hook_entity_prepare_form().
- */
-function content_entity_clone_entity_prepare_form(EntityInterface $entity, $operation, FormStateInterface $form_state) {
-  // Skip if the user doesn't have the permission to clone entities.
-  if (!\Drupal::currentUser()->hasPermission('clone content entities')) {
-    return;
-  }
-
-  // Skip if there is no request parameter to get the original entity.
-  $original_entity_id = \Drupal::request()->get('content_entity_clone');
-  if (empty($original_entity_id)) {
-    return;
-  }
-
-  // Skip if th entity is not valid or is not new.
-  if (empty($entity) || !($entity instanceof ContentEntityInterface) || !$entity->isNew()) {
-    return;
-  }
-
-  // Skip if cloning is not enabled for this entity type bundle.
-  $config = \Drupal::config('content_entity_clone.bundle.settings.' . $entity->getEntityTypeId() . '.' . $entity->bundle());
-  if (!isset($config) || $config->isNew() || empty($config->get('enabled'))) {
-    return;
-  }
-
-  // Skip if there is no field to clone.
-  $fields = $config->get('fields');
-  if (empty($fields)) {
-    return;
-  }
-
-  // Load the entity to clone and skip if none was found.
-  $original = \Drupal::entityTypeManager()
-    ->getStorage($entity->getEntityTypeId())
-    ->load($original_entity_id);
-  if (empty($original)) {
-    return;
-  }
-
-  // Get the field processor plugin manager.
-  $plugin_manager = \Drupal::service('plugin.manager.content_entity_clone.field_processor');
-
-  /** @var \Drupal\Core\Field\FieldItemListInterface $field */
-  foreach ($original as $field_name => $field) {
-    if (!empty($fields[$field_name]['id'])) {
-      // We clone the field to avoid changing the original entity.
-      $cloned_field = clone $field;
-      // Process the field.
-      $plugin_manager->processField($fields[$field_name]['id'], $cloned_field);
-      // Copy the processed field values to the new entity.
-      $entity->get($field_name)->setValue($cloned_field->getValue());
-    }
-  }
-
-}
-
-/**
- * Implements hook_module_implements_alter().
- *
- * Try to ensure that the content_entity_clone's hook_entity_prepare_form() hook
- * implementation runs first so that other modules implementing this hook
- * can operate on the entity with the clone field values.
- */
-function content_entity_clone_module_implements_alter(&$implementations, $hook) {
-  if ($hook == 'entity_prepare_form' && isset($implementations['content_entity_clone'])) {
-    $implementations = [
-      'content_entity_clone' => $implementations['content_entity_clone'],
-    ] + $implementations;
-  }
-}
-
-/**
- * Implements hook_menu_local_tasks_alter().
- */
-function content_entity_clone_menu_local_tasks_alter(&$data, $route_name, RefinableCacheableDependencyInterface &$cacheability) {
-  $user = \Drupal::currentUser();
-
-  // Skip if there are not local tasks.
-  if (empty($data['tabs'][0])) {
-    return;
-  }
-
-  // Skip if the user doesn't have the permission to clone entities.
-  if (!$user->hasPermission('clone content entities')) {
-    return;
-  }
-
-  // Try find the entity type id from the local tasks.
-  foreach ($data['tabs'][0] as $key => $link) {
-    if (preg_match('#^entity.(?<entity_type_id>[^.]+).canonical$#', $key, $matches) !== 1) {
-      continue;
-    }
-
-    // Skip as we cannot retrieve the entity if the canonical link is not
-    // defined properly.
-    if (!isset($link['#link']['url']) || !($link['#link']['url'] instanceof Url)) {
-      return;
-    }
-
-    $entity_type_id = $matches['entity_type_id'];
-    $parameters = $link['#link']['url']->getRouteParameters();
-
-    // Skip as we cannot retrieve the entity if there is no entity id.
-    if (!isset($parameters[$entity_type_id]) || !is_numeric($parameters[$entity_type_id])) {
-      return;
-    }
-
-    $entity = \drupal::entityTypeManager()
-      ->getStorage($entity_type_id)
-      ->load($parameters[$entity_type_id]);
-  }
-  if (!isset($entity) || !($entity instanceof ContentEntityInterface)) {
-    return;
-  }
-
-  // Retrieve the cloning config for the entity bundle if any.
-  $config = \Drupal::config('content_entity_clone.bundle.settings.' . $entity->getEntityTypeId() . '.' . $entity->bundle());
-  if (!isset($config) || $config->isNew() || empty($config->get('enabled'))) {
-    return;
-  }
-
-  // Ensure the local tasks can be refreshed if the configuration changes.
-  $cacheability->addCacheableDependency($config);
-
-  // Get the entity creation route from the entity type.
-  $entity_creation_route_name = content_entity_clone_get_entity_creation_route_name($entity->getEntityType());
-  if (!isset($entity_creation_route_name)) {
-    return;
-  }
-
-  // Pass the entity bundle as route parameter if necessary.
-  $entity_creation_route_parameters = [];
-  $bundle_entity_type_id = $entity->getEntityType()->getBundleEntityType();
-  if (!empty($bundle_entity_type_id)) {
-    $entity_creation_route_parameters = [
-      $bundle_entity_type_id => $entity->bundle(),
-    ];
-  }
-
-  // Check if the user has access to the entity creation route.
-  $access = \Drupal::accessManager()->checkNamedRoute(
-    $entity_creation_route_name,
-    $entity_creation_route_parameters,
-    $user,
-    TRUE
-  );
-
-  // The link is only accesible if the user can also edit the current entity.
-  $access = $access->andIf($entity->access('update', $user, TRUE));
-
-  // Ensure the cacheability is up to date.
-  $cacheability->addCacheableDependency($access);
-
-  // Add a local task to clone the entity.
-  $data['tabs'][0]['content_entity_clone.clone'] = [
-    '#theme' => 'menu_local_task',
-    '#link' => [
-      'title' => $config->get('local_task_label') ?? t('Clone'),
-      'url' => Url::fromRoute($entity_creation_route_name, $entity_creation_route_parameters),
-      'localized_options' => [
-        'query' => [
-          'content_entity_clone' => $entity->id(),
-        ],
-      ],
-    ],
-    '#access' => $access,
-  ];
-}
-
-/**
- * Retrieve the creation link for the given entity type.
- *
- * Note: there is no consistent way to get the route to an entity's creation
- * form. Nodes for example don't have an `add_form` route or `add-form` link
- * template. So this methods tries to infer the route from different options.
- *
- * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
- *   Entity type.
- *
- * @return string|null
- *   The route name to create a new entity of the given type.
- */
-function content_entity_clone_get_entity_creation_route_name(EntityTypeInterface $entity_type) {
-  $entity_type_id = $entity_type->id();
-  $route_provider = \Drupal::service('router.route_provider');
-
-  // First check if there is an add-form route for the entity.
-  try {
-    $route = $route_provider->getRouteByName('entity.' . $entity_type_id . '.add_form');
-    return 'entity.' . $entity_type_id . '.add_form';
-  }
-  // If none, try to get the route from the 'add-form', 'create' or 'collection'
-  // links.
-  catch (RouteNotFoundException $exception) {
-    $bundle_entity_type_id = $entity_type->getBundleEntityType();
-
-    $create_path = '';
-    if ($entity_type->hasLinkTemplate('add-form')) {
-      $create_path = $entity_type->getLinkTemplate('add-form');
-    }
-    elseif ($entity_type->hasLinkTemplate('create')) {
-      $create_path = $entity_type->getLinkTemplate('create') . '/add';
-      if (!empty($bundle_entity_type_id)) {
-        $create_path .= '/{' . $bundle_entity_type_id . '}';
-      }
-    }
-    elseif ($entity_type->hasLinkTemplate('collection')) {
-      $create_path = $entity_type->getLinkTemplate('collection') . '/add';
-      if (!empty($bundle_entity_type_id)) {
-        $create_path .= '/{' . $bundle_entity_type_id . '}';
-      }
-    }
-
-    // Try to get the route matching this creation path.
-    if (!empty($create_path)) {
-      $routes = $route_provider->getRoutesByPattern($create_path);
-      foreach ($routes->getIterator() as $name => $route) {
-        if ($route->getPath() === $create_path) {
-          return $name;
-        }
-      }
-    }
-  }
-  return NULL;
-}
diff --git a/html/modules/custom/content_entity_clone/content_entity_clone.permissions.yml b/html/modules/custom/content_entity_clone/content_entity_clone.permissions.yml
deleted file mode 100644
index 51bc45caa..000000000
--- a/html/modules/custom/content_entity_clone/content_entity_clone.permissions.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-administer entity cloning:
-  title: 'Administer entity cloning'
-  description: 'Allow users to administer which content entity type can be cloned.'
-
-clone content entities:
-  title: 'Clone content entities'
-  description: 'Allow users to clone content entities.'
diff --git a/html/modules/custom/content_entity_clone/content_entity_clone.routing.yml b/html/modules/custom/content_entity_clone/content_entity_clone.routing.yml
deleted file mode 100644
index 77a7dcd25..000000000
--- a/html/modules/custom/content_entity_clone/content_entity_clone.routing.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-content_entity_clone.overview:
-  path: '/admin/config/content_entity_clone'
-  options:
-    _admin_route: TRUE
-  defaults:
-    _title: 'Entity Cloning: Overview'
-    _controller: '\Drupal\content_entity_clone\Controller\Overview::getPageContent'
-  requirements:
-    _permission: 'administer entity cloning'
-
-content_entity_clone.bundle.field_settings:
-  path: '/admin/config/content_entity_clone/field_settings/{entity_type}/{bundle}'
-  options:
-    _admin_route: TRUE
-    parameters:
-      entity_type:
-        type: content_entity_clone:entity_type
-  defaults:
-    _title: 'Entity Cloning: Bundle field settings'
-    _title_callback: '\Drupal\content_entity_clone\Form\BundleSettingsForm::getPageTitle'
-    _form: '\Drupal\content_entity_clone\Form\BundleSettingsForm'
-  requirements:
-    _permission: 'administer entity cloning'
-    entity_type: "[a-z0-9_]+"
-    bundle: "[a-z0-9_]+"
diff --git a/html/modules/custom/content_entity_clone/content_entity_clone.services.yml b/html/modules/custom/content_entity_clone/content_entity_clone.services.yml
deleted file mode 100644
index ba08ba63b..000000000
--- a/html/modules/custom/content_entity_clone/content_entity_clone.services.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-services:
-  content_entity_clone.service.param_converter:
-    class: Drupal\content_entity_clone\ParamConverter\EntityTypeConverter
-    arguments: ['@entity_type.manager']
-    tags:
-      - { name: paramconverter }
-  plugin.manager.content_entity_clone.field_processor:
-    class: Drupal\content_entity_clone\Plugin\FieldProcessorPluginManager
-    parent: default_plugin_manager
diff --git a/html/modules/custom/content_entity_clone/src/Annotation/ContentEntityCloneFieldProcessor.php b/html/modules/custom/content_entity_clone/src/Annotation/ContentEntityCloneFieldProcessor.php
deleted file mode 100644
index b3302231c..000000000
--- a/html/modules/custom/content_entity_clone/src/Annotation/ContentEntityCloneFieldProcessor.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace Drupal\content_entity_clone\Annotation;
-
-use Drupal\Component\Annotation\Plugin;
-
-/**
- * Defines a content entity clone field processor plugin annotation object.
- *
- * Plugin Namespace: Plugin\content_entity_clone\FieldProcessor.
- *
- * @see \Drupal\content_entity_clone\Plugin\FieldProcessorInterface
- * @see \Drupal\content_entity_clone\Plugin\FieldProcessorPluginBase
- * @see \Drupal\content_entity_clone\Plugin\FieldProcessorPluginManager
- * @see plugin_api
- *
- * @Annotation
- */
-class ContentEntityCloneFieldProcessor extends Plugin {
-
-  /**
-   * The plugin ID.
-   *
-   * @var string
-   */
-  public $id;
-
-  /**
-   * The human-readable name of the field processor.
-   *
-   * @var \Drupal\Core\Annotation\Translation
-   * @ingroup plugin_translatable
-   */
-  public $label;
-
-
-  /**
-   * A short description of the field processor.
-   *
-   * @var \Drupal\Core\Annotation\Translation
-   * @ingroup plugin_translatable
-   */
-  public $description;
-
-  /**
-   * An array of field types the field processor supports.
-   *
-   * If empty, then it applies to all the field types.
-   *
-   * @var array
-   */
-  public $fieldTypes = [];
-
-}
diff --git a/html/modules/custom/content_entity_clone/src/Controller/Overview.php b/html/modules/custom/content_entity_clone/src/Controller/Overview.php
deleted file mode 100644
index 6290be119..000000000
--- a/html/modules/custom/content_entity_clone/src/Controller/Overview.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-namespace Drupal\content_entity_clone\Controller;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Entity\ContentEntityTypeInterface;
-use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Link;
-use Drupal\Core\Url;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Overview of the content entities with cloning enabled.
- */
-class Overview extends ControllerBase {
-
-  /**
-   * The config factory.
-   *
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
-   */
-  protected $configFactory;
-
-  /**
-   * The bundle info service.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface
-   */
-  protected $bundleInfo;
-
-  /**
-   * The entity type manager service.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(
-    ConfigFactoryInterface $config_factory,
-    EntityTypeBundleInfoInterface $bundle_info,
-    EntityTypeManagerInterface $entity_type_manager
-  ) {
-    $this->configFactory = $config_factory;
-    $this->bundleInfo = $bundle_info;
-    $this->entityTypeManager = $entity_type_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('config.factory'),
-      $container->get('entity_type.bundle.info'),
-      $container->get('entity_type.manager')
-    );
-  }
-
-  /**
-   * Get the overview render array.
-   *
-   * @return array
-   *   Render array.
-   */
-  public function getPageContent() {
-    $rows = [];
-    foreach ($this->bundleInfo->getAllBundleInfo() as $entity_type_id => $bundles) {
-      $entity_type = $this->entityTypeManager->getDefinition($entity_type_id);
-      if (!($entity_type instanceof ContentEntityTypeInterface)) {
-        continue;
-      }
-
-      foreach ($bundles as $bundle => $info) {
-        $row = [];
-
-        // Entity label.
-        $row[] = $entity_type->getLabel();
-
-        // Bundle label.
-        $row[] = $info['label'] ?? ucfirst(strtr($bundle, '_', ' '));
-
-        // Status.
-        $id = 'content_entity_clone.bundle.settings.' . $entity_type_id . '.' . $bundle;
-        $config = $this->configFactory->get($id);
-        $enabled = !empty($config) && !empty($config->get('enabled'));
-        $row[] = $enabled ? $this->t('Enabled') : '';
-
-        // Link to edit the cloning setting for the bundle.
-        $url = Url::fromRoute('content_entity_clone.bundle.field_settings', [
-          'entity_type' => $entity_type_id,
-          'bundle' => $bundle,
-        ]);
-        $row[] = Link::fromTextAndUrl($this->t('Edit'), $url);
-
-        $rows[] = $row;
-      }
-    }
-
-    return [
-      '#theme' => 'table',
-      '#header' => [
-        $this->t('Entity Type'),
-        $this->t('Bundle'),
-        $this->t('Status'),
-        $this->t('Field settings'),
-      ],
-      '#rows' => $rows,
-    ];
-  }
-
-}
diff --git a/html/modules/custom/content_entity_clone/src/Form/BundleSettingsForm.php b/html/modules/custom/content_entity_clone/src/Form/BundleSettingsForm.php
deleted file mode 100644
index 062ecd475..000000000
--- a/html/modules/custom/content_entity_clone/src/Form/BundleSettingsForm.php
+++ /dev/null
@@ -1,275 +0,0 @@
-<?php
-
-namespace Drupal\content_entity_clone\Form;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\ContentEntityTypeInterface;
-use Drupal\Core\Entity\EntityFieldManagerInterface;
-use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\content_entity_clone\Plugin\FieldProcessorPluginManagerInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-
-/**
- * Content entity clone - bundle settings form handler.
- */
-class BundleSettingsForm extends FormBase {
-
-  /**
-   * The config factory.
-   *
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
-   */
-  protected $configFactory;
-
-  /**
-   * The bundle info service.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface
-   */
-  protected $bundleInfo;
-
-  /**
-   * The entity field manager service.
-   *
-   * @var \Drupal\Core\Entity\EntityFieldManagerInterface
-   */
-  protected $entityFieldManager;
-
-  /**
-   * The content entity clone field processor plugin manager.
-   *
-   * @var \Drupal\content_entity_clone\Plugin\FieldProcessorPluginManagerInterface
-   */
-  protected $fieldProcessorManager;
-
-  /**
-   * The entity type for this form.
-   *
-   * @var \Drupal\Core\Entity\ContentEntityTypeInferface
-   */
-  protected $entityType;
-
-  /**
-   * The entity bundle for this form.
-   *
-   * @var string
-   */
-  protected $bundle;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(
-    ConfigFactoryInterface $config_factory,
-    EntityTypeBundleInfoInterface $bundle_info,
-    EntityFieldManagerInterface $entity_field_manager,
-    FieldProcessorPluginManagerInterface $field_processor_manager
-  ) {
-    $this->configFactory = $config_factory;
-    $this->bundleInfo = $bundle_info;
-    $this->entityFieldManager = $entity_field_manager;
-    $this->fieldProcessorManager = $field_processor_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('config.factory'),
-      $container->get('entity_type.bundle.info'),
-      $container->get('entity_field.manager'),
-      $container->get('plugin.manager.content_entity_clone.field_processor')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'content_entity_clone_bundle_settings_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, ContentEntityTypeInterface $entity_type = NULL, $bundle = NULL) {
-    $bundle_info = $this->getBundleInfo($entity_type, $bundle);
-    if (empty($bundle_info)) {
-      throw new NotFoundHttpException();
-    }
-
-    // Store the entity type and bundle.
-    $this->entityType = $entity_type;
-    $this->bundle = $bundle;
-
-    // Get the cloning configuration for this bundle.
-    $config = $this->configFactory->get($this->getConfigId());
-
-    // Get the field settings from the configuraton.
-    $defaults = [];
-    foreach ($config->get('fields') ?? [] as $field_name => $info) {
-      if (!empty($info['id'])) {
-        $defaults[$field_name] = $info['id'];
-      }
-    }
-
-    // Get the list of available fields for the bundle and generate a table
-    // with the editable fields and optional processors.
-    $field_definitions = $this->entityFieldManager
-      ->getFieldDefinitions($entity_type->id(), $bundle);
-
-    $form['enabled'] = [
-      '#type' => 'checkbox',
-      '#title' => $this->t('Enable cloning'),
-      '#default_value' => $config->get('enabled') ?? FALSE,
-    ];
-
-    $form['local_task_label'] = [
-      '#type' => 'textfield',
-      '#title' => $this->t('Clone local task label'),
-      '#default_value' => $config->get('local_task_label') ?? FALSE,
-    ];
-
-    $form['fields'] = [
-      '#type' => 'table',
-      '#caption' => $this->t('Clonable fields'),
-      '#header' => [
-        $this->t('Field'),
-        $this->t('Processor'),
-      ],
-    ];
-
-    foreach ($field_definitions as $field_name => $field_definition) {
-      if ($field_definition->isInternal() || $field_definition->isComputed() || $field_definition->isReadOnly()) {
-        continue;
-      }
-
-      // Field label.
-      $form['fields'][$field_name]['label'] = [
-        '#plain_text' => $field_definition->getLabel(),
-      ];
-
-      // List of processing plugins.
-      $plugins = $this->fieldProcessorManager->getAvailablePlugins($field_definition);
-      if (empty($plugins)) {
-        $form['fields'][$field_name]['processor'] = [
-          '#plain_text' => $this->t('No processor available'),
-        ];
-      }
-      else {
-        $options = ['' => $this->t('Skip field')];
-        foreach ($plugins as $plugin) {
-          $options[$plugin->getPluginId()] = $plugin->getPluginLabel();
-        }
-
-        $form['fields'][$field_name]['processor'] = [
-          '#type' => 'select',
-          '#title' => $this->t('Processor'),
-          '#title_display' => 'invisible',
-          '#options' => $options,
-          '#default_value' => $defaults[$field_name] ?? NULL,
-        ];
-      }
-    }
-
-    // Add the submit button.
-    $form['actions'] = [
-      '#type' => 'actions',
-      '#theme_wrappers' => [
-        'fieldset' => [
-          '#id' => 'actions',
-          '#title' => $this->t('Actions'),
-          '#title_display' => 'invisible',
-        ],
-      ],
-      '#weight' => 99,
-    ];
-    $form['actions']['submit'] = [
-      '#type' => 'submit',
-      '#name' => 'submit',
-      '#value' => $this->t('Save'),
-    ];
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $config = $this->configFactory->getEditable($this->getConfigId());
-
-    if (empty($form_state->getValue('enabled'))) {
-      $config->delete();
-    }
-    else {
-      $fields = [];
-      foreach ($form_state->getValue('fields') as $field_name => $data) {
-        if (!empty($data['processor'])) {
-          $fields[$field_name]['id'] = $data['processor'];
-        }
-      }
-      $config->set('enabled', TRUE);
-      $config->set('local_task_label', $form_state->getValue('local_task_label'));
-      $config->set('fields', $fields);
-      $config->save();
-    }
-  }
-
-  /**
-   * Get the config ID.
-   *
-   * @return string
-   *   Config ID.
-   */
-  protected function getConfigId() {
-    return 'content_entity_clone.bundle.settings.' . $this->entityType->id() . '.' . $this->bundle;
-  }
-
-  /**
-   * Validate the entity type and bundle.
-   *
-   * @param \Drupal\Core\Entity\ContentEntityTypeInterface $entity_type
-   *   Entity type.
-   * @param string $bundle
-   *   Entity bundle.
-   *
-   * @return array|false
-   *   FALSE if the entity type or bundle are not valid or the bundle info
-   *   otherwise.
-   */
-  protected function getBundleInfo(ContentEntityTypeInterface $entity_type = NULL, $bundle = NULL) {
-    if (!empty($entity_type)) {
-      $bundles = $this->bundleInfo->getBundleInfo($entity_type->id());
-      return $bundles[$bundle] ?? FALSE;
-    }
-    return FALSE;
-  }
-
-  /**
-   * Get the form title.
-   *
-   * @param \Drupal\Core\Entity\ContentEntityTypeInterface $entity_type
-   *   Entity type.
-   * @param string $bundle
-   *   Entity bundle.
-   *
-   * @return string
-   *   The page title.
-   */
-  public function getPageTitle(ContentEntityTypeInterface $entity_type = NULL, $bundle = NULL) {
-    $bundle_info = $this->getBundleInfo($entity_type, $bundle);
-    if (!empty($bundle_info)) {
-      return $this->t('Entity Cloning Settings: @entity_type - @bundle', [
-        '@entity_type' => $entity_type->getLabel(),
-        '@bundle' => $bundle_info['label'] ?? ucfirst(strtr($bundle, '_', ' ')),
-      ]);
-    }
-    return '';
-  }
-
-}
diff --git a/html/modules/custom/content_entity_clone/src/ParamConverter/EntityTypeConverter.php b/html/modules/custom/content_entity_clone/src/ParamConverter/EntityTypeConverter.php
deleted file mode 100644
index 55ed3a4c1..000000000
--- a/html/modules/custom/content_entity_clone/src/ParamConverter/EntityTypeConverter.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace Drupal\content_entity_clone\ParamConverter;
-
-use Drupal\Core\Entity\ContentEntityTypeInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\ParamConverter\ParamConverterInterface;
-use Symfony\Component\Routing\Route;
-
-/**
- * Convert an entity bundle into the corresponding moderation service.
- */
-class EntityTypeConverter implements ParamConverterInterface {
-
-  /**
-   * The entity type manager service.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * Constructor.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager service.
-   */
-  public function __construct(
-    EntityTypeManagerInterface $entity_type_manager
-  ) {
-    $this->entityTypeManager = $entity_type_manager;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function convert($value, $definition, $name, array $defaults) {
-    if (!empty($value)) {
-      $entity_type = $this->entityTypeManager->getDefinition($value);
-      if ($entity_type instanceof ContentEntityTypeInterface) {
-        return $entity_type;
-      }
-    }
-    return NULL;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function applies($definition, $name, Route $route) {
-    return !empty($definition['type']) && $definition['type'] == 'content_entity_clone:entity_type';
-  }
-
-}
diff --git a/html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginBase.php b/html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginBase.php
deleted file mode 100644
index e5d6312d6..000000000
--- a/html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginBase.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\content_entity_clone\Plugin;
-
-use Drupal\Core\Field\FieldDefinitionInterface;
-use Drupal\Core\Plugin\PluginBase;
-
-/**
- * Base field processor plugin.
- */
-abstract class FieldProcessorPluginBase extends PluginBase implements FieldProcessorPluginInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getPluginLabel() {
-    $definition = $this->getPluginDefinition();
-    return $definition['label'] ?? $this->getPluginId();
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function supports(FieldDefinitionInterface $field_definition) {
-    $type = $field_definition->getType();
-    $definition = $this->getPluginDefinition();
-    return empty($definition['types']) || in_array($type, $definition['types']);
-  }
-
-}
diff --git a/html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginInterface.php b/html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginInterface.php
deleted file mode 100644
index 23a7985f8..000000000
--- a/html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginInterface.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace Drupal\content_entity_clone\Plugin;
-
-use Drupal\Core\Field\FieldDefinitionInterface;
-use Drupal\Core\Field\FieldItemListInterface;
-
-/**
- * Interface for the content entity clone field processor plugins.
- */
-interface FieldProcessorPluginInterface {
-
-  /**
-   * Get the plugin label.
-   *
-   * @return string
-   *   The plugin label.
-   */
-  public function getPluginLabel();
-
-  /**
-   * Check if the plugin can be used for the given field.
-   *
-   * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
-   *   Field definition.
-   *
-   * @return bool
-   *   TRUE if the plugin supports the given field type.
-   */
-  public function supports(FieldDefinitionInterface $field_definition);
-
-  /**
-   * Do something with the given field.
-   *
-   * @param \Drupal\Core\Field\FieldItemListInterface $field
-   *   Field.
-   */
-  public function process(FieldItemListInterface $field);
-
-}
diff --git a/html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginManager.php b/html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginManager.php
deleted file mode 100644
index 205bc00a6..000000000
--- a/html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginManager.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace Drupal\content_entity_clone\Plugin;
-
-use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Field\FieldDefinitionInterface;
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\Core\Plugin\DefaultPluginManager;
-
-/**
- * Plugin manager for the content entity clone field processor plugins.
- */
-class FieldProcessorPluginManager extends DefaultPluginManager implements FieldProcessorPluginManagerInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function __construct(
-    \Traversable $namespaces,
-    CacheBackendInterface $cache_backend,
-    ModuleHandlerInterface $module_handler
-  ) {
-    parent::__construct(
-      'Plugin/content_entity_clone/FieldProcessor',
-      $namespaces,
-      $module_handler,
-      'Drupal\content_entity_clone\Plugin\FieldProcessorPluginInterface',
-      'Drupal\content_entity_clone\Annotation\ContentEntityCloneFieldProcessor'
-    );
-
-    $this->setCacheBackend($cache_backend, 'content_entity_clone_field_processor_plugins');
-    $this->alterInfo('content_entity_clone_field_processor_info');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getAvailablePlugins(FieldDefinitionInterface $field_definition) {
-    $plugins = [];
-    foreach ($this->getDefinitions() as $plugin_id => $plugin_definition) {
-      $plugin = $this->createInstance($plugin_id, $plugin_definition);
-      if ($plugin->supports($field_definition)) {
-        $plugins[] = $plugin;
-      }
-    }
-    return $plugins;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function processField($plugin_id, FieldItemListInterface $field) {
-    $plugin_definition = $this->getDefinition($plugin_id, FALSE);
-    if (!empty($plugin_definition)) {
-      $plugin = $this->createInstance($plugin_id, $plugin_definition);
-      $plugin->process($field);
-    }
-  }
-
-}
diff --git a/html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginManagerInterface.php b/html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginManagerInterface.php
deleted file mode 100644
index 46b617bce..000000000
--- a/html/modules/custom/content_entity_clone/src/Plugin/FieldProcessorPluginManagerInterface.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Drupal\content_entity_clone\Plugin;
-
-use Drupal\Core\Field\FieldDefinitionInterface;
-use Drupal\Core\Field\FieldItemListInterface;
-
-/**
- * Interface for the field processor plugin manager.
- */
-interface FieldProcessorPluginManagerInterface {
-
-  /**
-   * Get the available field processor plugins for the given field definition.
-   *
-   * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
-   *   Field definition.
-   */
-  public function getAvailablePlugins(FieldDefinitionInterface $field_definition);
-
-  /**
-   * Process a field with the given field processor plugin.
-   *
-   * @param string $plugin_id
-   *   Field processor plugin id.
-   * @param \Drupal\Core\Field\FieldItemListInterface $field
-   *   Field to process.
-   */
-  public function processField($plugin_id, FieldItemListInterface $field);
-
-}
diff --git a/html/modules/custom/content_entity_clone/src/Plugin/content_entity_clone/FieldProcessor/CopyValues.php b/html/modules/custom/content_entity_clone/src/Plugin/content_entity_clone/FieldProcessor/CopyValues.php
deleted file mode 100644
index 8b0f07fe7..000000000
--- a/html/modules/custom/content_entity_clone/src/Plugin/content_entity_clone/FieldProcessor/CopyValues.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace Drupal\content_entity_clone\Plugin\content_entity_clone\FieldProcessor;
-
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\content_entity_clone\Plugin\FieldProcessorPluginBase;
-
-/**
- * Simple field processor that copies the field values in the entity clone.
- *
- * @ContentEntityCloneFieldProcessor(
- *   id = "copy_values",
- *   label = @Translation("Copy values"),
- *   description = @Translation("Copy a field's values."),
- * )
- */
-class CopyValues extends FieldProcessorPluginBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function process(FieldItemListInterface $field) {
-    // No processing to do.
-  }
-
-}
diff --git a/html/modules/custom/content_entity_clone/src/Plugin/content_entity_clone/FieldProcessor/EntityLabelCloneSuffix.php b/html/modules/custom/content_entity_clone/src/Plugin/content_entity_clone/FieldProcessor/EntityLabelCloneSuffix.php
deleted file mode 100644
index 1455985b4..000000000
--- a/html/modules/custom/content_entity_clone/src/Plugin/content_entity_clone/FieldProcessor/EntityLabelCloneSuffix.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-namespace Drupal\content_entity_clone\Plugin\content_entity_clone\FieldProcessor;
-
-use Drupal\Core\Field\FieldDefinitionInterface;
-use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\content_entity_clone\Plugin\FieldProcessorPluginBase;
-
-/**
- * Field processor that adds a ' [CLONE]' suffix to the entity label field.
- *
- * @ContentEntityCloneFieldProcessor(
- *   id = "entity_label_clone_suffix",
- *   label = @Translation("Add [CLONE] suffix"),
- *   description = @Translation("Add a ' [CLONE]' suffix to the entity label."),
- *   fieldTypes = {
- *     "text",
- *     "text_long",
- *     "text_with_summary",
- *     "string",
- *     "string_long",
- *   }
- * )
- */
-class EntityLabelCloneSuffix extends FieldProcessorPluginBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function process(FieldItemListInterface $field) {
-    $entity_type_id = $field->getEntity()->getEntityTypeId();
-    $label_field = static::getEntityTypeLabelField($entity_type_id);
-    if ($field->getFieldDefinition()->getName() === $label_field) {
-      $field->value .= ' [CLONE]';
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function supports(FieldDefinitionInterface $field_definition) {
-    if (!parent::supports($field_definition)) {
-      return FALSE;
-    }
-    $entity_type_id = $field_definition->getTargetEntityTypeId();
-    $label_field = static::getEntityTypeLabelField($entity_type_id);
-    return $field_definition->getName() === $label_field;
-  }
-
-  /**
-   * Get the label field name for the entity type.
-   *
-   * @param string $entity_type_id
-   *   Entity type ID.
-   *
-   * @return string
-   *   The entity type label key.
-   */
-  protected function getEntityTypeLabelField($entity_type_id) {
-    return \Drupal::entityTypeManager()
-      ->getDefinition($entity_type_id)
-      ?->getKey('label') ?? '';
-  }
-
-}
diff --git a/symfony.lock b/symfony.lock
index 5a6ffa6ca..cf4202a6a 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -146,6 +146,9 @@
     "drupal/console-extend-plugin": {
         "version": "0.9.5"
     },
+    "drupal/content_entity_clone": {
+        "version": "1.0.0"
+    },
     "drupal/core": {
         "version": "9.3.0"
     },

From 176f360a6353eb0aa23921941c53d5313dc8b924 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 2 Feb 2022 03:26:11 +0000
Subject: [PATCH 409/720] [RW-336] Fix entity access

---
 .../src/Services/GuidelineModeration.php      |  3 +++
 .../reliefweb_moderation.module               | 21 +++++++++++++++----
 .../src/ModerationServiceBase.php             | 17 +++++++++++----
 .../src/Services/JobModeration.php            | 10 ++++-----
 .../src/Services/ReportModeration.php         |  8 ++++---
 .../src/Services/TrainingModeration.php       | 10 ++++-----
 .../src/Helpers/UserHelper.php                |  4 +++-
 7 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineModeration.php b/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineModeration.php
index a8d2e77ff..596099f37 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineModeration.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineModeration.php
@@ -163,6 +163,9 @@ public function entityAccess(EntityModeratedInterface $entity, $operation = 'vie
       case 'delete':
         $access = $account->hasPermission('delete guideline entities');
         break;
+
+      default:
+        return AccessResult::neutral();
     }
 
     return $access ? AccessResult::allowed() : AccessResult::forbidden();
diff --git a/html/modules/custom/reliefweb_moderation/reliefweb_moderation.module b/html/modules/custom/reliefweb_moderation/reliefweb_moderation.module
index b98a675a6..79be4d7cb 100644
--- a/html/modules/custom/reliefweb_moderation/reliefweb_moderation.module
+++ b/html/modules/custom/reliefweb_moderation/reliefweb_moderation.module
@@ -5,7 +5,6 @@
  * Theme declaration etc. for the reliefweb_moderation module.
  */
 
-use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
@@ -153,16 +152,30 @@ function reliefweb_moderation_moderation_status_value_callback(EntityInterface $
 
 /**
  * Implements hook_entity_access().
+ *
+ * Drupal's AccessResultNeutral is actually not neutral depending on
+ * the context: route access check ("andIf" -> Neutral = Deny) versus
+ * entity only access check ("orIf" -> Neutral = Neutral). So to
+ * prevent showing a 403 due to us returning an AccessResultNeutral, we
+ * return NULL instead which will make ModuleHandler::invokeAll() ignore
+ * the result.
+ *
+ * @see https://www.drupal.org/project/drupal/issues/2991698
+ * @see \Drupal\Core\Entity\EntityAccessControlHandler::processAccessHookResults()
+ * @see \Drupal\Core\Access\AccessManager\check()
+ * @see \Drupal\Core\Extension\ModuleHandler::invokeAll()
  */
 function reliefweb_moderation_entity_access(EntityInterface $entity, $operation, AccountInterface $account) {
   if ($entity instanceof EntityModeratedInterface) {
     $service = ModerationServiceBase::getModerationService($entity->bundle());
     if (!empty($service)) {
-      return $service->entityAccess($entity, $operation, $account);
+      $access_result = $service->entityAccess($entity, $operation, $account);
+      if (!$access_result->isNeutral()) {
+        return $access_result;
+      }
     }
   }
-  // No opinion.
-  return AccessResult::neutral();
+  return NULL;
 }
 
 /**
diff --git a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
index dc7d08466..aa25f9a37 100644
--- a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
+++ b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
@@ -325,6 +325,9 @@ public function entityAccess(EntityModeratedInterface $entity, $operation = 'vie
                 $access = UserPostingRightsHelper::userHasPostingRights($account, $entity, $status);
               }
               break;
+
+            default:
+              return AccessResult::neutral();
           }
         }
 
@@ -353,10 +356,16 @@ public function entityAccess(EntityModeratedInterface $entity, $operation = 'vie
             case 'delete':
               $access = $account->hasPermission('delete terms in ' . $bundle);
               break;
+
+            default:
+              return AccessResult::neutral();
           }
         }
 
         break;
+
+      default:
+        return AccessResult::neutral();
     }
 
     return $access ? AccessResult::allowed() : AccessResult::forbidden();
@@ -492,7 +501,7 @@ public function getFilterDefinitions() {
    */
   public function getFilterDefinition($name) {
     $filters = $this->getFilterDefinitions();
-    return isset($filters[$name]) ? $filters[$name] : NULL;
+    return $filters[$name] ?? NULL;
   }
 
   /**
@@ -1448,7 +1457,7 @@ protected function filterQuery(Select $query, array $filters = []) {
                   }
                 }
                 elseif ($widget === 'datepicker') {
-                  list($start, $end) = array_pad(explode('-', $value, 2), 2, NULL);
+                  [$start, $end] = array_pad(explode('-', $value, 2), 2, NULL);
                   $start = intval($start);
                   $end = intval($end);
                   // Should not happen.
@@ -1506,9 +1515,9 @@ protected function filterQuery(Select $query, array $filters = []) {
               }
               elseif ($widget === 'datepicker') {
                 foreach ($values as $value) {
-                  list($start, $end) = array_pad(explode('-', $value, 2), 2, NULL);
+                  [$start, $end] = array_pad(explode('-', $value, 2), 2, NULL);
                   $start = intval($start);
-                  $end = intval(isset($end) ? $end : $start + 86399);
+                  $end = intval($end ?? $start + 86399);
                   $this->addFilterCondition($definition, $condition, $field, [
                     $start,
                     $end,
diff --git a/html/modules/custom/reliefweb_moderation/src/Services/JobModeration.php b/html/modules/custom/reliefweb_moderation/src/Services/JobModeration.php
index 4a4fed21e..5ca2c086e 100644
--- a/html/modules/custom/reliefweb_moderation/src/Services/JobModeration.php
+++ b/html/modules/custom/reliefweb_moderation/src/Services/JobModeration.php
@@ -193,18 +193,18 @@ public function entityAccess(EntityModeratedInterface $entity, $operation = 'vie
     $account = $account ?: $this->currentUser;
 
     $access_result = parent::entityAccess($entity, $operation, $account);
-    $access = $access_result->isAllowed();
 
-    // Allow deletion of draft, pending and on-hold only or of any documents
-    // for editors.
+    // Allow deletion of draft, pending and on-hold only if not an editor.
     if ($operation === 'delete') {
       $statuses = ['draft', 'pending', 'on-hold'];
       $access = $account->hasPermission('bypass node access') ||
                 $account->hasPermission('administer nodes') ||
-                ($access && in_array($entity->getModerationStatus(), $statuses));
+                $account->hasPermission('delete any ' . $entity->bundle() . ' content') ||
+                ($access_result->isAllowed() && in_array($entity->getModerationStatus(), $statuses));
+      $access_result = $access ? AccessResult::allowed() : AccessResult::forbidden();
     }
 
-    return $access ? AccessResult::allowed() : AccessResult::forbidden();
+    return $access_result;
   }
 
   /**
diff --git a/html/modules/custom/reliefweb_moderation/src/Services/ReportModeration.php b/html/modules/custom/reliefweb_moderation/src/Services/ReportModeration.php
index 9a94f81e2..0a21aed71 100644
--- a/html/modules/custom/reliefweb_moderation/src/Services/ReportModeration.php
+++ b/html/modules/custom/reliefweb_moderation/src/Services/ReportModeration.php
@@ -272,15 +272,17 @@ public function disableNotifications(EntityModeratedInterface $entity, $status)
    */
   public function entityAccess(EntityModeratedInterface $entity, $operation = 'view', ?AccountInterface $account = NULL) {
     $access_result = parent::entityAccess($entity, $operation, $account);
-    $access = $access_result->isAllowed();
 
     if ($operation !== 'view') {
       // Normally editors can edit any kind of reports
       // but there are some exceptions like archived reports.
-      $access = $access && $this->isEditableStatus($entity->getModerationStatus(), $account);
+      $access = !$access_result->isForbidden() &&
+        $this->isEditableStatus($entity->getModerationStatus(), $account);
+
+      $access_result = $access ? $access_result : AccessResult::forbidden();
     }
 
-    return $access ? AccessResult::allowed() : AccessResult::forbidden();
+    return $access_result;
   }
 
   /**
diff --git a/html/modules/custom/reliefweb_moderation/src/Services/TrainingModeration.php b/html/modules/custom/reliefweb_moderation/src/Services/TrainingModeration.php
index b1c1ba0ec..bb4d3db82 100644
--- a/html/modules/custom/reliefweb_moderation/src/Services/TrainingModeration.php
+++ b/html/modules/custom/reliefweb_moderation/src/Services/TrainingModeration.php
@@ -218,18 +218,18 @@ public function entityAccess(EntityModeratedInterface $entity, $operation = 'vie
     $account = $account ?: $this->currentUser;
 
     $access_result = parent::entityAccess($entity, $operation, $account);
-    $access = $access_result->isAllowed();
 
-    // Allow deletion of draft, pending and on-hold only or of any documents
-    // for editors.
+    // Allow deletion of draft, pending and on-hold only if not an editor.
     if ($operation === 'delete') {
       $statuses = ['draft', 'pending', 'on-hold'];
       $access = $account->hasPermission('bypass node access') ||
                 $account->hasPermission('administer nodes') ||
-                ($access && in_array($entity->getModerationStatus(), $statuses));
+                $account->hasPermission('delete any ' . $entity->bundle() . ' content') ||
+                ($access_result->isAllowed() && in_array($entity->getModerationStatus(), $statuses));
+      $access_result = $access ? AccessResult::allowed() : AccessResult::forbidden();
     }
 
-    return $access ? AccessResult::allowed() : AccessResult::forbidden();
+    return $access_result;
   }
 
   /**
diff --git a/html/modules/custom/reliefweb_utility/src/Helpers/UserHelper.php b/html/modules/custom/reliefweb_utility/src/Helpers/UserHelper.php
index 8583aa6e8..9b54c9467 100644
--- a/html/modules/custom/reliefweb_utility/src/Helpers/UserHelper.php
+++ b/html/modules/custom/reliefweb_utility/src/Helpers/UserHelper.php
@@ -31,7 +31,9 @@ public static function userHasRoles(array $roles, ?AccountInterface $account = N
     }
     // Check the roles.
     elseif (!empty($roles)) {
-      $intersection = count(array_intersect($roles, $account->getRoles()));
+      $roles = array_map('strtolower', $roles);
+      $account_roles = array_map('strtolower', $account->getRoles());
+      $intersection = count(array_intersect($roles, $account_roles));
       return $all ? count($roles) === $intersection : $intersection > 0;
     }
     return FALSE;

From 5a35b1eb6d21d27f21c92da961a466bc82546a55 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 2 Feb 2022 03:50:35 +0000
Subject: [PATCH 410/720] [RW-325] Move the taxonomy_term_preview to the
 drupal.org and install it via composer

---
 composer.json                                 |   1 +
 composer.lock                                 |  47 ++++-
 .../custom/taxonomy_term_preview/README.md    |  11 --
 .../css/term.preview.css                      |  22 ---
 .../taxonomy_term_preview/js/term.preview.js  |  60 ------
 .../src/Access/TermPreviewAccessCheck.php     |  53 ------
 .../src/Controller/TermPreviewController.php  |  78 --------
 .../src/Form/TermForm.php                     | 173 ------------------
 .../src/Form/TermPreviewForm.php              | 163 -----------------
 .../src/PageCache/DenyTermPreview.php         |  44 -----
 .../ParamConverter/TermPreviewConverter.php   |  51 ------
 .../taxonomy_term_preview.info.yml            |   7 -
 .../taxonomy_term_preview.libraries.yml       |  13 --
 .../taxonomy_term_preview.module              |  51 ------
 .../taxonomy_term_preview.routing.yml         |  11 --
 .../taxonomy_term_preview.services.yml        |  18 --
 symfony.lock                                  |   3 +
 17 files changed, 50 insertions(+), 756 deletions(-)
 delete mode 100644 html/modules/custom/taxonomy_term_preview/README.md
 delete mode 100644 html/modules/custom/taxonomy_term_preview/css/term.preview.css
 delete mode 100644 html/modules/custom/taxonomy_term_preview/js/term.preview.js
 delete mode 100644 html/modules/custom/taxonomy_term_preview/src/Access/TermPreviewAccessCheck.php
 delete mode 100644 html/modules/custom/taxonomy_term_preview/src/Controller/TermPreviewController.php
 delete mode 100644 html/modules/custom/taxonomy_term_preview/src/Form/TermForm.php
 delete mode 100644 html/modules/custom/taxonomy_term_preview/src/Form/TermPreviewForm.php
 delete mode 100644 html/modules/custom/taxonomy_term_preview/src/PageCache/DenyTermPreview.php
 delete mode 100644 html/modules/custom/taxonomy_term_preview/src/ParamConverter/TermPreviewConverter.php
 delete mode 100644 html/modules/custom/taxonomy_term_preview/taxonomy_term_preview.info.yml
 delete mode 100644 html/modules/custom/taxonomy_term_preview/taxonomy_term_preview.libraries.yml
 delete mode 100644 html/modules/custom/taxonomy_term_preview/taxonomy_term_preview.module
 delete mode 100644 html/modules/custom/taxonomy_term_preview/taxonomy_term_preview.routing.yml
 delete mode 100644 html/modules/custom/taxonomy_term_preview/taxonomy_term_preview.services.yml

diff --git a/composer.json b/composer.json
index 77f6fe88c..8c6cc0bc9 100644
--- a/composer.json
+++ b/composer.json
@@ -78,6 +78,7 @@
         "drupal/redis": "^1.5",
         "drupal/social_auth_hid": "^3.0",
         "drupal/svg_image": "^1.15",
+        "drupal/taxonomy_term_preview": "^1.0.0",
         "drupal/taxonomy_term_revision": "1.x-dev",
         "drupal/theme_switcher": "^1.2",
         "drupal/token": "^1.10",
diff --git a/composer.lock b/composer.lock
index 51b8394ac..3606c61d3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "89fc98596f8aead5736ff6b779ba4b3b",
+    "content-hash": "7d91941868b1e41ee72d8dd17a57a2e0",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -3954,6 +3954,51 @@
                 "issues": "http://drupal.org/project/svg_image"
             }
         },
+        {
+            "name": "drupal/taxonomy_term_preview",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupalcode.org/project/taxonomy_term_preview.git",
+                "reference": "1.0.0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/taxonomy_term_preview-1.0.0.zip",
+                "reference": "1.0.0",
+                "shasum": "746b553054452cd50bc8bd21635540ce65e84637"
+            },
+            "require": {
+                "drupal/core": "^9"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "drupal": {
+                    "version": "1.0.0",
+                    "datestamp": "1643767522",
+                    "security-coverage": {
+                        "status": "not-covered",
+                        "message": "Project has not opted into security advisory coverage!"
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0+"
+            ],
+            "authors": [
+                {
+                    "name": "orakili",
+                    "homepage": "https://www.drupal.org/u/orakili"
+                }
+            ],
+            "description": "Provides preview of taxonomy terms.",
+            "homepage": "https://www.drupal.org/project/taxonomy_term_preview",
+            "support": {
+                "source": "https://git.drupal.org/project/taxonomy_term_preview.git",
+                "issues": "https://www.drupal.org/project/issues/taxonomy_term_preview"
+            }
+        },
         {
             "name": "drupal/taxonomy_term_revision",
             "version": "dev-1.x",
diff --git a/html/modules/custom/taxonomy_term_preview/README.md b/html/modules/custom/taxonomy_term_preview/README.md
deleted file mode 100644
index d16f79364..000000000
--- a/html/modules/custom/taxonomy_term_preview/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-Taxonomy Term Preview
-=====================
-
-This module enables previewing taxonomy terms like it's done for nodes.
-
-**Warning** This replaces the default form class for the taxonomy terms and is therefore not compatible with other modules that do the same.
-
-Alternatives
-------------
-
-The [All Entity Preview](https://www.drupal.org/project/all_entity_preview) module attemps to provide preview options for any entity type.
diff --git a/html/modules/custom/taxonomy_term_preview/css/term.preview.css b/html/modules/custom/taxonomy_term_preview/css/term.preview.css
deleted file mode 100644
index a00431589..000000000
--- a/html/modules/custom/taxonomy_term_preview/css/term.preview.css
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * @file
- * Styles for taxonomy term preview page.
- */
-
-.term-preview-container {
-  position: fixed;
-  z-index: 499;
-  box-sizing: border-box;
-  width: 100%;
-  padding: 10px;
-}
-
-@media only screen and (min-width: 36em) {
-  .term-preview-container .form-type-select {
-    margin-left: 25%; /* LTR */
-  }
-  [dir="rtl"] .term-preview-container .form-type-select {
-    margin-right: 25%;
-    margin-left: 0;
-  }
-}
diff --git a/html/modules/custom/taxonomy_term_preview/js/term.preview.js b/html/modules/custom/taxonomy_term_preview/js/term.preview.js
deleted file mode 100644
index 9d30f18e0..000000000
--- a/html/modules/custom/taxonomy_term_preview/js/term.preview.js
+++ /dev/null
@@ -1,60 +0,0 @@
-(function ($, Drupal) {
-
-  'use strict';
-
-  Drupal.behaviors.termPreviewDestroyLinks = {
-    attach: function (context) {
-      function clickPreviewModal(event) {
-        if (event.button === 0 && !event.altKey && !event.ctrlKey && !event.metaKey && !event.shiftKey) {
-          event.preventDefault();
-          var $previewDialog = $('<div>'.concat(Drupal.theme('termPreviewModal'), '</div>')).appendTo('body');
-          Drupal.dialog($previewDialog, {
-            title: Drupal.t('Leave preview?'),
-            buttons: [{
-              text: Drupal.t('Cancel'),
-              click: function () {
-                $(this).dialog('close');
-              }
-            }, {
-              text: Drupal.t('Leave preview'),
-              click: function () {
-                window.top.location.href = event.target.href;
-              }
-            }]
-          }).showModal();
-        }
-      }
-
-      var $preview = $(context).once('term-preview');
-
-      if ($(context).find('.term-preview-container').length) {
-        $preview.on('click.preview', 'a:not([href^="#"], .term-preview-container a)', clickPreviewModal);
-      }
-    },
-    detach: function (context, settings, trigger) {
-      if (trigger === 'unload') {
-        var $preview = $(context).find('.content').removeOnce('term-preview');
-
-        if ($preview.length) {
-          $preview.off('click.preview');
-        }
-      }
-    }
-  };
-
-  Drupal.behaviors.termPreviewSwitchViewMode = {
-    attach: function (context) {
-      var $autosubmit = $(context).find('[data-drupal-autosubmit]').once('autosubmit');
-
-      if ($autosubmit.length) {
-        $autosubmit.on('formUpdated.preview', function () {
-          $(this.form).trigger('submit');
-        });
-      }
-    }
-  };
-
-  Drupal.theme.termPreviewModal = function () {
-    return '<p>'.concat(Drupal.t('Leaving the preview will cause unsaved changes to be lost. Are you sure you want to leave the preview?'), '</p><small class="description">').concat(Drupal.t('CTRL+Left click will prevent this dialog from showing and proceed to the clicked link.'), '</small>');
-  };
-})(jQuery, Drupal);
diff --git a/html/modules/custom/taxonomy_term_preview/src/Access/TermPreviewAccessCheck.php b/html/modules/custom/taxonomy_term_preview/src/Access/TermPreviewAccessCheck.php
deleted file mode 100644
index 2ff5501de..000000000
--- a/html/modules/custom/taxonomy_term_preview/src/Access/TermPreviewAccessCheck.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-namespace Drupal\taxonomy_term_preview\Access;
-
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Routing\Access\AccessInterface;
-use Drupal\Core\Session\AccountInterface;
-use Drupal\taxonomy\TermInterface;
-
-/**
- * Determines access to taxonomy term previews.
- */
-class TermPreviewAccessCheck implements AccessInterface {
-
-  /**
-   * The entity type manager service.
-   *
-   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
-   */
-  protected $entityTypeManager;
-
-  /**
-   * Constructs an EntityCreateAccessCheck object.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager service.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager) {
-    $this->entityTypeManager = $entity_type_manager;
-  }
-
-  /**
-   * Checks access to the term preview page.
-   *
-   * @param \Drupal\Core\Session\AccountInterface $account
-   *   The currently logged in account.
-   * @param \Drupal\term\TermInterface $term_preview
-   *   The term that is being previewed.
-   *
-   * @return \Drupal\Core\Access\AccessResultInterface
-   *   The access result.
-   */
-  public function access(AccountInterface $account, TermInterface $term_preview) {
-    if ($term_preview->isNew()) {
-      $access_controller = $this->entityTypeManager->getAccessControlHandler('taxonomy_term');
-      return $access_controller->createAccess($term_preview->bundle(), $account, [], TRUE);
-    }
-    else {
-      return $term_preview->access('update', $account, TRUE);
-    }
-  }
-
-}
diff --git a/html/modules/custom/taxonomy_term_preview/src/Controller/TermPreviewController.php b/html/modules/custom/taxonomy_term_preview/src/Controller/TermPreviewController.php
deleted file mode 100644
index d6f6ad1c1..000000000
--- a/html/modules/custom/taxonomy_term_preview/src/Controller/TermPreviewController.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-namespace Drupal\taxonomy_term_preview\Controller;
-
-use Drupal\Core\Entity\Controller\EntityViewController;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityRepositoryInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Render\RendererInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Defines a controller to render a single taxonomy term in preview.
- */
-class TermPreviewController extends EntityViewController {
-
-  /**
-   * The entity repository service.
-   *
-   * @var \Drupal\Core\Entity\EntityRepositoryInterface
-   */
-  protected $entityRepository;
-
-  /**
-   * Creates a TermViewController object.
-   *
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   * @param \Drupal\Core\Render\RendererInterface $renderer
-   *   The renderer service.
-   * @param \Drupal\Core\Entity\EntityRepositoryInterface $entity_repository
-   *   The entity repository.
-   */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, RendererInterface $renderer, EntityRepositoryInterface $entity_repository) {
-    parent::__construct($entity_type_manager, $renderer);
-    $this->entityRepository = $entity_repository;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('entity_type.manager'),
-      $container->get('renderer'),
-      $container->get('entity.repository')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function view(EntityInterface $term_preview, $view_mode_id = 'full', $langcode = NULL) {
-    $term_preview->preview_view_mode = $view_mode_id;
-    $build = parent::view($term_preview, $view_mode_id);
-
-    $build['#attached']['library'][] = 'taxonomy_term_preview/drupal.term.preview';
-
-    // Don't render cache previews.
-    unset($build['#cache']);
-
-    return $build;
-  }
-
-  /**
-   * The _title_callback for the page that renders a single term in preview.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $term_preview
-   *   The current taxonomy term.
-   *
-   * @return string
-   *   The page title.
-   */
-  public function title(EntityInterface $term_preview) {
-    return $this->entityRepository->getTranslationFromContext($term_preview)->label();
-  }
-
-}
diff --git a/html/modules/custom/taxonomy_term_preview/src/Form/TermForm.php b/html/modules/custom/taxonomy_term_preview/src/Form/TermForm.php
deleted file mode 100644
index 6dd536b9a..000000000
--- a/html/modules/custom/taxonomy_term_preview/src/Form/TermForm.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-
-namespace Drupal\taxonomy_term_preview\Form;
-
-use Drupal\Component\Datetime\TimeInterface;
-use Drupal\Core\Entity\EntityRepositoryInterface;
-use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\TempStore\PrivateTempStoreFactory;
-use Drupal\Core\Url;
-use Drupal\taxonomy\TermForm as TaxonomyTermForm;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
-
-/**
- * Class extending the term form with term preview capabilities.
- */
-class TermForm extends TaxonomyTermForm {
-
-  /**
-   * The tempstore factory.
-   *
-   * @var \Drupal\Core\TempStore\PrivateTempStoreFactory
-   */
-  protected $tempStoreFactory;
-
-  /**
-   * The request stack.
-   *
-   * @var \Symfony\Component\HttpFoundation\RequestStack
-   */
-  protected $requestStack;
-
-  /**
-   * Constructs a ContentEntityForm object.
-   *
-   * @param \Drupal\Core\Entity\EntityRepositoryInterface $entity_repository
-   *   The entity repository service.
-   * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $entity_type_bundle_info
-   *   The entity type bundle service.
-   * @param \Drupal\Component\Datetime\TimeInterface $time
-   *   The time service.
-   * @param \Drupal\Core\TempStore\PrivateTempStoreFactory $temp_store_factory
-   *   The factory for the temp store object.
-   * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
-   *   The request stack.
-   */
-  public function __construct(
-    EntityRepositoryInterface $entity_repository,
-    EntityTypeBundleInfoInterface $entity_type_bundle_info,
-    TimeInterface $time,
-    PrivateTempStoreFactory $temp_store_factory,
-    RequestStack $request_stack
-  ) {
-    parent::__construct($entity_repository, $entity_type_bundle_info, $time);
-    $this->tempStoreFactory = $temp_store_factory;
-    $this->requestStack = $request_stack;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('entity.repository'),
-      $container->get('entity_type.bundle.info'),
-      $container->get('datetime.time'),
-      $container->get('tempstore.private'),
-      $container->get('request_stack'),
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function form(array $form, FormStateInterface $form_state) {
-    // Try to restore from temp store, this must be done before calling
-    // parent::form().
-    $store = $this->tempStoreFactory->get('term_preview');
-
-    // Attempt to load from preview when the uuid is present unless we are
-    // rebuilding the form.
-    $request_uuid = $this->getRequest()->query->get('uuid');
-    if (!$form_state->isRebuilding() && $request_uuid && $preview = $store->get($request_uuid)) {
-      /** @var \Drupal\Core\Form\FormStateInterface $preview */
-      $form_state->setStorage($preview->getStorage());
-      $form_state->setUserInput($preview->getUserInput());
-
-      // Rebuild the form.
-      $form_state->setRebuild();
-
-      // The combination of having user input and rebuilding the form means
-      // that it will attempt to cache the form state which will fail if it is
-      // a GET request.
-      $form_state->setRequestMethod('POST');
-
-      $this->entity = $preview->getFormObject()->getEntity();
-      $this->entity->in_preview = NULL;
-    }
-
-    return parent::form($form, $form_state);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function actions(array $form, FormStateInterface $form_state) {
-    $element = parent::actions($form, $form_state);
-    $term = $this->entity;
-
-    $element['preview'] = [
-      '#type' => 'submit',
-      '#access' => $term->access('create') || $term->access('update'),
-      '#value' => $this->t('Preview'),
-      '#weight' => -100,
-      '#submit' => ['::submitForm', '::preview'],
-    ];
-
-    return $element;
-  }
-
-  /**
-   * Form submission handler for the 'preview' action.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   */
-  public function preview(array $form, FormStateInterface $form_state) {
-    $store = $this->tempStoreFactory->get('term_preview');
-    $this->entity->in_preview = TRUE;
-    $store->set($this->entity->uuid(), $form_state);
-
-    $route_parameters = [
-      'term_preview' => $this->entity->uuid(),
-      'view_mode_id' => 'full',
-    ];
-
-    $options = [
-      'query' => [
-        'back' => Url::fromRoute('<current>')->toString(),
-      ],
-    ];
-    $query = $this->getRequest()->query;
-    if ($query->has('destination')) {
-      $options['query']['destination'] = $query->get('destination');
-      $query->remove('destination');
-    }
-    $form_state->setRedirect('entity.taxonomy_term.preview', $route_parameters, $options);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function save(array $form, FormStateInterface $form_state) {
-    parent::save($form, $form_state);
-
-    $term = $this->entity;
-    if ($term->id()) {
-      // Remove the preview entry from the temp store, if any.
-      $store = $this->tempStoreFactory->get('term_preview');
-      $store->delete($term->uuid());
-    }
-    else {
-      // In the unlikely case something went wrong on save, the term will be
-      // rebuilt and the term form redisplayed the same way as in preview.
-      $this->messenger()->addError($this->t('The post could not be saved.'));
-      $form_state->setRebuild();
-    }
-  }
-
-}
diff --git a/html/modules/custom/taxonomy_term_preview/src/Form/TermPreviewForm.php b/html/modules/custom/taxonomy_term_preview/src/Form/TermPreviewForm.php
deleted file mode 100644
index 09e0de5fc..000000000
--- a/html/modules/custom/taxonomy_term_preview/src/Form/TermPreviewForm.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-
-namespace Drupal\taxonomy_term_preview\Form;
-
-use Drupal\Core\Config\ConfigFactoryInterface;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityDisplayRepositoryInterface;
-use Drupal\Core\Form\FormBase;
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Contains a form for switching the view mode of a term during preview.
- *
- * @internal
- */
-class TermPreviewForm extends FormBase {
-
-  /**
-   * The entity display repository.
-   *
-   * @var \Drupal\Core\Entity\EntityDisplayRepositoryInterface
-   */
-  protected $entityDisplayRepository;
-
-  /**
-   * The config factory.
-   *
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
-   */
-  protected $configFactory;
-
-  /**
-   * Constructs a new TermPreviewForm.
-   *
-   * @param \Drupal\Core\Entity\EntityDisplayRepositoryInterface $entity_display_repository
-   *   The entity display repository.
-   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
-   *   The configuration factory.
-   */
-  public function __construct(EntityDisplayRepositoryInterface $entity_display_repository, ConfigFactoryInterface $config_factory) {
-    $this->entityDisplayRepository = $entity_display_repository;
-    $this->configFactory = $config_factory;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container) {
-    return new static(
-      $container->get('entity_display.repository'),
-      $container->get('config.factory')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'term_preview_form_select';
-  }
-
-  /**
-   * Form constructor.
-   *
-   * @param array $form
-   *   An associative array containing the structure of the form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   The current state of the form.
-   * @param \Drupal\Core\Entity\EntityInterface $term
-   *   The term being previewed.
-   *
-   * @return array
-   *   The form structure.
-   */
-  public function buildForm(array $form, FormStateInterface $form_state, EntityInterface $term = NULL) {
-    $view_mode = $term->preview_view_mode;
-
-    $query_options = ['query' => ['uuid' => $term->uuid()]];
-    $query = $this->getRequest()->query;
-    if ($query->has('destination')) {
-      $query_options['query']['destination'] = $query->get('destination');
-    }
-
-    if ($term->isNew()) {
-      $url = Url::fromRoute('entity.taxonomy_term.add_form', [
-        'taxonomy_vocabulary' => $term->bundle(),
-      ]);
-    }
-    elseif ($query->has('back')) {
-      $url = Url::fromUserInput($query->get('back'));
-    }
-    else {
-      $url = $term->toUrl('edit-form');
-    }
-
-    $form['backlink'] = [
-      '#type' => 'link',
-      '#title' => $this->t('Back to content editing'),
-      '#url' => $url,
-      '#options' => [
-        'attributes' => [
-          'class' => ['term-preview-backlink'],
-        ],
-      ] + $query_options,
-    ];
-
-    // Always show full as an option, even if the display is not enabled.
-    $view_mode_options = [
-      'full' => $this->t('Full'),
-    ] + $this->entityDisplayRepository->getViewModeOptionsByBundle('taxonomy_term', $term->bundle());
-
-    // Unset view modes that are not used in the front end.
-    unset($view_mode_options['default']);
-    unset($view_mode_options['rss']);
-    unset($view_mode_options['search_index']);
-
-    $form['uuid'] = [
-      '#type' => 'value',
-      '#value' => $term->uuid(),
-    ];
-
-    $form['view_mode'] = [
-      '#type' => 'select',
-      '#title' => $this->t('View mode'),
-      '#options' => $view_mode_options,
-      '#default_value' => $view_mode,
-      '#attributes' => [
-        'data-drupal-autosubmit' => TRUE,
-      ],
-    ];
-
-    $form['submit'] = [
-      '#type' => 'submit',
-      '#value' => $this->t('Switch'),
-      '#attributes' => [
-        'class' => ['js-hide'],
-      ],
-    ];
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-    $route_parameters = [
-      'term_preview' => $form_state->getValue('uuid'),
-      'view_mode_id' => $form_state->getValue('view_mode'),
-    ];
-
-    $options = [];
-    $query = $this->getRequest()->query;
-    if ($query->has('destination')) {
-      $options['query']['destination'] = $query->get('destination');
-      $query->remove('destination');
-    }
-    $form_state->setRedirect('entity.taxomomy_term.preview', $route_parameters, $options);
-  }
-
-}
diff --git a/html/modules/custom/taxonomy_term_preview/src/PageCache/DenyTermPreview.php b/html/modules/custom/taxonomy_term_preview/src/PageCache/DenyTermPreview.php
deleted file mode 100644
index be7ba7597..000000000
--- a/html/modules/custom/taxonomy_term_preview/src/PageCache/DenyTermPreview.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Drupal\taxonomy_term_preview\PageCache;
-
-use Drupal\Core\PageCache\ResponsePolicyInterface;
-use Drupal\Core\Routing\RouteMatchInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * Cache policy for taxonomy term preview page.
- *
- * This policy rule denies caching of responses generated by the
- * entity.taxonomy_term.preview route.
- */
-class DenyTermPreview implements ResponsePolicyInterface {
-
-  /**
-   * The current route match.
-   *
-   * @var \Drupal\Core\Routing\RouteMatchInterface
-   */
-  protected $routeMatch;
-
-  /**
-   * Constructs a deny term preview page cache policy.
-   *
-   * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
-   *   The current route match.
-   */
-  public function __construct(RouteMatchInterface $route_match) {
-    $this->routeMatch = $route_match;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function check(Response $response, Request $request) {
-    if ($this->routeMatch->getRouteName() === 'entity.taxonomy_term.preview') {
-      return static::DENY;
-    }
-  }
-
-}
diff --git a/html/modules/custom/taxonomy_term_preview/src/ParamConverter/TermPreviewConverter.php b/html/modules/custom/taxonomy_term_preview/src/ParamConverter/TermPreviewConverter.php
deleted file mode 100644
index 57df3549b..000000000
--- a/html/modules/custom/taxonomy_term_preview/src/ParamConverter/TermPreviewConverter.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace Drupal\taxonomy_term_preview\ParamConverter;
-
-use Drupal\Core\TempStore\PrivateTempStoreFactory;
-use Symfony\Component\Routing\Route;
-use Drupal\Core\ParamConverter\ParamConverterInterface;
-
-/**
- * Provides upcasting for a taxonomy term entity in preview.
- */
-class TermPreviewConverter implements ParamConverterInterface {
-
-  /**
-   * Stores the tempstore factory.
-   *
-   * @var \Drupal\Core\TempStore\PrivateTempStoreFactory
-   */
-  protected $tempStoreFactory;
-
-  /**
-   * Constructs a new TermPreviewConverter.
-   *
-   * @param \Drupal\Core\TempStore\PrivateTempStoreFactory $temp_store_factory
-   *   The factory for the temp store object.
-   */
-  public function __construct(PrivateTempStoreFactory $temp_store_factory) {
-    $this->tempStoreFactory = $temp_store_factory;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function convert($value, $definition, $name, array $defaults) {
-    $store = $this->tempStoreFactory->get('term_preview');
-    if ($form_state = $store->get($value)) {
-      return $form_state->getFormObject()->getEntity();
-    }
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function applies($definition, $name, Route $route) {
-    if (!empty($definition['type']) && $definition['type'] == 'term_preview') {
-      return TRUE;
-    }
-    return FALSE;
-  }
-
-}
diff --git a/html/modules/custom/taxonomy_term_preview/taxonomy_term_preview.info.yml b/html/modules/custom/taxonomy_term_preview/taxonomy_term_preview.info.yml
deleted file mode 100644
index 5f1ba07e2..000000000
--- a/html/modules/custom/taxonomy_term_preview/taxonomy_term_preview.info.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-type: module
-name: Taxonomy term preview
-description: 'Extends the taxonomy term form to handle previewing the term.'
-package: taxonomy
-core_version_requirement: ^9
-dependencies:
-  - drupal:taxonomy
diff --git a/html/modules/custom/taxonomy_term_preview/taxonomy_term_preview.libraries.yml b/html/modules/custom/taxonomy_term_preview/taxonomy_term_preview.libraries.yml
deleted file mode 100644
index 783a140b7..000000000
--- a/html/modules/custom/taxonomy_term_preview/taxonomy_term_preview.libraries.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-drupal.term.preview:
-  version: VERSION
-  css:
-    theme:
-      css/term.preview.css: {}
-  js:
-    js/term.preview.js: {}
-  dependencies:
-    - core/jquery
-    - core/jquery.once
-    - core/drupal
-    - core/drupal.dialog
-    - core/drupal.form
diff --git a/html/modules/custom/taxonomy_term_preview/taxonomy_term_preview.module b/html/modules/custom/taxonomy_term_preview/taxonomy_term_preview.module
deleted file mode 100644
index 39f674dea..000000000
--- a/html/modules/custom/taxonomy_term_preview/taxonomy_term_preview.module
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * @file
- * Taxonomy term preview module file.
- */
-
-use Drupal\Core\Routing\RouteMatchInterface;
-
-/**
- * Implements hook_help().
- */
-function taxonomy_term_preview_help($route_name, RouteMatchInterface $route_match) {
-  if ($route_name === 'help.page.taxonomy_term_preview') {
-    $output = '<h3>' . t('About') . '</h3>';
-    $output .= '<p>' . t('This module enables previewing taxonomy terms.') . '</p>';
-    return $output;
-  }
-}
-
-/**
- * Implements hook_entity_type_build().
- */
-function taxonomy_term_preview_entity_type_build(array &$entity_types) {
-  $entity_types['taxonomy_term']->setFormClass('default', 'Drupal\taxonomy_term_preview\Form\TermForm');
-}
-
-/**
- * Implements hook_page_top().
- */
-function taxonomy_term_preview_page_top(array &$page) {
-  // Add 'Back to content editing' link and the view mode selector
-  // at the top of the taxonomy term preview page.
-  $route_match = \Drupal::routeMatch();
-  if ($route_match->getRouteName() == 'entity.taxonomy_term.preview') {
-    $term = $route_match->getParameter('term_preview');
-
-    if (isset($term)) {
-      $form = \Drupal::formBuilder()
-        ->getForm('\Drupal\taxonomy_term_preview\Form\TermPreviewForm', $term);
-
-      $page['page_top']['term_preview'] = [
-        '#type' => 'container',
-        '#attributes' => [
-          'class' => ['term-preview-container', 'container-inline'],
-        ],
-        'view_mode' => $form,
-      ];
-    }
-  }
-}
diff --git a/html/modules/custom/taxonomy_term_preview/taxonomy_term_preview.routing.yml b/html/modules/custom/taxonomy_term_preview/taxonomy_term_preview.routing.yml
deleted file mode 100644
index c5786a106..000000000
--- a/html/modules/custom/taxonomy_term_preview/taxonomy_term_preview.routing.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-entity.taxonomy_term.preview:
-  path: '/taxonomy/term/preview/{term_preview}/{view_mode_id}'
-  defaults:
-    _controller: '\Drupal\taxonomy_term_preview\Controller\TermPreviewController::view'
-    _title_callback: '\Drupal\taxonomy_term_preview\Controller\TermPreviewController::title'
-  requirements:
-    _term_preview_access: '{term_preview}'
-  options:
-    parameters:
-      term_preview:
-        type: 'term_preview'
diff --git a/html/modules/custom/taxonomy_term_preview/taxonomy_term_preview.services.yml b/html/modules/custom/taxonomy_term_preview/taxonomy_term_preview.services.yml
deleted file mode 100644
index c1bd487d0..000000000
--- a/html/modules/custom/taxonomy_term_preview/taxonomy_term_preview.services.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-services:
-  access_check.taxonomy_term.preview:
-    class: Drupal\taxonomy_term_preview\Access\TermPreviewAccessCheck
-    arguments: ['@entity_type.manager']
-    tags:
-      - { name: access_check, applies_to: _term_preview_access }
-  taxonomy_term.page_cache_response_policy.deny_term_preview:
-    class: Drupal\taxonomy_term_preview\PageCache\DenyTermPreview
-    arguments: ['@current_route_match']
-    public: false
-    tags:
-      - { name: page_cache_response_policy }
-      - { name: dynamic_page_cache_response_policy }
-  term_preview:
-    class: Drupal\taxonomy_term_preview\ParamConverter\TermPreviewConverter
-    arguments: ['@tempstore.private']
-    tags:
-      - { name: paramconverter }
diff --git a/symfony.lock b/symfony.lock
index bbec8ef43..d3f62db4a 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -224,6 +224,9 @@
     "drupal/svg_image": {
         "version": "1.15.0"
     },
+    "drupal/taxonomy_term_preview": {
+        "version": "1.0.0"
+    },
     "drupal/taxonomy_term_revision": {
         "version": "1.x-dev"
     },

From cb29b312d01acbce0deac079202bbabc3d39a158 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 2 Feb 2022 08:34:49 -0700
Subject: [PATCH 411/720] RW-338 align radio buttons in columns by expanding
 selectors of existing rules

---
 .../common_design_subtheme/components/rw-form/rw-form.css    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index b0a9584ed..85f1f4570 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -321,6 +321,7 @@ form .form-radios .form-type-radio {
  * are often lots of choices and this improves readability. On large screens
  * we display them in 2 or 3 columns.
  */
+form .fieldset-wrapper .form-radios .form-item,
 form fieldset.details .form-checkboxes .form-item,
 form fieldset.details .form-radios .form-item {
   display: block;
@@ -329,10 +330,13 @@ form fieldset.details .form-radios .form-item {
 }
 
 @media screen and (min-width: 768px) {
+  form .fieldset-wrapper .form-radios,
   form fieldset.details .form-checkboxes,
   form fieldset.details .form-radios {
     column-count: 2;
   }
+
+  form .fieldset-wrapper .form-radios .form-item,
   form fieldset.details .form-checkboxes .form-item,
   form fieldset.details .form-radios .form-item {
     display: inline-block;
@@ -341,6 +345,7 @@ form fieldset.details .form-radios .form-item {
 }
 
 @media screen and (min-width: 1024px) {
+  form .fieldset-wrapper .form-radios,
   form fieldset.details .form-checkboxes,
   form fieldset.details .form-radios {
     column-count: 3;

From 3043d85ff978a3d90082eafa7fabf244fed46330 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 2 Feb 2022 09:15:38 -0700
Subject: [PATCH 412/720] RW-342 preview button style

---
 .../components/rw-form/rw-form.css                   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 85f1f4570..39ec07e3e 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -501,3 +501,15 @@ form button[value="edit"] {
   background-color: var(--cd-reliefweb-pink);
   font-size: 15px;
 }
+
+/* Preview button */
+input[data-drupal-selector=edit-preview] {
+  background-color: var(--cd-grey--dark);
+}
+input[data-drupal-selector=edit-preview]:hover,
+input[data-drupal-selector=edit-preview]:focus {
+  background-color: var(--cd-grey--mid);
+}
+input[data-drupal-selector=edit-preview]:focus {
+  border: 2px solid var(--cd-black);
+}

From 7f900bce2a427d2dd5796c348fe5d0a9b7c0c174 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 2 Feb 2022 09:34:34 -0700
Subject: [PATCH 413/720] RW-341 add CD error message class so error messages
 as styled consistently

---
 .../components/reliefweb-links/reliefweb-links.js               | 2 +-
 .../reliefweb-section-links/reliefweb-section-links.js          | 2 +-
 .../reliefweb-user-posting-rights.js                            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/html/modules/custom/reliefweb_fields/components/reliefweb-links/reliefweb-links.js b/html/modules/custom/reliefweb_fields/components/reliefweb-links/reliefweb-links.js
index 681e29a61..43786a499 100644
--- a/html/modules/custom/reliefweb_fields/components/reliefweb-links/reliefweb-links.js
+++ b/html/modules/custom/reliefweb_fields/components/reliefweb-links/reliefweb-links.js
@@ -416,7 +416,7 @@
       if (typeof error === 'string' && error !== '') {
         var message = document.createElement('div');
         message.setAttribute('data-error-message', '');
-        message.setAttribute('class', 'messages error');
+        message.setAttribute('class', 'messages error cd-form__error-message');
         message.appendChild(document.createTextNode(error));
 
         // Add the message at the top of the fieldset.
diff --git a/html/modules/custom/reliefweb_fields/components/reliefweb-section-links/reliefweb-section-links.js b/html/modules/custom/reliefweb_fields/components/reliefweb-section-links/reliefweb-section-links.js
index 05dd1ce11..c42790928 100644
--- a/html/modules/custom/reliefweb_fields/components/reliefweb-section-links/reliefweb-section-links.js
+++ b/html/modules/custom/reliefweb_fields/components/reliefweb-section-links/reliefweb-section-links.js
@@ -351,7 +351,7 @@
       if (typeof error === 'string' && error !== '') {
         var message = document.createElement('div');
         message.setAttribute('data-error-message', '');
-        message.setAttribute('class', 'messages error');
+        message.setAttribute('class', 'messages error cd-form__error-message');
         message.appendChild(document.createTextNode(error));
 
         // Add the message at the top of the fieldset.
diff --git a/html/modules/custom/reliefweb_fields/components/reliefweb-user-posting-rights/reliefweb-user-posting-rights.js b/html/modules/custom/reliefweb_fields/components/reliefweb-user-posting-rights/reliefweb-user-posting-rights.js
index 3d0554489..2e4d6e494 100644
--- a/html/modules/custom/reliefweb_fields/components/reliefweb-user-posting-rights/reliefweb-user-posting-rights.js
+++ b/html/modules/custom/reliefweb_fields/components/reliefweb-user-posting-rights/reliefweb-user-posting-rights.js
@@ -283,7 +283,7 @@
       // Display the error message and highlight the faulty element.
       if (typeof error === 'string' && error !== '') {
         var message = document.createElement('div');
-        message.setAttribute('class', 'messages error');
+        message.setAttribute('class', 'messages error cd-form__error-message');
         message.setAttribute('data-error-message', '');
         message.appendChild(document.createTextNode(error));
 

From cf9db20a67d9adc3c39b37fc2229eae211c2e370 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 2 Feb 2022 11:49:47 -0700
Subject: [PATCH 414/720] RW-337 add border to button and improve focus style
 for better visual feedback

---
 .../components/rw-form/rw-form.css                       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 39ec07e3e..b5b6d7f8e 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -17,9 +17,9 @@ form button,
   with some exceptions (Notably "Save" buttons) */
 form:not(.subscription-form):not(.community-topics-form) .form-item .cd-button {
   margin: 0 12px 0 0;
-  padding: 14px;
+  padding: 12px;
   color: white;
-  border: none;
+  border: 2px solid transparent;
   background: var(--cd-reliefweb-brand-blue--dark);
   font-size: 15px;
   font-weight: bold;
@@ -33,6 +33,11 @@ form:not(.subscription-form):not(.community-topics-form) .form-item .cd-button:a
   text-decoration: underline;
   background: var(--cd-reliefweb-brand-red--dark);
 }
+form button:focus,
+form:not(.subscription-form):not(.community-topics-form) .form-item .cd-button:focus {
+  text-decoration: underline;
+  border: 2px solid var(--cd-reliefweb-brand-grey--dark);
+}
 form:not('.subscription-form'):not('community-topics-form') .form-item .cd-button {
   transition: none;
   border-radius: 0;

From 718b655c4f8766906f43bb771c3cdea7eb9d579a Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 2 Feb 2022 11:51:56 -0700
Subject: [PATCH 415/720] RW-337 expand condition to exclude input type submit
 and id edit-create so form submits when filter or reset input, or create node
 link are focused and enter key is pressed

---
 .../custom/reliefweb_moderation/js/moderation.js      | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/html/modules/custom/reliefweb_moderation/js/moderation.js b/html/modules/custom/reliefweb_moderation/js/moderation.js
index ae4364c8d..1e31be434 100644
--- a/html/modules/custom/reliefweb_moderation/js/moderation.js
+++ b/html/modules/custom/reliefweb_moderation/js/moderation.js
@@ -489,14 +489,17 @@
           target.parentNode.parentNode.removeChild(target.parentNode);
         }
       });
-
       // Prevent form submission when pressing 'enter'.
       form.addEventListener('keydown', function (event) {
         var key = event.witch || event.keyCode;
         var target = event.target;
-        if (key === 13 && target && target.nodeName !== 'BUTTON') {
-          event.preventDefault();
-          return false;
+
+        if (key === 13 && target) {
+          // Except when Filter or Reset inputs or Create Node link is target.
+          if (target.type !== 'submit' && target.nodeName !== 'BUTTON' && target.id !== 'edit-create') {
+            event.preventDefault();
+            return false;
+          }
         }
       });
 

From 34a6590c78e57440e07fb0b434d17457f1fdb054 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 2 Feb 2022 15:37:38 -0700
Subject: [PATCH 416/720] RW-337 set outline to 0 for better results on button
 that do not have cd-button class

---
 .../custom/common_design_subtheme/components/rw-form/rw-form.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index b5b6d7f8e..e2a68ac0e 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -18,6 +18,7 @@ form button,
 form:not(.subscription-form):not(.community-topics-form) .form-item .cd-button {
   margin: 0 12px 0 0;
   padding: 12px;
+  outline: none;
   color: white;
   border: 2px solid transparent;
   background: var(--cd-reliefweb-brand-blue--dark);

From e72236c2f0ca1f2e9dfebe18fde1d1a038d60b98 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 2 Feb 2022 15:37:51 -0700
Subject: [PATCH 417/720] RW-337 set outline to 0 for better results on button
 that do not have cd-button class

---
 .../common_design_subtheme/components/rw-form/rw-form.css       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index e2a68ac0e..463ab91dd 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -18,9 +18,9 @@ form button,
 form:not(.subscription-form):not(.community-topics-form) .form-item .cd-button {
   margin: 0 12px 0 0;
   padding: 12px;
-  outline: none;
   color: white;
   border: 2px solid transparent;
+  outline: none;
   background: var(--cd-reliefweb-brand-blue--dark);
   font-size: 15px;
   font-weight: bold;

From 287ab224a90b334dd20c9d61030b0913ca5486b9 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 2 Feb 2022 16:33:27 -0700
Subject: [PATCH 418/720] RW-343 add clearfix rule to clear preceding floated
 element

---
 .../components/rw-guidelines/rw-guidelines.css             | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
index c9890b45a..00cd5e1e7 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
@@ -117,7 +117,10 @@ form[data-with-guidelines] .rw-guideline > div > .rw-guideline__content img {
   border: 4px solid var(--cd-reliefweb-brand-grey--light);
 }
 
-/* Clear the float on preceding label to prevent extra height on the div */
-form[data-with-guidelines] .rw-autocomplete--with-show-all {
+/* Clear the float on preceding label
+/* to prevent extra height on the autocomplete div */
+form[data-with-guidelines] .rw-autocomplete--with-show-all,
+/* to ensure the WYSIWYG clears float */
+form[data-with-guidelines] button[data-guideline] + div {
   clear: both;
 }

From 87a13d674352d7be38ad3c88e8a11cad593f63ce Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 3 Feb 2022 00:54:51 +0000
Subject: [PATCH 419/720] [OPS-8064] Change replicas and shards ES settings

---
 config/reliefweb_api.settings.yml                        | 3 ++-
 .../config/install/reliefweb_api.settings.yml            | 6 ++++--
 .../reliefweb_api/config/schema/reliefweb_api.schema.yml | 9 ++++++---
 html/modules/custom/reliefweb_api/reliefweb_api.module   | 3 ++-
 .../reliefweb_api/src/Commands/ReliefWebApiCommands.php  | 2 +-
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/config/reliefweb_api.settings.yml b/config/reliefweb_api.settings.yml
index b795db9d8..c1e4754bc 100644
--- a/config/reliefweb_api.settings.yml
+++ b/config/reliefweb_api.settings.yml
@@ -8,4 +8,5 @@ verify_ssl: true
 elasticsearch: 'http://elasticsearch:9200'
 base_index_name: reliefweb
 website: 'https://reliefweb.int'
-no_replica: false
+replicas: 0
+shards: 1
diff --git a/html/modules/custom/reliefweb_api/config/install/reliefweb_api.settings.yml b/html/modules/custom/reliefweb_api/config/install/reliefweb_api.settings.yml
index b3aacdc22..fc54ff42f 100644
--- a/html/modules/custom/reliefweb_api/config/install/reliefweb_api.settings.yml
+++ b/html/modules/custom/reliefweb_api/config/install/reliefweb_api.settings.yml
@@ -14,5 +14,7 @@ elasticsearch: http://elasticsearch:9200
 base_index_name: reliefweb
 # Scheme and host to use as base for the URLs in the indexed content.
 website: https://reliefweb.int
-# Whether to disable the index replica or not.
-no_replica: false
+# Number of elasticsearch index replicas.
+replicas: 0
+# Number of elasticsearch index shards.
+shards: 1
diff --git a/html/modules/custom/reliefweb_api/config/schema/reliefweb_api.schema.yml b/html/modules/custom/reliefweb_api/config/schema/reliefweb_api.schema.yml
index 3715b40d6..80ab4a236 100644
--- a/html/modules/custom/reliefweb_api/config/schema/reliefweb_api.schema.yml
+++ b/html/modules/custom/reliefweb_api/config/schema/reliefweb_api.schema.yml
@@ -26,6 +26,9 @@ reliefweb_api.settings:
     website:
       type: string
       label: 'Scheme and host to use as base for the URLs in the indexed content.'
-    no_replica:
-      type: boolean
-      label: 'Whether to disable the index replica or not.'
+    replicas:
+      type: integer
+      label: 'Number of elasticsearch index replicas'
+    shards:
+      type: integer
+      label: 'Number of elasticsearch index shards'
diff --git a/html/modules/custom/reliefweb_api/reliefweb_api.module b/html/modules/custom/reliefweb_api/reliefweb_api.module
index 53e444e2d..7814e48a8 100644
--- a/html/modules/custom/reliefweb_api/reliefweb_api.module
+++ b/html/modules/custom/reliefweb_api/reliefweb_api.module
@@ -117,7 +117,8 @@ function reliefweb_api_get_indexer_base_options() {
     'database' => $database['database'],
     'base-index-name' => $config->get('base_index_name') ?? $database['database'],
     'website' => $config->get('website') ?? 'https://' . \Drupal::request()->getHost(),
-    'no-replica' => $config->get('no_replica') ?? FALSE,
+    'replicas' => $config->get('replicas') ?? 0,
+    'shards' => $config->get('shards') ?? 1,
   ];
 
   return $options;
diff --git a/html/modules/custom/reliefweb_api/src/Commands/ReliefWebApiCommands.php b/html/modules/custom/reliefweb_api/src/Commands/ReliefWebApiCommands.php
index 0c7a96816..3e314d3b5 100644
--- a/html/modules/custom/reliefweb_api/src/Commands/ReliefWebApiCommands.php
+++ b/html/modules/custom/reliefweb_api/src/Commands/ReliefWebApiCommands.php
@@ -164,7 +164,7 @@ public function index($bundle = '', array $options = [
     $indexing_options['log'] = 'echo';
 
     // Make sure there is enough memory.
-    ini_set('memory_limit', $options['memory-limit'] ?: '512MB');
+    ini_set('memory_limit', $options['memory-limit'] ?: '512M');
 
     // Launch the indexing or index removal.
     try {

From 67f9664e168f2d5b6ac778ebd5c962c7d277419a Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 3 Feb 2022 01:11:54 +0000
Subject: [PATCH 420/720] [OPS-8064] Update api indexer

---
 composer.json |  2 +-
 composer.lock | 14 +++++++-------
 symfony.lock  |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index 8c6cc0bc9..eda644895 100644
--- a/composer.json
+++ b/composer.json
@@ -87,7 +87,7 @@
         "league/commonmark": "^1.6",
         "league/html-to-markdown": "^5.0",
         "pelago/emogrifier": "^6.0",
-        "reliefweb/api-indexer": "^v2.0.2",
+        "reliefweb/api-indexer": "^v2.1.0",
         "reliefweb/simple-autocomplete": "^v1.3.0",
         "reliefweb/simple-datepicker": "^v1.3.1",
         "symfony/flex": "^2.0",
diff --git a/composer.lock b/composer.lock
index 3606c61d3..bcc87a70d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "7d91941868b1e41ee72d8dd17a57a2e0",
+    "content-hash": "fd277ae3d403b2ae8c0322bb5d32670f",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -7629,16 +7629,16 @@
         },
         {
             "name": "reliefweb/api-indexer",
-            "version": "v2.0.2",
+            "version": "v2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/UN-OCHA/rwint-api-indexer.git",
-                "reference": "4af6ed40f253dc5f5a0f67ce41666f505da2cc0b"
+                "reference": "62fd059e7c65257ec9e4f44f60492e9f7d3c7f21"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/UN-OCHA/rwint-api-indexer/zipball/4af6ed40f253dc5f5a0f67ce41666f505da2cc0b",
-                "reference": "4af6ed40f253dc5f5a0f67ce41666f505da2cc0b",
+                "url": "https://api.github.com/repos/UN-OCHA/rwint-api-indexer/zipball/62fd059e7c65257ec9e4f44f60492e9f7d3c7f21",
+                "reference": "62fd059e7c65257ec9e4f44f60492e9f7d3c7f21",
                 "shasum": ""
             },
             "require": {
@@ -7678,10 +7678,10 @@
                 "reliefweb"
             ],
             "support": {
-                "source": "https://github.com/UN-OCHA/rwint-api-indexer/tree/v2.0.2",
+                "source": "https://github.com/UN-OCHA/rwint-api-indexer/tree/v2.1.0",
                 "issues": "https://github.com/UN-OCHA/rwint-api-indexer/issues"
             },
-            "time": "2022-01-21T03:15:17+00:00"
+            "time": "2022-02-03T00:46:56+00:00"
         },
         {
             "name": "reliefweb/simple-autocomplete",
diff --git a/symfony.lock b/symfony.lock
index d3f62db4a..968b24562 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -425,7 +425,7 @@
         "version": "v2.8.0"
     },
     "reliefweb/api-indexer": {
-        "version": "v2.0.2"
+        "version": "v2.1.0"
     },
     "reliefweb/simple-autocomplete": {
         "version": "v1.3.0"

From ac0e5a38e451b0bc2398079d6f820dd8c7b9fcb6 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 3 Feb 2022 01:28:06 +0000
Subject: [PATCH 421/720] [OPS-8064] Add options to the reliefweb api indexing
 drush command to specify the number of shards and replicas

---
 .../src/Commands/ReliefWebApiCommands.php              | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/html/modules/custom/reliefweb_api/src/Commands/ReliefWebApiCommands.php b/html/modules/custom/reliefweb_api/src/Commands/ReliefWebApiCommands.php
index 3e314d3b5..d25c0e9dc 100644
--- a/html/modules/custom/reliefweb_api/src/Commands/ReliefWebApiCommands.php
+++ b/html/modules/custom/reliefweb_api/src/Commands/ReliefWebApiCommands.php
@@ -92,6 +92,12 @@ public function __construct(
    * @option count-only Get the number of indexable entities for the
    *   options, defaults to FALSE.
    * @option memory_limit PHP memory limit, defaults to 512M.
+   * @option replicas Number of Elasticsearch replicas for the index,
+   *   defaults to NULL which means use the reliefweb_api.settings.replicas
+   *   default config value.
+   * @option replicas Number of Elasticsearch shards for the index,
+   *   defaults to NULL which means use the reliefweb_api.settings.shards
+   *   default config value.
    *
    * @default $options []
    *
@@ -129,6 +135,8 @@ public function index($bundle = '', array $options = [
     'log' => 'echo',
     'count-only' => FALSE,
     'memory-limit' => '512M',
+    'replicas' => NULL,
+    'shards' => NULL,
   ]) {
     // Index all the references at once when the special 'references' bundle
     // is passed to the command.
@@ -160,6 +168,8 @@ public function index($bundle = '', array $options = [
     $indexing_options['alias-only'] = !empty($options['alias-only']);
     // It looks like "simulate" is a reserved drush option so we need another
     // name for the option, thus "count-only"...
+    $indexing_options['replicas'] = $options['replicas'] ?? $indexing_options['replicas'];
+    $indexing_options['shards'] = $options['shards'] ?? $indexing_options['shards'];
     $indexing_options['simulate'] = !empty($options['count-only']);
     $indexing_options['log'] = 'echo';
 

From 9b7686fe68d39e70fc3e8727ea1370745c0b2458 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 3 Feb 2022 07:20:01 +0000
Subject: [PATCH 422/720] [RW-337] Fix issues with the added button borders to
 highlight them when focused

---
 .../components/rw-advanced-search/rw-advanced-search.css   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-advanced-search/rw-advanced-search.css b/html/themes/custom/common_design_subtheme/components/rw-advanced-search/rw-advanced-search.css
index 50fa4d241..a0085ee08 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-advanced-search/rw-advanced-search.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-advanced-search/rw-advanced-search.css
@@ -223,7 +223,7 @@
 .rw-advanced-search__actions button {
   height: 36px;
   padding: 0 14px;
-  line-height: 36px;
+  line-height: 32px;
 }
 .rw-advanced-search__actions button[data-clear] {
   color: var(--cd-reliefweb-brand-blue--dark);
@@ -354,7 +354,7 @@
   height: 36px;
   margin: 4px 0 0 0;
   font-size: 15px;
-  line-height: 36px;
+  line-height: 32px;
 }
 .rw-advanced-search__filter-selector input {
   padding: 8px;
@@ -386,7 +386,8 @@
 .rw-advanced-search__filter-selector [data-autocomplete] {
   padding: 0;
 }
-.rw-advanced-search__filter-selector [data-autocomplete] > input {
+.rw-advanced-search__filter-selector [data-autocomplete] > input,
+.rw-advanced-search__filter-selector [data-datepicker] > input {
   box-sizing: border-box;
   height: 36px;
   padding: 8px;

From 667a937779db3cb5fdd19f010a344266a577e4e7 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sat, 5 Feb 2022 01:07:49 +0000
Subject: [PATCH 423/720] [RW-188] Port RSS feeds

---
 .../reliefweb_rivers/reliefweb_rivers.module  |  16 ++
 .../reliefweb_rivers.routing.yml              |  40 ++++
 .../reliefweb_rivers.services.yml             |  16 +-
 .../reliefweb_rivers/src/AdvancedSearch.php   |   2 +-
 .../reliefweb_rivers/src/RiverServiceBase.php | 150 ++++++++++++++-
 .../src/RiverServiceInterface.php             |  42 ++++-
 .../src/Services/BlogPostRiver.php            |  92 +++++++++
 .../src/Services/DisasterRiver.php            |  84 +++++++++
 .../src/Services/JobRiver.php                 | 109 +++++++++++
 .../src/Services/ReportRiver.php              | 177 ++++++++++++++++++
 .../src/Services/TopicRiver.php               |  34 +++-
 .../src/Services/TrainingRiver.php            | 115 ++++++++++++
 .../templates/reliefweb-rivers-rss.html.twig  | 124 ++++++++++++
 .../img/logos/ReliefWeb_RSS_logo.png          | Bin 0 -> 12635 bytes
 14 files changed, 981 insertions(+), 20 deletions(-)
 create mode 100644 html/modules/custom/reliefweb_rivers/templates/reliefweb-rivers-rss.html.twig
 create mode 100644 html/themes/custom/common_design_subtheme/img/logos/ReliefWeb_RSS_logo.png

diff --git a/html/modules/custom/reliefweb_rivers/reliefweb_rivers.module b/html/modules/custom/reliefweb_rivers/reliefweb_rivers.module
index 31c54b2b4..ca339c253 100644
--- a/html/modules/custom/reliefweb_rivers/reliefweb_rivers.module
+++ b/html/modules/custom/reliefweb_rivers/reliefweb_rivers.module
@@ -237,6 +237,22 @@ function reliefweb_rivers_theme() {
         'sections' => [],
       ],
     ],
+    'reliefweb_rivers_rss' => [
+      'variables' => [
+        // The site URL.
+        'site_url' => '',
+        // The river RSS feed title.
+        'title' => '',
+        // The river RSS feed URL.
+        'feed_url' => '',
+        // The river RSS feed language.
+        'language' => '',
+        // The date of the most recent document matching the query parameters.
+        'date' => NULL,
+        // The articles.
+        'items' => [],
+      ],
+    ],
   ];
 
   // Add themes for the main river articles.
diff --git a/html/modules/custom/reliefweb_rivers/reliefweb_rivers.routing.yml b/html/modules/custom/reliefweb_rivers/reliefweb_rivers.routing.yml
index e5adfea26..93f315a21 100644
--- a/html/modules/custom/reliefweb_rivers/reliefweb_rivers.routing.yml
+++ b/html/modules/custom/reliefweb_rivers/reliefweb_rivers.routing.yml
@@ -1,3 +1,4 @@
+# River pages.
 reliefweb_rivers.blog_post.river:
   path: '/blog'
   defaults:
@@ -54,6 +55,8 @@ reliefweb_rivers.training.river:
     _controller: 'reliefweb_rivers.training.river:getPageContent'
   requirements:
     _permission: 'access content'
+
+# Gloval Search Results.
 reliefweb_rivers.search.results:
   path: '/search/results'
   defaults:
@@ -61,3 +64,40 @@ reliefweb_rivers.search.results:
     _controller: '\Drupal\reliefweb_rivers\Controller\SearchResults::getPageContent'
   requirements:
     _permission: 'access content'
+
+# RSS.
+reliefweb_rivers.blog_post.rss:
+  path: '/blog/rss.xml'
+  defaults:
+    _title: 'Blog'
+    _controller: 'reliefweb_rivers.blog_post.river:getRssContent'
+  requirements:
+    _permission: 'access content'
+reliefweb_rivers.disaster.rss:
+  path: '/disasters/rss.xml'
+  defaults:
+    _title: 'Disasters'
+    _controller: 'reliefweb_rivers.disaster.river:getRssContent'
+  requirements:
+    _permission: 'access content'
+reliefweb_rivers.job.rss:
+  path: '/jobs/rss.xml'
+  defaults:
+    _title: 'Jobs'
+    _controller: 'reliefweb_rivers.job.river:getRssContent'
+  requirements:
+    _permission: 'access content'
+reliefweb_rivers.report.rss:
+  path: '/updates/rss.xml'
+  defaults:
+    _title: 'Updates'
+    _controller: 'reliefweb_rivers.report.river:getRssContent'
+  requirements:
+    _permission: 'access content'
+reliefweb_rivers.training.rss:
+  path: '/training/rss.xml'
+  defaults:
+    _title: 'Training'
+    _controller: 'reliefweb_rivers.training.river:getRssContent'
+  requirements:
+    _permission: 'access content'
diff --git a/html/modules/custom/reliefweb_rivers/reliefweb_rivers.services.yml b/html/modules/custom/reliefweb_rivers/reliefweb_rivers.services.yml
index d061f1c1b..c3681790d 100644
--- a/html/modules/custom/reliefweb_rivers/reliefweb_rivers.services.yml
+++ b/html/modules/custom/reliefweb_rivers/reliefweb_rivers.services.yml
@@ -1,25 +1,25 @@
 services:
   reliefweb_rivers.blog_post.river:
     class: Drupal\reliefweb_rivers\Services\BlogPostRiver
-    arguments: ['@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@string_translation']
+    arguments: ['@language_manager', '@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@request_stack', '@renderer', '@string_translation']
   reliefweb_rivers.country.river:
     class: Drupal\reliefweb_rivers\Services\CountryRiver
-    arguments: ['@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@string_translation']
+    arguments: ['@language_manager', '@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@request_stack', '@renderer', '@string_translation']
   reliefweb_rivers.disaster.river:
     class: Drupal\reliefweb_rivers\Services\DisasterRiver
-    arguments: ['@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@string_translation']
+    arguments: ['@language_manager', '@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@request_stack', '@renderer', '@string_translation']
   reliefweb_rivers.job.river:
     class: Drupal\reliefweb_rivers\Services\JobRiver
-    arguments: ['@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@string_translation']
+    arguments: ['@language_manager', '@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@request_stack', '@renderer', '@string_translation']
   reliefweb_rivers.topic.river:
     class: Drupal\reliefweb_rivers\Services\TopicRiver
-    arguments: ['@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@string_translation', '@entity_type.manager']
+    arguments: ['@language_manager', '@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@request_stack', '@renderer', '@string_translation', '@entity_type.manager']
   reliefweb_rivers.report.river:
     class: Drupal\reliefweb_rivers\Services\ReportRiver
-    arguments: ['@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@string_translation']
+    arguments: ['@language_manager', '@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@request_stack', '@renderer', '@string_translation']
   reliefweb_rivers.source.river:
     class: Drupal\reliefweb_rivers\Services\SourceRiver
-    arguments: ['@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@string_translation']
+    arguments: ['@language_manager', '@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@request_stack', '@renderer', '@string_translation']
   reliefweb_rivers.training.river:
     class: Drupal\reliefweb_rivers\Services\TrainingRiver
-    arguments: ['@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@string_translation']
+    arguments: ['@language_manager', '@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@request_stack', '@renderer', '@string_translation']
diff --git a/html/modules/custom/reliefweb_rivers/src/AdvancedSearch.php b/html/modules/custom/reliefweb_rivers/src/AdvancedSearch.php
index 923a71948..f52698e67 100644
--- a/html/modules/custom/reliefweb_rivers/src/AdvancedSearch.php
+++ b/html/modules/custom/reliefweb_rivers/src/AdvancedSearch.php
@@ -535,7 +535,7 @@ public function parseLegacyRiverParameter() {
 
     // Check if the path is using the alias form and, if so, find the term path.
     if (preg_match('#(country|disaster)/([a-z0-9-]+)#', $path, $matches) === 1) {
-      $path = UrlHelper::getPathFromAlias($path);
+      $path = UrlHelper::getPathFromAlias('/' . $path);
     }
 
     // Validate and extract the id from the path.
diff --git a/html/modules/custom/reliefweb_rivers/src/RiverServiceBase.php b/html/modules/custom/reliefweb_rivers/src/RiverServiceBase.php
index 870f99293..716be0dad 100644
--- a/html/modules/custom/reliefweb_rivers/src/RiverServiceBase.php
+++ b/html/modules/custom/reliefweb_rivers/src/RiverServiceBase.php
@@ -3,13 +3,17 @@
 namespace Drupal\reliefweb_rivers;
 
 use Drupal\Component\Utility\Html;
-use Drupal\Core\Url;
+use Drupal\Core\Language\LanguageManagerInterface;
+use Drupal\Core\Pager\PagerManagerInterface;
+use Drupal\Core\Pager\PagerParametersInterface;
+use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\StringTranslation\TranslationInterface;
+use Drupal\Core\Url;
 use Drupal\reliefweb_api\Services\ReliefWebApiClient;
-use Drupal\Core\Pager\PagerManagerInterface;
-use Drupal\Core\Pager\PagerParametersInterface;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
 
 /**
@@ -19,6 +23,13 @@ abstract class RiverServiceBase implements RiverServiceInterface {
 
   use StringTranslationTrait;
 
+  /**
+   * The language manager.
+   *
+   * @var \Drupal\Core\Language\LanguageManagerInterface
+   */
+  protected $languageManager;
+
   /**
    * The pager manager servie.
    *
@@ -40,6 +51,20 @@ abstract class RiverServiceBase implements RiverServiceInterface {
    */
   protected $apiClient;
 
+  /**
+   * The request stack.
+   *
+   * @var \Symfony\Component\HttpFoundation\RequestStack
+   */
+  protected $requestStack;
+
+  /**
+   * The renderer service.
+   *
+   * @var \Drupal\Core\Render\RendererInterface
+   */
+  protected $renderer;
+
   /**
    * The river name.
    *
@@ -100,19 +125,36 @@ abstract class RiverServiceBase implements RiverServiceInterface {
   /**
    * Constructor.
    *
+   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
+   *   The language manager.
    * @param \Drupal\Core\Pager\PagerManagerInterface $pager_manager
    *   The pager manager service.
    * @param \Drupal\Core\Pager\PagerParametersInterface $pager_parameters
    *   The pager parameter service.
    * @param \Drupal\reliefweb_api\Services\ReliefWebApiClient $api_client
    *   The ReliefWeb API Client service.
+   * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
+   *   The request stack.
+   * @param \Drupal\Core\Render\RendererInterface $renderer
+   *   The renderer service.
    * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
    *   The translation manager service.
    */
-  public function __construct(PagerManagerInterface $pager_manager, PagerParametersInterface $pager_parameters, ReliefWebApiClient $api_client, TranslationInterface $string_translation) {
+  public function __construct(
+    LanguageManagerInterface $language_manager,
+    PagerManagerInterface $pager_manager,
+    PagerParametersInterface $pager_parameters,
+    ReliefWebApiClient $api_client,
+    RequestStack $request_stack,
+    RendererInterface $renderer,
+    TranslationInterface $string_translation
+  ) {
+    $this->languageManager = $language_manager;
     $this->pagerManager = $pager_manager;
     $this->pagerParameters = $pager_parameters;
     $this->apiClient = $api_client;
+    $this->requestStack = $request_stack;
+    $this->renderer = $renderer;
     $this->stringTranslation = $string_translation;
     $this->url = static::getRiverUrl($this->getBundle());
   }
@@ -504,6 +546,106 @@ public function requestApi(array $payload) {
     return $this->apiClient->request($this->resource, $payload);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getRssContent() {
+    $river = Html::getId($this->getRiver());
+    $request = $this->requestStack->getCurrentRequest();
+    $items = $this->getApiDataForRss();
+    $first = reset($items);
+    $date = $first['date'] ?? static::createDate(time());
+
+    $content = [
+      '#theme' => 'reliefweb_rivers_rss__' . $river,
+      '#site_url' => $request->getSchemeAndHttpHost(),
+      '#title' => $this->getPageTitle(),
+      '#feed_url' => $request->getUri(),
+      '#language' => $this->languageManager->getCurrentLanguage()->getId(),
+      '#date' => $date,
+      '#items' => $items,
+      '#cache' => [
+        'contexts' => [
+          'url.query_args',
+        ],
+        'tags' => [
+          $this->getEntityTypeId() . '_list:' . $this->getBundle(),
+          'taxonomy_term_list',
+        ],
+      ],
+    ];
+
+    $headers = [
+      'Content-Type' => 'application/rss+xml; charset=utf-8',
+      'Cache-Control' => 'private',
+    ];
+
+    return new Response($this->renderer->render($content), 200, $headers);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getApiDataForRss($limit = 20) {
+    $view = $this->getSelectedView();
+
+    $payload = $this->getApiPayloadForRss($view);
+    $payload['limit'] = $limit;
+
+    // Full text search.
+    // @todo add the filtering from the advanced search.
+    $search = $this->getSearch();
+    if (!empty($search)) {
+      $payload['query']['value'] = $search;
+    }
+    else {
+      unset($payload['query']);
+    }
+
+    // Generate the API filter with the facet and advanced search filters.
+    $filter = $this->getAdvancedSearch()->getApiFilter();
+    if (!empty($filter)) {
+      // Update the payload filter.
+      if (!empty($payload['filter'])) {
+        $payload['filter'] = [
+          'conditions' => [
+            $payload['filter'],
+            $filter,
+          ],
+          'operator' => 'AND',
+        ];
+      }
+      else {
+        $payload['filter'] = $filter;
+      }
+    }
+
+    // Retrieve the API data.
+    $data = $this->requestApi($payload);
+
+    // Skip if there is no data.
+    if (empty($data)) {
+      return [];
+    }
+
+    // Parse the API data and return the entities.
+    return $this->parseApiDataForRss($data, $view);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getApiPayloadForRss($view = '') {
+    return $this->getApiPayload($view);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function parseApiDataForRss(array $data, $view = '') {
+    return [];
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/html/modules/custom/reliefweb_rivers/src/RiverServiceInterface.php b/html/modules/custom/reliefweb_rivers/src/RiverServiceInterface.php
index 939c33b04..c38bed4bc 100644
--- a/html/modules/custom/reliefweb_rivers/src/RiverServiceInterface.php
+++ b/html/modules/custom/reliefweb_rivers/src/RiverServiceInterface.php
@@ -200,7 +200,7 @@ public function getRiverLinks();
   public function getApiPayload($view = '');
 
   /**
-   * Get the data from the ReliefWeb API for the given payload.
+   * Get the data from the ReliefWeb API.
    *
    * @param int $limit
    *   Number of resources to return.
@@ -237,6 +237,46 @@ public function parseApiData(array $data, $view = '');
    */
   public function requestApi(array $payload);
 
+  /**
+   * Get the RSS content for the river.
+   *
+   * @return array
+   *   Render array.
+   */
+  public function getRssContent();
+
+  /**
+   * Get the data for the RSS feeds from the ReliefWeb API.
+   *
+   * @param int $limit
+   *   Number of resources to return.
+   *
+   * @return array
+   *   List of resource data as returned by ::parseApiDataForRss().
+   */
+  public function getApiDataForRss($limit = 20);
+
+  /**
+   * Get the ReliefWeb API payload for the given river RSS feed and view.
+   *
+   * @return array
+   *   API payload.
+   */
+  public function getApiPayloadForRss($view = '');
+
+  /**
+   * Parse the data from the ReliefWeb API to use in river RSS feeds.
+   *
+   * @param array $data
+   *   Data returned by the ReliefWeb API.
+   * @param string $view
+   *   Current river view.
+   *
+   * @return array
+   *   Parsed data, ready to use in river RSS templates.
+   */
+  public function parseApiDataForRss(array $data, $view = '');
+
   /**
    * Get the ISO 639-1 language code for the entity.
    *
diff --git a/html/modules/custom/reliefweb_rivers/src/Services/BlogPostRiver.php b/html/modules/custom/reliefweb_rivers/src/Services/BlogPostRiver.php
index d1e36b2f2..828ea0eb3 100644
--- a/html/modules/custom/reliefweb_rivers/src/Services/BlogPostRiver.php
+++ b/html/modules/custom/reliefweb_rivers/src/Services/BlogPostRiver.php
@@ -156,4 +156,96 @@ public function parseApiData(array $api_data, $view = '') {
     return $entities;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getApiPayloadForRss($view = '') {
+    $payload = $this->getApiPayload($view);
+    $payload['fields']['include'][] = 'image';
+    return $payload;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function parseApiDataForRss(array $data, $view = '') {
+    // Retrieve the API data (with backward compatibility).
+    $items = $data['items'] ?? $data['data'] ?? [];
+
+    // Parse the entities retrieved from the API.
+    $entities = [];
+    foreach ($items as $item) {
+      $fields = $item['fields'];
+
+      // Base article data.
+      $data = [
+        'id' => $item['id'],
+        'bundle' => $this->bundle,
+      ];
+
+      // Title.
+      $data['title'] = $fields['title'];
+
+      // Url to the article.
+      if (isset($fields['url_alias'])) {
+        $data['url'] = UrlHelper::stripDangerousProtocols($fields['url_alias']);
+      }
+      else {
+        $data['url'] = UrlHelper::getAliasFromPath('/node/' . $item['id']);
+      }
+
+      // Dates.
+      $data['date'] = static::createDate($fields['date']['created']);
+
+      // Author.
+      $data['author'] = $fields['author'] ?? 'ReliefWeb';
+
+      // Body.
+      $data['body'] = $fields['body-html'] ?? '';
+
+      // Categories.
+      $categories = [
+        'tags' => [$this->t('Tag'), $this->t('Tags')],
+      ];
+      foreach ($categories as $category => $labels) {
+        if (!empty($fields[$category])) {
+          $data['categories'][$category] = [
+            'label' => $labels[count($fields[$category]) > 1 ? 1 : 0],
+            'values' => array_map(function ($term) {
+              return $term['name'];
+            }, $fields[$category]),
+          ];
+        }
+      }
+
+      // Media: image.
+      if (isset($fields['image']['url'])) {
+        $image = $fields['image'];
+        $copyright = trim($image['copyright'] ?? '');
+        if (!empty($copyright) && mb_strpos($copyright, '©') === FALSE) {
+          $copyright = '© ' . $copyright;
+        }
+        $data['media'][] = [
+          'url' => $image['url'],
+          'filesize' => $image['filesize'] ?? 0,
+          'type' => $image['mimetype'] ?? '',
+          'medium' => 'image',
+          'expression' => 'full',
+          'height' => $image['height'] ?? 0,
+          'width' => $image['width'] ?? 0,
+          'thumbnail' => $image['url-thumb'] ?? '',
+          'title' => $image['caption'] ?? '',
+          'copyright' => $copyright,
+        ];
+      }
+
+      // Compute the language code for the resource's data.
+      $data['langcode'] = static::getLanguageCode($data);
+
+      $entities[$item['id']] = $data;
+    }
+
+    return $entities;
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_rivers/src/Services/DisasterRiver.php b/html/modules/custom/reliefweb_rivers/src/Services/DisasterRiver.php
index c08fe24ff..137dbb73f 100644
--- a/html/modules/custom/reliefweb_rivers/src/Services/DisasterRiver.php
+++ b/html/modules/custom/reliefweb_rivers/src/Services/DisasterRiver.php
@@ -268,6 +268,90 @@ public function parseApiData(array $api_data, $view = '') {
     return $entities;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getApiPayloadForRss($view = '') {
+    $payload = $this->getApiPayload($view);
+    $payload['fields']['include'][] = 'glide';
+    $payload['fields']['include'][] = 'profile.overview-html';
+    return $payload;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function parseApiDataForRss(array $data, $view = '') {
+    $items = $data['items'] ?? $data['data'] ?? [];
+
+    // Parse the entities retrieved from the API.
+    $entities = [];
+    foreach ($items as $item) {
+      $fields = $item['fields'];
+
+      // Base article data.
+      $data = [
+        'id' => $item['id'],
+        'bundle' => $this->bundle,
+      ];
+
+      // Title.
+      $data['title'] = $fields['name'];
+
+      // Url to the article.
+      if (isset($fields['url_alias'])) {
+        $data['url'] = UrlHelper::stripDangerousProtocols($fields['url_alias']);
+      }
+      else {
+        $data['url'] = UrlHelper::getAliasFromPath('/taxonomy/term/' . $item['id']);
+      }
+
+      // Dates.
+      $data['date'] = static::createDate($fields['date']['created']);
+
+      // Body and how to apply.
+      $data['body'] = $fields['profile']['overview-html'] ?? '';
+
+      // Categories.
+      $categories = [
+        'country' => [
+          $this->t('Affected country'),
+          $this->t('Affected countries'),
+        ],
+        'disaster_type' => [
+          $this->t('Disaster type'),
+          $this->t('Disaster types'),
+        ],
+      ];
+      $inline = ['country' => TRUE];
+      foreach ($categories as $category => $labels) {
+        if (!empty($fields[$category])) {
+          $data['categories'][$category] = [
+            'label' => $labels[count($fields[$category]) > 1 ? 1 : 0],
+            'values' => array_map(function ($term) {
+              return $term['name'];
+            }, $fields[$category]),
+            'inline' => isset($inline[$category]),
+          ];
+        }
+      }
+      if (!empty($fields['glide'])) {
+        $data['categories']['glide'] = [
+          'label' => $this->t('Glide'),
+          'values' => [$fields['glide']],
+          'inline' => TRUE,
+        ];
+      }
+
+      // Compute the language code for the resource's data.
+      $data['langcode'] = static::getLanguageCode($data);
+
+      $entities[$item['id']] = $data;
+    }
+
+    return $entities;
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/html/modules/custom/reliefweb_rivers/src/Services/JobRiver.php b/html/modules/custom/reliefweb_rivers/src/Services/JobRiver.php
index dae5335e1..3c8cdca65 100644
--- a/html/modules/custom/reliefweb_rivers/src/Services/JobRiver.php
+++ b/html/modules/custom/reliefweb_rivers/src/Services/JobRiver.php
@@ -326,4 +326,113 @@ public function parseApiData(array $api_data, $view = '') {
     return $entities;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getApiPayloadForRss($view = '') {
+    $payload = $this->getApiPayload($view);
+    $payload['fields']['include'][] = 'date.created';
+    $payload['fields']['include'][] = 'career_categories.name';
+    $payload['fields']['include'][] = 'type.name';
+    $payload['fields']['include'][] = 'theme.name';
+    $payload['fields']['include'][] = 'how_to_apply-html';
+    return $payload;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function parseApiDataForRss(array $data, $view = '') {
+    $items = $data['items'] ?? $data['data'] ?? [];
+
+    // Parse the entities retrieved from the API.
+    $entities = [];
+    foreach ($items as $item) {
+      $fields = $item['fields'];
+
+      // Base article data.
+      $data = [
+        'id' => $item['id'],
+        'bundle' => $this->bundle,
+      ];
+
+      // Title.
+      $data['title'] = $fields['title'];
+
+      // Url to the article.
+      if (isset($fields['url_alias'])) {
+        $data['url'] = UrlHelper::stripDangerousProtocols($fields['url_alias']);
+      }
+      else {
+        $data['url'] = UrlHelper::getAliasFromPath('/node/' . $item['id']);
+      }
+
+      // Dates.
+      $data['date'] = static::createDate($fields['date']['created']);
+
+      // Body and how to apply.
+      $data['body'] = $fields['body-html'] ?? '';
+
+      if (!empty($fields['how_to_apply-html'])) {
+        $data['body'] .= '<h3>' . $this->t('How to apply') . '</h3>' . $fields['how_to_apply-html'];
+      }
+
+      // Categories.
+      $categories = [
+        'country' => [
+          $this->t('Country'),
+          $this->t('Countries'),
+        ],
+        'source' => [
+          $this->t('Organization'),
+          $this->t('Organizations'),
+        ],
+        'career_categories' => [
+          $this->t('Career category'),
+          $this->t('Career categories'),
+        ],
+        'type' => [
+          $this->t('Job type'),
+          $this->t('Job types'),
+        ],
+        'theme' => [
+          $this->t('Theme'),
+          $this->t('Themes'),
+        ],
+      ];
+      $inline = ['country' => TRUE, 'source' => TRUE];
+      foreach ($categories as $category => $labels) {
+        if (!empty($fields[$category])) {
+          $data['categories'][$category] = [
+            'label' => $labels[count($fields[$category]) > 1 ? 1 : 0],
+            'values' => array_map(function ($term) {
+              return $term['name'];
+            }, $fields[$category]),
+            'inline' => isset($inline[$category]),
+          ];
+        }
+      }
+
+      // Dates (description header).
+      $dates = [
+        'closing' => $this->t('Closing date'),
+      ];
+      foreach ($dates as $date => $label) {
+        if (!empty($fields['date'][$date])) {
+          $data['dates'][$date] = [
+            'label' => $label,
+            'value' => $fields['date'][$date],
+          ];
+        }
+      }
+
+      // Compute the language code for the resource's data.
+      $data['langcode'] = static::getLanguageCode($data);
+
+      $entities[$item['id']] = $data;
+    }
+
+    return $entities;
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_rivers/src/Services/ReportRiver.php b/html/modules/custom/reliefweb_rivers/src/Services/ReportRiver.php
index e2f3c0f4a..1ace533a2 100644
--- a/html/modules/custom/reliefweb_rivers/src/Services/ReportRiver.php
+++ b/html/modules/custom/reliefweb_rivers/src/Services/ReportRiver.php
@@ -480,4 +480,181 @@ protected function getSummaryFromFormat($format, array $files) {
     return '';
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getApiPayloadForRss($view = '') {
+    $payload = $this->getApiPayload($view);
+    $payload['fields']['include'][] = 'date.created';
+    $payload['fields']['include'][] = 'theme.name';
+    $payload['fields']['include'][] = 'disaster_type.name';
+    if ($view === 'headlines') {
+      $payload['fields']['include'][] = 'headline.image';
+    }
+    return $payload;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function parseApiDataForRss(array $data, $view = '') {
+    $headlines = $view === 'headlines';
+    $query = $this->requestStack->getCurrentRequest()->query;
+    $country_slug = !$query->has('country_slug') || $query->getInt('country_slug') !== 0;
+
+    $items = $data['items'] ?? $data['data'] ?? [];
+
+    // Parse the entities retrieved from the API.
+    $entities = [];
+    foreach ($items as $item) {
+      $fields = $item['fields'];
+
+      // Base article data.
+      $data = [
+        'id' => $item['id'],
+        'bundle' => $this->bundle,
+      ];
+
+      // Determine document type.
+      $format = 'Report';
+      if (!empty($fields['format'])) {
+        if (isset($fields['format']['name'])) {
+          $format = $fields['format']['name'];
+        }
+        elseif (isset($fields['format'][0]['name'])) {
+          $format = $fields['format'][0]['name'];
+        }
+      }
+      $data['format'] = $format;
+
+      // Title.
+      if ($headlines && !empty($fields['headline']['title'])) {
+        $title = $fields['headline']['title'];
+      }
+      else {
+        $title = $fields['title'];
+      }
+      // Add the primary country as prefix to the title, unless instructed
+      // otherwise.
+      if ($country_slug && !empty($fields['country'])) {
+        foreach ($fields['country'] as $value) {
+          // Ideally, we'd check the language and search for variations of the
+          // the country name inside the title but as of February 2022, country
+          // names in the API are only in English and alternate names are not
+          // indexed and not exposed.
+          if (!empty($value['primary'])) {
+            // Prepend the country shortname if it exists and the shortname
+            // and name are not in the title.
+            if (!empty($value['shortname'])) {
+              if (mb_stripos($title, $value['shortname']) === FALSE && mb_stripos($title, $value['name']) === FALSE) {
+                $title = $value['shortname'] . ': ' . $title;
+              }
+            }
+            // Prepend the country name if not in the title.
+            elseif (mb_stripos($title, $value['name']) === FALSE) {
+              $title = $value['name'] . ': ' . $title;
+            }
+            break;
+          }
+        }
+      }
+      $data['title'] = $title;
+
+      // Url to the article.
+      if (isset($fields['url_alias'])) {
+        $data['url'] = UrlHelper::stripDangerousProtocols($fields['url_alias']);
+      }
+      else {
+        $data['url'] = UrlHelper::getAliasFromPath('/node/' . $item['id']);
+      }
+
+      // Dates.
+      $data['date'] = static::createDate($fields['date']['created']);
+
+      // Body and Summary.
+      //
+      // The summary is just plain text, so we differenciate it from the body.
+      if ($headlines && !empty($fields['headline']['summary'])) {
+        $data['summary'] = $fields['headline']['summary'];
+      }
+      elseif (!empty($fields['body-html'])) {
+        $data['body'] = $fields['body-html'];
+      }
+
+      // Set the summary if it's empty but there are attachments.
+      if (empty($data['summary']) && !empty($fields['file'])) {
+        $data['summary'] = $this->getSummaryFromFormat($format, $fields['file']);
+      }
+
+      // Media: headline image.
+      if ($headlines && isset($fields['headline']['image']['url'])) {
+        $image = $fields['headline']['image'];
+        $copyright = trim($image['copyright'] ?? '');
+        if (!empty($copyright) && mb_strpos($copyright, '©') === FALSE) {
+          $copyright = '© ' . $copyright;
+        }
+        $data['media'][] = [
+          'url' => $image['url'],
+          'filesize' => $image['filesize'] ?? 0,
+          'type' => $image['mimetype'] ?? '',
+          'medium' => 'image',
+          'expression' => 'full',
+          'height' => $image['height'] ?? 0,
+          'width' => $image['width'] ?? 0,
+          'thumbnail' => $image['url-thumb'] ?? '',
+          'title' => $image['caption'] ?? '',
+          'copyright' => $copyright,
+        ];
+      }
+
+      // Enclosure.
+      // Only 1 as per rssboard.org/rss-profile#element-channel-item-enclosure.
+      if (!empty($fields['file'][0])) {
+        $file = $fields['file'][0];
+        if (!empty($file['preview']['url-thumb'])) {
+          $data['preview'] = $file['preview']['url-thumb'];
+        }
+        if (isset($file['filesize'], $file['mimetype'], $file['url'])) {
+          $data['enclosure'] = [
+            'length' => $file['filesize'],
+            'type' => $file['mimetype'],
+            'url' => $file['url'],
+          ];
+        }
+      }
+
+      // Categories.
+      $categories = [
+        'country' => [$this->t('Country'), $this->t('Countries')],
+        'source' => [$this->t('Source'), $this->t('Sources')],
+        'disaster' => [$this->t('Disaster'), $this->t('Disasters')],
+        'theme' => [$this->t('Theme'), $this->t('Themes')],
+        'format' => [$this->t('Format'), $this->t('Formats')],
+        'disaster_type' => [
+          $this->t('Disaster type'),
+          $this->t('Disaster types'),
+        ],
+      ];
+      $inline = ['country' => TRUE, 'source' => TRUE];
+      foreach ($categories as $category => $labels) {
+        if (!empty($fields[$category])) {
+          $data['categories'][$category] = [
+            'label' => $labels[count($fields[$category]) > 1 ? 1 : 0],
+            'values' => array_map(function ($term) {
+              return $term['name'];
+            }, $fields[$category]),
+            'inline' => isset($inline[$category]),
+          ];
+        }
+      }
+
+      // Compute the language code for the resource's data.
+      $data['langcode'] = static::getLanguageCode($data);
+
+      $entities[$item['id']] = $data;
+    }
+
+    return $entities;
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_rivers/src/Services/TopicRiver.php b/html/modules/custom/reliefweb_rivers/src/Services/TopicRiver.php
index 1a06053b4..7dc8c0ac1 100644
--- a/html/modules/custom/reliefweb_rivers/src/Services/TopicRiver.php
+++ b/html/modules/custom/reliefweb_rivers/src/Services/TopicRiver.php
@@ -3,12 +3,15 @@
 namespace Drupal\reliefweb_rivers\Services;
 
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\Pager\PagerManagerInterface;
 use Drupal\Core\Pager\PagerParametersInterface;
+use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\StringTranslation\TranslationInterface;
 use Drupal\reliefweb_api\Services\ReliefWebApiClient;
 use Drupal\reliefweb_rivers\RiverServiceBase;
 use Drupal\reliefweb_utility\Helpers\HtmlSummarizer;
+use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * Service class to retrieve job resource for the job rivers.
@@ -73,23 +76,42 @@ public function getViews() {
   /**
    * Constructor.
    *
+   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
+   *   The language manager.
    * @param \Drupal\Core\Pager\PagerManagerInterface $pager_manager
    *   The pager manager service.
    * @param \Drupal\Core\Pager\PagerParametersInterface $pager_parameters
    *   The pager parameter service.
    * @param \Drupal\reliefweb_api\Services\ReliefWebApiClient $api_client
    *   The ReliefWeb API Client service.
+   * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
+   *   The request stack.
+   * @param \Drupal\Core\Render\RendererInterface $renderer
+   *   The renderer service.
    * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
    *   The translation manager service.
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The entity type manager service.
    */
-  public function __construct(PagerManagerInterface $pager_manager, PagerParametersInterface $pager_parameters, ReliefWebApiClient $api_client, TranslationInterface $string_translation, EntityTypeManagerInterface $entity_type_manager) {
-    $this->pagerManager = $pager_manager;
-    $this->pagerParameters = $pager_parameters;
-    $this->apiClient = $api_client;
-    $this->stringTranslation = $string_translation;
-    $this->url = static::getRiverUrl($this->bundle);
+  public function __construct(
+    LanguageManagerInterface $language_manager,
+    PagerManagerInterface $pager_manager,
+    PagerParametersInterface $pager_parameters,
+    ReliefWebApiClient $api_client,
+    RequestStack $request_stack,
+    RendererInterface $renderer,
+    TranslationInterface $string_translation,
+    EntityTypeManagerInterface $entity_type_manager
+  ) {
+    parent::__construct(
+      $language_manager,
+      $pager_manager,
+      $pager_parameters,
+      $api_client,
+      $request_stack,
+      $renderer,
+      $string_translation
+    );
     $this->entityTypeManager = $entity_type_manager;
   }
 
diff --git a/html/modules/custom/reliefweb_rivers/src/Services/TrainingRiver.php b/html/modules/custom/reliefweb_rivers/src/Services/TrainingRiver.php
index a1945d8a9..d63f71917 100644
--- a/html/modules/custom/reliefweb_rivers/src/Services/TrainingRiver.php
+++ b/html/modules/custom/reliefweb_rivers/src/Services/TrainingRiver.php
@@ -417,4 +417,119 @@ public function parseApiData(array $api_data, $view = '') {
     return $entities;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getApiPayloadForRss($view = '') {
+    $payload = $this->getApiPayload($view);
+    $payload['fields']['include'][] = 'career_categories.name';
+    $payload['fields']['include'][] = 'type.name';
+    $payload['fields']['include'][] = 'theme.name';
+    $payload['fields']['include'][] = 'format.name';
+    $payload['fields']['include'][] = 'how_to_register-html';
+    return $payload;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function parseApiDataForRss(array $data, $view = '') {
+    $items = $data['items'] ?? $data['data'] ?? [];
+
+    // Parse the entities retrieved from the API.
+    $entities = [];
+    foreach ($items as $item) {
+      $fields = $item['fields'];
+
+      // Base article data.
+      $data = [
+        'id' => $item['id'],
+        'bundle' => $this->bundle,
+      ];
+
+      // Title.
+      $data['title'] = $fields['title'];
+
+      // Url to the article.
+      if (isset($fields['url_alias'])) {
+        $data['url'] = UrlHelper::stripDangerousProtocols($fields['url_alias']);
+      }
+      else {
+        $data['url'] = UrlHelper::getAliasFromPath('/node/' . $item['id']);
+      }
+
+      // Dates.
+      $data['date'] = static::createDate($fields['date']['created']);
+
+      // Body and how to apply.
+      $data['body'] = $fields['body-html'] ?? '';
+
+      if (!empty($fields['how_to_register-html'])) {
+        $data['body'] .= '<h3>' . $this->t('How to register') . '</h3>' . $fields['how_to_register-html'];
+      }
+
+      // Categories.
+      $categories = [
+        'country' => [
+          $this->t('Country'),
+          $this->t('Countries'),
+        ],
+        'source' => [
+          $this->t('Organization'),
+          $this->t('Organizations'),
+        ],
+        'career_categories' => [
+          $this->t('Career category'),
+          $this->t('Career categories'),
+        ],
+        'type' => [
+          $this->t('Job type'),
+          $this->t('Job types'),
+        ],
+        'theme' => [
+          $this->t('Theme'),
+          $this->t('Themes'),
+        ],
+        'format' => [
+          $this->t('Training format'),
+          $this->t('Training formats'),
+        ],
+      ];
+      $inline = ['country' => TRUE, 'source' => TRUE];
+      foreach ($categories as $category => $labels) {
+        if (!empty($fields[$category])) {
+          $data['categories'][$category] = [
+            'label' => $labels[count($fields[$category]) > 1 ? 1 : 0],
+            'values' => array_map(function ($term) {
+              return $term['name'];
+            }, $fields[$category]),
+            'inline' => isset($inline[$category]),
+          ];
+        }
+      }
+
+      // Dates (description header).
+      $dates = [
+        'start' => $this->t('Start date'),
+        'end' => $this->t('End date'),
+        'registration' => $this->t('Registration deadline'),
+      ];
+      foreach ($dates as $date => $label) {
+        if (!empty($fields['date'][$date])) {
+          $data['dates'][$date] = [
+            'label' => $label,
+            'value' => $fields['date'][$date],
+          ];
+        }
+      }
+
+      // Compute the language code for the resource's data.
+      $data['langcode'] = static::getLanguageCode($data);
+
+      $entities[$item['id']] = $data;
+    }
+
+    return $entities;
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_rivers/templates/reliefweb-rivers-rss.html.twig b/html/modules/custom/reliefweb_rivers/templates/reliefweb-rivers-rss.html.twig
new file mode 100644
index 000000000..d2c08a0cf
--- /dev/null
+++ b/html/modules/custom/reliefweb_rivers/templates/reliefweb-rivers-rss.html.twig
@@ -0,0 +1,124 @@
+{#
+
+/**
+ * @file
+ * Template for the river RSS feeds.
+ *
+ * Available variables:
+ * - site_url: the site URL
+ * - title: the RSS feed title
+ * - feed_url: the RSS feed URL
+ * - items: list of "article" items with the following properties:
+ *   - title: node title or term name
+ *   - url: canonical URL to the entity
+ *   - dates: list of dates like the publication date
+ *   - tags: list of
+ *   - categories: list of categories containing a list of terms the article
+ *     is tagged with
+ *   - author: article author (only relevant for blog posts)
+ *   - media: list of images with a url, filesize, type, medium,
+ *     expression, height, width, title and copyright.
+ *     RSS properties
+ *   - enclosure: attachment with the url, length and type.
+ */
+
+#}
+<?xml version="1.0" encoding="utf-8" ?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:media="http://search.yahoo.com/mrss/">
+  <channel>
+    <title>ReliefWeb - {{ title }}</title>
+    <description>ReliefWeb - {{ title }}</description>
+    <link>{{ site_url }}</link>
+    <atom:link rel="self" href="{{ feed_url }}" />
+    {# RSS logo. #}
+    <image>
+      <url>{{ site_url }}/themes/custom/common_design_subtheme/img/logos/ReliefWeb_RSS_logo.png</url>
+      <title>ReliefWeb - {{ title }}</title>
+      <link>{{ site_url }}</link>
+      <width>256</width>
+      <height>256</height>
+    </image>
+    <language>{{ language }}</language>
+    <copyright>{{ 'You should respect the intellectual property rights of the original source. Please contact the source directly if you want to re-use their content.'|t }}</copyright>
+    <pubDate>{{ date|date('r') }}</pubDate>
+    <lastBuildDate>{{ date|date('r') }}</lastBuildDate>
+    {# List of articles. #}
+    {% for item in items %}
+    <item>
+      <title>{{ item.title }}</title>
+      <link>{{ item.url }}</link>
+      <guid isPermaLink="true">{{ item.url }}</guid>
+      <pubDate>{{ item.date|date('r') }}</pubDate>
+      <source url="{{ feed_url }}">ReliefWeb - {{ title }}</source>
+      <description>{{ '<![CDATA['|raw }}
+        {% for key, category in item.categories if category.inline %}
+        <div class="tag {{ key }}">{{ '@label: @values'|t({
+          '@label': category.label,
+          '@values': category.values|join(', '),
+        }) }}</div>
+        {% endfor %}
+        {% for key, date in item.dates %}
+        <div class="date {{ key }}">{{ '@label: @date'|t({
+          '@label': date.label,
+          '@date': date.value|date('j M Y'),
+        }) }}</div>
+        {% endfor %}
+        {% if item.preview is not empty %}
+        <p><img src="{{ item.preview }}" alt=""></p>
+        {% endif %}
+        {% if item.summary is not empty %}
+        <p>{{ item.summary }}</p>
+        {% endif %}
+        {% if item.body is not empty %}
+        {{ item.body|sanitize_html(false, 1) }}
+        {% endif %}
+      {{ ']]>'|raw }}
+      </description>
+
+      {# Taxonomy terms. #}
+      {% for category in item.categories %}
+      {% for value in category.values %}
+      <category>{{ value }}</category>
+      {% endfor %}
+      {% endfor %}
+      {# Authour/sources of the article #}
+      {% if item.author is not empty %}
+      <author>{{ item.author }}</author>
+      {% endif %}
+      {% for source in item.categories.source.values %}
+      <author>{{ source }}</author>
+      {% endfor %}
+      {# Images. #}
+      {% for media in item.media %}
+      <media:content
+        url="{{ media.url }}"
+        filesize="{{ media.filesize }}"
+        type="{{ media.type }}"
+        medium="{{ media.medium }}"
+        expression="{{ media.expression }}"
+        height="{{ media.height }}"
+        width="{{ media.width }}"
+      >
+        {% if media.thumbnail %}
+        <media:thumbnail url="{{ media.thumbnail }}" />
+        {% endif %}
+        {% if media.title is not empty %}
+        <media:title>{{ media.title }}</media:title>
+        {% endif %}
+        {% if media.copyright is not empty %}
+        <media:copyright>{{ media.copyright }}</media:copyright>
+      {% endif %}
+      </media:content>
+      {% endfor %}
+      {# Attachments. #}
+      {% if item.enclosure %}
+      <enclosure
+        url="{{ item.enclosure.url }}"
+        length="{{ item.enclosure.length }}"
+        type="{{ item.enclosure.type }}"
+      />
+      {% endif %}
+    </item>
+    {% endfor %}
+  </channel>
+</rss>
diff --git a/html/themes/custom/common_design_subtheme/img/logos/ReliefWeb_RSS_logo.png b/html/themes/custom/common_design_subtheme/img/logos/ReliefWeb_RSS_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..11462a85d6560c4bfabf005fff4aa899f9718ee8
GIT binary patch
literal 12635
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
JYo#s2{|{kEnp^+?

literal 0
HcmV?d00001


From 52a39e23af12f86e720ac24bb603d24c06d63055 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sat, 5 Feb 2022 01:09:00 +0000
Subject: [PATCH 424/720] [RW-188] Add legacy rewrites

---
 .../etc/nginx/custom/02_legacy_rewrites.conf  | 156 ++++++++++++++++++
 1 file changed, 156 insertions(+)
 create mode 100644 docker/etc/nginx/custom/02_legacy_rewrites.conf

diff --git a/docker/etc/nginx/custom/02_legacy_rewrites.conf b/docker/etc/nginx/custom/02_legacy_rewrites.conf
new file mode 100644
index 000000000..d6cbd2e18
--- /dev/null
+++ b/docker/etc/nginx/custom/02_legacy_rewrites.conf
@@ -0,0 +1,156 @@
+#
+# Old URLs redirection.
+#
+
+# Training.
+rewrite ^/trainings                   $scheme://$server_name/training permanent;
+
+# Old site archives.
+rewrite ^/rwarchive(.*)               $scheme://$server_name/rw$1 permanent;
+
+# Files.
+if ($uri ~ \$file) {
+  # Report.
+  rewrite ^/r?w/(rwb|lib)\.nsf        $scheme://$server_name/updates? permanent;
+
+  # Job.
+  rewrite ^/r?w/(res)\.nsf            $scheme://$server_name/jobs? permanent;
+
+  # Training.
+  rewrite ^/r?w/(rwt)\.nsf            $scheme://$server_name/training? permanent;
+
+  # Map.
+  rewrite (?i)^/r?w/fullmaps          $scheme://$server_name/maps? permanent;
+
+  # Other.
+  rewrite (?i)^/r?w/                  $scheme://$server_name? permanent;
+}
+
+# ISO3.
+if ($arg_cc != "") {
+  # FTS.
+  rewrite ^/r?w/[^/]+\.nsf/doc105     http://fts.unocha.org/pageloader.aspx?page=emerg-emergencyCountryDetails&cc=$arg_cc? permanent;
+
+  # Key documents.
+  rewrite ^/r?w/[^/]+\.nsf/doc200     $scheme://$server_name/country/$arg_cc?f[]=field_feature:2? permanent;
+
+  # Maps
+  rewrite ^/r?w/[^/]+\.nsf/doc404     $scheme://$server_name/country/$arg_cc/thumb? permanent;
+
+  # Country jobs.
+  rewrite ^/r?w/[^/]+\.nsf/doc212     $scheme://$server_name/jobs?search=@country%20$arg_cc? permanent;
+
+  # Country training.
+  rewrite ^/r?w/[^/]+\.nsf/doc209     $scheme://$server_name/jobs?search=@country%20$arg_cc? permanent;
+
+  # Country.
+  rewrite ^/r?w/[^/]+\.nsf/doc\d+     $scheme://$server_name/country/$arg_cc? permanent;
+
+  # RSS.
+  rewrite (?i)^/RWFeed                $scheme://$server_name/country/$arg_cc/rss.xml? permanent;
+}
+
+# GLIDE.
+set $glide "";
+if ($arg_emid != "") {
+  set $glide $arg_emid;
+}
+if ($arg_emi != "") {
+  set $glide $arg_emi;
+}
+if ($glide != "") {
+  # FTS.
+  rewrite ^/r?w/[^/]+\.nsf/doc105     http://fts.unocha.org? permanent;
+
+  # Key documents.
+  rewrite ^/r?w/[^/]+\.nsf/doc200     $scheme://$server_name/disaster/$glide?f[]=field_feature:2? permanent;
+
+  # Maps.
+  rewrite ^/r?w/[^/]+\.nsf/doc404     $scheme://$server_name/disaster/$glide/thumb? permanent;
+
+  # Disaster.
+  rewrite ^/r?w/[^/]+\.nsf/doc\d+     $scheme://$server_name/disaster/$glide? permanent;
+
+  # RSS.
+  rewrite (?i)^/RWFeed                $scheme://$server_name/disaster/$glide/rss.xml? permanent;
+}
+
+# RSS.
+rewrite (?i)^/RWFeed                  $scheme://$server_name/rss? permanent;
+
+# OCHA jobs.
+if ($arg_srcid ~* ocha) {
+  rewrite ^/r?w/srch\.nsf/doc304      $scheme://$server_name/jobs?f[]=field_source:1503? permanent;
+}
+
+# Internships.
+if ($args ~ intern|stag|pasant|practicante) {
+  rewrite ^/r?w/srch\.nsf/doc304      $scheme://$server_name/jobs?f[]=field_job_type:265? permanent;
+}
+
+# Jobs.
+rewrite ^/vacancies                   $scheme://$server_name/jobs? permanent;
+rewrite ^/job$                        $scheme://$server_name/jobs? permanent;
+rewrite /vac_map                      $scheme://$server_name/jobs? permanent;
+rewrite ^/r?w/(dbc|res)\.nsf/doc(215|212)   $scheme://$server_name/jobs? permanent;
+rewrite ^/r?w/srch\.nsf/doc(302|304)  $scheme://$server_name/jobs?search=$arg_query? permanent;
+
+# Training
+rewrite ^/r?w/[^/]+\.nsf/doc211       $scheme://$server_name/trainings? permanent;
+
+# Updates
+rewrite ^/r?w/[^/]+\.nsf/doc106       $scheme://$server_name/updates? permanent;
+rewrite ^/r?w/srch.nsf                $scheme://$server_name/updates? permanent;
+
+# Updates by country.
+rewrite (?i)^/r?w/[^/]+\.nsf/ByCountry/([^/]+)  $scheme://$server_name/updates?search=@country%20$1? permanent;
+
+# Countries & Emergencies.
+rewrite ^/r?w/dbc\.nsf/doc(103|401|115) $scheme://$server_name/countries? permanent;
+
+# Disasters.
+rewrite ^/disaster$                   $scheme://$server_name/disasters? permanent;
+
+# Burundi maps.
+rewrite ^/ochaburundi                 $scheme://$server_name/country/bdi/thumb? permanent;
+
+# Maps.
+rewrite ^/map$                        $scheme://$server_name/maps? permanent;
+rewrite ^/r?w/map.nsf                 $scheme://$server_name/maps? permanent;
+rewrite (?i)^/r?w/fullMaps            $scheme://$server_name/maps? permanent;
+rewrite ^/r?w/rwb\.nsf/doc114         $scheme://$server_name/maps? permanent;
+rewrite ^/mapc/                       $scheme://$server_name/maps?f[]=field_content_format:12? permanent;
+
+# OCHA online.
+rewrite (?i)^/ocha_ol                 http://unocha.org? permanent;
+
+# IRIN.
+rewrite (?i)^/irin                    http://www.irinnews.org? permanent;
+
+# FTS.
+rewrite (?i)^/fts                     http://fts.unocha.org? permanent;
+
+# OCHA UNEP.
+rewrite (?i)^/ocha.*unep              http://unocha.org/unep? permanent;
+
+# About.
+rewrite (?i)AboutReliefWeb            $scheme://$server_name/about? permanent;
+
+# Help.
+rewrite ^/r?w/hlp.nsf                 $scheme://$server_name/help? permanent;
+
+# Home.
+rewrite (?i)^/(library|int)           $scheme://$server_name? permanent;
+rewrite ^/r?w/dbc\.nsf/doc100         $scheme://$server_name? permanent;
+rewrite ^/r?w/rwb\.nsf/?$             $scheme://$server_name? permanent;
+
+# River redirections.
+rewrite ^/rss.xml$                                                                 /updates/rss.xml permanent;
+rewrite ^/headlines(/rss\.xml)?$                                                   /updates$1?view=headlines permanent;
+rewrite ^/(maps|updates/thumb)(/rss\.xml)?$                                        /updates$2?view=maps permanent;
+rewrite ^/updates/no-thumb(/rss\.xml)?$                                            /updates$1?view=reports permanent;
+rewrite ^/(country|disaster|taxonomy/term)/([a-zA-Z0-9-]+)(/rss\.xml)$             /updates$3?legacy-river=$1/$2 permanent;
+rewrite ^/(country|disaster|taxonomy/term)/([a-zA-Z0-9-]+)/thumb(/rss\.xml)?$      /updates$3?view=maps&legacy-river=$1/$2 permanent;
+rewrite ^/(country|disaster|taxonomy/term)/([a-zA-Z0-9-]+)/no-thumb(/rss\.xml)?$   /updates$3?view=reports&legacy-river=$1/$2 permanent;
+rewrite ^/(country|disaster|taxonomy/term)/([a-zA-Z0-9-]+)/key-content$            /$1/$2 permanent;
+rewrite ^/training/(free|online|workshop|academic)(/rss\.xml)?$                    /training$2?view=$1 permanent;

From 9c7669d229ea0ac0b0380b233d1644f442d906cd Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sun, 6 Feb 2022 00:04:52 +0000
Subject: [PATCH 425/720] [RW-347] Ensure the career categories are imported
 for jobs/training

---
 config/migrate_plus.migration.reliefweb_node__job.yml           | 2 +-
 config/migrate_plus.migration.reliefweb_node__training.yml      | 2 +-
 .../install/migrate_plus.migration.reliefweb_node__job.yml      | 2 +-
 .../install/migrate_plus.migration.reliefweb_node__training.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/migrate_plus.migration.reliefweb_node__job.yml b/config/migrate_plus.migration.reliefweb_node__job.yml
index 905f3c041..87c841d55 100644
--- a/config/migrate_plus.migration.reliefweb_node__job.yml
+++ b/config/migrate_plus.migration.reliefweb_node__job.yml
@@ -17,7 +17,7 @@ process:
   body/format:
     plugin: default_value
     default_value: markdown_editor
-  field_career_categories/value:
+  field_career_categories:
     plugin: sub_process
     source: field_career_categories
     process:
diff --git a/config/migrate_plus.migration.reliefweb_node__training.yml b/config/migrate_plus.migration.reliefweb_node__training.yml
index dea2d0f67..6ee3b1782 100644
--- a/config/migrate_plus.migration.reliefweb_node__training.yml
+++ b/config/migrate_plus.migration.reliefweb_node__training.yml
@@ -17,7 +17,7 @@ process:
   body/format:
     plugin: default_value
     default_value: markdown_editor
-  field_career_categories/value:
+  field_career_categories:
     plugin: sub_process
     source: field_career_categories
     process:
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node__job.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node__job.yml
index 23bbc0dca..94bbf1ee1 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node__job.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node__job.yml
@@ -8,7 +8,7 @@ process:
   body/format:
     plugin: default_value
     default_value: "markdown_editor"
-  field_career_categories/value:
+  field_career_categories:
     plugin: sub_process
     source: field_career_categories
     process:
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node__training.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node__training.yml
index fa2d609e5..b3f1ef182 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node__training.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node__training.yml
@@ -8,7 +8,7 @@ process:
   body/format:
     plugin: default_value
     default_value: "markdown_editor"
-  field_career_categories/value:
+  field_career_categories:
     plugin: sub_process
     source: field_career_categories
     process:

From b10f73423189d51fb2c9dd8cbcb92827aa3aa0a3 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sun, 6 Feb 2022 02:06:17 +0000
Subject: [PATCH 426/720] [RW-348] Fix OCHA product

---
 .../src/Services/ReportFormAlter.php                   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php b/html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php
index 3660965a0..45a26a5a2 100644
--- a/html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php
+++ b/html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php
@@ -229,9 +229,15 @@ protected function alterOchaProductField(array &$form, FormStateInterface $form_
     $condition = [
       'select[name="field_source[]"]' => ['value' => ['1503']],
     ];
-    $widget['#states']['visible'] = $condition;
+    // We put the visibility state on the container to avoid styling issues with
+    // the surrounding elements but we need to to put the required state on the
+    // widget element for it to work properly.
+    $form['field_ocha_product']['#states']['visible'] = $condition;
     $widget['#states']['required'] = $condition;
 
+    // Remove the empty option.
+    unset($widget['#options']['_none']);
+
     // For the above to work we need the drupal states extension.
     // @todo remove if the equivalent is added to core.
     // @see https://www.drupal.org/project/drupal/issues/1149078
@@ -272,7 +278,7 @@ public function validateOchaProductField(array $form, FormStateInterface &$form_
     }
     // Remove the ocha product otherwise.
     elseif (!$selected && !empty($ocha_product)) {
-      $form_state->getValue(['field_ocha_product', 0, 'target_id'], NULL);
+      $form_state->setValue(['field_ocha_product', 0, 'target_id'], NULL);
     }
   }
 

From 0bf247cabfcd0a2607ccbe095733e6876b640627 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sun, 6 Feb 2022 02:07:13 +0000
Subject: [PATCH 427/720] [RW-349] Make show profile selected by default in
 disaster form

---
 config/field.field.taxonomy_term.disaster.field_profile.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/field.field.taxonomy_term.disaster.field_profile.yml b/config/field.field.taxonomy_term.disaster.field_profile.yml
index 873dff718..bc0d4b46b 100644
--- a/config/field.field.taxonomy_term.disaster.field_profile.yml
+++ b/config/field.field.taxonomy_term.disaster.field_profile.yml
@@ -15,7 +15,7 @@ required: false
 translatable: true
 default_value:
   -
-    value: 0
+    value: 1
 default_value_callback: ''
 settings:
   on_label: 'Yes'

From cb89e6f91c419777fc1954c666502e105301e5cd Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sun, 6 Feb 2022 02:09:17 +0000
Subject: [PATCH 428/720] [RW-350] Assign non conflicting ID to guideline path
 aliases

---
 .../Commands/ReliefWebGuidelinesCommands.php  | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/html/modules/custom/reliefweb_guidelines/src/Commands/ReliefWebGuidelinesCommands.php b/html/modules/custom/reliefweb_guidelines/src/Commands/ReliefWebGuidelinesCommands.php
index cb08ca6ed..96230dc1f 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Commands/ReliefWebGuidelinesCommands.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Commands/ReliefWebGuidelinesCommands.php
@@ -12,6 +12,7 @@
 use Drush\Commands\DrushCommands;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\ClientException;
+use Symfony\Component\Uid\Uuid;
 
 /**
  * ReliefWeb migration Drush commandfile.
@@ -112,6 +113,10 @@ public function migrateFromTrello() {
     $shortlinks = [];
     $field_pattern = '/^field--(?<entity_type_id>[^.]+)\.(?<bundle>[^.]+)\.(?<field_name>[^.]+)$/';
 
+    // Storage for the path aliases.
+    $path_alias_storage = $this->entityTypeManager->getStorage('path_alias');
+    $path_alias_id = 10000000;
+
     // Retrieve the data from the Guidelines Trello board.
     $lists = $this->getLists($board_id);
     foreach ($lists as $weight_list => $list) {
@@ -158,6 +163,11 @@ public function migrateFromTrello() {
           'field_images' => $images,
           'moderation_status' => 'published',
           '_is_migrating' => TRUE,
+          // Disable the automatic creation of the URL alias. We will create
+          // it manually to avoid ID conflicts with the other migrated content.
+          'path' => [
+            'pathauto' => 0,
+          ],
         ];
 
         // Check if the card has labels associated to form fields.
@@ -208,6 +218,19 @@ public function migrateFromTrello() {
         $shortlink['guideline'] = $guideline;
         $shortlink['guideline_link'] = '/guideline/' . $shortlink['short_link'];
         $shortlinks[$shortlink['short_link']] = $shortlink;
+
+        // Create the path alias.
+        $path_alias_alias = '/guideline/' . $shortlink['short_link'];
+        $path_alias_url = 'https://reliefweb.int' . $path_alias_alias;
+        $path_alias_uuid = Uuid::v3(Uuid::fromString(Uuid::NAMESPACE_URL), $path_alias_url)->toRfc4122();
+
+        $path_alias_storage->create([
+          'id' => $path_alias_id++,
+          'uuid' => $path_alias_uuid,
+          'path' => '/admin/structure/guideline/' . $guideline->id(),
+          'alias' => $path_alias_alias,
+          'langcode' => $guideline->language()->getId(),
+        ])->save();
       }
     }
 

From 3e43ab1facd7bfae7d441e834be35dce17f9bbdf Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sun, 6 Feb 2022 02:31:25 +0000
Subject: [PATCH 429/720] [RW-351] Fix moderation data attribute

---
 .../FieldWidget/ReliefWebEntityReferenceSelect.php | 14 +++-----------
 .../reliefweb_form/js/widget.autocomplete.js       | 10 +++++-----
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebEntityReferenceSelect.php b/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebEntityReferenceSelect.php
index a9f2aea20..e6dfdc152 100644
--- a/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebEntityReferenceSelect.php
+++ b/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebEntityReferenceSelect.php
@@ -355,7 +355,7 @@ protected function getExtraDataFields() {
     ];
     foreach ($this->getSetting('extra_data') as $field => $selected) {
       if (!empty($selected) && strpos($field, ':') !== FALSE) {
-        list($bundle, $field_name) = explode(':', $field);
+        [$bundle, $field_name] = explode(':', $field);
 
         $definitions = $this->getEntityFieldManager()
           ->getFieldDefinitions($entity_type_id, $bundle);
@@ -364,16 +364,8 @@ protected function getExtraDataFields() {
           $definition = $definitions[$field_name];
           $type = $definition->getFieldStorageDefinition()->isBaseField() ? 'base' : 'bundle';
 
-          // The moderation is a special case. It's a base field but its not
-          // using the entity type's table. We add it to the list of bundle
-          // fields and execute the appropriate query in `getExtraData`.
-          if ($field_name === 'moderation_state') {
-            $attribute = 'data-moderation-status';
-            $type = 'bundle';
-          }
-          else {
-            $attribute = 'data-' . preg_replace('#^field_#', '', $field_name);
-          }
+          $attribute = 'data-' . preg_replace('#^field_#', '', $field_name);
+          $attribute = strtr($attribute, '_', '-');
 
           $fields[$type][$field] = [
             'attribute' => $attribute,
diff --git a/html/modules/custom/reliefweb_form/js/widget.autocomplete.js b/html/modules/custom/reliefweb_form/js/widget.autocomplete.js
index 2a5fb2b21..2f040754e 100644
--- a/html/modules/custom/reliefweb_form/js/widget.autocomplete.js
+++ b/html/modules/custom/reliefweb_form/js/widget.autocomplete.js
@@ -286,8 +286,8 @@
           var options = disasterElement.getElementsByTagName('option');
           for (var i = 0, l = options.length; i < l; i++) {
             var option = options[i];
-            if (option.selected && option !== exclude && option.hasAttribute('data-disaster_type')) {
-              var types = option.getAttribute('data-disaster_type').split(',');
+            if (option.selected && option !== exclude && option.hasAttribute('data-disaster-type')) {
+              var types = option.getAttribute('data-disaster-type').split(',');
               for (var j = 0, m = types.length; j < m; j++) {
                 newTypes[types[j]] = true;
               }
@@ -323,9 +323,9 @@
         disasterSelection.addEventListener('click', function (event) {
           if (event.target && event.target.nodeName === 'BUTTON') {
             var option = findOption(disasterElement, event.target.parentNode.getAttribute('data-value'));
-            if (option !== false && option.hasAttribute('data-disaster_type')) {
+            if (option !== false && option.hasAttribute('data-disaster-type')) {
               var oldTypes = {};
-              var types = option.getAttribute('data-disaster_type').split(',');
+              var types = option.getAttribute('data-disaster-type').split(',');
               for (var i = 0, l = types.length; i < l; i++) {
                 oldTypes[types[i]] = true;
               }
@@ -356,7 +356,7 @@
         // Function to handle the changes to the country field.
         var changeHandler = function () {
           // Retrieve the selected disaster types.
-          var disasterTypes = getSelectedOptionAttributeValues(disasterElement, 'data-disaster_type');
+          var disasterTypes = getSelectedOptionAttributeValues(disasterElement, 'data-disaster-type');
 
           // Get the selected options from the country field.
           var available = getSelectedOptions(countryElement);

From 8474524b47b5ce21ade0350254cdcee2cd157804 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sun, 6 Feb 2022 02:33:28 +0000
Subject: [PATCH 430/720] [RW-352] Fix leftover of moderation_state

---
 .../reliefweb_entities/src/EntityFormAlterServiceBase.php | 8 ++++----
 .../src/Services/UserPostsService.php                     | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php b/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
index e559d202b..758839c94 100644
--- a/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
+++ b/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
@@ -588,7 +588,7 @@ public function handlePotentialNewSourceSubmission(array $form, FormStateInterfa
       $revision_log_field = $entity_type->getRevisionMetadataKey('revision_log_message');
 
       $log = $form_state->getValue([$revision_log_field, 0, 'value'], '');
-      $status = $form_state->getValue(['moderation_state', 0, 'value']);
+      $status = $this->getEntityModerationStatus($form_state);
 
       // Add the information about potential new source and update the status.
       if (!$form_state->isValueEmpty('field_source_none') &&
@@ -604,7 +604,7 @@ public function handlePotentialNewSourceSubmission(array $form, FormStateInterfa
         // If the status is "published" or "pending", change as appropriate.
         if ($status === 'published' || $status === 'pending') {
           $status = $this->state->get('reliefweb_no_source_status_' . $bundle, 'pending');
-          $form_state->setValue(['moderation_state', 0, 'value'], $status);
+          $this->setEntityModerationStatus($status, $form_state);
         }
       }
     }
@@ -850,7 +850,7 @@ protected function isPreviewRequested(FormStateInterface $form_state) {
    *   Moderation status.
    */
   protected function getEntityModerationStatus(FormStateInterface $form_state) {
-    return $form_state->getValue(['moderation_state', 0, 'value']);
+    return $form_state->getValue(['moderation_status', 0, 'value']);
   }
 
   /**
@@ -865,7 +865,7 @@ protected function getEntityModerationStatus(FormStateInterface $form_state) {
    *   Moderation status.
    */
   protected function setEntityModerationStatus($status, FormStateInterface $form_state) {
-    return $form_state->setValue(['moderation_state', 0, 'value'], $status);
+    return $form_state->setValue(['moderation_status', 0, 'value'], $status);
   }
 
   /**
diff --git a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
index 83ffabcb0..e6c9fd9d0 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Services/UserPostsService.php
@@ -138,8 +138,8 @@ public function getHeaders() {
       ],
       'status' => [
         'label' => $this->t('Status'),
-        'type' => '',
-        'specifier' => 'moderation_state',
+        'type' => 'property',
+        'specifier' => 'moderation_status',
         'sortable' => TRUE,
       ],
       'poster' => [

From 5b3f986187922395ba4c8b607a72970074871048 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sun, 6 Feb 2022 02:42:05 +0000
Subject: [PATCH 431/720] [RW-353] Unselect archived status on report
 moderation page

---
 .../src/Services/ReportModeration.php                    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/html/modules/custom/reliefweb_moderation/src/Services/ReportModeration.php b/html/modules/custom/reliefweb_moderation/src/Services/ReportModeration.php
index 0a21aed71..da8e97a96 100644
--- a/html/modules/custom/reliefweb_moderation/src/Services/ReportModeration.php
+++ b/html/modules/custom/reliefweb_moderation/src/Services/ReportModeration.php
@@ -208,6 +208,15 @@ public function getStatuses() {
     ];
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getFilterDefaultStatuses() {
+    $statuses = $this->getFilterStatuses();
+    unset($statuses['archive']);
+    return array_keys($statuses);
+  }
+
   /**
    * {@inheritdoc}
    */

From 35419a23e75844aa4ba9a094b8cfcebc24082849 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sun, 6 Feb 2022 02:56:09 +0000
Subject: [PATCH 432/720] [RW-354] Remove draft status for countries

---
 .../custom/reliefweb_entities/src/Entity/Country.php       | 7 +++++++
 .../src/Services/CountryModeration.php                     | 4 ----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Country.php b/html/modules/custom/reliefweb_entities/src/Entity/Country.php
index 59d2fe5fe..62d5809e2 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Country.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Country.php
@@ -150,4 +150,11 @@ protected function getKeyFiguresSection() {
     return $client->getKeyFiguresBuild($iso3, $this->label());
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getDefaultModerationStatus() {
+    return 'normal';
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_moderation/src/Services/CountryModeration.php b/html/modules/custom/reliefweb_moderation/src/Services/CountryModeration.php
index 3a1d26e89..31216617e 100644
--- a/html/modules/custom/reliefweb_moderation/src/Services/CountryModeration.php
+++ b/html/modules/custom/reliefweb_moderation/src/Services/CountryModeration.php
@@ -102,7 +102,6 @@ public function getRows(array $results) {
    */
   public function getStatuses() {
     return [
-      'draft' => $this->t('Draft'),
       'ongoing' => $this->t('Ongoing'),
       'normal' => $this->t('Normal'),
     ];
@@ -113,9 +112,6 @@ public function getStatuses() {
    */
   public function getEntityFormSubmitButtons($status, EntityModeratedInterface $entity) {
     return [
-      'draft' => [
-        '#value' => $this->t('Save as draft'),
-      ],
       'ongoing' => [
         '#value' => $this->t('Ongoing situation'),
       ],

From d629f51a040fd18f36340f3461db8e522645744b Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sun, 6 Feb 2022 03:02:53 +0000
Subject: [PATCH 433/720] [RW-355] Remove 'save and go to list' button on term
 forms

---
 .../custom/reliefweb_moderation/src/ModerationServiceBase.php    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
index aa25f9a37..1fcc56918 100644
--- a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
+++ b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
@@ -386,6 +386,7 @@ public function alterEntityForm(array &$form, FormStateInterface $form_state) {
 
     // Disable the moderation status widget and the default submit buttons.
     $form['actions']['submit']['#access'] = FALSE;
+    $form['actions']['overview']['#access'] = FALSE;
 
     // Move the preview button at the beginning if it exists.
     if (isset($form['actions']['preview'])) {

From be2beab942141f74c90319142d408bca314a0b51 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 8 Feb 2022 01:28:28 +0000
Subject: [PATCH 434/720] [RW-333] Add term selection plugin that is not
 restricted to published terms

---
 .../AnyTermSelection.php                      | 198 ++++++++++++++++++
 1 file changed, 198 insertions(+)
 create mode 100644 html/modules/custom/reliefweb_entities/src/Plugin/EntityReferenceSelection/AnyTermSelection.php

diff --git a/html/modules/custom/reliefweb_entities/src/Plugin/EntityReferenceSelection/AnyTermSelection.php b/html/modules/custom/reliefweb_entities/src/Plugin/EntityReferenceSelection/AnyTermSelection.php
new file mode 100644
index 000000000..de0227507
--- /dev/null
+++ b/html/modules/custom/reliefweb_entities/src/Plugin/EntityReferenceSelection/AnyTermSelection.php
@@ -0,0 +1,198 @@
+<?php
+
+namespace Drupal\reliefweb_entities\Plugin\EntityReferenceSelection;
+
+use Drupal\Component\Utility\Html;
+use Drupal\Core\Database\Connection;
+use Drupal\Core\Entity\EntityFieldManagerInterface;
+use Drupal\Core\Entity\EntityRepositoryInterface;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Entity\Plugin\EntityReferenceSelection\DefaultSelection;
+use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\Language\LanguageManagerInterface;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\reliefweb_utility\Traits\EntityDatabaseInfoTrait;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Term Entity Reference Selection plugin implementation for any status.
+ *
+ * Notes:
+ * - This is a term selection that doesn't care about the publication
+ *   status, allowing the selection of term saved as draft for example.
+ * - It's intended to be used instead of the taxonomy termn selection plugin:
+ *   \Drupal\taxonomy\Plugin\EntityReferenceSelection\TermSelection.
+ * - As opposed to the default selection plugin, this doesn't try to load all
+ *   the entities when building the selectable entities but just load the
+ *   relevant label to avoid out of memory issues with large vocabularies.
+ *
+ * @see \Drupal\Core\Entity\EntityReferenceSelection\SelectionPluginManager
+ * @see \Drupal\Core\Entity\Annotation\EntityReferenceSelection
+ * @see \Drupal\Core\Entity\EntityReferenceSelection\SelectionInterface
+ * @see \Drupal\Core\Entity\Plugin\Derivative\DefaultSelectionDeriver
+ * @see plugin_api
+ *
+ * @EntityReferenceSelection(
+ *   id = "any_term",
+ *   label = @Translation("Taxonomy term with any status"),
+ *   entity_types = {"taxonomy_term"},
+ *   group = "any_term",
+ *   weight = 0
+ * )
+ */
+class AnyTermSelection extends DefaultSelection {
+
+  use EntityDatabaseInfoTrait;
+
+  /**
+   * The database.
+   *
+   * @var \Drupal\Core\Database\Connection
+   */
+  protected $database;
+
+  /**
+   * The language manager.
+   *
+   * @var \Drupal\Core\Language\LanguageManagerInterface
+   */
+  protected $languageManager;
+
+  /**
+   * Constructs a new DefaultSelection object.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin_id for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager service.
+   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+   *   The module handler service.
+   * @param \Drupal\Core\Session\AccountInterface $current_user
+   *   The current user.
+   * @param \Drupal\Core\Entity\EntityFieldManagerInterface $entity_field_manager
+   *   The entity field manager.
+   * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $entity_type_bundle_info
+   *   The entity type bundle info service.
+   * @param \Drupal\Core\Entity\EntityRepositoryInterface $entity_repository
+   *   The entity repository.
+   * @param \Drupal\Core\Database\Connection $database
+   *   The database.
+   * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
+   *   The language manager.
+   */
+  public function __construct(
+    array $configuration,
+    $plugin_id,
+    $plugin_definition,
+    EntityTypeManagerInterface $entity_type_manager,
+    ModuleHandlerInterface $module_handler,
+    AccountInterface $current_user,
+    EntityFieldManagerInterface $entity_field_manager,
+    EntityTypeBundleInfoInterface $entity_type_bundle_info = NULL,
+    EntityRepositoryInterface $entity_repository,
+    Connection $database,
+    LanguageManagerInterface $language_manager
+  ) {
+    parent::__construct(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $entity_type_manager,
+      $module_handler,
+      $current_user,
+      $entity_field_manager,
+      $entity_type_bundle_info,
+      $entity_repository
+    );
+
+    $this->database = $database;
+    $this->languageManager = $language_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('entity_type.manager'),
+      $container->get('module_handler'),
+      $container->get('current_user'),
+      $container->get('entity_field.manager'),
+      $container->get('entity_type.bundle.info'),
+      $container->get('entity.repository'),
+      $container->get('database'),
+      $container->get('language_manager')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getReferenceableEntities($match = NULL, $match_operator = 'CONTAINS', $limit = 0) {
+    $entity_type_id = $this->getConfiguration()['target_type'];
+
+    $query = $this->buildEntityQuery($match, $match_operator);
+    if ($limit > 0) {
+      $query->range(0, $limit);
+    }
+
+    $ids = $query->execute();
+
+    if (empty($ids)) {
+      return [];
+    }
+
+    // Get the datbase info for the referenced entity type.
+    $table = $this->getEntityTypeDataTable($entity_type_id);
+    $id_field = $this->getEntityTypeIdField($entity_type_id);
+    $label_field = $this->getEntityTypeLabelField($entity_type_id);
+    $bundle_field = $this->getEntityTypeBundleField($entity_type_id);
+    $langcode_field = $this->getEntityTypeLangcodeField($entity_type_id);
+
+    // Get the current and default language codes.
+    $current_langcode = $this->languageManager->getCurrentLanguage()->getId();
+    $default_langcode = $this->languageManager->getDefaultLanguage()->getId();
+    $langcodes = array_unique([$current_langcode, $default_langcode]);
+
+    // We just want the label for the current language (or default one),
+    // so we do another query with the entity IDs retrieved previously.
+    // This much less resource intensive than loading all the entities,
+    // especially for large vocabularies like disaster and source.
+    $query = $this->getDatabase()->select($table, $table);
+    $query->addField($table, $id_field, 'id');
+    $query->addField($table, $label_field, 'label');
+    $query->addField($table, $langcode_field, 'langcode');
+    $query->addField($table, $bundle_field, 'bundle');
+    $query->condition($table . '.' . $id_field, $ids, 'IN');
+    $query->condition($table . '.' . $langcode_field, $langcodes, 'IN');
+
+    $options = [];
+    foreach ($query->execute() ?? [] as $record) {
+      $id = (int) $record->id;
+      $langcode = $record->langcode;
+      $bundle = $record->bundle;
+
+      // The record in the current language takes precedence over the default
+      // language version.
+      if ($langcode === $current_langcode || !isset($options[$bundle][$id])) {
+        // Note: for RW, there is not hierarchical terms so we can get away with
+        // simply using the label. However if at some point, RW starts using
+        // nested terms then we'll want to join the taxonomy_term__parent table,
+        // compute the term depth and prefix the label with something like
+        // str_repeat('-', $term->depth) like it's done in TermSelection.
+        $options[$bundle][$id] = Html::escape($record->label);
+      }
+    }
+
+    return $options;
+  }
+
+}

From 1a2df240bbbbefd7c30cab6c409f4dcb1a1736c0 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 8 Feb 2022 01:29:51 +0000
Subject: [PATCH 435/720] [RW-333] Update config to use term selection plugin

---
 config/field.field.media.file_report.field_language.yml     | 2 +-
 config/field.field.node.blog_post.field_tags.yml            | 6 +++---
 config/field.field.node.job.field_career_categories.yml     | 2 +-
 config/field.field.node.job.field_country.yml               | 2 +-
 config/field.field.node.job.field_job_experience.yml        | 2 +-
 config/field.field.node.job.field_job_type.yml              | 2 +-
 config/field.field.node.job.field_source.yml                | 2 +-
 config/field.field.node.job.field_theme.yml                 | 2 +-
 config/field.field.node.report.field_content_format.yml     | 2 +-
 config/field.field.node.report.field_country.yml            | 2 +-
 config/field.field.node.report.field_disaster.yml           | 2 +-
 config/field.field.node.report.field_disaster_type.yml      | 2 +-
 config/field.field.node.report.field_feature.yml            | 2 +-
 config/field.field.node.report.field_language.yml           | 2 +-
 config/field.field.node.report.field_ocha_product.yml       | 2 +-
 config/field.field.node.report.field_primary_country.yml    | 2 +-
 config/field.field.node.report.field_source.yml             | 2 +-
 config/field.field.node.report.field_theme.yml              | 2 +-
 config/field.field.node.report.field_vulnerable_groups.yml  | 2 +-
 .../field.field.node.training.field_career_categories.yml   | 2 +-
 config/field.field.node.training.field_country.yml          | 2 +-
 config/field.field.node.training.field_language.yml         | 2 +-
 config/field.field.node.training.field_source.yml           | 2 +-
 config/field.field.node.training.field_theme.yml            | 2 +-
 config/field.field.node.training.field_training_format.yml  | 2 +-
 .../field.field.node.training.field_training_language.yml   | 2 +-
 config/field.field.node.training.field_training_type.yml    | 2 +-
 config/field.field.taxonomy_term.disaster.field_country.yml | 2 +-
 ...eld.field.taxonomy_term.disaster.field_disaster_type.yml | 2 +-
 ...d.field.taxonomy_term.disaster.field_primary_country.yml | 2 +-
 ...d.taxonomy_term.disaster.field_primary_disaster_type.yml | 2 +-
 config/field.field.taxonomy_term.source.field_country.yml   | 2 +-
 ...d.field.taxonomy_term.source.field_organization_type.yml | 2 +-
 33 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/config/field.field.media.file_report.field_language.yml b/config/field.field.media.file_report.field_language.yml
index afd361926..62b247220 100644
--- a/config/field.field.media.file_report.field_language.yml
+++ b/config/field.field.media.file_report.field_language.yml
@@ -17,7 +17,7 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       language: language
diff --git a/config/field.field.node.blog_post.field_tags.yml b/config/field.field.node.blog_post.field_tags.yml
index 6e2cf3e05..2cb0c36a0 100644
--- a/config/field.field.node.blog_post.field_tags.yml
+++ b/config/field.field.node.blog_post.field_tags.yml
@@ -17,13 +17,13 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       tag: tag
     sort:
       field: name
-      direction: asc
-    auto_create: false
+      direction: ASC
+    auto_create: 1
     auto_create_bundle: ''
 field_type: entity_reference
diff --git a/config/field.field.node.job.field_career_categories.yml b/config/field.field.node.job.field_career_categories.yml
index 0ecf1b824..12fb8f3f8 100644
--- a/config/field.field.node.job.field_career_categories.yml
+++ b/config/field.field.node.job.field_career_categories.yml
@@ -17,7 +17,7 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       career_category: career_category
diff --git a/config/field.field.node.job.field_country.yml b/config/field.field.node.job.field_country.yml
index 0d5d9875f..c5e81c0b5 100644
--- a/config/field.field.node.job.field_country.yml
+++ b/config/field.field.node.job.field_country.yml
@@ -17,7 +17,7 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       country: country
diff --git a/config/field.field.node.job.field_job_experience.yml b/config/field.field.node.job.field_job_experience.yml
index b4d7e1c24..470d80936 100644
--- a/config/field.field.node.job.field_job_experience.yml
+++ b/config/field.field.node.job.field_job_experience.yml
@@ -17,7 +17,7 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       job_experience: job_experience
diff --git a/config/field.field.node.job.field_job_type.yml b/config/field.field.node.job.field_job_type.yml
index 1aea03b40..1bbde0928 100644
--- a/config/field.field.node.job.field_job_type.yml
+++ b/config/field.field.node.job.field_job_type.yml
@@ -17,7 +17,7 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       job_type: job_type
diff --git a/config/field.field.node.job.field_source.yml b/config/field.field.node.job.field_source.yml
index 98c4db720..c115ff195 100644
--- a/config/field.field.node.job.field_source.yml
+++ b/config/field.field.node.job.field_source.yml
@@ -17,7 +17,7 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       source: source
diff --git a/config/field.field.node.job.field_theme.yml b/config/field.field.node.job.field_theme.yml
index 7fa873844..1dbaa462c 100644
--- a/config/field.field.node.job.field_theme.yml
+++ b/config/field.field.node.job.field_theme.yml
@@ -17,7 +17,7 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       theme: theme
diff --git a/config/field.field.node.report.field_content_format.yml b/config/field.field.node.report.field_content_format.yml
index 6465f5115..889b2071a 100644
--- a/config/field.field.node.report.field_content_format.yml
+++ b/config/field.field.node.report.field_content_format.yml
@@ -17,7 +17,7 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       content_format: content_format
diff --git a/config/field.field.node.report.field_country.yml b/config/field.field.node.report.field_country.yml
index 2bad21c2c..a51e0eafe 100644
--- a/config/field.field.node.report.field_country.yml
+++ b/config/field.field.node.report.field_country.yml
@@ -17,7 +17,7 @@ translatable: true
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       country: country
diff --git a/config/field.field.node.report.field_disaster.yml b/config/field.field.node.report.field_disaster.yml
index 8673f85b9..6d16dc3f4 100644
--- a/config/field.field.node.report.field_disaster.yml
+++ b/config/field.field.node.report.field_disaster.yml
@@ -17,7 +17,7 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       disaster: disaster
diff --git a/config/field.field.node.report.field_disaster_type.yml b/config/field.field.node.report.field_disaster_type.yml
index 52103dcb0..e6bd1d87b 100644
--- a/config/field.field.node.report.field_disaster_type.yml
+++ b/config/field.field.node.report.field_disaster_type.yml
@@ -17,7 +17,7 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       disaster_type: disaster_type
diff --git a/config/field.field.node.report.field_feature.yml b/config/field.field.node.report.field_feature.yml
index 532160f35..4ed7d18d7 100644
--- a/config/field.field.node.report.field_feature.yml
+++ b/config/field.field.node.report.field_feature.yml
@@ -17,7 +17,7 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       feature: feature
diff --git a/config/field.field.node.report.field_language.yml b/config/field.field.node.report.field_language.yml
index 74a90d866..8f67f6fa8 100644
--- a/config/field.field.node.report.field_language.yml
+++ b/config/field.field.node.report.field_language.yml
@@ -17,7 +17,7 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       language: language
diff --git a/config/field.field.node.report.field_ocha_product.yml b/config/field.field.node.report.field_ocha_product.yml
index ec2d3250b..5fbb5118c 100644
--- a/config/field.field.node.report.field_ocha_product.yml
+++ b/config/field.field.node.report.field_ocha_product.yml
@@ -17,7 +17,7 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       ocha_product: ocha_product
diff --git a/config/field.field.node.report.field_primary_country.yml b/config/field.field.node.report.field_primary_country.yml
index a9ce7a75b..6b4659323 100644
--- a/config/field.field.node.report.field_primary_country.yml
+++ b/config/field.field.node.report.field_primary_country.yml
@@ -17,7 +17,7 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       country: country
diff --git a/config/field.field.node.report.field_source.yml b/config/field.field.node.report.field_source.yml
index df13f51a1..38a74721d 100644
--- a/config/field.field.node.report.field_source.yml
+++ b/config/field.field.node.report.field_source.yml
@@ -17,7 +17,7 @@ translatable: true
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       source: source
diff --git a/config/field.field.node.report.field_theme.yml b/config/field.field.node.report.field_theme.yml
index a22e9ac3e..9c28a6c04 100644
--- a/config/field.field.node.report.field_theme.yml
+++ b/config/field.field.node.report.field_theme.yml
@@ -17,7 +17,7 @@ translatable: true
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       theme: theme
diff --git a/config/field.field.node.report.field_vulnerable_groups.yml b/config/field.field.node.report.field_vulnerable_groups.yml
index 00cdc9267..8e58de4d8 100644
--- a/config/field.field.node.report.field_vulnerable_groups.yml
+++ b/config/field.field.node.report.field_vulnerable_groups.yml
@@ -17,7 +17,7 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       vulnerable_group: vulnerable_group
diff --git a/config/field.field.node.training.field_career_categories.yml b/config/field.field.node.training.field_career_categories.yml
index 70565c92e..d93819809 100644
--- a/config/field.field.node.training.field_career_categories.yml
+++ b/config/field.field.node.training.field_career_categories.yml
@@ -17,7 +17,7 @@ translatable: true
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       career_category: career_category
diff --git a/config/field.field.node.training.field_country.yml b/config/field.field.node.training.field_country.yml
index 9a88e6f23..732f4063a 100644
--- a/config/field.field.node.training.field_country.yml
+++ b/config/field.field.node.training.field_country.yml
@@ -17,7 +17,7 @@ translatable: true
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       country: country
diff --git a/config/field.field.node.training.field_language.yml b/config/field.field.node.training.field_language.yml
index 330678991..c93487976 100644
--- a/config/field.field.node.training.field_language.yml
+++ b/config/field.field.node.training.field_language.yml
@@ -17,7 +17,7 @@ translatable: true
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       language: language
diff --git a/config/field.field.node.training.field_source.yml b/config/field.field.node.training.field_source.yml
index 579137d83..43f80854b 100644
--- a/config/field.field.node.training.field_source.yml
+++ b/config/field.field.node.training.field_source.yml
@@ -17,7 +17,7 @@ translatable: true
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       source: source
diff --git a/config/field.field.node.training.field_theme.yml b/config/field.field.node.training.field_theme.yml
index 0fb9a2835..5a7d5d716 100644
--- a/config/field.field.node.training.field_theme.yml
+++ b/config/field.field.node.training.field_theme.yml
@@ -17,7 +17,7 @@ translatable: true
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       theme: theme
diff --git a/config/field.field.node.training.field_training_format.yml b/config/field.field.node.training.field_training_format.yml
index 76bdf3fa0..a90246f40 100644
--- a/config/field.field.node.training.field_training_format.yml
+++ b/config/field.field.node.training.field_training_format.yml
@@ -17,7 +17,7 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       training_format: training_format
diff --git a/config/field.field.node.training.field_training_language.yml b/config/field.field.node.training.field_training_language.yml
index 19ac4b792..b2ed36a90 100644
--- a/config/field.field.node.training.field_training_language.yml
+++ b/config/field.field.node.training.field_training_language.yml
@@ -17,7 +17,7 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       language: language
diff --git a/config/field.field.node.training.field_training_type.yml b/config/field.field.node.training.field_training_type.yml
index 77b77604f..9735cab6f 100644
--- a/config/field.field.node.training.field_training_type.yml
+++ b/config/field.field.node.training.field_training_type.yml
@@ -17,7 +17,7 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       training_type: training_type
diff --git a/config/field.field.taxonomy_term.disaster.field_country.yml b/config/field.field.taxonomy_term.disaster.field_country.yml
index 0f3d765f0..0ab7d1431 100644
--- a/config/field.field.taxonomy_term.disaster.field_country.yml
+++ b/config/field.field.taxonomy_term.disaster.field_country.yml
@@ -17,7 +17,7 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       country: country
diff --git a/config/field.field.taxonomy_term.disaster.field_disaster_type.yml b/config/field.field.taxonomy_term.disaster.field_disaster_type.yml
index 0b92da718..d8998acce 100644
--- a/config/field.field.taxonomy_term.disaster.field_disaster_type.yml
+++ b/config/field.field.taxonomy_term.disaster.field_disaster_type.yml
@@ -17,7 +17,7 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       disaster_type: disaster_type
diff --git a/config/field.field.taxonomy_term.disaster.field_primary_country.yml b/config/field.field.taxonomy_term.disaster.field_primary_country.yml
index acbf08d8b..d14cfedf4 100644
--- a/config/field.field.taxonomy_term.disaster.field_primary_country.yml
+++ b/config/field.field.taxonomy_term.disaster.field_primary_country.yml
@@ -17,7 +17,7 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       country: country
diff --git a/config/field.field.taxonomy_term.disaster.field_primary_disaster_type.yml b/config/field.field.taxonomy_term.disaster.field_primary_disaster_type.yml
index d35eeb90c..876c9d331 100644
--- a/config/field.field.taxonomy_term.disaster.field_primary_disaster_type.yml
+++ b/config/field.field.taxonomy_term.disaster.field_primary_disaster_type.yml
@@ -17,7 +17,7 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       disaster_type: disaster_type
diff --git a/config/field.field.taxonomy_term.source.field_country.yml b/config/field.field.taxonomy_term.source.field_country.yml
index c682b113c..4f7b0adbc 100644
--- a/config/field.field.taxonomy_term.source.field_country.yml
+++ b/config/field.field.taxonomy_term.source.field_country.yml
@@ -17,7 +17,7 @@ translatable: true
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       country: country
diff --git a/config/field.field.taxonomy_term.source.field_organization_type.yml b/config/field.field.taxonomy_term.source.field_organization_type.yml
index 50930be44..f8604c55f 100644
--- a/config/field.field.taxonomy_term.source.field_organization_type.yml
+++ b/config/field.field.taxonomy_term.source.field_organization_type.yml
@@ -17,7 +17,7 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:taxonomy_term'
+  handler: any_term
   handler_settings:
     target_bundles:
       organization_type: organization_type

From ff8dedde0a576cf2fa87ae3581d9c70e7305d707 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 8 Feb 2022 01:32:37 +0000
Subject: [PATCH 436/720] [RW-347] Update api indexer with career categories
 and other taxonomy term field fixes

---
 composer.json |  2 +-
 composer.lock | 14 +++++++-------
 symfony.lock  |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index eda644895..3788e73cd 100644
--- a/composer.json
+++ b/composer.json
@@ -87,7 +87,7 @@
         "league/commonmark": "^1.6",
         "league/html-to-markdown": "^5.0",
         "pelago/emogrifier": "^6.0",
-        "reliefweb/api-indexer": "^v2.1.0",
+        "reliefweb/api-indexer": "^v2.1.1",
         "reliefweb/simple-autocomplete": "^v1.3.0",
         "reliefweb/simple-datepicker": "^v1.3.1",
         "symfony/flex": "^2.0",
diff --git a/composer.lock b/composer.lock
index bcc87a70d..8d417bb80 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "fd277ae3d403b2ae8c0322bb5d32670f",
+    "content-hash": "0712344b622e3303d2facd7ae23f0360",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -7629,16 +7629,16 @@
         },
         {
             "name": "reliefweb/api-indexer",
-            "version": "v2.1.0",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/UN-OCHA/rwint-api-indexer.git",
-                "reference": "62fd059e7c65257ec9e4f44f60492e9f7d3c7f21"
+                "reference": "2178a619c256dad06022896f6bca0efa1889188d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/UN-OCHA/rwint-api-indexer/zipball/62fd059e7c65257ec9e4f44f60492e9f7d3c7f21",
-                "reference": "62fd059e7c65257ec9e4f44f60492e9f7d3c7f21",
+                "url": "https://api.github.com/repos/UN-OCHA/rwint-api-indexer/zipball/2178a619c256dad06022896f6bca0efa1889188d",
+                "reference": "2178a619c256dad06022896f6bca0efa1889188d",
                 "shasum": ""
             },
             "require": {
@@ -7678,10 +7678,10 @@
                 "reliefweb"
             ],
             "support": {
-                "source": "https://github.com/UN-OCHA/rwint-api-indexer/tree/v2.1.0",
+                "source": "https://github.com/UN-OCHA/rwint-api-indexer/tree/v2.1.1",
                 "issues": "https://github.com/UN-OCHA/rwint-api-indexer/issues"
             },
-            "time": "2022-02-03T00:46:56+00:00"
+            "time": "2022-02-07T05:27:53+00:00"
         },
         {
             "name": "reliefweb/simple-autocomplete",
diff --git a/symfony.lock b/symfony.lock
index 968b24562..0240cfc54 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -425,7 +425,7 @@
         "version": "v2.8.0"
     },
     "reliefweb/api-indexer": {
-        "version": "v2.1.0"
+        "version": "v2.1.1"
     },
     "reliefweb/simple-autocomplete": {
         "version": "v1.3.0"

From d074ceb98aa9ff3da2272cb9e5bf0805b76dc86a Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 8 Feb 2022 01:34:33 +0000
Subject: [PATCH 437/720] [RW-333] Ensure only viewable entities are available
 when displaying entity meta

---
 html/modules/custom/reliefweb_entities/src/DocumentTrait.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/html/modules/custom/reliefweb_entities/src/DocumentTrait.php b/html/modules/custom/reliefweb_entities/src/DocumentTrait.php
index 84963b53e..f54f1fd83 100644
--- a/html/modules/custom/reliefweb_entities/src/DocumentTrait.php
+++ b/html/modules/custom/reliefweb_entities/src/DocumentTrait.php
@@ -6,6 +6,7 @@
 use Drupal\Core\Field\EntityReferenceFieldItemList;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\Url;
+use Drupal\reliefweb_moderation\EntityModeratedInterface;
 use Drupal\reliefweb_rivers\RiverServiceBase;
 use Drupal\reliefweb_utility\Helpers\HtmlSummarizer;
 use Drupal\reliefweb_utility\Helpers\MediaHelper;
@@ -283,6 +284,9 @@ public function getEntityMetaFromField($field, $code, array $extra_fields = ['sh
 
     $items = [];
     foreach ($this->{$field}->referencedEntities() as $entity) {
+      if ($entity instanceof EntityModeratedInterface && !$entity->access('view')) {
+        continue;
+      }
       $item = [
         'name' => $entity->label(),
         'url' => RiverServiceBase::getRiverUrl($this->bundle(), [

From bbdfae4bb6027c94bea036a3bdada68cd06eccb0 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 8 Feb 2022 01:36:48 +0000
Subject: [PATCH 438/720] [RW-337] Fix position of 'fix PDF' button on report
 pages

---
 .../components/rw-form/rw-form.css                     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 463ab91dd..515c01e8f 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -484,7 +484,7 @@ form button[data-formatter="pdf"] {
   /* Display the format PDf button in the top right corner above the textarea.
    * The editorial team is used to this position. */
   position: absolute;
-  top: -7px;
+  top: -11px;
   right: 0;
 }
 /* Show/Hide row weight button */
@@ -509,13 +509,13 @@ form button[value="edit"] {
 }
 
 /* Preview button */
-input[data-drupal-selector=edit-preview] {
+input[data-drupal-selector="edit-preview"] {
   background-color: var(--cd-grey--dark);
 }
-input[data-drupal-selector=edit-preview]:hover,
-input[data-drupal-selector=edit-preview]:focus {
+input[data-drupal-selector="edit-preview"]:hover,
+input[data-drupal-selector="edit-preview"]:focus {
   background-color: var(--cd-grey--mid);
 }
-input[data-drupal-selector=edit-preview]:focus {
+input[data-drupal-selector="edit-preview"]:focus {
   border: 2px solid var(--cd-black);
 }

From e8043b4c422005b568f2239ba344764cf9f3ed72 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 8 Feb 2022 01:59:35 +0000
Subject: [PATCH 439/720] [RW-331] Fix report origin field migration and make
 URL selected as default

---
 config/field.field.node.report.field_origin.yml       |  4 +++-
 .../migrate_plus.migration.reliefweb_node__report.yml | 11 ++++++++---
 ...plus.migration.reliefweb_node_revision__report.yml | 11 ++++++++---
 .../migrate_plus.migration.reliefweb_node__report.yml | 11 ++++++++---
 ...plus.migration.reliefweb_node_revision__report.yml | 11 ++++++++---
 5 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/config/field.field.node.report.field_origin.yml b/config/field.field.node.report.field_origin.yml
index d5e2cbb61..af8b23871 100644
--- a/config/field.field.node.report.field_origin.yml
+++ b/config/field.field.node.report.field_origin.yml
@@ -15,7 +15,9 @@ label: Origin
 description: ''
 required: true
 translatable: false
-default_value: {  }
+default_value:
+  -
+    value: 0
 default_value_callback: ''
 settings: {  }
 field_type: list_integer
diff --git a/config/migrate_plus.migration.reliefweb_node__report.yml b/config/migrate_plus.migration.reliefweb_node__report.yml
index 31acf8490..6320f821f 100644
--- a/config/migrate_plus.migration.reliefweb_node__report.yml
+++ b/config/migrate_plus.migration.reliefweb_node__report.yml
@@ -92,9 +92,14 @@ process:
     process:
       target_id: tid
   field_origin:
-    plugin: skip_on_empty
-    method: process
-    source: field_origin/0/value
+    -
+      plugin: skip_on_empty
+      method: process
+      source: field_origin
+    -
+      plugin: sub_process
+      process:
+        value: value
   field_origin_notes:
     plugin: skip_on_empty
     method: process
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__report.yml b/config/migrate_plus.migration.reliefweb_node_revision__report.yml
index 41f47abd5..6ece9c290 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__report.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__report.yml
@@ -92,9 +92,14 @@ process:
     process:
       target_id: tid
   field_origin:
-    plugin: skip_on_empty
-    method: process
-    source: field_origin/0/value
+    -
+      plugin: skip_on_empty
+      method: process
+      source: field_origin
+    -
+      plugin: sub_process
+      process:
+        value: value
   field_origin_notes:
     plugin: skip_on_empty
     method: process
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node__report.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node__report.yml
index 36e26d457..f307b0dad 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node__report.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node__report.yml
@@ -89,9 +89,14 @@ process:
     process:
       target_id: tid
   field_origin:
-    plugin: skip_on_empty
-    method: process
-    source: field_origin/0/value
+    -
+      plugin: skip_on_empty
+      method: process
+      source: field_origin
+    -
+      plugin: sub_process
+      process:
+        value: value
   field_origin_notes:
     plugin: skip_on_empty
     method: process
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__report.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__report.yml
index 7189df537..33825e1ae 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__report.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__report.yml
@@ -89,9 +89,14 @@ process:
     process:
       target_id: tid
   field_origin:
-    plugin: skip_on_empty
-    method: process
-    source: field_origin/0/value
+    -
+      plugin: skip_on_empty
+      method: process
+      source: field_origin
+    -
+      plugin: sub_process
+      process:
+        value: value
   field_origin_notes:
     plugin: skip_on_empty
     method: process

From 1d5ba9a203cfee0eec6b8ae2c97f699ad48d4753 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 8 Feb 2022 03:00:26 +0000
Subject: [PATCH 440/720] [RW-332] Add logic for bury field when saving reports

---
 .../reliefweb_entities/src/Entity/Report.php  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Report.php b/html/modules/custom/reliefweb_entities/src/Entity/Report.php
index 956a165a0..57aeaaa42 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Report.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Report.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\reliefweb_entities\Entity;
 
+use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Link;
 use Drupal\Core\Url;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
@@ -190,4 +191,25 @@ public function getAttachments(?array $build = NULL) {
     return $build;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function preSave(EntityStorageInterface $storage) {
+    parent::preSave($storage);
+
+    // Change the publication date if bury is selected to the original
+    // publication date.
+    if (!empty($this->field_bury->value) && !$this->field_original_publication_date->isEmpty()) {
+      $date = $this->field_original_publication_date->value;
+      $timestamp = DateHelper::getDateTimeStamp($date);
+      if (!empty($timestamp)) {
+        $this->_original_created = $this->getCreatedTime();
+        $this->setCreatedTime($timestamp);
+      }
+    }
+    elseif (isset($this->_original_created)) {
+      $this->setCreatedTime($this->_original_created);
+    }
+  }
+
 }

From aa80819fca589efb7d3b92a7ec4883f171eceb7a Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 8 Feb 2022 08:46:56 +0000
Subject: [PATCH 441/720] [RW-357] Fix book hierarchy

---
 .../reliefweb_entities/src/Entity/Book.php    |  2 +-
 .../src/Plugin/migrate/source/Book.php        | 37 +++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Book.php b/html/modules/custom/reliefweb_entities/src/Entity/Book.php
index 6b20cd81b..6bda9a51d 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Book.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Book.php
@@ -55,7 +55,7 @@ public function getBookOutline() {
     // Extract the book menu links from the books.
     $links = [];
     foreach ($books as $book) {
-      $data = $book_manager->bookTreeAllData($book['bid'], $book);
+      $data = $book_manager->bookTreeAllData($book['bid']);
       $menu = $book_manager->bookTreeOutput($data);
       $links += $menu['#items'];
     }
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Book.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Book.php
index a118569a7..668952159 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Book.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Book.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\reliefweb_migrate\Plugin\migrate\source;
 
+use Drupal\migrate\Row;
 use Drupal\migrate\Plugin\migrate\source\SqlBase;
 
 /**
@@ -13,6 +14,13 @@
  */
 class Book extends SqlBase {
 
+  /**
+   * Mapping D7 mlid => nid.
+   *
+   * @var array
+   */
+  protected $menuIdMapping;
+
   /**
    * {@inheritdoc}
    */
@@ -34,6 +42,35 @@ public function query() {
     return $query;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function prepareRow(Row $row) {
+    if (parent::prepareRow($row) === FALSE) {
+      return FALSE;
+    }
+
+    if (!isset($this->menuIdMapping)) {
+      $this->menuIdMapping = $this->select('book', 'b')
+        ->fields('b', ['mlid', 'nid'])
+        ->execute()
+        ?->fetchAllKeyed(0, 1) ?? [];
+    }
+
+    // Convert the menu link ids to their corresponding node ids.
+    $fields = ['pid'];
+    for ($i = 1; $i < 10; $i++) {
+      $fields[] = 'p' . $i;
+    }
+    foreach ($fields as $field) {
+      $id = $row->getSourceProperty($field);
+      if (isset($this->menuIdMapping[$id])) {
+        $row->setDestinationProperty($field, $this->menuIdMapping[$id]);
+        $row->setSourceProperty($field, $this->menuIdMapping[$id]);
+      }
+    }
+  }
+
   /**
    * {@inheritdoc}
    */

From bc4c3ed6896f81a36cd770dc17adc08b3fbdde56 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 8 Feb 2022 08:48:29 +0000
Subject: [PATCH 442/720] [RW-358] Add drush command to reset high water to
 ease debugging

---
 .../src/Commands/ReliefWebMigrateCommands.php | 46 +++++++++++++++++++
 .../src/Plugin/migrate/source/EntityBase.php  | 19 +++++++-
 .../SourceMigrationHighWaterInterface.php     | 21 +++++++++
 3 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/SourceMigrationHighWaterInterface.php

diff --git a/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php b/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
index 576680ce5..e06fb42a2 100644
--- a/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
+++ b/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
@@ -18,6 +18,7 @@
 use Drupal\migrate\Exception\RequirementsException;
 use Drupal\migrate\Plugin\MigrationPluginManager;
 use Drupal\migrate\Plugin\RequirementsInterface;
+use Drupal\reliefweb_migrate\Plugin\migrate\source\SourceMigrationHighWaterInterface;
 use Drupal\reliefweb_migrate\Plugin\migrate\source\SourceMigrationStatusInterface;
 use Drupal\reliefweb_utility\Helpers\LegacyHelper;
 use Drush\Commands\DrushCommands;
@@ -518,6 +519,51 @@ protected function downloadFile($source, $destination) {
     return $success;
   }
 
+  /**
+   * Reset the hight water mark.
+   *
+   * @command rw-migrate:reset-high-water
+   *
+   * @option group A comma-separated list of migration groups to list
+   * @option tag Name of the migration tag to list
+   *
+   * @default $options []
+   *
+   * @usage rw-migrate:reset-high-water
+   *   Reset the stored high water for all migrations.
+   * @usage rw-migrate:reset-high-water beer_term,beer_node
+   *   Reset the stored high water for specific migrations.
+   * @usage rw-migrate:reset-high-water --group=beer
+   *   Reset the stored high water for all migrations in a given group.
+   * @usage migrate:reset-high-water --tag=user
+   *   Reset the stored high water for all migrations with a given tag.
+   *
+   * @validate-module-enabled reliefweb_migrate
+   *
+   * @aliases rw-mrhw
+   */
+  public function resetHighWater($migration_names = '', array $options = [
+    'group' => '',
+    'tag' => '',
+  ]) {
+    $migrations = $this->migrationsList($migration_names, $options);
+
+    // Take it one group at a time, listing the migrations within each group.
+    foreach ($migrations as $migration_list) {
+      foreach ($migration_list as $migration_id => $migration) {
+        $source_plugin = $migration->getSourcePlugin();
+
+        if ($source_plugin instanceof SourceMigrationHighWaterInterface) {
+          $id = $source_plugin->setHighWaterToLatestNonImported();
+          $this->logger->info(strtr('Set high water to @id for @migration.', [
+            '@id' => $id,
+            '@migration' => $migration_id,
+          ]));
+        }
+      }
+    }
+  }
+
   /**
    * Check if the attachments are migrated properly.
    *
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
index 16c06d06a..de332e6c6 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
@@ -14,7 +14,7 @@
 /**
  * Base entity source plugin for reliefweb migrations.
  */
-abstract class EntityBase extends SqlBase implements ImportAwareInterface, RollbackAwareInterface, SourceMigrationStatusInterface {
+abstract class EntityBase extends SqlBase implements ImportAwareInterface, RollbackAwareInterface, SourceMigrationHighWaterInterface, SourceMigrationStatusInterface {
 
   /**
    * Entity type.
@@ -326,6 +326,23 @@ public function resetHighWater() {
     $this->getHighWaterStorage()->set($this->migration->id(), NULL);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function setHighWaterToLatestNonImported() {
+    $destination_ids = $this->getDestinationEntityIds();
+    $source_ids = $this->getSourceEntityIds();
+    $imported_ids = array_intersect($destination_ids, $source_ids);
+    $updated_ids = array_diff_assoc($imported_ids, $source_ids);
+    $new_ids = array_diff($source_ids, $imported_ids);
+    $ids = array_keys($new_ids + $updated_ids);
+
+    if (!empty($ids)) {
+      $this->getHighWaterStorage()->set($this->migration->id(), min($ids) - 1);
+    }
+    return $this->getHighWater();
+  }
+
   /**
    * Remove the entities from the D9 site that don't exist in the D7 site.
    */
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/SourceMigrationHighWaterInterface.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/SourceMigrationHighWaterInterface.php
new file mode 100644
index 000000000..c17df5a10
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/SourceMigrationHighWaterInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Drupal\reliefweb_migrate\Plugin\migrate\source;
+
+/**
+ * Interface for source migration plugins using high water mark.
+ */
+interface SourceMigrationHighWaterInterface {
+
+  /**
+   * Set the high water to latest non imported ID.
+   *
+   * Note: this mostly useful during development to be able to re-import
+   * deleted or modified old content.
+   *
+   * @return int
+   *   The latest imported ID for the migration.
+   */
+  public function setHighWaterToLatestNonImported();
+
+}

From 2233c28425b184ccbaba5b9477cbddf3fdbdb63d Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 8 Feb 2022 08:49:49 +0000
Subject: [PATCH 443/720] [RW-358] Fix path alias migration

---
 .../src/Commands/ReliefWebGuidelinesCommands.php             | 5 ++++-
 .../src/Plugin/migrate/destination/Entity.php                | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_guidelines/src/Commands/ReliefWebGuidelinesCommands.php b/html/modules/custom/reliefweb_guidelines/src/Commands/ReliefWebGuidelinesCommands.php
index 96230dc1f..aae32e416 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Commands/ReliefWebGuidelinesCommands.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Commands/ReliefWebGuidelinesCommands.php
@@ -220,16 +220,19 @@ public function migrateFromTrello() {
         $shortlinks[$shortlink['short_link']] = $shortlink;
 
         // Create the path alias.
+        $path_alias_id++;
         $path_alias_alias = '/guideline/' . $shortlink['short_link'];
         $path_alias_url = 'https://reliefweb.int' . $path_alias_alias;
         $path_alias_uuid = Uuid::v3(Uuid::fromString(Uuid::NAMESPACE_URL), $path_alias_url)->toRfc4122();
 
         $path_alias_storage->create([
-          'id' => $path_alias_id++,
+          'id' => $path_alias_id,
+          'revision_id' => $path_alias_id,
           'uuid' => $path_alias_uuid,
           'path' => '/admin/structure/guideline/' . $guideline->id(),
           'alias' => $path_alias_alias,
           'langcode' => $guideline->language()->getId(),
+          'status' => 1,
         ])->save();
       }
     }
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Entity.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Entity.php
index e07708c5f..c2c8d905c 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Entity.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Entity.php
@@ -242,10 +242,12 @@ protected function saveUrlAlias(ContentEntityInterface $entity) {
       $uuid = Uuid::v3(Uuid::fromString(Uuid::NAMESPACE_URL), 'https://reliefweb.int' . $path)->toRfc4122();
       $path_alias = $this->pathAliasStorage->create([
         'id' => $entity->url_alias['id'],
+        'revision_id' => $entity->url_alias['id'],
         'uuid' => $uuid,
         'path' => $path,
         'alias' => $alias,
         'langcode' => $entity->language()->getId(),
+        'status' => 1,
       ]);
       $this->pathAliasStorage->saveAccumulated($path_alias);
       unset($entity->url_alias);

From 1f6e1f9dbed40683ee7a959dd4ff7e327c8a66c5 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 9 Feb 2022 02:30:21 +0000
Subject: [PATCH 444/720] [RW-311] Hide outline tab

---
 config/user.role.editor.yml    | 1 -
 config/user.role.webmaster.yml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/config/user.role.editor.yml b/config/user.role.editor.yml
index 8e6a0e0fc..4cb8bfb5e 100644
--- a/config/user.role.editor.yml
+++ b/config/user.role.editor.yml
@@ -52,7 +52,6 @@ permissions:
   - 'access user contact forms'
   - 'access user profiles'
   - 'add content to books'
-  - 'administer book outlines'
   - 'administer community topics'
   - 'administer url aliases'
   - 'archive content'
diff --git a/config/user.role.webmaster.yml b/config/user.role.webmaster.yml
index d12c8ff46..4ad8f7042 100644
--- a/config/user.role.webmaster.yml
+++ b/config/user.role.webmaster.yml
@@ -33,7 +33,6 @@ weight: 4
 is_admin: null
 permissions:
   - 'add content to books'
-  - 'administer book outlines'
   - 'administer google tag manager'
   - 'create new books'
   - 'create terms in career_category'

From c4c68780fd4dfa462c1f09466c09ede2735cf393 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 9 Feb 2022 02:44:50 +0000
Subject: [PATCH 445/720] [RW-367] Refactor access to moderation information

---
 config/user.role.authenticated.yml            |  4 +
 config/user.role.editor.yml                   |  1 +
 .../reliefweb_moderation.module               | 77 +++++++++++--------
 .../reliefweb_moderation.permissions.yml      | 16 ++++
 .../src/ModerationServiceBase.php             | 17 ++++
 .../src/Helpers/EntityHelper.php              | 47 +++++++++++
 6 files changed, 129 insertions(+), 33 deletions(-)
 create mode 100644 html/modules/custom/reliefweb_utility/src/Helpers/EntityHelper.php

diff --git a/config/user.role.authenticated.yml b/config/user.role.authenticated.yml
index a8c4ebc5c..ffcd01c9f 100644
--- a/config/user.role.authenticated.yml
+++ b/config/user.role.authenticated.yml
@@ -15,6 +15,7 @@ dependencies:
     - node
     - reliefweb_bookmarks
     - reliefweb_form
+    - reliefweb_moderation
     - reliefweb_subscriptions
     - reliefweb_user_posts
     - system
@@ -40,5 +41,8 @@ permissions:
   - 'use text format markdown_editor'
   - 'use text format token_markdown'
   - 'view media'
+  - 'view moderation information'
+  - 'view moderation information revision message'
+  - 'view moderation information status'
   - 'view own posts'
   - 'view own unpublished content'
diff --git a/config/user.role.editor.yml b/config/user.role.editor.yml
index 4cb8bfb5e..df5d7cecd 100644
--- a/config/user.role.editor.yml
+++ b/config/user.role.editor.yml
@@ -157,6 +157,7 @@ permissions:
   - 'view book revisions'
   - 'view entity history'
   - 'view job revisions'
+  - 'view moderation information revision message author'
   - 'view other user posts'
   - 'view own unpublished content'
   - 'view own unpublished media'
diff --git a/html/modules/custom/reliefweb_moderation/reliefweb_moderation.module b/html/modules/custom/reliefweb_moderation/reliefweb_moderation.module
index 79be4d7cb..cdf3d986f 100644
--- a/html/modules/custom/reliefweb_moderation/reliefweb_moderation.module
+++ b/html/modules/custom/reliefweb_moderation/reliefweb_moderation.module
@@ -15,6 +15,7 @@ use Drupal\reliefweb_moderation\EntityModeratedInterface;
 use Drupal\reliefweb_moderation\ModeratedNodeStorageSchema;
 use Drupal\reliefweb_moderation\ModeratedTermStorageSchema;
 use Drupal\reliefweb_moderation\ModerationServiceBase;
+use Drupal\reliefweb_utility\Helpers\EntityHelper;
 
 /**
  * Implements hook_theme().
@@ -196,50 +197,60 @@ function reliefweb_moderation_entity_presave(EntityInterface $entity) {
  * Add the moderation information block to entity pages and forms.
  */
 function reliefweb_moderation_preprocess_page(&$variables) {
-  if (!\Drupal::currentUser()->hasPermission('access content moderation features')) {
+  $user = \Drupal::currentUser();
+
+  // For existing revisionable and moderated entities, add the moderation
+  // information at the top of the entity page/form.
+  $entity = EntityHelper::getEntityFromRoute();
+  if (empty($entity) || $entity->isNew() || !($entity instanceof EntityModeratedInterface)) {
     return;
   }
 
-  $route_match = \Drupal::routeMatch();
-  $entity = $route_match->getParameter('node') ?? $route_match->getParameter('taxonomy_term');
+  $element = [
+    '#theme' => 'reliefweb_moderation_information',
+    // Display the moderation information before the page title and local
+    // tasks.
+    '#weight' => -100,
+    '#cache' => [
+      '#contexts' => [
+        'user.permissions',
+      ],
+      '#tags' => [
+        $entity->getEntityTypeId() . ':' . $entity->id(),
+      ],
+    ],
+    '#access' => $entity->access('view_moderation_information'),
+  ];
 
-  // For existing revisionable and moderated entities, add the moderation
-  // information at the top of the entity page/form.
-  if (
-      !empty($entity) &&
-      $entity instanceof EntityModeratedInterface &&
-      !$entity->isNew()
-  ) {
-    // Note: when comming back from the preview, the original revision log will
-    // not be available...
+  // Get the moderation status.
+  if ($user->hasPermission('view moderation information status')) {
+    $element['#status'] = [
+      'value' => $entity->getModerationStatus(),
+      'label' => $entity->getModerationStatusLabel(),
+    ];
+  }
+
+  // Get the moderation revision message.
+  //
+  // Note: when comming back from the preview, the original revision log will
+  // not be available...
+  if ($user->hasPermission('view moderation information revision message')) {
     $message = $entity->getOriginalRevisionLogMessage();
     if (!empty($message)) {
-      // Convert the message to markdown to generated links notably.
+      // Convert the message to markdown to generate the links notably.
       // Wrap in a Markup so that the HTML is not escaped when rendered.
       $message = Markup::create(strip_tags(check_markup($message, 'markdown'), '<a><em><strong><br>'));
-    }
 
-    $element = [
-      '#theme' => 'reliefweb_moderation_information',
-      '#status' => [
-        'value' => $entity->getModerationStatus(),
-        'label' => $entity->getModerationStatusLabel(),
-      ],
-      '#message' => [
+      $element['#message'] = [
         'type' => $entity->getOriginalRevisionLogMessageType(),
         'content' => $message,
-        'author' => $entity->getOriginalRevisionUser(),
-      ],
-      // Display the moderation information before the page title and local
-      // tasks.
-      '#weight' => -100,
-      '#cache' => [
-        '#tags' => [
-          $entity->getEntityTypeId() . ':' . $entity->id(),
-        ],
-      ],
-    ];
+      ];
 
-    $variables['page']['content']['moderation-information'] = $element;
+      if ($user->hasPermission('view moderation information revision message author')) {
+        $element['#message']['author'] = $entity->getOriginalRevisionUser();
+      }
+    }
   }
+
+  $variables['page']['content']['moderation-information'] = $element;
 }
diff --git a/html/modules/custom/reliefweb_moderation/reliefweb_moderation.permissions.yml b/html/modules/custom/reliefweb_moderation/reliefweb_moderation.permissions.yml
index e08fc651e..25c4f6aa1 100644
--- a/html/modules/custom/reliefweb_moderation/reliefweb_moderation.permissions.yml
+++ b/html/modules/custom/reliefweb_moderation/reliefweb_moderation.permissions.yml
@@ -13,3 +13,19 @@ archive content:
 view any content:
   title: 'View any content'
   description: 'Allow users to view any content.'
+
+view moderation information:
+  title: 'View moderation information'
+  description: 'Allow users to view the moderation status and revision message.'
+
+view moderation information status:
+  title: 'View moderation information status'
+  description: 'Allow users to view the moderation status.'
+
+view moderation information revision message:
+  title: 'View moderation information revision message'
+  description: 'Allow users to view the moderation revision message.'
+
+view moderation information revision message author:
+  title: 'View moderation information revision message author'
+  description: 'Allow users to view the moderation revision message author.'
diff --git a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
index 1fcc56918..f741cc5f6 100644
--- a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
+++ b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
@@ -326,6 +326,17 @@ public function entityAccess(EntityModeratedInterface $entity, $operation = 'vie
               }
               break;
 
+            case 'view_moderation_information':
+              if ($account->hasPermission('view moderation information')) {
+                if ($account->hasPermission('edit any ' . $bundle . ' content')) {
+                  $access = TRUE;
+                }
+                elseif ($account->hasPermission('edit own ' . $bundle . ' content')) {
+                  $access = UserPostingRightsHelper::userHasPostingRights($account, $entity, $status);
+                }
+              }
+              break;
+
             default:
               return AccessResult::neutral();
           }
@@ -357,6 +368,12 @@ public function entityAccess(EntityModeratedInterface $entity, $operation = 'vie
               $access = $account->hasPermission('delete terms in ' . $bundle);
               break;
 
+            case 'view_moderation_information':
+              if ($account->hasPermission('view moderation information')) {
+                $access = $account->hasPermission('edit terms in ' . $bundle);
+              }
+              break;
+
             default:
               return AccessResult::neutral();
           }
diff --git a/html/modules/custom/reliefweb_utility/src/Helpers/EntityHelper.php b/html/modules/custom/reliefweb_utility/src/Helpers/EntityHelper.php
new file mode 100644
index 000000000..6221defa6
--- /dev/null
+++ b/html/modules/custom/reliefweb_utility/src/Helpers/EntityHelper.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Drupal\reliefweb_utility\Helpers;
+
+use Drupal\Core\Entity\EntityInterface;
+
+/**
+ * Helper to information about entities.
+ */
+class EntityHelper {
+
+  /**
+   * Attempt to get the entity for the current route.
+   *
+   * Note: this only works for routes using the "standard" way to declare
+   * entity parameters: `entity:entity_type_id`.
+   *
+   * @return \Drupal\Core\Entity\EntityInterface|null
+   *   The entity for the route or NULL if none.
+   */
+  public static function getEntityFromRoute() {
+    $route_match = \Drupal::routeMatch();
+
+    $route = $route_match->getRouteObject();
+    if (empty($route)) {
+      return NULL;
+    }
+
+    $parameters = $route->getOption('parameters');
+    if (empty($parameters)) {
+      return NULL;
+    }
+
+    foreach ($parameters as $name => $options) {
+      if (isset($options['type']) && strpos($options['type'], 'entity:') === 0) {
+        $entity = $route_match->getParameter($name);
+        if (!empty($entity) && $entity instanceof EntityInterface) {
+          return $entity;
+        }
+        else {
+          return NULL;
+        }
+      }
+    }
+  }
+
+}

From a42c7b6b1a6f102ad6920b4452455148d23fcc4c Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 9 Feb 2022 02:52:04 +0000
Subject: [PATCH 446/720] [RW-367] Add moderation information on guideline
 pages and add permissions to edit guidelines

---
 config/user.role.authenticated.yml            |  1 +
 config/user.role.editor.yml                   | 21 +++++++++++++++
 config/user.role.webmaster.yml                | 26 +++++++++++++++++++
 .../src/Services/GuidelineModeration.php      |  6 +++++
 4 files changed, 54 insertions(+)

diff --git a/config/user.role.authenticated.yml b/config/user.role.authenticated.yml
index ffcd01c9f..20da79b78 100644
--- a/config/user.role.authenticated.yml
+++ b/config/user.role.authenticated.yml
@@ -44,5 +44,6 @@ permissions:
   - 'view moderation information'
   - 'view moderation information revision message'
   - 'view moderation information status'
+  - 'view moderation status'
   - 'view own posts'
   - 'view own unpublished content'
diff --git a/config/user.role.editor.yml b/config/user.role.editor.yml
index df5d7cecd..d9a1f3561 100644
--- a/config/user.role.editor.yml
+++ b/config/user.role.editor.yml
@@ -3,6 +3,7 @@ langcode: en
 status: true
 dependencies:
   config:
+    - filter.format.guideline
     - filter.format.html
     - filter.format.markdown
     - media.type.image_announcement
@@ -25,6 +26,7 @@ dependencies:
     - book
     - contact
     - filter
+    - guidelines
     - media
     - node
     - path
@@ -52,6 +54,7 @@ permissions:
   - 'access user contact forms'
   - 'access user profiles'
   - 'add content to books'
+  - 'add guideline entities'
   - 'administer community topics'
   - 'administer url aliases'
   - 'archive content'
@@ -118,6 +121,7 @@ permissions:
   - 'edit any report content'
   - 'edit any topic content'
   - 'edit any training content'
+  - 'edit guideline entities'
   - 'edit homepage headlines'
   - 'edit own announcement content'
   - 'edit own blog_post content'
@@ -137,6 +141,18 @@ permissions:
   - 'edit terms in source'
   - 'edit terms in tag'
   - 'edit user posting rights'
+  - 'field_guideline create entities'
+  - 'field_guideline delete any entities'
+  - 'field_guideline delete own entities'
+  - 'field_guideline edit any entities'
+  - 'field_guideline edit own entities'
+  - 'field_guideline view revisions'
+  - 'guideline_list create entities'
+  - 'guideline_list delete any entities'
+  - 'guideline_list delete own entities'
+  - 'guideline_list edit any entities'
+  - 'guideline_list edit own entities'
+  - 'guideline_list view revisions'
   - 'revert announcement revisions'
   - 'revert blog_post revisions'
   - 'revert book revisions'
@@ -145,11 +161,14 @@ permissions:
   - 'revert term revision'
   - 'revert topic revisions'
   - 'revert training revisions'
+  - 'sort all guideline'
   - 'update any media'
   - 'update media'
   - 'use enhanced input forms'
+  - 'use text format guideline'
   - 'use text format html'
   - 'use text format markdown'
+  - 'view all guideline revisions'
   - 'view all media revisions'
   - 'view announcement revisions'
   - 'view any content'
@@ -161,9 +180,11 @@ permissions:
   - 'view other user posts'
   - 'view own unpublished content'
   - 'view own unpublished media'
+  - 'view published guideline entities'
   - 'view report revisions'
   - 'view term revision data'
   - 'view term revision list'
   - 'view topic revisions'
   - 'view training revisions'
+  - 'view unpublished guideline entities'
   - 'view user email addresses'
diff --git a/config/user.role.webmaster.yml b/config/user.role.webmaster.yml
index 4ad8f7042..cf335eb08 100644
--- a/config/user.role.webmaster.yml
+++ b/config/user.role.webmaster.yml
@@ -25,6 +25,7 @@ dependencies:
     - book
     - filter
     - google_tag
+    - guidelines
     - taxonomy
     - taxonomy_term_revision
 id: webmaster
@@ -33,6 +34,7 @@ weight: 4
 is_admin: null
 permissions:
   - 'add content to books'
+  - 'add guideline entities'
   - 'administer google tag manager'
   - 'create new books'
   - 'create terms in career_category'
@@ -52,6 +54,8 @@ permissions:
   - 'create terms in training_format'
   - 'create terms in training_type'
   - 'create terms in vulnerable_group'
+  - 'delete all guideline revisions'
+  - 'delete guideline entities'
   - 'delete term revision'
   - 'delete terms in career_category'
   - 'delete terms in content_format'
@@ -70,6 +74,7 @@ permissions:
   - 'delete terms in training_format'
   - 'delete terms in training_type'
   - 'delete terms in vulnerable_group'
+  - 'edit guideline entities'
   - 'edit terms in career_category'
   - 'edit terms in content_format'
   - 'edit terms in country'
@@ -87,7 +92,28 @@ permissions:
   - 'edit terms in training_format'
   - 'edit terms in training_type'
   - 'edit terms in vulnerable_group'
+  - 'field_guideline create entities'
+  - 'field_guideline delete any entities'
+  - 'field_guideline delete own entities'
+  - 'field_guideline delete revisions'
+  - 'field_guideline edit any entities'
+  - 'field_guideline edit own entities'
+  - 'field_guideline revert revisions'
+  - 'field_guideline view revisions'
+  - 'guideline_list create entities'
+  - 'guideline_list delete any entities'
+  - 'guideline_list delete own entities'
+  - 'guideline_list delete revisions'
+  - 'guideline_list edit any entities'
+  - 'guideline_list edit own entities'
+  - 'guideline_list revert revisions'
+  - 'guideline_list view revisions'
+  - 'revert all guideline revisions'
   - 'revert term revision'
+  - 'sort all guideline'
   - 'use text format guideline'
+  - 'view all guideline revisions'
+  - 'view published guideline entities'
   - 'view term revision data'
   - 'view term revision list'
+  - 'view unpublished guideline entities'
diff --git a/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineModeration.php b/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineModeration.php
index 596099f37..1679e8274 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineModeration.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineModeration.php
@@ -164,6 +164,12 @@ public function entityAccess(EntityModeratedInterface $entity, $operation = 'vie
         $access = $account->hasPermission('delete guideline entities');
         break;
 
+      case 'view_moderation_information':
+        if ($account->hasPermission('view moderation information')) {
+          $access = $account->hasPermission('edit guideline entities');
+        }
+        break;
+
       default:
         return AccessResult::neutral();
     }

From fe976924ddc9aa83e3b78b13adc6fbe8d90b2215 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 9 Feb 2022 03:51:47 +0000
Subject: [PATCH 447/720] [RW-368] Add missing table elements to the list of
 allowed html for the text formats

---
 config/filter.format.html.yml           | 2 +-
 config/filter.format.markdown.yml       | 2 +-
 config/filter.format.token_markdown.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/filter.format.html.yml b/config/filter.format.html.yml
index 97ac806bd..4ceeaed57 100644
--- a/config/filter.format.html.yml
+++ b/config/filter.format.html.yml
@@ -15,7 +15,7 @@ filters:
     status: true
     weight: -49
     settings:
-      allowed_html: '<a href hreflang target> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type=''1 A I''> <li> <dl> <dt> <dd> <h1 id> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <table> <caption> <thead> <th> <td> <div> <span> <p> <br> <strike> <ul> <img src> <sup> <sub>'
+      allowed_html: '<a href hreflang target> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type=''1 A I''> <li> <dl> <dt> <dd> <h1 id> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <table> <caption> <thead> <tbody> <tfoot> <tr> <th colspan rowspan> <td colspan rowspan> <div> <span> <p> <br> <strike> <ul> <img src> <sup> <sub>'
       filter_html_help: false
       filter_html_nofollow: false
   filter_htmlcorrector:
diff --git a/config/filter.format.markdown.yml b/config/filter.format.markdown.yml
index 3c9b3f296..f2524eb50 100644
--- a/config/filter.format.markdown.yml
+++ b/config/filter.format.markdown.yml
@@ -15,7 +15,7 @@ filters:
     status: true
     weight: -49
     settings:
-      allowed_html: '<a href hreflang target> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type=''1 A I''> <li> <dl> <dt> <dd> <h1 id> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <table> <caption> <thead> <th> <td> <div> <span> <p> <br> <strike> <ul> <img src> <sup> <sub>'
+      allowed_html: '<a href hreflang target> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type=''1 A I''> <li> <dl> <dt> <dd> <h1 id> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <table> <caption> <thead> <tbody> <tfoot> <tr> <th colspan rowspan> <td colspan rowspan> <div> <span> <p> <br> <strike> <ul> <img src> <sup> <sub>'
       filter_html_help: false
       filter_html_nofollow: false
   filter_htmlcorrector:
diff --git a/config/filter.format.token_markdown.yml b/config/filter.format.token_markdown.yml
index cf6bc1e49..e848a28e7 100644
--- a/config/filter.format.token_markdown.yml
+++ b/config/filter.format.token_markdown.yml
@@ -21,7 +21,7 @@ filters:
     status: true
     weight: -48
     settings:
-      allowed_html: '<a href hreflang target> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type=''1 A I''> <li> <dl> <dt> <dd> <h1 id> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <table> <caption> <thead> <th> <td> <div> <span> <p> <br> <strike> <ul> <img src> <sup> <sub> <iframe longdesc name scrolling src title align height frameborder width allowfullscreen>'
+      allowed_html: '<a href hreflang target> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type=''1 A I''> <li> <dl> <dt> <dd> <h1 id> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <table> <caption> <thead> <tbody> <tfoot> <tr> <th colspan rowspan> <td colspan rowspan> <div> <span> <p> <br> <strike> <ul> <img src> <sup> <sub> <iframe longdesc name scrolling src title align height frameborder width allowfullscreen>'
       filter_html_help: true
       filter_html_nofollow: false
   media_embed:

From fdda837a94fe559a7cea69b66d34417e0b11c67a Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 9 Feb 2022 04:28:06 +0000
Subject: [PATCH 448/720] [RW-361] Allow alt attribute for images

---
 config/filter.format.html.yml           | 2 +-
 config/filter.format.markdown.yml       | 2 +-
 config/filter.format.token_markdown.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/filter.format.html.yml b/config/filter.format.html.yml
index 4ceeaed57..bb1481376 100644
--- a/config/filter.format.html.yml
+++ b/config/filter.format.html.yml
@@ -15,7 +15,7 @@ filters:
     status: true
     weight: -49
     settings:
-      allowed_html: '<a href hreflang target> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type=''1 A I''> <li> <dl> <dt> <dd> <h1 id> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <table> <caption> <thead> <tbody> <tfoot> <tr> <th colspan rowspan> <td colspan rowspan> <div> <span> <p> <br> <strike> <ul> <img src> <sup> <sub>'
+      allowed_html: '<a href hreflang target> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type=''1 A I''> <li> <dl> <dt> <dd> <h1 id> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <table> <caption> <thead> <tbody> <tfoot> <tr> <th colspan rowspan> <td colspan rowspan> <div> <span> <p> <br> <strike> <ul> <img src alt> <sup> <sub>'
       filter_html_help: false
       filter_html_nofollow: false
   filter_htmlcorrector:
diff --git a/config/filter.format.markdown.yml b/config/filter.format.markdown.yml
index f2524eb50..68af27398 100644
--- a/config/filter.format.markdown.yml
+++ b/config/filter.format.markdown.yml
@@ -15,7 +15,7 @@ filters:
     status: true
     weight: -49
     settings:
-      allowed_html: '<a href hreflang target> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type=''1 A I''> <li> <dl> <dt> <dd> <h1 id> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <table> <caption> <thead> <tbody> <tfoot> <tr> <th colspan rowspan> <td colspan rowspan> <div> <span> <p> <br> <strike> <ul> <img src> <sup> <sub>'
+      allowed_html: '<a href hreflang target> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type=''1 A I''> <li> <dl> <dt> <dd> <h1 id> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <table> <caption> <thead> <tbody> <tfoot> <tr> <th colspan rowspan> <td colspan rowspan> <div> <span> <p> <br> <strike> <ul> <img src alt> <sup> <sub>'
       filter_html_help: false
       filter_html_nofollow: false
   filter_htmlcorrector:
diff --git a/config/filter.format.token_markdown.yml b/config/filter.format.token_markdown.yml
index e848a28e7..8d3717353 100644
--- a/config/filter.format.token_markdown.yml
+++ b/config/filter.format.token_markdown.yml
@@ -21,7 +21,7 @@ filters:
     status: true
     weight: -48
     settings:
-      allowed_html: '<a href hreflang target> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type=''1 A I''> <li> <dl> <dt> <dd> <h1 id> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <table> <caption> <thead> <tbody> <tfoot> <tr> <th colspan rowspan> <td colspan rowspan> <div> <span> <p> <br> <strike> <ul> <img src> <sup> <sub> <iframe longdesc name scrolling src title align height frameborder width allowfullscreen>'
+      allowed_html: '<a href hreflang target> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type=''1 A I''> <li> <dl> <dt> <dd> <h1 id> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <table> <caption> <thead> <tbody> <tfoot> <tr> <th colspan rowspan> <td colspan rowspan> <div> <span> <p> <br> <strike> <ul> <img src alt> <sup> <sub> <iframe longdesc name scrolling src title align height frameborder width allowfullscreen>'
       filter_html_help: true
       filter_html_nofollow: false
   media_embed:

From 43c6a2d6400db695f4f60b94cfef9047277d636e Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 9 Feb 2022 04:28:43 +0000
Subject: [PATCH 449/720] [RW-361] Add special css rules for a counter image

---
 .../components/rw-report/rw-report.css                | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-report/rw-report.css b/html/themes/custom/common_design_subtheme/components/rw-report/rw-report.css
index 395845038..be6cf33b0 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-report/rw-report.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-report/rw-report.css
@@ -106,3 +106,14 @@
 .node--report--full li {
   margin: 8px 0 0;
 }
+
+/* Special rules for The Conversation counter images... */
+.node--report--full img[src*="counter.theconversation.com"] {
+  position: absolute;
+  visibility: hidden;
+  width: 1px;
+  height: 1px;
+}
+.node--report--full img[src*="counter.theconversation.com"] + p {
+  margin-top: 0;
+}

From 6eac782f1f1bfe68ba30ed5b9b8c2261582fdf56 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 9 Feb 2022 04:47:37 +0000
Subject: [PATCH 450/720] [RW-372] Ensure OCHA product is removed if OCHA is
 not a source of the document

---
 .../reliefweb_entities/src/Entity/Report.php      | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Report.php b/html/modules/custom/reliefweb_entities/src/Entity/Report.php
index 57aeaaa42..09148df33 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Report.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Report.php
@@ -210,6 +210,21 @@ public function preSave(EntityStorageInterface $storage) {
     elseif (isset($this->_original_created)) {
       $this->setCreatedTime($this->_original_created);
     }
+
+    // #KYPCnkXd - No OCHA Product if the source is not OCHA (id: 1503).
+    if (!$this->field_source->isEmpty()) {
+      $from_ocha = FALSE;
+      foreach ($this->field_source as $item) {
+        // We don't use a strict equality as tid may be a numeric string...
+        if (!$item->isEmpty() && $item->getValue('target_id') == 1503) {
+          $from_ocha = TRUE;
+          break;
+        }
+      }
+      if ($from_ocha === FALSE) {
+        $this->field_ocha_product->setValue([]);
+      }
+    }
   }
 
 }

From 473567bc1c2ce17a995a9786d4b496f420e6a251 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 9 Feb 2022 08:59:35 +0000
Subject: [PATCH 451/720] [RW-227] Add helper to convert an email HTML body to
 plain text

---
 .../src/Helpers/MailHelper.php                | 111 ++++++++++++++++++
 1 file changed, 111 insertions(+)
 create mode 100644 html/modules/custom/reliefweb_utility/src/Helpers/MailHelper.php

diff --git a/html/modules/custom/reliefweb_utility/src/Helpers/MailHelper.php b/html/modules/custom/reliefweb_utility/src/Helpers/MailHelper.php
new file mode 100644
index 000000000..c7f756b8b
--- /dev/null
+++ b/html/modules/custom/reliefweb_utility/src/Helpers/MailHelper.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace Drupal\reliefweb_utility\Helpers;
+
+use Drupal\Core\Mail\MailFormatHelper;
+use Drupal\Core\Site\Settings;
+
+/**
+ * Helper to manipulate emails.
+ */
+class MailHelper {
+
+
+  /**
+   * Allowed tags in the HTML body part of the email.
+   *
+   * @var array
+   */
+  protected static $allowedTags = [
+    'html',
+    'head',
+    'meta',
+    'body',
+    'div',
+    'span',
+    'br',
+    'a',
+    'em',
+    'i',
+    'strong',
+    'b',
+    'cite',
+    'code',
+    'strike',
+    'ul',
+    'ol',
+    'li',
+    'dl',
+    'dt',
+    'dd',
+    'blockquote',
+    'p',
+    'pre',
+    'h1',
+    'h2',
+    'h3',
+    'h4',
+    'h5',
+    'h6',
+    'table',
+    'caption',
+    'thead',
+    'tbody',
+    'th',
+    'td',
+    'tr',
+    'sup',
+    'sub',
+    'img',
+  ];
+
+  /**
+   * Get the plain text version of an email's body.
+   *
+   * @param array|string $body
+   *   The mail body.
+   *
+   * @return string
+   *   The plain text body.
+   */
+  public static function getPlainText($body) {
+    if (empty($body)) {
+      return '';
+    }
+
+    // Get the line ending characters.
+    $eol = Settings::get('mail_line_endings', PHP_EOL);
+
+    // Join the body array into one string if necessary.
+    if (is_array($body)) {
+      $body = implode($eol . $eol, $body);
+    }
+
+    // Skip if there is nothing to convert.
+    $body = trim($body);
+    if (empty($body)) {
+      return '';
+    }
+
+    // If there is no apparent HTML elements we assume it's already plain text.
+    if (preg_match('#</[^>]+>#', $body) !== 1) {
+      $body_text = $body;
+    }
+    else {
+      // Remove the preheader for plain text mail.
+      $body = preg_replace('#<[^ ]+ id="preheader"[^<]*</[^>]+>#', '', $body);
+
+      // Convert any HTML to plain-text.
+      $body_text = MailFormatHelper::htmlToText($body, self::$allowedTags);
+    }
+
+    // Remove unnecessary consecutive line breaks.
+    $body_text = preg_replace('#(' . $eol . '){3,}#', $eol . $eol, $body_text);
+
+    // Ensure there is a blank line before second level titles.
+    $body_text = preg_replace('/([^\n\r])(' . $eol . '--------)/', '$1' . $eol . '$2', $body_text);
+
+    return $body_text;
+  }
+
+}

From e6f38a1c34fa0e2d080a13863a124134989394fb Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 10 Feb 2022 00:00:30 +0000
Subject: [PATCH 452/720] [RW-116] Adjust subscriptions to have better plain
 text version

---
 .../reliefweb_subscriptions.module            |  2 +
 .../src/Form/SubscriptionForm.php             |  6 ++
 ...-subscriptions-content--disaster.html.twig | 29 ++++----
 ...bscriptions-content--ocha-sitrep.html.twig | 24 +++----
 .../reliefweb-subscriptions-content.html.twig | 66 ++++++++++---------
 .../reliefweb-subscriptions-footer.html.twig  | 13 ++--
 .../reliefweb-subscriptions-header.html.twig  |  4 ++
 7 files changed, 84 insertions(+), 60 deletions(-)

diff --git a/html/modules/custom/reliefweb_subscriptions/reliefweb_subscriptions.module b/html/modules/custom/reliefweb_subscriptions/reliefweb_subscriptions.module
index 313fad406..46e3a1ccd 100644
--- a/html/modules/custom/reliefweb_subscriptions/reliefweb_subscriptions.module
+++ b/html/modules/custom/reliefweb_subscriptions/reliefweb_subscriptions.module
@@ -6,6 +6,7 @@
  */
 
 use Drupal\Core\Entity\EntityInterface;
+use Drupal\reliefweb_utility\Helpers\MailHelper;
 
 /**
  * Get the list of subscriptions.
@@ -349,6 +350,7 @@ function reliefweb_subscriptions_mail($key, &$message, $params) {
 
   $message['subject'] = $params['subject'];
   $message['body'] = $params['body'];
+  $message['params']['plaintext'] = MailHelper::getPlainText($message['body']);
 }
 
 /**
diff --git a/html/modules/custom/reliefweb_subscriptions/src/Form/SubscriptionForm.php b/html/modules/custom/reliefweb_subscriptions/src/Form/SubscriptionForm.php
index 89e92215b..84e0cdec9 100644
--- a/html/modules/custom/reliefweb_subscriptions/src/Form/SubscriptionForm.php
+++ b/html/modules/custom/reliefweb_subscriptions/src/Form/SubscriptionForm.php
@@ -131,6 +131,9 @@ public function buildForm(array $form, FormStateInterface $form_state, AccountIn
   public function submitForm(array &$form, FormStateInterface $form_state) {
     $subscriptions = $form_state->getValue('global');
     foreach ($subscriptions as $sid => $value) {
+      if ($sid === '_none') {
+        continue;
+      }
       if (!$value) {
         $this->unsubscribe($form_state->getValue('uid'), $sid);
       }
@@ -141,6 +144,9 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
 
     $subscriptions = $form_state->getValue('country_updates');
     foreach ($subscriptions as $sid => $value) {
+      if ($sid === '_none') {
+        continue;
+      }
       if (!$value) {
         $this->unsubscribe($form_state->getValue('uid'), $sid);
       }
diff --git a/html/modules/custom/reliefweb_subscriptions/templates/reliefweb-subscriptions-content--disaster.html.twig b/html/modules/custom/reliefweb_subscriptions/templates/reliefweb-subscriptions-content--disaster.html.twig
index 8770ede81..8d6089b2c 100644
--- a/html/modules/custom/reliefweb_subscriptions/templates/reliefweb-subscriptions-content--disaster.html.twig
+++ b/html/modules/custom/reliefweb_subscriptions/templates/reliefweb-subscriptions-content--disaster.html.twig
@@ -4,6 +4,10 @@
  * @file
  * Template for the disaster notifications.
  *
+ * Important note: the formmatting of this template and the use of the twig
+ * spaceless indicator `-` are on purpose to ensure a clean conversion to
+ * plain text without excessive line breaks and indentation.
+ *
  * Available variables are:
  * - preheader: string for preheader.
  * - title: disaster name.
@@ -15,18 +19,19 @@
 ?>
 
 #}
-{% embed '@reliefweb_subscriptions/reliefweb-subscriptions-content.html.twig' %}
+{%- embed '@reliefweb_subscriptions/reliefweb-subscriptions-content.html.twig' -%}
+
+{%- block content -%}
+<h1 class="email-title">New Disaster - {{ title }} / <span class="email-title-date">{{ date }}</span></h1>
 
-{% block content %}
-  <h1 class="email-title">New Disaster - {{ title }} / <span class="email-title-date">{{ date }}</span></h1>
+<div class="email-resource">
+<h2>Overview</h2>
 
-  <div class="email-resource">
-    <h2>Overview</h2>
-    <div class="email-resource-teaser">
-      {{ overview|raw }}
-      <a class="email-resource-read-more" href="{{ url }}">View on ReliefWeb</a>
-    </div>
-  </div>
-{% endblock %}
+<div class="email-resource-teaser">
+{{- overview|raw }}
+<a class="email-resource-read-more" href="{{ url }}">View on ReliefWeb</a>
+</div>
+</div>
+{%- endblock -%}
 
-{% endembed %}
+{%- endembed -%}
diff --git a/html/modules/custom/reliefweb_subscriptions/templates/reliefweb-subscriptions-content--ocha-sitrep.html.twig b/html/modules/custom/reliefweb_subscriptions/templates/reliefweb-subscriptions-content--ocha-sitrep.html.twig
index 4acc93784..d77ecd36b 100644
--- a/html/modules/custom/reliefweb_subscriptions/templates/reliefweb-subscriptions-content--ocha-sitrep.html.twig
+++ b/html/modules/custom/reliefweb_subscriptions/templates/reliefweb-subscriptions-content--ocha-sitrep.html.twig
@@ -13,19 +13,19 @@
  */
 
 #}
-{% embed '@reliefweb_subscriptions/reliefweb-subscriptions-content.html.twig' %}
+{%- embed '@reliefweb_subscriptions/reliefweb-subscriptions-content.html.twig' -%}
 
-{% block content %}
-  <h1 class="email-title">New OCHA Situation Report - {{ title }}</h1>
+{%- block content -%}
+<h1 class="email-title">New OCHA Situation Report - {{ title }}</h1>
 
-  <div class="email-resource">
-    <div class="email-resource-info">{{ info|raw }}</div>
+<div class="email-resource">
+<div class="email-resource-info">{{ info|raw }}</div>
 
-    <div class="email-resource-teaser">
-      {{ summary|raw }}
-      <a class="email-resource-read-more" href="{{ url }}">Read more</a>
-    </div>
-  </div>
-{% endblock %}
+<div class="email-resource-teaser">
+{{- summary|raw }}
+<a class="email-resource-read-more" href="{{ url }}">Read more</a>
+</div>
+</div>
+{%- endblock -%}
 
-{% endembed %}
+{%- endembed -%}
diff --git a/html/modules/custom/reliefweb_subscriptions/templates/reliefweb-subscriptions-content.html.twig b/html/modules/custom/reliefweb_subscriptions/templates/reliefweb-subscriptions-content.html.twig
index abf797fde..f5b863e63 100644
--- a/html/modules/custom/reliefweb_subscriptions/templates/reliefweb-subscriptions-content.html.twig
+++ b/html/modules/custom/reliefweb_subscriptions/templates/reliefweb-subscriptions-content.html.twig
@@ -4,6 +4,10 @@
  * @file
  * Default template for notifications.
  *
+ * Important note: the formmatting of this template and the use of the twig
+ * spaceless indicator `-` are on purpose to ensure a clean conversion to
+ * plain text without excessive line breaks and indentation.
+ *
  * Available variables are:
  * - preheader: string for preheader.
  * - title: notification title.
@@ -18,39 +22,39 @@
  */
 
 #}
-{% block header %}
-  {{ render_var({
+{%- block header -%}
+  {{- render_var({
     '#theme': 'reliefweb_subscriptions_header',
     '#preheader': preheader,
-  }) }}
-{% endblock %}
-
-{% block content %}
-  <h1 class="email-title">{{ title }} / <span class="email-title-date">{{ 'now'|date('j M Y') }}</span></h1>
-
-  {% for item in items %}
-    <div class="email-resource">
-      <h2 class="email-resource-title"><a class="email-resource-title-link" href="{{ item.url }}">{{ item.title }}</a></h2>
-      <div class="email-resource-info">{{ item.info|raw }}</div>
-
-      {% if item.image %}
-        <div class="email-resource-image">
-          <img src="{{ item.image.url }}" alt="{{ item.image.description }}">
-        </div>
-      {% endif %}
-
-      <div class="email-resource-teaser">
-        {{ item.summary|raw }}
-        <a class="email-resource-read-more" href="{{ item.url }}">{{ read_more_label }}</a>
-      </div>
-    </div>
-  {% endfor %}
-{% endblock %}
-
-{% block footer %}
-  {{ render_var({
+  }) -}}
+{%- endblock -%}
+
+{%- block content -%}
+<h1 class="email-title">{{ title }} / <span class="email-title-date">{{ 'now'|date('j M Y') }}</span></h1>
+
+{%- for item in items -%}
+<div class="email-resource">
+<h2 class="email-resource-title"><a class="email-resource-title-link" href="{{ item.url }}">{{ item.title }}</a></h2>
+<div class="email-resource-info">{{ item.info|raw }}</div>
+
+{% if item.image -%}
+<div class="email-resource-image">
+<img src="{{ item.image.url }}" alt="{{ item.image.description }}">
+</div>
+{%- endif -%}
+
+<div class="email-resource-teaser">
+{{- item.summary|raw }}
+<a class="email-resource-read-more" href="{{ item.url }}">{{ read_more_label }}</a>
+</div>
+</div>
+{%- endfor -%}
+{%- endblock -%}
+
+{%- block footer -%}
+  {{- render_var({
     '#theme': 'reliefweb_subscriptions_footer',
     '#prefooter': prefooter,
-  }) }}
-{% endblock %}
+  }) -}}
+{%- endblock -%}
 
diff --git a/html/modules/custom/reliefweb_subscriptions/templates/reliefweb-subscriptions-footer.html.twig b/html/modules/custom/reliefweb_subscriptions/templates/reliefweb-subscriptions-footer.html.twig
index 769e2239e..330b8cdcb 100644
--- a/html/modules/custom/reliefweb_subscriptions/templates/reliefweb-subscriptions-footer.html.twig
+++ b/html/modules/custom/reliefweb_subscriptions/templates/reliefweb-subscriptions-footer.html.twig
@@ -4,19 +4,22 @@
  * @file
  * Footer template for the notifications.
  *
+ * Important note: the formmatting of this template and the use of the twig
+ * spaceless indicator `-` are on purpose to ensure a clean conversion to
+ * plain text without excessive line breaks and indentation.
+ *
  * Available variables are:
  * - prefooter: string for prefooter.
  */
 
 #}
-{% if prefooter %}
+{% if prefooter -%}
 <div class="prefooter">
-  {{ prefooter|raw }}
+  {{- prefooter|raw -}}
 </div>
 {% endif %}
-
 <div class="footer">
-  <a class="footer-link" href="{{ url('<front>') }}contact">Feedback</a> | <a class="footer-link" href="@unsubscribe">Unsubscribe</a>
+<a class="footer-link" href="{{ url('<front>') }}contact">Feedback</a> | <a class="footer-link" href="@unsubscribe">Unsubscribe</a>
 
-  <div class="footer-copyright">&copy; {{ 'now'|date('Y') }} ReliefWeb</div>
+<div class="footer-copyright">&copy; {{ 'now'|date('Y') }} ReliefWeb</div>
 </div>
diff --git a/html/modules/custom/reliefweb_subscriptions/templates/reliefweb-subscriptions-header.html.twig b/html/modules/custom/reliefweb_subscriptions/templates/reliefweb-subscriptions-header.html.twig
index f809975f9..a9140b317 100644
--- a/html/modules/custom/reliefweb_subscriptions/templates/reliefweb-subscriptions-header.html.twig
+++ b/html/modules/custom/reliefweb_subscriptions/templates/reliefweb-subscriptions-header.html.twig
@@ -4,6 +4,10 @@
  * @file
  * Header template for the notifications.
  *
+ * Important note: the formmatting of this template and the use of the twig
+ * spaceless indicator `-` are on purpose to ensure a clean conversion to
+ * plain text without excessive line breaks and indentation.
+ *
  * Available variables are:
  * - logo: url of the ReliefWeb logo.
  * - preheader: string for preheader.

From e809b38b9ee4edd9349a9437c5ba3163a41aed20 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 10 Feb 2022 00:02:18 +0000
Subject: [PATCH 453/720] [RW-116] Adjust content of contact emails and make
 them plain text only

---
 .../reliefweb_contact/reliefweb_contact.module       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/html/modules/custom/reliefweb_contact/reliefweb_contact.module b/html/modules/custom/reliefweb_contact/reliefweb_contact.module
index af804ffeb..1e1f788b6 100644
--- a/html/modules/custom/reliefweb_contact/reliefweb_contact.module
+++ b/html/modules/custom/reliefweb_contact/reliefweb_contact.module
@@ -5,6 +5,8 @@
  * Reliefweb contact module.
  */
 
+use Drupal\reliefweb_utility\Helpers\MailHelper;
+
 /**
  * Implements hook_mail_alter().
  */
@@ -31,10 +33,12 @@ function reliefweb_contact_mail_alter(&$message) {
     '@subject' => $contact_message->subject->value,
   ]);
 
-  // Clean body.
-  unset($message['body'][1]);
-  unset($message['body'][2]);
-  $message['body'][3] = check_markup($contact_message->message->value, 'plain_text');
+  // Replace the body from contact_mail() with the entered message content.
+  $message['body'] = [check_markup($contact_message->message->value, 'plain_text')];
+
+  // Plain text only.
+  $message['params']['plaintext'] = MailHelper::getPlainText($message['body']);
+  $message['params']['plain'] = TRUE;
 
   // Set sender headers.
   $message['from'] = $sender;

From e94d223df0b1f3f6326cff20ee8f11be0b57ef5e Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 10 Feb 2022 00:04:33 +0000
Subject: [PATCH 454/720] [RW-227] Add logic for the report publication
 notifications

---
 .../reliefweb_entities.module                 | 23 +++++
 .../reliefweb_entities/src/Entity/Report.php  | 96 ++++++++++++++++++-
 2 files changed, 118 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_entities/reliefweb_entities.module b/html/modules/custom/reliefweb_entities/reliefweb_entities.module
index a6c3b7660..45d17223d 100644
--- a/html/modules/custom/reliefweb_entities/reliefweb_entities.module
+++ b/html/modules/custom/reliefweb_entities/reliefweb_entities.module
@@ -11,6 +11,7 @@ use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\reliefweb_entities\EntityFormAlterServiceBase;
+use Drupal\reliefweb_utility\Helpers\MailHelper;
 use Drupal\reliefweb_utility\Helpers\TaxonomyHelper;
 use Drupal\reliefweb_utility\Helpers\TextHelper;
 use Drupal\taxonomy\TermInterface;
@@ -432,3 +433,25 @@ function reliefweb_entities_entity_presave(EntityInterface $entity) {
     }
   }
 }
+
+/**
+ * Implements hook_mail().
+ *
+ * Populate the subject and body of the message sent after publishing a report.
+ */
+function reliefweb_entities_mail($key, array &$message, array $parameters) {
+  if ($key === 'report_publication_notification') {
+    $message['subject'] = $parameters['subject'];
+    $message['body'][] = $parameters['content'];
+    // Plain text only.
+    $message['params']['plaintext'] = MailHelper::getPlainText($message['body']);
+    $message['params']['plain'] = TRUE;
+    // Use the submit mailbox as sender and add it also as CC to track the
+    // notifications.
+    $submit = \Drupal::state()->get('reliefweb_submit_email');
+    if (!empty($submit)) {
+      $message['headers']['From'] = $submit;
+      $message['headers']['CC'] = $submit;
+    }
+  }
+}
diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Report.php b/html/modules/custom/reliefweb_entities/src/Entity/Report.php
index 09148df33..20500ee9b 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Report.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Report.php
@@ -216,7 +216,7 @@ public function preSave(EntityStorageInterface $storage) {
       $from_ocha = FALSE;
       foreach ($this->field_source as $item) {
         // We don't use a strict equality as tid may be a numeric string...
-        if (!$item->isEmpty() && $item->getValue('target_id') == 1503) {
+        if (!$item->isEmpty() && $item->target_id == 1503) {
           $from_ocha = TRUE;
           break;
         }
@@ -225,6 +225,100 @@ public function preSave(EntityStorageInterface $storage) {
         $this->field_ocha_product->setValue([]);
       }
     }
+
+    // Prepare notifications.
+    $this->preparePublicationNotification();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function postSave(EntityStorageInterface $storage, $update = TRUE) {
+    parent::postSave($storage, $update);
+
+    $this->sendPublicationNotification();
+  }
+
+  /**
+   * Prepare the list of recipients to notify of the publication.
+   */
+  protected function preparePublicationNotification() {
+    // Only send the notifications when the report is published.
+    $status = $this->getModerationStatus();
+    if ($status !== 'to-review' && $status !== 'published') {
+      return;
+    }
+
+    // Extract the emails.
+    $emails = $this->field_notify->value ?? '';
+    $emails = preg_split('/([,;]|\s)+/', trim($emails));
+    $emails = array_filter(filter_var_array($emails, FILTER_VALIDATE_EMAIL));
+    $emails = array_unique($emails);
+
+    // Empty the field.
+    $this->field_notify->setValue([]);
+
+    // Skip if there is no recipients.
+    if (empty($emails)) {
+      return;
+    }
+
+    // Store the emails to notify after the node is saved.
+    $this->_publication_notification_emails = $emails;
+
+    // Update the log message with the list of emails to notify.
+    $log_field = $this->getEntityType()
+      ->getRevisionMetadataKey('revision_log_message');
+
+    // Not using `t()` because this is an internal editorial message.
+    $log = strtr('Publication notification sent to @to', [
+      '@to' => implode(', ', $emails),
+    ]);
+    if (!empty($this->{$log_field}->value)) {
+      $this->{$log_field}->value .= ' - ' . $log;
+    }
+    else {
+      $this->{$log_field}->value = $log;
+    }
+  }
+
+  /**
+   * Notify of the publication.
+   */
+  protected function sendPublicationNotification() {
+    if (empty($this->_publication_notification_emails)) {
+      return;
+    }
+    $emails = $this->_publication_notification_emails;
+    unset($this->_publication_notification_emails);
+
+    // Recipients and sender.
+    $to = implode(', ', $emails);
+    $from = \Drupal::state()->get('reliefweb_submit_email');
+    if (empty($from)) {
+      return;
+    }
+
+    // Subject and content.
+    $parameters = [];
+    $parameters['subject'] = 'ReliefWeb: Your submission has been published';
+    $parameters['content'] = strtr(implode("\n\n", [
+      "Thank you for your submission to ReliefWeb.",
+      "Your submission \"@title\" has been published with the following URL:",
+      "@url",
+      "Please respond to this email in case you have questions or corrections to your submission.",
+      "Best regards,",
+      "ReliefWeb team",
+    ]), [
+      '@title' => $this->label(),
+      '@url' => $this->toUrl('canonical', ['absolute' => TRUE])->toString(FALSE),
+    ]);
+
+    $langcode = \Drupal::languageManager()->getCurrentLanguage()->getId();
+
+    // Send the email.
+    \Drupal::service('plugin.manager.mail')
+      ->mail('reliefweb_entities', 'report_publication_notification', $to, $langcode, $parameters, $from, TRUE);
   }
 
 }

From 34b645008bfd146cfb2e9491f4e3c95160f6034d Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 10 Feb 2022 02:24:22 +0000
Subject: [PATCH 455/720] [RW-327][RW-343] Rework guidelines js and css to
 avoid conflicts and be more robust

---
 .../common_design_subtheme.info.yml           |   5 +-
 .../common_design_subtheme.libraries.yml      |   2 +-
 .../components/rw-form/rw-form.css            |   2 +-
 .../rw-guidelines/rw-guidelines.css           |  64 ++-----
 .../{guidelines-json.js => rw-guidelines.js}  | 163 ++++++++++--------
 5 files changed, 111 insertions(+), 125 deletions(-)
 rename html/themes/custom/common_design_subtheme/components/rw-guidelines/{guidelines-json.js => rw-guidelines.js} (53%)

diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.info.yml b/html/themes/custom/common_design_subtheme/common_design_subtheme.info.yml
index 9ef6870f4..ad740c42c 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.info.yml
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.info.yml
@@ -63,4 +63,7 @@ ckeditor_stylesheets:
 libraries-override:
   guidelines/guidelines-json:
     js:
-      components/guidelines-json/guidelines-json.js: components/rw-guidelines/guidelines-json.js
+      components/guidelines-json/guidelines-json.js: false
+    css:
+      component:
+        components/guidelines-json/guidelines-json.css: false
diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
index c67073343..a5266f124 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
@@ -138,7 +138,7 @@ rw-guidelines:
     theme:
       components/rw-guidelines/rw-guidelines.css: {}
   js:
-    components/rw-guidelines/guidelines-json.js: {}
+    components/rw-guidelines/rw-guidelines.js: {}
   dependencies:
     - common_design_subtheme/rw-icons
 
diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 515c01e8f..8b77c5924 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -484,7 +484,7 @@ form button[data-formatter="pdf"] {
   /* Display the format PDf button in the top right corner above the textarea.
    * The editorial team is used to this position. */
   position: absolute;
-  top: -11px;
+  top: -8px;
   right: 0;
 }
 /* Show/Hide row weight button */
diff --git a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
index 00cd5e1e7..7123d2af2 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
@@ -1,18 +1,17 @@
-form[data-with-guidelines] .form-item label,
-form[data-with-guidelines] .form-wrapper label {
-  float: left;
+form[data-with-guidelines] .rw-guideline__label {
+  display: inline-flex;
+  margin-right: 12px;
 }
-form[data-with-guidelines] .fieldset-wrapper label,
-form[data-with-guidelines] label.option {
-  float: none;
+form[data-with-guidelines] .rw-guideline__label.form-required {
+  margin-right: 8px;
 }
-form[data-with-guidelines] button[data-guideline] {
+form[data-with-guidelines] .rw-guideline__open-button {
   position: relative;
   display: inline-block;
   overflow: hidden;
   width: 20px;
   height: 20px;
-  margin: -0.75rem 0 0 0.5rem;
+  margin: -4px 0 0 0;
   padding: 0 0 0 12px;
   vertical-align: middle;
   border: 4px solid var(--cd-reliefweb-brand-grey--light);
@@ -20,28 +19,7 @@ form[data-with-guidelines] button[data-guideline] {
   background: var(--rw-icons--common--help--12--dark-blue);
   background-color: var(--cd-reliefweb-brand-grey--light);
 }
-/* Legend with child button */
-form[data-with-guidelines] legend button[data-guideline] {
-  margin: -0.75rem 0 0 0.5rem;
-}
-form[data-with-guidelines] .form-required button[data-guideline] {
-  margin: 0 0 0 0.5rem;
-}
-form[data-with-guidelines] legend .form-required button[data-guideline] {
-  order: 1;
-}
-/* Label followed by button */
-form[data-with-guidelines] label + button[data-guideline],
-form[data-with-guidelines] .form-required + button[data-guideline] {
-  margin: -0.75rem 0 0;
-}
-form[data-with-guidelines] label.option + button[data-guideline] {
-  margin: -0.5rem 0 0;
-}
-form[data-with-guidelines] .visually-hidden + button[data-guideline] {
-  margin: -0.75rem 0 0 0.5rem;
-}
-form[data-with-guidelines] button[data-guideline]:hover {
+form[data-with-guidelines] .rw-guideline__open-button:hover {
   background: var(--rw-icons--common--help--12--dark-red);
   background-color: var(--cd-reliefweb-brand-grey--light);
 }
@@ -59,7 +37,7 @@ form[data-with-guidelines] .rw-guideline:before {
 }
 form[data-with-guidelines] .rw-guideline {
   position: fixed;
-  z-index: 1;
+  z-index: 10000;
   top: 10vh;
   left: 25vw;
   width: 50vw;
@@ -68,7 +46,7 @@ form[data-with-guidelines] .rw-guideline {
   border: 10px solid rgba(0, 0, 0, 0.1);
 }
 
-form[data-with-guidelines] .rw-guideline > button[value="close"] {
+form[data-with-guidelines] .rw-guideline .rw-guideline__close-button {
   position: absolute;
   z-index: 10002;
   top: -16px;
@@ -81,7 +59,7 @@ form[data-with-guidelines] .rw-guideline > button[value="close"] {
   border-radius: 50%;
   background: white;
 }
-form[data-with-guidelines] .rw-guideline > button[value="close"]:after {
+form[data-with-guidelines] .rw-guideline .rw-guideline__close-button:after {
   position: absolute;
   top: 6px;
   left: 6px;
@@ -91,13 +69,13 @@ form[data-with-guidelines] .rw-guideline > button[value="close"]:after {
   content: "";
   background: var(--rw-icons--common--close--12--dark-blue);
 }
-form[data-with-guidelines] .rw-guideline > button[value="close"]:hover {
+form[data-with-guidelines] .rw-guideline .rw-guideline__close-button:hover {
   border-color: var(--cd-reliefweb-brand-red--dark);
 }
-form[data-with-guidelines] .rw-guideline > button[value="close"]:hover:after {
+form[data-with-guidelines] .rw-guideline .rw-guideline__close-button:hover:after {
   background: var(--rw-icons--common--close--12--dark-red);
 }
-form[data-with-guidelines] .rw-guideline > div {
+form[data-with-guidelines] .rw-guideline__container {
   position: relative;
   z-index: 10001;
   overflow-x: hidden;
@@ -107,20 +85,12 @@ form[data-with-guidelines] .rw-guideline > div {
   padding: 16px;
   background-color: white;
 }
-form[data-with-guidelines] .rw-guideline > div > h3 {
+form[data-with-guidelines] .rw-guideline__heading {
   text-align: center;
 }
-form[data-with-guidelines] .rw-guideline > div > .content {
+form[data-with-guidelines] .rw-guideline__content {
   padding-top: 0;
 }
-form[data-with-guidelines] .rw-guideline > div > .rw-guideline__content img {
+form[data-with-guidelines] .rw-guideline__content img {
   border: 4px solid var(--cd-reliefweb-brand-grey--light);
 }
-
-/* Clear the float on preceding label
-/* to prevent extra height on the autocomplete div */
-form[data-with-guidelines] .rw-autocomplete--with-show-all,
-/* to ensure the WYSIWYG clears float */
-form[data-with-guidelines] button[data-guideline] + div {
-  clear: both;
-}
diff --git a/html/themes/custom/common_design_subtheme/components/rw-guidelines/guidelines-json.js b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.js
similarity index 53%
rename from html/themes/custom/common_design_subtheme/components/rw-guidelines/guidelines-json.js
rename to html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.js
index 5c54cce22..44f0afece 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-guidelines/guidelines-json.js
+++ b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.js
@@ -14,70 +14,34 @@
 
       var t = Drupal.t;
 
-      /**
-       * Helpers.
-       */
-
-      // Trim a string.
-      function trim(string) {
-        if (typeof string.trim === 'function') {
-          return string.trim();
-        }
-        return string.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '');
-      }
-
       /**
        * Main logic.
        */
 
-      // Get the list of label/legend elements.
-      function getLabelElements(form) {
-        var labels = {};
-
-        // Search for field labels to which attach the guideline toggler.
-        var elements = form.querySelectorAll('fieldset[data-drupal-selector], div[data-drupal-selector]');
-        for (var i = 0, l = elements.length; i < l; i++) {
-          var element = elements[i];
-          if (!element.querySelector('[name]')) {
-            continue;
-          }
-
-          var fieldName = element.querySelector('[name]').name;
-          if (fieldName.indexOf('[') > 0) {
-            fieldName = fieldName.substring(0, fieldName.indexOf('['));
-          }
-
-          var label = '';
-          var labelElement = element.querySelector('label, legend');
-          if (labelElement) {
-            label = trim(labelElement.textContent || labelElement.innerText);
-          }
-
-          labels[fieldName] = {
-            element: element,
-            label: label
-          };
-        }
-        return labels;
-      }
-
       // Remove guidelines elements from the form.
-      function cleanGuidelines(form, popupOnly) {
+      function cleanGuidelines(form, removeButtons, removeLabelClasses) {
         var selector = '.rw-guideline';
 
-        if (!popupOnly) {
-          selector += ', [data-guideline]';
+        if (removeButtons) {
+          selector += ', .rw-guideline__open-button';
         }
         var elements = form.querySelectorAll(selector);
         for (var i = elements.length - 1; i >= 0; i--) {
           var element = elements[i];
           element.parentNode.removeChild(element);
         }
+
+        if (removeLabelClasses) {
+          var elements = form.querySelectorAll('.rw-guideline__label');
+          for (var i = elements.length - 1; i >= 0; i--) {
+            elements[i].classList.remove('.rw-guideline__label');
+          }
+        }
       }
 
       // Hide the guideline popup.
       function hideGuideline(form) {
-        cleanGuidelines(form, true);
+        cleanGuidelines(form, false, false);
       }
 
       // Show the guideline popup.
@@ -87,6 +51,7 @@
         var close = document.createElement('button');
         close.setAttribute('type', 'button');
         close.setAttribute('value', 'close');
+        close.classList.add('rw-guideline__close-button');
         close.appendChild(document.createTextNode(t('Close')));
         close.addEventListener('click', function (event) {
           hideGuideline(form);
@@ -104,18 +69,20 @@
         link.appendChild(document.createTextNode(card.title));
 
         var heading = document.createElement('h3');
+        heading.classList.add('rw-guideline__heading');
         heading.appendChild(link);
 
         var content = document.createElement('div');
-        content.className = 'rw-guideline__content';
+        content.classList.add('rw-guideline__content');
         content.innerHTML = card.content;
 
         var container = document.createElement('div');
+        container.classList.add('rw-guideline__container');
         container.appendChild(heading);
         container.appendChild(content);
 
         var popup = document.createElement('div');
-        popup.className = 'rw-guideline';
+        popup.classList.add('rw-guideline');
         popup.appendChild(close);
         popup.appendChild(container);
 
@@ -152,38 +119,84 @@
       // Add the guidelines to the page with a question mark icon to trigger the display.
       function setGuidelines(form, guidelines) {
         // Remove the existing guidelines from the page if any.
-        cleanGuidelines(form);
-
-        // Add a guideline toggler to each label element.
-        var list = getLabelElements(form);
-        for (var field in list) {
-          if (list.hasOwnProperty(field) && guidelines.hasOwnProperty(field)) {
-            var item = list[field];
-            var element = item.element;
-            var label = item.label;
-
-            var button = document.createElement('button');
-            button.setAttribute('type', 'button');
-            button.setAttribute('data-guideline', field);
-            button.appendChild(document.createTextNode(t('View guidelines for ' + label)));
-
-            button.addEventListener('click', function (event) {
-              showGuideline(form, guidelines[event.target.getAttribute('data-guideline')]);
-            });
-
-            // Drupal fields with either Legend or Label element ancestors.
-            const labels = element.querySelectorAll('.form-wrapper .form-item > label');
-            for (let i = 0; i < labels.length; i++) {
-              labels[i].parentNode.insertBefore(button, labels[i].nextSibling);
+        cleanGuidelines(form, true, true);
+
+        for (var fieldName in guidelines) {
+          if (guidelines.hasOwnProperty(fieldName)) {
+            var selector = 'edit-' + fieldName.replaceAll('_', '-');
+
+            var field = document.querySelector('[data-drupal-selector="' + selector + '"], [name^="' + fieldName + '["]');
+            if (!field) {
+              continue;
+            }
+
+            // Try to get the classic label associated with the field.
+            var label = null;
+            if (field.nodeName === 'FIELDSET') {
+              label = field.querySelector('.fieldset-legend');
             }
-            const legends = element.querySelectorAll('[data-drupal-selector] > legend > span');
-            for (let j = 0; j < legends.length; j++) {
-              legends[j].appendChild(button);
+            else if (field.hasAttribute('id')) {
+              label = document.querySelector('label[for="' + field.getAttribute('id') + '"]');
+            }
+
+            // If the label is visually hidden, we need to find another one.
+            if (label && label.classList.contains('visually-hidden')) {
+              label = null;
+
+              // Try to find a suitable label or legend among the field's
+              // parents.
+              var parent = field.parentNode;
+              while (parent && parent !== form) {
+                var candidate = null;
+                if (parent.hasAttribute('data-drupal-selector') && parent.getAttribute('data-drupal-selector') === selector + '-wrapper') {
+                  candidate = parent.querySelector('.fieldset-legend, label');
+                }
+                else if (parent.nodeName === 'FIELDSET') {
+                  candidate = parent.querySelector('.fieldset-legend, legend');
+                }
+                if (candidate && !candidate.classList.contains('visually-hidden')) {
+                  label = candidate;
+                  break;
+                }
+                parent = parent.parentNode;
+              }
+            }
+
+            if (label) {
+              addGuidelineOpenButton(fieldName, label, form, guidelines[fieldName]);
             }
           }
         }
       }
 
+      // Add the button to open the guideline popup next to a field's label.
+      function addGuidelineOpenButton(fieldName, label, form, guideline) {
+        var labelText = label.textContent.trim();
+
+        var button = document.createElement('button');
+        button.setAttribute('type', 'button');
+        button.setAttribute('data-guideline', fieldName);
+        button.classList.add('rw-guideline__open-button');
+        button.appendChild(document.createTextNode(t('View guidelines for ' + labelText)));
+
+        button.addEventListener('click', function (event) {
+          showGuideline(form, guideline);
+        });
+
+        // Wrap the legend into a span so we can have consistent behavior.
+        if (label.nodeName === 'LEGEND') {
+          var container = document.createElement('span');
+          while (label.firstChild) {
+            container.appendChild(label.firstChild);
+          }
+          label.appendChild(container);
+          label = container;
+        }
+
+        label.classList.add('rw-guideline__label');
+        label.parentNode.insertBefore(button, label.nextSibling);
+      }
+
       // Either load the guidelines from the guidelines site or use the cache.
       function loadGuidelines(form) {
         var entityId = form.getAttribute('data-guidelines-entity-type');

From 36a5f3d22ba71a189407ac4cb689b5a276767bd2 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 10 Feb 2022 05:34:25 +0000
Subject: [PATCH 456/720] [RW-373][374] Fix saving disasters as archived, fix
 redirection after creating terms and reorganize code for job/training status
 update based on user posting rights

---
 .../reliefweb_entities/src/DocumentTrait.php  |  2 +-
 .../reliefweb_entities/src/Entity/Job.php     |  8 +-
 .../src/Entity/Training.php                   | 16 +++-
 .../src/EntityFormAlterServiceBase.php        | 80 +++++++++++++++--
 .../src/OpportunityDocumentInterface.php      | 10 +++
 .../src/OpportunityDocumentTrait.php          | 86 +++++++++++++++++++
 .../src/Services/CountryFormAlter.php         |  3 -
 .../src/Services/DisasterFormAlter.php        | 12 +--
 .../src/Services/JobFormAlter.php             |  3 +
 .../src/Services/ReportFormAlter.php          | 56 ++----------
 .../src/Services/SourceFormAlter.php          |  3 -
 .../src/Services/TrainingFormAlter.php        |  3 +
 .../src/ModerationServiceBase.php             | 36 ++++----
 .../src/ModerationServiceInterface.php        | 10 ---
 .../src/Services/DisasterModeration.php       |  6 +-
 .../src/Services/JobModeration.php            | 69 ---------------
 .../src/Services/TrainingModeration.php       | 69 ---------------
 17 files changed, 231 insertions(+), 241 deletions(-)
 create mode 100644 html/modules/custom/reliefweb_entities/src/OpportunityDocumentInterface.php
 create mode 100644 html/modules/custom/reliefweb_entities/src/OpportunityDocumentTrait.php

diff --git a/html/modules/custom/reliefweb_entities/src/DocumentTrait.php b/html/modules/custom/reliefweb_entities/src/DocumentTrait.php
index f54f1fd83..1ea71c377 100644
--- a/html/modules/custom/reliefweb_entities/src/DocumentTrait.php
+++ b/html/modules/custom/reliefweb_entities/src/DocumentTrait.php
@@ -14,7 +14,7 @@
 /**
  * Trait implementing most methods of the DocumentInterface.
  *
- * @see Drupal\reliefweb_entities\DocuemntInterface
+ * @see Drupal\reliefweb_entities\DocumentInterface
  */
 trait DocumentTrait {
 
diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Job.php b/html/modules/custom/reliefweb_entities/src/Entity/Job.php
index dc2325a74..01675fdd3 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Job.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Job.php
@@ -8,6 +8,8 @@
 use Drupal\reliefweb_entities\BundleEntityInterface;
 use Drupal\reliefweb_entities\DocumentInterface;
 use Drupal\reliefweb_entities\DocumentTrait;
+use Drupal\reliefweb_entities\OpportunityDocumentInterface;
+use Drupal\reliefweb_entities\OpportunityDocumentTrait;
 use Drupal\reliefweb_moderation\EntityModeratedInterface;
 use Drupal\reliefweb_moderation\EntityModeratedTrait;
 use Drupal\reliefweb_revisions\EntityRevisionedInterface;
@@ -16,11 +18,12 @@
 /**
  * Bundle class for job nodes.
  */
-class Job extends Node implements BundleEntityInterface, EntityModeratedInterface, EntityRevisionedInterface, DocumentInterface {
+class Job extends Node implements BundleEntityInterface, EntityModeratedInterface, EntityRevisionedInterface, DocumentInterface, OpportunityDocumentInterface {
 
   use DocumentTrait;
   use EntityModeratedTrait;
   use EntityRevisionedTrait;
+  use OpportunityDocumentTrait;
   use StringTranslationTrait;
 
   /**
@@ -128,6 +131,9 @@ public function preSave(EntityStorageInterface $storage) {
       $this->set('field_theme', $themes);
     }
 
+    // Update the entity status based on the user posting rights.
+    $this->updateModerationStatusFromPostingRights();
+
     parent::preSave($storage);
   }
 
diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Training.php b/html/modules/custom/reliefweb_entities/src/Entity/Training.php
index 9dcf5a44e..522f08b59 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Training.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Training.php
@@ -2,11 +2,14 @@
 
 namespace Drupal\reliefweb_entities\Entity;
 
+use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\node\Entity\Node;
 use Drupal\reliefweb_entities\BundleEntityInterface;
 use Drupal\reliefweb_entities\DocumentInterface;
 use Drupal\reliefweb_entities\DocumentTrait;
+use Drupal\reliefweb_entities\OpportunityDocumentInterface;
+use Drupal\reliefweb_entities\OpportunityDocumentTrait;
 use Drupal\reliefweb_moderation\EntityModeratedInterface;
 use Drupal\reliefweb_moderation\EntityModeratedTrait;
 use Drupal\reliefweb_revisions\EntityRevisionedInterface;
@@ -17,11 +20,12 @@
 /**
  * Bundle class for training nodes.
  */
-class Training extends Node implements BundleEntityInterface, EntityModeratedInterface, EntityRevisionedInterface, DocumentInterface {
+class Training extends Node implements BundleEntityInterface, EntityModeratedInterface, EntityRevisionedInterface, DocumentInterface, OpportunityDocumentInterface {
 
   use DocumentTrait;
   use EntityModeratedTrait;
   use EntityRevisionedTrait;
+  use OpportunityDocumentTrait;
   use StringTranslationTrait;
 
   /**
@@ -93,4 +97,14 @@ public function getEntityMeta() {
     ];
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function preSave(EntityStorageInterface $storage) {
+    // Update the entity status based on the user posting rights.
+    $this->updateModerationStatusFromPostingRights();
+
+    parent::preSave($storage);
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php b/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
index 758839c94..a2e19ac50 100644
--- a/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
+++ b/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
@@ -114,6 +114,11 @@ public function alterForm(array &$form, FormStateInterface $form_state) {
     // Mark the form for enhancement by the reliefweb_form module.
     $form['#attributes']['data-enhanced'] = '';
 
+    // Remove the "save and go to list" submit button on term pages.
+    if (isset($form['actions']['overview'])) {
+      $form['actions']['overview']['#access'] = FALSE;
+    }
+
     // Get what entity form is being used.
     $operation = $form_state->getFormObject()?->getOperation() ?? 'default';
 
@@ -826,6 +831,69 @@ public function validateSelectionLimit(array $element, FormStateInterface $form_
     }
   }
 
+  /**
+   * Prevent saving a document from a blocked source.
+   *
+   * @param array $form
+   *   Form to alter.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   Form state.
+   */
+  public function validateBlockedSource(array $form, FormStateInterface &$form_state) {
+    $ids = [];
+    foreach ($form_state->getValue('field_source', []) as $item) {
+      if (!empty($item['target_id'])) {
+        $ids[] = $item['target_id'];
+      }
+    }
+
+    if (!empty($ids)) {
+      $entity_type_manager = $this->getEntityTypeManager();
+
+      $taxonomy_term_entity_type = $entity_type_manager
+        ->getStorage('taxonomy_term')
+        ->getEntityType();
+
+      $table = $taxonomy_term_entity_type->getDataTable();
+      $id_field = $taxonomy_term_entity_type->getKey('id');
+      $label_field = $taxonomy_term_entity_type->getKey('label');
+
+      // Retrieve the labels of the selected blocked sources if any.
+      $sources = $this->getDatabase()
+        ->select($table, $table)
+        ->fields($table, [$label_field])
+        ->condition($table . '.' . $id_field, $ids, 'IN')
+        ->condition($table . '.moderation_status', 'blocked', '=')
+        ->execute()
+        ?->fetchCol() ?? [];
+
+      if (!empty($sources)) {
+        $form_state->setErrorByName('field_source', $this->t('Publications from "@sources" are not allowed.', [
+          '@sources' => implode('", "', $sources),
+        ]));
+      }
+    }
+  }
+
+  /**
+   * Add a checkbox to disable notifications.
+   *
+   * @param array $form
+   *   The entity form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   Form state.
+   */
+  protected function addDisableNotifications(array &$form, FormStateInterface $form_state) {
+    // Add a checkbox to disable the notifications.
+    $status = $form_state->getFormObject()?->getEntity()?->getModerationStatus();
+    $form['notifications_content_disable'] = [
+      '#type' => 'checkbox',
+      '#title' => $this->t('Disable notifications'),
+      '#default_value' => !empty($status) && $status !== 'draft',
+    ];
+    $form['#submit'][] = [$this, 'setDisabledNotifications'];
+  }
+
   /**
    * Check if the form action is to show the preview.
    *
@@ -869,17 +937,19 @@ protected function setEntityModerationStatus($status, FormStateInterface $form_s
   }
 
   /**
-   * Redirect to the entity page.
+   * Disable the notifications if instructed so.
    *
    * @param array $form
    *   Form.
    * @param \Drupal\Core\Form\FormStateInterface $form_state
    *   Form state.
    */
-  public function redirectToEntityPage(array $form, FormStateInterface $form_state) {
-    $entity = $form_state->getFormObject()?->getEntity();
-    if (!empty($entity) && empty($entity->in_preview) && $entity->id() !== NULL) {
-      $form_state->setRedirectUrl($entity->toUrl());
+  public function setDisabledNotifications(array $form, FormStateInterface $form_state) {
+    if (!empty($form_state->getValue('notifications_content_disable'))) {
+      $entity = $form_state->getFormObject()?->getEntity();
+      if (is_object($entity)) {
+        $entity->notifications_content_disable = TRUE;
+      }
     }
   }
 
diff --git a/html/modules/custom/reliefweb_entities/src/OpportunityDocumentInterface.php b/html/modules/custom/reliefweb_entities/src/OpportunityDocumentInterface.php
new file mode 100644
index 000000000..b6619b04a
--- /dev/null
+++ b/html/modules/custom/reliefweb_entities/src/OpportunityDocumentInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Drupal\reliefweb_entities;
+
+/**
+ * Interface for the opportunity document entities like jobs and training.
+ */
+interface OpportunityDocumentInterface {
+
+}
diff --git a/html/modules/custom/reliefweb_entities/src/OpportunityDocumentTrait.php b/html/modules/custom/reliefweb_entities/src/OpportunityDocumentTrait.php
new file mode 100644
index 000000000..ebd171810
--- /dev/null
+++ b/html/modules/custom/reliefweb_entities/src/OpportunityDocumentTrait.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace Drupal\reliefweb_entities;
+
+use Drupal\reliefweb_moderation\Helpers\UserPostingRightsHelper;
+use Drupal\reliefweb_utility\Helpers\TaxonomyHelper;
+use Drupal\reliefweb_utility\Helpers\UserHelper;
+
+/**
+ * Trait for "opportunity" documents like jobs and training.
+ *
+ * @see Drupal\reliefweb_entities\DocuemntInterface
+ */
+trait OpportunityDocumentTrait {
+
+  /**
+   * Update the status for the entity based on the user posting rights.
+   */
+  protected function updateModerationStatusFromPostingRights() {
+    $user = $this->getRevisionUser();
+    $status = $this->getModerationStatus();
+
+    // For non editors, we determine the real status based on the user
+    // posting rights for the selected sources.
+    if (!UserHelper::userHasRoles(['editor']) && $status === 'pending') {
+      // Retrieve the list of sources and check the user rights.
+      if (!$this->field_source->isEmpty()) {
+        // Extract source ids.
+        $sources = [];
+        foreach ($this->field_source as $item) {
+          if (!empty($item->target_id)) {
+            $sources[] = $item->target_id;
+          }
+        }
+
+        // Get the user's posting right for the document.
+        $right = UserPostingRightsHelper::getUserConsolidatedPostingRight($user, $this->bundle(), $sources);
+
+        // Update the status based on the user's right.
+        // Note: we don't use `t()` because those are log messages for editors.
+        switch ($right['name']) {
+          // Unverified for some sources => pending + flag.
+          case 'unverified':
+            $status = 'pending';
+            $message = strtr('Unverified user for @sources.', [
+              '@sources' => implode(', ', TaxonomyHelper::getSourceShortnames($right['sources'])),
+            ]);
+            break;
+
+          // Blocked for some sources => refused + flag.
+          case 'blocked':
+            $status = 'refused';
+            $message = strtr('Blocked user for @sources.', [
+              '@sources' => implode(', ', TaxonomyHelper::getSourceShortnames($right['sources'])),
+            ]);
+            break;
+
+          // Allowed for all sources => pending.
+          case 'allowed':
+            $status = 'pending';
+            break;
+
+          // Trusted for all the sources => published.
+          case 'trusted':
+            $status = 'published';
+            break;
+        }
+
+        $this->setModerationStatus($status);
+
+        // Update the log message.
+        if (!empty($message)) {
+          $revision_log_field = $this->getEntityType()
+            ->getRevisionMetadataKey('revision_log_message');
+
+          if (!empty($revision_log_field)) {
+            $log = trim($this->{$revision_log_field}->value ?? '');
+            $log = $message . (!empty($log) ? ' ' . $log : '');
+            $this->{$revision_log_field}->value = $log;
+          }
+        }
+      }
+    }
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_entities/src/Services/CountryFormAlter.php b/html/modules/custom/reliefweb_entities/src/Services/CountryFormAlter.php
index b364a250b..c7da9bc67 100644
--- a/html/modules/custom/reliefweb_entities/src/Services/CountryFormAlter.php
+++ b/html/modules/custom/reliefweb_entities/src/Services/CountryFormAlter.php
@@ -16,9 +16,6 @@ class CountryFormAlter extends EntityFormAlterServiceBase {
   protected function addBundleFormAlterations(array &$form, FormStateInterface $form_state) {
     // Hide term relations as they are not used.
     $form['relations']['#access'] = FALSE;
-
-    // Redirect to term page.
-    $form['#submit'][] = [$this, 'redirectToEntityPage'];
   }
 
 }
diff --git a/html/modules/custom/reliefweb_entities/src/Services/DisasterFormAlter.php b/html/modules/custom/reliefweb_entities/src/Services/DisasterFormAlter.php
index 3ee67c95a..728663c6c 100644
--- a/html/modules/custom/reliefweb_entities/src/Services/DisasterFormAlter.php
+++ b/html/modules/custom/reliefweb_entities/src/Services/DisasterFormAlter.php
@@ -19,8 +19,6 @@ class DisasterFormAlter extends EntityFormAlterServiceBase {
    * {@inheritdoc}
    */
   protected function addBundleFormAlterations(array &$form, FormStateInterface $form_state) {
-    $entity = $form_state->getFormObject()->getEntity();
-
     // Hide term relations as they are not used.
     $form['relations']['#access'] = FALSE;
 
@@ -42,12 +40,7 @@ protected function addBundleFormAlterations(array &$form, FormStateInterface $fo
     $form['field_primary_disaster_type']['#attributes']['data-with-autocomplete'] = 'primary';
 
     // Add a checkbox to disable the notifications.
-    $status = $entity->getModerationStatus();
-    $form['notifications_content_disable'] = [
-      '#type' => 'checkbox',
-      '#title' => $this->t('Disable notifications'),
-      '#default_value' => !empty($status) && $status !== 'draft',
-    ];
+    $this->addDisableNotifications($form, $form_state);
 
     // Limit form for External disaster managers who are not Editors.
     if (UserHelper::userHasRoles(['external_disaster_manager'])) {
@@ -64,9 +57,6 @@ protected function addBundleFormAlterations(array &$form, FormStateInterface $fo
     // Validate the disaster GLIDE number and check for duplicates.
     $form['#validate'][] = [$this, 'validateGlidePattern'];
     $form['#validate'][] = [$this, 'validateGlideUniqueness'];
-
-    // Redirect to term page.
-    $form['#submit'][] = [$this, 'redirectToEntityPage'];
   }
 
   /**
diff --git a/html/modules/custom/reliefweb_entities/src/Services/JobFormAlter.php b/html/modules/custom/reliefweb_entities/src/Services/JobFormAlter.php
index 3e28e99e1..abbb3fbac 100644
--- a/html/modules/custom/reliefweb_entities/src/Services/JobFormAlter.php
+++ b/html/modules/custom/reliefweb_entities/src/Services/JobFormAlter.php
@@ -72,6 +72,9 @@ protected function addBundleFormAlterations(array &$form, FormStateInterface $fo
 
     // Add the terms and conditions block.
     $this->addTermsAndConditions($form, $form_state);
+
+    // Prevent saving from a blocked source.
+    $form['#validate'][] = [$this, 'validateBlockedSource'];
   }
 
   /**
diff --git a/html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php b/html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php
index 45a26a5a2..64aec63e4 100644
--- a/html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php
+++ b/html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php
@@ -78,10 +78,12 @@ protected function addBundleFormAlterations(array &$form, FormStateInterface $fo
     // Remove Complex Emergency (41764) option for disaster type field.
     FormHelper::removeOptions($form, 'field_disaster_type', [41764]);
 
-    // Add validation callbacks for the file, source and embargo date fields.
+    // Add validation callbacks for the file and embargo date fields.
     $form['#validate'][] = [$this, 'validateAttachment'];
-    $form['#validate'][] = [$this, 'validateSource'];
     $form['#validate'][] = [$this, 'validateEmbargoDate'];
+
+    // Prevent saving from a blocked source.
+    $form['#validate'][] = [$this, 'validateBlockedSource'];
   }
 
   /**
@@ -310,55 +312,7 @@ public function validateAttachment(array $form, FormStateInterface &$form_state)
   }
 
   /**
-   * Validate the file field.
-   *
-   * Prevent saving a document from a blocked source.
-   *
-   * @param array $form
-   *   Form to alter.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   Form state.
-   *
-   * @todo Extends that to jobs and training.
-   */
-  public function validateSource(array $form, FormStateInterface &$form_state) {
-    $ids = [];
-    foreach ($form_state->getValue('field_source', []) as $item) {
-      if (!empty($item['target_id'])) {
-        $ids[] = $item['target_id'];
-      }
-    }
-
-    if (!empty($ids)) {
-      $entity_type_manager = $this->getEntityTypeManager();
-
-      $taxonomy_term_entity_type = $entity_type_manager
-        ->getStorage('taxonomy_term')
-        ->getEntityType();
-
-      $table = $taxonomy_term_entity_type->getDataTable();
-      $id_field = $taxonomy_term_entity_type->getKey('id');
-      $label_field = $taxonomy_term_entity_type->getKey('label');
-
-      // Retrieve the labels of the selected blocked sources if any.
-      $sources = $this->getDatabase()
-        ->select($table, $table)
-        ->fields($table, [$label_field])
-        ->condition($table . '.' . $id_field, $ids, 'IN')
-        ->condition($table . '.moderation_status', 'blocked', '=')
-        ->execute()
-        ?->fetchCol() ?? [];
-
-      if (!empty($sources)) {
-        $form_state->setErrorByName('field_source', $this->t('Publications from "@sources" are not allowed.', [
-          '@sources' => implode('", "', $sources),
-        ]));
-      }
-    }
-  }
-
-  /**
-   * Validate the source field.
+   * Validate the embargo date field.
    *
    * Embargo date cannot be in the past as that would not make sense.
    *
diff --git a/html/modules/custom/reliefweb_entities/src/Services/SourceFormAlter.php b/html/modules/custom/reliefweb_entities/src/Services/SourceFormAlter.php
index 81fc74c6e..f5a4d2fdb 100644
--- a/html/modules/custom/reliefweb_entities/src/Services/SourceFormAlter.php
+++ b/html/modules/custom/reliefweb_entities/src/Services/SourceFormAlter.php
@@ -32,9 +32,6 @@ protected function addBundleFormAlterations(array &$form, FormStateInterface $fo
 
     // Validate social media links.
     $form['#validate'][] = [$this, 'validateSourceSocialMediaLinks'];
-
-    // Redirect to term page.
-    $form['#submit'][] = [$this, 'redirectToEntityPage'];
   }
 
   /**
diff --git a/html/modules/custom/reliefweb_entities/src/Services/TrainingFormAlter.php b/html/modules/custom/reliefweb_entities/src/Services/TrainingFormAlter.php
index e080fc218..f637a5ea0 100644
--- a/html/modules/custom/reliefweb_entities/src/Services/TrainingFormAlter.php
+++ b/html/modules/custom/reliefweb_entities/src/Services/TrainingFormAlter.php
@@ -83,6 +83,9 @@ protected function addBundleFormAlterations(array &$form, FormStateInterface $fo
 
     // Add a validation callback to handle the altered fields above.
     $form['#validate'][] = [$this, 'validateTrainingEventUrl'];
+
+    // Prevent saving from a blocked source.
+    $form['#validate'][] = [$this, 'validateBlockedSource'];
   }
 
   /**
diff --git a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
index f741cc5f6..2c8a3243b 100644
--- a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
+++ b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
@@ -243,7 +243,7 @@ public function entityPresave(EntityModeratedInterface $entity) {
       $this->disableNotifications($entity, $status);
 
       // Disable notifications for buried entities.
-      if ($entity->hasField('field_bury') && !$entity->field_bury->isEmpty()) {
+      if ($entity->hasField('field_bury') && !empty($entity->field_bury->value)) {
         $entity->notifications_content_disable = TRUE;
       }
     }
@@ -403,7 +403,6 @@ public function alterEntityForm(array &$form, FormStateInterface $form_state) {
 
     // Disable the moderation status widget and the default submit buttons.
     $form['actions']['submit']['#access'] = FALSE;
-    $form['actions']['overview']['#access'] = FALSE;
 
     // Move the preview button at the beginning if it exists.
     if (isset($form['actions']['preview'])) {
@@ -419,9 +418,8 @@ public function alterEntityForm(array &$form, FormStateInterface $form_state) {
       $submit_handlers = array_merge($submit_handlers, $form['actions']['submit']['#submit']);
     }
 
-    // Add submit handler at the end to finalize the selection of the status
-    // based on the rest of the submitted data.
-    $submit_handlers[] = [$this, 'handleEntitySubmission'];
+    // Try to redirect to the entity page after submitting the form.
+    $submit_handlers[] = [$this, 'redirectToEntityPage'];
 
     // Add the buttons.
     foreach ($this->getEntityFormSubmitButtons($status, $entity) as $status => $info) {
@@ -445,26 +443,34 @@ public function alterEntityForm(array &$form, FormStateInterface $form_state) {
   public function validateEntityStatus(array $element, FormStateInterface $form_state) {
     $triggering_element = $form_state->getTriggeringElement();
     if (isset($triggering_element['#entity_status']) && $triggering_element['#entity_status'] === $element['#entity_status']) {
-      $form_state->setValue(['moderation_status', 0, 'value'], $element['#entity_status']);
+      // Alter the status from the button. This is useful notably for disasters
+      // because we use a single 'archive' button and the status is derived
+      // from the previous status of the disaster.
+      $status = $this->alterSubmittedEntityStatus($element['#entity_status'], $form_state);
+      $form_state->setValue(['moderation_status', 0, 'value'], $status);
     }
   }
 
   /**
    * {@inheritdoc}
    */
-  public function handleEntitySubmission(array $form, FormStateInterface $form_state) {
-    // Alter the status based on the rest of the submitted form.
-    // @todo review if that should not be done in the entity presave instead.
-    $status = $form_state->getValue(['moderation_status', 0, 'value']);
-    $status = $this->alterSubmittedEntityStatus($status, $form_state);
-    $form_state->setValue(['moderation_status', 0, 'value'], $status);
+  public function alterSubmittedEntityStatus($status, FormStateInterface $form_state) {
+    return $status;
   }
 
   /**
-   * {@inheritdoc}
+   * Redirect to the entity page.
+   *
+   * @param array $form
+   *   Form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   Form state.
    */
-  public function alterSubmittedEntityStatus($status, FormStateInterface $form_state) {
-    return $status;
+  public function redirectToEntityPage(array $form, FormStateInterface $form_state) {
+    $entity = $form_state->getFormObject()?->getEntity();
+    if (!empty($entity) && empty($entity->in_preview) && $entity->id() !== NULL) {
+      $form_state->setRedirectUrl($entity->toUrl());
+    }
   }
 
   /**
diff --git a/html/modules/custom/reliefweb_moderation/src/ModerationServiceInterface.php b/html/modules/custom/reliefweb_moderation/src/ModerationServiceInterface.php
index d1facd02d..b2610f04f 100644
--- a/html/modules/custom/reliefweb_moderation/src/ModerationServiceInterface.php
+++ b/html/modules/custom/reliefweb_moderation/src/ModerationServiceInterface.php
@@ -182,16 +182,6 @@ public function alterEntityForm(array &$form, FormStateInterface $form_state);
    */
   public function validateEntityStatus(array $element, FormStateInterface $form_state);
 
-  /**
-   * Submit handler to alter the moderation status.
-   *
-   * @param array $form
-   *   Entity form.
-   * @param \Drupal\Core\Form\FormStateInterface $form_state
-   *   Form state.
-   */
-  public function handleEntitySubmission(array $form, FormStateInterface $form_state);
-
   /**
    * Get the final entity status based on the rest of the form.
    *
diff --git a/html/modules/custom/reliefweb_moderation/src/Services/DisasterModeration.php b/html/modules/custom/reliefweb_moderation/src/Services/DisasterModeration.php
index 1fde55037..126866956 100644
--- a/html/modules/custom/reliefweb_moderation/src/Services/DisasterModeration.php
+++ b/html/modules/custom/reliefweb_moderation/src/Services/DisasterModeration.php
@@ -284,8 +284,10 @@ public function hasStatus($status) {
    * {@inheritdoc}
    */
   public function disableNotifications(EntityModeratedInterface $entity, $status) {
-    $allowed_statuses = ['alert', 'current', 'ongoing'];
-    $entity->notifications_content_disable = !in_array($status, $allowed_statuses);
+    if (empty($entity->notifications_content_disable)) {
+      $allowed_statuses = ['alert', 'current', 'ongoing'];
+      $entity->notifications_content_disable = !in_array($status, $allowed_statuses);
+    }
   }
 
   /**
diff --git a/html/modules/custom/reliefweb_moderation/src/Services/JobModeration.php b/html/modules/custom/reliefweb_moderation/src/Services/JobModeration.php
index 5ca2c086e..69bd7700a 100644
--- a/html/modules/custom/reliefweb_moderation/src/Services/JobModeration.php
+++ b/html/modules/custom/reliefweb_moderation/src/Services/JobModeration.php
@@ -3,13 +3,11 @@
 namespace Drupal\reliefweb_moderation\Services;
 
 use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\reliefweb_moderation\EntityModeratedInterface;
 use Drupal\reliefweb_moderation\Helpers\UserPostingRightsHelper;
 use Drupal\reliefweb_moderation\ModerationServiceBase;
 use Drupal\reliefweb_utility\Helpers\DateHelper;
-use Drupal\reliefweb_utility\Helpers\TaxonomyHelper;
 use Drupal\reliefweb_utility\Helpers\UserHelper;
 
 /**
@@ -270,73 +268,6 @@ public function getEntityFormSubmitButtons($status, EntityModeratedInterface $en
     return $buttons;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function alterSubmittedEntityStatus($status, FormStateInterface $form_state) {
-    // For non editors, we determine the real status based on the user
-    // posting rights for the selected sources.
-    if (!UserHelper::userHasRoles(['editor']) && $status === 'pending') {
-      // Retrieve the list of sources and check the user rights.
-      if (!$form_state->isValueEmpty('field_source')) {
-        // Extract source ids.
-        $sources = array_filter(array_map(function ($source) {
-          return $source['target_id'];
-        }, $form_state->getValue('field_source')));
-
-        // Get the user's posting right for the document.
-        $right = UserPostingRightsHelper::getUserConsolidatedPostingRight($user, 'job', $sources);
-
-        // Update the status based on the user's right.
-        // Note: we don't use `t()` because those are log messages for editors.
-        switch ($right['name']) {
-          // Unverified for some sources => pending + flag.
-          case 'unverified':
-            $status = 'pending';
-            $message = strtr('Unverified user for @sources.', [
-              '@sources' => implode(', ', TaxonomyHelper::getSourceShortnames($right['sources'])),
-            ]);
-            break;
-
-          // Blocked for some sources => refused + flag.
-          case 'blocked':
-            $status = 'refused';
-            $message = strtr('Blocked user for @sources.', [
-              '@sources' => implode(', ', TaxonomyHelper::getSourceShortnames($right['sources'])),
-            ]);
-            break;
-
-          // Allowed for all sources => pending.
-          case 'allowed':
-            $status = 'pending';
-            break;
-
-          // Trusted for all the sources => published.
-          case 'trusted':
-            $status = 'published';
-            break;
-        }
-
-        // Update the log message.
-        if (!empty($message)) {
-          $revision_log_field = $form_state
-            ?->getFormObject()
-            ?->getEntity()
-            ?->getEntityType()
-            ?->getRevisionMetadataKey('revision_log_message');
-
-          if (!empty($revision_log_field)) {
-            $log = $form_state->getValue([$revision_log_field, 0, 'value'], '');
-            $log = $message . (!empty($log) ? ' ' . $log : '');
-            $form_state->setValue([$revision_log_field, 0, 'value'], $log);
-          }
-        }
-      }
-    }
-
-    return $status;
-  }
-
   /**
    * {@inheritdoc}
    */
diff --git a/html/modules/custom/reliefweb_moderation/src/Services/TrainingModeration.php b/html/modules/custom/reliefweb_moderation/src/Services/TrainingModeration.php
index bb4d3db82..170734a9b 100644
--- a/html/modules/custom/reliefweb_moderation/src/Services/TrainingModeration.php
+++ b/html/modules/custom/reliefweb_moderation/src/Services/TrainingModeration.php
@@ -3,13 +3,11 @@
 namespace Drupal\reliefweb_moderation\Services;
 
 use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\reliefweb_moderation\EntityModeratedInterface;
 use Drupal\reliefweb_moderation\Helpers\UserPostingRightsHelper;
 use Drupal\reliefweb_moderation\ModerationServiceBase;
 use Drupal\reliefweb_utility\Helpers\DateHelper;
-use Drupal\reliefweb_utility\Helpers\TaxonomyHelper;
 use Drupal\reliefweb_utility\Helpers\UserHelper;
 
 /**
@@ -295,73 +293,6 @@ public function getEntityFormSubmitButtons($status, EntityModeratedInterface $en
     return $buttons;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function alterSubmittedEntityStatus($status, FormStateInterface $form_state) {
-    // For non editors, we determine the real status based on the user
-    // posting rights for the selected sources.
-    if (!UserHelper::userHasRoles(['editor']) && $status === 'pending') {
-      // Retrieve the list of sources and check the user rights.
-      if (!$form_state->isValueEmpty('field_source')) {
-        // Extract source ids.
-        $sources = array_filter(array_map(function ($source) {
-          return $source['target_id'];
-        }, $form_state->getValue('field_source')));
-
-        // Get the user's posting right for the document.
-        $right = UserPostingRightsHelper::getUserConsolidatedPostingRight($user, 'training', $sources);
-
-        // Update the status based on the user's right.
-        // Note: we don't use `t()` because those are log messages for editors.
-        switch ($right['name']) {
-          // Unverified for some sources => pending + flag.
-          case 'unverified':
-            $status = 'pending';
-            $message = strtr('Unverified user for @sources.', [
-              '@sources' => implode(', ', TaxonomyHelper::getSourceShortnames($right['sources'])),
-            ]);
-            break;
-
-          // Blocked for some sources => refused + flag.
-          case 'blocked':
-            $status = 'refused';
-            $message = strtr('Blocked user for @sources.', [
-              '@sources' => implode(', ', TaxonomyHelper::getSourceShortnames($right['sources'])),
-            ]);
-            break;
-
-          // Allowed for all sources => pending.
-          case 'allowed':
-            $status = 'pending';
-            break;
-
-          // Trusted for all the sources => published.
-          case 'trusted':
-            $status = 'published';
-            break;
-        }
-
-        // Update the log message.
-        if (!empty($message)) {
-          $revision_log_field = $form_state
-            ?->getFormObject()
-            ?->getEntity()
-            ?->getEntityType()
-            ?->getRevisionMetadataKey('revision_log_message');
-
-          if (!empty($revision_log_field)) {
-            $log = $form_state->getValue([$revision_log_field, 0, 'value'], '');
-            $log = $message . (!empty($log) ? ' ' . $log : '');
-            $form_state->setValue([$revision_log_field, 0, 'value'], $log);
-          }
-        }
-      }
-    }
-
-    return $status;
-  }
-
   /**
    * {@inheritdoc}
    */

From 678aca5489403a25261a9e9ba07afa6454ba0508 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 10 Feb 2022 05:39:54 +0000
Subject: [PATCH 457/720] [RW-227] Change system email

---
 config/mimemail.settings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/mimemail.settings.yml b/config/mimemail.settings.yml
index 191bd3d6c..2244414dc 100644
--- a/config/mimemail.settings.yml
+++ b/config/mimemail.settings.yml
@@ -1,7 +1,7 @@
 _core:
   default_config_hash: rLKGzzC9TqjbEZiBoiyMpOSyZgldADa5SzvbA2gQDxE
 name: ReliefWeb
-mail: admin@reliefweb.int
+mail: donotreply@reliefweb.int
 simple_address: false
 sitestyle: true
 textonly: false

From 6168fc2b375d8b1611f2e35659b38044ac0e2fd0 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 10 Feb 2022 07:15:03 +0000
Subject: [PATCH 458/720] [RW-123] Add permission to view the reliefweb admin
 menu

---
 .../custom/reliefweb_users/reliefweb_users.permissions.yml     | 3 +++
 .../templates/cd/cd-footer/cd-footer.html.twig                 | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 html/modules/custom/reliefweb_users/reliefweb_users.permissions.yml

diff --git a/html/modules/custom/reliefweb_users/reliefweb_users.permissions.yml b/html/modules/custom/reliefweb_users/reliefweb_users.permissions.yml
new file mode 100644
index 000000000..bc8489120
--- /dev/null
+++ b/html/modules/custom/reliefweb_users/reliefweb_users.permissions.yml
@@ -0,0 +1,3 @@
+view reliefweb admin menu:
+  title: 'View reliefweb admin menu'
+  description: 'Allow users to view the reliefwebadmin menu.'
diff --git a/html/themes/custom/common_design_subtheme/templates/cd/cd-footer/cd-footer.html.twig b/html/themes/custom/common_design_subtheme/templates/cd/cd-footer/cd-footer.html.twig
index ce29ce1f9..e671daa32 100644
--- a/html/themes/custom/common_design_subtheme/templates/cd/cd-footer/cd-footer.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/cd/cd-footer/cd-footer.html.twig
@@ -18,7 +18,7 @@
       {% include '@common_design_subtheme/cd/cd-footer/cd-copyright.html.twig' %}
     {% endblock %}
 
-    {% if ('editor' in user.getroles) or ('webmaster' in user.getroles) or ('administrator' in user.getroles) or (user.id == '1')%}
+    {% if user.hasPermission('view reliefweb admin menu') %}
       {% include '@common_design_subtheme/user/admin-menu.html.twig' %}
     {% endif %}
 

From f8afc9e0c87976d09b9e91c6b973f083e555891e Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 10 Feb 2022 07:34:28 +0000
Subject: [PATCH 459/720] [RW-369] Add entity label validation for cloned
 entities

---
 .../src/EntityFormAlterServiceBase.php        | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php b/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
index a2e19ac50..9fd70149c 100644
--- a/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
+++ b/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
@@ -141,6 +141,9 @@ public function alterForm(array &$form, FormStateInterface $form_state) {
     // Add the revision form alterations.
     $this->addRevisionFormAlterations($form, $form_state);
 
+    // Add the cloning form alterations.
+    $this->addCloneFormAlterations($form, $form_state);
+
     // Force separate display of the URL alias fields.
     if (isset($form['path']['widget'][0])) {
       unset($form['path']['widget'][0]['#group']);
@@ -223,6 +226,48 @@ protected function addRevisionFormAlterations(array &$form, FormStateInterface $
     }
   }
 
+  /**
+   * Add form alterations related to clone entities.
+   *
+   * @param array $form
+   *   Form to alter.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   Form state.
+   */
+  protected function addCloneFormAlterations(array &$form, FormStateInterface $form_state) {
+    $label_field = $form_state->getFormObject()
+      ?->getEntity()
+      ?->getEntityType()
+      ?->getKey('label');
+
+    if (!empty($label_field) && isset($form[$label_field]['widget'][0]['value'])) {
+      $form[$label_field]['widget']['#element_validate'][] = [
+        $this, 'validateClonedEntityLabel',
+      ];
+    }
+  }
+
+  /**
+   * Validate that the label field of a cloned entity.
+   *
+   * @param array $element
+   *   Form element to validate.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   Form state.
+   * @param array $form
+   *   The complete form.
+   *
+   * @see \Drupal\content_entity_clone\Plugin\content_entity_clone\FieldProcessor\EntityLabelCloneSuffix;
+   */
+  public function validateClonedEntityLabel(array &$element, FormStateInterface $form_state, array &$form) {
+    $field = $element['#field_name'];
+    $value = $form_state->getValue([$field, 0, 'value']);
+
+    if (!empty($value) && preg_match('/\[CLONE\]$/', $value) === 1) {
+      $form_state->setError($element[0]['value'], $this->t('Please check the title and remove "[CLONE]".'));
+    }
+  }
+
   /**
    * Alter a primary field field to add empty value and validation.
    *

From 76dec22b45d66479ee99ab3f1a30d21127ca45c5 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 10 Feb 2022 23:49:04 +0000
Subject: [PATCH 460/720] [RW-123] Save permission to access admin menu

---
 config/user.role.editor.yml       | 2 ++
 config/user.role.user_manager.yml | 2 ++
 config/user.role.webmaster.yml    | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/config/user.role.editor.yml b/config/user.role.editor.yml
index d9a1f3561..692756ae2 100644
--- a/config/user.role.editor.yml
+++ b/config/user.role.editor.yml
@@ -38,6 +38,7 @@ dependencies:
     - reliefweb_revisions
     - reliefweb_topics
     - reliefweb_user_posts
+    - reliefweb_users
     - taxonomy
     - taxonomy_term_revision
 id: editor
@@ -181,6 +182,7 @@ permissions:
   - 'view own unpublished content'
   - 'view own unpublished media'
   - 'view published guideline entities'
+  - 'view reliefweb admin menu'
   - 'view report revisions'
   - 'view term revision data'
   - 'view term revision list'
diff --git a/config/user.role.user_manager.yml b/config/user.role.user_manager.yml
index d2497b99d..dcad5f423 100644
--- a/config/user.role.user_manager.yml
+++ b/config/user.role.user_manager.yml
@@ -4,6 +4,7 @@ status: true
 dependencies:
   module:
     - reliefweb_subscriptions
+    - reliefweb_users
 id: user_manager
 label: 'User manager'
 weight: 3
@@ -13,4 +14,5 @@ permissions:
   - 'administer subscriptions'
   - 'administer users'
   - 'change own username'
+  - 'view reliefweb admin menu'
   - 'view user email addresses'
diff --git a/config/user.role.webmaster.yml b/config/user.role.webmaster.yml
index cf335eb08..4bc173c71 100644
--- a/config/user.role.webmaster.yml
+++ b/config/user.role.webmaster.yml
@@ -26,6 +26,7 @@ dependencies:
     - filter
     - google_tag
     - guidelines
+    - reliefweb_users
     - taxonomy
     - taxonomy_term_revision
 id: webmaster
@@ -114,6 +115,7 @@ permissions:
   - 'use text format guideline'
   - 'view all guideline revisions'
   - 'view published guideline entities'
+  - 'view reliefweb admin menu'
   - 'view term revision data'
   - 'view term revision list'
   - 'view unpublished guideline entities'

From 8270cf8623d0e7a84c701bcccdbede069e62248e Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 10 Feb 2022 23:50:00 +0000
Subject: [PATCH 461/720] [RW-223] Adjust announcement fields

---
 ...core.entity_form_display.node.announcement.default.yml | 8 ++++++--
 config/field.field.node.announcement.field_link.yml       | 2 +-
 .../src/Services/AnnouncementFormAlter.php                | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/config/core.entity_form_display.node.announcement.default.yml b/config/core.entity_form_display.node.announcement.default.yml
index 1ce131d86..2c3441b98 100644
--- a/config/core.entity_form_display.node.announcement.default.yml
+++ b/config/core.entity_form_display.node.announcement.default.yml
@@ -8,6 +8,7 @@ dependencies:
     - field.field.node.announcement.field_link
     - node.type.announcement
   module:
+    - allowed_formats
     - link
     - media_library
     - text
@@ -21,11 +22,14 @@ content:
     weight: 3
     region: content
     settings:
-      rows: 9
+      rows: 5
       summary_rows: 3
       placeholder: ''
       show_summary: false
-    third_party_settings: {  }
+    third_party_settings:
+      allowed_formats:
+        hide_help: '1'
+        hide_guidelines: '1'
   field_image:
     type: media_library_widget
     weight: 2
diff --git a/config/field.field.node.announcement.field_link.yml b/config/field.field.node.announcement.field_link.yml
index e4a4bf510..152b6527b 100644
--- a/config/field.field.node.announcement.field_link.yml
+++ b/config/field.field.node.announcement.field_link.yml
@@ -19,5 +19,5 @@ default_value: {  }
 default_value_callback: ''
 settings:
   title: 0
-  link_type: 17
+  link_type: 16
 field_type: link
diff --git a/html/modules/custom/reliefweb_entities/src/Services/AnnouncementFormAlter.php b/html/modules/custom/reliefweb_entities/src/Services/AnnouncementFormAlter.php
index a5ea68d91..39f516a05 100644
--- a/html/modules/custom/reliefweb_entities/src/Services/AnnouncementFormAlter.php
+++ b/html/modules/custom/reliefweb_entities/src/Services/AnnouncementFormAlter.php
@@ -14,7 +14,7 @@ class AnnouncementFormAlter extends EntityFormAlterServiceBase {
    * {@inheritdoc}
    */
   protected function addBundleFormAlterations(array &$form, FormStateInterface $form_state) {
-    // No customizations.
+    $form['title']['widget'][0]['value']['#description'] = $this->t('Title will show up in tooltip when you hover over the banner.');
   }
 
 }

From febfb6d263de4f2d994a363374a0c6d6ed4ad4c8 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 11 Feb 2022 03:47:24 +0000
Subject: [PATCH 462/720] [RW-224] Consolidate text format help for textarea
 fields

---
 ...ty_form_display.node.blog_post.default.yml |  8 ++-
 ....entity_form_display.node.book.default.yml |  4 +-
 ...ntity_form_display.node.report.default.yml |  8 ++-
 ...entity_form_display.node.topic.default.yml | 10 ++--
 ..._display.taxonomy_term.country.default.yml |  2 +-
 ..._display.taxonomy_term.country.profile.yml |  2 +-
 ...display.taxonomy_term.disaster.default.yml |  2 +-
 ...display.taxonomy_term.disaster.profile.yml |  2 +-
 ...m_display.taxonomy_term.source.default.yml |  2 +-
 .../src/Services/CountryFormAlter.php         | 16 +++++-
 .../src/Services/DisasterFormAlter.php        | 14 +++++-
 .../src/Services/SourceFormAlter.php          | 14 +++++-
 .../reliefweb_form/reliefweb_form.module      | 49 +++++++++++++++++++
 .../components/rw-form/rw-form.css            |  6 ++-
 14 files changed, 118 insertions(+), 21 deletions(-)

diff --git a/config/core.entity_form_display.node.blog_post.default.yml b/config/core.entity_form_display.node.blog_post.default.yml
index 216a10132..58579fdd0 100644
--- a/config/core.entity_form_display.node.blog_post.default.yml
+++ b/config/core.entity_form_display.node.blog_post.default.yml
@@ -10,6 +10,7 @@ dependencies:
     - field.field.node.blog_post.field_tags
     - node.type.blog_post
   module:
+    - allowed_formats
     - media_library
     - path
     - text
@@ -23,11 +24,14 @@ content:
     weight: 4
     region: content
     settings:
-      rows: 9
+      rows: 20
       summary_rows: 3
       placeholder: ''
       show_summary: false
-    third_party_settings: {  }
+    third_party_settings:
+      allowed_formats:
+        hide_help: '0'
+        hide_guidelines: '1'
   field_attached_images:
     type: media_library_widget
     weight: 6
diff --git a/config/core.entity_form_display.node.book.default.yml b/config/core.entity_form_display.node.book.default.yml
index 153a270c7..e46c50ed5 100644
--- a/config/core.entity_form_display.node.book.default.yml
+++ b/config/core.entity_form_display.node.book.default.yml
@@ -23,13 +23,13 @@ content:
     weight: 1
     region: content
     settings:
-      rows: 9
+      rows: 20
       summary_rows: 3
       placeholder: ''
       show_summary: false
     third_party_settings:
       allowed_formats:
-        hide_help: '1'
+        hide_help: '0'
         hide_guidelines: '1'
   field_attached_images:
     type: media_library_widget
diff --git a/config/core.entity_form_display.node.report.default.yml b/config/core.entity_form_display.node.report.default.yml
index 38700d89e..66b7db580 100644
--- a/config/core.entity_form_display.node.report.default.yml
+++ b/config/core.entity_form_display.node.report.default.yml
@@ -29,6 +29,7 @@ dependencies:
     - field.field.node.report.field_vulnerable_groups
     - node.type.report
   module:
+    - allowed_formats
     - datetime
     - media_library
     - path
@@ -45,11 +46,14 @@ content:
     weight: 2
     region: content
     settings:
-      rows: 9
+      rows: 20
       summary_rows: 3
       placeholder: ''
       show_summary: false
-    third_party_settings: {  }
+    third_party_settings:
+      allowed_formats:
+        hide_help: '0'
+        hide_guidelines: '1'
   field_bury:
     type: boolean_checkbox
     weight: 22
diff --git a/config/core.entity_form_display.node.topic.default.yml b/config/core.entity_form_display.node.topic.default.yml
index 6f5dd6641..4c3e516a2 100644
--- a/config/core.entity_form_display.node.topic.default.yml
+++ b/config/core.entity_form_display.node.topic.default.yml
@@ -37,7 +37,7 @@ content:
       show_summary: false
     third_party_settings:
       allowed_formats:
-        hide_help: '1'
+        hide_help: '0'
         hide_guidelines: '1'
   field_bury:
     type: boolean_checkbox
@@ -77,11 +77,11 @@ content:
     weight: 3
     region: content
     settings:
-      rows: 5
+      rows: 9
       placeholder: ''
     third_party_settings:
       allowed_formats:
-        hide_help: '1'
+        hide_help: '0'
         hide_guidelines: '1'
   field_reports_search:
     type: reliefweb_section_links
@@ -94,11 +94,11 @@ content:
     weight: 4
     region: content
     settings:
-      rows: 5
+      rows: 9
       placeholder: ''
     third_party_settings:
       allowed_formats:
-        hide_help: '1'
+        hide_help: '0'
         hide_guidelines: '1'
   field_sections:
     type: reliefweb_section_links
diff --git a/config/core.entity_form_display.taxonomy_term.country.default.yml b/config/core.entity_form_display.taxonomy_term.country.default.yml
index 423e46c47..08efe74c8 100644
--- a/config/core.entity_form_display.taxonomy_term.country.default.yml
+++ b/config/core.entity_form_display.taxonomy_term.country.default.yml
@@ -33,7 +33,7 @@ content:
       placeholder: ''
     third_party_settings:
       allowed_formats:
-        hide_help: '1'
+        hide_help: '0'
         hide_guidelines: '1'
   field_aliases:
     type: string_textarea
diff --git a/config/core.entity_form_display.taxonomy_term.country.profile.yml b/config/core.entity_form_display.taxonomy_term.country.profile.yml
index 4342397db..016d84ba7 100644
--- a/config/core.entity_form_display.taxonomy_term.country.profile.yml
+++ b/config/core.entity_form_display.taxonomy_term.country.profile.yml
@@ -33,7 +33,7 @@ content:
       placeholder: ''
     third_party_settings:
       allowed_formats:
-        hide_help: '1'
+        hide_help: '0'
         hide_guidelines: '1'
   field_appeals_response_plans:
     type: reliefweb_links
diff --git a/config/core.entity_form_display.taxonomy_term.disaster.default.yml b/config/core.entity_form_display.taxonomy_term.disaster.default.yml
index 343b457d0..cc88d2eea 100644
--- a/config/core.entity_form_display.taxonomy_term.disaster.default.yml
+++ b/config/core.entity_form_display.taxonomy_term.disaster.default.yml
@@ -36,7 +36,7 @@ content:
       placeholder: ''
     third_party_settings:
       allowed_formats:
-        hide_help: '1'
+        hide_help: '0'
         hide_guidelines: '1'
   field_country:
     type: reliefweb_entity_reference_select
diff --git a/config/core.entity_form_display.taxonomy_term.disaster.profile.yml b/config/core.entity_form_display.taxonomy_term.disaster.profile.yml
index c1936c02a..d2c55035a 100644
--- a/config/core.entity_form_display.taxonomy_term.disaster.profile.yml
+++ b/config/core.entity_form_display.taxonomy_term.disaster.profile.yml
@@ -35,7 +35,7 @@ content:
       placeholder: ''
     third_party_settings:
       allowed_formats:
-        hide_help: '1'
+        hide_help: '0'
         hide_guidelines: '1'
   field_appeals_response_plans:
     type: reliefweb_links
diff --git a/config/core.entity_form_display.taxonomy_term.source.default.yml b/config/core.entity_form_display.taxonomy_term.source.default.yml
index 8a69330c9..cda3ad8f7 100644
--- a/config/core.entity_form_display.taxonomy_term.source.default.yml
+++ b/config/core.entity_form_display.taxonomy_term.source.default.yml
@@ -44,7 +44,7 @@ content:
       placeholder: ''
     third_party_settings:
       allowed_formats:
-        hide_help: '1'
+        hide_help: '0'
         hide_guidelines: '1'
   field_aliases:
     type: string_textarea
diff --git a/html/modules/custom/reliefweb_entities/src/Services/CountryFormAlter.php b/html/modules/custom/reliefweb_entities/src/Services/CountryFormAlter.php
index c7da9bc67..060cb8979 100644
--- a/html/modules/custom/reliefweb_entities/src/Services/CountryFormAlter.php
+++ b/html/modules/custom/reliefweb_entities/src/Services/CountryFormAlter.php
@@ -13,9 +13,23 @@ class CountryFormAlter extends EntityFormAlterServiceBase {
   /**
    * {@inheritdoc}
    */
-  protected function addBundleFormAlterations(array &$form, FormStateInterface $form_state) {
+  public function alterForm(array &$form, FormStateInterface $form_state) {
+    parent::alterForm($form, $form_state);
+
+    // Restrict the description to the markdown format.
+    $form['description']['widget'][0]['#allowed_formats'] = [
+      'markdown' => 'markdown',
+    ];
+
     // Hide term relations as they are not used.
     $form['relations']['#access'] = FALSE;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function addBundleFormAlterations(array &$form, FormStateInterface $form_state) {
+    // No customizations.
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_entities/src/Services/DisasterFormAlter.php b/html/modules/custom/reliefweb_entities/src/Services/DisasterFormAlter.php
index 728663c6c..86dd6575d 100644
--- a/html/modules/custom/reliefweb_entities/src/Services/DisasterFormAlter.php
+++ b/html/modules/custom/reliefweb_entities/src/Services/DisasterFormAlter.php
@@ -18,10 +18,22 @@ class DisasterFormAlter extends EntityFormAlterServiceBase {
   /**
    * {@inheritdoc}
    */
-  protected function addBundleFormAlterations(array &$form, FormStateInterface $form_state) {
+  public function alterForm(array &$form, FormStateInterface $form_state) {
+    parent::alterForm($form, $form_state);
+
+    // Restrict the description to the markdown format.
+    $form['description']['widget'][0]['#allowed_formats'] = [
+      'markdown' => 'markdown',
+    ];
+
     // Hide term relations as they are not used.
     $form['relations']['#access'] = FALSE;
+  }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function addBundleFormAlterations(array &$form, FormStateInterface $form_state) {
     // Alter the primary country field, ensuring it's using a value among
     // the selected country values.
     $this->alterPrimaryField('field_primary_country', $form, $form_state);
diff --git a/html/modules/custom/reliefweb_entities/src/Services/SourceFormAlter.php b/html/modules/custom/reliefweb_entities/src/Services/SourceFormAlter.php
index f5a4d2fdb..bf6a382fe 100644
--- a/html/modules/custom/reliefweb_entities/src/Services/SourceFormAlter.php
+++ b/html/modules/custom/reliefweb_entities/src/Services/SourceFormAlter.php
@@ -17,10 +17,22 @@ class SourceFormAlter extends EntityFormAlterServiceBase {
   /**
    * {@inheritdoc}
    */
-  protected function addBundleFormAlterations(array &$form, FormStateInterface $form_state) {
+  public function alterForm(array &$form, FormStateInterface $form_state) {
+    parent::alterForm($form, $form_state);
+
+    // Restrict the description to the markdown format.
+    $form['description']['widget'][0]['#allowed_formats'] = [
+      'markdown' => 'markdown',
+    ];
+
     // Hide term relations as they are not used.
     $form['relations']['#access'] = FALSE;
+  }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function addBundleFormAlterations(array &$form, FormStateInterface $form_state) {
     // Use an autocomplete widget for the country and source fields.
     $form['field_country']['#attributes']['data-with-autocomplete'] = '';
 
diff --git a/html/modules/custom/reliefweb_form/reliefweb_form.module b/html/modules/custom/reliefweb_form/reliefweb_form.module
index e0ae21a4c..7315d8d69 100644
--- a/html/modules/custom/reliefweb_form/reliefweb_form.module
+++ b/html/modules/custom/reliefweb_form/reliefweb_form.module
@@ -273,3 +273,52 @@ function reliefweb_form_module_implements_alter(&$implementations, $hook) {
     $implementations['reliefweb_form'] = $group;
   }
 }
+
+/**
+ * Implements hook_field_widget_form_alter().
+ */
+function reliefweb_form_field_widget_form_alter(&$element, FormStateInterface $form_state, $context) {
+  if (!empty($element['#after_build'])) {
+    foreach ($element['#after_build'] as $key => $callback) {
+      if ($callback === '_allowed_formats_remove_textarea_help') {
+        $element['#after_build'][$key] = 'reliefweb_form_hide_format_help';
+      }
+    }
+  }
+}
+
+/**
+ * After build callback to hide the text format help.
+ */
+function reliefweb_form_hide_format_help($form_element, FormStateInterface $form_state) {
+  if (isset($form_element['format'])) {
+    $hide_help = !empty($form_element['#allowed_format_hide_settings']['hide_help']);
+    $hide_guidelines = !empty($form_element['#allowed_format_hide_settings']['hide_guidelines']);
+
+    if ($hide_help) {
+      $form_element['format']['help']['#access'] = FALSE;
+    }
+    if ($hide_guidelines) {
+      $form_element['format']['guidelines']['#access'] = FALSE;
+    }
+
+    // Ensure the format is displayed even it's only one, except for plain text.
+    if (isset($form_element['#allowed_formats']) && count($form_element['#allowed_formats']) === 1) {
+      if (($hide_help && $hide_guidelines) || $form_element['format']['format']['#default_value'] === 'plain_text') {
+        // We need to keep the format (we cannot use #access = FALSE) otherwise
+        // the editor for the text format, if any, will not be displayed...
+        // @see \Drupal\editor\Element::preRenderTextFormat()
+        unset($form_element['format']['#type']);
+        unset($form_element['format']['#theme_wrappers']);
+      }
+      else {
+        // We need to set the #access to TRUE otherwiwse it's hidden...
+        // @see \Drupal\editor\Element::preRenderTextFormat()
+        $form_element['format']['format']['#access'] = TRUE;
+        $form_element['format']['format']['#attributes']['disabled'] = TRUE;
+      }
+    }
+  }
+
+  return $form_element;
+}
diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 8b77c5924..261105f86 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -426,9 +426,11 @@ form > #actions legend + .form-type-checkbox.form-item-notifications-content-dis
   margin-top: 0;
 }
 .filter-wrapper {
-  border: 1px solid var(--cd-reliefweb-brand-grey--light);
+  border: 2px solid var(--cd-reliefweb-brand-grey--light);
+  border-top: none;
+  background: var(--cd-reliefweb-brand-grey--light);
 }
-.filter-wrapper .filter-help {
+.filter-wrapper * {
   font-size: 14px;
 }
 .filter-wrapper ul {

From 42429c3b4f195b439f17c575dd5c4d524e2b47f2 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 11 Feb 2022 03:48:03 +0000
Subject: [PATCH 463/720] [RW-224] Add markdown reference to text format help

---
 .../src/Plugin/Filter/Markdown.php            | 161 ++++++++++++++++++
 1 file changed, 161 insertions(+)

diff --git a/html/modules/custom/reliefweb_utility/src/Plugin/Filter/Markdown.php b/html/modules/custom/reliefweb_utility/src/Plugin/Filter/Markdown.php
index cde2d4c7c..058b1355d 100644
--- a/html/modules/custom/reliefweb_utility/src/Plugin/Filter/Markdown.php
+++ b/html/modules/custom/reliefweb_utility/src/Plugin/Filter/Markdown.php
@@ -2,6 +2,9 @@
 
 namespace Drupal\reliefweb_utility\Plugin\Filter;
 
+use Drupal\Core\Link;
+use Drupal\Core\Url;
+use Drupal\Core\Render\Markup;
 use Drupal\filter\FilterProcessResult;
 use Drupal\filter\Plugin\FilterBase;
 use League\CommonMark\Environment;
@@ -69,4 +72,162 @@ public function process($text, $langcode) {
     return new FilterProcessResult($html);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function tips($long = FALSE) {
+    $help = '<h4>Markdown reference</h4>
+    <table class="markdown-reference">
+        <thead>
+            <tr>
+                <th>Type</th>
+                <th>… to Get</th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr>
+                <td>*Italic*</td>
+                <td><em>Italic</em></td>
+            </tr>
+            <tr>
+                <td>**Bold**</td>
+                <td><strong>Bold</strong></td>
+            </tr>
+            <tr>
+                <td>
+                    # Heading 1
+                </td>
+                <td>
+                    <h1>Heading 1</h1>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    ## Heading 2
+                </td>
+                <td>
+                    <h2>Heading 2</h2>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    ### Heading 3
+                </td>
+                <td>
+                    <h3>Heading 3</h3>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    #### Heading 4
+                </td>
+                <td>
+                    <h4>Heading 4</h4>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    ##### Heading 5
+                </td>
+                <td>
+                    <h5>Heading 5</h5>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    ###### Heading 6
+                </td>
+                <td>
+                    <h6>Heading 6</h6>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    [Link](http://a.com)
+                </td>
+                <td><a href="https://commonmark.org/help">Link</a></td>
+            </tr>
+            <tr>
+                <td>
+                    ![Image](http://url/reliefweb.png)
+                </td>
+                <td>
+                    <img src="/themes/custom/common_design_subtheme/img/logos/rw-logo-desktop.svg" width="140" height="60" alt="">
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    &gt; Blockquote
+                </td>
+                <td>
+                    <blockquote>Blockquote</blockquote>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <p>
+                        - List<br>
+                        - List<br>
+                        - List
+                    </p>
+                </td>
+                <td>
+                    <ul>
+                        <li>List</li>
+                        <li>List</li>
+                        <li>List</li>
+                    </ul>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <p>
+                        1. One<br>
+                        2. Two<br>
+                        3. Three
+                    </p>
+                </td>
+                <td>
+                    <ol>
+                        <li>One</li>
+                        <li>Two</li>
+                        <li>Three</li>
+                    </ol>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    Horizontal rule:
+                    <br>
+                    ---
+                </td>
+                <td>
+                    Horizontal rule:
+                    <hr>
+                </td>
+            </tr>
+        </tbody>
+    </table>';
+
+    $tips = [
+      '#type' => 'container',
+    ];
+
+    $tips[] = [
+      '#markup' => Markup::create($help),
+    ];
+
+    // Documentation link.
+    $url = Url::fromUri('https://commonmark.org/help', [
+      'attributes' => ['target' => '_blank', 'rel' => 'noopener noreferrer'],
+    ]);
+    $tips[] = [
+      '#markup' => $this->t('For complete details on the Markdown syntax, see the @link', [
+        '@link' => Link::fromTextAndUrl($this->t('Markdown documentation'), $url)->toString(),
+      ]),
+    ];
+
+    return \Drupal::service('renderer')->render($tips);
+  }
+
 }

From ca7478fe97c4ac0e1cb031dfc13cdd1ea95969f4 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 11 Feb 2022 07:43:09 +0000
Subject: [PATCH 464/720] [RW-224] Fix text format styling and remove disabled
 select background that breaks the browser's default styling

---
 .../components/rw-form/rw-form.css            | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 261105f86..70f17c090 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -238,8 +238,7 @@ form .form-disabled [data-irrelevant] > div {
   display: none;
 }
 form input[disabled],
-form textarea[disabled],
-form select[disabled] {
+form textarea[disabled] {
   background: var(--cd-reliefweb-brand-grey--light);
   background: var(--cd-reliefweb-grey--disable);
 }
@@ -426,6 +425,8 @@ form > #actions legend + .form-type-checkbox.form-item-notifications-content-dis
   margin-top: 0;
 }
 .filter-wrapper {
+  display: flex;
+  align-items: center;
   border: 2px solid var(--cd-reliefweb-brand-grey--light);
   border-top: none;
   background: var(--cd-reliefweb-brand-grey--light);
@@ -433,7 +434,21 @@ form > #actions legend + .form-type-checkbox.form-item-notifications-content-dis
 .filter-wrapper * {
   font-size: 14px;
 }
+.filter-wrapper .filter-help {
+  display: flex;
+  float: none;
+  flex-grow: 1;
+  justify-content: flex-end;
+  order: 1;
+}
+.filter-wrapper .filter-help a:after {
+  top: 2px;
+}
+.filter-wrapper select[disabled] {
+  padding: 0 4px;
+}
 .filter-wrapper ul {
+  width: 100%;
   margin: 0;
   padding: 0;
   list-style-type: none;

From d9d27e0e9c13daecfc8c65d2ea206989d89d9e79 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 11 Feb 2022 07:47:28 +0000
Subject: [PATCH 465/720] [RW-379] Update source(s) moderation status when
 publishing a job/training

---
 .../reliefweb_entities.module                 | 63 ++++++++++++++++++-
 .../reliefweb_entities/src/Entity/Job.php     | 10 +++
 .../src/Entity/Training.php                   | 10 +++
 .../src/OpportunityDocumentTrait.php          | 33 ++++++++++
 4 files changed, 114 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/reliefweb_entities/reliefweb_entities.module b/html/modules/custom/reliefweb_entities/reliefweb_entities.module
index 45d17223d..82d2c9576 100644
--- a/html/modules/custom/reliefweb_entities/reliefweb_entities.module
+++ b/html/modules/custom/reliefweb_entities/reliefweb_entities.module
@@ -372,6 +372,13 @@ function reliefweb_entities_form_node_form_alter(array &$form, FormStateInterfac
  */
 function reliefweb_entities_form_taxonomy_term_form_alter(array &$form, FormStateInterface $form_state) {
   EntityFormAlterServiceBase::alterEntityForm($form, $form_state);
+
+  // Empty the revision log message as we always create new revisions.
+  //
+  // @see reliefweb_entities_set_taxonomy_term_revision()
+  if (!empty($form['revision_log_message']['widget'][0]['value']['#default_value'])) {
+    $form['revision_log_message']['widget'][0]['value']['#default_value'] = '';
+  }
 }
 
 /**
@@ -391,12 +398,64 @@ function reliefweb_entities_form_alter(array &$form, FormStateInterface $form_st
   }
 }
 
+/**
+ * Implements hook_module_implements_alter().
+ */
+function reliefweb_entities_module_implements_alter(&$implementation, $hook) {
+  // Remove the hook_entity_presave() implementation from the
+  // taxonomy_term_revision module because it doesn't allow us to speify the
+  // revision user or timestamp. This is replaced by
+  // reliefweb_entities_set_taxonomy_term_revision().
+  //
+  // @see taxonomy_term_revision_entity_presave()
+  // @see reliefweb_entities_set_taxonomy_term_revision()
+  if ($hook === 'entity_presave') {
+    unset($implementation['taxonomy_term_revision']);
+  }
+}
+
 /**
  * Implements hook_entity_presave().
- *
- * Remove control characters from text fields.
  */
 function reliefweb_entities_entity_presave(EntityInterface $entity) {
+  // Remove control characters from an entity's text fields.
+  reliefweb_entities_clean_text_fields($entity);
+
+  // Set the taxonomy term revision.
+  reliefweb_entities_set_taxonomy_term_revision($entity);
+}
+
+/**
+ * Set a taxonomy term's revision information.
+ *
+ * Note: this replaces the taxonomy_term_revision_entity_presave() which
+ * is not flexible and forces the revision user ID and creation time.
+ *
+ * @param \Drupal\Core\Entity\EntityInterface $entity
+ *   Entity.
+ *
+ * @see taxonomy_term_revision_entity_presave()
+ */
+function reliefweb_entities_set_taxonomy_term_revision(EntityInterface $entity) {
+  // Saving new revision of term on each save.
+  if ($entity instanceof TermInterface) {
+    $entity->setNewRevision(TRUE);
+    if (is_null($entity->getRevisionUserId())) {
+      $entity->setRevisionUserId(\Drupal::currentUser()->id());
+    }
+    if (empty($entity->getRevisionCreationTime())) {
+      $entity->setRevisionCreationTime(\Drupal::time()->getRequestTime());
+    }
+  }
+}
+
+/**
+ * Remove control characters from an entity's text fields.
+ *
+ * @param \Drupal\Core\Entity\EntityInterface $entity
+ *   Entity.
+ */
+function reliefweb_entities_clean_text_fields(EntityInterface $entity) {
   $entity_type_id = $entity->getEntityTypeId();
   if ($entity_type_id === 'node' || $entity_type_id === 'taxonomy_term') {
     $field_definitions = \Drupal::service('entity_field.manager')
diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Job.php b/html/modules/custom/reliefweb_entities/src/Entity/Job.php
index 01675fdd3..16601e716 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Job.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Job.php
@@ -137,6 +137,16 @@ public function preSave(EntityStorageInterface $storage) {
     parent::preSave($storage);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function postSave(EntityStorageInterface $storage, $update = TRUE) {
+    parent::postSave($storage, $update);
+
+    // Make the sources active.
+    $this->updateSourceModerationStatus();
+  }
+
   /**
    * Get the list of job categories for which themes are irrelevant.
    *
diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Training.php b/html/modules/custom/reliefweb_entities/src/Entity/Training.php
index 522f08b59..6b34bf480 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Training.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Training.php
@@ -107,4 +107,14 @@ public function preSave(EntityStorageInterface $storage) {
     parent::preSave($storage);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function postSave(EntityStorageInterface $storage, $update = TRUE) {
+    parent::postSave($storage, $update);
+
+    // Make the sources active.
+    $this->updateSourceModerationStatus();
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_entities/src/OpportunityDocumentTrait.php b/html/modules/custom/reliefweb_entities/src/OpportunityDocumentTrait.php
index ebd171810..3a283bd7a 100644
--- a/html/modules/custom/reliefweb_entities/src/OpportunityDocumentTrait.php
+++ b/html/modules/custom/reliefweb_entities/src/OpportunityDocumentTrait.php
@@ -2,6 +2,8 @@
 
 namespace Drupal\reliefweb_entities;
 
+use Drupal\Core\Entity\EntityPublishedInterface;
+use Drupal\reliefweb_entities\Entity\Source;
 use Drupal\reliefweb_moderation\Helpers\UserPostingRightsHelper;
 use Drupal\reliefweb_utility\Helpers\TaxonomyHelper;
 use Drupal\reliefweb_utility\Helpers\UserHelper;
@@ -83,4 +85,35 @@ protected function updateModerationStatusFromPostingRights() {
     }
   }
 
+  /**
+   * Update the status of the sources when publishing an opportunity.
+   */
+  protected function updateSourceModerationStatus() {
+    if (!$this->hasField('field_source') || $this->field_source->isEmpty()) {
+      return;
+    }
+
+    if (!($this instanceof EntityPublishedInterface) || !$this->isPublished()) {
+      return;
+    }
+
+    // Make the inactive or archive sources active when an apportunity is
+    // published.
+    foreach ($this->field_source as $item) {
+      $source = $item->entity;
+      if (empty($source) || !($source instanceof Source)) {
+        continue;
+      }
+
+      if (in_array($source->getModerationStatus(), ['inactive', 'archive'])) {
+        $entity->notifications_content_disable = TRUE;
+        $source->setModerationStatus('active');
+        $source->setNewRevision(TRUE);
+        $source->setRevisionLogMessage('Automatic status update');
+        $source->setRevisionUserId(2);
+        $source->save();
+      }
+    }
+  }
+
 }

From b4dd8f80cca3b67c2ce8605cb78c13f164de8b5c Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 11 Feb 2022 08:38:06 +0000
Subject: [PATCH 466/720] [RW-224] Make padding for text format select a bit
 more consistent

---
 .../common_design_subtheme/components/rw-form/rw-form.css       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 70f17c090..f66deccb2 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -444,7 +444,7 @@ form > #actions legend + .form-type-checkbox.form-item-notifications-content-dis
 .filter-wrapper .filter-help a:after {
   top: 2px;
 }
-.filter-wrapper select[disabled] {
+.filter-wrapper select {
   padding: 0 4px;
 }
 .filter-wrapper ul {

From 5eb15cc22fde606f99399f4fa2cd9919c3dc92b1 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 11 Feb 2022 08:40:07 +0000
Subject: [PATCH 467/720] [RW-380] Update blog post date when published

---
 .../reliefweb_entities/src/Entity/BlogPost.php    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/html/modules/custom/reliefweb_entities/src/Entity/BlogPost.php b/html/modules/custom/reliefweb_entities/src/Entity/BlogPost.php
index abf34c64b..aed4e7b98 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/BlogPost.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/BlogPost.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\reliefweb_entities\Entity;
 
+use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\node\Entity\Node;
 use Drupal\reliefweb_entities\BundleEntityInterface;
@@ -107,4 +108,18 @@ public function getLatestBlogPosts($limit = 8) {
     ];
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function preSave(EntityStorageInterface $storage) {
+    // Set the creation date to the changed date when publishing the blog
+    // post from an unpublished state.
+    if (isset($this->original) &&
+      $this->getModerationStatus() === 'published' &&
+      $this->original->getModerationStatus() !== 'published'
+    ) {
+      $this->setCreatedTime($this->getChangedTime());
+    }
+  }
+
 }

From 604ca31cfb28244a6870a312448002a8d12b1821 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 11 Feb 2022 08:59:50 +0000
Subject: [PATCH 468/720] [RW-382] Update status to refused for jobs/training
 if one of the sources is blocked

---
 .../reliefweb_entities/src/Entity/Job.php     |  3 ++
 .../src/Entity/Training.php                   |  3 ++
 .../src/OpportunityDocumentTrait.php          | 39 +++++++++++++++++++
 3 files changed, 45 insertions(+)

diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Job.php b/html/modules/custom/reliefweb_entities/src/Entity/Job.php
index 16601e716..cd55f6745 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Job.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Job.php
@@ -134,6 +134,9 @@ public function preSave(EntityStorageInterface $storage) {
     // Update the entity status based on the user posting rights.
     $this->updateModerationStatusFromPostingRights();
 
+    // Update the entity statys based on the source(s) moderation status.
+    $this->updateModerationStatusFromSourceStatus();
+
     parent::preSave($storage);
   }
 
diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Training.php b/html/modules/custom/reliefweb_entities/src/Entity/Training.php
index 6b34bf480..850dc986d 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Training.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Training.php
@@ -104,6 +104,9 @@ public function preSave(EntityStorageInterface $storage) {
     // Update the entity status based on the user posting rights.
     $this->updateModerationStatusFromPostingRights();
 
+    // Update the entity statys based on the source(s) moderation status.
+    $this->updateModerationStatusFromSourceStatus();
+
     parent::preSave($storage);
   }
 
diff --git a/html/modules/custom/reliefweb_entities/src/OpportunityDocumentTrait.php b/html/modules/custom/reliefweb_entities/src/OpportunityDocumentTrait.php
index 3a283bd7a..bfbd6660a 100644
--- a/html/modules/custom/reliefweb_entities/src/OpportunityDocumentTrait.php
+++ b/html/modules/custom/reliefweb_entities/src/OpportunityDocumentTrait.php
@@ -3,6 +3,7 @@
 namespace Drupal\reliefweb_entities;
 
 use Drupal\Core\Entity\EntityPublishedInterface;
+use Drupal\Core\Entity\RevisionLogInterface;
 use Drupal\reliefweb_entities\Entity\Source;
 use Drupal\reliefweb_moderation\Helpers\UserPostingRightsHelper;
 use Drupal\reliefweb_utility\Helpers\TaxonomyHelper;
@@ -85,6 +86,44 @@ protected function updateModerationStatusFromPostingRights() {
     }
   }
 
+  /**
+   * Update the status to refused if any of the sources is blocked.
+   */
+  protected function updateModerationStatusFromSourceStatus() {
+    if (!$this->hasField('field_source') || $this->field_source->isEmpty()) {
+      return;
+    }
+
+    $blocked = [];
+    foreach ($this->field_source as $item) {
+      $source = $item->entity;
+      if (empty($source) || !($source instanceof Source)) {
+        continue;
+      }
+
+      if ($source->getModerationStatus() === 'blocked') {
+        $blocked[] = $source->label();
+      }
+    }
+
+    if (!empty($blocked)) {
+      $this->setModerationStatus('refused');
+
+      // Add a message to the revision log.
+      if ($this instanceof RevisionLogInterface) {
+        $message = 'Submissions from "' . implode('", "', $blocked) . '" are no longer allowed.';
+
+        $log = $this->getRevisionLogMessage();
+        if (empty($log)) {
+          $this->setRevisionLogMessage($message);
+        }
+        else {
+          $this->setRevisionLogMessage($message . ' ' . $log);
+        }
+      }
+    }
+  }
+
   /**
    * Update the status of the sources when publishing an opportunity.
    */

From 3dadbd60c1e6c491d0c93707330353a41a778f6e Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 11 Feb 2022 09:22:08 +0000
Subject: [PATCH 469/720] [RW-383] Add logic to update the creation date of a
 job/training when published for the first time

---
 .../reliefweb_entities/src/Entity/Job.php     |  4 +++
 .../src/Entity/Training.php                   |  4 +++
 .../src/OpportunityDocumentTrait.php          | 27 +++++++++++++++++++
 3 files changed, 35 insertions(+)

diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Job.php b/html/modules/custom/reliefweb_entities/src/Entity/Job.php
index cd55f6745..a6fb1e95a 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Job.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Job.php
@@ -137,6 +137,10 @@ public function preSave(EntityStorageInterface $storage) {
     // Update the entity statys based on the source(s) moderation status.
     $this->updateModerationStatusFromSourceStatus();
 
+    // Update the creation date when published for the first time so that
+    // the opportunity can appear at the top of the opportunity river.
+    $this->updateDateWhenPublished();
+
     parent::preSave($storage);
   }
 
diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Training.php b/html/modules/custom/reliefweb_entities/src/Entity/Training.php
index 850dc986d..ab4f218b0 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Training.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Training.php
@@ -107,6 +107,10 @@ public function preSave(EntityStorageInterface $storage) {
     // Update the entity statys based on the source(s) moderation status.
     $this->updateModerationStatusFromSourceStatus();
 
+    // Update the creation date when published for the first time so that
+    // the opportunity can appear at the top of the opportunity river.
+    $this->updateDateWhenPublished();
+
     parent::preSave($storage);
   }
 
diff --git a/html/modules/custom/reliefweb_entities/src/OpportunityDocumentTrait.php b/html/modules/custom/reliefweb_entities/src/OpportunityDocumentTrait.php
index bfbd6660a..0a7436e94 100644
--- a/html/modules/custom/reliefweb_entities/src/OpportunityDocumentTrait.php
+++ b/html/modules/custom/reliefweb_entities/src/OpportunityDocumentTrait.php
@@ -124,6 +124,33 @@ protected function updateModerationStatusFromSourceStatus() {
     }
   }
 
+  /**
+   * Update creation date when the opportunity is published for the first time.
+   */
+  protected function updateDateWhenPublished() {
+    if ($this->id() === NULL || $this->getModerationStatus() !== 'published') {
+      return;
+    }
+
+    $entity_type = $this->getEntityType();
+    $table = $entity_type->getRevisionDataTable();
+    $id_field = $entity_type->getKey('id');
+
+    $previously_published = \Drupal::database()
+      ->select($table, $table)
+      ->fields($table, [$entity_type->getKey('revision')])
+      ->condition($table . '.' . $id_field, $this->id(), '=')
+      ->condition($table . '.moderation_status', 'published', '=')
+      ->range(0, 1)
+      ->execute()
+      ?->fetchField();
+
+    // Update publication date if published for the first time.
+    if (empty($previously_published)) {
+      $this->setCreatedTime($this->getChangedTime());
+    }
+  }
+
   /**
    * Update the status of the sources when publishing an opportunity.
    */

From dc6c331272861e5a8ee295f4761b694e7c79a270 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Feb 2022 05:17:24 +0000
Subject: [PATCH 470/720] Bump follow-redirects in
 /html/themes/custom/common_design_subtheme

Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 html/themes/custom/common_design_subtheme/package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/package-lock.json b/html/themes/custom/common_design_subtheme/package-lock.json
index 76284a530..c59512f18 100644
--- a/html/themes/custom/common_design_subtheme/package-lock.json
+++ b/html/themes/custom/common_design_subtheme/package-lock.json
@@ -3932,9 +3932,9 @@
       "dev": true
     },
     "follow-redirects": {
-      "version": "1.14.7",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",
-      "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==",
+      "version": "1.14.8",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
+      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==",
       "dev": true
     },
     "for-in": {

From aceacc292602bb173ae959d3600e68f52b4967c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Feb 2022 00:46:59 +0000
Subject: [PATCH 471/720] Bump enshrined/svg-sanitize from 0.14.1 to 0.15.2

Bumps [enshrined/svg-sanitize](https://github.com/darylldoyle/svg-sanitizer) from 0.14.1 to 0.15.2.
- [Release notes](https://github.com/darylldoyle/svg-sanitizer/releases)
- [Commits](https://github.com/darylldoyle/svg-sanitizer/compare/0.14.1...0.15.2)

---
updated-dependencies:
- dependency-name: enshrined/svg-sanitize
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 composer.lock | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/composer.lock b/composer.lock
index 8d417bb80..2ea716f68 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4561,16 +4561,16 @@
         },
         {
             "name": "enshrined/svg-sanitize",
-            "version": "0.14.1",
+            "version": "0.15.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/darylldoyle/svg-sanitizer.git",
-                "reference": "307b42066fb0b76b5119f5e1f0826e18fefabe95"
+                "reference": "454682a67b335bb918952b93c4e699a36012c568"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/darylldoyle/svg-sanitizer/zipball/307b42066fb0b76b5119f5e1f0826e18fefabe95",
-                "reference": "307b42066fb0b76b5119f5e1f0826e18fefabe95",
+                "url": "https://api.github.com/repos/darylldoyle/svg-sanitizer/zipball/454682a67b335bb918952b93c4e699a36012c568",
+                "reference": "454682a67b335bb918952b93c4e699a36012c568",
                 "shasum": ""
             },
             "require": {
@@ -4579,7 +4579,6 @@
                 "php": "^7.0 || ^8.0"
             },
             "require-dev": {
-                "codeclimate/php-test-reporter": "^0.1.2",
                 "phpunit/phpunit": "^6.5 || ^8.5"
             },
             "type": "library",
@@ -4601,9 +4600,9 @@
             "description": "An SVG sanitizer for PHP",
             "support": {
                 "issues": "https://github.com/darylldoyle/svg-sanitizer/issues",
-                "source": "https://github.com/darylldoyle/svg-sanitizer/tree/0.14.1"
+                "source": "https://github.com/darylldoyle/svg-sanitizer/tree/0.15.2"
             },
-            "time": "2021-08-09T23:46:54+00:00"
+            "time": "2022-02-14T00:53:22+00:00"
         },
         {
             "name": "friends-of-behat/mink-browserkit-driver",
@@ -14603,5 +14602,5 @@
         "php": ">=8.0"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.2.0"
 }

From 0d7aaf61b7c0c32ad58dc7e4e1d0565e5e529b38 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 15 Feb 2022 01:44:45 +0000
Subject: [PATCH 472/720] [RW-138] Add file validation for visual reports

---
 .../src/Services/ReportFormAlter.php          | 40 ++++++++++++++++---
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php b/html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php
index 64aec63e4..14b3d9070 100644
--- a/html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php
+++ b/html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php
@@ -302,12 +302,42 @@ public function validateAttachment(array $form, FormStateInterface &$form_state)
       '38974' => 'Interactive',
     ];
 
-    $content_format = $form_state
-      ->getValue(['field_content_format', 0, 'target_id']);
+    $formats = $form_state->getValue(['field_content_format']);
+    if (empty($formats)) {
+      return;
+    }
 
-    // File and its preview are mandatory for visual content when publishing.
-    if (isset($visual_formats[$content_format])) {
-      // @todo add file check - RW-138.
+    // Normally there is only 1 content format allowed.
+    foreach ($formats as $item) {
+      $format = $visual_formats[$item['target_id']] ?? NULL;
+      // File and its preview are mandatory for visual content when publishing.
+      if (isset($format)) {
+        $file = $form_state->getValue(['field_file', 0, 'uuid']);
+        // #4L7i0wbW - File is mandatory.
+        if (empty($file)) {
+          $status = $this->getEntityModerationStatus($form_state);
+          if (in_array($status, ['to-review', 'published'])) {
+            $form_state->setErrorByName('field_file][add_more', $this->t('The content format is %format. You must attach a file.', [
+              '%format' => $format,
+            ]));
+          }
+        }
+        // Preview is also mandatory.
+        else {
+          $preview_file = $form_state->getValue([
+            'field_file', 0, 'preview_uuid',
+          ]);
+          $preview_page = $form_state->getValue([
+            'field_file', 0, 'preview_page',
+          ]);
+          if (empty($preview_file) || empty($preview_page)) {
+            $form_state->setErrorByName('field_file][0][preview_page', $this->t('The content format is %format. You must enable the "preview" for the attachment.', [
+              '%format' => $format,
+            ]));
+          }
+        }
+      }
+      break;
     }
   }
 

From ad5084e4b2f62412f525fa7a20a4f0f5b176e960 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 15 Feb 2022 03:13:10 +0000
Subject: [PATCH 473/720] [RW-370] Set a proper year range for the embargo date
 field

---
 .../src/Services/ReportFormAlter.php          | 31 +++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php b/html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php
index 14b3d9070..62f70bc6e 100644
--- a/html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php
+++ b/html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\reliefweb_entities\Services;
 
+use Drupal\Core\Datetime\DrupalDateTime;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
 use Drupal\reliefweb_entities\EntityFormAlterServiceBase;
@@ -55,6 +56,9 @@ protected function addBundleFormAlterations(array &$form, FormStateInterface $fo
     // the selected country values.
     $this->alterPrimaryField('field_primary_country', $form, $form_state);
 
+    // Alter the embargo field.
+    $this->alterEmbargoDateField($form, $form_state);
+
     // Alter the headline fields.
     $this->alterHeadlineFields($form, $form_state);
 
@@ -78,14 +82,35 @@ protected function addBundleFormAlterations(array &$form, FormStateInterface $fo
     // Remove Complex Emergency (41764) option for disaster type field.
     FormHelper::removeOptions($form, 'field_disaster_type', [41764]);
 
-    // Add validation callbacks for the file and embargo date fields.
+    // Validate the attachments.
     $form['#validate'][] = [$this, 'validateAttachment'];
+
+    // Validate the embargo date.
     $form['#validate'][] = [$this, 'validateEmbargoDate'];
 
     // Prevent saving from a blocked source.
     $form['#validate'][] = [$this, 'validateBlockedSource'];
   }
 
+  /**
+   * Modify the embargo date field.
+   *
+   * Set a proper range for the year widget (current year up to 1 year after).
+   *
+   * @param array $form
+   *   Form to alter.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   Form state.
+   *
+   * @see https://www.drupal.org/project/drupal/issues/2836054
+   */
+  protected function alterEmbargoDateField(array &$form, FormStateInterface $form_state) {
+    $min_year = gmdate('Y');
+    $max_year = $min_year + 1;
+
+    $form['field_embargo_date']['widget'][0]['value']['#date_year_range'] = $min_year . ':' . $max_year;
+  }
+
   /**
    * Modify the headline fields.
    *
@@ -353,7 +378,9 @@ public function validateAttachment(array $form, FormStateInterface &$form_state)
    */
   public function validateEmbargoDate(array $form, FormStateInterface &$form_state) {
     $embargo_date = $form_state->getValue(['field_embargo_date', 0, 'value']);
-    if (!empty($embargo_date) && $embargo_date->getTimestamp() < time()) {
+    // If there is a valid date (with year, month etc.), then $embargo_date
+    // is a \Drupal\Core\Datetime\DrupalDateTime instance...
+    if (!empty($embargo_date) && $embargo_date instanceof DrupalDateTime && $embargo_date->getTimestamp() < time()) {
       $form_state->setErrorByName('field_embargo_date][0][value', $this->t('The embargo date cannot be in the past.'));
     }
   }

From cec4ff2d6103f9637c06fa2f6937a9ee0a58c257 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 15 Feb 2022 03:39:38 +0000
Subject: [PATCH 474/720] [RW-385] Add logic for report embargo date

---
 .../reliefweb_entities.module                 | 37 +++++++++++++++++++
 .../reliefweb_entities/src/Entity/Report.php  | 15 +++++++-
 .../src/Helpers/DateHelper.php                |  6 ++-
 3 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/reliefweb_entities/reliefweb_entities.module b/html/modules/custom/reliefweb_entities/reliefweb_entities.module
index 82d2c9576..30dedc745 100644
--- a/html/modules/custom/reliefweb_entities/reliefweb_entities.module
+++ b/html/modules/custom/reliefweb_entities/reliefweb_entities.module
@@ -11,6 +11,7 @@ use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\reliefweb_entities\EntityFormAlterServiceBase;
+use Drupal\reliefweb_utility\Helpers\DateHelper;
 use Drupal\reliefweb_utility\Helpers\MailHelper;
 use Drupal\reliefweb_utility\Helpers\TaxonomyHelper;
 use Drupal\reliefweb_utility\Helpers\TextHelper;
@@ -514,3 +515,39 @@ function reliefweb_entities_mail($key, array &$message, array $parameters) {
     }
   }
 }
+
+/**
+ * Implements hook_cron().
+ *
+ * This performs the following tasks:
+ * - Publish embargoed documents.
+ *
+ * At max 20 nodes of each type is processed at once to avoid clogging the cron
+ * process and using excessive resources.
+ */
+function reliefweb_moderation_cron() {
+  $storage = \Drupal::entityTypeManager()->getStorage('node');
+
+  // Publish embargoed reports.
+  $ids = $storage
+    ->getQuery()
+    ->condition('type', 'report', '=')
+    ->condition('field_embargo_date.value', gmdate("Y-m-d\TH:i:s"), '<')
+    ->execute();
+
+  if (!empty($ids)) {
+    $reports = $storage->loadMultiple($ids) ?? [];
+    foreach ($reports as $report) {
+      $timestamp = DateHelper::getDateTimeStamp($report->field_embargo_date->value);
+      $report->setCreatedTime($timestamp);
+      $report->setModerationStatus('published');
+      $report->field_embargo_date->setValue([]);
+      $report->setNewRevision(TRUE);
+      $report->setRevisionUserId(2);
+      $report->setRevisionLogMessage(strtr('Embargoed automatically document published on @date.', [
+        '@date' => DateHelper::format($timestamp, 'custom', 'd M Y H:i e'),
+      ]));
+      $report->save();
+    }
+  }
+}
diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Report.php b/html/modules/custom/reliefweb_entities/src/Entity/Report.php
index 20500ee9b..55d990b65 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Report.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Report.php
@@ -197,7 +197,7 @@ public function getAttachments(?array $build = NULL) {
   public function preSave(EntityStorageInterface $storage) {
     parent::preSave($storage);
 
-    // Change the publication date if bury is selected to the original
+    // Change the publication date if bury is selected, to the original
     // publication date.
     if (!empty($this->field_bury->value) && !$this->field_original_publication_date->isEmpty()) {
       $date = $this->field_original_publication_date->value;
@@ -226,6 +226,19 @@ public function preSave(EntityStorageInterface $storage) {
       }
     }
 
+    // Change the status to `embargoed` if there is an embargo date.
+    if (!empty($this->field_embargo_date->value) && $this->getModerationStatus() !== 'draft') {
+      $this->setModerationStatus('embargoed');
+
+      $message = strtr('Embargoed (to be automatically published on @date).', [
+        '@date' => DateHelper::format($this->field_embargo_date->value, 'custom', 'd M Y H:i e'),
+      ]);
+
+      $log = trim($this->getRevisionLogMessage());
+      $log = $message . (!empty($log) ? "\n" . $log : '');
+      $this->setRevisionLogMessage($log);
+    }
+
     // Prepare notifications.
     $this->preparePublicationNotification();
   }
diff --git a/html/modules/custom/reliefweb_utility/src/Helpers/DateHelper.php b/html/modules/custom/reliefweb_utility/src/Helpers/DateHelper.php
index 2e176dd82..19e1d6342 100644
--- a/html/modules/custom/reliefweb_utility/src/Helpers/DateHelper.php
+++ b/html/modules/custom/reliefweb_utility/src/Helpers/DateHelper.php
@@ -45,6 +45,10 @@ public static function getDateTimeStamp($date) {
   /**
    * Format a date.
    *
+   * Wrapper around DateFormatter::format() that accepts various types for the
+   * date parameter and convert it to a timestamp and also using UTC as default
+   * timezone.
+   *
    * @param mixed $date
    *   Date field value.
    * @param string $type
@@ -72,7 +76,7 @@ public static function getDateTimeStamp($date) {
    *   contain user input, this value should be escaped when output.
    *   An empty string is returned if the date couldn't be formatted.
    */
-  public static function format($date, $type = 'medium', $format = '', $timezone = NULL, $langcode = NULL) {
+  public static function format($date, $type = 'medium', $format = '', $timezone = 'UTC', $langcode = NULL) {
     $timestamp = static::getDateTimeStamp($date);
     if (empty($timestamp)) {
       return '';

From 47f9e6d7ead88294c8fd2ffd63634d53cd2cd785 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 15 Feb 2022 06:21:20 +0000
Subject: [PATCH 475/720] [RW-386] Change status of expired jobs and training
 on cron runs

---
 config/reliefweb_entities.settings.yml        |  4 ++
 .../install/reliefweb_entities.settings.yml   |  6 +++
 .../schema/reliefweb_entities.schema.yml      | 22 +++++++++
 .../reliefweb_entities.module                 | 46 +++++++++++++++++--
 .../reliefweb_entities/src/Entity/Source.php  |  2 +-
 5 files changed, 75 insertions(+), 5 deletions(-)
 create mode 100644 html/modules/custom/reliefweb_entities/config/schema/reliefweb_entities.schema.yml

diff --git a/config/reliefweb_entities.settings.yml b/config/reliefweb_entities.settings.yml
index fb7c21bb3..bde780e78 100644
--- a/config/reliefweb_entities.settings.yml
+++ b/config/reliefweb_entities.settings.yml
@@ -5,3 +5,7 @@ allowed_social_media_links:
   linkedin: LinkedIn
   twitter: Twitter
   youtube: YouTube
+cron:
+  embargoed_reports_limit: 20
+  expired_jobs_limit: 20
+  expired_training_limit: 20
diff --git a/html/modules/custom/reliefweb_entities/config/install/reliefweb_entities.settings.yml b/html/modules/custom/reliefweb_entities/config/install/reliefweb_entities.settings.yml
index fe211671a..3da71105f 100644
--- a/html/modules/custom/reliefweb_entities/config/install/reliefweb_entities.settings.yml
+++ b/html/modules/custom/reliefweb_entities/config/install/reliefweb_entities.settings.yml
@@ -1,3 +1,4 @@
+# Allowed social media links.
 allowed_social_media_links:
   facebook: 'Facebook'
   instagram: 'Instagram'
@@ -5,3 +6,8 @@ allowed_social_media_links:
   linkedin: 'LinkedIn'
   twitter: 'Twitter'
   youtube: 'YouTube'
+# Entity related cron task settings.
+cron:
+  embargoed_reports_limit: 20
+  expired_jobs_limit: 20
+  expired_training_limit: 20
diff --git a/html/modules/custom/reliefweb_entities/config/schema/reliefweb_entities.schema.yml b/html/modules/custom/reliefweb_entities/config/schema/reliefweb_entities.schema.yml
new file mode 100644
index 000000000..3390e22fe
--- /dev/null
+++ b/html/modules/custom/reliefweb_entities/config/schema/reliefweb_entities.schema.yml
@@ -0,0 +1,22 @@
+reliefweb_entities.settings:
+  type: config_object
+  label: 'Reliefweb Entities settings'
+  mapping:
+    allowed_social_media_links:
+      type: sequence
+      label: 'Allowed social media links'
+      sequence:
+        type: string
+    cron:
+      type: mapping
+      label: 'Entity related cron task settings'
+      mapping:
+        embargoed_reports_limit:
+          type: integer
+          label: 'Maximum number of embargoed reports to publish at once'
+        expired_jobs_limit:
+          type: integer
+          label: 'Maximum number of published jobs to expire at once'
+        expired_training_limit:
+          type: integer
+          label: 'Maximum number of published training to expire at once'
diff --git a/html/modules/custom/reliefweb_entities/reliefweb_entities.module b/html/modules/custom/reliefweb_entities/reliefweb_entities.module
index 30dedc745..4b8815970 100644
--- a/html/modules/custom/reliefweb_entities/reliefweb_entities.module
+++ b/html/modules/custom/reliefweb_entities/reliefweb_entities.module
@@ -521,22 +521,25 @@ function reliefweb_entities_mail($key, array &$message, array $parameters) {
  *
  * This performs the following tasks:
  * - Publish embargoed documents.
+ * - Expire jobs and training.
  *
  * At max 20 nodes of each type is processed at once to avoid clogging the cron
  * process and using excessive resources.
  */
 function reliefweb_moderation_cron() {
   $storage = \Drupal::entityTypeManager()->getStorage('node');
+  $cron_settings = \Drupal::config('reliefweb_entities.settings')->get('cron') ?? [];
 
   // Publish embargoed reports.
-  $ids = $storage
+  $embargoed_ids = $storage
     ->getQuery()
     ->condition('type', 'report', '=')
     ->condition('field_embargo_date.value', gmdate("Y-m-d\TH:i:s"), '<')
+    ->range(0, $cron_settings['embargoed_reports_limit'] ?? 20)
     ->execute();
 
-  if (!empty($ids)) {
-    $reports = $storage->loadMultiple($ids) ?? [];
+  if (!empty($embargoed_ids)) {
+    $reports = $storage->loadMultiple($embargoed_ids) ?? [];
     foreach ($reports as $report) {
       $timestamp = DateHelper::getDateTimeStamp($report->field_embargo_date->value);
       $report->setCreatedTime($timestamp);
@@ -544,10 +547,45 @@ function reliefweb_moderation_cron() {
       $report->field_embargo_date->setValue([]);
       $report->setNewRevision(TRUE);
       $report->setRevisionUserId(2);
-      $report->setRevisionLogMessage(strtr('Embargoed automatically document published on @date.', [
+      $report->setRevisionLogMessage(strtr('Embargoed document automatically published on @date.', [
         '@date' => DateHelper::format($timestamp, 'custom', 'd M Y H:i e'),
       ]));
       $report->save();
     }
   }
+
+  // Change status of expired jobs and training.
+  $expired_ids = [];
+  $time = gmmktime(0, 0, 0);
+  $date = gmdate("Y-m-d", $time);
+
+  $expired_ids += $storage
+    ->getQuery()
+    ->condition('type', 'job', '=')
+    ->condition('moderation_status', 'published', '=')
+    ->condition('field_job_closing_date.value', $date, '<')
+    ->range(0, $cron_settings['expired_jobs_limit'] ?? 20)
+    ->execute();
+
+  $expired_ids += $storage
+    ->getQuery()
+    ->condition('type', 'training', '=')
+    ->condition('moderation_status', 'published', '=')
+    ->condition('field_registration_deadline.value', $date, '<')
+    ->range(0, $cron_settings['expired_training_limit'] ?? 20)
+    ->execute();
+
+  if (!empty($expired_ids)) {
+    $nodes = $storage->loadMultiple($expired_ids) ?? [];
+    foreach ($nodes as $node) {
+      $node->setModerationStatus('expired');
+      $node->setNewRevision(TRUE);
+      $node->setRevisionUserId(2);
+      $node->setRevisionLogMessage(strtr('@type automatically expired on @date.', [
+        '@type' => ucfirst($node->bundle()),
+        '@date' => DateHelper::format($time, 'custom', 'd M Y H:i e'),
+      ]));
+      $node->save();
+    }
+  }
 }
diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Source.php b/html/modules/custom/reliefweb_entities/src/Entity/Source.php
index c3ef8b380..99f1487da 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Source.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Source.php
@@ -210,7 +210,7 @@ protected function getOrganizationSocialMediaLinks() {
     if (!$this->field_links->isEmpty()) {
       // Get the list of allowed social media.
       $allowed = \Drupal::config('reliefweb_entities.settings')
-        ->get('allowed_social_media_links', []);
+        ->get('allowed_social_media_links') ?? [];
 
       // Prepare the links.
       foreach ($this->field_links as $link) {

From 9b4f2f02056b36fd9ca718395e5b964a41ea1f43 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 16 Feb 2022 00:51:56 +0000
Subject: [PATCH 476/720] [RW-387] Add a hook_entity_after_save() that can be
 used to index entities in the API after it is actually saved in the database

---
 .../custom/reliefweb_api/reliefweb_api.module |  37 +++---
 .../reliefweb_entities.module                 | 106 ++++++++----------
 .../src/BundleEntityStorageInterface.php      |  17 +++
 .../src/BundleNodeStorage.php                 |  22 ++++
 .../src/BundleTaxonomyTermStorage.php         |  22 ++++
 .../src/Helpers/ClassHelper.php               |  33 ++++++
 6 files changed, 156 insertions(+), 81 deletions(-)
 create mode 100644 html/modules/custom/reliefweb_entities/src/BundleEntityStorageInterface.php
 create mode 100644 html/modules/custom/reliefweb_entities/src/BundleNodeStorage.php
 create mode 100644 html/modules/custom/reliefweb_entities/src/BundleTaxonomyTermStorage.php
 create mode 100644 html/modules/custom/reliefweb_utility/src/Helpers/ClassHelper.php

diff --git a/html/modules/custom/reliefweb_api/reliefweb_api.module b/html/modules/custom/reliefweb_api/reliefweb_api.module
index 7814e48a8..2197dbc52 100644
--- a/html/modules/custom/reliefweb_api/reliefweb_api.module
+++ b/html/modules/custom/reliefweb_api/reliefweb_api.module
@@ -12,20 +12,11 @@ use RWAPIIndexer\Bundles;
 use RWAPIIndexer\Manager;
 
 /**
- * Implements hook_entity_insert().
- */
-function reliefweb_api_entity_insert(EntityInterface $entity) {
-  // @todo remove when removing `reliefweb_migrate`.
-  if (!empty($entity->_is_migrating)) {
-    return;
-  }
-  reliefweb_api_handle_entity($entity);
-}
-
-/**
- * Implements hook_entity_update().
+ * Implements hook_entity_after_save().
+ *
+ * @see \Drupal\reliefweb_entities\BundleEntityStorageInterface
  */
-function reliefweb_api_entity_update(EntityInterface $entity) {
+function reliefweb_api_entity_after_save(EntityInterface $entity) {
   // @todo remove when removing `reliefweb_migrate`.
   if (!empty($entity->_is_migrating)) {
     return;
@@ -85,8 +76,8 @@ function reliefweb_api_handle_entity(EntityInterface $entity, $delete = FALSE) {
     'tag' => \Drupal::state()->get('reliefweb_api_index_tag_' . $bundle, ''),
   ];
 
-  // Register the actual indexing or deletion to run on script shutdown.
-  drupal_register_shutdown_function('reliefweb_api_execute', $options, $entity_type_id);
+  // Index/delete the entity.
+  reliefweb_api_execute($options, $entity_type_id);
 }
 
 /**
@@ -181,9 +172,17 @@ function reliefweb_api_reliefweb_api_post_indexing($entity_type_id, $bundle, $en
  *   TRUE if the indexer is available.
  */
 function reliefweb_api_indexer_available() {
-  if (!class_exists('\RWAPIIndexer\Manager')) {
-    \Drupal::logger('reliefweb_api')->warning('ReliefWeb API Indexer class missing.');
-    return FALSE;
+  static $available;
+
+  if (!isset($available)) {
+    if (!class_exists('\RWAPIIndexer\Manager')) {
+      \Drupal::logger('reliefweb_api')->warning('ReliefWeb API Indexer class missing.');
+      $available = FALSE;
+    }
+    else {
+      $available = TRUE;
+    }
   }
-  return TRUE;
+
+  return $available;
 }
diff --git a/html/modules/custom/reliefweb_entities/reliefweb_entities.module b/html/modules/custom/reliefweb_entities/reliefweb_entities.module
index 4b8815970..21788b5f2 100644
--- a/html/modules/custom/reliefweb_entities/reliefweb_entities.module
+++ b/html/modules/custom/reliefweb_entities/reliefweb_entities.module
@@ -10,76 +10,27 @@ use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\BubbleableMetadata;
+use Drupal\reliefweb_entities\BundleEntityInterface;
+use Drupal\reliefweb_entities\BundleEntityStorageInterface;
 use Drupal\reliefweb_entities\EntityFormAlterServiceBase;
+use Drupal\reliefweb_utility\Helpers\ClassHelper;
 use Drupal\reliefweb_utility\Helpers\DateHelper;
 use Drupal\reliefweb_utility\Helpers\MailHelper;
 use Drupal\reliefweb_utility\Helpers\TaxonomyHelper;
 use Drupal\reliefweb_utility\Helpers\TextHelper;
 use Drupal\taxonomy\TermInterface;
 
-/**
- * Get the list of entity bundle classes.
- *
- * @return array
- *   List of entity bundle classes, keyed by entity type id then bundle. Each
- *   item has a class and label attributes.
- */
-function reliefweb_entities_get_entity_bundle_classes() {
-  return [
-    'node' => [
-      'announcement' => [
-        'class' => '\Drupal\reliefweb_entities\Entity\Announcement',
-        'label' => 'Announcement',
-      ],
-      'blog_post' => [
-        'class' => '\Drupal\reliefweb_entities\Entity\BlogPost',
-        'label' => 'Blog Post',
-      ],
-      'book' => [
-        'class' => '\Drupal\reliefweb_entities\Entity\Book',
-        'label' => 'Book',
-      ],
-      'job' => [
-        'class' => '\Drupal\reliefweb_entities\Entity\Job',
-        'label' => 'Job',
-      ],
-      'report' => [
-        'class' => '\Drupal\reliefweb_entities\Entity\Report',
-        'label' => 'Report',
-      ],
-      'topic' => [
-        'class' => '\Drupal\reliefweb_entities\Entity\Topic',
-        'label' => 'Topic',
-      ],
-      'training' => [
-        'class' => '\Drupal\reliefweb_entities\Entity\Training',
-        'label' => 'Training',
-      ],
-    ],
-    'taxonomy_term' => [
-      'country' => [
-        'class' => '\Drupal\reliefweb_entities\Entity\Country',
-        'label' => 'Country',
-      ],
-      'disaster' => [
-        'class' => '\Drupal\reliefweb_entities\Entity\Disaster',
-        'label' => 'Disaster',
-      ],
-      'source' => [
-        'class' => '\Drupal\reliefweb_entities\Entity\Source',
-        'label' => 'Source',
-      ],
-    ],
-  ];
-}
-
 /**
  * Implements hook_entity_bundle_field_info_alter().
  */
 function reliefweb_entities_entity_bundle_field_info_alter(array &$fields, EntityTypeInterface $entity_type, $bundle) {
-  $entity_bundle_classes = reliefweb_entities_get_entity_bundle_classes();
-  if (isset($entity_bundle_classes[$entity_type->id()][$bundle]['class'])) {
-    $class = $entity_bundle_classes[$entity_type->id()][$bundle]['class'];
+  $namespace = '\Drupal\reliefweb_entities\Entity';
+
+  $class = ClassHelper::classExists($namespace, $bundle);
+  if ($class === FALSE) {
+    $class = ClassHelper::classExists($namespace, $entity_type->id() . 'Base');
+  }
+  if ($class !== FALSE && is_subclass_of($class, BundleEntityInterface::class)) {
     $class::addFieldConstraints($fields);
   }
 }
@@ -90,11 +41,42 @@ function reliefweb_entities_entity_bundle_field_info_alter(array &$fields, Entit
  * Add bundle classes to nodes and terms to handle business logic.
  */
 function reliefweb_entities_entity_bundle_info_alter(&$bundles) {
-  foreach (reliefweb_entities_get_entity_bundle_classes() as $entity_type_id => $items) {
+  $namespace = '\Drupal\reliefweb_entities\Entity';
+
+  foreach ($bundles as $entity_type_id => $items) {
     foreach ($items as $bundle => $info) {
-      foreach ($info as $property => $value) {
-        $bundles[$entity_type_id][$bundle][$property] = $value;
+      $class = ClassHelper::classExists($namespace, $bundle);
+      if ($class === FALSE) {
+        $class = ClassHelper::classExists($namespace, $entity_type_id . 'Base');
       }
+      if ($class !== FALSE && is_subclass_of($class, BundleEntityInterface::class)) {
+        $label = ucwords(str_replace(['_', '-'], ' ', $bundle));
+        $bundles[$entity_type_id][$bundle]['class'] = $class;
+        $bundles[$entity_type_id][$bundle]['label'] = $label;
+      }
+    }
+  }
+}
+
+/**
+ * Implements hook_entity_type_alter().
+ *
+ * Override content entity storages so we can add post transaction hooks.
+ */
+function reliefweb_entities_entity_type_alter(array &$entity_types) {
+  $namespace = '\Drupal\reliefweb_entities';
+
+  /** @var \Drupal\Core\Entity\EntityTypeInterface $entity_type */
+  foreach ($entity_types as $entity_type_id => $entity_type) {
+    $storage_class = $entity_type->getStorageClass();
+    if (empty($storage_class)) {
+      break;
+    }
+
+    $classname = ClassHelper::toCamelCase($entity_type_id);
+    $class = ClassHelper::classExists($namespace, 'Bundle' . $classname . 'Storage');
+    if ($class !== FALSE && is_subclass_of($class, $storage_class) && is_subclass_of($class, BundleEntityStorageInterface::class)) {
+      $entity_type->setStorageClass($class);
     }
   }
 }
diff --git a/html/modules/custom/reliefweb_entities/src/BundleEntityStorageInterface.php b/html/modules/custom/reliefweb_entities/src/BundleEntityStorageInterface.php
new file mode 100644
index 000000000..d4dfb259b
--- /dev/null
+++ b/html/modules/custom/reliefweb_entities/src/BundleEntityStorageInterface.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Drupal\reliefweb_entities;
+
+/**
+ * Interface for bundle entity storages.
+ *
+ * Storages implementing this interface should extends their ::save() method
+ * and call `$this->invokeHook('after_save', $entity);` to allow other modules
+ * to interact with an entity after it is saved in the database because Drupal
+ * doesn't provide such functionality...
+ *
+ * @see https://www.drupal.org/project/drupal/issues/2992426
+ */
+interface BundleEntityStorageInterface {
+
+}
diff --git a/html/modules/custom/reliefweb_entities/src/BundleNodeStorage.php b/html/modules/custom/reliefweb_entities/src/BundleNodeStorage.php
new file mode 100644
index 000000000..c909b8fed
--- /dev/null
+++ b/html/modules/custom/reliefweb_entities/src/BundleNodeStorage.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Drupal\reliefweb_entities;
+
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\node\NodeStorage;
+
+/**
+ * Interface for bundle entities.
+ */
+class BundleNodeStorage extends NodeStorage implements BundleEntityStorageInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function save(EntityInterface $entity) {
+    parent::save($entity);
+
+    $this->invokeHook('after_save', $entity);
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_entities/src/BundleTaxonomyTermStorage.php b/html/modules/custom/reliefweb_entities/src/BundleTaxonomyTermStorage.php
new file mode 100644
index 000000000..709edf3b0
--- /dev/null
+++ b/html/modules/custom/reliefweb_entities/src/BundleTaxonomyTermStorage.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Drupal\reliefweb_entities;
+
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\taxonomy\TermStorage;
+
+/**
+ * Interface for bundle entities.
+ */
+class BundleTaxonomyTermStorage extends TermStorage implements BundleEntityStorageInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function save(EntityInterface $entity) {
+    parent::save($entity);
+
+    $this->invokeHook('after_save', $entity);
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_utility/src/Helpers/ClassHelper.php b/html/modules/custom/reliefweb_utility/src/Helpers/ClassHelper.php
new file mode 100644
index 000000000..20eae41b1
--- /dev/null
+++ b/html/modules/custom/reliefweb_utility/src/Helpers/ClassHelper.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Drupal\reliefweb_utility\Helpers;
+
+/**
+ * Helper to manipulate classes.
+ */
+class ClassHelper {
+
+  /**
+   * Check if a class exists, converting the given class name to camel case.
+   *
+   * @param string $namespace
+   *   Namespace.
+   * @param string $classname
+   *   Class name.
+   *
+   * @return string|false
+   *   Namespaced class name or FALSE if it was not found.
+   */
+  public static function classExists($namespace, $classname) {
+    $class = rtrim($namespace, '\\') . '\\' . static::toCamelCase($classname);
+    return class_exists($class) ? $class : FALSE;
+  }
+
+  /**
+   * Convert the give string to camel case.
+   */
+  public static function toCamelCase($string) {
+    return str_replace(['_', '-', ' '], '', ucwords($string, '_- '));
+  }
+
+}

From 9a9ed65a45f124f6fa6579a40eb4c0bcbd2ed316 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 16 Feb 2022 01:04:02 +0000
Subject: [PATCH 477/720] [RW-375] Fix links to countries, disasters and
 sources on job, report and training pages

---
 .../reliefweb_entities/src/DocumentInterface.php |  7 ++++---
 .../reliefweb_entities/src/DocumentTrait.php     | 16 ++++++++++++----
 .../custom/reliefweb_entities/src/Entity/Job.php |  4 ++--
 .../reliefweb_entities/src/Entity/Report.php     |  6 +++---
 .../reliefweb_entities/src/Entity/Training.php   |  4 ++--
 5 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/html/modules/custom/reliefweb_entities/src/DocumentInterface.php b/html/modules/custom/reliefweb_entities/src/DocumentInterface.php
index 29f5e6745..0656f8f44 100644
--- a/html/modules/custom/reliefweb_entities/src/DocumentInterface.php
+++ b/html/modules/custom/reliefweb_entities/src/DocumentInterface.php
@@ -47,8 +47,9 @@ public function getRelatedContent($limit = 4);
    *
    * @param string $field
    *   Field name without the `field_` prefix.
-   * @param string $code
-   *   Advanced search code for the field.
+   * @param string|null $code
+   *   Advanced search code for the field. If defined the reference term will
+   *   link to the filtered river otherwise it will link to the term page.
    * @param array $extra_fields
    *   List of additional properties to add to the items. By default, the
    *   shortname if defined is added.
@@ -57,7 +58,7 @@ public function getRelatedContent($limit = 4);
    *   List of meta items for the field with name, url and some additional
    *   properties like shortname.
    */
-  public function getEntityMetaFromField($field, $code, array $extra_fields = ['shortname' => 'shortname']);
+  public function getEntityMetaFromField($field, $code = NULL, array $extra_fields = ['shortname' => 'shortname']);
 
   /**
    * Get the entity ids from a entity reference field.
diff --git a/html/modules/custom/reliefweb_entities/src/DocumentTrait.php b/html/modules/custom/reliefweb_entities/src/DocumentTrait.php
index 1ea71c377..b46a64c5b 100644
--- a/html/modules/custom/reliefweb_entities/src/DocumentTrait.php
+++ b/html/modules/custom/reliefweb_entities/src/DocumentTrait.php
@@ -268,7 +268,7 @@ protected function getReportInOtherLanguages() {
    *
    * @see Drupal\reliefweb_entities\DocumentInterface::getEntityMetaFromField()
    */
-  public function getEntityMetaFromField($field, $code, array $extra_fields = ['shortname' => 'shortname']) {
+  public function getEntityMetaFromField($field, $code = NULL, array $extra_fields = ['shortname' => 'shortname']) {
     $field = 'field_' . $field;
 
     if (!$this->hasField($field) || !$this->{$field} instanceof EntityReferenceFieldItemList) {
@@ -287,11 +287,19 @@ public function getEntityMetaFromField($field, $code, array $extra_fields = ['sh
       if ($entity instanceof EntityModeratedInterface && !$entity->access('view')) {
         continue;
       }
+
+      if ($code !== NULL) {
+        $url = RiverServiceBase::getRiverUrl($this->bundle(), [
+          'advanced-search' => '(' . $code . $entity->id() . ')',
+        ]);
+      }
+      else {
+        $url = $entity->toUrl();
+      }
+
       $item = [
         'name' => $entity->label(),
-        'url' => RiverServiceBase::getRiverUrl($this->bundle(), [
-          'advanced-search' => '(' . $code . $entity->id() . ')',
-        ]),
+        'url' => $url,
       ];
 
       if (!empty($main_id) && $entity->id() === $main_id) {
diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Job.php b/html/modules/custom/reliefweb_entities/src/Entity/Job.php
index a6fb1e95a..a49d6bbf6 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Job.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Job.php
@@ -80,8 +80,8 @@ public function getEntityMeta() {
     return [
       'posted' => $this->createDate($this->getCreatedTime()),
       'closing' => $this->createDate($this->field_job_closing_date->value),
-      'country' => $this->getEntityMetaFromField('country', 'C'),
-      'source' => $this->getEntityMetaFromField('source', 'S'),
+      'country' => $this->getEntityMetaFromField('country'),
+      'source' => $this->getEntityMetaFromField('source'),
       'city' => $this->field_city->value ?? '',
       'type' => $this->getEntityMetaFromField('job_type', 'TY'),
       'career_category' => $this->getEntityMetaFromField('career_categories', 'CC'),
diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Report.php b/html/modules/custom/reliefweb_entities/src/Entity/Report.php
index 55d990b65..049eafa1a 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Report.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Report.php
@@ -57,9 +57,9 @@ public function getEntityMeta() {
       'origin' => $origin,
       'posted' => $this->createDate($this->getCreatedTime()),
       'published' => $this->createDate($this->field_original_publication_date->value),
-      'country' => $this->getEntityMetaFromField('country', 'C'),
-      'source' => $this->getEntityMetaFromField('source', 'S'),
-      'disaster' => $this->getEntityMetaFromField('disaster', 'D'),
+      'country' => $this->getEntityMetaFromField('country'),
+      'source' => $this->getEntityMetaFromField('source'),
+      'disaster' => $this->getEntityMetaFromField('disaster'),
       'format' => $this->getEntityMetaFromField('content_format', 'F'),
       'theme' => $this->getEntityMetaFromField('theme', 'T'),
       'disaster_type' => $this->getEntityMetaFromField('disaster_type', 'DT'),
diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Training.php b/html/modules/custom/reliefweb_entities/src/Entity/Training.php
index ab4f218b0..1f0953244 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Training.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Training.php
@@ -85,8 +85,8 @@ public function getEntityMeta() {
       'start' => static::createDate($this->field_training_date->value),
       'end' => static::createDate($this->field_training_date->end_value),
       'event_url' => $event_url,
-      'country' => $this->getEntityMetaFromField('country', 'C'),
-      'source' => $this->getEntityMetaFromField('source', 'S'),
+      'country' => $this->getEntityMetaFromField('country'),
+      'source' => $this->getEntityMetaFromField('source'),
       'city' => $this->field_city->value ?? '',
       'format' => $this->getEntityMetaFromField('training_format', 'F'),
       'category' => $this->getEntityMetaFromField('training_type', 'TY'),

From 09fa33cbb18c127ca4518aa6bb364abf95b0c1fb Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 16 Feb 2022 01:10:19 +0000
Subject: [PATCH 478/720] [RW-376] Add 'version' suffix to file description
 when language was selected

---
 .../src/Plugin/Field/FieldFormatter/ReliefWebFile.php    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldFormatter/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldFormatter/ReliefWebFile.php
index 521cc469e..bd9931caf 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldFormatter/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldFormatter/ReliefWebFile.php
@@ -28,6 +28,13 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
       if (!empty($url)) {
         $languages = reliefweb_docstore_get_languages();
 
+        $version = '';
+        if (isset($languages[$item->getFileLanguage()])) {
+          $version = $this->t('@language version', [
+            '@language' => $languages[$item->getFileLanguage()],
+          ]);
+        }
+
         $list[] = [
           'item' => $item,
           'url' => $url->toString(),
@@ -39,7 +46,7 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
             format_size($item->getFileSize()),
             implode(' - ', array_filter([
               $item->getFileDescription(),
-              $languages[$item->getFileLanguage()] ?? '',
+              $version,
             ])),
           ])) . ')',
         ];

From 19f213421079c30d7f97e4535f83f9c574f8b4f5 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 16 Feb 2022 01:22:02 +0000
Subject: [PATCH 479/720] [RW-378] Make profile links more flexible for
 internal URLs and with a more explicit error message

---
 .../src/Plugin/Field/FieldWidget/ReliefWebLinks.php          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebLinks.php b/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebLinks.php
index 1d28d8db6..af54bd2f5 100644
--- a/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebLinks.php
+++ b/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebLinks.php
@@ -235,7 +235,7 @@ public static function parseLinkData(array &$item, $internal, $use_cover, $gener
 
       // Only nodes are supported as internal links.
       if (empty($path)) {
-        $invalid = t('Invalid internal URL.');
+        $invalid = t('Invalid internal URL: it must be in the form "/node/123456" or "/reports/xxx" (it can start with https://reliefweb.int).');
       }
       elseif (strpos($path, '/node/') === 0 && strlen($path) > 6) {
         $nid = intval(substr($path, 6), 10);
@@ -341,7 +341,8 @@ public static function getInternalPath($url) {
       }
     }
     // Resolve aliases to their corresponding internal path.
-    $path = UrlHelper::getPathFromAlias(urldecode($parts['path']));
+    $path = '/' . ltrim($parts['path'], '/');
+    $path = UrlHelper::getPathFromAlias(urldecode($path));
 
     // Only accept links resolved to a node internal path.
     return preg_match('#^/node/[0-9]+$#', $path) === 1 ? $path : '';

From b17e250b5646ea383d35b475548d4be69f2400b4 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 16 Feb 2022 01:52:14 +0000
Subject: [PATCH 480/720] [RW-363] Remove body and how to apply text length
 constraints - this is still checked in the job importer

---
 .../custom/reliefweb_entities/src/Entity/Job.php     | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Job.php b/html/modules/custom/reliefweb_entities/src/Entity/Job.php
index a49d6bbf6..b7583f272 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Job.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Job.php
@@ -37,18 +37,6 @@ public function getApiResource() {
    * {@inheritdoc}
    */
   public static function addFieldConstraints(&$fields) {
-    // Restrict body length.
-    $fields['body']->addConstraint('TextLengthWithinRange', [
-      'min' => 400,
-      'max' => 50000,
-    ]);
-
-    // Restrict how to apply length.
-    $fields['field_how_to_apply']->addConstraint('TextLengthWithinRange', [
-      'min' => 100,
-      'max' => 10000,
-    ]);
-
     // The city field cannot have a value if the country field is empty.
     $fields['field_city']->addConstraint('EmptyIfOtherFieldEmpty', [
       'otherFieldName' => 'field_country',

From adfb92fe36ffd873591fd9aa20c5c50a683919a7 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 16 Feb 2022 03:10:41 +0000
Subject: [PATCH 481/720] [RW-247] Add river RSS and API links

---
 config/reliefweb_rivers.settings.yml          |  1 +
 .../install/reliefweb_rivers.settings.yml     |  2 +
 .../config/schema/reliefweb_rivers.schema.yml |  7 ++
 .../reliefweb_rivers.services.yml             | 16 ++---
 .../reliefweb_rivers/src/RiverServiceBase.php | 70 ++++++++++++++++++-
 .../src/RiverServiceInterface.php             | 20 +++++-
 .../src/Services/TopicRiver.php               | 10 +++
 .../reliefweb-rivers-links.html.twig          | 25 +++++++
 .../common_design_subtheme.libraries.yml      |  1 +
 .../components/rw-river/rw-river-links.css    | 24 +++++++
 10 files changed, 165 insertions(+), 11 deletions(-)
 create mode 100644 config/reliefweb_rivers.settings.yml
 create mode 100644 html/modules/custom/reliefweb_rivers/config/install/reliefweb_rivers.settings.yml
 create mode 100644 html/modules/custom/reliefweb_rivers/config/schema/reliefweb_rivers.schema.yml
 create mode 100644 html/themes/custom/common_design_subtheme/components/rw-river/rw-river-links.css

diff --git a/config/reliefweb_rivers.settings.yml b/config/reliefweb_rivers.settings.yml
new file mode 100644
index 000000000..d7b002197
--- /dev/null
+++ b/config/reliefweb_rivers.settings.yml
@@ -0,0 +1 @@
+search_converter_url: https://reliefweb.github.io/search-converter
diff --git a/html/modules/custom/reliefweb_rivers/config/install/reliefweb_rivers.settings.yml b/html/modules/custom/reliefweb_rivers/config/install/reliefweb_rivers.settings.yml
new file mode 100644
index 000000000..0b197152a
--- /dev/null
+++ b/html/modules/custom/reliefweb_rivers/config/install/reliefweb_rivers.settings.yml
@@ -0,0 +1,2 @@
+# URL to the API search converter.
+search_converter_url: https://reliefweb.github.io/search-converter
diff --git a/html/modules/custom/reliefweb_rivers/config/schema/reliefweb_rivers.schema.yml b/html/modules/custom/reliefweb_rivers/config/schema/reliefweb_rivers.schema.yml
new file mode 100644
index 000000000..49b0d2480
--- /dev/null
+++ b/html/modules/custom/reliefweb_rivers/config/schema/reliefweb_rivers.schema.yml
@@ -0,0 +1,7 @@
+reliefweb_rivers.settings:
+  type: config_object
+  label: 'Reliefweb Rivers settings'
+  mapping:
+    search_converter_url:
+      type: string
+      label: 'URL to the API search converter'
diff --git a/html/modules/custom/reliefweb_rivers/reliefweb_rivers.services.yml b/html/modules/custom/reliefweb_rivers/reliefweb_rivers.services.yml
index c3681790d..e5a8d113d 100644
--- a/html/modules/custom/reliefweb_rivers/reliefweb_rivers.services.yml
+++ b/html/modules/custom/reliefweb_rivers/reliefweb_rivers.services.yml
@@ -1,25 +1,25 @@
 services:
   reliefweb_rivers.blog_post.river:
     class: Drupal\reliefweb_rivers\Services\BlogPostRiver
-    arguments: ['@language_manager', '@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@request_stack', '@renderer', '@string_translation']
+    arguments: ['@config.factory', '@current_user', '@language_manager', '@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@request_stack', '@renderer', '@string_translation']
   reliefweb_rivers.country.river:
     class: Drupal\reliefweb_rivers\Services\CountryRiver
-    arguments: ['@language_manager', '@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@request_stack', '@renderer', '@string_translation']
+    arguments: ['@config.factory', '@current_user', '@language_manager', '@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@request_stack', '@renderer', '@string_translation']
   reliefweb_rivers.disaster.river:
     class: Drupal\reliefweb_rivers\Services\DisasterRiver
-    arguments: ['@language_manager', '@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@request_stack', '@renderer', '@string_translation']
+    arguments: ['@config.factory', '@current_user', '@language_manager', '@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@request_stack', '@renderer', '@string_translation']
   reliefweb_rivers.job.river:
     class: Drupal\reliefweb_rivers\Services\JobRiver
-    arguments: ['@language_manager', '@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@request_stack', '@renderer', '@string_translation']
+    arguments: ['@config.factory', '@current_user', '@language_manager', '@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@request_stack', '@renderer', '@string_translation']
   reliefweb_rivers.topic.river:
     class: Drupal\reliefweb_rivers\Services\TopicRiver
-    arguments: ['@language_manager', '@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@request_stack', '@renderer', '@string_translation', '@entity_type.manager']
+    arguments: ['@config.factory', '@current_user', '@language_manager', '@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@request_stack', '@renderer', '@string_translation', '@entity_type.manager']
   reliefweb_rivers.report.river:
     class: Drupal\reliefweb_rivers\Services\ReportRiver
-    arguments: ['@language_manager', '@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@request_stack', '@renderer', '@string_translation']
+    arguments: ['@config.factory', '@current_user', '@language_manager', '@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@request_stack', '@renderer', '@string_translation']
   reliefweb_rivers.source.river:
     class: Drupal\reliefweb_rivers\Services\SourceRiver
-    arguments: ['@language_manager', '@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@request_stack', '@renderer', '@string_translation']
+    arguments: ['@config.factory', '@current_user', '@language_manager', '@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@request_stack', '@renderer', '@string_translation']
   reliefweb_rivers.training.river:
     class: Drupal\reliefweb_rivers\Services\TrainingRiver
-    arguments: ['@language_manager', '@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@request_stack', '@renderer', '@string_translation']
+    arguments: ['@config.factory', '@current_user', '@language_manager', '@pager.manager', '@pager.parameters', '@reliefweb_api.client', '@request_stack', '@renderer', '@string_translation']
diff --git a/html/modules/custom/reliefweb_rivers/src/RiverServiceBase.php b/html/modules/custom/reliefweb_rivers/src/RiverServiceBase.php
index 716be0dad..7106a04be 100644
--- a/html/modules/custom/reliefweb_rivers/src/RiverServiceBase.php
+++ b/html/modules/custom/reliefweb_rivers/src/RiverServiceBase.php
@@ -3,10 +3,12 @@
 namespace Drupal\reliefweb_rivers;
 
 use Drupal\Component\Utility\Html;
+use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\Pager\PagerManagerInterface;
 use Drupal\Core\Pager\PagerParametersInterface;
 use Drupal\Core\Render\RendererInterface;
+use Drupal\Core\Session\AccountProxyInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\StringTranslation\TranslationInterface;
 use Drupal\Core\Url;
@@ -23,6 +25,20 @@ abstract class RiverServiceBase implements RiverServiceInterface {
 
   use StringTranslationTrait;
 
+  /**
+   * The config factory.
+   *
+   * @var \Drupal\Core\Config\ConfigFactoryInterface
+   */
+  protected $configFactory;
+
+  /**
+   * The current user.
+   *
+   * @var \Drupal\Core\Session\AccountProxyInterface
+   */
+  protected $currentUser;
+
   /**
    * The language manager.
    *
@@ -125,6 +141,10 @@ abstract class RiverServiceBase implements RiverServiceInterface {
   /**
    * Constructor.
    *
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
+   *   The config factory.
+   * @param \Drupal\Core\Session\AccountProxyInterface $current_user
+   *   The current user.
    * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
    *   The language manager.
    * @param \Drupal\Core\Pager\PagerManagerInterface $pager_manager
@@ -141,6 +161,8 @@ abstract class RiverServiceBase implements RiverServiceInterface {
    *   The translation manager service.
    */
   public function __construct(
+    ConfigFactoryInterface $config_factory,
+    AccountProxyInterface $current_user,
     LanguageManagerInterface $language_manager,
     PagerManagerInterface $pager_manager,
     PagerParametersInterface $pager_parameters,
@@ -149,6 +171,8 @@ public function __construct(
     RendererInterface $renderer,
     TranslationInterface $string_translation
   ) {
+    $this->configFactory = $config_factory;
+    $this->currentUser = $current_user;
     $this->languageManager = $language_manager;
     $this->pagerManager = $pager_manager;
     $this->pagerParameters = $pager_parameters;
@@ -470,13 +494,54 @@ public function getRiverPager() {
   public function getRiverLinks() {
     return [
       '#theme' => 'reliefweb_rivers_links',
-      '#links' => [],
+      '#links' => array_filter([
+        'rss' => $this->getRssLink(),
+        'api' => $this->getApiLink(),
+      ]),
       '#cache' => [
         'max-age' => 0,
       ],
     ];
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getRssLink() {
+    try {
+      return Url::fromRoute('reliefweb_rivers.' . $this->getBundle() . '.rss', [], [
+        'query' => $this->getParameters()->get(),
+        'absolute' => TRUE,
+      ])->toString();
+    }
+    catch (RouteNotFoundException $exception) {
+      return '';
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getApiLink() {
+    $url = $this->configFactory
+      ->get('reliefweb_rivers.settings')
+      ->get('search_converter_url');
+
+    if (empty($url)) {
+      return '';
+    }
+
+    $parameters = $this->getParameters()->get();
+    $search_url = static::getRiverUrl($this->getBundle(), $parameters, TRUE);
+
+    return Url::fromUri($url, [
+      'query' => [
+        'appname' => 'rwint-user-' . $this->currentUser->id(),
+        'search-url' => $search_url,
+      ],
+    ]);
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -682,10 +747,11 @@ public static function createDate($date) {
   /**
    * {@inheritdoc}
    */
-  public static function getRiverUrl($bundle, array $parameters = []) {
+  public static function getRiverUrl($bundle, array $parameters = [], $absolute = FALSE) {
     try {
       return Url::fromRoute('reliefweb_rivers.' . $bundle . '.river', [], [
         'query' => $parameters,
+        'absolute' => $absolute,
       ])->toString();
     }
     catch (RouteNotFoundException $exception) {
diff --git a/html/modules/custom/reliefweb_rivers/src/RiverServiceInterface.php b/html/modules/custom/reliefweb_rivers/src/RiverServiceInterface.php
index c38bed4bc..fc4f0121e 100644
--- a/html/modules/custom/reliefweb_rivers/src/RiverServiceInterface.php
+++ b/html/modules/custom/reliefweb_rivers/src/RiverServiceInterface.php
@@ -191,6 +191,22 @@ public function getRiverPager();
    */
   public function getRiverLinks();
 
+  /**
+   * Get the link to the RSS feed for the river.
+   *
+   * @return string
+   *   Link to the RSS feed for the river.
+   */
+  public function getRssLink();
+
+  /**
+   * Get the link to the API search converter.
+   *
+   * @return string
+   *   Link to the search converter.
+   */
+  public function getApiLink();
+
   /**
    * Get the ReliefWeb API payload for the given river and view.
    *
@@ -308,11 +324,13 @@ public static function createDate($date);
    *   Entity bundle associated with the river.
    * @param array $parameters
    *   Query parameters.
+   * @param bool $absolute
+   *   If TRUE, return an absolute URL.
    *
    * @return string
    *   River URL.
    */
-  public static function getRiverUrl($bundle, array $parameters = []);
+  public static function getRiverUrl($bundle, array $parameters = [], $absolute = FALSE);
 
   /**
    * Get the data of the river for given bundle and API data.
diff --git a/html/modules/custom/reliefweb_rivers/src/Services/TopicRiver.php b/html/modules/custom/reliefweb_rivers/src/Services/TopicRiver.php
index 7dc8c0ac1..9a0bb6ced 100644
--- a/html/modules/custom/reliefweb_rivers/src/Services/TopicRiver.php
+++ b/html/modules/custom/reliefweb_rivers/src/Services/TopicRiver.php
@@ -2,11 +2,13 @@
 
 namespace Drupal\reliefweb_rivers\Services;
 
+use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\Pager\PagerManagerInterface;
 use Drupal\Core\Pager\PagerParametersInterface;
 use Drupal\Core\Render\RendererInterface;
+use Drupal\Core\Session\AccountProxyInterface;
 use Drupal\Core\StringTranslation\TranslationInterface;
 use Drupal\reliefweb_api\Services\ReliefWebApiClient;
 use Drupal\reliefweb_rivers\RiverServiceBase;
@@ -76,6 +78,10 @@ public function getViews() {
   /**
    * Constructor.
    *
+   * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
+   *   The config factory.
+   * @param \Drupal\Core\Session\AccountProxyInterface $current_user
+   *   The current user.
    * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
    *   The language manager.
    * @param \Drupal\Core\Pager\PagerManagerInterface $pager_manager
@@ -94,6 +100,8 @@ public function getViews() {
    *   The entity type manager service.
    */
   public function __construct(
+    ConfigFactoryInterface $config_factory,
+    AccountProxyInterface $current_user,
     LanguageManagerInterface $language_manager,
     PagerManagerInterface $pager_manager,
     PagerParametersInterface $pager_parameters,
@@ -104,6 +112,8 @@ public function __construct(
     EntityTypeManagerInterface $entity_type_manager
   ) {
     parent::__construct(
+      $config_factory,
+      $current_user,
       $language_manager,
       $pager_manager,
       $pager_parameters,
diff --git a/html/modules/custom/reliefweb_rivers/templates/reliefweb-rivers-links.html.twig b/html/modules/custom/reliefweb_rivers/templates/reliefweb-rivers-links.html.twig
index e69de29bb..814d707a4 100644
--- a/html/modules/custom/reliefweb_rivers/templates/reliefweb-rivers-links.html.twig
+++ b/html/modules/custom/reliefweb_rivers/templates/reliefweb-rivers-links.html.twig
@@ -0,0 +1,25 @@
+{#
+
+/**
+ * @file
+ * Template for the river links.
+ *
+ * Available variables:
+ * - level: heading level for the section
+ * - attributes: section attributes
+ * - title: section title
+ * - title_attributes: title attributes
+ * - links: The API/RSS links for the river.
+ */
+
+#}
+{% if links is not empty %}
+<section{{ attributes.addClass('rw-river-links') }}>
+  <h{{ level }}{{ title_attributes.addClass('visually-hidden') }}>{{ title }}</h{{ level }}>
+  <ul class="rw-river-links__list">
+  {%- for key, url in links -%}
+    <li class="rw-river-links__list__item"><a href="{{ url }}">{{ key|upper }}</a></li>
+  {%- endfor -%}
+  </ul>
+</section>
+{% endif %}
diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
index a5266f124..02019b4d2 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
@@ -284,6 +284,7 @@ rw-river:
   css:
     theme:
       components/rw-river/rw-river.css: {}
+      components/rw-river/rw-river-links.css: {}
       components/rw-river/rw-river-results.css: {}
       components/rw-river/rw-river-views.css: {}
 
diff --git a/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-links.css b/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-links.css
new file mode 100644
index 000000000..c9dc4268f
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-links.css
@@ -0,0 +1,24 @@
+/**
+ * River links.
+ *
+ * RSS and API links for the river.
+ */
+.rw-river-links {
+  clear: both;
+  width: 100%;
+  margin-top: 32px;
+  padding-top: 32px;
+  text-align: center;
+  border-top: 1px solid var(--cd-reliefweb-brand-grey--light);
+}
+.rw-river-links__list {
+  display: inline;
+  /* Compensate for the margin of the <li> */
+  margin: -32px;
+  padding: 0;
+  list-style: none;
+}
+.rw-river-links__list__item {
+  display: inline;
+  margin: 32px;
+}

From f9feb3136520c9f0072fdff7f916a0df0bb0ee97 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 16 Feb 2022 04:11:36 +0000
Subject: [PATCH 482/720] [RW-365] Show posts from user by default on My Posts
 page

---
 .../reliefweb_user_posts/src/Form/UserPostsPageFilterForm.php  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/html/modules/custom/reliefweb_user_posts/src/Form/UserPostsPageFilterForm.php b/html/modules/custom/reliefweb_user_posts/src/Form/UserPostsPageFilterForm.php
index 1b69eba75..debae2830 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Form/UserPostsPageFilterForm.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Form/UserPostsPageFilterForm.php
@@ -65,6 +65,9 @@ public function buildForm(array $form, FormStateInterface $form_state, Moderatio
 
     // Make js work.
     $form['#attributes']['id'] = 'reliefweb-moderation-page-filter-form';
+    if (isset($form['filters']['other']['poster']) && !isset($form['filters']['other']['poster']['#default_value'])) {
+      $form['filters']['other']['poster']['#default_value'] = ['me'];
+    }
 
     return $form;
   }

From 6ac722f033a38e8122b8e4868828a405975f1456 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 16 Feb 2022 05:19:15 +0000
Subject: [PATCH 483/720] [RW-305] Fix some labels in rivers

---
 .../reliefweb_moderation.module               | 22 +++++++++++++++++++
 .../src/Services/DisasterRiver.php            |  2 ++
 ...b-rivers-river-article--disaster.html.twig |  2 +-
 ...iefweb-rivers-river-article--job.html.twig |  4 ++--
 ...b-rivers-river-article--training.html.twig |  2 +-
 5 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/html/modules/custom/reliefweb_moderation/reliefweb_moderation.module b/html/modules/custom/reliefweb_moderation/reliefweb_moderation.module
index cdf3d986f..ad095d24b 100644
--- a/html/modules/custom/reliefweb_moderation/reliefweb_moderation.module
+++ b/html/modules/custom/reliefweb_moderation/reliefweb_moderation.module
@@ -254,3 +254,25 @@ function reliefweb_moderation_preprocess_page(&$variables) {
 
   $variables['page']['content']['moderation-information'] = $element;
 }
+
+/**
+ * Get the moderation status label for the given entity bundle and status.
+ *
+ * @param string $bundle
+ *   Entity bundle.
+ * @param string $status
+ *   Entity moderation status.
+ *
+ * @return string
+ *   The moderation status label.
+ */
+function reliefweb_moderation_get_moderation_status_label($bundle, $status) {
+  $service = ModerationServiceBase::getModerationService($bundle);
+  if (!empty($service)) {
+    $statuses = $service->getStatuses();
+    if (isset($statuses[$status])) {
+      return $statuses[$status];
+    }
+  }
+  return ucfirst($status);
+}
diff --git a/html/modules/custom/reliefweb_rivers/src/Services/DisasterRiver.php b/html/modules/custom/reliefweb_rivers/src/Services/DisasterRiver.php
index 137dbb73f..8475b0ed2 100644
--- a/html/modules/custom/reliefweb_rivers/src/Services/DisasterRiver.php
+++ b/html/modules/custom/reliefweb_rivers/src/Services/DisasterRiver.php
@@ -198,6 +198,7 @@ public function parseApiData(array $api_data, $view = '') {
 
       // Status.
       $status = $fields['status'] === 'current' ? 'ongoing' : $fields['status'];
+      $status_label = reliefweb_moderation_get_moderation_status_label('disaster', $status);
 
       // Tags (countries, sources etc.).
       $tags = [];
@@ -237,6 +238,7 @@ public function parseApiData(array $api_data, $view = '') {
         'type' => $fields['primary_type']['code'] ?? '',
         'title' => $title,
         'status' => $status,
+        'status_label' => $status_label,
         'tags' => $tags,
       ];
 
diff --git a/html/modules/custom/reliefweb_rivers/templates/reliefweb-rivers-river-article--disaster.html.twig b/html/modules/custom/reliefweb_rivers/templates/reliefweb-rivers-river-article--disaster.html.twig
index 3c8bd7068..788f9f6bb 100644
--- a/html/modules/custom/reliefweb_rivers/templates/reliefweb-rivers-river-article--disaster.html.twig
+++ b/html/modules/custom/reliefweb_rivers/templates/reliefweb-rivers-river-article--disaster.html.twig
@@ -62,7 +62,7 @@
         'status': {
           'type': 'simple',
           'label': 'Status'|t,
-          'value': entity.status,
+          'value': entity.status_label ?? entity.status,
           'value_attributes': create_attribute()
             .addClass('rw-entity-meta__tag-value--status--' ~ entity.status|clean_class),
         },
diff --git a/html/modules/custom/reliefweb_rivers/templates/reliefweb-rivers-river-article--job.html.twig b/html/modules/custom/reliefweb_rivers/templates/reliefweb-rivers-river-article--job.html.twig
index 30c0e8974..d8a464d80 100644
--- a/html/modules/custom/reliefweb_rivers/templates/reliefweb-rivers-river-article--job.html.twig
+++ b/html/modules/custom/reliefweb_rivers/templates/reliefweb-rivers-river-article--job.html.twig
@@ -52,7 +52,7 @@
       '#meta': {
         'source': {
           'type': 'taglist',
-          'label': entity.tags.source|length > 1 ? 'Sources'|t : 'Source'|t,
+          'label': entity.tags.source|length > 1 ? 'Organizations'|t : 'Organization'|t,
           'value': entity.tags.source,
           'count': 1,
           'sort': 'shortname',
@@ -65,7 +65,7 @@
         },
         'closing-date': {
           'type': 'date',
-          'label': 'Closing'|t,
+          'label': 'Closing date'|t,
           'value': entity.closing,
         },
       }
diff --git a/html/modules/custom/reliefweb_rivers/templates/reliefweb-rivers-river-article--training.html.twig b/html/modules/custom/reliefweb_rivers/templates/reliefweb-rivers-river-article--training.html.twig
index 99311d0cc..bbfafb3a9 100644
--- a/html/modules/custom/reliefweb_rivers/templates/reliefweb-rivers-river-article--training.html.twig
+++ b/html/modules/custom/reliefweb_rivers/templates/reliefweb-rivers-river-article--training.html.twig
@@ -49,7 +49,7 @@
     {% set meta = {
       'source': {
         'type': 'taglist',
-        'label': entity.tags.source|length > 1 ? 'Sources'|t : 'Source'|t,
+        'label': entity.tags.source|length > 1 ? 'Organizations'|t : 'Organization'|t,
         'value': entity.tags.source,
         'count': 1,
         'sort': 'shortname',

From d6b10b5ef0ae2ee9e3bd21701b6b0e060e581358 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 16 Feb 2022 05:24:39 +0000
Subject: [PATCH 484/720] [RW-305] Fix about us menu label, footer menu
 migration and add help menu migration

---
 .../migrate_plus.migration.reliefweb_book.yml |  2 +-
 ...ate_plus.migration.reliefweb_bookmarks.yml |  2 +-
 ...migrate_plus.migration.reliefweb_image.yml |  2 +-
 ...on.reliefweb_media__image_announcement.yml |  2 +-
 ...image_blog_post__field_attached_images.yml |  2 +-
 ...eb_media__image_blog_post__field_image.yml |  2 +-
 ...ia__image_report__field_headline_image.yml |  2 +-
 ...efweb_media__image_report__field_image.yml |  2 +-
 ...migration.reliefweb_media__image_topic.yml |  2 +-
 ....migration.reliefweb_menu_link__footer.yml | 16 +++---
 ...us.migration.reliefweb_menu_link__help.yml | 55 +++++++++++++++++++
 ...us.migration.reliefweb_menu_link__main.yml |  2 +-
 ...migration.reliefweb_node__announcement.yml |  2 +-
 ...us.migration.reliefweb_node__blog_post.yml |  2 +-
 ...te_plus.migration.reliefweb_node__book.yml |  2 +-
 ...ate_plus.migration.reliefweb_node__job.yml |  4 +-
 ..._plus.migration.reliefweb_node__report.yml |  4 +-
 ...e_plus.migration.reliefweb_node__topic.yml |  2 +-
 ...lus.migration.reliefweb_node__training.yml |  4 +-
 ....reliefweb_node_revision__announcement.yml |  2 +-
 ...ion.reliefweb_node_revision__blog_post.yml |  2 +-
 ...igration.reliefweb_node_revision__book.yml |  2 +-
 ...migration.reliefweb_node_revision__job.yml |  2 +-
 ...ration.reliefweb_node_revision__report.yml |  4 +-
 ...gration.reliefweb_node_revision__topic.yml |  2 +-
 ...tion.reliefweb_node_revision__training.yml |  2 +-
 ...plus.migration.reliefweb_subscriptions.yml |  2 +-
 ...plus.migration.reliefweb_taxonomy_term.yml |  2 +-
 ...ation.reliefweb_taxonomy_term__country.yml |  2 +-
 ...tion.reliefweb_taxonomy_term__disaster.yml |  2 +-
 ...ration.reliefweb_taxonomy_term__source.yml |  2 +-
 ...ation.reliefweb_taxonomy_term_revision.yml |  2 +-
 ...iefweb_taxonomy_term_revision__country.yml |  2 +-
 ...efweb_taxonomy_term_revision__disaster.yml |  2 +-
 ...liefweb_taxonomy_term_revision__source.yml |  2 +-
 ...ate_plus.migration.reliefweb_url_alias.yml |  2 +-
 .../migrate_plus.migration.reliefweb_user.yml |  2 +-
 ...plus.migration.reliefweb_user__default.yml |  2 +-
 ...te_plus.migration_group.reliefweb_base.yml |  2 +-
 ...e_plus.migration_group.reliefweb_extra.yml |  2 +-
 ...e_plus.migration_group.reliefweb_image.yml |  2 +-
 ...e_plus.migration_group.reliefweb_media.yml |  2 +-
 ...te_plus.migration_group.reliefweb_node.yml |  2 +-
 ...igration_group.reliefweb_node_revision.yml |  2 +-
 ...te_plus.migration_group.reliefweb_term.yml |  2 +-
 ...igration_group.reliefweb_term_revision.yml |  2 +-
 config/reliefweb_rivers.settings.yml          |  2 +-
 ....migration.reliefweb_menu_link__footer.yml | 12 ++--
 ...us.migration.reliefweb_menu_link__help.yml | 48 ++++++++++++++++
 49 files changed, 166 insertions(+), 63 deletions(-)
 create mode 100644 config/migrate_plus.migration.reliefweb_menu_link__help.yml
 create mode 100644 html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_menu_link__help.yml

diff --git a/config/migrate_plus.migration.reliefweb_book.yml b/config/migrate_plus.migration.reliefweb_book.yml
index ed00bf7e8..cacf284a7 100644
--- a/config/migrate_plus.migration.reliefweb_book.yml
+++ b/config/migrate_plus.migration.reliefweb_book.yml
@@ -1,4 +1,4 @@
-uuid: a2cf5189-d165-4139-965d-974473e22d98
+uuid: 0aafbf29-ea1f-4a6d-afed-adbcea9bfb7d
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_bookmarks.yml b/config/migrate_plus.migration.reliefweb_bookmarks.yml
index 0d1695d04..586e02b25 100644
--- a/config/migrate_plus.migration.reliefweb_bookmarks.yml
+++ b/config/migrate_plus.migration.reliefweb_bookmarks.yml
@@ -1,4 +1,4 @@
-uuid: 4bfeab78-c57a-479f-bd2f-388e7df606bb
+uuid: 35b44ea8-7120-4692-b474-d97f97145d03
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_image.yml b/config/migrate_plus.migration.reliefweb_image.yml
index 72e0bfb03..2a744d9c3 100644
--- a/config/migrate_plus.migration.reliefweb_image.yml
+++ b/config/migrate_plus.migration.reliefweb_image.yml
@@ -1,4 +1,4 @@
-uuid: fe3a0f2e-b059-42eb-bbc0-f4cf694d15a4
+uuid: 6cd44d0a-e313-45d2-b315-5c1b70a56173
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_media__image_announcement.yml b/config/migrate_plus.migration.reliefweb_media__image_announcement.yml
index 556e4fac3..2f806d14d 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_announcement.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_announcement.yml
@@ -1,4 +1,4 @@
-uuid: 1b6e1a4c-26bd-4627-8781-7ce88a2b95b8
+uuid: a1a3e993-7e27-4874-b0ea-d481aa12b66f
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_attached_images.yml b/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_attached_images.yml
index dbf444044..55843f769 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_attached_images.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_attached_images.yml
@@ -1,4 +1,4 @@
-uuid: 1279f2fb-eb7a-4db6-a587-561092e9b775
+uuid: c48e9883-b1c2-40ce-8dcf-517a9e64143e
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_image.yml b/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_image.yml
index c0e0bfc6a..02eef8702 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_image.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_blog_post__field_image.yml
@@ -1,4 +1,4 @@
-uuid: 5233e4de-5b62-4d43-851c-5e4f617e6758
+uuid: 82ca4456-8f8d-47c7-82a8-5fb20a132d06
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_media__image_report__field_headline_image.yml b/config/migrate_plus.migration.reliefweb_media__image_report__field_headline_image.yml
index 883dc7f56..a051af5e4 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_report__field_headline_image.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_report__field_headline_image.yml
@@ -1,4 +1,4 @@
-uuid: 7b7c27ab-2681-4100-a85e-9b4a9fb02827
+uuid: 1920c145-00f8-44f9-840e-4c1c8173a7e9
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_media__image_report__field_image.yml b/config/migrate_plus.migration.reliefweb_media__image_report__field_image.yml
index 5648b4398..0960d47fa 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_report__field_image.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_report__field_image.yml
@@ -1,4 +1,4 @@
-uuid: fd0578db-cfd5-4190-abb2-8234a8a42186
+uuid: 3d94e10f-3b11-4022-843f-90ca6c851e22
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_media__image_topic.yml b/config/migrate_plus.migration.reliefweb_media__image_topic.yml
index a499fdd7b..1cee6ad6b 100644
--- a/config/migrate_plus.migration.reliefweb_media__image_topic.yml
+++ b/config/migrate_plus.migration.reliefweb_media__image_topic.yml
@@ -1,4 +1,4 @@
-uuid: c8ba73c4-6865-4a17-aefc-fdb32d9282ae
+uuid: f131168a-09d1-4281-9e0f-f3d94cc81e25
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_menu_link__footer.yml b/config/migrate_plus.migration.reliefweb_menu_link__footer.yml
index f5cc9092f..2a3a4c910 100644
--- a/config/migrate_plus.migration.reliefweb_menu_link__footer.yml
+++ b/config/migrate_plus.migration.reliefweb_menu_link__footer.yml
@@ -1,4 +1,4 @@
-uuid: 24243ef1-e11a-411c-a2a7-c9384135d8cc
+uuid: 390e1a43-9f4f-4c12-8cac-0964f2a8ac70
 langcode: en
 status: true
 dependencies:
@@ -6,7 +6,7 @@ dependencies:
     module:
       - reliefweb_migrate
 _core:
-  default_config_hash: ubo19RVHa1E89UT1XMl_VqjGR_QfEmE34t05IHYE_mU
+  default_config_hash: 4s4hzqmRLH2SqQh3TQJGkuqJEKdoeHcMErXGTXV-je0
 id: reliefweb_menu_link__footer
 class: null
 field_plugin_method: null
@@ -23,7 +23,7 @@ source:
       id: 8
       title: Blog
       description: Blog
-      link_uri: 'internal:/blog'
+      link_uri: 'base:/blog'
       external: 0
       weight: 0
     -
@@ -35,23 +35,23 @@ source:
       weight: 1
     -
       id: 10
-      title: About
-      description: About
-      link_uri: 'internal:/about'
+      title: 'About Us'
+      description: 'About Us'
+      link_uri: 'base:/about'
       external: 0
       weight: 2
     -
       id: 11
       title: Terms
       description: Terms
-      link_uri: 'internal:/terms-conditions'
+      link_uri: 'base:/terms-conditions'
       external: 0
       weight: 3
     -
       id: 12
       title: Contact
       description: Contact
-      link_uri: 'internal:/contact'
+      link_uri: 'base:/contact'
       external: 0
       weight: 4
   ids:
diff --git a/config/migrate_plus.migration.reliefweb_menu_link__help.yml b/config/migrate_plus.migration.reliefweb_menu_link__help.yml
new file mode 100644
index 000000000..1afab646a
--- /dev/null
+++ b/config/migrate_plus.migration.reliefweb_menu_link__help.yml
@@ -0,0 +1,55 @@
+uuid: d1a1a842-2f6d-48f6-b49f-9be1ecf61061
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - reliefweb_migrate
+_core:
+  default_config_hash: oMGwjRYiH0smHUBnxss8xQ1S_QnyNsZRCpVunpTxj8M
+id: reliefweb_menu_link__help
+class: null
+field_plugin_method: null
+cck_plugin_method: null
+migration_tags:
+  - 'Drupal 7'
+  - Content
+migration_group: reliefweb_base
+label: 'Migrate ReliefWeb help menu links.'
+source:
+  plugin: embedded_data
+  data_rows:
+    -
+      id: 13
+      title: Help
+      description: Help
+      link_uri: 'base:/help'
+      external: 0
+      weight: 0
+  ids:
+    id:
+      type: integer
+  constants:
+    bundle: menu_link_content
+    menu_name: help
+    enabled: 1
+    expanded: 0
+    parent: null
+process:
+  id: id
+  bundle: constants/bundle
+  title: title
+  description: description
+  menu_name: constants/menu_name
+  link/uri: link_uri
+  external: external
+  weight: weight
+  expanded: constants/expanded
+  enabled: constants/enabled
+  parent: constants/parent
+destination:
+  plugin: 'entity:menu_link_content'
+  no_stub: true
+migration_dependencies:
+  required:
+    - rw_menu_link__main
diff --git a/config/migrate_plus.migration.reliefweb_menu_link__main.yml b/config/migrate_plus.migration.reliefweb_menu_link__main.yml
index 7208f87d5..c1b3c7bbb 100644
--- a/config/migrate_plus.migration.reliefweb_menu_link__main.yml
+++ b/config/migrate_plus.migration.reliefweb_menu_link__main.yml
@@ -1,4 +1,4 @@
-uuid: 0b69a6a8-79ce-4bd1-aa1d-6d66633b8bf1
+uuid: 7d78b3c8-49fb-4839-9099-5706f25a4301
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration.reliefweb_node__announcement.yml b/config/migrate_plus.migration.reliefweb_node__announcement.yml
index 7ba31b125..1be805590 100644
--- a/config/migrate_plus.migration.reliefweb_node__announcement.yml
+++ b/config/migrate_plus.migration.reliefweb_node__announcement.yml
@@ -1,4 +1,4 @@
-uuid: d0dff5cc-e5b9-43e3-b78f-1f7f23e1d4f4
+uuid: 7a3c3498-bedf-41ac-8b61-dbf96e27633d
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node__blog_post.yml b/config/migrate_plus.migration.reliefweb_node__blog_post.yml
index 7791d805a..afd95fcc3 100644
--- a/config/migrate_plus.migration.reliefweb_node__blog_post.yml
+++ b/config/migrate_plus.migration.reliefweb_node__blog_post.yml
@@ -1,4 +1,4 @@
-uuid: 509dba0d-dd79-45fb-8ab1-0cd91b06d112
+uuid: 9f7c8f63-771c-4567-ad4a-bf0c748a4827
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node__book.yml b/config/migrate_plus.migration.reliefweb_node__book.yml
index f7dde28d7..28837d8a0 100644
--- a/config/migrate_plus.migration.reliefweb_node__book.yml
+++ b/config/migrate_plus.migration.reliefweb_node__book.yml
@@ -1,4 +1,4 @@
-uuid: 0fa9dcca-9385-438a-993c-39f3754057bc
+uuid: 9fdd662d-7dd6-40e6-8d63-373c2bfbe78c
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node__job.yml b/config/migrate_plus.migration.reliefweb_node__job.yml
index 87c841d55..190fd07fc 100644
--- a/config/migrate_plus.migration.reliefweb_node__job.yml
+++ b/config/migrate_plus.migration.reliefweb_node__job.yml
@@ -1,9 +1,9 @@
-uuid: 097b9e33-a302-4131-914a-40779705799b
+uuid: cc0fc885-36d7-4809-9244-7a6dc94adb2b
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: 8DBBZFIvaJTfF8GdHcHMVgjIKK9lTpcfv_QmhIvVZhk
+  default_config_hash: 4Yt-4gxWTXQ5yxo4xq2broAhY1KmtktEU7EiYTxhtts
 id: reliefweb_node__job
 class: null
 field_plugin_method: null
diff --git a/config/migrate_plus.migration.reliefweb_node__report.yml b/config/migrate_plus.migration.reliefweb_node__report.yml
index 6320f821f..d1bd17275 100644
--- a/config/migrate_plus.migration.reliefweb_node__report.yml
+++ b/config/migrate_plus.migration.reliefweb_node__report.yml
@@ -1,9 +1,9 @@
-uuid: 63704fd9-e6c5-451d-973c-e2cc95b16fa0
+uuid: d8698ed7-0292-405d-b701-655b62989dc2
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: IWA-TYJmq7W_mFwnCmi8gQ6STI-seT8Oc2ntc00_jBI
+  default_config_hash: DS-xcnpBWUkSUn7e01RDU-Zxoro7ugXbp-b5V4NpNi8
 id: reliefweb_node__report
 class: null
 field_plugin_method: null
diff --git a/config/migrate_plus.migration.reliefweb_node__topic.yml b/config/migrate_plus.migration.reliefweb_node__topic.yml
index e1086621f..2714ec5b9 100644
--- a/config/migrate_plus.migration.reliefweb_node__topic.yml
+++ b/config/migrate_plus.migration.reliefweb_node__topic.yml
@@ -1,4 +1,4 @@
-uuid: d8b5c6b0-37d9-4307-b5fd-e895a2460ad8
+uuid: 5bbb5707-f8e1-4753-9b84-80232bc7ec0d
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node__training.yml b/config/migrate_plus.migration.reliefweb_node__training.yml
index 6ee3b1782..46fa9db1d 100644
--- a/config/migrate_plus.migration.reliefweb_node__training.yml
+++ b/config/migrate_plus.migration.reliefweb_node__training.yml
@@ -1,9 +1,9 @@
-uuid: 50a1ef37-04a7-4ff2-9bbd-4a64fdb84cd3
+uuid: 1832af48-5dea-456c-9a63-8bf6239636fc
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: JAPBYw8MeZgqoLftDwBKMOYWGhlnRa8YpPcsoLJjdNY
+  default_config_hash: XzJ8dW5Aauaoya2l2GlE2GC0YACcTh2thSnfB3P5Fhk
 id: reliefweb_node__training
 class: null
 field_plugin_method: null
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__announcement.yml b/config/migrate_plus.migration.reliefweb_node_revision__announcement.yml
index a3a6dbda9..a9806e300 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__announcement.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__announcement.yml
@@ -1,4 +1,4 @@
-uuid: c064a1f5-224e-4951-adfb-0eacc767b955
+uuid: e6491f39-d280-47ee-9ec7-ebde7a9d473e
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__blog_post.yml b/config/migrate_plus.migration.reliefweb_node_revision__blog_post.yml
index 439fc0632..3f0710e5e 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__blog_post.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__blog_post.yml
@@ -1,4 +1,4 @@
-uuid: d58bf523-8946-4c38-acb1-fa08fadc764c
+uuid: 82d9f1bc-d610-4cd0-9833-a831a4f4789b
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__book.yml b/config/migrate_plus.migration.reliefweb_node_revision__book.yml
index d6f04509f..a826f7b85 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__book.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__book.yml
@@ -1,4 +1,4 @@
-uuid: 53969726-12fb-43f2-b9c9-439926a98f4a
+uuid: 6a450625-5143-4db1-8883-8848d13d6af1
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__job.yml b/config/migrate_plus.migration.reliefweb_node_revision__job.yml
index d5ca91e5c..b47dfc043 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__job.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__job.yml
@@ -1,4 +1,4 @@
-uuid: d4027b2e-bdb4-4ef9-9435-e1df72f19703
+uuid: 122fff90-017c-4f29-b0b3-9d0fd1d1253d
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__report.yml b/config/migrate_plus.migration.reliefweb_node_revision__report.yml
index 6ece9c290..9afa95245 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__report.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__report.yml
@@ -1,9 +1,9 @@
-uuid: 67465dc7-629b-4b31-b310-4d38afe8e397
+uuid: 9bb981d1-3b56-41fa-90e8-cd25391e2018
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: kRoIg6lXYMvd9WGRAY1xtIR2nrwkkqjIr9BsjMW6WXM
+  default_config_hash: BaM8nk4iaaqO34hmUPKL1Bb4dn_-gIT8BFx4froPTYY
 id: reliefweb_node_revision__report
 class: null
 field_plugin_method: null
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__topic.yml b/config/migrate_plus.migration.reliefweb_node_revision__topic.yml
index 894bfbd81..95b5b5931 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__topic.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__topic.yml
@@ -1,4 +1,4 @@
-uuid: 4aa3a8e5-3891-40f2-9f70-26179faf275a
+uuid: 7c2d32a9-1df1-491e-b7ff-66972530dfc2
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__training.yml b/config/migrate_plus.migration.reliefweb_node_revision__training.yml
index 197f97b85..a8a4ba47d 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__training.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__training.yml
@@ -1,4 +1,4 @@
-uuid: ddc534e4-9f4f-4647-8fdf-3ba021821d00
+uuid: 62103b03-e380-4b48-88f0-88a5f299c20d
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_subscriptions.yml b/config/migrate_plus.migration.reliefweb_subscriptions.yml
index 7dceb39ba..9881c456d 100644
--- a/config/migrate_plus.migration.reliefweb_subscriptions.yml
+++ b/config/migrate_plus.migration.reliefweb_subscriptions.yml
@@ -1,4 +1,4 @@
-uuid: 2e8b6c7f-2609-4bc8-b1e5-7b3329d05af5
+uuid: 2f1367aa-2678-457c-ae1a-a8544ad9c52d
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term.yml
index e90ea4bb9..b738cfe37 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term.yml
@@ -1,4 +1,4 @@
-uuid: ffd31f51-9d96-4f37-a716-57f83c14a649
+uuid: fb17f52c-48a2-4ed0-86d7-3830d4d3d795
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term__country.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term__country.yml
index 0f08a03de..353622a08 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term__country.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term__country.yml
@@ -1,4 +1,4 @@
-uuid: a0071ecb-dbb5-4bf9-89f7-c5e0c36cc93e
+uuid: 314dfc18-33a0-490c-b266-abf3b1cb8c73
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term__disaster.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term__disaster.yml
index 01d4695de..c03e445d5 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term__disaster.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term__disaster.yml
@@ -1,4 +1,4 @@
-uuid: 38ae6300-940c-4f96-85de-f68be2705e44
+uuid: fc70b6f0-99ee-4ccd-b951-c65d57115ff1
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term__source.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
index f54a88478..346945d20 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
@@ -1,4 +1,4 @@
-uuid: e941f073-9036-4ba7-8253-89e28a8d3306
+uuid: e8ebad49-7b78-415d-be50-5831fbde57c6
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision.yml
index 9c958fa1a..11be3265d 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision.yml
@@ -1,4 +1,4 @@
-uuid: 1a83a7d0-1166-4c90-a5bc-f67ee29f923c
+uuid: b2e45a56-05cb-49e9-8c85-2d4304617709
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__country.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__country.yml
index d7d47b5e4..c10fcd86c 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__country.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__country.yml
@@ -1,4 +1,4 @@
-uuid: f8f863bf-f287-4729-9063-dbe0430ac505
+uuid: 82d6aad4-833c-4b41-9afa-d10d88ddd68b
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__disaster.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__disaster.yml
index ef65ca35d..d54d3ff62 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__disaster.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__disaster.yml
@@ -1,4 +1,4 @@
-uuid: b0923017-e48b-4829-9aa3-d1bf822374c0
+uuid: 4fc60d06-43b2-417f-a2d3-52d8ed6c3d66
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
index 3c220547b..dbce58187 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
@@ -1,4 +1,4 @@
-uuid: 54ed3f4c-9aef-4abf-bb47-70f0e5090224
+uuid: 028e903a-df2b-4b1d-afa2-ddffda3abcea
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_url_alias.yml b/config/migrate_plus.migration.reliefweb_url_alias.yml
index d45e7d83f..a558770a8 100644
--- a/config/migrate_plus.migration.reliefweb_url_alias.yml
+++ b/config/migrate_plus.migration.reliefweb_url_alias.yml
@@ -1,4 +1,4 @@
-uuid: 55d65fa9-909b-4c34-a307-05087549eb1b
+uuid: 57edb875-2604-4995-b9f3-58924fb4aa1f
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_user.yml b/config/migrate_plus.migration.reliefweb_user.yml
index 9056181f8..7c43e745c 100644
--- a/config/migrate_plus.migration.reliefweb_user.yml
+++ b/config/migrate_plus.migration.reliefweb_user.yml
@@ -1,4 +1,4 @@
-uuid: a4f93ba0-ae62-42ed-b436-0b430ef5609d
+uuid: dea45bba-ab49-4f24-84eb-d0d25ca362af
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration.reliefweb_user__default.yml b/config/migrate_plus.migration.reliefweb_user__default.yml
index 73c2c86d5..4c31e5545 100644
--- a/config/migrate_plus.migration.reliefweb_user__default.yml
+++ b/config/migrate_plus.migration.reliefweb_user__default.yml
@@ -1,4 +1,4 @@
-uuid: 30436a79-27d5-4d8c-bf2b-6f6f11742cab
+uuid: e61bcfa1-c4ce-4561-afea-19621b46ebcb
 langcode: en
 status: true
 dependencies: {  }
diff --git a/config/migrate_plus.migration_group.reliefweb_base.yml b/config/migrate_plus.migration_group.reliefweb_base.yml
index 10cce8827..4c6278721 100644
--- a/config/migrate_plus.migration_group.reliefweb_base.yml
+++ b/config/migrate_plus.migration_group.reliefweb_base.yml
@@ -1,4 +1,4 @@
-uuid: f2c70d6a-d56e-4ab2-96a0-25e7bff039d6
+uuid: 794d99e1-f94f-421f-8bfa-d32c00b3ab58
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration_group.reliefweb_extra.yml b/config/migrate_plus.migration_group.reliefweb_extra.yml
index 8e3e69fdc..63fb6d715 100644
--- a/config/migrate_plus.migration_group.reliefweb_extra.yml
+++ b/config/migrate_plus.migration_group.reliefweb_extra.yml
@@ -1,4 +1,4 @@
-uuid: f209c294-8bed-467e-b8c9-843bc0bb143f
+uuid: bbc9f252-86d5-4896-902d-743ef7d6771e
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration_group.reliefweb_image.yml b/config/migrate_plus.migration_group.reliefweb_image.yml
index 85eb86710..633938185 100644
--- a/config/migrate_plus.migration_group.reliefweb_image.yml
+++ b/config/migrate_plus.migration_group.reliefweb_image.yml
@@ -1,4 +1,4 @@
-uuid: ae9ca388-b004-4f26-a334-187fce42f705
+uuid: 5094fcbf-6bf3-47a1-9f0b-a3a306dd2e7b
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration_group.reliefweb_media.yml b/config/migrate_plus.migration_group.reliefweb_media.yml
index 5dcf44abf..272267830 100644
--- a/config/migrate_plus.migration_group.reliefweb_media.yml
+++ b/config/migrate_plus.migration_group.reliefweb_media.yml
@@ -1,4 +1,4 @@
-uuid: ff264b53-bd2d-462b-9b38-ec692b303c50
+uuid: dc714cc1-4cce-4515-82bc-e0f745b7634f
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration_group.reliefweb_node.yml b/config/migrate_plus.migration_group.reliefweb_node.yml
index b83d05968..28a03735e 100644
--- a/config/migrate_plus.migration_group.reliefweb_node.yml
+++ b/config/migrate_plus.migration_group.reliefweb_node.yml
@@ -1,4 +1,4 @@
-uuid: 8f854d39-623d-4410-9df6-29b1d8c9af7c
+uuid: eaf4f6d2-6569-4ed2-9644-3ffd2cc35d48
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration_group.reliefweb_node_revision.yml b/config/migrate_plus.migration_group.reliefweb_node_revision.yml
index af8ac013f..1292ed362 100644
--- a/config/migrate_plus.migration_group.reliefweb_node_revision.yml
+++ b/config/migrate_plus.migration_group.reliefweb_node_revision.yml
@@ -1,4 +1,4 @@
-uuid: 24779588-23ad-4531-bdb3-49ca71774a57
+uuid: 61d02c28-9fa5-4433-a349-3360460f660f
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration_group.reliefweb_term.yml b/config/migrate_plus.migration_group.reliefweb_term.yml
index 0e78add23..dde870786 100644
--- a/config/migrate_plus.migration_group.reliefweb_term.yml
+++ b/config/migrate_plus.migration_group.reliefweb_term.yml
@@ -1,4 +1,4 @@
-uuid: a4eb8c3c-faa0-4887-9612-d9f43a91d49a
+uuid: 5685cad3-0538-42dd-a86a-06ee04ab6691
 langcode: en
 status: true
 dependencies:
diff --git a/config/migrate_plus.migration_group.reliefweb_term_revision.yml b/config/migrate_plus.migration_group.reliefweb_term_revision.yml
index e2ff9b8b3..7997b98fd 100644
--- a/config/migrate_plus.migration_group.reliefweb_term_revision.yml
+++ b/config/migrate_plus.migration_group.reliefweb_term_revision.yml
@@ -1,4 +1,4 @@
-uuid: 5a562e56-04f9-48f3-9f78-75fd43bbaf38
+uuid: e0792453-a9e9-4cba-9a38-37179aca5b36
 langcode: en
 status: true
 dependencies:
diff --git a/config/reliefweb_rivers.settings.yml b/config/reliefweb_rivers.settings.yml
index d7b002197..e83f83fb6 100644
--- a/config/reliefweb_rivers.settings.yml
+++ b/config/reliefweb_rivers.settings.yml
@@ -1 +1 @@
-search_converter_url: https://reliefweb.github.io/search-converter
+search_converter_url: 'https://reliefweb.github.io/search-converter'
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_menu_link__footer.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_menu_link__footer.yml
index 589b66687..c9776ee83 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_menu_link__footer.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_menu_link__footer.yml
@@ -16,7 +16,7 @@ source:
       id: 8
       title: Blog
       description: Blog
-      link_uri: internal:/blog
+      link_uri: base:/blog
       external: 0
       weight: 0
     -
@@ -28,23 +28,23 @@ source:
       weight: 1
     -
       id: 10
-      title: About
-      description: About
-      link_uri: internal:/about
+      title: About Us
+      description: About Us
+      link_uri: base:/about
       external: 0
       weight: 2
     -
       id: 11
       title: Terms
       description: Terms
-      link_uri: internal:/terms-conditions
+      link_uri: base:/terms-conditions
       external: 0
       weight: 3
     -
       id: 12
       title: Contact
       description: Contact
-      link_uri: internal:/contact
+      link_uri: base:/contact
       external: 0
       weight: 4
   ids:
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_menu_link__help.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_menu_link__help.yml
new file mode 100644
index 000000000..0478a8574
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_menu_link__help.yml
@@ -0,0 +1,48 @@
+id: reliefweb_menu_link__help
+label: Migrate ReliefWeb help menu links.
+migration_group: reliefweb_base
+dependencies:
+  enforced:
+    module:
+      - reliefweb_migrate
+audit: true
+migration_tags:
+  - Drupal 7
+  - Content
+source:
+  plugin: embedded_data
+  data_rows:
+    -
+      id: 13
+      title: Help
+      description: Help
+      link_uri: base:/help
+      external: 0
+      weight: 0
+  ids:
+    id:
+      type: integer
+  constants:
+    bundle: menu_link_content
+    menu_name: help
+    enabled: 1
+    expanded: 0
+    parent: null
+destination:
+  plugin: entity:menu_link_content
+  no_stub: true
+process:
+  id: id
+  bundle: constants/bundle
+  title: title
+  description: description
+  menu_name: constants/menu_name
+  link/uri: link_uri
+  external: external
+  weight: weight
+  expanded: constants/expanded
+  enabled: constants/enabled
+  parent: constants/parent
+migration_dependencies:
+  required:
+    - rw_menu_link__main

From c5222ab6bb2cdb8ab0acc0c05d8189d6260e5f80 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 16 Feb 2022 10:32:55 +0100
Subject: [PATCH 485/720] RW-340 add break-all rule for filename links

---
 .../components/rw-form/rw-form--widget.css                     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
index 8973cbfd0..a936499d1 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
@@ -93,6 +93,9 @@ form .views-field-media-library-select-form .form-type-checkbox:only-of-type {
 .rw-file-widget__table td {
   padding: 16px;
 }
+.rw-file-widget__table a {
+  word-break: break-all
+}
 .rw-file-widget__table td.rw-file-widget-item__weight {
   padding: 0;
   text-align: center;

From 198a9b1f3d543a9674e66821773d1d3144a8058d Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 16 Feb 2022 10:36:55 +0100
Subject: [PATCH 486/720] RW-340 add break-all rule for filename links

---
 .../components/rw-form/rw-form--widget.css                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
index a936499d1..a8dda54ec 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
@@ -94,7 +94,7 @@ form .views-field-media-library-select-form .form-type-checkbox:only-of-type {
   padding: 16px;
 }
 .rw-file-widget__table a {
-  word-break: break-all
+  word-break: break-all;
 }
 .rw-file-widget__table td.rw-file-widget-item__weight {
   padding: 0;

From 5709f60825fac508b59005d62cb6414fb88588b6 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 16 Feb 2022 10:48:54 +0100
Subject: [PATCH 487/720] add focus style to create button

---
 .../components/rw-moderation/rw-moderation.css                | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
index c638b97f5..131541b70 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
@@ -81,6 +81,10 @@
   border-radius: 8px;
   line-height: 20px;
 }
+.rw-moderation-filters .form-actions a:focus {
+  border: 2px solid var(--cd-reliefweb-brand-grey--dark);
+  outline: none;
+}
 /**
  * Result list.
  *

From 10c09e99b928fb189e34d382a5ea1b44a45e36ba Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 16 Feb 2022 11:07:20 +0100
Subject: [PATCH 488/720] RW-384 separate h1 and h2 rule and distinguish font
 size

---
 html/themes/custom/common_design_subtheme/css/styles.css    | 2 +-
 .../common_design_subtheme/sass/base/_typography.scss       | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/css/styles.css b/html/themes/custom/common_design_subtheme/css/styles.css
index f41053d74..bec7822b3 100644
--- a/html/themes/custom/common_design_subtheme/css/styles.css
+++ b/html/themes/custom/common_design_subtheme/css/styles.css
@@ -1 +1 @@
-@import"https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400%3B500%3B700&display=swap";@import"https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,300%3B0,400%3B0,500%3B0,700%3B0,900%3B1,400%3B1,700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400%3B700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@400%3B700&display=swap";:root{--cd-reliefweb-brand-blue: #0988bb;--cd-reliefweb-brand-red: #f65c51;--cd-reliefweb-brand-blue--dark: #055372;--cd-reliefweb-brand-red--dark: #eb1405;--cd-reliefweb-brand-grey--dark: #2e3436;--cd-reliefweb-brand-grey--mid: #4d5254;--cd-reliefweb-brand-grey--light: #e6ecef;--cd-rgb-reliefweb-brand-blue: 9, 136, 187;--cd-rgb-reliefweb-brand-red: 246, 92, 81;--cd-rgb-reliefweb-brand-blue--dark: 4, 82, 112;--cd-rgb-reliefweb-brand-red--dark: 235, 20, 5;--cd-rgb-reliefweb-brand-grey--dark: 46, 52, 54;--cd-rgb-reliefweb-brand-grey--light: 230, 236, 239;--cd-reliefweb-grey--light: #d9d9d9;--cd-reliefweb-grey--light--bg: rgba(217, 217, 217, 0.2);--cd-reliefweb-orange: #f49e2c;--cd-reliefweb-orange--bg: rgba(244, 158, 44, 0.2);--cd-reliefweb-blue: #076d96;--cd-reliefweb-blue--bg: rgba(7, 109, 150, 0.2);--cd-reliefweb-green: #88bb09;--cd-reliefweb-green--bg: rgba(136, 187, 9, 0.2);--cd-reliefweb-red: #da190b;--cd-reliefweb-red--bg: rgba(218, 25, 11, 0.2);--cd-reliefweb-purple: #9509bb;--cd-reliefweb-purple--bg: rgba(149, 9, 187, 0.2);--cd-reliefweb-grey: #4b4b4b;--cd-reliefweb-grey--bg: rgba(75, 75, 75, 0.2);--cd-reliefweb-brown: #8f5507;--cd-reliefweb-brown--bg: rgba(143, 85, 7, 0.2);--cd-reliefweb-yellow: #f5cb2f;--cd-reliefweb-yellow--bg: rgba(245, 203, 47, 0.2);--cd-reliefweb-cyan: #56c9f7;--cd-reliefweb-cyan--bg: rgba(86, 201, 247, 0.2);--cd-reliefweb-orange--alert: #eb8705;--cd-reliefweb-pink: rgba(246, 92, 81, 0.2);--cd-reliefweb-grey--disable: rgba(230, 236, 239, 0.5);--cd-ocha-blue: #1f69b3;--cd-blue--dark: #144372;--cd-blue--bright: #82b5e9;--cd-blue--light: #d4e5f7;--cd-highlight-red: #e56a54;--cd-contrast-red: #e00000;--cd-white: #fff;--cd-grey--light: #f2f2f2;--cd-grey--mid: #595959;--cd-grey--dark: #4a4a4a;--cd-default-text-color: var(--cd-grey--dark);--cd-black: #000;--cd-blue-grey: #e6ecf1;--cd-blue-grey--dark: #d3dde5;--cd-blue-grey--light: #ebf0f4;--cd-rgb-ocha-blue: 2, 108, 182;--cd-rgb-grey--mid: 89, 89, 89;--cd-rgb-grey--dark: 74, 74, 74;--cd-rgb-highlight-red: 229, 106, 84;--cd-rgb-blue-grey--dark: 211, 221, 229;--cd-max-content-width: 820px;--cd-max-body-width: 1400px;--cd-max-width: 1220px;--cd-container-padding: 0.75rem;--cd-container-padding-tablet: 1.5rem;--cd-container-padding-xlarge: 2.5rem;--cd-flow-space: 1rem;--cd-bumper-space: 1rem;--cd-footer-row-number: 5;--cd-red: #cd3a1f;--cd-red--light: #f8d8d3;--cd-orange: #db7b18;--cd-orange--light: #fae6d1;--cd-yellow: #d5de26;--cd-yellow--light: #f7f8d3;--cd-green: #7fb92f;--cd-green--light: #e8f5d6;--cd-font-size--tiny: 0.75rem;--cd-font-size--small: 0.875rem;--cd-font-size--base: 1.125rem;--cd-font-size--medium: 1.375rem;--cd-font-size--large: 1.625rem;--cd-font-size--2xbase: 1.875rem;--cd-font-size--2xmedium: 2.375rem;--cd-font-size--2xlarge: 2.875rem;--cd-font: helvetica, arial, sans-serif;--cd-font--system: system-ui;--cd-font--noto: "Noto Sans", sans-serif;--cd-font--noto-kufi: "Noto Kufi Arabic", sans-serif;--cd-font--roboto: "Roboto", helvetica, arial, sans-serif;--cd-font--roboto-condensed: "Roboto Condensed", helvetica, arial, sans-serif;--cd-font--roboto-slab: "Roboto Slab", helvetica, arial, sans-serif}@supports(display: grid){@media(min-width: 768px){.cd-layout-container{grid-template-rows:151px auto 1fr auto}}}@media(min-width: 768px){.cd-layout-container .cd-layout-content-wrapper{display:flex;flex-wrap:wrap}}@media(min-width: 768px){.cd-layout-content{flex-basis:0;flex-grow:999}}.cd-global-header__dropdown{background:var(--cd-reliefweb-brand-blue--dark)}.cd-global-header button[aria-expanded=true]::before{border-color:transparent transparent var(--cd-reliefweb-brand-blue--dark)}@media(max-width: 767px){.cd-global-header button[aria-expanded] span[class*=__btn-label]{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}.cd-header button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header{background:var(--cd-reliefweb-brand-blue--dark);background-image:linear-gradient(-180deg, var(--cd-reliefweb-brand-blue--dark) 67%, #04415a 97%)}@supports(display: grid){.cd-site-header__inner{grid-template-columns:52px 1fr}@media(min-width: 768px){.cd-site-header__inner{grid-template-columns:186px 1fr}}}.cd-language-switcher__btn:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-user-menu__dropdown li a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-site-logo{width:52px}.cd-site-logo:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}@media(max-width: 767px){.cd-site-logo{background:url("../img/logos/rw-logo-mobile.svg") center no-repeat;background:linear-gradient(transparent, transparent),url("../img/logos/rw-logo-mobile.svg") center no-repeat}}@media(min-width: 768px){.cd-site-logo{width:140px}}.menu--main button[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red--dark)}.cd-nav__btn[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red--dark)}.cd-nav__btn[aria-expanded=true]::before{background:var(--cd-reliefweb-brand-red--dark)}@media(max-width: 1023px){.cd-site-header__nav-holder .cd-nav>ul>li>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>button.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>button.is-active::before{background:rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.6)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}}@media(min-width: 1024px){.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail button::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a:focus::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button:focus::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul a.is-active,.cd-site-header__nav-holder .cd-nav>.menu>li>ul button.is-active{border-left:3px solid var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul>li.menu-item--active-trail .is-active{border-left:3px solid var(--cd-reliefweb-brand-red--dark)}}.cd-ocha-dropdown__link a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-search__btn{color:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn svg{fill:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn:hover,.cd-search__btn:focus{color:#04415a}.cd-search__btn:hover svg,.cd-search__btn:focus svg{fill:#04415a}.cd-search__btn:focus{color:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn:focus svg{fill:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn[aria-expanded=true]{color:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn[aria-expanded=true] svg{fill:var(--cd-reliefweb-brand-red--dark)}.cd-search__submit:focus{background-color:var(--cd-reliefweb-brand-red--dark)}.cd-user-menu--no-language-switcher li:last-child a,.cd-user-menu--no-language-switcher li:last-child button{padding-right:0}.cd-user-menu--no-language-switcher li:last-child a::after,.cd-user-menu--no-language-switcher li:last-child button::after{content:none}.cd-user-menu__item:focus,.cd-global-header .menu>li a:focus,.cd-global-header .menu>li button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button{padding-right:0}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a::after,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button::after{content:none}@media(max-width: 767px){.cd-global-header__user-menu a svg+span{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}[dir=ltr] .admin-menu__btn svg+span{margin-left:10px}[dir=rtl] .admin-menu__btn svg+span{margin-right:10px}.admin-menu__btn .cd-icon:not(.cd-icon--arrow-down){display:inline-block;width:14px;height:14px;vertical-align:middle;fill:var(--cd-white)}.cd-footer{background:var(--cd-reliefweb-brand-blue--dark)}.cd-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-footer-copyright{display:block;margin-top:0;text-align:right;color:#fff;font-size:12px;font-weight:lighter}.cd-footer-copyright p{margin:0}.cd-footer-copyright a{display:inline-block;overflow:hidden;width:140px;height:60px;margin:0 0 -4px 0;padding:0 0 0 140px;background:url(../img/logos/rw-logo-sprite.png) 0 -60px no-repeat;background:rgba(0,0,0,0) url(../img/logos/rw-logo-sprite.svg) 0 -60px no-repeat}.cd-footer-copyright a:hover,.cd-footer-copyright a:active,.cd-footer-copyright a:focus{opacity:.8}@media all and (max-width: 1023px){.cd-footer-copyright{width:100%;text-align:center}}.cd-soft-footer{background:rgba(var(--cd-rgb-ocha-blue), 0.9)}.cd-soft-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}a{color:var(--cd-reliefweb-brand-blue--dark)}a:hover,a:focus{color:var(--cd-reliefweb-brand-blue--dark)}h1,h2{margin:0 0 24px 0;letter-spacing:.5px;font-size:24px;font-weight:bold;line-height:1.3}@media screen and (min-width: 480px){h1,h2{font-size:var(--cd-font-size--2xbase)}}h3{margin:0 0 16px 0;letter-spacing:.5px;font-size:20px;font-weight:bold;line-height:1.3}h4{margin:0 0 16px 0;letter-spacing:.5px;font-size:18px;font-weight:bold;line-height:1.3}h5{margin:0 0 16px 0;letter-spacing:.5px;font-size:17px;font-weight:bold;font-style:italic}h6{margin:0 0 16px 0;letter-spacing:.5px;font-size:16px;font-weight:bold}.rw-article__content *+h3,.rw-article__content *+h4,.rw-article__content *+h5,.rw-article__content *+h6{margin-top:16px}@media all and (max-width: 479px){#main h2{font-size:24px}}p{margin:1rem 0;line-height:1.6}p:first-child{margin-top:0}p:last-child{margin-bottom:0}input[type=search]{-moz-appearance:none;-webkit-appearance:none;appearance:none}input::-webkit-search-decoration{-webkit-appearance:none}input:-ms-input-placeholder{opacity:.7;color:inherit;font-style:italic}input::-moz-placeholder{opacity:.7;color:inherit;font-style:italic}input::placeholder{opacity:.7;color:inherit;font-style:italic}select{max-width:100%}select:not([multitple]){-moz-appearance:menulist-button;-webkit-appearance:menulist-button}fieldset{min-inline-size:auto}table{width:100%;border-collapse:collapse}table caption{margin:12px 0;font-weight:bold}table th,table td{padding:8px;border:1px solid var(--cd-reliefweb-brand-grey--light)}table th{border-left-color:#fff;background:var(--cd-reliefweb-brand-grey--light)}table thead th{border-left-color:#fff}th.field-label>h4.label{margin:0}table thead th:first-child{border-left-color:var(--cd-reliefweb-brand-grey--light)}table tbody th{border-top-color:#fff}table tbody th:first-child{border-top-color:var(--cd-reliefweb-brand-grey--light)}code{padding:2px;background:var(--cd-reliefweb-brand-grey--light);font-family:monospace}
+@import"https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400%3B500%3B700&display=swap";@import"https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,300%3B0,400%3B0,500%3B0,700%3B0,900%3B1,400%3B1,700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400%3B700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@400%3B700&display=swap";:root{--cd-reliefweb-brand-blue: #0988bb;--cd-reliefweb-brand-red: #f65c51;--cd-reliefweb-brand-blue--dark: #055372;--cd-reliefweb-brand-red--dark: #eb1405;--cd-reliefweb-brand-grey--dark: #2e3436;--cd-reliefweb-brand-grey--mid: #4d5254;--cd-reliefweb-brand-grey--light: #e6ecef;--cd-rgb-reliefweb-brand-blue: 9, 136, 187;--cd-rgb-reliefweb-brand-red: 246, 92, 81;--cd-rgb-reliefweb-brand-blue--dark: 4, 82, 112;--cd-rgb-reliefweb-brand-red--dark: 235, 20, 5;--cd-rgb-reliefweb-brand-grey--dark: 46, 52, 54;--cd-rgb-reliefweb-brand-grey--light: 230, 236, 239;--cd-reliefweb-grey--light: #d9d9d9;--cd-reliefweb-grey--light--bg: rgba(217, 217, 217, 0.2);--cd-reliefweb-orange: #f49e2c;--cd-reliefweb-orange--bg: rgba(244, 158, 44, 0.2);--cd-reliefweb-blue: #076d96;--cd-reliefweb-blue--bg: rgba(7, 109, 150, 0.2);--cd-reliefweb-green: #88bb09;--cd-reliefweb-green--bg: rgba(136, 187, 9, 0.2);--cd-reliefweb-red: #da190b;--cd-reliefweb-red--bg: rgba(218, 25, 11, 0.2);--cd-reliefweb-purple: #9509bb;--cd-reliefweb-purple--bg: rgba(149, 9, 187, 0.2);--cd-reliefweb-grey: #4b4b4b;--cd-reliefweb-grey--bg: rgba(75, 75, 75, 0.2);--cd-reliefweb-brown: #8f5507;--cd-reliefweb-brown--bg: rgba(143, 85, 7, 0.2);--cd-reliefweb-yellow: #f5cb2f;--cd-reliefweb-yellow--bg: rgba(245, 203, 47, 0.2);--cd-reliefweb-cyan: #56c9f7;--cd-reliefweb-cyan--bg: rgba(86, 201, 247, 0.2);--cd-reliefweb-orange--alert: #eb8705;--cd-reliefweb-pink: rgba(246, 92, 81, 0.2);--cd-reliefweb-grey--disable: rgba(230, 236, 239, 0.5);--cd-ocha-blue: #1f69b3;--cd-blue--dark: #144372;--cd-blue--bright: #82b5e9;--cd-blue--light: #d4e5f7;--cd-highlight-red: #e56a54;--cd-contrast-red: #e00000;--cd-white: #fff;--cd-grey--light: #f2f2f2;--cd-grey--mid: #595959;--cd-grey--dark: #4a4a4a;--cd-default-text-color: var(--cd-grey--dark);--cd-black: #000;--cd-blue-grey: #e6ecf1;--cd-blue-grey--dark: #d3dde5;--cd-blue-grey--light: #ebf0f4;--cd-rgb-ocha-blue: 2, 108, 182;--cd-rgb-grey--mid: 89, 89, 89;--cd-rgb-grey--dark: 74, 74, 74;--cd-rgb-highlight-red: 229, 106, 84;--cd-rgb-blue-grey--dark: 211, 221, 229;--cd-max-content-width: 820px;--cd-max-body-width: 1400px;--cd-max-width: 1220px;--cd-container-padding: 0.75rem;--cd-container-padding-tablet: 1.5rem;--cd-container-padding-xlarge: 2.5rem;--cd-flow-space: 1rem;--cd-bumper-space: 1rem;--cd-footer-row-number: 5;--cd-red: #cd3a1f;--cd-red--light: #f8d8d3;--cd-orange: #db7b18;--cd-orange--light: #fae6d1;--cd-yellow: #d5de26;--cd-yellow--light: #f7f8d3;--cd-green: #7fb92f;--cd-green--light: #e8f5d6;--cd-font-size--tiny: 0.75rem;--cd-font-size--small: 0.875rem;--cd-font-size--base: 1.125rem;--cd-font-size--medium: 1.375rem;--cd-font-size--large: 1.625rem;--cd-font-size--2xbase: 1.875rem;--cd-font-size--2xmedium: 2.375rem;--cd-font-size--2xlarge: 2.875rem;--cd-font: helvetica, arial, sans-serif;--cd-font--system: system-ui;--cd-font--noto: "Noto Sans", sans-serif;--cd-font--noto-kufi: "Noto Kufi Arabic", sans-serif;--cd-font--roboto: "Roboto", helvetica, arial, sans-serif;--cd-font--roboto-condensed: "Roboto Condensed", helvetica, arial, sans-serif;--cd-font--roboto-slab: "Roboto Slab", helvetica, arial, sans-serif}@supports(display: grid){@media(min-width: 768px){.cd-layout-container{grid-template-rows:151px auto 1fr auto}}}@media(min-width: 768px){.cd-layout-container .cd-layout-content-wrapper{display:flex;flex-wrap:wrap}}@media(min-width: 768px){.cd-layout-content{flex-basis:0;flex-grow:999}}.cd-global-header__dropdown{background:var(--cd-reliefweb-brand-blue--dark)}.cd-global-header button[aria-expanded=true]::before{border-color:transparent transparent var(--cd-reliefweb-brand-blue--dark)}@media(max-width: 767px){.cd-global-header button[aria-expanded] span[class*=__btn-label]{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}.cd-header button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header{background:var(--cd-reliefweb-brand-blue--dark);background-image:linear-gradient(-180deg, var(--cd-reliefweb-brand-blue--dark) 67%, #04415a 97%)}@supports(display: grid){.cd-site-header__inner{grid-template-columns:52px 1fr}@media(min-width: 768px){.cd-site-header__inner{grid-template-columns:186px 1fr}}}.cd-language-switcher__btn:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-user-menu__dropdown li a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-site-logo{width:52px}.cd-site-logo:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}@media(max-width: 767px){.cd-site-logo{background:url("../img/logos/rw-logo-mobile.svg") center no-repeat;background:linear-gradient(transparent, transparent),url("../img/logos/rw-logo-mobile.svg") center no-repeat}}@media(min-width: 768px){.cd-site-logo{width:140px}}.menu--main button[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red--dark)}.cd-nav__btn[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red--dark)}.cd-nav__btn[aria-expanded=true]::before{background:var(--cd-reliefweb-brand-red--dark)}@media(max-width: 1023px){.cd-site-header__nav-holder .cd-nav>ul>li>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>button.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>button.is-active::before{background:rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.6)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}}@media(min-width: 1024px){.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail button::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a:focus::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button:focus::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul a.is-active,.cd-site-header__nav-holder .cd-nav>.menu>li>ul button.is-active{border-left:3px solid var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul>li.menu-item--active-trail .is-active{border-left:3px solid var(--cd-reliefweb-brand-red--dark)}}.cd-ocha-dropdown__link a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-search__btn{color:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn svg{fill:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn:hover,.cd-search__btn:focus{color:#04415a}.cd-search__btn:hover svg,.cd-search__btn:focus svg{fill:#04415a}.cd-search__btn:focus{color:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn:focus svg{fill:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn[aria-expanded=true]{color:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn[aria-expanded=true] svg{fill:var(--cd-reliefweb-brand-red--dark)}.cd-search__submit:focus{background-color:var(--cd-reliefweb-brand-red--dark)}.cd-user-menu--no-language-switcher li:last-child a,.cd-user-menu--no-language-switcher li:last-child button{padding-right:0}.cd-user-menu--no-language-switcher li:last-child a::after,.cd-user-menu--no-language-switcher li:last-child button::after{content:none}.cd-user-menu__item:focus,.cd-global-header .menu>li a:focus,.cd-global-header .menu>li button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button{padding-right:0}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a::after,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button::after{content:none}@media(max-width: 767px){.cd-global-header__user-menu a svg+span{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}[dir=ltr] .admin-menu__btn svg+span{margin-left:10px}[dir=rtl] .admin-menu__btn svg+span{margin-right:10px}.admin-menu__btn .cd-icon:not(.cd-icon--arrow-down){display:inline-block;width:14px;height:14px;vertical-align:middle;fill:var(--cd-white)}.cd-footer{background:var(--cd-reliefweb-brand-blue--dark)}.cd-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-footer-copyright{display:block;margin-top:0;text-align:right;color:#fff;font-size:12px;font-weight:lighter}.cd-footer-copyright p{margin:0}.cd-footer-copyright a{display:inline-block;overflow:hidden;width:140px;height:60px;margin:0 0 -4px 0;padding:0 0 0 140px;background:url(../img/logos/rw-logo-sprite.png) 0 -60px no-repeat;background:rgba(0,0,0,0) url(../img/logos/rw-logo-sprite.svg) 0 -60px no-repeat}.cd-footer-copyright a:hover,.cd-footer-copyright a:active,.cd-footer-copyright a:focus{opacity:.8}@media all and (max-width: 1023px){.cd-footer-copyright{width:100%;text-align:center}}.cd-soft-footer{background:rgba(var(--cd-rgb-ocha-blue), 0.9)}.cd-soft-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}a{color:var(--cd-reliefweb-brand-blue--dark)}a:hover,a:focus{color:var(--cd-reliefweb-brand-blue--dark)}h1,h2{margin:0 0 24px 0;letter-spacing:.5px;font-size:24px;font-weight:bold;line-height:1.3}@media screen and (min-width: 480px){h1{font-size:var(--cd-font-size--2xbase)}h2{font-size:var(--cd-font-size--medium)}}h3{margin:0 0 16px 0;letter-spacing:.5px;font-size:20px;font-weight:bold;line-height:1.3}h4{margin:0 0 16px 0;letter-spacing:.5px;font-size:18px;font-weight:bold;line-height:1.3}h5{margin:0 0 16px 0;letter-spacing:.5px;font-size:17px;font-weight:bold;font-style:italic}h6{margin:0 0 16px 0;letter-spacing:.5px;font-size:16px;font-weight:bold}.rw-article__content *+h3,.rw-article__content *+h4,.rw-article__content *+h5,.rw-article__content *+h6{margin-top:16px}@media all and (max-width: 479px){#main h2{font-size:24px}}p{margin:1rem 0;line-height:1.6}p:first-child{margin-top:0}p:last-child{margin-bottom:0}input[type=search]{-moz-appearance:none;-webkit-appearance:none;appearance:none}input::-webkit-search-decoration{-webkit-appearance:none}input:-ms-input-placeholder{opacity:.7;color:inherit;font-style:italic}input::-moz-placeholder{opacity:.7;color:inherit;font-style:italic}input::placeholder{opacity:.7;color:inherit;font-style:italic}select{max-width:100%}select:not([multitple]){-moz-appearance:menulist-button;-webkit-appearance:menulist-button}fieldset{min-inline-size:auto}table{width:100%;border-collapse:collapse}table caption{margin:12px 0;font-weight:bold}table th,table td{padding:8px;border:1px solid var(--cd-reliefweb-brand-grey--light)}table th{border-left-color:#fff;background:var(--cd-reliefweb-brand-grey--light)}table thead th{border-left-color:#fff}th.field-label>h4.label{margin:0}table thead th:first-child{border-left-color:var(--cd-reliefweb-brand-grey--light)}table tbody th{border-top-color:#fff}table tbody th:first-child{border-top-color:var(--cd-reliefweb-brand-grey--light)}code{padding:2px;background:var(--cd-reliefweb-brand-grey--light);font-family:monospace}
diff --git a/html/themes/custom/common_design_subtheme/sass/base/_typography.scss b/html/themes/custom/common_design_subtheme/sass/base/_typography.scss
index 03ebf90d6..525faf73e 100644
--- a/html/themes/custom/common_design_subtheme/sass/base/_typography.scss
+++ b/html/themes/custom/common_design_subtheme/sass/base/_typography.scss
@@ -36,10 +36,12 @@ h2 {
 }
 
 @media screen and (min-width: 480px) {
-  h1,
-  h2 {
+  h1 {
     font-size: var(--cd-font-size--2xbase);
   }
+  h2 {
+    font-size: var(--cd-font-size--medium);
+  }
 }
 h3 {
   margin: 0 0 16px 0;

From 0fcb89f48d30d38bb234456f46786e9a5bf3d121 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 16 Feb 2022 11:12:09 +0100
Subject: [PATCH 489/720] RW-384 increase heading 2 to large 26px

---
 html/themes/custom/common_design_subtheme/css/styles.css        | 2 +-
 .../custom/common_design_subtheme/sass/base/_typography.scss    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/css/styles.css b/html/themes/custom/common_design_subtheme/css/styles.css
index bec7822b3..7ee679459 100644
--- a/html/themes/custom/common_design_subtheme/css/styles.css
+++ b/html/themes/custom/common_design_subtheme/css/styles.css
@@ -1 +1 @@
-@import"https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400%3B500%3B700&display=swap";@import"https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,300%3B0,400%3B0,500%3B0,700%3B0,900%3B1,400%3B1,700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400%3B700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@400%3B700&display=swap";:root{--cd-reliefweb-brand-blue: #0988bb;--cd-reliefweb-brand-red: #f65c51;--cd-reliefweb-brand-blue--dark: #055372;--cd-reliefweb-brand-red--dark: #eb1405;--cd-reliefweb-brand-grey--dark: #2e3436;--cd-reliefweb-brand-grey--mid: #4d5254;--cd-reliefweb-brand-grey--light: #e6ecef;--cd-rgb-reliefweb-brand-blue: 9, 136, 187;--cd-rgb-reliefweb-brand-red: 246, 92, 81;--cd-rgb-reliefweb-brand-blue--dark: 4, 82, 112;--cd-rgb-reliefweb-brand-red--dark: 235, 20, 5;--cd-rgb-reliefweb-brand-grey--dark: 46, 52, 54;--cd-rgb-reliefweb-brand-grey--light: 230, 236, 239;--cd-reliefweb-grey--light: #d9d9d9;--cd-reliefweb-grey--light--bg: rgba(217, 217, 217, 0.2);--cd-reliefweb-orange: #f49e2c;--cd-reliefweb-orange--bg: rgba(244, 158, 44, 0.2);--cd-reliefweb-blue: #076d96;--cd-reliefweb-blue--bg: rgba(7, 109, 150, 0.2);--cd-reliefweb-green: #88bb09;--cd-reliefweb-green--bg: rgba(136, 187, 9, 0.2);--cd-reliefweb-red: #da190b;--cd-reliefweb-red--bg: rgba(218, 25, 11, 0.2);--cd-reliefweb-purple: #9509bb;--cd-reliefweb-purple--bg: rgba(149, 9, 187, 0.2);--cd-reliefweb-grey: #4b4b4b;--cd-reliefweb-grey--bg: rgba(75, 75, 75, 0.2);--cd-reliefweb-brown: #8f5507;--cd-reliefweb-brown--bg: rgba(143, 85, 7, 0.2);--cd-reliefweb-yellow: #f5cb2f;--cd-reliefweb-yellow--bg: rgba(245, 203, 47, 0.2);--cd-reliefweb-cyan: #56c9f7;--cd-reliefweb-cyan--bg: rgba(86, 201, 247, 0.2);--cd-reliefweb-orange--alert: #eb8705;--cd-reliefweb-pink: rgba(246, 92, 81, 0.2);--cd-reliefweb-grey--disable: rgba(230, 236, 239, 0.5);--cd-ocha-blue: #1f69b3;--cd-blue--dark: #144372;--cd-blue--bright: #82b5e9;--cd-blue--light: #d4e5f7;--cd-highlight-red: #e56a54;--cd-contrast-red: #e00000;--cd-white: #fff;--cd-grey--light: #f2f2f2;--cd-grey--mid: #595959;--cd-grey--dark: #4a4a4a;--cd-default-text-color: var(--cd-grey--dark);--cd-black: #000;--cd-blue-grey: #e6ecf1;--cd-blue-grey--dark: #d3dde5;--cd-blue-grey--light: #ebf0f4;--cd-rgb-ocha-blue: 2, 108, 182;--cd-rgb-grey--mid: 89, 89, 89;--cd-rgb-grey--dark: 74, 74, 74;--cd-rgb-highlight-red: 229, 106, 84;--cd-rgb-blue-grey--dark: 211, 221, 229;--cd-max-content-width: 820px;--cd-max-body-width: 1400px;--cd-max-width: 1220px;--cd-container-padding: 0.75rem;--cd-container-padding-tablet: 1.5rem;--cd-container-padding-xlarge: 2.5rem;--cd-flow-space: 1rem;--cd-bumper-space: 1rem;--cd-footer-row-number: 5;--cd-red: #cd3a1f;--cd-red--light: #f8d8d3;--cd-orange: #db7b18;--cd-orange--light: #fae6d1;--cd-yellow: #d5de26;--cd-yellow--light: #f7f8d3;--cd-green: #7fb92f;--cd-green--light: #e8f5d6;--cd-font-size--tiny: 0.75rem;--cd-font-size--small: 0.875rem;--cd-font-size--base: 1.125rem;--cd-font-size--medium: 1.375rem;--cd-font-size--large: 1.625rem;--cd-font-size--2xbase: 1.875rem;--cd-font-size--2xmedium: 2.375rem;--cd-font-size--2xlarge: 2.875rem;--cd-font: helvetica, arial, sans-serif;--cd-font--system: system-ui;--cd-font--noto: "Noto Sans", sans-serif;--cd-font--noto-kufi: "Noto Kufi Arabic", sans-serif;--cd-font--roboto: "Roboto", helvetica, arial, sans-serif;--cd-font--roboto-condensed: "Roboto Condensed", helvetica, arial, sans-serif;--cd-font--roboto-slab: "Roboto Slab", helvetica, arial, sans-serif}@supports(display: grid){@media(min-width: 768px){.cd-layout-container{grid-template-rows:151px auto 1fr auto}}}@media(min-width: 768px){.cd-layout-container .cd-layout-content-wrapper{display:flex;flex-wrap:wrap}}@media(min-width: 768px){.cd-layout-content{flex-basis:0;flex-grow:999}}.cd-global-header__dropdown{background:var(--cd-reliefweb-brand-blue--dark)}.cd-global-header button[aria-expanded=true]::before{border-color:transparent transparent var(--cd-reliefweb-brand-blue--dark)}@media(max-width: 767px){.cd-global-header button[aria-expanded] span[class*=__btn-label]{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}.cd-header button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header{background:var(--cd-reliefweb-brand-blue--dark);background-image:linear-gradient(-180deg, var(--cd-reliefweb-brand-blue--dark) 67%, #04415a 97%)}@supports(display: grid){.cd-site-header__inner{grid-template-columns:52px 1fr}@media(min-width: 768px){.cd-site-header__inner{grid-template-columns:186px 1fr}}}.cd-language-switcher__btn:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-user-menu__dropdown li a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-site-logo{width:52px}.cd-site-logo:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}@media(max-width: 767px){.cd-site-logo{background:url("../img/logos/rw-logo-mobile.svg") center no-repeat;background:linear-gradient(transparent, transparent),url("../img/logos/rw-logo-mobile.svg") center no-repeat}}@media(min-width: 768px){.cd-site-logo{width:140px}}.menu--main button[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red--dark)}.cd-nav__btn[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red--dark)}.cd-nav__btn[aria-expanded=true]::before{background:var(--cd-reliefweb-brand-red--dark)}@media(max-width: 1023px){.cd-site-header__nav-holder .cd-nav>ul>li>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>button.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>button.is-active::before{background:rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.6)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}}@media(min-width: 1024px){.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail button::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a:focus::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button:focus::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul a.is-active,.cd-site-header__nav-holder .cd-nav>.menu>li>ul button.is-active{border-left:3px solid var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul>li.menu-item--active-trail .is-active{border-left:3px solid var(--cd-reliefweb-brand-red--dark)}}.cd-ocha-dropdown__link a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-search__btn{color:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn svg{fill:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn:hover,.cd-search__btn:focus{color:#04415a}.cd-search__btn:hover svg,.cd-search__btn:focus svg{fill:#04415a}.cd-search__btn:focus{color:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn:focus svg{fill:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn[aria-expanded=true]{color:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn[aria-expanded=true] svg{fill:var(--cd-reliefweb-brand-red--dark)}.cd-search__submit:focus{background-color:var(--cd-reliefweb-brand-red--dark)}.cd-user-menu--no-language-switcher li:last-child a,.cd-user-menu--no-language-switcher li:last-child button{padding-right:0}.cd-user-menu--no-language-switcher li:last-child a::after,.cd-user-menu--no-language-switcher li:last-child button::after{content:none}.cd-user-menu__item:focus,.cd-global-header .menu>li a:focus,.cd-global-header .menu>li button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button{padding-right:0}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a::after,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button::after{content:none}@media(max-width: 767px){.cd-global-header__user-menu a svg+span{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}[dir=ltr] .admin-menu__btn svg+span{margin-left:10px}[dir=rtl] .admin-menu__btn svg+span{margin-right:10px}.admin-menu__btn .cd-icon:not(.cd-icon--arrow-down){display:inline-block;width:14px;height:14px;vertical-align:middle;fill:var(--cd-white)}.cd-footer{background:var(--cd-reliefweb-brand-blue--dark)}.cd-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-footer-copyright{display:block;margin-top:0;text-align:right;color:#fff;font-size:12px;font-weight:lighter}.cd-footer-copyright p{margin:0}.cd-footer-copyright a{display:inline-block;overflow:hidden;width:140px;height:60px;margin:0 0 -4px 0;padding:0 0 0 140px;background:url(../img/logos/rw-logo-sprite.png) 0 -60px no-repeat;background:rgba(0,0,0,0) url(../img/logos/rw-logo-sprite.svg) 0 -60px no-repeat}.cd-footer-copyright a:hover,.cd-footer-copyright a:active,.cd-footer-copyright a:focus{opacity:.8}@media all and (max-width: 1023px){.cd-footer-copyright{width:100%;text-align:center}}.cd-soft-footer{background:rgba(var(--cd-rgb-ocha-blue), 0.9)}.cd-soft-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}a{color:var(--cd-reliefweb-brand-blue--dark)}a:hover,a:focus{color:var(--cd-reliefweb-brand-blue--dark)}h1,h2{margin:0 0 24px 0;letter-spacing:.5px;font-size:24px;font-weight:bold;line-height:1.3}@media screen and (min-width: 480px){h1{font-size:var(--cd-font-size--2xbase)}h2{font-size:var(--cd-font-size--medium)}}h3{margin:0 0 16px 0;letter-spacing:.5px;font-size:20px;font-weight:bold;line-height:1.3}h4{margin:0 0 16px 0;letter-spacing:.5px;font-size:18px;font-weight:bold;line-height:1.3}h5{margin:0 0 16px 0;letter-spacing:.5px;font-size:17px;font-weight:bold;font-style:italic}h6{margin:0 0 16px 0;letter-spacing:.5px;font-size:16px;font-weight:bold}.rw-article__content *+h3,.rw-article__content *+h4,.rw-article__content *+h5,.rw-article__content *+h6{margin-top:16px}@media all and (max-width: 479px){#main h2{font-size:24px}}p{margin:1rem 0;line-height:1.6}p:first-child{margin-top:0}p:last-child{margin-bottom:0}input[type=search]{-moz-appearance:none;-webkit-appearance:none;appearance:none}input::-webkit-search-decoration{-webkit-appearance:none}input:-ms-input-placeholder{opacity:.7;color:inherit;font-style:italic}input::-moz-placeholder{opacity:.7;color:inherit;font-style:italic}input::placeholder{opacity:.7;color:inherit;font-style:italic}select{max-width:100%}select:not([multitple]){-moz-appearance:menulist-button;-webkit-appearance:menulist-button}fieldset{min-inline-size:auto}table{width:100%;border-collapse:collapse}table caption{margin:12px 0;font-weight:bold}table th,table td{padding:8px;border:1px solid var(--cd-reliefweb-brand-grey--light)}table th{border-left-color:#fff;background:var(--cd-reliefweb-brand-grey--light)}table thead th{border-left-color:#fff}th.field-label>h4.label{margin:0}table thead th:first-child{border-left-color:var(--cd-reliefweb-brand-grey--light)}table tbody th{border-top-color:#fff}table tbody th:first-child{border-top-color:var(--cd-reliefweb-brand-grey--light)}code{padding:2px;background:var(--cd-reliefweb-brand-grey--light);font-family:monospace}
+@import"https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400%3B500%3B700&display=swap";@import"https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,300%3B0,400%3B0,500%3B0,700%3B0,900%3B1,400%3B1,700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400%3B700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@400%3B700&display=swap";:root{--cd-reliefweb-brand-blue: #0988bb;--cd-reliefweb-brand-red: #f65c51;--cd-reliefweb-brand-blue--dark: #055372;--cd-reliefweb-brand-red--dark: #eb1405;--cd-reliefweb-brand-grey--dark: #2e3436;--cd-reliefweb-brand-grey--mid: #4d5254;--cd-reliefweb-brand-grey--light: #e6ecef;--cd-rgb-reliefweb-brand-blue: 9, 136, 187;--cd-rgb-reliefweb-brand-red: 246, 92, 81;--cd-rgb-reliefweb-brand-blue--dark: 4, 82, 112;--cd-rgb-reliefweb-brand-red--dark: 235, 20, 5;--cd-rgb-reliefweb-brand-grey--dark: 46, 52, 54;--cd-rgb-reliefweb-brand-grey--light: 230, 236, 239;--cd-reliefweb-grey--light: #d9d9d9;--cd-reliefweb-grey--light--bg: rgba(217, 217, 217, 0.2);--cd-reliefweb-orange: #f49e2c;--cd-reliefweb-orange--bg: rgba(244, 158, 44, 0.2);--cd-reliefweb-blue: #076d96;--cd-reliefweb-blue--bg: rgba(7, 109, 150, 0.2);--cd-reliefweb-green: #88bb09;--cd-reliefweb-green--bg: rgba(136, 187, 9, 0.2);--cd-reliefweb-red: #da190b;--cd-reliefweb-red--bg: rgba(218, 25, 11, 0.2);--cd-reliefweb-purple: #9509bb;--cd-reliefweb-purple--bg: rgba(149, 9, 187, 0.2);--cd-reliefweb-grey: #4b4b4b;--cd-reliefweb-grey--bg: rgba(75, 75, 75, 0.2);--cd-reliefweb-brown: #8f5507;--cd-reliefweb-brown--bg: rgba(143, 85, 7, 0.2);--cd-reliefweb-yellow: #f5cb2f;--cd-reliefweb-yellow--bg: rgba(245, 203, 47, 0.2);--cd-reliefweb-cyan: #56c9f7;--cd-reliefweb-cyan--bg: rgba(86, 201, 247, 0.2);--cd-reliefweb-orange--alert: #eb8705;--cd-reliefweb-pink: rgba(246, 92, 81, 0.2);--cd-reliefweb-grey--disable: rgba(230, 236, 239, 0.5);--cd-ocha-blue: #1f69b3;--cd-blue--dark: #144372;--cd-blue--bright: #82b5e9;--cd-blue--light: #d4e5f7;--cd-highlight-red: #e56a54;--cd-contrast-red: #e00000;--cd-white: #fff;--cd-grey--light: #f2f2f2;--cd-grey--mid: #595959;--cd-grey--dark: #4a4a4a;--cd-default-text-color: var(--cd-grey--dark);--cd-black: #000;--cd-blue-grey: #e6ecf1;--cd-blue-grey--dark: #d3dde5;--cd-blue-grey--light: #ebf0f4;--cd-rgb-ocha-blue: 2, 108, 182;--cd-rgb-grey--mid: 89, 89, 89;--cd-rgb-grey--dark: 74, 74, 74;--cd-rgb-highlight-red: 229, 106, 84;--cd-rgb-blue-grey--dark: 211, 221, 229;--cd-max-content-width: 820px;--cd-max-body-width: 1400px;--cd-max-width: 1220px;--cd-container-padding: 0.75rem;--cd-container-padding-tablet: 1.5rem;--cd-container-padding-xlarge: 2.5rem;--cd-flow-space: 1rem;--cd-bumper-space: 1rem;--cd-footer-row-number: 5;--cd-red: #cd3a1f;--cd-red--light: #f8d8d3;--cd-orange: #db7b18;--cd-orange--light: #fae6d1;--cd-yellow: #d5de26;--cd-yellow--light: #f7f8d3;--cd-green: #7fb92f;--cd-green--light: #e8f5d6;--cd-font-size--tiny: 0.75rem;--cd-font-size--small: 0.875rem;--cd-font-size--base: 1.125rem;--cd-font-size--medium: 1.375rem;--cd-font-size--large: 1.625rem;--cd-font-size--2xbase: 1.875rem;--cd-font-size--2xmedium: 2.375rem;--cd-font-size--2xlarge: 2.875rem;--cd-font: helvetica, arial, sans-serif;--cd-font--system: system-ui;--cd-font--noto: "Noto Sans", sans-serif;--cd-font--noto-kufi: "Noto Kufi Arabic", sans-serif;--cd-font--roboto: "Roboto", helvetica, arial, sans-serif;--cd-font--roboto-condensed: "Roboto Condensed", helvetica, arial, sans-serif;--cd-font--roboto-slab: "Roboto Slab", helvetica, arial, sans-serif}@supports(display: grid){@media(min-width: 768px){.cd-layout-container{grid-template-rows:151px auto 1fr auto}}}@media(min-width: 768px){.cd-layout-container .cd-layout-content-wrapper{display:flex;flex-wrap:wrap}}@media(min-width: 768px){.cd-layout-content{flex-basis:0;flex-grow:999}}.cd-global-header__dropdown{background:var(--cd-reliefweb-brand-blue--dark)}.cd-global-header button[aria-expanded=true]::before{border-color:transparent transparent var(--cd-reliefweb-brand-blue--dark)}@media(max-width: 767px){.cd-global-header button[aria-expanded] span[class*=__btn-label]{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}.cd-header button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header{background:var(--cd-reliefweb-brand-blue--dark);background-image:linear-gradient(-180deg, var(--cd-reliefweb-brand-blue--dark) 67%, #04415a 97%)}@supports(display: grid){.cd-site-header__inner{grid-template-columns:52px 1fr}@media(min-width: 768px){.cd-site-header__inner{grid-template-columns:186px 1fr}}}.cd-language-switcher__btn:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-user-menu__dropdown li a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-site-logo{width:52px}.cd-site-logo:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}@media(max-width: 767px){.cd-site-logo{background:url("../img/logos/rw-logo-mobile.svg") center no-repeat;background:linear-gradient(transparent, transparent),url("../img/logos/rw-logo-mobile.svg") center no-repeat}}@media(min-width: 768px){.cd-site-logo{width:140px}}.menu--main button[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red--dark)}.cd-nav__btn[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red--dark)}.cd-nav__btn[aria-expanded=true]::before{background:var(--cd-reliefweb-brand-red--dark)}@media(max-width: 1023px){.cd-site-header__nav-holder .cd-nav>ul>li>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>button.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>button.is-active::before{background:rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.6)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}}@media(min-width: 1024px){.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail button::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a:focus::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button:focus::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul a.is-active,.cd-site-header__nav-holder .cd-nav>.menu>li>ul button.is-active{border-left:3px solid var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul>li.menu-item--active-trail .is-active{border-left:3px solid var(--cd-reliefweb-brand-red--dark)}}.cd-ocha-dropdown__link a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-search__btn{color:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn svg{fill:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn:hover,.cd-search__btn:focus{color:#04415a}.cd-search__btn:hover svg,.cd-search__btn:focus svg{fill:#04415a}.cd-search__btn:focus{color:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn:focus svg{fill:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn[aria-expanded=true]{color:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn[aria-expanded=true] svg{fill:var(--cd-reliefweb-brand-red--dark)}.cd-search__submit:focus{background-color:var(--cd-reliefweb-brand-red--dark)}.cd-user-menu--no-language-switcher li:last-child a,.cd-user-menu--no-language-switcher li:last-child button{padding-right:0}.cd-user-menu--no-language-switcher li:last-child a::after,.cd-user-menu--no-language-switcher li:last-child button::after{content:none}.cd-user-menu__item:focus,.cd-global-header .menu>li a:focus,.cd-global-header .menu>li button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button{padding-right:0}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a::after,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button::after{content:none}@media(max-width: 767px){.cd-global-header__user-menu a svg+span{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}[dir=ltr] .admin-menu__btn svg+span{margin-left:10px}[dir=rtl] .admin-menu__btn svg+span{margin-right:10px}.admin-menu__btn .cd-icon:not(.cd-icon--arrow-down){display:inline-block;width:14px;height:14px;vertical-align:middle;fill:var(--cd-white)}.cd-footer{background:var(--cd-reliefweb-brand-blue--dark)}.cd-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-footer-copyright{display:block;margin-top:0;text-align:right;color:#fff;font-size:12px;font-weight:lighter}.cd-footer-copyright p{margin:0}.cd-footer-copyright a{display:inline-block;overflow:hidden;width:140px;height:60px;margin:0 0 -4px 0;padding:0 0 0 140px;background:url(../img/logos/rw-logo-sprite.png) 0 -60px no-repeat;background:rgba(0,0,0,0) url(../img/logos/rw-logo-sprite.svg) 0 -60px no-repeat}.cd-footer-copyright a:hover,.cd-footer-copyright a:active,.cd-footer-copyright a:focus{opacity:.8}@media all and (max-width: 1023px){.cd-footer-copyright{width:100%;text-align:center}}.cd-soft-footer{background:rgba(var(--cd-rgb-ocha-blue), 0.9)}.cd-soft-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}a{color:var(--cd-reliefweb-brand-blue--dark)}a:hover,a:focus{color:var(--cd-reliefweb-brand-blue--dark)}h1,h2{margin:0 0 24px 0;letter-spacing:.5px;font-size:24px;font-weight:bold;line-height:1.3}@media screen and (min-width: 480px){h1{font-size:var(--cd-font-size--2xbase)}h2{font-size:var(--cd-font-size--large)}}h3{margin:0 0 16px 0;letter-spacing:.5px;font-size:20px;font-weight:bold;line-height:1.3}h4{margin:0 0 16px 0;letter-spacing:.5px;font-size:18px;font-weight:bold;line-height:1.3}h5{margin:0 0 16px 0;letter-spacing:.5px;font-size:17px;font-weight:bold;font-style:italic}h6{margin:0 0 16px 0;letter-spacing:.5px;font-size:16px;font-weight:bold}.rw-article__content *+h3,.rw-article__content *+h4,.rw-article__content *+h5,.rw-article__content *+h6{margin-top:16px}@media all and (max-width: 479px){#main h2{font-size:24px}}p{margin:1rem 0;line-height:1.6}p:first-child{margin-top:0}p:last-child{margin-bottom:0}input[type=search]{-moz-appearance:none;-webkit-appearance:none;appearance:none}input::-webkit-search-decoration{-webkit-appearance:none}input:-ms-input-placeholder{opacity:.7;color:inherit;font-style:italic}input::-moz-placeholder{opacity:.7;color:inherit;font-style:italic}input::placeholder{opacity:.7;color:inherit;font-style:italic}select{max-width:100%}select:not([multitple]){-moz-appearance:menulist-button;-webkit-appearance:menulist-button}fieldset{min-inline-size:auto}table{width:100%;border-collapse:collapse}table caption{margin:12px 0;font-weight:bold}table th,table td{padding:8px;border:1px solid var(--cd-reliefweb-brand-grey--light)}table th{border-left-color:#fff;background:var(--cd-reliefweb-brand-grey--light)}table thead th{border-left-color:#fff}th.field-label>h4.label{margin:0}table thead th:first-child{border-left-color:var(--cd-reliefweb-brand-grey--light)}table tbody th{border-top-color:#fff}table tbody th:first-child{border-top-color:var(--cd-reliefweb-brand-grey--light)}code{padding:2px;background:var(--cd-reliefweb-brand-grey--light);font-family:monospace}
diff --git a/html/themes/custom/common_design_subtheme/sass/base/_typography.scss b/html/themes/custom/common_design_subtheme/sass/base/_typography.scss
index 525faf73e..e045674d5 100644
--- a/html/themes/custom/common_design_subtheme/sass/base/_typography.scss
+++ b/html/themes/custom/common_design_subtheme/sass/base/_typography.scss
@@ -40,7 +40,7 @@ h2 {
     font-size: var(--cd-font-size--2xbase);
   }
   h2 {
-    font-size: var(--cd-font-size--medium);
+    font-size: var(--cd-font-size--large);
   }
 }
 h3 {

From c45c72ebe1f169e671cae7a4651271b3c152b87c Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 16 Feb 2022 10:15:52 +0000
Subject: [PATCH 490/720] [RW-190] Prevent access to the system users pages

---
 .../reliefweb_users.services.yml              |  4 +++
 .../src/Access/SystemUserAccessCheck.php      | 29 +++++++++++++++++++
 .../src/Routing/RouteSubscriber.php           |  7 +++++
 3 files changed, 40 insertions(+)
 create mode 100644 html/modules/custom/reliefweb_users/src/Access/SystemUserAccessCheck.php

diff --git a/html/modules/custom/reliefweb_users/reliefweb_users.services.yml b/html/modules/custom/reliefweb_users/reliefweb_users.services.yml
index 013a8268a..43f5b5f3b 100644
--- a/html/modules/custom/reliefweb_users/reliefweb_users.services.yml
+++ b/html/modules/custom/reliefweb_users/reliefweb_users.services.yml
@@ -3,3 +3,7 @@ services:
     class: Drupal\reliefweb_users\Routing\RouteSubscriber
     tags:
       - { name: event_subscriber }
+  reliefweb_users.access_checker:
+    class: Drupal\reliefweb_users\Access\SystemUserAccessCheck
+    tags:
+      - { name: access_check, applies_to: _reliefweb_user_access_check }
diff --git a/html/modules/custom/reliefweb_users/src/Access/SystemUserAccessCheck.php b/html/modules/custom/reliefweb_users/src/Access/SystemUserAccessCheck.php
new file mode 100644
index 000000000..522526a0c
--- /dev/null
+++ b/html/modules/custom/reliefweb_users/src/Access/SystemUserAccessCheck.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\reliefweb_users\Access;
+
+use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Routing\Access\AccessInterface;
+use Drupal\Core\Session\AccountInterface;
+
+/**
+ * Check access to system user pages.
+ */
+class SystemUserAccessCheck implements AccessInterface {
+
+  /**
+   * Check access to system user pages.
+   *
+   * @param \Drupal\Core\Session\AccountInterface $account
+   *   Run access checks for this account.
+   * @param \Drupal\Core\Session\AccountInterface $user
+   *   The user entity for the user form.
+   *
+   * @return \Drupal\Core\Access\AccessResultInterface
+   *   The access result.
+   */
+  public function access(AccountInterface $account, AccountInterface $user) {
+    return AccessResult::allowedIf($user->id() > 2 || $account->id() === $user->id());
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_users/src/Routing/RouteSubscriber.php b/html/modules/custom/reliefweb_users/src/Routing/RouteSubscriber.php
index d97c5cd52..54b5c80d0 100644
--- a/html/modules/custom/reliefweb_users/src/Routing/RouteSubscriber.php
+++ b/html/modules/custom/reliefweb_users/src/Routing/RouteSubscriber.php
@@ -20,6 +20,13 @@ protected function alterRoutes(RouteCollection $collection) {
         '_title' => 'People',
       ]);
     }
+
+    // Define custom access for the user routes.
+    foreach ($collection->getIterator() as $route) {
+      if (strpos($route->getPath(), '/user/{user}') === 0) {
+        $route->setRequirement('_reliefweb_user_access_check', 'Drupal\reliefweb_users\Access\SystemUserAccessCheck::access');
+      }
+    }
   }
 
 }

From a0a63cd100c3a8cd33760b099ed78058cec3ecb3 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 16 Feb 2022 10:16:44 +0000
Subject: [PATCH 491/720] [RW-182] Add permissions to assign user roles

---
 config/user.role.user_manager.yml             |  7 ++
 .../reliefweb_users.permissions.yml           |  7 ++
 .../reliefweb_users/src/UserPermissions.php   | 72 +++++++++++++++++++
 3 files changed, 86 insertions(+)
 create mode 100644 html/modules/custom/reliefweb_users/src/UserPermissions.php

diff --git a/config/user.role.user_manager.yml b/config/user.role.user_manager.yml
index dcad5f423..257ad2cef 100644
--- a/config/user.role.user_manager.yml
+++ b/config/user.role.user_manager.yml
@@ -13,6 +13,13 @@ permissions:
   - 'access user profiles'
   - 'administer subscriptions'
   - 'administer users'
+  - 'assign beta role'
+  - 'assign editor role'
+  - 'assign external_disaster_manager role'
+  - 'assign job_importer role'
+  - 'assign user_manager role'
+  - 'assign webmaster role'
   - 'change own username'
+  - 'manage user roles'
   - 'view reliefweb admin menu'
   - 'view user email addresses'
diff --git a/html/modules/custom/reliefweb_users/reliefweb_users.permissions.yml b/html/modules/custom/reliefweb_users/reliefweb_users.permissions.yml
index bc8489120..d8bcd2a0a 100644
--- a/html/modules/custom/reliefweb_users/reliefweb_users.permissions.yml
+++ b/html/modules/custom/reliefweb_users/reliefweb_users.permissions.yml
@@ -1,3 +1,10 @@
 view reliefweb admin menu:
   title: 'View reliefweb admin menu'
   description: 'Allow users to view the reliefwebadmin menu.'
+
+manage user roles:
+  title: 'Manage user roles'
+  description: 'Allow users to manager user roles on other accounts.'
+
+permission_callbacks:
+  - Drupal\reliefweb_users\UserPermissions::permissions
diff --git a/html/modules/custom/reliefweb_users/src/UserPermissions.php b/html/modules/custom/reliefweb_users/src/UserPermissions.php
new file mode 100644
index 000000000..d5b321e47
--- /dev/null
+++ b/html/modules/custom/reliefweb_users/src/UserPermissions.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace Drupal\reliefweb_users;
+
+use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * ReliefWeb Users permission provider.
+ */
+class UserPermissions implements ContainerInjectionInterface {
+
+  use StringTranslationTrait;
+
+  /**
+   * The entity type manager service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * Constructor.
+   *
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager service.
+   */
+  public function __construct(EntityTypeManagerInterface $entity_type_manager) {
+    $this->entityTypeManager = $entity_type_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('entity_type.manager')
+    );
+  }
+
+  /**
+   * Get permissions to assign roles.
+   *
+   * @return array
+   *   Associative array witht the permissions as keys and an array with the
+   *   permission title and description as values.
+   */
+  public function permissions() {
+    $permissions = [];
+
+    $roles = $this->entityTypeManager->getStorage('user_role')->loadMultiple();
+    foreach ($roles as $id => $role) {
+      if ($id === $role::ANONYMOUS_ID || $id === $role::AUTHENTICATED_ID) {
+        continue;
+      }
+
+      $permissions['assign ' . $id . ' role'] = [
+        'title' => $this->t('Assign @label role.', [
+          '@label' => $role->label(),
+        ]),
+        'description' => $this->t('Allow users to assign the @label role to other accounts.', [
+          '@label' => $role->label(),
+        ]),
+      ];
+    }
+
+    return $permissions;
+  }
+
+}

From 51f729d212af89ec2030f7d7875f775806494755 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 16 Feb 2022 10:18:05 +0000
Subject: [PATCH 492/720] [RW-157][RW-261] Limit fields on user edit form

---
 .../reliefweb_users/reliefweb_users.module    | 46 +++++++++++++++++++
 .../templates/form/user-edit-form.html.twig   |  4 +-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_users/reliefweb_users.module b/html/modules/custom/reliefweb_users/reliefweb_users.module
index 9fdcbf066..a81b82648 100644
--- a/html/modules/custom/reliefweb_users/reliefweb_users.module
+++ b/html/modules/custom/reliefweb_users/reliefweb_users.module
@@ -5,6 +5,9 @@
  * Module file for reliefweb_users.
  */
 
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\user\RoleInterface;
+
 /**
  * Implements hook_theme().
  */
@@ -33,3 +36,46 @@ function reliefweb_users_menu_local_actions_alter(&$local_actions) {
   // Remove the create user action on the "people" page.
   unset($local_actions['user_admin_create']);
 }
+
+/**
+ * Implements hook_form_user_form_alter().
+ */
+function reliefweb_users_form_user_form_alter(array &$form, FormStateInterface $form_state) {
+  $user = \Drupal::currentUser();
+
+  // Unncessary fields.
+  $form['contact']['#access'] = FALSE;
+  $form['details']['#access'] = FALSE;
+  $form['footer']['#access'] = FALSE;
+  $form['language']['#access'] = FALSE;
+  $form['timezone']['#access'] = FALSE;
+
+  // Only people who can administrate other accounts can add notes.
+  $form['field_notes']['#access'] = $user->hasPermission('administer users');
+
+  // Check if hte user is allowed to assign roles.
+  if ($user->hasPermission('manage user roles') && !empty($form['account']['roles']['#options'])) {
+    $form['account']['roles']['#access'] = TRUE;
+
+    $default_roles = $form['account']['roles']['#default_value'] ?? [];
+
+    foreach ($form['account']['roles']['#options'] as $role => $label) {
+      if ($role === RoleInterface::ANONYMOUS_ID) {
+        continue;
+      }
+      // No need to display the authenticated role.
+      elseif ($role === RoleInterface::AUTHENTICATED_ID) {
+        $form['account']['roles'][$role]['#access'] = FALSE;
+      }
+      // Only display the roles that can be assigned by the current user.
+      elseif (!$user->hasPermission('assign ' . $role . ' role')) {
+        $form['account']['roles'][$role]['#access'] = FALSE;
+        $form['account']['roles'][$role]['#disabled'] = TRUE;
+        $form['account']['roles'][$role]['#default_value'] = in_array($role, $default_roles);
+      }
+    }
+  }
+  else {
+    $form['account']['roles']['#access'] = FALSE;
+  }
+}
diff --git a/html/themes/custom/common_design_subtheme/templates/form/user-edit-form.html.twig b/html/themes/custom/common_design_subtheme/templates/form/user-edit-form.html.twig
index 281929066..ab280fea4 100644
--- a/html/themes/custom/common_design_subtheme/templates/form/user-edit-form.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/form/user-edit-form.html.twig
@@ -21,19 +21,21 @@
 <fieldset id="account">
   <legend>{% trans %}Account information{% endtrans %}</legend>
   {{ form.account.name }}
-  {{ form.display_name }}
   {{ form.account.current_pass }}
   {{ form.account.mail }}
   {{ form.account.pass }}
   {{ form.account.reset_pass }}
+  {{ form.display_name }}
 </fieldset>
 
+{% if form.account.status['#access'] != false %}
 <fieldset id="details" class="details">
   <legend>{% trans %}Account status and notes{% endtrans %}</legend>
   {{ form.account.status }}
   {{ form.account.roles }}
   {{ form.field_notes }}
 </fieldset>
+{% endif %}
 
 <fieldset id="actions">
   <legend class="visually-hidden">{% trans %}Form submission and other actions{% endtrans %}</legend>

From c07048fbe2b1dd2541f5da06e6dae88db45f994c Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 17 Feb 2022 05:47:18 +0000
Subject: [PATCH 493/720] [RW-390] Remote report from headline selection when
 unpublished or headline is unselected

---
 .../reliefweb_homepage.module                 | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/html/modules/custom/reliefweb_homepage/reliefweb_homepage.module b/html/modules/custom/reliefweb_homepage/reliefweb_homepage.module
index b582a3972..48c9281dc 100644
--- a/html/modules/custom/reliefweb_homepage/reliefweb_homepage.module
+++ b/html/modules/custom/reliefweb_homepage/reliefweb_homepage.module
@@ -5,6 +5,8 @@
  * Module file for the ReliefWeb Homepage module.
  */
 
+use Drupal\Core\Entity\EntityInterface;
+
 /**
  * Implements hook_theme().
  */
@@ -67,3 +69,26 @@ function reliefweb_homepage_theme() {
     ],
   ];
 }
+
+/**
+ * Implements hook_entity_update().
+ *
+ * Remove reports from the headlines selection when unpublished or when
+ * the headline flag is deselected.
+ */
+function reliefweb_homepage_entity_update(EntityInterface $entity) {
+  if ($entity->getEntityTypeId() === 'node' && $entity->bundle() === 'report') {
+    if (empty($entity->field_headline->value) || !$entity->isPublished()) {
+      $state = \Drupal::state();
+      $selected = $state->get('reliefweb_headline_selection', []);
+      foreach ($selected as $index => $id) {
+        // Ids are numeric strings or integers so not using strict equality.
+        if ($id == $entity->id()) {
+          unset($selected[$index]);
+          $state->set('reliefweb_headline_selection', array_values($selected));
+          break;
+        }
+      }
+    }
+  }
+}

From b88ca8f3559dbac042014505d39a105049f06c16 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 17 Feb 2022 05:49:13 +0000
Subject: [PATCH 494/720] [RW-391] Refactor drag and drop for homepage's
 headline widget to be snappier

---
 .../headlines-widget/headlines-widget.js      | 133 ++++++++++--------
 1 file changed, 74 insertions(+), 59 deletions(-)

diff --git a/html/modules/custom/reliefweb_homepage/components/headlines-widget/headlines-widget.js b/html/modules/custom/reliefweb_homepage/components/headlines-widget/headlines-widget.js
index 3547e711e..d1efc34e7 100644
--- a/html/modules/custom/reliefweb_homepage/components/headlines-widget/headlines-widget.js
+++ b/html/modules/custom/reliefweb_homepage/components/headlines-widget/headlines-widget.js
@@ -195,39 +195,43 @@
     var replaced = null;
     var replacement = null;
 
-    // Find the hovered article if any.
-    function findHovered() {
+    // Update the article even handlers.
+    function updateArticleEventHandlers(remove) {
       var articles = container.getElementsByTagName('article');
       for (var i = articles.length - 1; i >= 0; i--) {
         var article = articles[i];
         // Not an article from the headline selection, skip.
-        if (article.parentNode === container && article.matches(':hover')) {
-          return article;
+        if (article.parentNode === container) {
+          if (remove === true) {
+            article.removeEventListener('mouseenter', swapArticle);
+            article.removeEventListener('mousleave', restoreArticle);
+          }
+          else {
+            article.addEventListener('mouseenter', swapArticle);
+            article.addEventListener('mousleave', restoreArticle);
+          }
         }
       }
-      return null;
     }
 
-    // Swap the dragged element with a sibling.
-    function swap(event) {
+    // Restore an article when the mouse leaves it.
+    function restoreArticle(event) {
+      // Swap back the previously replaced article.
+      if (replaced !== null && replacement !== null) {
+        container.replaceChild(replaced, replacement);
+      }
+    }
+
+    // Swap the hovered article with the dragged one.
+    function swapArticle(event) {
       if (!draggable) {
         return;
       }
 
-      event.preventDefault();
-      event.stopPropagation();
+      var article = event.currentTarget;
 
       var id = draggable.getAttribute('data-id');
 
-      // Update the position of the dragged element.
-      updatePosition(event.pageX, event.pageY);
-
-      // Find the hovered article.
-      var article = findHovered();
-      if (!article) {
-        return;
-      }
-
       // Skip if the hovered article has the same id as the draggable.
       if (article.getAttribute('data-id') === id) {
         return;
@@ -244,55 +248,33 @@
       replacement.removeAttribute('style');
       replaced = container.replaceChild(replacement, article);
 
+      updateArticleEventHandlers();
       checkDuplicates();
       updateSelected();
     }
 
-    // Stop the drag handling, swapping the rows and untracking events.
-    function stop(event) {
-      // Ensure we are up to date.
-      swap(event);
-
-      // Clean up.
-      clean();
-    }
-
-    // Clean the elements.
-    function clean() {
-      // Clear the drag elements.
-      if (draggable) {
-        draggable.parentNode.removeChild(draggable);
+    // Update the position of the draggable element.
+    function updateDraggablePosition(event) {
+      if (!draggable) {
+        return;
       }
-      draggable = null;
-      replaced = null;
-      replacement = null;
 
-      // Clean the document.
-      document.body.removeAttribute('data-headlines-widget-drag-on');
-      document.removeEventListener('mousemove', swap);
-      document.removeEventListener('mouseup', stop);
-    }
+      event.preventDefault();
+      event.stopPropagation();
 
-    // Update the position of the draggable element.
-    function updatePosition(x, y) {
-      if (draggable) {
-        draggable.setAttribute('style', 'left:' + x + 'px;top:' + y + 'px');
-      }
+      var x = event.pageX + 5;
+      var y = event.pageY;
+      draggable.setAttribute('style', 'left:' + x + 'px;top:' + y + 'px');
     }
 
-    // Find the article parent element.
-    function findArticle(element) {
-      while (element && element !== container) {
-        if (element.tagName === 'ARTICLE') {
-          return element;
-        }
-        element = element.parentNode;
-      }
-      return null;
+    // Stop the drag handling, swapping the rows and untracking events.
+    function disableDragDrop(event) {
+      // Clean up.
+      clean();
     }
 
     // Handle mousedown on article elements to start drag/drop.
-    function handleMousedown(event) {
+    function enableDragDrop(event) {
       if (manager.open === false) {
         return;
       }
@@ -313,18 +295,51 @@
         draggable = target.cloneNode(true);
         draggable.removeAttribute('data-headlines-widget-selected');
         draggable.setAttribute('data-headlines-widget-dragged', '');
-        updatePosition(event.pageX, event.pageY);
+        updateDraggablePosition(event);
         document.body.appendChild(draggable);
 
         // We need to track mouse events on the whole page.
-        document.addEventListener('mousemove', swap);
-        document.addEventListener('mouseup', stop);
+        document.addEventListener('mousemove', updateDraggablePosition);
+        document.addEventListener('mouseup', disableDragDrop);
+
+        // Add event listeners to the articles.
+        updateArticleEventHandlers();
       }
     }
 
+    // Clean the elements.
+    function clean() {
+      // Clear the drag elements.
+      if (draggable) {
+        draggable.parentNode.removeChild(draggable);
+      }
+      draggable = null;
+      replaced = null;
+      replacement = null;
+
+      // Remove the event listeners on the articles.
+      updateArticleEventHandlers(true);
+
+      // Clean the document.
+      document.body.removeAttribute('data-headlines-widget-drag-on');
+      document.removeEventListener('mousemove', updateDraggablePosition);
+      document.removeEventListener('mouseup', disableDragDrop);
+    }
+
+    // Find the article parent element.
+    function findArticle(element) {
+      while (element && element !== container) {
+        if (element.tagName === 'ARTICLE') {
+          return element;
+        }
+        element = element.parentNode;
+      }
+      return null;
+    }
+
     // Start the drag and drop handling when there is a mousedown event
     // on an article
-    document.body.addEventListener('mousedown', handleMousedown);
+    document.body.addEventListener('mousedown', enableDragDrop);
   }
 
   /**

From f3bbdb630a63d006bd74684970a5392b18c79e6c Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 17 Feb 2022 05:52:36 +0000
Subject: [PATCH 495/720] [RW-392] Only change file URI for final destinations

---
 .../custom/reliefweb_utility/reliefweb_utility.module        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/html/modules/custom/reliefweb_utility/reliefweb_utility.module b/html/modules/custom/reliefweb_utility/reliefweb_utility.module
index 3db39120b..6178839b5 100644
--- a/html/modules/custom/reliefweb_utility/reliefweb_utility.module
+++ b/html/modules/custom/reliefweb_utility/reliefweb_utility.module
@@ -40,6 +40,11 @@ function reliefweb_utility_file_presave(FileInterface $file) {
     return;
   }
 
+  // Skip temporary files.
+  if (strpos($uri, 'temporary://') === 0) {
+    return;
+  }
+
   // Let other modules decide if this should apply.
   $apply = TRUE;
   $clone = clone $file;

From 383f6ea893d636c85235c2e1f9e90d6cb87631b3 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 17 Feb 2022 05:56:43 +0000
Subject: [PATCH 496/720] [RW-390] Do not run the homepage hook_entity_update
 when migrating

---
 .../custom/reliefweb_homepage/reliefweb_homepage.module       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/html/modules/custom/reliefweb_homepage/reliefweb_homepage.module b/html/modules/custom/reliefweb_homepage/reliefweb_homepage.module
index 48c9281dc..e9e34d23b 100644
--- a/html/modules/custom/reliefweb_homepage/reliefweb_homepage.module
+++ b/html/modules/custom/reliefweb_homepage/reliefweb_homepage.module
@@ -77,6 +77,10 @@ function reliefweb_homepage_theme() {
  * the headline flag is deselected.
  */
 function reliefweb_homepage_entity_update(EntityInterface $entity) {
+  // @todo remove when removing `reliefweb_migrate`.
+  if (!empty($entity->_is_migrating)) {
+    return;
+  }
   if ($entity->getEntityTypeId() === 'node' && $entity->bundle() === 'report') {
     if (empty($entity->field_headline->value) || !$entity->isPublished()) {
       $state = \Drupal::state();

From d0681861ac7f661f060c84844a1fc2911d498b59 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 17 Feb 2022 06:01:08 +0000
Subject: [PATCH 497/720] [RW-390] Remove reports from the homepage headline
 selection when deleted

---
 .../reliefweb_homepage.module                 | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/html/modules/custom/reliefweb_homepage/reliefweb_homepage.module b/html/modules/custom/reliefweb_homepage/reliefweb_homepage.module
index e9e34d23b..d3bc8335f 100644
--- a/html/modules/custom/reliefweb_homepage/reliefweb_homepage.module
+++ b/html/modules/custom/reliefweb_homepage/reliefweb_homepage.module
@@ -96,3 +96,27 @@ function reliefweb_homepage_entity_update(EntityInterface $entity) {
     }
   }
 }
+
+/**
+ * Implements hook_entity_delete().
+ *
+ * Remove reports from the headlines selection when deleted.
+ */
+function reliefweb_homepage_entity_delete(EntityInterface $entity) {
+  // @todo remove when removing `reliefweb_migrate`.
+  if (!empty($entity->_is_migrating)) {
+    return;
+  }
+  if ($entity->getEntityTypeId() === 'node' && $entity->bundle() === 'report') {
+    $state = \Drupal::state();
+    $selected = $state->get('reliefweb_headline_selection', []);
+    foreach ($selected as $index => $id) {
+      // Ids are numeric strings or integers so not using strict equality.
+      if ($id == $entity->id()) {
+        unset($selected[$index]);
+        $state->set('reliefweb_headline_selection', array_values($selected));
+        break;
+      }
+    }
+  }
+}

From 858933ee4917a21b04b951f4a1a6a3826d104efd Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 17 Feb 2022 07:53:46 +0000
Subject: [PATCH 498/720] [RW-390] Fix redirect URIs

---
 .../src/Plugin/migrate/source/UrlAlias.php                | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/UrlAlias.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/UrlAlias.php
index cf93e7c38..cfacb6fa3 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/UrlAlias.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/UrlAlias.php
@@ -94,8 +94,12 @@ public function prepareRow(Row $row) {
     }
 
     $source = $row->getSourceProperty('source');
-    if (strpos($source, 'node/') === 0 || strpos($source, 'taxonomy/term/') === 0) {
-      $row->setSourceProperty('source', 'entity:/' . $source);
+    if (strpos($source, 'node/') === 0) {
+      $row->setSourceProperty('source', 'entity:' . $source);
+    }
+    elseif (strpos($source, 'taxonomy/term/') === 0) {
+      $source = str_replace('taxonomy/term', 'taxonomy_term', $source);
+      $row->setSourceProperty('source', 'entity:' . $source);
     }
     else {
       $row->setSourceProperty('source', 'internal:/' . $source);

From f1556e1552dfee924010d71151aab52dfecda4ba Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 17 Feb 2022 09:26:39 +0100
Subject: [PATCH 499/720] RW-384 reduce font-size for --large from 26 to 24

---
 html/themes/custom/common_design_subtheme/css/styles.css        | 2 +-
 .../custom/common_design_subtheme/sass/cd/_cd-variables.scss    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/css/styles.css b/html/themes/custom/common_design_subtheme/css/styles.css
index 7ee679459..9fd35c98a 100644
--- a/html/themes/custom/common_design_subtheme/css/styles.css
+++ b/html/themes/custom/common_design_subtheme/css/styles.css
@@ -1 +1 @@
-@import"https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400%3B500%3B700&display=swap";@import"https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,300%3B0,400%3B0,500%3B0,700%3B0,900%3B1,400%3B1,700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400%3B700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@400%3B700&display=swap";:root{--cd-reliefweb-brand-blue: #0988bb;--cd-reliefweb-brand-red: #f65c51;--cd-reliefweb-brand-blue--dark: #055372;--cd-reliefweb-brand-red--dark: #eb1405;--cd-reliefweb-brand-grey--dark: #2e3436;--cd-reliefweb-brand-grey--mid: #4d5254;--cd-reliefweb-brand-grey--light: #e6ecef;--cd-rgb-reliefweb-brand-blue: 9, 136, 187;--cd-rgb-reliefweb-brand-red: 246, 92, 81;--cd-rgb-reliefweb-brand-blue--dark: 4, 82, 112;--cd-rgb-reliefweb-brand-red--dark: 235, 20, 5;--cd-rgb-reliefweb-brand-grey--dark: 46, 52, 54;--cd-rgb-reliefweb-brand-grey--light: 230, 236, 239;--cd-reliefweb-grey--light: #d9d9d9;--cd-reliefweb-grey--light--bg: rgba(217, 217, 217, 0.2);--cd-reliefweb-orange: #f49e2c;--cd-reliefweb-orange--bg: rgba(244, 158, 44, 0.2);--cd-reliefweb-blue: #076d96;--cd-reliefweb-blue--bg: rgba(7, 109, 150, 0.2);--cd-reliefweb-green: #88bb09;--cd-reliefweb-green--bg: rgba(136, 187, 9, 0.2);--cd-reliefweb-red: #da190b;--cd-reliefweb-red--bg: rgba(218, 25, 11, 0.2);--cd-reliefweb-purple: #9509bb;--cd-reliefweb-purple--bg: rgba(149, 9, 187, 0.2);--cd-reliefweb-grey: #4b4b4b;--cd-reliefweb-grey--bg: rgba(75, 75, 75, 0.2);--cd-reliefweb-brown: #8f5507;--cd-reliefweb-brown--bg: rgba(143, 85, 7, 0.2);--cd-reliefweb-yellow: #f5cb2f;--cd-reliefweb-yellow--bg: rgba(245, 203, 47, 0.2);--cd-reliefweb-cyan: #56c9f7;--cd-reliefweb-cyan--bg: rgba(86, 201, 247, 0.2);--cd-reliefweb-orange--alert: #eb8705;--cd-reliefweb-pink: rgba(246, 92, 81, 0.2);--cd-reliefweb-grey--disable: rgba(230, 236, 239, 0.5);--cd-ocha-blue: #1f69b3;--cd-blue--dark: #144372;--cd-blue--bright: #82b5e9;--cd-blue--light: #d4e5f7;--cd-highlight-red: #e56a54;--cd-contrast-red: #e00000;--cd-white: #fff;--cd-grey--light: #f2f2f2;--cd-grey--mid: #595959;--cd-grey--dark: #4a4a4a;--cd-default-text-color: var(--cd-grey--dark);--cd-black: #000;--cd-blue-grey: #e6ecf1;--cd-blue-grey--dark: #d3dde5;--cd-blue-grey--light: #ebf0f4;--cd-rgb-ocha-blue: 2, 108, 182;--cd-rgb-grey--mid: 89, 89, 89;--cd-rgb-grey--dark: 74, 74, 74;--cd-rgb-highlight-red: 229, 106, 84;--cd-rgb-blue-grey--dark: 211, 221, 229;--cd-max-content-width: 820px;--cd-max-body-width: 1400px;--cd-max-width: 1220px;--cd-container-padding: 0.75rem;--cd-container-padding-tablet: 1.5rem;--cd-container-padding-xlarge: 2.5rem;--cd-flow-space: 1rem;--cd-bumper-space: 1rem;--cd-footer-row-number: 5;--cd-red: #cd3a1f;--cd-red--light: #f8d8d3;--cd-orange: #db7b18;--cd-orange--light: #fae6d1;--cd-yellow: #d5de26;--cd-yellow--light: #f7f8d3;--cd-green: #7fb92f;--cd-green--light: #e8f5d6;--cd-font-size--tiny: 0.75rem;--cd-font-size--small: 0.875rem;--cd-font-size--base: 1.125rem;--cd-font-size--medium: 1.375rem;--cd-font-size--large: 1.625rem;--cd-font-size--2xbase: 1.875rem;--cd-font-size--2xmedium: 2.375rem;--cd-font-size--2xlarge: 2.875rem;--cd-font: helvetica, arial, sans-serif;--cd-font--system: system-ui;--cd-font--noto: "Noto Sans", sans-serif;--cd-font--noto-kufi: "Noto Kufi Arabic", sans-serif;--cd-font--roboto: "Roboto", helvetica, arial, sans-serif;--cd-font--roboto-condensed: "Roboto Condensed", helvetica, arial, sans-serif;--cd-font--roboto-slab: "Roboto Slab", helvetica, arial, sans-serif}@supports(display: grid){@media(min-width: 768px){.cd-layout-container{grid-template-rows:151px auto 1fr auto}}}@media(min-width: 768px){.cd-layout-container .cd-layout-content-wrapper{display:flex;flex-wrap:wrap}}@media(min-width: 768px){.cd-layout-content{flex-basis:0;flex-grow:999}}.cd-global-header__dropdown{background:var(--cd-reliefweb-brand-blue--dark)}.cd-global-header button[aria-expanded=true]::before{border-color:transparent transparent var(--cd-reliefweb-brand-blue--dark)}@media(max-width: 767px){.cd-global-header button[aria-expanded] span[class*=__btn-label]{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}.cd-header button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header{background:var(--cd-reliefweb-brand-blue--dark);background-image:linear-gradient(-180deg, var(--cd-reliefweb-brand-blue--dark) 67%, #04415a 97%)}@supports(display: grid){.cd-site-header__inner{grid-template-columns:52px 1fr}@media(min-width: 768px){.cd-site-header__inner{grid-template-columns:186px 1fr}}}.cd-language-switcher__btn:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-user-menu__dropdown li a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-site-logo{width:52px}.cd-site-logo:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}@media(max-width: 767px){.cd-site-logo{background:url("../img/logos/rw-logo-mobile.svg") center no-repeat;background:linear-gradient(transparent, transparent),url("../img/logos/rw-logo-mobile.svg") center no-repeat}}@media(min-width: 768px){.cd-site-logo{width:140px}}.menu--main button[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red--dark)}.cd-nav__btn[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red--dark)}.cd-nav__btn[aria-expanded=true]::before{background:var(--cd-reliefweb-brand-red--dark)}@media(max-width: 1023px){.cd-site-header__nav-holder .cd-nav>ul>li>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>button.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>button.is-active::before{background:rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.6)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}}@media(min-width: 1024px){.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail button::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a:focus::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button:focus::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul a.is-active,.cd-site-header__nav-holder .cd-nav>.menu>li>ul button.is-active{border-left:3px solid var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul>li.menu-item--active-trail .is-active{border-left:3px solid var(--cd-reliefweb-brand-red--dark)}}.cd-ocha-dropdown__link a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-search__btn{color:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn svg{fill:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn:hover,.cd-search__btn:focus{color:#04415a}.cd-search__btn:hover svg,.cd-search__btn:focus svg{fill:#04415a}.cd-search__btn:focus{color:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn:focus svg{fill:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn[aria-expanded=true]{color:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn[aria-expanded=true] svg{fill:var(--cd-reliefweb-brand-red--dark)}.cd-search__submit:focus{background-color:var(--cd-reliefweb-brand-red--dark)}.cd-user-menu--no-language-switcher li:last-child a,.cd-user-menu--no-language-switcher li:last-child button{padding-right:0}.cd-user-menu--no-language-switcher li:last-child a::after,.cd-user-menu--no-language-switcher li:last-child button::after{content:none}.cd-user-menu__item:focus,.cd-global-header .menu>li a:focus,.cd-global-header .menu>li button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button{padding-right:0}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a::after,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button::after{content:none}@media(max-width: 767px){.cd-global-header__user-menu a svg+span{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}[dir=ltr] .admin-menu__btn svg+span{margin-left:10px}[dir=rtl] .admin-menu__btn svg+span{margin-right:10px}.admin-menu__btn .cd-icon:not(.cd-icon--arrow-down){display:inline-block;width:14px;height:14px;vertical-align:middle;fill:var(--cd-white)}.cd-footer{background:var(--cd-reliefweb-brand-blue--dark)}.cd-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-footer-copyright{display:block;margin-top:0;text-align:right;color:#fff;font-size:12px;font-weight:lighter}.cd-footer-copyright p{margin:0}.cd-footer-copyright a{display:inline-block;overflow:hidden;width:140px;height:60px;margin:0 0 -4px 0;padding:0 0 0 140px;background:url(../img/logos/rw-logo-sprite.png) 0 -60px no-repeat;background:rgba(0,0,0,0) url(../img/logos/rw-logo-sprite.svg) 0 -60px no-repeat}.cd-footer-copyright a:hover,.cd-footer-copyright a:active,.cd-footer-copyright a:focus{opacity:.8}@media all and (max-width: 1023px){.cd-footer-copyright{width:100%;text-align:center}}.cd-soft-footer{background:rgba(var(--cd-rgb-ocha-blue), 0.9)}.cd-soft-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}a{color:var(--cd-reliefweb-brand-blue--dark)}a:hover,a:focus{color:var(--cd-reliefweb-brand-blue--dark)}h1,h2{margin:0 0 24px 0;letter-spacing:.5px;font-size:24px;font-weight:bold;line-height:1.3}@media screen and (min-width: 480px){h1{font-size:var(--cd-font-size--2xbase)}h2{font-size:var(--cd-font-size--large)}}h3{margin:0 0 16px 0;letter-spacing:.5px;font-size:20px;font-weight:bold;line-height:1.3}h4{margin:0 0 16px 0;letter-spacing:.5px;font-size:18px;font-weight:bold;line-height:1.3}h5{margin:0 0 16px 0;letter-spacing:.5px;font-size:17px;font-weight:bold;font-style:italic}h6{margin:0 0 16px 0;letter-spacing:.5px;font-size:16px;font-weight:bold}.rw-article__content *+h3,.rw-article__content *+h4,.rw-article__content *+h5,.rw-article__content *+h6{margin-top:16px}@media all and (max-width: 479px){#main h2{font-size:24px}}p{margin:1rem 0;line-height:1.6}p:first-child{margin-top:0}p:last-child{margin-bottom:0}input[type=search]{-moz-appearance:none;-webkit-appearance:none;appearance:none}input::-webkit-search-decoration{-webkit-appearance:none}input:-ms-input-placeholder{opacity:.7;color:inherit;font-style:italic}input::-moz-placeholder{opacity:.7;color:inherit;font-style:italic}input::placeholder{opacity:.7;color:inherit;font-style:italic}select{max-width:100%}select:not([multitple]){-moz-appearance:menulist-button;-webkit-appearance:menulist-button}fieldset{min-inline-size:auto}table{width:100%;border-collapse:collapse}table caption{margin:12px 0;font-weight:bold}table th,table td{padding:8px;border:1px solid var(--cd-reliefweb-brand-grey--light)}table th{border-left-color:#fff;background:var(--cd-reliefweb-brand-grey--light)}table thead th{border-left-color:#fff}th.field-label>h4.label{margin:0}table thead th:first-child{border-left-color:var(--cd-reliefweb-brand-grey--light)}table tbody th{border-top-color:#fff}table tbody th:first-child{border-top-color:var(--cd-reliefweb-brand-grey--light)}code{padding:2px;background:var(--cd-reliefweb-brand-grey--light);font-family:monospace}
+@import"https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400%3B500%3B700&display=swap";@import"https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,300%3B0,400%3B0,500%3B0,700%3B0,900%3B1,400%3B1,700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400%3B700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@400%3B700&display=swap";:root{--cd-reliefweb-brand-blue: #0988bb;--cd-reliefweb-brand-red: #f65c51;--cd-reliefweb-brand-blue--dark: #055372;--cd-reliefweb-brand-red--dark: #eb1405;--cd-reliefweb-brand-grey--dark: #2e3436;--cd-reliefweb-brand-grey--mid: #4d5254;--cd-reliefweb-brand-grey--light: #e6ecef;--cd-rgb-reliefweb-brand-blue: 9, 136, 187;--cd-rgb-reliefweb-brand-red: 246, 92, 81;--cd-rgb-reliefweb-brand-blue--dark: 4, 82, 112;--cd-rgb-reliefweb-brand-red--dark: 235, 20, 5;--cd-rgb-reliefweb-brand-grey--dark: 46, 52, 54;--cd-rgb-reliefweb-brand-grey--light: 230, 236, 239;--cd-reliefweb-grey--light: #d9d9d9;--cd-reliefweb-grey--light--bg: rgba(217, 217, 217, 0.2);--cd-reliefweb-orange: #f49e2c;--cd-reliefweb-orange--bg: rgba(244, 158, 44, 0.2);--cd-reliefweb-blue: #076d96;--cd-reliefweb-blue--bg: rgba(7, 109, 150, 0.2);--cd-reliefweb-green: #88bb09;--cd-reliefweb-green--bg: rgba(136, 187, 9, 0.2);--cd-reliefweb-red: #da190b;--cd-reliefweb-red--bg: rgba(218, 25, 11, 0.2);--cd-reliefweb-purple: #9509bb;--cd-reliefweb-purple--bg: rgba(149, 9, 187, 0.2);--cd-reliefweb-grey: #4b4b4b;--cd-reliefweb-grey--bg: rgba(75, 75, 75, 0.2);--cd-reliefweb-brown: #8f5507;--cd-reliefweb-brown--bg: rgba(143, 85, 7, 0.2);--cd-reliefweb-yellow: #f5cb2f;--cd-reliefweb-yellow--bg: rgba(245, 203, 47, 0.2);--cd-reliefweb-cyan: #56c9f7;--cd-reliefweb-cyan--bg: rgba(86, 201, 247, 0.2);--cd-reliefweb-orange--alert: #eb8705;--cd-reliefweb-pink: rgba(246, 92, 81, 0.2);--cd-reliefweb-grey--disable: rgba(230, 236, 239, 0.5);--cd-ocha-blue: #1f69b3;--cd-blue--dark: #144372;--cd-blue--bright: #82b5e9;--cd-blue--light: #d4e5f7;--cd-highlight-red: #e56a54;--cd-contrast-red: #e00000;--cd-white: #fff;--cd-grey--light: #f2f2f2;--cd-grey--mid: #595959;--cd-grey--dark: #4a4a4a;--cd-default-text-color: var(--cd-grey--dark);--cd-black: #000;--cd-blue-grey: #e6ecf1;--cd-blue-grey--dark: #d3dde5;--cd-blue-grey--light: #ebf0f4;--cd-rgb-ocha-blue: 2, 108, 182;--cd-rgb-grey--mid: 89, 89, 89;--cd-rgb-grey--dark: 74, 74, 74;--cd-rgb-highlight-red: 229, 106, 84;--cd-rgb-blue-grey--dark: 211, 221, 229;--cd-max-content-width: 820px;--cd-max-body-width: 1400px;--cd-max-width: 1220px;--cd-container-padding: 0.75rem;--cd-container-padding-tablet: 1.5rem;--cd-container-padding-xlarge: 2.5rem;--cd-flow-space: 1rem;--cd-bumper-space: 1rem;--cd-footer-row-number: 5;--cd-red: #cd3a1f;--cd-red--light: #f8d8d3;--cd-orange: #db7b18;--cd-orange--light: #fae6d1;--cd-yellow: #d5de26;--cd-yellow--light: #f7f8d3;--cd-green: #7fb92f;--cd-green--light: #e8f5d6;--cd-font-size--tiny: 0.75rem;--cd-font-size--small: 0.875rem;--cd-font-size--base: 1.125rem;--cd-font-size--medium: 1.375rem;--cd-font-size--large: 1.5rem;--cd-font-size--2xbase: 1.875rem;--cd-font-size--2xmedium: 2.375rem;--cd-font-size--2xlarge: 2.875rem;--cd-font: helvetica, arial, sans-serif;--cd-font--system: system-ui;--cd-font--noto: "Noto Sans", sans-serif;--cd-font--noto-kufi: "Noto Kufi Arabic", sans-serif;--cd-font--roboto: "Roboto", helvetica, arial, sans-serif;--cd-font--roboto-condensed: "Roboto Condensed", helvetica, arial, sans-serif;--cd-font--roboto-slab: "Roboto Slab", helvetica, arial, sans-serif}@supports(display: grid){@media(min-width: 768px){.cd-layout-container{grid-template-rows:151px auto 1fr auto}}}@media(min-width: 768px){.cd-layout-container .cd-layout-content-wrapper{display:flex;flex-wrap:wrap}}@media(min-width: 768px){.cd-layout-content{flex-basis:0;flex-grow:999}}.cd-global-header__dropdown{background:var(--cd-reliefweb-brand-blue--dark)}.cd-global-header button[aria-expanded=true]::before{border-color:transparent transparent var(--cd-reliefweb-brand-blue--dark)}@media(max-width: 767px){.cd-global-header button[aria-expanded] span[class*=__btn-label]{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}.cd-header button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header{background:var(--cd-reliefweb-brand-blue--dark);background-image:linear-gradient(-180deg, var(--cd-reliefweb-brand-blue--dark) 67%, #04415a 97%)}@supports(display: grid){.cd-site-header__inner{grid-template-columns:52px 1fr}@media(min-width: 768px){.cd-site-header__inner{grid-template-columns:186px 1fr}}}.cd-language-switcher__btn:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-user-menu__dropdown li a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-site-logo{width:52px}.cd-site-logo:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}@media(max-width: 767px){.cd-site-logo{background:url("../img/logos/rw-logo-mobile.svg") center no-repeat;background:linear-gradient(transparent, transparent),url("../img/logos/rw-logo-mobile.svg") center no-repeat}}@media(min-width: 768px){.cd-site-logo{width:140px}}.menu--main button[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red--dark)}.cd-nav__btn[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red--dark)}.cd-nav__btn[aria-expanded=true]::before{background:var(--cd-reliefweb-brand-red--dark)}@media(max-width: 1023px){.cd-site-header__nav-holder .cd-nav>ul>li>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>button.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>button.is-active::before{background:rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.6)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}}@media(min-width: 1024px){.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail button::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a:focus::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button:focus::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul a.is-active,.cd-site-header__nav-holder .cd-nav>.menu>li>ul button.is-active{border-left:3px solid var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul>li.menu-item--active-trail .is-active{border-left:3px solid var(--cd-reliefweb-brand-red--dark)}}.cd-ocha-dropdown__link a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-search__btn{color:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn svg{fill:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn:hover,.cd-search__btn:focus{color:#04415a}.cd-search__btn:hover svg,.cd-search__btn:focus svg{fill:#04415a}.cd-search__btn:focus{color:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn:focus svg{fill:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn[aria-expanded=true]{color:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn[aria-expanded=true] svg{fill:var(--cd-reliefweb-brand-red--dark)}.cd-search__submit:focus{background-color:var(--cd-reliefweb-brand-red--dark)}.cd-user-menu--no-language-switcher li:last-child a,.cd-user-menu--no-language-switcher li:last-child button{padding-right:0}.cd-user-menu--no-language-switcher li:last-child a::after,.cd-user-menu--no-language-switcher li:last-child button::after{content:none}.cd-user-menu__item:focus,.cd-global-header .menu>li a:focus,.cd-global-header .menu>li button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button{padding-right:0}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a::after,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button::after{content:none}@media(max-width: 767px){.cd-global-header__user-menu a svg+span{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}[dir=ltr] .admin-menu__btn svg+span{margin-left:10px}[dir=rtl] .admin-menu__btn svg+span{margin-right:10px}.admin-menu__btn .cd-icon:not(.cd-icon--arrow-down){display:inline-block;width:14px;height:14px;vertical-align:middle;fill:var(--cd-white)}.cd-footer{background:var(--cd-reliefweb-brand-blue--dark)}.cd-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-footer-copyright{display:block;margin-top:0;text-align:right;color:#fff;font-size:12px;font-weight:lighter}.cd-footer-copyright p{margin:0}.cd-footer-copyright a{display:inline-block;overflow:hidden;width:140px;height:60px;margin:0 0 -4px 0;padding:0 0 0 140px;background:url(../img/logos/rw-logo-sprite.png) 0 -60px no-repeat;background:rgba(0,0,0,0) url(../img/logos/rw-logo-sprite.svg) 0 -60px no-repeat}.cd-footer-copyright a:hover,.cd-footer-copyright a:active,.cd-footer-copyright a:focus{opacity:.8}@media all and (max-width: 1023px){.cd-footer-copyright{width:100%;text-align:center}}.cd-soft-footer{background:rgba(var(--cd-rgb-ocha-blue), 0.9)}.cd-soft-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}a{color:var(--cd-reliefweb-brand-blue--dark)}a:hover,a:focus{color:var(--cd-reliefweb-brand-blue--dark)}h1,h2{margin:0 0 24px 0;letter-spacing:.5px;font-size:24px;font-weight:bold;line-height:1.3}@media screen and (min-width: 480px){h1{font-size:var(--cd-font-size--2xbase)}h2{font-size:var(--cd-font-size--large)}}h3{margin:0 0 16px 0;letter-spacing:.5px;font-size:20px;font-weight:bold;line-height:1.3}h4{margin:0 0 16px 0;letter-spacing:.5px;font-size:18px;font-weight:bold;line-height:1.3}h5{margin:0 0 16px 0;letter-spacing:.5px;font-size:17px;font-weight:bold;font-style:italic}h6{margin:0 0 16px 0;letter-spacing:.5px;font-size:16px;font-weight:bold}.rw-article__content *+h3,.rw-article__content *+h4,.rw-article__content *+h5,.rw-article__content *+h6{margin-top:16px}@media all and (max-width: 479px){#main h2{font-size:24px}}p{margin:1rem 0;line-height:1.6}p:first-child{margin-top:0}p:last-child{margin-bottom:0}input[type=search]{-moz-appearance:none;-webkit-appearance:none;appearance:none}input::-webkit-search-decoration{-webkit-appearance:none}input:-ms-input-placeholder{opacity:.7;color:inherit;font-style:italic}input::-moz-placeholder{opacity:.7;color:inherit;font-style:italic}input::placeholder{opacity:.7;color:inherit;font-style:italic}select{max-width:100%}select:not([multitple]){-moz-appearance:menulist-button;-webkit-appearance:menulist-button}fieldset{min-inline-size:auto}table{width:100%;border-collapse:collapse}table caption{margin:12px 0;font-weight:bold}table th,table td{padding:8px;border:1px solid var(--cd-reliefweb-brand-grey--light)}table th{border-left-color:#fff;background:var(--cd-reliefweb-brand-grey--light)}table thead th{border-left-color:#fff}th.field-label>h4.label{margin:0}table thead th:first-child{border-left-color:var(--cd-reliefweb-brand-grey--light)}table tbody th{border-top-color:#fff}table tbody th:first-child{border-top-color:var(--cd-reliefweb-brand-grey--light)}code{padding:2px;background:var(--cd-reliefweb-brand-grey--light);font-family:monospace}
diff --git a/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss b/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
index 4b93bb2c3..fd44f34e4 100644
--- a/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
+++ b/html/themes/custom/common_design_subtheme/sass/cd/_cd-variables.scss
@@ -133,7 +133,7 @@
   --cd-font-size--small: 0.875rem;    /* 14px */
   --cd-font-size--base: 1.125rem;     /* 18px */
   --cd-font-size--medium: 1.375rem;   /* 22px */
-  --cd-font-size--large: 1.625rem;    /* 26px */
+  --cd-font-size--large: 1.5rem;      /* 24px */
   --cd-font-size--2xbase: 1.875rem;   /* 30px */
   --cd-font-size--2xmedium: 2.375rem; /* 38px */
   --cd-font-size--2xlarge: 2.875rem;  /* 46px */

From c80e8d43dd21e785ff1118fbd577608c1214159a Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 17 Feb 2022 09:27:28 +0100
Subject: [PATCH 500/720] RW-384 replace font-size 24px with --large custom
 property

---
 .../components/cd-block-title/cd-block-title.css              | 4 ++--
 .../common_design_subtheme/components/rw-blog/rw-blog.css     | 2 +-
 .../components/rw-country/rw-country-list.css                 | 2 +-
 .../components/rw-most-read/rw-most-read.css                  | 2 +-
 .../components/rw-opportunities/rw-opportunities.css          | 2 +-
 .../components/rw-related-content/rw-related-content.css      | 2 +-
 .../components/rw-river/rw-river-views.css                    | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/cd-block-title/cd-block-title.css b/html/themes/custom/common_design_subtheme/components/cd-block-title/cd-block-title.css
index ce0f10230..17ada3c4a 100644
--- a/html/themes/custom/common_design_subtheme/components/cd-block-title/cd-block-title.css
+++ b/html/themes/custom/common_design_subtheme/components/cd-block-title/cd-block-title.css
@@ -9,11 +9,11 @@
 .rw-page-title.cd-block-title {
   padding-bottom: 0.5rem;
   border-bottom: 1px solid var(--cd-reliefweb-brand-red--dark);
-  font-size: 24px;
+  font-size: var(--cd-font-size--large);
 }
 
 .rw-river--headlines h2.cd-block-title {
-  font-size: 24px;
+  font-size: var(--cd-font-size--large);
 }
 
 @media screen and (min-width: 480px) {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-blog/rw-blog.css b/html/themes/custom/common_design_subtheme/components/rw-blog/rw-blog.css
index bb61ddc78..9212a5afe 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-blog/rw-blog.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-blog/rw-blog.css
@@ -4,7 +4,7 @@
  * Latest blog post.
  */
 .path-frontpage .rw-river--blog h2 {
-  font-size: 24px;
+  font-size: var(--cd-font-size--large);
 }
 .path-frontpage .rw-river--blog article {
   padding: 0;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-country/rw-country-list.css b/html/themes/custom/common_design_subtheme/components/rw-country/rw-country-list.css
index 137ccf601..780cdee9e 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-country/rw-country-list.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-country/rw-country-list.css
@@ -32,7 +32,7 @@
   margin: 8px 0 24px 0;
   padding: 0 0 16px 0;
   border-bottom: 1px solid var(--cd-reliefweb-brand-grey--dark);
-  font-size: 24px;
+  font-size: var(--cd-font-size--large);
   font-weight: bold;
 }
 .rw-river-page--countries > ul li li {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-most-read/rw-most-read.css b/html/themes/custom/common_design_subtheme/components/rw-most-read/rw-most-read.css
index 9fa938294..407dffad5 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-most-read/rw-most-read.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-most-read/rw-most-read.css
@@ -5,7 +5,7 @@
  */
 /* "Last 24h hours" text. */
 .path-frontpage .rw-river--most-read h2 {
-  font-size: 24px;
+  font-size: var(--cd-font-size--large);
 }
 .path-frontpage .rw-river--most-read h2 span {
   display: inline-block;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-opportunities/rw-opportunities.css b/html/themes/custom/common_design_subtheme/components/rw-opportunities/rw-opportunities.css
index a65509e0d..77d93d798 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-opportunities/rw-opportunities.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-opportunities/rw-opportunities.css
@@ -4,7 +4,7 @@
  * Open jobs and training.
  */
 .rw-homepage-opportunties h2 {
-  font-size: 24px;
+  font-size: var(--cd-font-size--large);
 }
 .rw-homepage-opportunties ul {
   margin: 24px 0 0 0;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-related-content/rw-related-content.css b/html/themes/custom/common_design_subtheme/components/rw-related-content/rw-related-content.css
index 821c69cbb..1b22963ef 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-related-content/rw-related-content.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-related-content/rw-related-content.css
@@ -11,7 +11,7 @@
 .rw-river--related h2 {
   padding-bottom: 12px;
   border-bottom: 1px solid var(--cd-reliefweb-brand-red--dark);
-  font-size: 24px;
+  font-size: var(--cd-font-size--large);
 }
 .rw-river--related article footer {
   display: flex;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-views.css b/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-views.css
index fb1dae7a7..e4b211de1 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-views.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-river/rw-river-views.css
@@ -41,6 +41,6 @@
     font-size: 20px;
   }
   .rw-river-page .rw-river-views .rw-river-views__list__item--selected a {
-    font-size: 24px;
+    font-size: var(--cd-font-size--large);
   }
 }

From b34dd1700e2f7ee758feb93f8a50a9ba709bd20a Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 18 Feb 2022 01:08:21 +0000
Subject: [PATCH 501/720] [RW-309] Order disasters by date in advanced search
 suggestions

---
 .../custom/reliefweb_rivers/src/Services/ReportRiver.php       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/html/modules/custom/reliefweb_rivers/src/Services/ReportRiver.php b/html/modules/custom/reliefweb_rivers/src/Services/ReportRiver.php
index 1ace533a2..ca549d8b3 100644
--- a/html/modules/custom/reliefweb_rivers/src/Services/ReportRiver.php
+++ b/html/modules/custom/reliefweb_rivers/src/Services/ReportRiver.php
@@ -118,6 +118,9 @@ public function getFilters() {
           'type' => 'autocomplete',
           'label' => $this->t('Search for a disaster'),
           'resource' => 'disasters',
+          'parameters' => [
+            'sort' => 'date:desc',
+          ],
         ],
         'operator' => 'OR',
       ],

From 38e337f7269b5efd269ce90760bf3297ea8e54ee Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 18 Feb 2022 06:22:35 +0000
Subject: [PATCH 502/720] [RW-266] Add helper function to replaced deprecated
 file_create_url

---
 .../src/Helpers/UrlHelper.php                 | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/html/modules/custom/reliefweb_utility/src/Helpers/UrlHelper.php b/html/modules/custom/reliefweb_utility/src/Helpers/UrlHelper.php
index 718277ff1..4b7eaccc5 100644
--- a/html/modules/custom/reliefweb_utility/src/Helpers/UrlHelper.php
+++ b/html/modules/custom/reliefweb_utility/src/Helpers/UrlHelper.php
@@ -3,6 +3,7 @@
 namespace Drupal\reliefweb_utility\Helpers;
 
 use Drupal\Component\Utility\UrlHelper as DrupalUrlHelper;
+use Drupal\Core\File\Exception\InvalidStreamWrapperException;
 use Drupal\Core\Url;
 use Symfony\Component\Uid\Uuid;
 
@@ -188,4 +189,25 @@ public static function getImageUriFromUrl($uri, $preserve_style = FALSE) {
     }
   }
 
+  /**
+   * Get an absolute file URI.
+   *
+   * @param string $uri
+   *   File URI.
+   *
+   * @return string
+   *   Absolute URI for the file or empty if an error occured.
+   */
+  public static function getAbsoluteFileUri($uri) {
+    if (empty($uri)) {
+      return '';
+    }
+    try {
+      return \Drupal::service('file_url_generator')->generateAbsoluteString($uri);
+    }
+    catch (InvalidStreamWrapperException $exception) {
+      return '';
+    }
+  }
+
 }

From 3be06015d78a80b514eaf20e44970bf8c0e7cd16 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 18 Feb 2022 06:24:22 +0000
Subject: [PATCH 503/720] [RW-266] Replace file_create_url

---
 .../src/Plugin/Field/FieldWidget/ReliefWebLinks.php             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebLinks.php b/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebLinks.php
index af54bd2f5..0f822cfd7 100644
--- a/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebLinks.php
+++ b/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebLinks.php
@@ -45,7 +45,7 @@ protected function formMultipleElements(FieldItemListInterface $items, array &$f
     $parents = $form['#parents'];
 
     // Base of the internal image URLs.
-    $base_image_url = file_create_url('public://styles/thumbnail/public/');
+    $base_image_url = UrlHelper::getAbsoluteFileUri('public://styles/thumbnail/public/');
 
     // Url of the link validation route for the field.
     $validate_url = Url::fromRoute('reliefweb_fields.validate.reliefweb_links', [

From aadea9ccc2c2472a71bfdb20845026f9a1260394 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 18 Feb 2022 06:28:18 +0000
Subject: [PATCH 504/720] [RW-266] Format attachment revisions

---
 .../src/Services/EntityHistory.php            | 211 ++++++++++++++++++
 1 file changed, 211 insertions(+)

diff --git a/html/modules/custom/reliefweb_revisions/src/Services/EntityHistory.php b/html/modules/custom/reliefweb_revisions/src/Services/EntityHistory.php
index 888791c2e..310188e12 100644
--- a/html/modules/custom/reliefweb_revisions/src/Services/EntityHistory.php
+++ b/html/modules/custom/reliefweb_revisions/src/Services/EntityHistory.php
@@ -23,6 +23,7 @@
 use Drupal\reliefweb_utility\Helpers\DateHelper;
 use Drupal\reliefweb_utility\Helpers\MediaHelper;
 use Drupal\reliefweb_utility\Helpers\TextHelper;
+use Drupal\reliefweb_utility\Helpers\UrlHelper;
 use Drupal\reliefweb_utility\Traits\EntityDatabaseInfoTrait;
 use Drupal\user\EntityOwnerInterface;
 
@@ -352,6 +353,9 @@ protected function formatFieldDiff(FieldDefinitionInterface $field_definition, a
       case 'reliefweb_user_posting_rights':
         return $this->formatReliefWebUserPostingRightsFieldDiff($field_definition, $diff);
 
+      case 'reliefweb_file':
+        return $this->formatReliefWebFileFieldDiff($field_definition, $diff);
+
       default:
         return $this->formatFieldDiffDefault($field_definition, $diff);
     }
@@ -949,6 +953,213 @@ protected function formatReliefWebUserPostingRightsFieldDiff(FieldDefinitionInte
     ] + $output;
   }
 
+  /**
+   * Format reliefweb file field differences.
+   *
+   * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
+   *   Field definition.
+   * @param array $diff
+   *   Field value differences.
+   *
+   * @return array|null
+   *   The render array for the difference or NULL if there is no difference.
+   */
+  protected function formatReliefWebFileFieldDiff(FieldDefinitionInterface $field_definition, array $diff) {
+    if (empty($diff['added']) && empty($diff['removed'])) {
+      return NULL;
+    }
+
+    // Keep track of the file UUIDs so we can load their file names and URIs.
+    $file_uuids = [];
+
+    // Previous files.
+    $previous = [];
+    foreach ($diff['previous'] as $item) {
+      $previous[$item['uuid']] = $item;
+      if (!empty($item['file_uuid'])) {
+        $file_uuids[$item['file_uuid']] = $item['file_uuid'];
+      }
+    }
+
+    // Current files.
+    $current = [];
+    foreach ($diff['current'] as $item) {
+      $current[$item['uuid']] = $item;
+      if (!empty($item['file_uuid'])) {
+        $file_uuids[$item['file_uuid']] = $item['file_uuid'];
+      }
+    }
+
+    // Revision categories.
+    $categories = [
+      'added' => array_diff_key($current, $previous),
+      'removed' => array_diff_key($previous, $current),
+      'modified' => [],
+      'replaced' => [],
+    ];
+
+    $labels = [
+      'added' => $this->t('Added'),
+      'removed' => $this->t('Removed'),
+      'modified' => $this->t('Modified'),
+      'replaced' => $this->t('Replaced'),
+    ];
+
+    // Load the file information.
+    if (!empty($file_uuids)) {
+      $files = $this->getDatabase()->select('file_managed', 'fm')
+        ->fields('fm', ['uuid', 'uri', 'filename', 'filesize'])
+        ->condition('uuid', $file_uuids, 'IN')
+        ->execute()
+        ?->fetchAllAssoc('uuid', \PDO::FETCH_ASSOC) ?? [];
+    }
+
+    // Properties to display in the revisions.
+    $properties = [
+      'description' => 'description',
+      'language' => 'version',
+      'preview_page' => 'preview page',
+      'preview_rotation' => 'preview rotation',
+    ];
+    $property_values = [
+      'language' => reliefweb_docstore_get_languages(),
+      'preview_rotation' => ['90' => 'right', '-90' => 'left'],
+    ];
+
+    // Check if the file description changed.
+    foreach (array_intersect_key($current, $previous) as $key => $item) {
+      $previous_item = $previous[$key];
+      $current_item = $current[$key];
+      $modified = FALSE;
+
+      // Replaced file.
+      if ($previous_item['file_uuid'] !== $current_item['file_uuid']) {
+        $item['replaced'] = $previous_item;
+        $categories['replaced'][$item['uuid']] = $item;
+      }
+      // Modified properties.
+      else {
+        $details = [];
+        foreach ($properties as $property => $property_label) {
+          if ($current_item[$property] !== $previous_item[$property]) {
+            if (isset($property_values[$property][$previous_item[$property]])) {
+              $previous_item[$property] = $property_values[$property][$previous_item[$property]];
+            }
+            if (isset($property_values[$property][$current_item[$property]])) {
+              $current_item[$property] = $property_values[$property][$current_item[$property]];
+            }
+
+            $details[$property] = new FormattableMarkup('@label: @before => @after', [
+              '@label' => $property_label,
+              '@before' => $previous_item[$property] ?: Markup::create('<em>none</em>'),
+              '@after' => $current_item[$property] ?: Markup::create('<em>none</em>'),
+            ]);
+            $modified = TRUE;
+          }
+        }
+
+        if ($modified) {
+          $item['details'] = $details;
+          $categories['modified'][$item['uuid']] = $item;
+        }
+      }
+    }
+
+    $change_count = 0;
+    $output = [];
+    foreach ($categories as $category => $items) {
+      $changes = [];
+      foreach ($items as $item) {
+        if (isset($files[$item['file_uuid']])) {
+          $file = $files[$item['file_uuid']];
+          $label = new FormattableMarkup('@file_name (@file_size)', [
+            '@file_name' => $file['filename'],
+            '@file_size' => format_size($file['filesize']),
+          ]);
+
+          $uri = UrlHelper::getAbsoluteFileUri($file['uri']);
+          if (!empty($uri)) {
+            $label = Link::fromTextAndUrl($label, Url::fromUri($uri))->toString();
+          }
+        }
+        else {
+          $label = Markup::create($item['file_name']);
+        }
+
+        if ($category !== 'removed') {
+          // For new or replaced files, extract the properties.
+          if ($category !== 'modified') {
+            foreach ($properties as $property => $property_label) {
+              $item['details'][$property] = new FormattableMarkup('@label: @change', [
+                '@label' => $property_label,
+                '@change' => $item[$property] ?: Markup::create('<em>none</em>'),
+              ]);
+            }
+          }
+
+          // Add the property details.
+          if (!empty($item['details'])) {
+            $label = new FormattableMarkup('@label (@details)', [
+              '@label' => $label,
+              '@details' => Markup::create(implode(', ', $item['details'])),
+            ]);
+          }
+
+          // Add a link to the previous file for replaced files.
+          if ($category === 'replaced' && isset($item['replaced'])) {
+            $original_item = $item['replaced'];
+
+            if (isset($files[$original_item['file_uuid']])) {
+              $original_file = $files[$original_item['file_uuid']];
+              $original_label = new FormattableMarkup('@file_name (@file_size)', [
+                '@file_name' => $original_file['filename'],
+                '@file_size' => format_size($original_file['filesize']),
+              ]);
+
+              $original_uri = UrlHelper::getAbsoluteFileUri($original_file['uri']);
+              if (!empty($original_uri)) {
+                $original_label = Link::fromTextAndUrl($original_label, Url::fromUri($original_uri))->toString();
+              }
+            }
+            else {
+              $original_label = Markup::create($original_item['file_name']);
+            }
+
+            $label = new FormattableMarkup('@current &mdash; replaced: @previous', [
+              '@previous' => $original_label,
+              '@current' => $label,
+            ]);
+          }
+        }
+        $changes[] = $label;
+        $change_count++;
+      }
+
+      if (!empty($changes)) {
+        $output['#categories'][$category] = [
+          'label' => $labels[$category],
+          'changes' => $changes,
+        ];
+      }
+    }
+
+    // If no other changes, check if the active links have been reordered.
+    if (empty($output)) {
+      if (!empty($diff['re-ordered'])) {
+        return [
+          '#theme' => 'reliefweb_revisions_diff_reordered',
+          '#message' => $this->t('Files re-ordered'),
+        ];
+      }
+      return NULL;
+    }
+
+    return [
+      '#theme' => 'reliefweb_revisions_diff_categories',
+      '#change_count' => $change_count,
+    ] + $output;
+  }
+
   /**
    * Default field differences formatting function.
    *

From d08a1f828acdab21e450659c7a53d0a2ce777bf0 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 18 Feb 2022 06:34:23 +0000
Subject: [PATCH 505/720] [RW-279][RW-280] Improve information when replacing
 an attachment

---
 .../Plugin/Field/FieldType/ReliefWebFile.php  | 23 ++++++--
 .../Field/FieldWidget/ReliefWebFile.php       | 55 +++++++++++++++++--
 .../reliefweb-file-widget-item.html.twig      |  6 ++
 .../components/rw-form/rw-form--widget.css    |  3 +-
 4 files changed, 76 insertions(+), 11 deletions(-)

diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
index f5f1116fc..c52def3f1 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
@@ -18,6 +18,7 @@
 use Drupal\Core\TypedData\DataDefinition;
 use Drupal\Core\Url;
 use Drupal\file\Entity\File;
+use Drupal\reliefweb_utility\Helpers\UrlHelper;
 use Drupal\reliefweb_utility\Traits\EntityDatabaseInfoTrait;
 
 /**
@@ -289,7 +290,7 @@ public static function mainPropertyName() {
   public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
     // The UUID of the file resource used notably to generate the permanent URL.
     $properties['uuid'] = DataDefinition::create('string')
-      ->setLabel(new TranslatableMarkup('File UUID'))
+      ->setLabel(new TranslatableMarkup('UUID'))
       ->setDescription(new TranslatableMarkup('The UUID of the file resource.'))
       ->setRequired(TRUE);
 
@@ -300,7 +301,7 @@ public static function propertyDefinitions(FieldStorageDefinitionInterface $fiel
     // local file.
     // It's set to 0 for content being created.
     $properties['revision_id'] = DataDefinition::create('integer')
-      ->setLabel(new TranslatableMarkup('File revision ID'))
+      ->setLabel(new TranslatableMarkup('Revision ID'))
       ->setDescription(new TranslatableMarkup('The ID of the file revision.'))
       ->setRequired(TRUE);
 
@@ -310,8 +311,8 @@ public static function propertyDefinitions(FieldStorageDefinitionInterface $fiel
     // When "local" is selected in the settings, this is the UUID of the
     // permanent file associated with the field item.
     $properties['file_uuid'] = DataDefinition::create('string')
-      ->setLabel(new TranslatableMarkup('Preview UUID'))
-      ->setDescription(new TranslatableMarkup('The UUID of the preview file.'))
+      ->setLabel(new TranslatableMarkup('File UUID'))
+      ->setDescription(new TranslatableMarkup('The UUID of the attachment file.'))
       ->setRequired(TRUE);
 
     // The name of the file as uploaded.
@@ -847,7 +848,8 @@ public function getFileUrl() {
     // file on disk for them. However we need to check for the page count to
     // distinguish between those and initially migrated content.
     elseif (empty($this->getRevisionId()) && $this->hasPageCount()) {
-      return Url::fromUri(file_create_url($uri));
+      $url = UrlHelper::getAbsoluteFileUri($uri);
+      return empty($url) ? NULL : Url::fromUri($url);
     }
     // For existing files, they should be accessible via the permanent URL.
     elseif ($uri === $this->getPermanentUri($private)) {
@@ -1260,6 +1262,17 @@ public function getFileName() {
     return $this->get('file_name')->getValue();
   }
 
+  /**
+   * Get the file name as uploaded.
+   *
+   * @return string
+   *   File name.
+   */
+  public function getUploadedFileName() {
+    $file = $this->loadFile();
+    return !empty($file) ? $file->getFileName() : '';
+  }
+
   /**
    * Get the file extension.
    *
diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
index 6e4a9b54f..b5944cf56 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
@@ -290,10 +290,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
     $element['#theme'] = 'reliefweb_file_widget_item';
 
     // Link to the file.
-    $file_name = $item->getFileName();
-    $file_size = $item->getFileSize();
-    $file_extension = $item->getFileExtension();
-    $file_label = $file_name . ' (' . mb_strtoupper($file_extension) . ' | ' . format_size($file_size) . ')';
+    $file_label = $this->formatFileItemInformation($item);
     $file_url = $item->getFileUrl();
     if (!empty($file_url)) {
       $element['link'] = [
@@ -310,6 +307,18 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
       ];
     }
 
+    // Check if the attachment was replaced.
+    $original_item = $this->getOriginalFileItem($item);
+    if (isset($original_item) && $original_item->getFileUuid() !== $item->getFileUuid()) {
+      $element['replaced_file'] = [
+        '#type' => 'link',
+        '#title' => $this->formatFileItemInformation($original_item),
+        // We add a timestamp to prevent caching by the browser so that
+        // it can display replaced files.
+        '#url' => $original_item->getFileUrl()->setOption('query', ['time' => microtime(TRUE)]),
+      ];
+    }
+
     // Information fields.
     $element['description'] = [
       '#type' => 'textfield',
@@ -547,7 +556,7 @@ public function extractFormValues(FieldItemListInterface $items, array $form, Fo
           }
           if (!empty($value)) {
             $value['_original_delta'] = $delta;
-            $value['_weight'] = isset($value['_weight']) ? $value['_weight'] : $delta;
+            $value['_weight'] = $value['_weight'] ?? $delta;
             $files[] = $value;
           }
         }
@@ -969,6 +978,42 @@ protected function validateUploadedFile(\SplFileInfo $file_info) {
            mb_strlen($file_info->getClientOriginalName()) <= 240;
   }
 
+  /**
+   * Get the original file type item.
+   *
+   * @param \Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile $item
+   *   The current field type item.
+   *
+   * @return \Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile
+   *   The original file type item.
+   */
+  protected function getOriginalFileItem(ReliefWebFileType $item) {
+    if (isset($item->_original_values[$item->getUuid()])) {
+      return $this->createFieldItem($item->_original_values[$item->getUuid()]);
+    }
+  }
+
+  /**
+   * Format the file information.
+   *
+   * @param \Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile $item
+   *   Field type item.
+   *
+   * @return \Drupal\Core\StringTranslation\TranslatableMarkup
+   *   Formatted file information.
+   */
+  protected function formatFileItemInformation(ReliefWebFileType $item) {
+    $file_name = $item->getUploadedFileName() ?: $item->getFileName();
+    $file_size = $item->getFileSize();
+    $file_extension = $item->getFileExtension();
+
+    return $this->t('@file_name (@file_extension | @file_size)', [
+      '@file_name' => $file_name,
+      '@file_extension' => mb_strtoupper($file_extension),
+      '@file_size' => format_size($file_size),
+    ]);
+  }
+
   /**
    * Submit callback for the different operations in the widget.
    *
diff --git a/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget-item.html.twig b/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget-item.html.twig
index 42efa8e9a..1c0b9ff99 100644
--- a/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget-item.html.twig
+++ b/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget-item.html.twig
@@ -12,6 +12,7 @@
 {%
   set rendered = [
     'link',
+    'replaced_file',
     'description',
     'language',
     'preview',
@@ -32,6 +33,11 @@
   <td class="rw-file-widget-item__information">
   {% endif %}
     {{ element.link }}
+    {% if element.replaced_file %}
+    <div class="rw-file-widget-item__information__replaced"><small>
+      {{- 'Replaced: %file'|t({'%file': element.replaced_file|render}) -}}
+    </small></div>
+    {% endif %}
     {{ element.description }}
     {{ element.language }}
     {# Make sure all the element children are rendered. #}
diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
index a8dda54ec..b736160a9 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
@@ -93,7 +93,8 @@ form .views-field-media-library-select-form .form-type-checkbox:only-of-type {
 .rw-file-widget__table td {
   padding: 16px;
 }
-.rw-file-widget__table a {
+.rw-file-widget__table a,
+.rw-file-widget-item__information__replaced {
   word-break: break-all;
 }
 .rw-file-widget__table td.rw-file-widget-item__weight {

From 15debf984f0d3f58594e1070d691263ff7a0f4f9 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 18 Feb 2022 07:05:36 +0000
Subject: [PATCH 506/720] [RW-15] Add dimension constraints to media

---
 ...field.field.media.image_announcement.field_media_image.yml | 4 ++--
 .../field.field.media.image_blog_post.field_media_image.yml   | 2 +-
 config/field.field.media.image_book.field_media_image.yml     | 2 +-
 config/field.field.media.image_report.field_media_image.yml   | 2 +-
 config/field.field.media.image_topic.field_media_image.yml    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/field.field.media.image_announcement.field_media_image.yml b/config/field.field.media.image_announcement.field_media_image.yml
index b2d3df338..36c35ae0d 100644
--- a/config/field.field.media.image_announcement.field_media_image.yml
+++ b/config/field.field.media.image_announcement.field_media_image.yml
@@ -30,8 +30,8 @@ settings:
   file_directory: images/announcements
   file_extensions: 'png gif jpg jpeg'
   max_filesize: ''
-  max_resolution: ''
-  min_resolution: ''
+  max_resolution: 1400x400
+  min_resolution: 1400x400
   alt_field: true
   alt_field_required: true
   title_field: false
diff --git a/config/field.field.media.image_blog_post.field_media_image.yml b/config/field.field.media.image_blog_post.field_media_image.yml
index 3bffa3df8..7fea36edf 100644
--- a/config/field.field.media.image_blog_post.field_media_image.yml
+++ b/config/field.field.media.image_blog_post.field_media_image.yml
@@ -31,7 +31,7 @@ settings:
   file_extensions: 'png gif jpg jpeg'
   max_filesize: ''
   max_resolution: ''
-  min_resolution: ''
+  min_resolution: 700x200
   alt_field: false
   alt_field_required: true
   title_field: false
diff --git a/config/field.field.media.image_book.field_media_image.yml b/config/field.field.media.image_book.field_media_image.yml
index d3bc66413..bfc0696ae 100644
--- a/config/field.field.media.image_book.field_media_image.yml
+++ b/config/field.field.media.image_book.field_media_image.yml
@@ -31,7 +31,7 @@ settings:
   file_extensions: 'png gif jpg jpeg'
   max_filesize: ''
   max_resolution: ''
-  min_resolution: ''
+  min_resolution: 700x200
   alt_field: false
   alt_field_required: true
   title_field: false
diff --git a/config/field.field.media.image_report.field_media_image.yml b/config/field.field.media.image_report.field_media_image.yml
index 97dd2a856..77bb9acf5 100644
--- a/config/field.field.media.image_report.field_media_image.yml
+++ b/config/field.field.media.image_report.field_media_image.yml
@@ -31,7 +31,7 @@ settings:
   file_extensions: 'png gif jpg jpeg'
   max_filesize: ''
   max_resolution: ''
-  min_resolution: ''
+  min_resolution: 700x400
   alt_field: false
   alt_field_required: true
   title_field: false
diff --git a/config/field.field.media.image_topic.field_media_image.yml b/config/field.field.media.image_topic.field_media_image.yml
index c05045d19..af658be07 100644
--- a/config/field.field.media.image_topic.field_media_image.yml
+++ b/config/field.field.media.image_topic.field_media_image.yml
@@ -31,7 +31,7 @@ settings:
   file_extensions: 'png gif jpg jpeg svg'
   max_filesize: ''
   max_resolution: ''
-  min_resolution: ''
+  min_resolution: 64x64
   alt_field: false
   alt_field_required: true
   title_field: false

From 4ee16521fe142782dbf177cb91b18266184eb312 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 18 Feb 2022 07:28:13 +0000
Subject: [PATCH 507/720] [RW-334] Migrated new 'changed' field for users

---
 .../custom/reliefweb_migrate/src/Plugin/migrate/source/User.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php
index 09fe84d3d..43f967e7e 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php
@@ -31,6 +31,7 @@ public function query() {
         'signature',
         'signature_format',
         'created',
+        'changed',
         'access',
         'login',
         'status',
@@ -129,6 +130,7 @@ public function fields() {
       'signature' => $this->t('Signature'),
       'signature_format' => $this->t('Signature format'),
       'created' => $this->t('Registered timestamp'),
+      'changed' => $this->t('Timestamp for when user was changed.'),
       'access' => $this->t('Last access timestamp'),
       'login' => $this->t('Last login timestamp'),
       'status' => $this->t('Status'),

From 8dbefcfde8363fd880965d91cb06bcfc65bb6d76 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 18 Feb 2022 07:47:01 +0000
Subject: [PATCH 508/720] [RW-394] Remove mandatory alt attribute for
 announcement images

---
 ...eld.field.media.image_announcement.field_media_image.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/field.field.media.image_announcement.field_media_image.yml b/config/field.field.media.image_announcement.field_media_image.yml
index 36c35ae0d..4582c0492 100644
--- a/config/field.field.media.image_announcement.field_media_image.yml
+++ b/config/field.field.media.image_announcement.field_media_image.yml
@@ -11,9 +11,9 @@ dependencies:
 third_party_settings:
   content_translation:
     translation_sync:
-      alt: alt
-      title: title
       file: '0'
+      alt: '0'
+      title: '0'
 id: media.image_announcement.field_media_image
 field_name: field_media_image
 entity_type: media
@@ -32,7 +32,7 @@ settings:
   max_filesize: ''
   max_resolution: 1400x400
   min_resolution: 1400x400
-  alt_field: true
+  alt_field: false
   alt_field_required: true
   title_field: false
   title_field_required: false

From 5f1ce3ded6049984ed364e022f47124d6fb3c1e5 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 23 Feb 2022 04:52:59 +0000
Subject: [PATCH 509/720] [RW-284] Add inline enitity form module

---
 composer.json             |  1 +
 composer.lock             | 97 ++++++++++++++++++++++++++++++++++++++-
 config/core.extension.yml |  1 +
 symfony.lock              |  3 ++
 4 files changed, 100 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 3788e73cd..3bb9c8d31 100644
--- a/composer.json
+++ b/composer.json
@@ -67,6 +67,7 @@
         "drupal/google_tag": "^1.4",
         "drupal/guidelines": "^1.0",
         "drupal/imageapi_optimize_binaries": "^1.0-alpha2",
+        "drupal/inline_entity_form": "^1.0@RC",
         "drupal/mailsystem": "^4.3",
         "drupal/maintenance200": "^1.1",
         "drupal/metatag": "^1.16",
diff --git a/composer.lock b/composer.lock
index 2ea716f68..64096ab75 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "0712344b622e3303d2facd7ae23f0360",
+    "content-hash": "38124281bae16948fa9feebfd9ce4ab7",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -3157,6 +3157,98 @@
                 "source": "https://git.drupalcode.org/project/imageapi_optimize_binaries"
             }
         },
+        {
+            "name": "drupal/inline_entity_form",
+            "version": "1.0.0-rc9",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupalcode.org/project/inline_entity_form.git",
+                "reference": "8.x-1.0-rc9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/inline_entity_form-8.x-1.0-rc9.zip",
+                "reference": "8.x-1.0-rc9",
+                "shasum": "78953103a9c6e4e44bc877820a35f39913ea4559"
+            },
+            "require": {
+                "drupal/core": "^8.8 || ^9",
+                "php": ">=7.1"
+            },
+            "require-dev": {
+                "drupal/entity_reference_revisions": "^1.0"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "drupal": {
+                    "version": "8.x-1.0-rc9",
+                    "datestamp": "1618174486",
+                    "security-coverage": {
+                        "status": "not-covered",
+                        "message": "RC releases are not covered by Drupal security advisories."
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Centarro",
+                    "homepage": "https://www.drupal.org/user/3661446"
+                },
+                {
+                    "name": "bojanz",
+                    "homepage": "https://www.drupal.org/user/86106"
+                },
+                {
+                    "name": "dawehner",
+                    "homepage": "https://www.drupal.org/user/99340"
+                },
+                {
+                    "name": "geek-merlin",
+                    "homepage": "https://www.drupal.org/user/229048"
+                },
+                {
+                    "name": "joachim",
+                    "homepage": "https://www.drupal.org/user/107701"
+                },
+                {
+                    "name": "jsacksick",
+                    "homepage": "https://www.drupal.org/user/972218"
+                },
+                {
+                    "name": "kaythay",
+                    "homepage": "https://www.drupal.org/user/2182186"
+                },
+                {
+                    "name": "oknate",
+                    "homepage": "https://www.drupal.org/user/471638"
+                },
+                {
+                    "name": "ram4nd",
+                    "homepage": "https://www.drupal.org/user/601534"
+                },
+                {
+                    "name": "rszrama",
+                    "homepage": "https://www.drupal.org/user/49344"
+                },
+                {
+                    "name": "slashrsm",
+                    "homepage": "https://www.drupal.org/user/744628"
+                },
+                {
+                    "name": "webflo",
+                    "homepage": "https://www.drupal.org/user/254778"
+                }
+            ],
+            "description": "Provides a widget for inline management (creation, modification, removal) of referenced entities.",
+            "homepage": "https://www.drupal.org/project/inline_entity_form",
+            "support": {
+                "source": "https://git.drupalcode.org/project/inline_entity_form"
+            }
+        },
         {
             "name": "drupal/mailsystem",
             "version": "4.3.0",
@@ -14593,6 +14685,7 @@
     "aliases": [],
     "minimum-stability": "dev",
     "stability-flags": {
+        "drupal/inline_entity_form": 5,
         "drupal/taxonomy_term_revision": 20,
         "unocha/common_design": 20
     },
@@ -14602,5 +14695,5 @@
         "php": ">=8.0"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.1.0"
 }
diff --git a/config/core.extension.yml b/config/core.extension.yml
index bdb9042eb..c7896c30a 100644
--- a/config/core.extension.yml
+++ b/config/core.extension.yml
@@ -27,6 +27,7 @@ module:
   image: 0
   imageapi_optimize: 0
   imageapi_optimize_binaries: 0
+  inline_entity_form: 0
   inline_form_errors: 0
   language: 0
   link: 0
diff --git a/symfony.lock b/symfony.lock
index 0240cfc54..2e4594c92 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -182,6 +182,9 @@
     "drupal/imageapi_optimize_binaries": {
         "version": "1.0.0-alpha2"
     },
+    "drupal/inline_entity_form": {
+        "version": "1.0.0-rc9"
+    },
     "drupal/mailsystem": {
         "version": "4.3.0"
     },

From e7b63d057b3e9dd7d31dca26acb1297390a0d52c Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 23 Feb 2022 04:55:53 +0000
Subject: [PATCH 510/720] [RW-284] Configure media fields to use the
 inline_entity_form simple or complex widgets where relevant

---
 ...splay.media.image_announcement.default.yml | 25 ++++-----------
 ...media.image_announcement.media_library.yml | 17 +++-------
 ..._display.media.image_blog_post.default.yml | 10 +++---
 ...ay.media.image_blog_post.media_library.yml | 10 +++---
 ..._form_display.media.image_book.default.yml | 10 +++---
 ...display.media.image_book.media_library.yml | 10 +++---
 ...orm_display.media.image_report.default.yml | 21 +++++--------
 ...splay.media.image_report.media_library.yml | 17 +++-------
 ...form_display.media.image_topic.default.yml | 11 ++-----
 ...isplay.media.image_topic.media_library.yml | 11 ++-----
 ...form_display.node.announcement.default.yml | 13 ++++++--
 ...ntity_form_display.node.report.default.yml | 31 ++++++++++++++++---
 ...media.image_announcement.media_library.yml | 14 ++++++---
 ...ay.media.image_blog_post.media_library.yml | 12 ++++---
 ...display.media.image_book.media_library.yml | 12 ++++---
 ...splay.media.image_report.media_library.yml | 25 ++++++++++-----
 ...a.image_announcement.field_media_image.yml |  4 +--
 ...d.media.image_report.field_description.yml |  2 +-
 ...ld.field.node.announcement.field_image.yml |  4 +--
 .../field.field.node.report.field_image.yml   |  2 +-
 20 files changed, 132 insertions(+), 129 deletions(-)

diff --git a/config/core.entity_form_display.media.image_announcement.default.yml b/config/core.entity_form_display.media.image_announcement.default.yml
index ab6a17e70..6d2dfc643 100644
--- a/config/core.entity_form_display.media.image_announcement.default.yml
+++ b/config/core.entity_form_display.media.image_announcement.default.yml
@@ -4,10 +4,10 @@ status: true
 dependencies:
   config:
     - field.field.media.image_announcement.field_media_image
-    - image.style.thumbnail
+    - image.style.media_library
     - media.type.image_announcement
   module:
-    - image
+    - svg_image
 id: media.image_announcement.default
 targetEntityType: media
 bundle: image_announcement
@@ -15,29 +15,16 @@ mode: default
 content:
   field_media_image:
     type: image_image
-    weight: 1
-    region: content
-    settings:
-      progress_indicator: throbber
-      preview_image_style: thumbnail
-    third_party_settings: {  }
-  name:
-    type: string_textfield
     weight: 0
     region: content
     settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 2
-    region: content
-    settings:
-      display_label: true
+      progress_indicator: throbber
+      preview_image_style: media_library
     third_party_settings: {  }
 hidden:
   created: true
   langcode: true
+  name: true
   path: true
+  status: true
   uid: true
diff --git a/config/core.entity_form_display.media.image_announcement.media_library.yml b/config/core.entity_form_display.media.image_announcement.media_library.yml
index 27c55afa8..2aeda8ede 100644
--- a/config/core.entity_form_display.media.image_announcement.media_library.yml
+++ b/config/core.entity_form_display.media.image_announcement.media_library.yml
@@ -5,10 +5,10 @@ dependencies:
   config:
     - core.entity_form_mode.media.media_library
     - field.field.media.image_announcement.field_media_image
-    - image.style.thumbnail
+    - image.style.media_library
     - media.type.image_announcement
   module:
-    - image
+    - svg_image
 id: media.image_announcement.media_library
 targetEntityType: media
 bundle: image_announcement
@@ -16,23 +16,16 @@ mode: media_library
 content:
   field_media_image:
     type: image_image
-    weight: 5
-    region: content
-    settings:
-      progress_indicator: throbber
-      preview_image_style: thumbnail
-    third_party_settings: {  }
-  name:
-    type: string_textfield
     weight: 0
     region: content
     settings:
-      size: 60
-      placeholder: ''
+      progress_indicator: throbber
+      preview_image_style: media_library
     third_party_settings: {  }
 hidden:
   created: true
   langcode: true
+  name: true
   path: true
   status: true
   uid: true
diff --git a/config/core.entity_form_display.media.image_blog_post.default.yml b/config/core.entity_form_display.media.image_blog_post.default.yml
index 85efccfb8..22c337681 100644
--- a/config/core.entity_form_display.media.image_blog_post.default.yml
+++ b/config/core.entity_form_display.media.image_blog_post.default.yml
@@ -6,10 +6,10 @@ dependencies:
     - field.field.media.image_blog_post.field_copyright
     - field.field.media.image_blog_post.field_description
     - field.field.media.image_blog_post.field_media_image
-    - image.style.thumbnail
+    - image.style.media_library
     - media.type.image_blog_post
   module:
-    - image
+    - svg_image
 id: media.image_blog_post.default
 targetEntityType: media
 bundle: image_blog_post
@@ -33,15 +33,15 @@ content:
     third_party_settings: {  }
   field_media_image:
     type: image_image
-    weight: 1
+    weight: 0
     region: content
     settings:
       progress_indicator: throbber
-      preview_image_style: thumbnail
+      preview_image_style: media_library
     third_party_settings: {  }
   name:
     type: string_textfield
-    weight: 0
+    weight: 1
     region: content
     settings:
       size: 60
diff --git a/config/core.entity_form_display.media.image_blog_post.media_library.yml b/config/core.entity_form_display.media.image_blog_post.media_library.yml
index 4106e4dd8..f2a07c919 100644
--- a/config/core.entity_form_display.media.image_blog_post.media_library.yml
+++ b/config/core.entity_form_display.media.image_blog_post.media_library.yml
@@ -7,10 +7,10 @@ dependencies:
     - field.field.media.image_blog_post.field_copyright
     - field.field.media.image_blog_post.field_description
     - field.field.media.image_blog_post.field_media_image
-    - image.style.thumbnail
+    - image.style.media_library
     - media.type.image_blog_post
   module:
-    - image
+    - svg_image
 id: media.image_blog_post.media_library
 targetEntityType: media
 bundle: image_blog_post
@@ -34,15 +34,15 @@ content:
     third_party_settings: {  }
   field_media_image:
     type: image_image
-    weight: 1
+    weight: 0
     region: content
     settings:
       progress_indicator: throbber
-      preview_image_style: thumbnail
+      preview_image_style: media_library
     third_party_settings: {  }
   name:
     type: string_textfield
-    weight: 0
+    weight: 1
     region: content
     settings:
       size: 60
diff --git a/config/core.entity_form_display.media.image_book.default.yml b/config/core.entity_form_display.media.image_book.default.yml
index 256e41ac3..4552a7964 100644
--- a/config/core.entity_form_display.media.image_book.default.yml
+++ b/config/core.entity_form_display.media.image_book.default.yml
@@ -6,10 +6,10 @@ dependencies:
     - field.field.media.image_book.field_copyright
     - field.field.media.image_book.field_description
     - field.field.media.image_book.field_media_image
-    - image.style.thumbnail
+    - image.style.media_library
     - media.type.image_book
   module:
-    - image
+    - svg_image
 id: media.image_book.default
 targetEntityType: media
 bundle: image_book
@@ -33,15 +33,15 @@ content:
     third_party_settings: {  }
   field_media_image:
     type: image_image
-    weight: 1
+    weight: 0
     region: content
     settings:
       progress_indicator: throbber
-      preview_image_style: thumbnail
+      preview_image_style: media_library
     third_party_settings: {  }
   name:
     type: string_textfield
-    weight: 0
+    weight: 1
     region: content
     settings:
       size: 60
diff --git a/config/core.entity_form_display.media.image_book.media_library.yml b/config/core.entity_form_display.media.image_book.media_library.yml
index 9145e72e8..bc763f11a 100644
--- a/config/core.entity_form_display.media.image_book.media_library.yml
+++ b/config/core.entity_form_display.media.image_book.media_library.yml
@@ -7,10 +7,10 @@ dependencies:
     - field.field.media.image_book.field_copyright
     - field.field.media.image_book.field_description
     - field.field.media.image_book.field_media_image
-    - image.style.thumbnail
+    - image.style.media_library
     - media.type.image_book
   module:
-    - image
+    - svg_image
 id: media.image_book.media_library
 targetEntityType: media
 bundle: image_book
@@ -34,15 +34,15 @@ content:
     third_party_settings: {  }
   field_media_image:
     type: image_image
-    weight: 1
+    weight: 0
     region: content
     settings:
       progress_indicator: throbber
-      preview_image_style: thumbnail
+      preview_image_style: media_library
     third_party_settings: {  }
   name:
     type: string_textfield
-    weight: 0
+    weight: 1
     region: content
     settings:
       size: 60
diff --git a/config/core.entity_form_display.media.image_report.default.yml b/config/core.entity_form_display.media.image_report.default.yml
index 574cd1374..6847c0e6f 100644
--- a/config/core.entity_form_display.media.image_report.default.yml
+++ b/config/core.entity_form_display.media.image_report.default.yml
@@ -6,10 +6,10 @@ dependencies:
     - field.field.media.image_report.field_copyright
     - field.field.media.image_report.field_description
     - field.field.media.image_report.field_media_image
-    - image.style.thumbnail
+    - image.style.media_library
     - media.type.image_report
   module:
-    - image
+    - svg_image
 id: media.image_report.default
 targetEntityType: media
 bundle: image_report
@@ -17,7 +17,7 @@ mode: default
 content:
   field_copyright:
     type: string_textfield
-    weight: 2
+    weight: 1
     region: content
     settings:
       size: 60
@@ -25,7 +25,7 @@ content:
     third_party_settings: {  }
   field_description:
     type: string_textfield
-    weight: 3
+    weight: 2
     region: content
     settings:
       size: 60
@@ -33,23 +33,16 @@ content:
     third_party_settings: {  }
   field_media_image:
     type: image_image
-    weight: 1
-    region: content
-    settings:
-      progress_indicator: throbber
-      preview_image_style: thumbnail
-    third_party_settings: {  }
-  name:
-    type: string_textfield
     weight: 0
     region: content
     settings:
-      size: 60
-      placeholder: ''
+      progress_indicator: throbber
+      preview_image_style: media_library
     third_party_settings: {  }
 hidden:
   created: true
   langcode: true
+  name: true
   path: true
   status: true
   uid: true
diff --git a/config/core.entity_form_display.media.image_report.media_library.yml b/config/core.entity_form_display.media.image_report.media_library.yml
index c98cd9fcd..884811751 100644
--- a/config/core.entity_form_display.media.image_report.media_library.yml
+++ b/config/core.entity_form_display.media.image_report.media_library.yml
@@ -10,7 +10,7 @@ dependencies:
     - image.style.thumbnail
     - media.type.image_report
   module:
-    - image
+    - svg_image
 id: media.image_report.media_library
 targetEntityType: media
 bundle: image_report
@@ -18,7 +18,7 @@ mode: media_library
 content:
   field_copyright:
     type: string_textfield
-    weight: 2
+    weight: 1
     region: content
     settings:
       size: 60
@@ -26,7 +26,7 @@ content:
     third_party_settings: {  }
   field_description:
     type: string_textfield
-    weight: 3
+    weight: 2
     region: content
     settings:
       size: 60
@@ -34,23 +34,16 @@ content:
     third_party_settings: {  }
   field_media_image:
     type: image_image
-    weight: 1
+    weight: 0
     region: content
     settings:
       progress_indicator: throbber
       preview_image_style: thumbnail
     third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
 hidden:
   created: true
   langcode: true
+  name: true
   path: true
   status: true
   uid: true
diff --git a/config/core.entity_form_display.media.image_topic.default.yml b/config/core.entity_form_display.media.image_topic.default.yml
index f42bacbd7..5137c6564 100644
--- a/config/core.entity_form_display.media.image_topic.default.yml
+++ b/config/core.entity_form_display.media.image_topic.default.yml
@@ -15,23 +15,16 @@ mode: default
 content:
   field_media_image:
     type: image_image
-    weight: 1
+    weight: 0
     region: content
     settings:
       progress_indicator: throbber
       preview_image_style: icon
     third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
 hidden:
   created: true
   langcode: true
+  name: true
   path: true
   status: true
   uid: true
diff --git a/config/core.entity_form_display.media.image_topic.media_library.yml b/config/core.entity_form_display.media.image_topic.media_library.yml
index a380ee4f0..1b410a807 100644
--- a/config/core.entity_form_display.media.image_topic.media_library.yml
+++ b/config/core.entity_form_display.media.image_topic.media_library.yml
@@ -16,23 +16,16 @@ mode: media_library
 content:
   field_media_image:
     type: image_image
-    weight: 5
+    weight: 0
     region: content
     settings:
       progress_indicator: throbber
       preview_image_style: icon
     third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
 hidden:
   created: true
   langcode: true
+  name: true
   path: true
   status: true
   uid: true
diff --git a/config/core.entity_form_display.node.announcement.default.yml b/config/core.entity_form_display.node.announcement.default.yml
index 2c3441b98..09e9ee91a 100644
--- a/config/core.entity_form_display.node.announcement.default.yml
+++ b/config/core.entity_form_display.node.announcement.default.yml
@@ -3,14 +3,15 @@ langcode: en
 status: true
 dependencies:
   config:
+    - core.entity_form_mode.media.media_library
     - field.field.node.announcement.body
     - field.field.node.announcement.field_image
     - field.field.node.announcement.field_link
     - node.type.announcement
   module:
     - allowed_formats
+    - inline_entity_form
     - link
-    - media_library
     - text
 id: node.announcement.default
 targetEntityType: node
@@ -31,11 +32,17 @@ content:
         hide_help: '1'
         hide_guidelines: '1'
   field_image:
-    type: media_library_widget
+    type: inline_entity_form_simple
     weight: 2
     region: content
     settings:
-      media_types: {  }
+      form_mode: media_library
+      override_labels: false
+      label_singular: ''
+      label_plural: ''
+      collapsible: false
+      collapsed: false
+      revision: false
     third_party_settings: {  }
   field_link:
     type: link_default
diff --git a/config/core.entity_form_display.node.report.default.yml b/config/core.entity_form_display.node.report.default.yml
index 66b7db580..17137c0e7 100644
--- a/config/core.entity_form_display.node.report.default.yml
+++ b/config/core.entity_form_display.node.report.default.yml
@@ -3,6 +3,7 @@ langcode: en
 status: true
 dependencies:
   config:
+    - core.entity_form_mode.media.media_library
     - field.field.node.report.body
     - field.field.node.report.field_bury
     - field.field.node.report.field_content_format
@@ -31,7 +32,7 @@ dependencies:
   module:
     - allowed_formats
     - datetime
-    - media_library
+    - inline_entity_form
     - path
     - reliefweb_docstore
     - reliefweb_fields
@@ -180,11 +181,21 @@ content:
       display_label: true
     third_party_settings: {  }
   field_headline_image:
-    type: media_library_widget
+    type: inline_entity_form_complex
     weight: 19
     region: content
     settings:
-      media_types: {  }
+      form_mode: media_library
+      override_labels: true
+      label_singular: image
+      label_plural: ''
+      allow_new: true
+      allow_existing: false
+      match_operator: CONTAINS
+      allow_duplicate: false
+      collapsible: false
+      collapsed: false
+      revision: false
     third_party_settings: {  }
   field_headline_summary:
     type: string_textarea
@@ -203,11 +214,21 @@ content:
       placeholder: ''
     third_party_settings: {  }
   field_image:
-    type: media_library_widget
+    type: inline_entity_form_complex
     weight: 4
     region: content
     settings:
-      media_types: {  }
+      form_mode: media_library
+      override_labels: true
+      label_singular: image
+      label_plural: ''
+      allow_new: true
+      allow_existing: false
+      match_operator: CONTAINS
+      allow_duplicate: false
+      collapsible: false
+      collapsed: true
+      revision: false
     third_party_settings: {  }
   field_language:
     type: options_buttons
diff --git a/config/core.entity_view_display.media.image_announcement.media_library.yml b/config/core.entity_view_display.media.image_announcement.media_library.yml
index 858f50b15..97efbe32b 100644
--- a/config/core.entity_view_display.media.image_announcement.media_library.yml
+++ b/config/core.entity_view_display.media.image_announcement.media_library.yml
@@ -5,27 +5,31 @@ dependencies:
   config:
     - core.entity_view_mode.media.media_library
     - field.field.media.image_announcement.field_media_image
-    - image.style.medium
+    - image.style.announcement
     - media.type.image_announcement
   module:
-    - image
+    - svg_image
 id: media.image_announcement.media_library
 targetEntityType: media
 bundle: image_announcement
 mode: media_library
 content:
-  thumbnail:
+  field_media_image:
     type: image
     label: hidden
     settings:
       image_link: ''
-      image_style: medium
+      image_style: announcement
+      svg_attributes:
+        width: null
+        height: null
+      svg_render_as_image: true
     third_party_settings: {  }
     weight: 0
     region: content
 hidden:
   created: true
-  field_media_image: true
   langcode: true
   name: true
+  thumbnail: true
   uid: true
diff --git a/config/core.entity_view_display.media.image_blog_post.media_library.yml b/config/core.entity_view_display.media.image_blog_post.media_library.yml
index 31af3757d..087f704a5 100644
--- a/config/core.entity_view_display.media.image_blog_post.media_library.yml
+++ b/config/core.entity_view_display.media.image_blog_post.media_library.yml
@@ -7,10 +7,10 @@ dependencies:
     - field.field.media.image_blog_post.field_copyright
     - field.field.media.image_blog_post.field_description
     - field.field.media.image_blog_post.field_media_image
-    - image.style.medium
+    - image.style.media_library
     - media.type.image_blog_post
   module:
-    - image
+    - svg_image
 id: media.image_blog_post.media_library
 targetEntityType: media
 bundle: image_blog_post
@@ -20,8 +20,12 @@ content:
     type: image
     label: hidden
     settings:
-      image_link: ''
-      image_style: medium
+      image_link: file
+      image_style: media_library
+      svg_attributes:
+        width: null
+        height: null
+      svg_render_as_image: true
     third_party_settings: {  }
     weight: 0
     region: content
diff --git a/config/core.entity_view_display.media.image_book.media_library.yml b/config/core.entity_view_display.media.image_book.media_library.yml
index 200dc70f3..bc4d65fc7 100644
--- a/config/core.entity_view_display.media.image_book.media_library.yml
+++ b/config/core.entity_view_display.media.image_book.media_library.yml
@@ -7,10 +7,10 @@ dependencies:
     - field.field.media.image_book.field_copyright
     - field.field.media.image_book.field_description
     - field.field.media.image_book.field_media_image
-    - image.style.medium
+    - image.style.media_library
     - media.type.image_book
   module:
-    - image
+    - svg_image
 id: media.image_book.media_library
 targetEntityType: media
 bundle: image_book
@@ -20,8 +20,12 @@ content:
     type: image
     label: hidden
     settings:
-      image_link: ''
-      image_style: medium
+      image_link: file
+      image_style: media_library
+      svg_attributes:
+        width: null
+        height: null
+      svg_render_as_image: true
     third_party_settings: {  }
     weight: 0
     region: content
diff --git a/config/core.entity_view_display.media.image_report.media_library.yml b/config/core.entity_view_display.media.image_report.media_library.yml
index 71b0e40fa..dd71e3fac 100644
--- a/config/core.entity_view_display.media.image_report.media_library.yml
+++ b/config/core.entity_view_display.media.image_report.media_library.yml
@@ -7,29 +7,40 @@ dependencies:
     - field.field.media.image_report.field_copyright
     - field.field.media.image_report.field_description
     - field.field.media.image_report.field_media_image
-    - image.style.medium
+    - image.style.media_library
     - media.type.image_report
   module:
-    - image
+    - svg_image
 id: media.image_report.media_library
 targetEntityType: media
 bundle: image_report
 mode: media_library
 content:
-  thumbnail:
+  field_media_image:
     type: image
     label: hidden
     settings:
-      image_link: ''
-      image_style: medium
+      image_link: file
+      image_style: media_library
+      svg_attributes:
+        width: null
+        height: null
+      svg_render_as_image: true
     third_party_settings: {  }
     weight: 0
     region: content
+  name:
+    type: string
+    label: hidden
+    settings:
+      link_to_entity: false
+    third_party_settings: {  }
+    weight: 1
+    region: content
 hidden:
   created: true
   field_copyright: true
   field_description: true
-  field_media_image: true
   langcode: true
-  name: true
+  thumbnail: true
   uid: true
diff --git a/config/field.field.media.image_announcement.field_media_image.yml b/config/field.field.media.image_announcement.field_media_image.yml
index 4582c0492..2cdd03268 100644
--- a/config/field.field.media.image_announcement.field_media_image.yml
+++ b/config/field.field.media.image_announcement.field_media_image.yml
@@ -30,8 +30,8 @@ settings:
   file_directory: images/announcements
   file_extensions: 'png gif jpg jpeg'
   max_filesize: ''
-  max_resolution: 1400x400
-  min_resolution: 1400x400
+  max_resolution: 1200x400
+  min_resolution: 1200x400
   alt_field: false
   alt_field_required: true
   title_field: false
diff --git a/config/field.field.media.image_report.field_description.yml b/config/field.field.media.image_report.field_description.yml
index f8d8963eb..38ff54a18 100644
--- a/config/field.field.media.image_report.field_description.yml
+++ b/config/field.field.media.image_report.field_description.yml
@@ -11,7 +11,7 @@ entity_type: media
 bundle: image_report
 label: Description
 description: 'Text describing the content of the image.'
-required: true
+required: false
 translatable: true
 default_value: {  }
 default_value_callback: ''
diff --git a/config/field.field.node.announcement.field_image.yml b/config/field.field.node.announcement.field_image.yml
index 1248cd2b2..beda567e3 100644
--- a/config/field.field.node.announcement.field_image.yml
+++ b/config/field.field.node.announcement.field_image.yml
@@ -11,7 +11,7 @@ field_name: field_image
 entity_type: node
 bundle: announcement
 label: Banner
-description: 'Announcement''s banner image. It should be exactly 1200x400 pixels.'
+description: ''
 required: true
 translatable: false
 default_value: {  }
@@ -24,6 +24,6 @@ settings:
     sort:
       field: mid
       direction: DESC
-    auto_create: false
+    auto_create: true
     auto_create_bundle: ''
 field_type: entity_reference
diff --git a/config/field.field.node.report.field_image.yml b/config/field.field.node.report.field_image.yml
index 377ea640d..2375bca20 100644
--- a/config/field.field.node.report.field_image.yml
+++ b/config/field.field.node.report.field_image.yml
@@ -24,6 +24,6 @@ settings:
     sort:
       field: mid
       direction: DESC
-    auto_create: false
+    auto_create: true
     auto_create_bundle: ''
 field_type: entity_reference

From f00bebad5f759e5e568522f88ad67768e955c8fa Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 23 Feb 2022 04:56:43 +0000
Subject: [PATCH 511/720] [RW-284] Update media library thumbail image style

---
 config/image.style.media_library.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/image.style.media_library.yml b/config/image.style.media_library.yml
index 2dc1877c6..5920b61e8 100644
--- a/config/image.style.media_library.yml
+++ b/config/image.style.media_library.yml
@@ -8,7 +8,7 @@ dependencies:
 _core:
   default_config_hash: 7qJqToD1OQLAyeswpmg7M0LRxQlw1URQkJDWUJCnmR8
 name: media_library
-label: 'Media Library thumbnail (220×220)'
+label: 'Media Library thumbnail'
 effects:
   75b076a8-1234-4b42-85db-bf377c4d8d5f:
     uuid: 75b076a8-1234-4b42-85db-bf377c4d8d5f
@@ -16,6 +16,6 @@ effects:
     weight: 0
     data:
       width: 220
-      height: 220
-      upscale: false
+      height: 140
+      upscale: true
 pipeline: __default__

From 1edc445253674ef8310ea9ce9d59ee642816d303 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 23 Feb 2022 04:58:07 +0000
Subject: [PATCH 512/720] [RW-284] Refactor media library view widget

---
 config/views.view.media_library.yml | 617 +++++++++++++++-------------
 1 file changed, 323 insertions(+), 294 deletions(-)

diff --git a/config/views.view.media_library.yml b/config/views.view.media_library.yml
index 6d4741bef..3eeca2b94 100644
--- a/config/views.view.media_library.yml
+++ b/config/views.view.media_library.yml
@@ -4,6 +4,9 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.media.media_library
+    - field.storage.media.field_copyright
+    - field.storage.media.field_description
+    - field.storage.media.field_media_image
     - image.style.media_library
   module:
     - media
@@ -484,7 +487,19 @@ display:
         - 'url.query_args:sort_by'
         - user
         - user.permissions
-      tags: {  }
+      tags:
+        - 'config:core.entity_view_display.media.file_report.default'
+        - 'config:core.entity_view_display.media.file_report.media_library'
+        - 'config:core.entity_view_display.media.image_announcement.default'
+        - 'config:core.entity_view_display.media.image_announcement.media_library'
+        - 'config:core.entity_view_display.media.image_blog_post.default'
+        - 'config:core.entity_view_display.media.image_blog_post.media_library'
+        - 'config:core.entity_view_display.media.image_book.default'
+        - 'config:core.entity_view_display.media.image_book.media_library'
+        - 'config:core.entity_view_display.media.image_report.default'
+        - 'config:core.entity_view_display.media.image_report.media_library'
+        - 'config:core.entity_view_display.media.image_topic.default'
+        - 'config:core.entity_view_display.media.image_topic.media_library'
   page:
     id: page
     display_title: Page
@@ -781,12 +796,24 @@ display:
         - 'url.query_args:sort_by'
         - user
         - user.permissions
-      tags: {  }
+      tags:
+        - 'config:core.entity_view_display.media.file_report.default'
+        - 'config:core.entity_view_display.media.file_report.media_library'
+        - 'config:core.entity_view_display.media.image_announcement.default'
+        - 'config:core.entity_view_display.media.image_announcement.media_library'
+        - 'config:core.entity_view_display.media.image_blog_post.default'
+        - 'config:core.entity_view_display.media.image_blog_post.media_library'
+        - 'config:core.entity_view_display.media.image_book.default'
+        - 'config:core.entity_view_display.media.image_book.media_library'
+        - 'config:core.entity_view_display.media.image_report.default'
+        - 'config:core.entity_view_display.media.image_report.media_library'
+        - 'config:core.entity_view_display.media.image_topic.default'
+        - 'config:core.entity_view_display.media.image_topic.media_library'
   widget:
     id: widget
-    display_title: Widget
+    display_title: 'Widget (table)'
     display_plugin: page
-    position: 2
+    position: 3
     display_options:
       fields:
         media_library_select_form:
@@ -794,11 +821,20 @@ display:
           table: media
           field: media_library_select_form
           relationship: none
-          group_type: group
-          admin_label: ''
           entity_type: media
           plugin_id: media_library_select_form
           label: ''
+          element_class: ''
+          element_wrapper_class: ''
+        field_media_image:
+          id: field_media_image
+          table: media__field_media_image
+          field: field_media_image
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: field
+          label: Image
           exclude: false
           alter:
             alter_text: false
@@ -831,7 +867,7 @@ display:
           element_class: ''
           element_label_type: ''
           element_label_class: ''
-          element_label_colon: false
+          element_label_colon: true
           element_wrapper_type: ''
           element_wrapper_class: ''
           element_default_classes: true
@@ -839,16 +875,46 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-        rendered_entity:
-          id: rendered_entity
-          table: media
-          field: rendered_entity
+          click_sort_column: target_id
+          type: image
+          settings:
+            image_link: file
+            image_style: media_library
+            svg_attributes:
+              width: null
+              height: null
+            svg_render_as_image: true
+          group_column: ''
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        name:
+          id: name
+          table: media_field_data
+          field: name
+          relationship: none
+          entity_type: media
+          entity_field: name
+          plugin_id: field
+          label: Name
+          type: string
+          settings:
+            link_to_entity: false
+        field_copyright:
+          id: field_copyright
+          table: media__field_copyright
+          field: field_copyright
           relationship: none
           group_type: group
           admin_label: ''
-          entity_type: media
-          plugin_id: rendered_entity
-          label: ''
+          plugin_id: field
+          label: Copyright
           exclude: false
           alter:
             alter_text: false
@@ -881,7 +947,7 @@ display:
           element_class: ''
           element_label_type: ''
           element_label_class: ''
-          element_label_colon: false
+          element_label_colon: true
           element_wrapper_type: ''
           element_wrapper_class: ''
           element_default_classes: true
@@ -889,287 +955,263 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          view_mode: media_library
-      access:
-        type: perm
-        options:
-          perm: 'view media'
-      arguments:
-        bundle:
-          id: bundle
-          table: media_field_data
-          field: bundle
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: bundle
-          plugin_id: string
-          default_action: ignore
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: fixed
-          default_argument_options:
-            argument: ''
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 24
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          glossary: false
-          limit: 0
-          case: none
-          path_case: none
-          transform_dash: false
-          break_phrase: false
-      filters:
-        status:
-          id: status
-          table: media_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: status
-          plugin_id: boolean
-          operator: '='
-          value: '1'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        name:
-          id: name
-          table: media_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: name
-          plugin_id: string
-          operator: contains
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: name_op
-            label: Name
-            description: ''
-            use_operator: false
-            operator: name_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: name
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        default_langcode:
-          id: default_langcode
-          table: media_field_data
-          field: default_langcode
+          click_sort_column: value
+          type: string
+          settings:
+            link_to_entity: false
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        field_description:
+          id: field_description
+          table: media__field_description
+          field: field_description
           relationship: none
           group_type: group
           admin_label: ''
-          entity_type: media
-          entity_field: default_langcode
-          plugin_id: boolean
-          operator: '='
-          value: '1'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      defaults:
-        access: false
-        css_class: false
-        fields: false
-        arguments: false
-        filters: false
-        filter_groups: false
-        header: false
-      css_class: ''
-      display_description: ''
-      header:
-        display_link_grid:
-          id: display_link_grid
-          table: views
-          field: display_link
-          plugin_id: display_link
-          label: Grid
-          empty: true
-          display_id: widget
-        display_link_table:
-          id: display_link_table
-          table: views
-          field: display_link
-          plugin_id: display_link
-          label: Table
-          empty: true
-          display_id: widget_table
-      rendering_language: '***LANGUAGE_language_interface***'
-      display_extenders: {  }
-      path: admin/content/media-widget
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - 'url.query_args:sort_by'
-        - user.permissions
-      tags: {  }
-  widget_table:
-    id: widget_table
-    display_title: 'Widget (table)'
-    display_plugin: page
-    position: 3
-    display_options:
-      fields:
-        media_library_select_form:
-          id: media_library_select_form
-          table: media
-          field: media_library_select_form
-          relationship: none
-          entity_type: media
-          plugin_id: media_library_select_form
-          label: ''
+          plugin_id: field
+          label: Description
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
           element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
           element_wrapper_class: ''
-        thumbnail__target_id:
-          id: thumbnail__target_id
-          table: media_field_data
-          field: thumbnail__target_id
-          relationship: none
-          entity_type: media
-          entity_field: thumbnail
-          plugin_id: field
-          label: Thumbnail
-          type: image
-          settings:
-            image_link: ''
-            image_style: media_library
-        name:
-          id: name
-          table: media_field_data
-          field: name
-          relationship: none
-          entity_type: media
-          entity_field: name
-          plugin_id: field
-          label: Name
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
           type: string
           settings:
             link_to_entity: false
-        uid:
-          id: uid
-          table: media_field_revision
-          field: uid
-          relationship: none
-          entity_type: media
-          entity_field: uid
-          plugin_id: field
-          label: Author
-          type: entity_reference_label
-          settings:
-            link: true
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
         changed:
           id: changed
           table: media_field_data
           field: changed
           relationship: none
+          group_type: group
+          admin_label: ''
           entity_type: media
           entity_field: changed
           plugin_id: field
           label: Updated
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
           type: timestamp
           settings:
-            date_format: short
+            date_format: html_date
             custom_date_format: ''
             timezone: ''
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        mid:
+          id: mid
+          table: media_field_data
+          field: mid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: media
+          entity_field: mid
+          plugin_id: field
+          label: ''
+          exclude: true
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: number_unformatted
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+        nothing:
+          id: nothing
+          table: views
+          field: nothing
+          relationship: none
+          group_type: group
+          admin_label: 'Link to edit media'
+          plugin_id: custom
+          label: Edit
+          exclude: false
+          alter:
+            alter_text: true
+            text: '<a href="/media/{{ mid }}/edit" target="_blank">edit</a>'
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: false
       access:
         type: perm
         options:
@@ -1361,26 +1403,10 @@ display:
         filter_groups: false
         header: false
       css_class: ''
-      header:
-        display_link_grid:
-          id: display_link_grid
-          table: views
-          field: display_link
-          plugin_id: display_link
-          label: Grid
-          empty: true
-          display_id: widget
-        display_link_table:
-          id: display_link_table
-          table: views
-          field: display_link
-          plugin_id: display_link
-          label: Table
-          empty: true
-          display_id: widget_table
+      header: {  }
       rendering_language: '***LANGUAGE_language_interface***'
       display_extenders: {  }
-      path: admin/content/media-widget-table
+      path: admin/content/media-widget
     cache_metadata:
       max-age: -1
       contexts:
@@ -1389,4 +1415,7 @@ display:
         - url.query_args
         - 'url.query_args:sort_by'
         - user.permissions
-      tags: {  }
+      tags:
+        - 'config:field.storage.media.field_copyright'
+        - 'config:field.storage.media.field_description'
+        - 'config:field.storage.media.field_media_image'

From a94f86f53f5db267c33e334bc32eb839bbbae22e Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 23 Feb 2022 04:59:04 +0000
Subject: [PATCH 513/720] [RW-320] Add twig function to hide nested field
 labels

---
 .../reliefweb_utility/src/TwigExtension.php   | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/html/modules/custom/reliefweb_utility/src/TwigExtension.php b/html/modules/custom/reliefweb_utility/src/TwigExtension.php
index 3762aecbf..be759eb98 100644
--- a/html/modules/custom/reliefweb_utility/src/TwigExtension.php
+++ b/html/modules/custom/reliefweb_utility/src/TwigExtension.php
@@ -30,6 +30,7 @@ public function getFilters() {
       ]),
       new TwigFilter('dpm', 'dpm'),
       new TwigFilter('values', 'array_values'),
+      new TwigFilter('hide_nested_label', [$this, 'hideNestedLabel']),
     ];
   }
 
@@ -187,4 +188,31 @@ public static function getEntityLink(EntityInterface $entity, $text = NULL, $rel
     return $entity->toLink($text, $rel, $options)->toString();
   }
 
+  /**
+   * Hide a label in a nested render array.
+   *
+   * @param array $element
+   *   Form element.
+   * @param array $children
+   *   List of nested children of the form element.
+   */
+  public static function hideNestedLabel(array $element, array $children) {
+    $parent = &$element;
+    $last = count($children) - 1;
+    foreach ($children as $index => $child) {
+      if (isset($parent[$child])) {
+        if ($index === $last) {
+          $parent[$child]['#title_display'] = 'invisible';
+        }
+        else {
+          $parent = &$parent[$child];
+        }
+      }
+      else {
+        break;
+      }
+    }
+    return $element;
+  }
+
 }

From 155d81829abacce20b36aeb4362b721ed4e341b8 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 23 Feb 2022 05:00:32 +0000
Subject: [PATCH 514/720] [RW-224] Fix text format help display

---
 .../reliefweb_form/reliefweb_form.module      | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/html/modules/custom/reliefweb_form/reliefweb_form.module b/html/modules/custom/reliefweb_form/reliefweb_form.module
index 7315d8d69..44158695f 100644
--- a/html/modules/custom/reliefweb_form/reliefweb_form.module
+++ b/html/modules/custom/reliefweb_form/reliefweb_form.module
@@ -304,15 +304,29 @@ function reliefweb_form_hide_format_help($form_element, FormStateInterface $form
 
     // Ensure the format is displayed even it's only one, except for plain text.
     if (isset($form_element['#allowed_formats']) && count($form_element['#allowed_formats']) === 1) {
-      if (($hide_help && $hide_guidelines) || $form_element['format']['format']['#default_value'] === 'plain_text') {
-        // We need to keep the format (we cannot use #access = FALSE) otherwise
-        // the editor for the text format, if any, will not be displayed...
-        // @see \Drupal\editor\Element::preRenderTextFormat()
-        unset($form_element['format']['#type']);
-        unset($form_element['format']['#theme_wrappers']);
+      $allowed_format = key($form_element['#allowed_formats']);
+
+      // Select a default format if not already.
+      if (empty($form_element['format']['format']['#default_value'])) {
+        $form_element['format']['format']['#default_value'] = $allowed_format;
+      }
+
+      if ($hide_help && $hide_guidelines) {
+        if ($allowed_format === 'markdown_editor') {
+          // We need to keep the format (we cannot use #access = FALSE)
+          // otherwise the text editor for the text format, if any, will not be
+          // displayed...
+          // @see \Drupal\editor\Element::preRenderTextFormat()
+          unset($form_element['format']['#type']);
+          unset($form_element['format']['#theme_wrappers']);
+        }
+        else {
+          $form_element['format']['#access'] = FALSE;
+        }
       }
       else {
-        // We need to set the #access to TRUE otherwiwse it's hidden...
+        // We need to set the #access to TRUE otherwiwse it's hidden... but we
+        // want to show what type of format is allowed.
         // @see \Drupal\editor\Element::preRenderTextFormat()
         $form_element['format']['format']['#access'] = TRUE;
         $form_element['format']['format']['#attributes']['disabled'] = TRUE;

From f58e41f5da983ee2cb1d908b1e7dcdd113577b57 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 23 Feb 2022 05:02:09 +0000
Subject: [PATCH 515/720] [RW-284] Make submit buttons on entity forms work
 with inline entity form module

---
 .../src/ModerationServiceBase.php             | 41 ++++++++++++-------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
index 2c8a3243b..69406eced 100644
--- a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
+++ b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
@@ -401,7 +401,16 @@ public function alterEntityForm(array &$form, FormStateInterface $form_state) {
       $form['status']['#access'] = FALSE;
     }
 
-    // Disable the moderation status widget and the default submit buttons.
+    // Use the default submit button as base.
+    $submit = [];
+    if (isset($form['actions']['submit'])) {
+      $submit = $form['actions']['submit'];
+      unset($submit['#name']);
+      unset($submit['#value']);
+      unset($submit['#description']);
+    }
+
+    // Disable the default submit buttons.
     $form['actions']['submit']['#access'] = FALSE;
 
     // Move the preview button at the beginning if it exists.
@@ -411,29 +420,31 @@ public function alterEntityForm(array &$form, FormStateInterface $form_state) {
 
     // Ensure we call all the submit handlers.
     $submit_handlers = [];
+    if (!empty($submit['#submit'])) {
+      $submit_handlers = array_merge($submit_handlers, $submit['#submit']);
+    }
     if (!empty($form['#submit'])) {
       $submit_handlers = array_merge($submit_handlers, $form['#submit']);
     }
-    if (!empty($form['actions']['submit']['#submit'])) {
-      $submit_handlers = array_merge($submit_handlers, $form['actions']['submit']['#submit']);
-    }
 
     // Try to redirect to the entity page after submitting the form.
     $submit_handlers[] = [$this, 'redirectToEntityPage'];
 
+    // Ensure we don't call the same submit callback several times.
+    $submit['#submit'] = array_unique($submit_handlers, \SORT_REGULAR);
+
     // Add the buttons.
     foreach ($this->getEntityFormSubmitButtons($status, $entity) as $status => $info) {
-      $form['actions'][$status] = array_merge_recursive([
-        '#type' => 'submit',
-        '#name' => $status,
-        '#submit' => $submit_handlers,
-        '#entity_status' => $status,
-        // Add validation callback to update the moderation status based on the
-        // clicked status button. This needs to be added as element_validate
-        // so that it runs before any other validation which may rely on the
-        // entity status.
-        '#element_validate' => [[$this, 'validateEntityStatus']],
-      ], $info);
+      $button = $submit;
+      $button['#name'] = $status;
+      $button['#entity_status'] = $status;
+      // Add validation callback to update the moderation status based on the
+      // clicked status button. This needs to be added as element_validate
+      // so that it runs before any other validation which may rely on the
+      // entity status.
+      $button['#element_validate'][] = [$this, 'validateEntityStatus'];
+
+      $form['actions'][$status] = array_merge_recursive($button, $info);
     }
   }
 

From 0b242d5bc67b9281cecb63be182b2f05bfeeeb9a Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 23 Feb 2022 05:03:14 +0000
Subject: [PATCH 516/720] [RW-320] Make linked images in forms open in a new
 window/tab to prevent quitting the form

---
 .../common_design_subtheme.theme              | 99 +++++++++++++++++++
 1 file changed, 99 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.theme b/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
index bf9f14f9d..ce093c7b7 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
@@ -7,6 +7,10 @@
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Render\Element;
+use Drupal\Core\Template\Attribute;
+use Drupal\Core\Url;
+use Drupal\media\MediaInterface;
 
 /**
  * Implements hook_preprocess_taxonomy_term().
@@ -180,3 +184,98 @@ function common_design_subtheme_theme(array $existing, $type, $theme, $path) {
 function common_design_subtheme_form_guideline_form_alter(&$form, FormStateInterface $form_state) {
   common_design_add_entity_edit_form_theme($form, $form_state);
 }
+
+/**
+ * Implements hook_preprocess_image_formatter().
+ *
+ * Force the linked images in a form to open in a new tab/window to prevent
+ * quitting the form.
+ *
+ * We cannot easily detect if we are in a form, so we rely on the image style
+ * to guess where this should apply.
+ */
+function common_design_subtheme_preprocess_image_formatter(array &$variables) {
+  if (isset($variables['image_style']) && $variables['image_style'] === 'media_library') {
+    $url = $variables['url'] ?? NULL;
+    if (isset($url) && $url instanceof Url) {
+      $attributes = $url->getOption('attributes') ?? [];
+      $attributes['target'] = '_blank';
+      $url->setOption('attributes', $attributes);
+    }
+  }
+}
+
+/**
+ * Implements hook_preprocess_image_widget().
+ *
+ * Force the linked images in a form to open in a new tab/window to prevent
+ * quitting the form.
+ *
+ * Another drupal nonsense prevents us from adding attributes to the link
+ * generated by the file_link template (they are added to the wrapper...).
+ * So we set the "target" attribute on the file_link element and in the
+ * preprocess_file_link we extract it and put on the link itself.
+ */
+function common_design_subtheme_preprocess_image_widget(array &$variables) {
+  foreach ($variables['data'] ?? [] as $key => $item) {
+    if (strpos($key, 'file_') === 0 && isset($item['filename']['#theme'])) {
+      if ($item['filename']['#theme'] === 'file_link') {
+        $variables['data'][$key]['filename']['#attributes']['target'] = '_blank';
+      }
+    }
+  }
+}
+
+/**
+ * Implements hook_preprocess_file_link().
+ *
+ * Force the linked images in a form to open in a new tab/window to prevent
+ * quitting the form.
+ */
+function common_design_subtheme_preprocess_file_link(array &$variables) {
+  // @see common_design_subtheme_preprocess_image_widget() above.
+  if (isset($variables['attributes']) && $variables['attributes'] instanceof Attribute) {
+    $target = $variables['attributes']->offsetGet('target');
+    $url = $variables['link']['#url'] ?? NULL;
+    if (!empty($target) && isset($url)) {
+      $attributes = $url->getOption('attributes') ?? [];
+      $attributes['target'] = '_blank';
+      $url->setOption('attributes', $attributes);
+    }
+    $variables['attributes']->offsetUnset('target');
+  }
+}
+
+/**
+ * Implements hook_preprocess_inline_entity_form_entity_table().
+ *
+ * Display a preview of the media in the inline entity form table and hide the
+ * row being edited.
+ */
+function common_design_subtheme_preprocess_inline_entity_form_entity_table(array &$variables) {
+  // Extract any media being displayed in the inline entity form.
+  $media_entities = [];
+  foreach (Element::children($variables['form']) as $key) {
+    $entity = $variables['form'][$key]['#entity'] ?? NULL;
+    if (isset($entity) && $entity instanceof MediaInterface) {
+      $media_entities[$key] = $entity;
+    }
+  }
+
+  if (!empty($media_entities)) {
+    $view_builder = \Drupal::entityTypeManager()->getViewBuilder('media');
+
+    foreach (Element::children($variables['table']) as $key) {
+      if (isset($media_entities[$key])) {
+        $display = $view_builder->view($media_entities[$key], 'media_library');
+        $display['#wrapper_attributes'] = $variables['table'][$key]['label']['#wrapper_attributes'] ?? [];
+        $variables['table'][$key]['label'] = $display;
+
+        // Hide rows being edited.
+        if (isset($variables['form'][$key]['form'])) {
+          $variables['table'][$key]['#attributes']['class'] = 'visually-hidden';
+        }
+      }
+    }
+  }
+}

From 20ac94e92bd78415fb368bc344c5e7910ac084aa Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 23 Feb 2022 05:05:35 +0000
Subject: [PATCH 517/720] [RW-326] Fix display of guidelines button to be
 properly added to the closted parent when label/legend is visually hidden

---
 .../components/rw-form/rw-form.css            |  6 +++++
 .../components/rw-guidelines/rw-guidelines.js | 23 +++++++++++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index f66deccb2..f27407b83 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -536,3 +536,9 @@ input[data-drupal-selector="edit-preview"]:focus {
 input[data-drupal-selector="edit-preview"]:focus {
   border: 2px solid var(--cd-black);
 }
+
+/* legends with the required class need some extra rules. */
+legend.form-required::after {
+  display: inline-block;
+  vertical-align: top;
+}
diff --git a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.js b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.js
index 44f0afece..95f8e50fb 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.js
+++ b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.js
@@ -140,7 +140,7 @@
             }
 
             // If the label is visually hidden, we need to find another one.
-            if (label && label.classList.contains('visually-hidden')) {
+            if (label && isLabelHidden(label)) {
               label = null;
 
               // Try to find a suitable label or legend among the field's
@@ -154,7 +154,7 @@
                 else if (parent.nodeName === 'FIELDSET') {
                   candidate = parent.querySelector('.fieldset-legend, legend');
                 }
-                if (candidate && !candidate.classList.contains('visually-hidden')) {
+                if (candidate && !isLabelHidden(candidate)) {
                   label = candidate;
                   break;
                 }
@@ -169,6 +169,19 @@
         }
       }
 
+      // Check if a label/legend element is visually hidden.
+      function isLabelHidden(label) {
+        if (label) {
+          if (label.classList.contains('visually-hidden')) {
+            return true;
+          }
+          else if (label.classList.contains('fieldset-legend')) {
+            return label.parentNode.classList.contains('visually-hidden');
+          }
+        }
+        return false;
+      }
+
       // Add the button to open the guideline popup next to a field's label.
       function addGuidelineOpenButton(fieldName, label, form, guideline) {
         var labelText = label.textContent.trim();
@@ -186,6 +199,12 @@
         // Wrap the legend into a span so we can have consistent behavior.
         if (label.nodeName === 'LEGEND') {
           var container = document.createElement('span');
+          // We also need to move the form-required class to the span so that
+          // the mark appears before the guidelines button.
+          if (label.classList.contains('form-required')) {
+            container.classList.add('form-required');
+            label.classList.remove('form-required');
+          }
           while (label.firstChild) {
             container.appendChild(label.firstChild);
           }

From 0b6bba42029ce7b913c5208282048f77a476b320 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 23 Feb 2022 05:06:38 +0000
Subject: [PATCH 518/720] [RW-320] Hide redundant banner image label in
 announcement form

---
 .../templates/form/node-edit-form--announcement.html.twig       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/templates/form/node-edit-form--announcement.html.twig b/html/themes/custom/common_design_subtheme/templates/form/node-edit-form--announcement.html.twig
index 0165d1ee3..ebf8c6c34 100644
--- a/html/themes/custom/common_design_subtheme/templates/form/node-edit-form--announcement.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/form/node-edit-form--announcement.html.twig
@@ -46,7 +46,7 @@
   {{ form.title }}
   {{ form.field_link }}
   {{ form.body }}
-  {{ form.field_image }}
+  {{ form.field_image|hide_nested_label(['widget', 0, 'inline_entity_form', 'field_media_image', 'widget', 0]) }}
 </fieldset>
 
 <fieldset id="actions">

From cb805a98b2d49e9a34ed9a0d2e475ac27c6def02 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 23 Feb 2022 05:07:03 +0000
Subject: [PATCH 519/720] [RW-284] Adjust styling of media widgets

---
 .../components/rw-form/rw-form--widget.css    | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
index b736160a9..943abd742 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
@@ -41,18 +41,79 @@ form .image-widget article > div {
   max-height: 200px;
 }
 
+/* Media library widget. */
 /* Prevent empty divs from taking up space */
 form .js-media-library-widget .js-media-library-selection.form-wrapper,
 .js-media-library-add-form .field--type-image {
   margin-top: 0;
 }
+form .js-media-library-item.image-widget {
+  padding: 0;
+}
+form .js-media-library-widget .field-suffix .button:not(.visually-hidden) {
+  margin-bottom: 1rem;
+}
+form .js-media-library-widget .field-suffix + .description {
+  margin-top: 0;
+}
 .js-media-library-add-form .image-widget {
   padding: 0;
 }
+.js-media-library-views-form table tbody td {
+  font-size: 16px;
+}
+.js-media-library-views-form table tbody td.views-field-changed {
+  word-break: keep-all;
+}
+.js-media-library-views-form table tbody td a {
+  color: var(--cd-reliefweb-brand-blue--dark);
+}
 
 form .views-field-media-library-select-form .form-type-checkbox:only-of-type {
   margin-right: 24px;
 }
+
+/* Media styling in media_library view mode. */
+form article.media-library-item__preview-wrapper {
+  display: flex;
+  flex-flow: row wrap;
+  align-items: center;
+}
+form .media-library-item__preview-wrapper .media-library-item__preview {
+  margin-right: 12px;
+}
+form .media-library-item__preview-wrapper .media-library-item__preview .image-style-thumbnail {
+  display: block;
+  max-width: none;
+}
+form .media-library-item__preview-wrapper .media-library-item__attributes {
+  flex: 1 1 0;
+  min-width: 120px;
+}
+form .media-library-item__preview-wrapper .media-library-item__name {
+  word-break: break-all;
+  font-size: 16px;
+}
+
+/* Inline enity form styling. */
+form .ief-entity-table .ief-entity-operations {
+  display: flex;
+  flex-direction: column;
+}
+form .ief-entity-table .ief-entity-operations .button.cd-button {
+  margin: 0;
+}
+form .ief-entity-table .ief-entity-operations .button + .button {
+  margin-top: 12px;
+}
+form .ief-entity-table .image-widget {
+  flex-wrap: nowrap;
+}
+form .ief-form .fieldset-wrapper {
+  padding: 12px;
+  border: 1px solid var(--cd-reliefweb-brand-grey--light);
+}
+
 /* Media UI buttons styled the same as other UI buttons */
 .ui-dialog .ui-dialog-buttonpane .cd-button,
 .view-media-library .cd-button,

From 376c1a5428fed3faafab69ec2e9733cd8129fee8 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 23 Feb 2022 05:07:59 +0000
Subject: [PATCH 520/720] [RW-320] Add template for media displayed with the
 media_library view mode

---
 .../media--media-library.html.twig            | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 html/themes/custom/common_design_subtheme/templates/media-library/media--media-library.html.twig

diff --git a/html/themes/custom/common_design_subtheme/templates/media-library/media--media-library.html.twig b/html/themes/custom/common_design_subtheme/templates/media-library/media--media-library.html.twig
new file mode 100644
index 000000000..c211e69d8
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/templates/media-library/media--media-library.html.twig
@@ -0,0 +1,49 @@
+{#
+/**
+ * @file
+ * Theme override to present a media entity in the media library.
+ *
+ * Available variables:
+ * - media: The entity with limited access to object properties and methods.
+ *   Only method names starting with "get", "has", or "is" and a few common
+ *   methods such as "id", "label", and "bundle" are available. For example:
+ *   - entity.getEntityTypeId() will return the entity type ID.
+ *   - entity.hasField('field_example') returns TRUE if the entity includes
+ *     field_example. (This does not indicate the presence of a value in this
+ *     field.)
+ *   Calling other methods, such as entity.delete(), will result in an exception.
+ *   See \Drupal\Core\Entity\EntityInterface for a full list of methods.
+ * - name: Name of the media.
+ * - content: Media content.
+ * - title_prefix: Additional output populated by modules, intended to be
+ *   displayed in front of the main title tag that appears in the template.
+ * - title_suffix: Additional output populated by modules, intended to be
+ *   displayed after the main title tag that appears in the template.
+ * - view_mode: View mode; for example, "teaser" or "full".
+ * - attributes: HTML attributes for the containing element.
+ * - title_attributes: Same as attributes, except applied to the main title
+ *   tag that appears in the template.
+ * - url: Direct URL of the media.
+ * - preview_attributes: HTML attributes for the preview wrapper.
+ * - metadata_attributes: HTML attributes for the expandable metadata area.
+ * - status: Whether or not the Media is published.
+ *
+ * @see template_preprocess_media()
+ * @see media_library_preprocess_media()
+ */
+#}
+<article{{ attributes.addClass('media-library-item__preview-wrapper') }}>
+  {% if content %}
+    <div{{ preview_attributes.addClass('media-library-item__preview js-media-library-item-preview') }}>
+      {{ content|without('name') }}
+    </div>
+    {% if not status %}
+      <div class="media-library-item__status">{{ "unpublished" | t }}</div>
+    {% endif %}
+    <div{{ metadata_attributes.addClass('media-library-item__attributes') }}>
+      <div class="media-library-item__name">
+        {{ content.name }}
+      </div>
+    </div>
+  {% endif %}
+</article>

From b851a14a5270ec9a03ffaa08c480964b4ed88c58 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 24 Feb 2022 02:47:54 +0000
Subject: [PATCH 521/720] [RW-173] Flag optional fields instead of required
 ones

---
 .../Field/FieldWidget/ReliefWebFile.php       |   3 +
 .../src/EntityFormAlterServiceBase.php        |   7 +-
 .../src/Services/JobFormAlter.php             |   6 +-
 .../src/Services/ReportFormAlter.php          |   5 -
 .../src/Services/TrainingFormAlter.php        |  13 +-
 .../custom/reliefweb_form/js/drupal.states.js |  82 ++++++----
 .../reliefweb_form/reliefweb_form.module      |  44 +++++-
 .../common_design_subtheme.theme              | 145 ++++++++++++++++++
 .../components/rw-form/rw-form.css            |   7 +-
 .../rw-guidelines/rw-guidelines.css           |   3 +
 10 files changed, 261 insertions(+), 54 deletions(-)

diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
index b5944cf56..57faf479b 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
@@ -382,6 +382,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
           range(1, $item->getPageCount())
         ),
         '#default_value' => $preview_page,
+        '#required' => TRUE,
         '#ajax' => $this->getAjaxSettings($this->t('Regenerating preview...'), $field_parents),
       ];
       $element['preview_rotation'] = [
@@ -393,6 +394,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
           -90 => $this->t('left'),
         ],
         '#default_value' => $preview_rotation,
+        '#required' => TRUE,
         '#ajax' => $this->getAjaxSettings($this->t('Regenerating preview...'), $field_parents),
       ];
 
@@ -419,6 +421,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
     $element['operations'] = [
       '#type' => 'details',
       '#title' => $this->t('Actions'),
+      '#not_required' => TRUE,
     ];
 
     // Add a button to delete the file.
diff --git a/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php b/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
index 9fd70149c..7d57b399b 100644
--- a/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
+++ b/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
@@ -390,7 +390,6 @@ protected function addPotentialNewSourceFields(array &$form, FormStateInterface
       '#type' => 'checkbox',
       '#title' => $this->t('I can NOT find my organization in the list above.'),
       '#wrapper_attributes' => ['class' => ['form-wrapper']],
-      '#optional' => FALSE,
       '#default_value' => !empty($new_source['name']) && $is_editor ? 1 : 0,
     ];
     $element['field_source_new'] = [
@@ -401,18 +400,19 @@ protected function addPotentialNewSourceFields(array &$form, FormStateInterface
         '#type' => 'textfield',
         '#title' => $this->t('Organization Name'),
         '#default_value' => $new_source['name'] ?? '',
-        '#optional' => FALSE,
       ],
       'url' => [
         '#type' => 'textfield',
         '#title' => $this->t('Homepage URL'),
         '#default_value' => $new_source['url'] ?? '',
-        '#optional' => FALSE,
       ],
       '#states' => [
         'visible' => [
           ':input[name="field_source_none"]' => ['checked' => TRUE],
         ],
+        'required' => [
+          ':input[name="field_source_none"]' => ['checked' => TRUE],
+        ],
       ],
       '#tree' => TRUE,
     ];
@@ -491,7 +491,6 @@ protected function addPotentialNewSourceFields(array &$form, FormStateInterface
             '#options' => $allowed,
             '#default_value' => $allowed_defaults,
             '#empty_value' => 'other',
-            '#optional' => FALSE,
             '#weight' => -1,
           ];
 
diff --git a/html/modules/custom/reliefweb_entities/src/Services/JobFormAlter.php b/html/modules/custom/reliefweb_entities/src/Services/JobFormAlter.php
index abbb3fbac..078420372 100644
--- a/html/modules/custom/reliefweb_entities/src/Services/JobFormAlter.php
+++ b/html/modules/custom/reliefweb_entities/src/Services/JobFormAlter.php
@@ -105,15 +105,11 @@ protected function alterJobLocationFields(array &$form, FormStateInterface $form
       '#wrapper_attributes' => ['class' => ['form-wrapper']],
     ];
 
-    // Make the country field non optional.
-    // @todo review.
-    $form['field_country']['widget']['#optional'] = FALSE;
-
     // Flag the country field as mandatory when "unspecified" is not checked.
     $condition = [
       ':input[name="unspecified_location"]' => ['checked' => FALSE],
     ];
-    $form['field_country']['widget']['#states']['required'] = $condition;
+    $form['field_country']['#states']['required'] = $condition;
 
     // Hide the country and city field when "unspecified" is selected.
     $condition = [
diff --git a/html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php b/html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php
index 62f70bc6e..48406d089 100644
--- a/html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php
+++ b/html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php
@@ -265,11 +265,6 @@ protected function alterOchaProductField(array &$form, FormStateInterface $form_
     // Remove the empty option.
     unset($widget['#options']['_none']);
 
-    // For the above to work we need the drupal states extension.
-    // @todo remove if the equivalent is added to core.
-    // @see https://www.drupal.org/project/drupal/issues/1149078
-    $form['#attached']['library'][] = 'reliefweb_form/drupal.states';
-
     // Add a validation callback to ensure that an OCHA product is selected
     // when OCHA is selected as source.
     $form['#validate'][] = [$this, 'validateOchaProductField'];
diff --git a/html/modules/custom/reliefweb_entities/src/Services/TrainingFormAlter.php b/html/modules/custom/reliefweb_entities/src/Services/TrainingFormAlter.php
index f637a5ea0..c18e71bb0 100644
--- a/html/modules/custom/reliefweb_entities/src/Services/TrainingFormAlter.php
+++ b/html/modules/custom/reliefweb_entities/src/Services/TrainingFormAlter.php
@@ -112,7 +112,7 @@ protected function alterTrainingLocationFields(array &$form, FormStateInterface
     $condition = [
       ':input[name="field_training_format[4606]"]' => ['checked' => TRUE],
     ];
-    $form['field_country']['widget']['#states']['required'] = $condition;
+    $form['field_country']['#states']['required'] = $condition;
 
     // Add a validation callback to add 'World' as country if 'online' is
     // selected and remove other countries and empty the city field if 'on-site'
@@ -185,16 +185,14 @@ protected function alterTrainingDateFields(array &$form, FormStateInterface $for
       '#attributes' => ['class' => ['form-wrapper']],
     ];
 
-    // Do not mark the date fields as optional.
-    $form['field_training_date']['widget']['#optional'] = FALSE;
-    $form['field_registration_deadline']['widget']['#optional'] = FALSE;
-
-    // Hide the date fields when ongoing is selected.
+    // Hide the date fields and mark them as optional when ongoing is selected.
     $condition = [
       ':input[name="ongoing"]' => ['value' => 'ongoing'],
     ];
     $form['field_registration_deadline']['#states']['invisible'] = $condition;
     $form['field_training_date']['#states']['invisible'] = $condition;
+    $form['field_registration_deadline']['#states']['optional'] = $condition;
+    $form['field_training_date']['#states']['optional'] = $condition;
 
     // Add a validation callback to empty the dates.
     $form['#validate'][] = [$this, 'validateTrainingDateFields'];
@@ -279,9 +277,6 @@ public function validateTrainingDateFields(array $form, FormStateInterface $form
    *   Form state.
    */
   protected function alterTrainingFeeInformationField(array &$form, FormStateInterface $form_state) {
-    // Make the fee information mandatory by default.
-    $form['field_fee_information']['widget'][0]['value']['#optional'] = FALSE;
-
     // Hide the fee information if 'free' is selected.
     $condition = [
       ':input[name="field_cost"]' => ['value' => 'fee-based'],
diff --git a/html/modules/custom/reliefweb_form/js/drupal.states.js b/html/modules/custom/reliefweb_form/js/drupal.states.js
index dac1bd406..dfd29306d 100644
--- a/html/modules/custom/reliefweb_form/js/drupal.states.js
+++ b/html/modules/custom/reliefweb_form/js/drupal.states.js
@@ -5,40 +5,64 @@
 
   'use strict';
 
-  // Remove if one day https://www.drupal.org/project/drupal/issues/1149078
-  // is added.
-  if (Drupal &&
-      Drupal.states &&
-      Drupal.states.Dependent &&
-      Drupal.states.Dependent.comparisons &&
-      !Drupal.states.Dependent.comparisons.Array) {
+  if (Drupal && Drupal.states) {
+    // Remove if one day https://www.drupal.org/project/drupal/issues/1149078
+    // is added.
+    if (Drupal.states.Dependent &&
+        Drupal.states.Dependent.comparisons &&
+        !Drupal.states.Dependent.comparisons.Array) {
 
-    // Allow the comparison of multiple selected values in a select element.
-    Drupal.states.Dependent.comparisons.Array = function (reference, value) {
-      if (!$.isArray(reference) || !$.isArray(value)) {
-        return false;
-      }
-      // Check if the selected values contain the reference values.
-      for (var i = 0, l = reference.length; i < l; i++) {
-        // We need to cast the reference value as a string because the values
-        // returned by jQuery's val() are strings. This way we can use a strict
-        // comparison.
-        var ref = reference[i].toString();
-        var ok = false;
-        // Check if the reference value is in the selected values.
-        for (var j = 0, m = value.length; j < m; j++) {
-          if (value[j] === ref) {
-            ok = true;
-            break;
+      // Allow the comparison of multiple selected values in a select element.
+      Drupal.states.Dependent.comparisons.Array = function (reference, value) {
+        if (!$.isArray(reference) || !$.isArray(value)) {
+          return false;
+        }
+        // Check if the selected values contain the reference values.
+        for (var i = 0, l = reference.length; i < l; i++) {
+          // We need to cast the reference value as a string because the values
+          // returned by jQuery's val() are strings. This way we can use a strict
+          // comparison.
+          var ref = reference[i].toString();
+          var ok = false;
+          // Check if the reference value is in the selected values.
+          for (var j = 0, m = value.length; j < m; j++) {
+            if (value[j] === ref) {
+              ok = true;
+              break;
+            }
+          }
+          // Exit early if the reference value is not in the selection.
+          if (ok === false) {
+            return false;
           }
         }
-        // Exit early if the reference value is not in the selection.
-        if (ok === false) {
-          return false;
+        return true;
+      };
+    }
+
+    // Extend the behavior for the required state to remove any optional marker.
+    $(document).on('state:required', function (event) {
+      if (event.trigger) {
+        if (!event.value) {
+          // Add the optional mark if not already there.
+          $(event.target).find('[data-optional]').each(function () {
+            var $label = $(this);
+            if (!$label.find('.form-optional').length) {
+              $label.append('<span class="form-optional">' + $label.attr('data-optional') + '</span>');
+            }
+          });
+        }
+        else {
+          // Store the text of the optional marker to preseve the translated
+          // string so that it can be re-used if the marker is added back.
+          $(event.target).find('.form-optional').each(function () {
+            var $element = $(this);
+            $element.parent().attr('data-optional', $element.text());
+            $element.remove();
+          });
         }
       }
-      return true;
-    };
+    });
   }
 
 })(jQuery, Drupal);
diff --git a/html/modules/custom/reliefweb_form/reliefweb_form.module b/html/modules/custom/reliefweb_form/reliefweb_form.module
index 44158695f..149b7c20f 100644
--- a/html/modules/custom/reliefweb_form/reliefweb_form.module
+++ b/html/modules/custom/reliefweb_form/reliefweb_form.module
@@ -29,6 +29,10 @@ function reliefweb_form_element_info_alter(array &$info) {
   $info['checkboxes']['#process'][] = 'reliefweb_form_checkboxes_element_process';
   $info['radios']['#process'][] = 'reliefweb_form_radios_element_process';
   $info['date']['#process'][] = 'reliefweb_form_date_element_process';
+
+  foreach ($info as $key => $item) {
+    $info[$key]['#process'][] = 'reliefweb_form_mark_optional';
+  }
 }
 
 /**
@@ -108,6 +112,33 @@ function reliefweb_form_date_element_process(array $element, FormStateInterface
   return $element;
 }
 
+/**
+ * Mark non required elements as optional.
+ *
+ * @param array $element
+ *   The form element.
+ * @param \Drupal\Core\Form\FormStateInterface $form_state
+ *   The form interface.
+ * @param array $form
+ *   The complete form.
+ *
+ * @return array
+ *   The modified form element.
+ */
+function reliefweb_form_mark_optional(array $element, FormStateInterface $form_state, array $form) {
+  $context = [
+    'form_state' => $form_state,
+    'form' => $form,
+  ];
+  // Let the active theme handle marking the element as optional to ensure
+  // it's conistent with the way the theme handles the styling of the
+  // required elements.
+  if (reliefweb_form_enhancements_enabled($form)) {
+    \Drupal::service('theme.manager')->alter('reliefweb_form_mark_optional', $element, $context);
+  }
+  return $element;
+}
+
 /**
  * Implements hook_theme_suggestions_HOOK_alter() for `select`.
  *
@@ -144,7 +175,7 @@ function reliefweb_form_preprocess_select(&$variables) {
  */
 function reliefweb_form_form_alter(array &$form, FormStateInterface $form_state, $form_id) {
   // Enhance the form.
-  if (isset($form['#attributes']['data-enhanced']) && \Drupal::currentUser()->hasPermission('use enhanced input forms')) {
+  if (reliefweb_form_enhancements_enabled($form)) {
     // Attach the widget libraries if there are fields using them.
     reliefweb_form_attach_autocomplete($form);
     reliefweb_form_attach_datepicker($form);
@@ -155,11 +186,22 @@ function reliefweb_form_form_alter(array &$form, FormStateInterface $form_state,
     // Attach the guidelines.
     reliefweb_form_attach_guidelines($form);
 
+    // Attach the drupal states extensions.
+    $form['#attached']['library'][] = 'reliefweb_form/drupal.states';
+
     // Attach the main enhanced form library.
     $form['#attached']['library'][] = 'reliefweb_form/form.main';
   }
 }
 
+/**
+ * Check if we should use the form enhancements.
+ */
+function reliefweb_form_enhancements_enabled(array $form) {
+  return isset($form['#attributes']['data-enhanced']) &&
+    \Drupal::currentUser()->hasPermission('use enhanced input forms');
+}
+
 /**
  * Attach the autocomplete js scripts to the given form.
  *
diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.theme b/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
index ce093c7b7..e2ff5716a 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
@@ -5,6 +5,8 @@
  * Preprocess functions for the Common Design subtheme.
  */
 
+use Drupal\Component\Render\FormattableMarkup;
+use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Element;
@@ -279,3 +281,146 @@ function common_design_subtheme_preprocess_inline_entity_form_entity_table(array
     }
   }
 }
+
+/**
+ * Implements hook_reliefweb_form_mark_optional_alter().
+ *
+ * Mark form elements as optional.
+ *
+ * Note: we cannot use '#optional' as it has a different meaning in Drupal 9 so
+ * we use '#not_required' to flag optional elements.
+ */
+function common_design_subtheme_reliefweb_form_mark_optional_alter(array &$element, array &$context) {
+  $types_to_skip = [
+    'button',
+    'hidden',
+    'link',
+    'submit',
+    'text_format',
+    'token',
+    'vertical_tabs',
+    'weight',
+  ];
+
+  $container_types = [
+    'container',
+    'details',
+    'fieldset',
+    'checkboxes',
+    'radios',
+  ];
+
+  // Skip if the field is not of a type we want to mark as optional.
+  if (!isset($element['#type']) || in_array($element['#type'], $types_to_skip)) {
+    return;
+  }
+
+  // Skip if the field is required.
+  if (!empty($element['#required']) || !empty($elment['widget']['#required'])) {
+    return;
+  }
+
+  // Skipped if already processed.
+  if (isset($element['#not_required'])) {
+    return;
+  }
+
+  // Process container elements.
+  if (in_array($element['#type'], $container_types)) {
+    common_design_subtheme_mark_children_as_optional($element);
+  }
+  // Process other elements.
+  else {
+    // Flag the element as optional.
+    $element['#not_required'] = TRUE;
+
+    $form = $context['form'];
+    $type = $element['#type'];
+
+    // Special handling of checkbox and radio elements. We need to check if
+    // they are part of a group of checkboxes or radios in which case we'll
+    // mark the grouping element as optional when processed by
+    // common_design_subtheme_mark_children_as_optional().
+    if ($type === 'checkbox' || $type === 'radio') {
+      if (isset($element['#array_parents'])) {
+        $parents = array_slice($element['#array_parents'], 0, -1);
+
+        while (!empty($parents)) {
+          $parent = NestedArray::getValue($form, $parents);
+
+          switch ($parent['#type'] ?? NULL) {
+            case 'checkboxes':
+            case 'radios':
+              return;
+          }
+
+          array_pop($parents);
+        }
+      }
+    }
+
+    if (isset($element['#title'])) {
+      $element['#title'] = common_design_subtheme_add_optional_mark_to_title($element['#title']);
+    }
+  }
+}
+
+/**
+ * Mark an element and its children as optional.
+ *
+ * @param mixed $element
+ *   Form element.
+ */
+function common_design_subtheme_mark_children_as_optional(&$element) {
+  $types_to_skip = [
+    // Grouped checkboxes and radios.
+    'checkbox',
+    'radio',
+    // Same list as common_design_subtheme_reliefweb_form_mark_optional_alter().
+    'button',
+    'hidden',
+    'link',
+    'submit',
+    'text_format',
+    'token',
+    'vertical_tabs',
+    'weight',
+  ];
+
+  // Skip if the element is invalid or already processed or required.
+  if (!is_array($element) || isset($element['#not_required']) || !empty($element['#required'])) {
+    return;
+  }
+
+  // Skip if the field is not of a type we want to mark as optional.
+  if (isset($element['#type']) && in_array($element['#type'], $types_to_skip)) {
+    return;
+  }
+
+  $element['#not_required'] = TRUE;
+  if (!empty($element['#title'])) {
+    $element['#title'] = common_design_subtheme_add_optional_mark_to_title($element['#title']);
+  }
+  if (!empty($element['#field_title'])) {
+    $element['#field_title'] = common_design_subtheme_add_optional_mark_to_title($element['#field_title']);
+  }
+
+  foreach (Element::children($element) as $key) {
+    common_design_subtheme_mark_children_as_optional($element[$key]);
+  }
+}
+
+/**
+ * Add the optional mark to a form element title.
+ *
+ * @param string|\Drupal\Component\Render\MarkupInterface $title
+ *   Form element title.
+ *
+ * @return \Drupal\Component\Render\MarkupInterface
+ *   Title with "optional" appended.
+ */
+function common_design_subtheme_add_optional_mark_to_title($title) {
+  return new FormattableMarkup('@title <span class="form-optional"> - optional</span>', [
+    '@title' => $title,
+  ]);
+}
diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index f27407b83..8b32b7aee 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -223,11 +223,16 @@ form .description ul {
   margin: 0;
   padding: 0 0 0 16px;
 }
-form .form-optional {
+/* "Enhanced" forms flags optional fields instead of required fields. */
+form[data-enhanced] .form-optional {
+  font-family: sans-serif;
   font-size: 16px;
   font-weight: 300;
   font-style: italic;
 }
+form[data-enhanced] .form-required::after {
+  content: none;
+}
 form .form-disabled [data-irrelevant]:after {
   display: block;
   clear: both;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
index 7123d2af2..e07b33f16 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-guidelines/rw-guidelines.css
@@ -2,6 +2,9 @@ form[data-with-guidelines] .rw-guideline__label {
   display: inline-flex;
   margin-right: 12px;
 }
+form[data-with-guidelines] .rw-guideline__label .form-optional {
+  white-space: pre;
+}
 form[data-with-guidelines] .rw-guideline__label.form-required {
   margin-right: 8px;
 }

From 76580fd241033ca5d104e4880c869d5986a6fb65 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 24 Feb 2022 06:33:33 +0000
Subject: [PATCH 522/720] [CD-356] Ensure datetime wrapper title is hidden when
 title_display is invisible

---
 .../common_design_subtheme.theme                    | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.theme b/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
index e2ff5716a..465df02b8 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
@@ -282,6 +282,19 @@ function common_design_subtheme_preprocess_inline_entity_form_entity_table(array
   }
 }
 
+/**
+ * Implements hook_preprocess_datetime_wrapper().
+ *
+ * Ensure the title is not displayed when instructed to be hidden.
+ *
+ * @todo remove when https://humanitarian.atlassian.net/browse/CD-356 is merged.
+ */
+function common_design_subtheme_preprocess_datetime_wrapper(&$variables) {
+  if (isset($variables['element']['#title_display']) && $variables['element']['#title_display'] === 'invisible') {
+    $variables['title_attributes']['class'][] = 'visually-hidden';
+  }
+}
+
 /**
  * Implements hook_reliefweb_form_mark_optional_alter().
  *

From b422f5d4f10cc3adfb610e836dd280185be6309c Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 24 Feb 2022 06:34:24 +0000
Subject: [PATCH 523/720] [Rw-399] Prevent issue with file widget

---
 .../Field/FieldWidget/ReliefWebFile.php       | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
index 57faf479b..cde7e45e7 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
@@ -1050,15 +1050,20 @@ public static function rebuildWidgetForm(array &$form, FormStateInterface &$form
     $field_name = array_pop($parents);
     $field_state = static::getWidgetState($parents, $field_name, $form_state);
 
-    // The array parents are populaed in the WidgetBase::afterBuild().
-    $widget = NestedArray::getValue($form, $field_state['array_parents']);
-
-    // Create the response and ensure the widget attachments will be loaded.
     $response = new AjaxResponse();
-    $response->setAttachments($widget['#attached'] ?? []);
 
-    // This will replace the widget with the new one in the form.
-    return $response->addCommand(new ReplaceCommand(NULL, $widget));
+    if (!empty($field_state['array_parents'])) {
+      // The array parents are populated in the WidgetBase::afterBuild().
+      $widget = NestedArray::getValue($form, $field_state['array_parents']);
+
+      // Create the response and ensure the widget attachments will be loaded.
+      $response->setAttachments($widget['#attached'] ?? []);
+
+      // This will replace the widget with the new one in the form.
+      $response->addCommand(new ReplaceCommand(NULL, $widget));
+    }
+
+    return $response;
   }
 
   /**

From fc18f1fbfd8c907c3a84840aac88108ef5e75618 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 24 Feb 2022 06:38:23 +0000
Subject: [PATCH 524/720] [RW-400] Fix incompatibility between media_libary and
 inline_entity_form

---
 .../reliefweb_entities.module                 | 53 ++++++++++++++++++-
 .../media--media-library.html.twig            |  7 ++-
 2 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/html/modules/custom/reliefweb_entities/reliefweb_entities.module b/html/modules/custom/reliefweb_entities/reliefweb_entities.module
index 21788b5f2..89b0d8d02 100644
--- a/html/modules/custom/reliefweb_entities/reliefweb_entities.module
+++ b/html/modules/custom/reliefweb_entities/reliefweb_entities.module
@@ -384,7 +384,7 @@ function reliefweb_entities_form_alter(array &$form, FormStateInterface $form_st
 /**
  * Implements hook_module_implements_alter().
  */
-function reliefweb_entities_module_implements_alter(&$implementation, $hook) {
+function reliefweb_entities_module_implements_alter(array &$implementation, $hook) {
   // Remove the hook_entity_presave() implementation from the
   // taxonomy_term_revision module because it doesn't allow us to speify the
   // revision user or timestamp. This is replaced by
@@ -397,6 +397,57 @@ function reliefweb_entities_module_implements_alter(&$implementation, $hook) {
   }
 }
 
+/**
+ * Implements hook_theme_registry_alter().
+ */
+function reliefweb_entities_theme_registry_alter(array &$theme_registry) {
+  // Remove the hook_preprocess_media() implementation from the media_library
+  // because it's not compatible with the inline entity form as it tries to
+  // create a link to the media while it may not yet have an ID (temporary
+  // media entity when creating a new content). This is replaced by
+  // reliefweb_entities_preprocess_media().
+  //
+  // @see media_library_preprocess_media()
+  // @see reliefweb_entities_preprocess_media()
+  foreach ($theme_registry as $theme => $info) {
+    if (isset($info['preprocess functions'])) {
+      foreach ($info['preprocess functions'] as $key => $value) {
+        if ($value === 'media_library_preprocess_media') {
+          unset($theme_registry[$theme]['preprocess functions'][$key]);
+        }
+      }
+    }
+  }
+}
+
+/**
+ * Implements hook_preprocess_media().
+ *
+ * Replacement of media_library_preprocess_media() that is compatible with
+ * inline_entity_form which can create temporary media which don't yet have
+ * an ID and so cannot have a URL.
+ *
+ * @see media_library_preprocess_media()
+ */
+function reliefweb_entities_preprocess_media(array &$variables) {
+  if ($variables['view_mode'] === 'media_library') {
+    /** @var \Drupal\media\MediaInterface $media */
+    $media = $variables['media'];
+    $variables['#cache']['contexts'][] = 'user.permissions';
+    if ($media->id() !== NULL) {
+      $rel = $media->access('edit') ? 'edit-form' : 'canonical';
+      $variables['url'] = $media->toUrl($rel, [
+        'language' => $media->language(),
+      ]);
+    }
+    $variables += [
+      'preview_attributes' => new Attribute(),
+      'metadata_attributes' => new Attribute(),
+    ];
+    $variables['status'] = $media->isPublished();
+  }
+}
+
 /**
  * Implements hook_entity_presave().
  */
diff --git a/html/themes/custom/common_design_subtheme/templates/media-library/media--media-library.html.twig b/html/themes/custom/common_design_subtheme/templates/media-library/media--media-library.html.twig
index c211e69d8..252ea64b6 100644
--- a/html/themes/custom/common_design_subtheme/templates/media-library/media--media-library.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/media-library/media--media-library.html.twig
@@ -32,17 +32,16 @@
  * @see media_library_preprocess_media()
  */
 #}
+{% set preview_attributes = preview_attributes ? create_attribute() %}
+{% set metadata_attributes = metadata_attributes ? create_attribute() %}
 <article{{ attributes.addClass('media-library-item__preview-wrapper') }}>
   {% if content %}
     <div{{ preview_attributes.addClass('media-library-item__preview js-media-library-item-preview') }}>
       {{ content|without('name') }}
     </div>
-    {% if not status %}
-      <div class="media-library-item__status">{{ "unpublished" | t }}</div>
-    {% endif %}
     <div{{ metadata_attributes.addClass('media-library-item__attributes') }}>
       <div class="media-library-item__name">
-        {{ content.name }}
+        {{ name }}
       </div>
     </div>
   {% endif %}

From a732cefd33a5f71f9b5aefa33b76631af9a19561 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 24 Feb 2022 06:39:24 +0000
Subject: [PATCH 525/720] [RW-398] Fix field placholders for community topics
 form

---
 .../js/reliefweb_topics_community_topics.admin.js           | 6 +-----
 .../reliefweb_topics/src/Form/CommunityTopicsForm.php       | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/html/modules/custom/reliefweb_topics/js/reliefweb_topics_community_topics.admin.js b/html/modules/custom/reliefweb_topics/js/reliefweb_topics_community_topics.admin.js
index d17130d09..2905eee95 100644
--- a/html/modules/custom/reliefweb_topics/js/reliefweb_topics_community_topics.admin.js
+++ b/html/modules/custom/reliefweb_topics/js/reliefweb_topics_community_topics.admin.js
@@ -75,11 +75,7 @@
        * Create a input/textarea form compoment for the given property.
        */
       function createLinkFormComponent(name, value, textarea) {
-        var placeholders = {
-          url: t('River URL'),
-          title: t('Link title (mandatory)'),
-          override: t('Node Id to promote to beginning of list')
-        };
+        var placeholders = topicsSettings.placeholders || {};
 
         var element;
 
diff --git a/html/modules/custom/reliefweb_topics/src/Form/CommunityTopicsForm.php b/html/modules/custom/reliefweb_topics/src/Form/CommunityTopicsForm.php
index e3365051c..a62c410a1 100644
--- a/html/modules/custom/reliefweb_topics/src/Form/CommunityTopicsForm.php
+++ b/html/modules/custom/reliefweb_topics/src/Form/CommunityTopicsForm.php
@@ -66,7 +66,7 @@ public function buildForm(array $form, FormStateInterface $form_state, AccountIn
       'placeholders' => [
         'url' => $this->t('External URL (must start with http or https)'),
         'title' => $this->t('Link title'),
-        'description' => $this->t('Description'),
+        'description' => $this->t('Short description of topic page (optional)'),
       ],
       'links' => $links,
       'settings' => [],

From eaa83f65f60122dad63695b60e8a8d115a2ea33b Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 24 Feb 2022 06:41:43 +0000
Subject: [PATCH 526/720] [RW-401] Ensure drupal messages displayed in forms
 via ajax are properly styled

---
 .../common_design_subtheme.libraries.yml                     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
index 02019b4d2..11d330b71 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
@@ -132,6 +132,11 @@ rw-form:
     theme:
       components/rw-form/rw-form.css: {}
       components/rw-form/rw-form--widget.css: {}
+  # Some widgets like the inline entity forms show drupal messages added via
+  # javascript in which case the cd-alert component may not be loaded so we
+  # add it as a dependency of the rw-form library which is added globally.
+  dependencies:
+    - common_design/cd-alert
 
 rw-guidelines:
   css:

From 2b41481fbb0672d853007d612a121598a977333e Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 24 Feb 2022 06:45:49 +0000
Subject: [PATCH 527/720] [RW-231] Hide redundant field titles

---
 .../reliefweb_entities/src/Services/TopicFormAlter.php      | 1 +
 .../templates/form/node-edit-form--job.html.twig            | 2 +-
 .../templates/form/node-edit-form--training.html.twig       | 6 +++---
 .../form/taxonomy-term-edit-form--country.html.twig         | 4 ++--
 .../form/taxonomy-term-edit-form--disaster.html.twig        | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/html/modules/custom/reliefweb_entities/src/Services/TopicFormAlter.php b/html/modules/custom/reliefweb_entities/src/Services/TopicFormAlter.php
index 20b49f864..a97242ae9 100644
--- a/html/modules/custom/reliefweb_entities/src/Services/TopicFormAlter.php
+++ b/html/modules/custom/reliefweb_entities/src/Services/TopicFormAlter.php
@@ -66,6 +66,7 @@ protected static function getDisasterMapTokenHelp() {
           'rw-token-help',
         ],
       ],
+      '#not_required' => TRUE,
       'table' => $table,
     ];
   }
diff --git a/html/themes/custom/common_design_subtheme/templates/form/node-edit-form--job.html.twig b/html/themes/custom/common_design_subtheme/templates/form/node-edit-form--job.html.twig
index 98421ac01..4c456815c 100644
--- a/html/themes/custom/common_design_subtheme/templates/form/node-edit-form--job.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/form/node-edit-form--job.html.twig
@@ -85,7 +85,7 @@
 
 <fieldset id="organization">
   <legend>{% trans %}Organization{% endtrans %}</legend>
-  {{ form.field_source }}
+  {{ form.field_source|hide_nested_label(['field_source_new']) }}
 </fieldset>
 
 <fieldset id="location">
diff --git a/html/themes/custom/common_design_subtheme/templates/form/node-edit-form--training.html.twig b/html/themes/custom/common_design_subtheme/templates/form/node-edit-form--training.html.twig
index 07d2b330b..ed53a8c23 100644
--- a/html/themes/custom/common_design_subtheme/templates/form/node-edit-form--training.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/form/node-edit-form--training.html.twig
@@ -87,12 +87,12 @@
 
 <fieldset id="organization">
   <legend>{% trans %}Organization{% endtrans %}</legend>
-  {{ form.field_source }}
+  {{ form.field_source|hide_nested_label(['field_source_new']) }}
 </fieldset>
 
 <fieldset id="location">
   <legend>{% trans %}Location{% endtrans %}</legend>
-  {{ form.field_training_format }}
+  {{ form.field_training_format|hide_nested_label(['widget']) }}
   {{ form.field_country }}
   {{ form.field_city }}
 </fieldset>
@@ -106,7 +106,7 @@
 
 <fieldset id="event-url">
   <legend>{% trans %}Event URL{% endtrans %}</legend>
-  {{ form.field_link }}
+  {{ form.field_link|hide_nested_label(['widget', 0, 'uri']) }}
 </fieldset>
 
 <fieldset id="fee">
diff --git a/html/themes/custom/common_design_subtheme/templates/form/taxonomy-term-edit-form--country.html.twig b/html/themes/custom/common_design_subtheme/templates/form/taxonomy-term-edit-form--country.html.twig
index 2b59f528c..fd6f4f126 100644
--- a/html/themes/custom/common_design_subtheme/templates/form/taxonomy-term-edit-form--country.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/form/taxonomy-term-edit-form--country.html.twig
@@ -45,7 +45,7 @@
 {# Form content. #}
 <fieldset id="description">
   <legend>{% trans %}Description{% endtrans %}</legend>
-  {{ form.name }}
+  {{ form.name|hide_nested_label(['widget', 0]) }}
   {{ form.field_shortname }}
   {{ form.field_longname }}
   {{ form.field_aliases }}
@@ -55,7 +55,7 @@
 <fieldset id="details" class="details">
   <legend>{% trans %}Details{% endtrans %}</legend>
   {{ form.field_iso3 }}
-  {{ form.field_location }}
+  {{ form.field_location|hide_nested_label(['widget', 0, 'value']) }}
 </fieldset>
 
 <fieldset id="editorial-flags">
diff --git a/html/themes/custom/common_design_subtheme/templates/form/taxonomy-term-edit-form--disaster.html.twig b/html/themes/custom/common_design_subtheme/templates/form/taxonomy-term-edit-form--disaster.html.twig
index d9500c212..749625eb1 100644
--- a/html/themes/custom/common_design_subtheme/templates/form/taxonomy-term-edit-form--disaster.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/form/taxonomy-term-edit-form--disaster.html.twig
@@ -49,7 +49,7 @@
 {# Form content. #}
 <fieldset id="name">
   <legend>{% trans %}Name{% endtrans %}</legend>
-  {{ form.name }}
+  {{ form.name|hide_nested_label(['widget', 0, 'value']) }}
 </fieldset>
 
 <fieldset id="countries">
@@ -66,7 +66,7 @@
 
 <fieldset id="date">
   <legend>{% trans %}Event date{% endtrans %}</legend>
-  {{ form.field_disaster_date }}
+  {{ form.field_disaster_date|hide_nested_label(['widget', 0, 'value']) }}
 </fieldset>
 
 <fieldset id="profile">

From 214bf7e2e6e6b5b6d610ebab2d29db76bcd1b66d Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 24 Feb 2022 06:46:47 +0000
Subject: [PATCH 528/720] [RW-320] Fix styling of temporary media added via
 inline entity form

---
 .../components/rw-form/rw-form--widget.css                | 8 ++++----
 .../common_design_subtheme/components/rw-form/rw-form.css | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
index 943abd742..a08ab0659 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
@@ -82,9 +82,8 @@ form article.media-library-item__preview-wrapper {
 form .media-library-item__preview-wrapper .media-library-item__preview {
   margin-right: 12px;
 }
-form .media-library-item__preview-wrapper .media-library-item__preview .image-style-thumbnail {
-  display: block;
-  max-width: none;
+form .media-library-item__preview-wrapper .media-library-item__preview img {
+  display: flex;
 }
 form .media-library-item__preview-wrapper .media-library-item__attributes {
   flex: 1 1 0;
@@ -106,7 +105,8 @@ form .ief-entity-table .ief-entity-operations .button.cd-button {
 form .ief-entity-table .ief-entity-operations .button + .button {
   margin-top: 12px;
 }
-form .ief-entity-table .image-widget {
+form .ief-entity-table .image-widget,
+form .ief-form .image-widget {
   flex-wrap: nowrap;
 }
 form .ief-form .fieldset-wrapper {
diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 8b32b7aee..619805d50 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -422,7 +422,7 @@ form #edit-organization #edit-field-source-allowed .form-item:last-child {
 /* Term form Disable Notifications checkbox is inside #actions fieldset */
 form > #actions legend + .form-type-checkbox.form-item-notifications-content-disable,
 .form-item-notifications-content-disable + .form-actions {
-  margin: 0;
+  margin: 8px 0 0 0;
 }
 
 /* Text format wrapper */

From f099a2626632e92b04dadc066d31ffd168926e4f Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 24 Feb 2022 08:24:37 +0000
Subject: [PATCH 529/720] [RW-402] Update drupal core and modules

---
 composer.json |    1 +
 composer.lock | 1108 ++++++++++++++++++++++++++++++-------------------
 symfony.lock  |   21 +
 3 files changed, 694 insertions(+), 436 deletions(-)

diff --git a/composer.json b/composer.json
index 3bb9c8d31..32fc7040d 100644
--- a/composer.json
+++ b/composer.json
@@ -124,6 +124,7 @@
         "allow-plugins": {
             "composer/installers": true,
             "cweagans/composer-patches": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true,
             "drupal-composer/preserve-paths": true,
             "drupal/core-composer-scaffold": true,
             "drupal/core-project-message": true,
diff --git a/composer.lock b/composer.lock
index 64096ab75..76e92841c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -323,21 +323,22 @@
         },
         {
             "name": "composer/composer",
-            "version": "2.1.14",
+            "version": "2.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/composer.git",
-                "reference": "cd28fc05b0c9d3beaf58b57018725c4dc15a6446"
+                "reference": "ce785a18c0fb472421e52d958bab339247cb0e82"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/cd28fc05b0c9d3beaf58b57018725c4dc15a6446",
-                "reference": "cd28fc05b0c9d3beaf58b57018725c4dc15a6446",
+                "url": "https://api.github.com/repos/composer/composer/zipball/ce785a18c0fb472421e52d958bab339247cb0e82",
+                "reference": "ce785a18c0fb472421e52d958bab339247cb0e82",
                 "shasum": ""
             },
             "require": {
                 "composer/ca-bundle": "^1.0",
                 "composer/metadata-minifier": "^1.0",
+                "composer/pcre": "^1.0",
                 "composer/semver": "^3.0",
                 "composer/spdx-licenses": "^1.2",
                 "composer/xdebug-handler": "^2.0",
@@ -367,7 +368,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.1-dev"
+                    "dev-main": "2.2-dev"
                 }
             },
             "autoload": {
@@ -401,7 +402,7 @@
             "support": {
                 "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/composer/issues",
-                "source": "https://github.com/composer/composer/tree/2.1.14"
+                "source": "https://github.com/composer/composer/tree/2.2.6"
             },
             "funding": [
                 {
@@ -417,7 +418,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-30T09:51:43+00:00"
+            "time": "2022-02-04T16:00:38+00:00"
         },
         {
             "name": "composer/installers",
@@ -641,23 +642,23 @@
         },
         {
             "name": "composer/pcre",
-            "version": "1.0.0",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/pcre.git",
-                "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2"
+                "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/pcre/zipball/3d322d715c43a1ac36c7fe215fa59336265500f2",
-                "reference": "3d322d715c43a1ac36c7fe215fa59336265500f2",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/67a32d7d6f9f560b726ab25a061b38ff3a80c560",
+                "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3.2 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^1",
+                "phpstan/phpstan": "^1.3",
                 "phpstan/phpstan-strict-rules": "^1.1",
                 "symfony/phpunit-bridge": "^4.2 || ^5"
             },
@@ -692,7 +693,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/pcre/issues",
-                "source": "https://github.com/composer/pcre/tree/1.0.0"
+                "source": "https://github.com/composer/pcre/tree/1.0.1"
             },
             "funding": [
                 {
@@ -708,7 +709,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-06T15:17:27+00:00"
+            "time": "2022-01-21T20:24:37+00:00"
         },
         {
             "name": "composer/semver",
@@ -873,16 +874,16 @@
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "2.0.3",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "6555461e76962fd0379c444c46fd558a0fcfb65e"
+                "reference": "0c1a3925ec58a4ec98e992b9c7d171e9e184be0a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6555461e76962fd0379c444c46fd558a0fcfb65e",
-                "reference": "6555461e76962fd0379c444c46fd558a0fcfb65e",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/0c1a3925ec58a4ec98e992b9c7d171e9e184be0a",
+                "reference": "0c1a3925ec58a4ec98e992b9c7d171e9e184be0a",
                 "shasum": ""
             },
             "require": {
@@ -919,7 +920,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/2.0.3"
+                "source": "https://github.com/composer/xdebug-handler/tree/2.0.4"
             },
             "funding": [
                 {
@@ -935,31 +936,32 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-08T13:07:32+00:00"
+            "time": "2022-01-04T17:06:45+00:00"
         },
         {
             "name": "consolidation/annotated-command",
-            "version": "4.4.0",
+            "version": "4.5.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/annotated-command.git",
-                "reference": "308f6ac178566a1ce9aa90ed908dac90a2c1e707"
+                "reference": "24c1529436b4f4beec3d19aab71fd127817f47ef"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/308f6ac178566a1ce9aa90ed908dac90a2c1e707",
-                "reference": "308f6ac178566a1ce9aa90ed908dac90a2c1e707",
+                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/24c1529436b4f4beec3d19aab71fd127817f47ef",
+                "reference": "24c1529436b4f4beec3d19aab71fd127817f47ef",
                 "shasum": ""
             },
             "require": {
                 "consolidation/output-formatters": "^4.1.1",
                 "php": ">=7.1.3",
                 "psr/log": "^1|^2",
-                "symfony/console": "^4.4.8|~5.1.0",
-                "symfony/event-dispatcher": "^4.4.8|^5",
-                "symfony/finder": "^4.4.8|^5"
+                "symfony/console": "^4.4.8|^5|^6",
+                "symfony/event-dispatcher": "^4.4.8|^5|^6",
+                "symfony/finder": "^4.4.8|^5|^6"
             },
             "require-dev": {
+                "composer-runtime-api": "^2.0",
                 "phpunit/phpunit": "^7.5.20 || ^8 || ^9",
                 "squizlabs/php_codesniffer": "^3",
                 "yoast/phpunit-polyfills": "^0.2.0"
@@ -988,9 +990,9 @@
             "description": "Initialize Symfony Console commands from annotated command class methods.",
             "support": {
                 "issues": "https://github.com/consolidation/annotated-command/issues",
-                "source": "https://github.com/consolidation/annotated-command/tree/4.4.0"
+                "source": "https://github.com/consolidation/annotated-command/tree/4.5.2"
             },
-            "time": "2021-09-30T01:08:15+00:00"
+            "time": "2022-02-20T16:36:18+00:00"
         },
         {
             "name": "consolidation/config",
@@ -1149,22 +1151,22 @@
         },
         {
             "name": "consolidation/log",
-            "version": "2.0.2",
+            "version": "2.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/log.git",
-                "reference": "82a2aaaa621a7b976e50a745a8d249d5085ee2b1"
+                "reference": "3ad08dc57e8aff9400111bad36beb0ed387fe6a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/log/zipball/82a2aaaa621a7b976e50a745a8d249d5085ee2b1",
-                "reference": "82a2aaaa621a7b976e50a745a8d249d5085ee2b1",
+                "url": "https://api.github.com/repos/consolidation/log/zipball/3ad08dc57e8aff9400111bad36beb0ed387fe6a9",
+                "reference": "3ad08dc57e8aff9400111bad36beb0ed387fe6a9",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1.3",
-                "psr/log": "^1.0",
-                "symfony/console": "^4|^5"
+                "psr/log": "^1 || ^2",
+                "symfony/console": "^4 || ^5 || ^6"
             },
             "require-dev": {
                 "phpunit/phpunit": ">=7.5.20",
@@ -1195,36 +1197,36 @@
             "description": "Improved Psr-3 / Psr\\Log logger based on Symfony Console components.",
             "support": {
                 "issues": "https://github.com/consolidation/log/issues",
-                "source": "https://github.com/consolidation/log/tree/2.0.2"
+                "source": "https://github.com/consolidation/log/tree/2.1.1"
             },
-            "time": "2020-12-10T16:26:23+00:00"
+            "time": "2022-02-24T04:27:32+00:00"
         },
         {
             "name": "consolidation/output-formatters",
-            "version": "4.1.2",
+            "version": "4.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/output-formatters.git",
-                "reference": "5821e6ae076bf690058a4de6c94dce97398a69c9"
+                "reference": "d57992bf81ead908ee21cd94b46ed65afa2e785b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/5821e6ae076bf690058a4de6c94dce97398a69c9",
-                "reference": "5821e6ae076bf690058a4de6c94dce97398a69c9",
+                "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/d57992bf81ead908ee21cd94b46ed65afa2e785b",
+                "reference": "d57992bf81ead908ee21cd94b46ed65afa2e785b",
                 "shasum": ""
             },
             "require": {
-                "dflydev/dot-access-data": "^1.1.0",
+                "dflydev/dot-access-data": "^1.1.0 || ^2 || ^3",
                 "php": ">=7.1.3",
-                "symfony/console": "^4|^5",
-                "symfony/finder": "^4|^5"
+                "symfony/console": "^4|^5|^6",
+                "symfony/finder": "^4|^5|^6"
             },
             "require-dev": {
                 "php-coveralls/php-coveralls": "^2.4.2",
                 "phpunit/phpunit": ">=7",
                 "squizlabs/php_codesniffer": "^3",
-                "symfony/var-dumper": "^4",
-                "symfony/yaml": "^4",
+                "symfony/var-dumper": "^4|^5|^6",
+                "symfony/yaml": "^4|^5|^6",
                 "yoast/phpunit-polyfills": "^0.2.0"
             },
             "suggest": {
@@ -1254,38 +1256,38 @@
             "description": "Format text by applying transformations provided by plug-in formatters.",
             "support": {
                 "issues": "https://github.com/consolidation/output-formatters/issues",
-                "source": "https://github.com/consolidation/output-formatters/tree/4.1.2"
+                "source": "https://github.com/consolidation/output-formatters/tree/4.2.2"
             },
-            "time": "2020-12-12T19:04:59+00:00"
+            "time": "2022-02-13T15:28:30+00:00"
         },
         {
             "name": "consolidation/robo",
-            "version": "3.0.6",
+            "version": "3.0.10",
             "source": {
                 "type": "git",
-                "url": "https://github.com/consolidation/Robo.git",
-                "reference": "36dce2965a67abe5cf91f2bc36d2582a64a11258"
+                "url": "https://github.com/consolidation/robo.git",
+                "reference": "206bbe23b34081a36bfefc4de2abbc1abcd29ef4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/Robo/zipball/36dce2965a67abe5cf91f2bc36d2582a64a11258",
-                "reference": "36dce2965a67abe5cf91f2bc36d2582a64a11258",
+                "url": "https://api.github.com/repos/consolidation/robo/zipball/206bbe23b34081a36bfefc4de2abbc1abcd29ef4",
+                "reference": "206bbe23b34081a36bfefc4de2abbc1abcd29ef4",
                 "shasum": ""
             },
             "require": {
                 "consolidation/annotated-command": "^4.3",
-                "consolidation/config": "^1.2.1|^2.0.1",
-                "consolidation/log": "^1.1.1|^2.0.2",
+                "consolidation/config": "^1.2.1 || ^2.0.1",
+                "consolidation/log": "^1.1.1 || ^2.0.2",
                 "consolidation/output-formatters": "^4.1.2",
                 "consolidation/self-update": "^2.0",
-                "league/container": "^3.3.1",
+                "league/container": "^3.3.1 || ^4.0",
                 "php": ">=7.1.3",
-                "symfony/console": "^4.4.19 || ^5",
-                "symfony/event-dispatcher": "^4.4.19 || ^5",
-                "symfony/filesystem": "^4.4.9 || ^5",
-                "symfony/finder": "^4.4.9 || ^5",
-                "symfony/process": "^4.4.9 || ^5",
-                "symfony/yaml": "^4.4 || ^5"
+                "symfony/console": "^4.4.19 || ^5 || ^6",
+                "symfony/event-dispatcher": "^4.4.19 || ^5 || ^6",
+                "symfony/filesystem": "^4.4.9 || ^5 || ^6",
+                "symfony/finder": "^4.4.9 || ^5 || ^6",
+                "symfony/process": "^4.4.9 || ^5 || ^6",
+                "symfony/yaml": "^4.4 || ^5 || ^6"
             },
             "conflict": {
                 "codegyre/robo": "*"
@@ -1294,7 +1296,7 @@
                 "natxet/cssmin": "3.0.4",
                 "patchwork/jsqueeze": "^2",
                 "pear/archive_tar": "^1.4.4",
-                "phpunit/phpunit": "^7.5.20 | ^8",
+                "phpunit/phpunit": "^7.5.20 || ^8",
                 "squizlabs/php_codesniffer": "^3.6",
                 "yoast/phpunit-polyfills": "^0.2.0"
             },
@@ -1352,30 +1354,30 @@
             ],
             "description": "Modern task runner",
             "support": {
-                "issues": "https://github.com/consolidation/Robo/issues",
-                "source": "https://github.com/consolidation/Robo/tree/3.0.6"
+                "issues": "https://github.com/consolidation/robo/issues",
+                "source": "https://github.com/consolidation/robo/tree/3.0.10"
             },
-            "time": "2021-10-05T23:56:45+00:00"
+            "time": "2022-02-21T17:19:14+00:00"
         },
         {
             "name": "consolidation/self-update",
-            "version": "2.0.1",
+            "version": "2.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/self-update.git",
-                "reference": "7b9223bdfc1b23ab93489b580382accb6f0411b6"
+                "reference": "8a64bdd8daf5faa8e85f56534dd99caf928164b3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/self-update/zipball/7b9223bdfc1b23ab93489b580382accb6f0411b6",
-                "reference": "7b9223bdfc1b23ab93489b580382accb6f0411b6",
+                "url": "https://api.github.com/repos/consolidation/self-update/zipball/8a64bdd8daf5faa8e85f56534dd99caf928164b3",
+                "reference": "8a64bdd8daf5faa8e85f56534dd99caf928164b3",
                 "shasum": ""
             },
             "require": {
                 "composer/semver": "^3.2",
                 "php": ">=5.5.0",
-                "symfony/console": "^2.8|^3|^4|^5",
-                "symfony/filesystem": "^2.5|^3|^4|^5"
+                "symfony/console": "^2.8 || ^3 || ^4 || ^5 || ^6",
+                "symfony/filesystem": "^2.5 || ^3 || ^4 || ^5 || ^6"
             },
             "bin": [
                 "scripts/release"
@@ -1408,28 +1410,28 @@
             "description": "Provides a self:update command for Symfony Console applications.",
             "support": {
                 "issues": "https://github.com/consolidation/self-update/issues",
-                "source": "https://github.com/consolidation/self-update/tree/2.0.1"
+                "source": "https://github.com/consolidation/self-update/tree/2.0.5"
             },
-            "time": "2021-12-03T23:57:36+00:00"
+            "time": "2022-02-09T22:44:24+00:00"
         },
         {
             "name": "consolidation/site-alias",
-            "version": "3.1.1",
+            "version": "3.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/site-alias.git",
-                "reference": "e824b57253d9174f4a500f87e6d0e1e497c2a50a"
+                "reference": "ef2eb7d37e59b3d837b4556d4d8070cb345b378c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/site-alias/zipball/e824b57253d9174f4a500f87e6d0e1e497c2a50a",
-                "reference": "e824b57253d9174f4a500f87e6d0e1e497c2a50a",
+                "url": "https://api.github.com/repos/consolidation/site-alias/zipball/ef2eb7d37e59b3d837b4556d4d8070cb345b378c",
+                "reference": "ef2eb7d37e59b3d837b4556d4d8070cb345b378c",
                 "shasum": ""
             },
             "require": {
-                "consolidation/config": "^1.2.1|^2",
+                "consolidation/config": "^1.2.1 || ^2",
                 "php": ">=5.5.0",
-                "symfony/finder": "~2.3|^3|^4.4|^5"
+                "symfony/finder": "~2.3 || ^3 || ^4.4 || ^5 || ^6"
             },
             "require-dev": {
                 "php-coveralls/php-coveralls": "^2.4.2",
@@ -1466,22 +1468,22 @@
             "description": "Manage alias records for local and remote sites.",
             "support": {
                 "issues": "https://github.com/consolidation/site-alias/issues",
-                "source": "https://github.com/consolidation/site-alias/tree/3.1.1"
+                "source": "https://github.com/consolidation/site-alias/tree/3.1.5"
             },
-            "time": "2021-09-21T00:30:48+00:00"
+            "time": "2022-02-23T23:59:18+00:00"
         },
         {
             "name": "consolidation/site-process",
-            "version": "4.1.0",
+            "version": "4.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/site-process.git",
-                "reference": "ef57711d7049f7606ce936ded16ad93f1ad7f02c"
+                "reference": "9ef08d471573d6a56405b06ef6830dd70c883072"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/site-process/zipball/ef57711d7049f7606ce936ded16ad93f1ad7f02c",
-                "reference": "ef57711d7049f7606ce936ded16ad93f1ad7f02c",
+                "url": "https://api.github.com/repos/consolidation/site-process/zipball/9ef08d471573d6a56405b06ef6830dd70c883072",
+                "reference": "9ef08d471573d6a56405b06ef6830dd70c883072",
                 "shasum": ""
             },
             "require": {
@@ -1489,7 +1491,7 @@
                 "consolidation/site-alias": "^3",
                 "php": ">=7.1.3",
                 "symfony/console": "^2.8.52|^3|^4.4|^5",
-                "symfony/process": "^4.3.4"
+                "symfony/process": "^4.3.4|^5"
             },
             "require-dev": {
                 "phpunit/phpunit": "^7.5.20|^8.5.14",
@@ -1524,22 +1526,22 @@
             "description": "A thin wrapper around the Symfony Process Component that allows applications to use the Site Alias library to specify the target for a remote call.",
             "support": {
                 "issues": "https://github.com/consolidation/site-process/issues",
-                "source": "https://github.com/consolidation/site-process/tree/4.1.0"
+                "source": "https://github.com/consolidation/site-process/tree/4.2.0"
             },
-            "time": "2021-02-21T02:53:33+00:00"
+            "time": "2022-02-19T04:09:55+00:00"
         },
         {
             "name": "cweagans/composer-patches",
-            "version": "1.7.1",
+            "version": "1.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cweagans/composer-patches.git",
-                "reference": "9888dcc74993c030b75f3dd548bb5e20cdbd740c"
+                "reference": "e9969cfc0796e6dea9b4e52f77f18e1065212871"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/9888dcc74993c030b75f3dd548bb5e20cdbd740c",
-                "reference": "9888dcc74993c030b75f3dd548bb5e20cdbd740c",
+                "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/e9969cfc0796e6dea9b4e52f77f18e1065212871",
+                "reference": "e9969cfc0796e6dea9b4e52f77f18e1065212871",
                 "shasum": ""
             },
             "require": {
@@ -1572,9 +1574,9 @@
             "description": "Provides a way to patch Composer packages.",
             "support": {
                 "issues": "https://github.com/cweagans/composer-patches/issues",
-                "source": "https://github.com/cweagans/composer-patches/tree/1.7.1"
+                "source": "https://github.com/cweagans/composer-patches/tree/1.7.2"
             },
-            "time": "2021-06-08T15:12:46+00:00"
+            "time": "2022-01-25T19:21:20+00:00"
         },
         {
             "name": "d4h/finediff",
@@ -1637,6 +1639,81 @@
             },
             "time": "2020-08-05T20:41:25+00:00"
         },
+        {
+            "name": "dealerdirect/phpcodesniffer-composer-installer",
+            "version": "v0.7.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer.git",
+                "reference": "1c968e542d8843d7cd71de3c5c9c3ff3ad71a1db"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/1c968e542d8843d7cd71de3c5c9c3ff3ad71a1db",
+                "reference": "1c968e542d8843d7cd71de3c5c9c3ff3ad71a1db",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.0 || ^2.0",
+                "php": ">=5.3",
+                "squizlabs/php_codesniffer": "^2.0 || ^3.1.0 || ^4.0"
+            },
+            "require-dev": {
+                "composer/composer": "*",
+                "php-parallel-lint/php-parallel-lint": "^1.3.1",
+                "phpcompatibility/php-compatibility": "^9.0"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin"
+            },
+            "autoload": {
+                "psr-4": {
+                    "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Franck Nijhof",
+                    "email": "franck.nijhof@dealerdirect.com",
+                    "homepage": "http://www.frenck.nl",
+                    "role": "Developer / IT Manager"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer/graphs/contributors"
+                }
+            ],
+            "description": "PHP_CodeSniffer Standards Composer Installer Plugin",
+            "homepage": "http://www.dealerdirect.com",
+            "keywords": [
+                "PHPCodeSniffer",
+                "PHP_CodeSniffer",
+                "code quality",
+                "codesniffer",
+                "composer",
+                "installer",
+                "phpcbf",
+                "phpcs",
+                "plugin",
+                "qa",
+                "quality",
+                "standard",
+                "standards",
+                "style guide",
+                "stylecheck",
+                "tests"
+            ],
+            "support": {
+                "issues": "https://github.com/dealerdirect/phpcodesniffer-composer-installer/issues",
+                "source": "https://github.com/dealerdirect/phpcodesniffer-composer-installer"
+            },
+            "time": "2022-02-04T12:51:07+00:00"
+        },
         {
             "name": "dflydev/dot-access-data",
             "version": "v1.1.0",
@@ -2108,26 +2185,26 @@
         },
         {
             "name": "drupal/allowed_formats",
-            "version": "1.3.0",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/allowed_formats.git",
-                "reference": "8.x-1.3"
+                "reference": "8.x-1.4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/allowed_formats-8.x-1.3.zip",
-                "reference": "8.x-1.3",
-                "shasum": "4c3c036d7b41428d6e22b61f1219de0ab012feec"
+                "url": "https://ftp.drupal.org/files/projects/allowed_formats-8.x-1.4.zip",
+                "reference": "8.x-1.4",
+                "shasum": "6c73fd69781e8a7c3ebc394ce74f981b6da50eae"
             },
             "require": {
-                "drupal/core": "^8.7.7 || ^9"
+                "drupal/core": "^8.8 || ^9"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.3",
-                    "datestamp": "1592909219",
+                    "version": "8.x-1.4",
+                    "datestamp": "1643490593",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -2140,38 +2217,53 @@
             ],
             "authors": [
                 {
-                    "name": "floretan",
-                    "homepage": "https://www.drupal.org/user/66163"
+                    "name": "Northern Commerce (formerly Digital Echidna)",
+                    "homepage": "https://www.drupal.org/northern-commerce-formerly-digital-echidna",
+                    "role": "Supporting organization"
+                },
+                {
+                    "name": "Jordan Thompson (nord102)",
+                    "homepage": "https://www.drupal.org/u/nord102",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "Wunder",
+                    "homepage": "https://www.drupal.org/wunder",
+                    "role": "Supporting organization"
                 },
                 {
-                    "name": "nord102",
-                    "homepage": "https://www.drupal.org/user/3471419"
+                    "name": "Florian Loretan (floretan)",
+                    "homepage": "https://www.drupal.org/u/floretan",
+                    "role": "Maintainer"
                 }
             ],
             "description": "Limit which text formats are available for each field instance.",
             "homepage": "https://www.drupal.org/project/allowed_formats",
             "support": {
-                "source": "https://git.drupalcode.org/project/allowed_formats"
+                "source": "http://cgit.drupalcode.org/allowed_formats",
+                "issues": "https://www.drupal.org/project/issues/allowed_formats"
             }
         },
         {
             "name": "drupal/coder",
-            "version": "8.3.13",
+            "version": "8.3.14",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/coder.git",
-                "reference": "d3286d571b19633cc296d438c36b9aed195de43c"
+                "reference": "adb06efa79ba8b91afed2f351014a6b94192622f"
             },
             "require": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
                 "ext-mbstring": "*",
-                "php": ">=7.0.8",
+                "php": ">=7.1",
                 "sirbrillig/phpcs-variable-analysis": "^2.10",
-                "squizlabs/php_codesniffer": "^3.5.6",
+                "slevomat/coding-standard": "^7.0",
+                "squizlabs/php_codesniffer": "^3.6.0",
                 "symfony/yaml": ">=2.0.5"
             },
             "require-dev": {
-                "phpstan/phpstan": "^0.12.63",
-                "phpunit/phpunit": "^6.0 || ^7.0"
+                "phpstan/phpstan": "^1.2.0",
+                "phpunit/phpunit": "^6.0 || ^7.0 || ^8.0"
             },
             "type": "phpcodesniffer-standard",
             "autoload": {
@@ -2195,7 +2287,7 @@
                 "issues": "https://www.drupal.org/project/issues/coder",
                 "source": "https://www.drupal.org/project/coder"
             },
-            "time": "2021-02-06T10:44:32+00:00"
+            "time": "2022-01-28T09:33:01+00:00"
         },
         {
             "name": "drupal/components",
@@ -2371,16 +2463,16 @@
         },
         {
             "name": "drupal/core",
-            "version": "9.3.0",
+            "version": "9.3.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core.git",
-                "reference": "1e1bf0e841e11029b21775dd125332d7ffd6fb47"
+                "reference": "2c0c89a0f49fab56f8322721888cdfa28fe98c3a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core/zipball/1e1bf0e841e11029b21775dd125332d7ffd6fb47",
-                "reference": "1e1bf0e841e11029b21775dd125332d7ffd6fb47",
+                "url": "https://api.github.com/repos/drupal/core/zipball/2c0c89a0f49fab56f8322721888cdfa28fe98c3a",
+                "reference": "2c0c89a0f49fab56f8322721888cdfa28fe98c3a",
                 "shasum": ""
             },
             "require": {
@@ -2578,10 +2670,14 @@
                 }
             },
             "autoload": {
+                "files": [
+                    "includes/bootstrap.inc",
+                    "includes/guzzle_php81_shim.php"
+                ],
                 "psr-4": {
                     "Drupal\\Core\\": "lib/Drupal/Core",
-                    "Drupal\\Component\\": "lib/Drupal/Component",
-                    "Drupal\\Driver\\": "../drivers/lib/Drupal/Driver"
+                    "Drupal\\Driver\\": "../drivers/lib/Drupal/Driver",
+                    "Drupal\\Component\\": "lib/Drupal/Component"
                 },
                 "classmap": [
                     "lib/Drupal.php",
@@ -2610,10 +2706,6 @@
                     "lib/Drupal/Core/Http/InputBag.php",
                     "lib/Drupal/Core/Installer/InstallerRedirectTrait.php",
                     "lib/Drupal/Core/Site/Settings.php"
-                ],
-                "files": [
-                    "includes/bootstrap.inc",
-                    "includes/guzzle_php81_shim.php"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -2622,13 +2714,13 @@
             ],
             "description": "Drupal is an open source content management platform powering millions of websites and applications.",
             "support": {
-                "source": "https://github.com/drupal/core/tree/9.3.0"
+                "source": "https://github.com/drupal/core/tree/9.3.6"
             },
-            "time": "2021-12-08T22:09:38+00:00"
+            "time": "2022-02-15T20:26:28+00:00"
         },
         {
             "name": "drupal/core-composer-scaffold",
-            "version": "9.3.0",
+            "version": "9.3.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-composer-scaffold.git",
@@ -2672,13 +2764,13 @@
                 "drupal"
             ],
             "support": {
-                "source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.0"
+                "source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.6"
             },
             "time": "2021-11-19T09:52:23+00:00"
         },
         {
             "name": "drupal/core-dev",
-            "version": "9.3.0",
+            "version": "9.3.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-dev.git",
@@ -2722,22 +2814,22 @@
             ],
             "description": "require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.",
             "support": {
-                "source": "https://github.com/drupal/core-dev/tree/9.3.0"
+                "source": "https://github.com/drupal/core-dev/tree/9.3.6"
             },
             "time": "2021-11-30T05:41:29+00:00"
         },
         {
             "name": "drupal/core-recommended",
-            "version": "9.3.0",
+            "version": "9.3.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-recommended.git",
-                "reference": "d65aaa36a8cab54332787a20676f81928f675bb3"
+                "reference": "1b24d3f87b55510f85d8495a63e141e601e32a88"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core-recommended/zipball/d65aaa36a8cab54332787a20676f81928f675bb3",
-                "reference": "d65aaa36a8cab54332787a20676f81928f675bb3",
+                "url": "https://api.github.com/repos/drupal/core-recommended/zipball/1b24d3f87b55510f85d8495a63e141e601e32a88",
+                "reference": "1b24d3f87b55510f85d8495a63e141e601e32a88",
                 "shasum": ""
             },
             "require": {
@@ -2746,7 +2838,7 @@
                 "doctrine/annotations": "1.13.2",
                 "doctrine/lexer": "1.2.1",
                 "doctrine/reflection": "1.2.2",
-                "drupal/core": "9.3.0",
+                "drupal/core": "9.3.6",
                 "egulias/email-validator": "3.1.2",
                 "guzzlehttp/guzzle": "6.5.5",
                 "guzzlehttp/promises": "1.5.1",
@@ -2795,7 +2887,7 @@
                 "symfony/validator": "v4.4.35",
                 "symfony/var-dumper": "v5.4.0",
                 "symfony/yaml": "v4.4.34",
-                "twig/twig": "v2.14.7",
+                "twig/twig": "v2.14.11",
                 "typo3/phar-stream-wrapper": "v3.1.7"
             },
             "conflict": {
@@ -2808,9 +2900,9 @@
             ],
             "description": "Locked core dependencies; require this project INSTEAD OF drupal/core.",
             "support": {
-                "source": "https://github.com/drupal/core-recommended/tree/9.3.0"
+                "source": "https://github.com/drupal/core-recommended/tree/9.3.6"
             },
-            "time": "2021-12-08T22:09:38+00:00"
+            "time": "2022-02-15T20:26:28+00:00"
         },
         {
             "name": "drupal/ctools",
@@ -2907,17 +2999,17 @@
         },
         {
             "name": "drupal/geofield",
-            "version": "1.35.0",
+            "version": "1.36.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/geofield.git",
-                "reference": "8.x-1.35"
+                "reference": "8.x-1.36"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/geofield-8.x-1.35.zip",
-                "reference": "8.x-1.35",
-                "shasum": "9565fb799451f3cbad243979f9d2372e3456fe27"
+                "url": "https://ftp.drupal.org/files/projects/geofield-8.x-1.36.zip",
+                "reference": "8.x-1.36",
+                "shasum": "4aa5f6b6f60f33506a7044f11d7ed68bd4e75009"
             },
             "require": {
                 "drupal/core": "^8.8 || ^9",
@@ -2926,8 +3018,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.35",
-                    "datestamp": "1637015166",
+                    "version": "8.x-1.36",
+                    "datestamp": "1641134825",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -3367,21 +3459,22 @@
         },
         {
             "name": "drupal/metatag",
-            "version": "1.16.0",
+            "version": "1.19.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/metatag.git",
-                "reference": "8.x-1.16"
+                "reference": "8.x-1.19"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/metatag-8.x-1.16.zip",
-                "reference": "8.x-1.16",
-                "shasum": "1c0028f4ff4583dc6601035657dd631c351b290c"
+                "url": "https://ftp.drupal.org/files/projects/metatag-8.x-1.19.zip",
+                "reference": "8.x-1.19",
+                "shasum": "d70f59c034e971885ed4969a11bb392f6ab447ee"
             },
             "require": {
-                "drupal/core": "^8 || ^9",
-                "drupal/token": "^1.0"
+                "drupal/core": "^9",
+                "drupal/token": "^1.0",
+                "php": ">=7.0"
             },
             "require-dev": {
                 "drupal/devel": "^4.0",
@@ -3389,13 +3482,14 @@
                 "drupal/metatag_open_graph": "*",
                 "drupal/page_manager": "4.x-dev",
                 "drupal/panelizer": "4.x-dev",
-                "drupal/redirect": "1.x-dev"
+                "drupal/redirect": "1.x-dev",
+                "mpyw/phpunit-patch-serializable-comparison": "*"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.16",
-                    "datestamp": "1615820867",
+                    "version": "8.x-1.19",
+                    "datestamp": "1641496014",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -3431,25 +3525,25 @@
         },
         {
             "name": "drupal/migrate_plus",
-            "version": "5.1.0",
+            "version": "5.2.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/migrate_plus.git",
-                "reference": "8.x-5.1"
+                "reference": "8.x-5.2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/migrate_plus-8.x-5.1.zip",
-                "reference": "8.x-5.1",
-                "shasum": "1257427ab0c64459c3c1e42bb2a98d3114b77163"
+                "url": "https://ftp.drupal.org/files/projects/migrate_plus-8.x-5.2.zip",
+                "reference": "8.x-5.2",
+                "shasum": "03ae34c362ccfacc4ae95b58469b25522e0ffb68"
             },
             "require": {
-                "drupal/core": "^8.8 || ^9",
-                "php": ">=7.1"
+                "drupal/core": "^9.1"
             },
             "require-dev": {
                 "drupal/migrate_example_advanced_setup": "*",
-                "drupal/migrate_example_setup": "*"
+                "drupal/migrate_example_setup": "*",
+                "drush/drush": "^10"
             },
             "suggest": {
                 "ext-soap": "*",
@@ -3458,12 +3552,17 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-5.1",
-                    "datestamp": "1588261060",
+                    "version": "8.x-5.2",
+                    "datestamp": "1641478565",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
                     }
+                },
+                "drush": {
+                    "services": {
+                        "drush.services.yml": "^9 || ^10"
+                    }
                 }
             },
             "notification-url": "https://packages.drupal.org/8/downloads",
@@ -3480,6 +3579,10 @@
                     "name": "Lucas Hedding",
                     "homepage": "https://www.drupal.org/u/heddn",
                     "role": "Maintainer"
+                },
+                {
+                    "name": "mikeryan",
+                    "homepage": "https://www.drupal.org/user/4420"
                 }
             ],
             "description": "Enhancements to core migration support.",
@@ -3492,11 +3595,17 @@
         },
         {
             "name": "drupal/migrate_tools",
-            "version": "dev-5.x",
+            "version": "5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/migrate_tools.git",
-                "reference": "60bc0c01f1468cd58f7dec1dee6f6170cd5244e8"
+                "reference": "8.x-5.1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/migrate_tools-8.x-5.1.zip",
+                "reference": "8.x-5.1",
+                "shasum": "2c1a9d35d318a0e1de30a99fbf64bedd4e65cee1"
             },
             "require": {
                 "drupal/core": "^9.1",
@@ -3512,15 +3621,12 @@
             },
             "type": "drupal-module",
             "extra": {
-                "branch-alias": {
-                    "dev-5.x": "5.x-dev"
-                },
                 "drupal": {
-                    "version": "8.x-5.0+27-dev",
-                    "datestamp": "1640377675",
+                    "version": "8.x-5.1",
+                    "datestamp": "1640378500",
                     "security-coverage": {
-                        "status": "not-covered",
-                        "message": "Dev releases are not covered by Drupal security advisories."
+                        "status": "covered",
+                        "message": "Covered by Drupal's security advisory policy"
                     }
                 },
                 "drush": {
@@ -3619,17 +3725,17 @@
         },
         {
             "name": "drupal/pathauto",
-            "version": "1.8.0",
+            "version": "1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/pathauto.git",
-                "reference": "8.x-1.8"
+                "reference": "8.x-1.9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/pathauto-8.x-1.8.zip",
-                "reference": "8.x-1.8",
-                "shasum": "ede3216abb9c4f77709338d9147334c595046329"
+                "url": "https://ftp.drupal.org/files/projects/pathauto-8.x-1.9.zip",
+                "reference": "8.x-1.9",
+                "shasum": "f075ebff595c9b8b62333d65ad29020330e0ea9d"
             },
             "require": {
                 "drupal/core": "^8.8 || ^9",
@@ -3642,8 +3748,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.8",
-                    "datestamp": "1588103046",
+                    "version": "8.x-1.9",
+                    "datestamp": "1644822949",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -4587,30 +4693,30 @@
         },
         {
             "name": "enlightn/security-checker",
-            "version": "v1.9.0",
+            "version": "v1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/enlightn/security-checker.git",
-                "reference": "dc5bce653fa4d9c792e9dcffa728c0642847c1e1"
+                "reference": "196bacc76e7a72a63d0e1220926dbb190272db97"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/enlightn/security-checker/zipball/dc5bce653fa4d9c792e9dcffa728c0642847c1e1",
-                "reference": "dc5bce653fa4d9c792e9dcffa728c0642847c1e1",
+                "url": "https://api.github.com/repos/enlightn/security-checker/zipball/196bacc76e7a72a63d0e1220926dbb190272db97",
+                "reference": "196bacc76e7a72a63d0e1220926dbb190272db97",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "guzzlehttp/guzzle": "^6.3|^7.0",
                 "php": ">=5.6",
-                "symfony/console": "^3.4|^4|^5",
-                "symfony/finder": "^3|^4|^5",
-                "symfony/process": "^3.4|^4|^5",
-                "symfony/yaml": "^3.4|^4|^5"
+                "symfony/console": "^3.4|^4|^5|^6",
+                "symfony/finder": "^3|^4|^5|^6",
+                "symfony/process": "^3.4|^4|^5|^6",
+                "symfony/yaml": "^3.4|^4|^5|^6"
             },
             "require-dev": {
                 "ext-zip": "*",
-                "friendsofphp/php-cs-fixer": "^2.18",
+                "friendsofphp/php-cs-fixer": "^2.18|^3.0",
                 "phpunit/phpunit": "^5.5|^6|^7|^8|^9"
             },
             "bin": [
@@ -4647,22 +4753,22 @@
             ],
             "support": {
                 "issues": "https://github.com/enlightn/security-checker/issues",
-                "source": "https://github.com/enlightn/security-checker/tree/v1.9.0"
+                "source": "https://github.com/enlightn/security-checker/tree/v1.10.0"
             },
-            "time": "2021-05-06T09:03:35+00:00"
+            "time": "2022-02-21T22:40:16+00:00"
         },
         {
             "name": "enshrined/svg-sanitize",
-            "version": "0.15.2",
+            "version": "0.15.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/darylldoyle/svg-sanitizer.git",
-                "reference": "454682a67b335bb918952b93c4e699a36012c568"
+                "reference": "e50b83a2f1f296ca61394fe88fbfe3e896a84cf4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/darylldoyle/svg-sanitizer/zipball/454682a67b335bb918952b93c4e699a36012c568",
-                "reference": "454682a67b335bb918952b93c4e699a36012c568",
+                "url": "https://api.github.com/repos/darylldoyle/svg-sanitizer/zipball/e50b83a2f1f296ca61394fe88fbfe3e896a84cf4",
+                "reference": "e50b83a2f1f296ca61394fe88fbfe3e896a84cf4",
                 "shasum": ""
             },
             "require": {
@@ -4692,9 +4798,9 @@
             "description": "An SVG sanitizer for PHP",
             "support": {
                 "issues": "https://github.com/darylldoyle/svg-sanitizer/issues",
-                "source": "https://github.com/darylldoyle/svg-sanitizer/tree/0.15.2"
+                "source": "https://github.com/darylldoyle/svg-sanitizer/tree/0.15.4"
             },
-            "time": "2022-02-14T00:53:22+00:00"
+            "time": "2022-02-21T09:13:59+00:00"
         },
         {
             "name": "friends-of-behat/mink-browserkit-driver",
@@ -4897,12 +5003,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\": "src/"
-                },
                 "files": [
                     "src/functions_include.php"
-                ]
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -4959,12 +5065,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Promise\\": "src/"
-                },
                 "files": [
                     "src/functions_include.php"
-                ]
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\Promise\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -5052,12 +5158,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Psr7\\": "src/"
-                },
                 "files": [
                     "src/functions_include.php"
-                ]
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\Psr7\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -5558,16 +5664,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "1.6.6",
+            "version": "1.6.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "c4228d11e30d7493c6836d20872f9582d8ba6dcf"
+                "reference": "2b8185c13bc9578367a5bf901881d1c1b5bbd09b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/c4228d11e30d7493c6836d20872f9582d8ba6dcf",
-                "reference": "c4228d11e30d7493c6836d20872f9582d8ba6dcf",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/2b8185c13bc9578367a5bf901881d1c1b5bbd09b",
+                "reference": "2b8185c13bc9578367a5bf901881d1c1b5bbd09b",
                 "shasum": ""
             },
             "require": {
@@ -5630,10 +5736,6 @@
                 "source": "https://github.com/thephpleague/commonmark"
             },
             "funding": [
-                {
-                    "url": "https://enjoy.gitstore.app/repositories/thephpleague/commonmark",
-                    "type": "custom"
-                },
                 {
                     "url": "https://www.colinodell.com/sponsor",
                     "type": "custom"
@@ -5646,16 +5748,12 @@
                     "url": "https://github.com/colinodell",
                     "type": "github"
                 },
-                {
-                    "url": "https://www.patreon.com/colinodell",
-                    "type": "patreon"
-                },
                 {
                     "url": "https://tidelift.com/funding/github/packagist/league/commonmark",
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-17T17:13:23+00:00"
+            "time": "2022-01-13T17:18:13+00:00"
         },
         {
             "name": "league/container",
@@ -5827,16 +5925,16 @@
         },
         {
             "name": "league/oauth2-client",
-            "version": "2.6.0",
+            "version": "2.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/oauth2-client.git",
-                "reference": "badb01e62383430706433191b82506b6df24ad98"
+                "reference": "2334c249907190c132364f5dae0287ab8666aa19"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/oauth2-client/zipball/badb01e62383430706433191b82506b6df24ad98",
-                "reference": "badb01e62383430706433191b82506b6df24ad98",
+                "url": "https://api.github.com/repos/thephpleague/oauth2-client/zipball/2334c249907190c132364f5dae0287ab8666aa19",
+                "reference": "2334c249907190c132364f5dae0287ab8666aa19",
                 "shasum": ""
             },
             "require": {
@@ -5845,9 +5943,9 @@
                 "php": "^5.6 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "mockery/mockery": "^1.3",
-                "php-parallel-lint/php-parallel-lint": "^1.2",
-                "phpunit/phpunit": "^5.7 || ^6.0 || ^9.3",
+                "mockery/mockery": "^1.3.5",
+                "php-parallel-lint/php-parallel-lint": "^1.3.1",
+                "phpunit/phpunit": "^5.7 || ^6.0 || ^9.5",
                 "squizlabs/php_codesniffer": "^2.3 || ^3.0"
             },
             "type": "library",
@@ -5891,9 +5989,9 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/oauth2-client/issues",
-                "source": "https://github.com/thephpleague/oauth2-client/tree/2.6.0"
+                "source": "https://github.com/thephpleague/oauth2-client/tree/2.6.1"
             },
-            "time": "2020-10-28T02:03:40+00:00"
+            "time": "2021-12-22T16:42:49+00:00"
         },
         {
             "name": "masterminds/html5",
@@ -6032,9 +6130,6 @@
             "require": {
                 "php": "^7.1 || ^8.0"
             },
-            "replace": {
-                "myclabs/deep-copy": "self.version"
-            },
             "require-dev": {
                 "doctrine/collections": "^1.0",
                 "doctrine/common": "^2.6",
@@ -6042,12 +6137,12 @@
             },
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "DeepCopy\\": "src/DeepCopy/"
-                },
                 "files": [
                     "src/DeepCopy/deep_copy.php"
-                ]
+                ],
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -6557,16 +6652,16 @@
         },
         {
             "name": "phar-io/version",
-            "version": "3.1.0",
+            "version": "3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/version.git",
-                "reference": "bae7c545bef187884426f042434e561ab1ddb182"
+                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/version/zipball/bae7c545bef187884426f042434e561ab1ddb182",
-                "reference": "bae7c545bef187884426f042434e561ab1ddb182",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
+                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
                 "shasum": ""
             },
             "require": {
@@ -6602,9 +6697,9 @@
             "description": "Library for handling version information and constraints",
             "support": {
                 "issues": "https://github.com/phar-io/version/issues",
-                "source": "https://github.com/phar-io/version/tree/3.1.0"
+                "source": "https://github.com/phar-io/version/tree/3.2.1"
             },
-            "time": "2021-02-23T14:00:09+00:00"
+            "time": "2022-02-21T01:04:05+00:00"
         },
         {
             "name": "phayes/geophp",
@@ -6758,16 +6853,16 @@
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.5.1",
+            "version": "1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae"
+                "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/a12f7e301eb7258bb68acd89d4aefa05c2906cae",
-                "reference": "a12f7e301eb7258bb68acd89d4aefa05c2906cae",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706",
+                "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706",
                 "shasum": ""
             },
             "require": {
@@ -6802,9 +6897,9 @@
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
             "support": {
                 "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.5.1"
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.0"
             },
-            "time": "2021-10-02T14:08:47+00:00"
+            "time": "2022-01-04T19:58:01+00:00"
         },
         {
             "name": "phpspec/prophecy",
@@ -6873,18 +6968,67 @@
             },
             "time": "2021-12-08T12:19:24+00:00"
         },
+        {
+            "name": "phpstan/phpdoc-parser",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpstan/phpdoc-parser.git",
+                "reference": "dbc093d7af60eff5cd575d2ed761b15ed40bd08e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/dbc093d7af60eff5cd575d2ed761b15ed40bd08e",
+                "reference": "dbc093d7af60eff5cd575d2ed761b15ed40bd08e",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0"
+            },
+            "require-dev": {
+                "php-parallel-lint/php-parallel-lint": "^1.2",
+                "phpstan/extension-installer": "^1.0",
+                "phpstan/phpstan": "^1.0",
+                "phpstan/phpstan-strict-rules": "^1.0",
+                "phpunit/phpunit": "^9.5",
+                "symfony/process": "^5.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PHPStan\\PhpDocParser\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHPDoc parser with support for nullable, intersection and generic types",
+            "support": {
+                "issues": "https://github.com/phpstan/phpdoc-parser/issues",
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.2.0"
+            },
+            "time": "2021-09-16T20:46:02+00:00"
+        },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.10",
+            "version": "9.2.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "d5850aaf931743067f4bfc1ae4cbd06468400687"
+                "reference": "deac8540cb7bd40b2b8cfa679b76202834fd04e8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/d5850aaf931743067f4bfc1ae4cbd06468400687",
-                "reference": "d5850aaf931743067f4bfc1ae4cbd06468400687",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/deac8540cb7bd40b2b8cfa679b76202834fd04e8",
+                "reference": "deac8540cb7bd40b2b8cfa679b76202834fd04e8",
                 "shasum": ""
             },
             "require": {
@@ -6940,7 +7084,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.10"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.13"
             },
             "funding": [
                 {
@@ -6948,7 +7092,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-12-05T09:12:13+00:00"
+            "time": "2022-02-23T17:02:38+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -7193,16 +7337,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.10",
+            "version": "9.5.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "c814a05837f2edb0d1471d6e3f4ab3501ca3899a"
+                "reference": "5ff8c545a50226c569310a35f4fa89d79f1ddfdc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c814a05837f2edb0d1471d6e3f4ab3501ca3899a",
-                "reference": "c814a05837f2edb0d1471d6e3f4ab3501ca3899a",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5ff8c545a50226c569310a35f4fa89d79f1ddfdc",
+                "reference": "5ff8c545a50226c569310a35f4fa89d79f1ddfdc",
                 "shasum": ""
             },
             "require": {
@@ -7218,7 +7362,7 @@
                 "phar-io/version": "^3.0.2",
                 "php": ">=7.3",
                 "phpspec/prophecy": "^1.12.1",
-                "phpunit/php-code-coverage": "^9.2.7",
+                "phpunit/php-code-coverage": "^9.2.13",
                 "phpunit/php-file-iterator": "^3.0.5",
                 "phpunit/php-invoker": "^3.1.1",
                 "phpunit/php-text-template": "^2.0.3",
@@ -7253,11 +7397,11 @@
                 }
             },
             "autoload": {
-                "classmap": [
-                    "src/"
-                ],
                 "files": [
                     "src/Framework/Assert/Functions.php"
+                ],
+                "classmap": [
+                    "src/"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -7280,11 +7424,11 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.10"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.16"
             },
             "funding": [
                 {
-                    "url": "https://phpunit.de/donate.html",
+                    "url": "https://phpunit.de/sponsors.html",
                     "type": "custom"
                 },
                 {
@@ -7292,7 +7436,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-09-25T07:38:51+00:00"
+            "time": "2022-02-23T17:10:58+00:00"
         },
         {
             "name": "psr/cache",
@@ -7670,32 +7814,32 @@
         },
         {
             "name": "react/promise",
-            "version": "v2.8.0",
+            "version": "v2.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/reactphp/promise.git",
-                "reference": "f3cff96a19736714524ca0dd1d4130de73dbbbc4"
+                "reference": "234f8fd1023c9158e2314fa9d7d0e6a83db42910"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/reactphp/promise/zipball/f3cff96a19736714524ca0dd1d4130de73dbbbc4",
-                "reference": "f3cff96a19736714524ca0dd1d4130de73dbbbc4",
+                "url": "https://api.github.com/repos/reactphp/promise/zipball/234f8fd1023c9158e2314fa9d7d0e6a83db42910",
+                "reference": "234f8fd1023c9158e2314fa9d7d0e6a83db42910",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.4.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^7.0 || ^6.5 || ^5.7 || ^4.8.36"
+                "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.36"
             },
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "React\\Promise\\": "src/"
-                },
                 "files": [
                     "src/functions_include.php"
-                ]
+                ],
+                "psr-4": {
+                    "React\\Promise\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -7704,7 +7848,23 @@
             "authors": [
                 {
                     "name": "Jan Sorgalla",
-                    "email": "jsorgalla@gmail.com"
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
                 }
             ],
             "description": "A lightweight implementation of CommonJS Promises/A for PHP",
@@ -7714,9 +7874,19 @@
             ],
             "support": {
                 "issues": "https://github.com/reactphp/promise/issues",
-                "source": "https://github.com/reactphp/promise/tree/v2.8.0"
+                "source": "https://github.com/reactphp/promise/tree/v2.9.0"
             },
-            "time": "2020-05-12T15:16:56+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/WyriHaximus",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/clue",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-02-11T10:27:51+00:00"
         },
         {
             "name": "reliefweb/api-indexer",
@@ -8353,16 +8523,16 @@
         },
         {
             "name": "sebastian/global-state",
-            "version": "5.0.3",
+            "version": "5.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49"
+                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/23bd5951f7ff26f12d4e3242864df3e08dec4e49",
-                "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2",
+                "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2",
                 "shasum": ""
             },
             "require": {
@@ -8405,7 +8575,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.3"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5"
             },
             "funding": [
                 {
@@ -8413,7 +8583,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-06-11T13:31:12+00:00"
+            "time": "2022-02-14T08:28:10+00:00"
         },
         {
             "name": "sebastian/lines-of-code",
@@ -8924,16 +9094,16 @@
         },
         {
             "name": "sirbrillig/phpcs-variable-analysis",
-            "version": "v2.11.2",
+            "version": "v2.11.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sirbrillig/phpcs-variable-analysis.git",
-                "reference": "3fad28475bfbdbf8aa5c440f8a8f89824983d85e"
+                "reference": "c921498b474212fe4552928bbeb68d70250ce5e8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sirbrillig/phpcs-variable-analysis/zipball/3fad28475bfbdbf8aa5c440f8a8f89824983d85e",
-                "reference": "3fad28475bfbdbf8aa5c440f8a8f89824983d85e",
+                "url": "https://api.github.com/repos/sirbrillig/phpcs-variable-analysis/zipball/c921498b474212fe4552928bbeb68d70250ce5e8",
+                "reference": "c921498b474212fe4552928bbeb68d70250ce5e8",
                 "shasum": ""
             },
             "require": {
@@ -8973,7 +9143,68 @@
                 "source": "https://github.com/sirbrillig/phpcs-variable-analysis",
                 "wiki": "https://github.com/sirbrillig/phpcs-variable-analysis/wiki"
             },
-            "time": "2021-07-06T23:45:17+00:00"
+            "time": "2022-02-21T17:01:13+00:00"
+        },
+        {
+            "name": "slevomat/coding-standard",
+            "version": "7.0.18",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/slevomat/coding-standard.git",
+                "reference": "b81ac84f41a4797dc25c8ede1b0718e2a74be0fc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/b81ac84f41a4797dc25c8ede1b0718e2a74be0fc",
+                "reference": "b81ac84f41a4797dc25c8ede1b0718e2a74be0fc",
+                "shasum": ""
+            },
+            "require": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7",
+                "php": "^7.1 || ^8.0",
+                "phpstan/phpdoc-parser": "^1.0.0",
+                "squizlabs/php_codesniffer": "^3.6.1"
+            },
+            "require-dev": {
+                "phing/phing": "2.17.0",
+                "php-parallel-lint/php-parallel-lint": "1.3.1",
+                "phpstan/phpstan": "1.2.0",
+                "phpstan/phpstan-deprecation-rules": "1.0.0",
+                "phpstan/phpstan-phpunit": "1.0.0",
+                "phpstan/phpstan-strict-rules": "1.1.0",
+                "phpunit/phpunit": "7.5.20|8.5.21|9.5.10"
+            },
+            "type": "phpcodesniffer-standard",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "7.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "SlevomatCodingStandard\\": "SlevomatCodingStandard"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.",
+            "support": {
+                "issues": "https://github.com/slevomat/coding-standard/issues",
+                "source": "https://github.com/slevomat/coding-standard/tree/7.0.18"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/kukulich",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/slevomat/coding-standard",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-12-07T17:19:06+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
@@ -9150,16 +9381,16 @@
         },
         {
             "name": "symfony/browser-kit",
-            "version": "v4.4.27",
+            "version": "v4.4.37",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "9629d1524d8ced5a4ec3e94abdbd638b4ec8319b"
+                "reference": "6e81008cac62369871cb6b8de64576ed138e3998"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/9629d1524d8ced5a4ec3e94abdbd638b4ec8319b",
-                "reference": "9629d1524d8ced5a4ec3e94abdbd638b4ec8319b",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/6e81008cac62369871cb6b8de64576ed138e3998",
+                "reference": "6e81008cac62369871cb6b8de64576ed138e3998",
                 "shasum": ""
             },
             "require": {
@@ -9202,7 +9433,7 @@
             "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/browser-kit/tree/v4.4.27"
+                "source": "https://github.com/symfony/browser-kit/tree/v4.4.37"
             },
             "funding": [
                 {
@@ -9218,7 +9449,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-21T12:19:41+00:00"
+            "time": "2022-01-02T09:41:36+00:00"
         },
         {
             "name": "symfony/console",
@@ -9312,16 +9543,16 @@
         },
         {
             "name": "symfony/css-selector",
-            "version": "v4.4.27",
+            "version": "v4.4.37",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "5194f18bd80d106f11efa8f7cd0fbdcc3af96ce6"
+                "reference": "0628e6c6d7c92f1a7bae543959bdc17347be2436"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/5194f18bd80d106f11efa8f7cd0fbdcc3af96ce6",
-                "reference": "5194f18bd80d106f11efa8f7cd0fbdcc3af96ce6",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/0628e6c6d7c92f1a7bae543959bdc17347be2436",
+                "reference": "0628e6c6d7c92f1a7bae543959bdc17347be2436",
                 "shasum": ""
             },
             "require": {
@@ -9358,7 +9589,7 @@
             "description": "Converts CSS selectors to XPath expressions",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/css-selector/tree/v4.4.27"
+                "source": "https://github.com/symfony/css-selector/tree/v4.4.37"
             },
             "funding": [
                 {
@@ -9374,7 +9605,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-21T12:19:41+00:00"
+            "time": "2022-01-02T09:41:36+00:00"
         },
         {
             "name": "symfony/debug",
@@ -9599,16 +9830,16 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v4.4.30",
+            "version": "v4.4.37",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "4632ae3567746c7e915c33c67a2fb6ab746090c4"
+                "reference": "60d36408a3a48500bcc6e30d9f831e51d04d7fa4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/4632ae3567746c7e915c33c67a2fb6ab746090c4",
-                "reference": "4632ae3567746c7e915c33c67a2fb6ab746090c4",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/60d36408a3a48500bcc6e30d9f831e51d04d7fa4",
+                "reference": "60d36408a3a48500bcc6e30d9f831e51d04d7fa4",
                 "shasum": ""
             },
             "require": {
@@ -9653,7 +9884,7 @@
             "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dom-crawler/tree/v4.4.30"
+                "source": "https://github.com/symfony/dom-crawler/tree/v4.4.37"
             },
             "funding": [
                 {
@@ -9669,7 +9900,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-08-28T15:40:01+00:00"
+            "time": "2022-01-02T09:41:36+00:00"
         },
         {
             "name": "symfony/error-handler",
@@ -9904,16 +10135,16 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v4.4.27",
+            "version": "v4.4.37",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "517fb795794faf29086a77d99eb8f35e457837a7"
+                "reference": "c59f37705c3e513ae55b2735f128f4ce363c82ec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/517fb795794faf29086a77d99eb8f35e457837a7",
-                "reference": "517fb795794faf29086a77d99eb8f35e457837a7",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/c59f37705c3e513ae55b2735f128f4ce363c82ec",
+                "reference": "c59f37705c3e513ae55b2735f128f4ce363c82ec",
                 "shasum": ""
             },
             "require": {
@@ -9947,7 +10178,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v4.4.27"
+                "source": "https://github.com/symfony/filesystem/tree/v4.4.37"
             },
             "funding": [
                 {
@@ -9963,20 +10194,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-21T12:19:41+00:00"
+            "time": "2022-01-02T09:41:36+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v4.4.30",
+            "version": "v4.4.37",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "70362f1e112280d75b30087c7598b837c1b468b6"
+                "reference": "b17d76d7ed179f017aad646e858c90a2771af15d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/70362f1e112280d75b30087c7598b837c1b468b6",
-                "reference": "70362f1e112280d75b30087c7598b837c1b468b6",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/b17d76d7ed179f017aad646e858c90a2771af15d",
+                "reference": "b17d76d7ed179f017aad646e858c90a2771af15d",
                 "shasum": ""
             },
             "require": {
@@ -10009,7 +10240,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v4.4.30"
+                "source": "https://github.com/symfony/finder/tree/v4.4.37"
             },
             "funding": [
                 {
@@ -10025,20 +10256,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-08-04T20:31:23+00:00"
+            "time": "2022-01-02T09:41:36+00:00"
         },
         {
             "name": "symfony/flex",
-            "version": "v2.0.1",
+            "version": "v2.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/flex.git",
-                "reference": "3dbfa5c4e3308fd9def9a2006a20fa0c272a30a2"
+                "reference": "dd7dafe3bfebf8441e167b76d8a18974585467f3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/flex/zipball/3dbfa5c4e3308fd9def9a2006a20fa0c272a30a2",
-                "reference": "3dbfa5c4e3308fd9def9a2006a20fa0c272a30a2",
+                "url": "https://api.github.com/repos/symfony/flex/zipball/dd7dafe3bfebf8441e167b76d8a18974585467f3",
+                "reference": "dd7dafe3bfebf8441e167b76d8a18974585467f3",
                 "shasum": ""
             },
             "require": {
@@ -10074,7 +10305,7 @@
             "description": "Composer plugin for Symfony",
             "support": {
                 "issues": "https://github.com/symfony/flex/issues",
-                "source": "https://github.com/symfony/flex/tree/v2.0.1"
+                "source": "https://github.com/symfony/flex/tree/v2.1.6"
             },
             "funding": [
                 {
@@ -10090,7 +10321,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-29T15:40:20+00:00"
+            "time": "2022-02-16T17:31:43+00:00"
         },
         {
             "name": "symfony/http-client-contracts",
@@ -10344,16 +10575,16 @@
         },
         {
             "name": "symfony/lock",
-            "version": "v4.4.33",
+            "version": "v4.4.37",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/lock.git",
-                "reference": "567d29b1bc6e3937652054dafc069151d17824a9"
+                "reference": "fac900d30b6f37a1867237f79a3d4dab8df4a450"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/lock/zipball/567d29b1bc6e3937652054dafc069151d17824a9",
-                "reference": "567d29b1bc6e3937652054dafc069151d17824a9",
+                "url": "https://api.github.com/repos/symfony/lock/zipball/fac900d30b6f37a1867237f79a3d4dab8df4a450",
+                "reference": "fac900d30b6f37a1867237f79a3d4dab8df4a450",
                 "shasum": ""
             },
             "require": {
@@ -10402,7 +10633,7 @@
                 "semaphore"
             ],
             "support": {
-                "source": "https://github.com/symfony/lock/tree/v4.4.33"
+                "source": "https://github.com/symfony/lock/tree/v4.4.37"
             },
             "funding": [
                 {
@@ -10418,7 +10649,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-05T20:27:01+00:00"
+            "time": "2022-01-02T09:41:36+00:00"
         },
         {
             "name": "symfony/mime",
@@ -10505,16 +10736,16 @@
         },
         {
             "name": "symfony/phpunit-bridge",
-            "version": "v5.4.0",
+            "version": "v5.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/phpunit-bridge.git",
-                "reference": "59bbd98ee7aa15b9f75c0fc088c7a5cbf7aa9b5c"
+                "reference": "216b07b05644607c81afd89a208e52641c1ce6b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/59bbd98ee7aa15b9f75c0fc088c7a5cbf7aa9b5c",
-                "reference": "59bbd98ee7aa15b9f75c0fc088c7a5cbf7aa9b5c",
+                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/216b07b05644607c81afd89a208e52641c1ce6b8",
+                "reference": "216b07b05644607c81afd89a208e52641c1ce6b8",
                 "shasum": ""
             },
             "require": {
@@ -10568,7 +10799,7 @@
             "description": "Provides utilities for PHPUnit, especially user deprecation notices management",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/phpunit-bridge/tree/v5.4.0"
+                "source": "https://github.com/symfony/phpunit-bridge/tree/v5.4.3"
             },
             "funding": [
                 {
@@ -10584,7 +10815,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-29T15:30:56+00:00"
+            "time": "2022-01-26T16:28:35+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -10696,12 +10927,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Iconv\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Iconv\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -10778,12 +11009,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Idn\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Idn\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -10863,12 +11094,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -10947,12 +11178,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -10998,7 +11229,7 @@
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.23.0",
+            "version": "v1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
@@ -11024,12 +11255,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php72\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php72\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -11054,7 +11285,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.23.0"
+                "source": "https://github.com/symfony/polyfill-php72/tree/v1.24.0"
             },
             "funding": [
                 {
@@ -11074,16 +11305,16 @@
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.23.0",
+            "version": "v1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010"
+                "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010",
-                "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/cc5db0e22b3cb4111010e48785a97f670b350ca5",
+                "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5",
                 "shasum": ""
             },
             "require": {
@@ -11100,12 +11331,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php73\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php73\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -11133,7 +11364,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php73/tree/v1.23.0"
+                "source": "https://github.com/symfony/polyfill-php73/tree/v1.24.0"
             },
             "funding": [
                 {
@@ -11149,7 +11380,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-19T12:13:01+00:00"
+            "time": "2021-06-05T21:20:04+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
@@ -11179,12 +11410,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -11236,21 +11467,24 @@
         },
         {
             "name": "symfony/polyfill-uuid",
-            "version": "v1.23.0",
+            "version": "v1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-uuid.git",
-                "reference": "9165effa2eb8a31bb3fa608df9d529920d21ddd9"
+                "reference": "7529922412d23ac44413d0f308861d50cf68d3ee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/9165effa2eb8a31bb3fa608df9d529920d21ddd9",
-                "reference": "9165effa2eb8a31bb3fa608df9d529920d21ddd9",
+                "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/7529922412d23ac44413d0f308861d50cf68d3ee",
+                "reference": "7529922412d23ac44413d0f308861d50cf68d3ee",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1"
             },
+            "provide": {
+                "ext-uuid": "*"
+            },
             "suggest": {
                 "ext-uuid": "For best performance"
             },
@@ -11265,12 +11499,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Uuid\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Uuid\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -11295,7 +11529,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.23.0"
+                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.24.0"
             },
             "funding": [
                 {
@@ -11311,7 +11545,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-19T12:13:01+00:00"
+            "time": "2021-10-20T20:35:02+00:00"
         },
         {
             "name": "symfony/process",
@@ -11898,16 +12132,16 @@
         },
         {
             "name": "symfony/uid",
-            "version": "v6.0.1",
+            "version": "v6.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/uid.git",
-                "reference": "6ef7c361b84f8ae666843279d08b2b8ce8006033"
+                "reference": "bc1f80c2f512430b9b322df2b71983742dd4f8e7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/uid/zipball/6ef7c361b84f8ae666843279d08b2b8ce8006033",
-                "reference": "6ef7c361b84f8ae666843279d08b2b8ce8006033",
+                "url": "https://api.github.com/repos/symfony/uid/zipball/bc1f80c2f512430b9b322df2b71983742dd4f8e7",
+                "reference": "bc1f80c2f512430b9b322df2b71983742dd4f8e7",
                 "shasum": ""
             },
             "require": {
@@ -11948,10 +12182,11 @@
             "homepage": "https://symfony.com",
             "keywords": [
                 "UID",
+                "ulid",
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/uid/tree/v6.0.1"
+                "source": "https://github.com/symfony/uid/tree/v6.0.3"
             },
             "funding": [
                 {
@@ -11967,7 +12202,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-08T15:13:44+00:00"
+            "time": "2022-01-02T09:55:41+00:00"
         },
         {
             "name": "symfony/validator",
@@ -12287,22 +12522,23 @@
         },
         {
             "name": "twig/twig",
-            "version": "v2.14.7",
+            "version": "v2.14.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "8e202327ee1ed863629de9b18a5ec70ac614d88f"
+                "reference": "66baa66f29ee30e487e05f1679903e36eb01d727"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/8e202327ee1ed863629de9b18a5ec70ac614d88f",
-                "reference": "8e202327ee1ed863629de9b18a5ec70ac614d88f",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/66baa66f29ee30e487e05f1679903e36eb01d727",
+                "reference": "66baa66f29ee30e487e05f1679903e36eb01d727",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
+                "php": ">=7.1.3",
                 "symfony/polyfill-ctype": "^1.8",
-                "symfony/polyfill-mbstring": "^1.3"
+                "symfony/polyfill-mbstring": "^1.3",
+                "symfony/polyfill-php72": "^1.8"
             },
             "require-dev": {
                 "psr/container": "^1.0",
@@ -12350,7 +12586,7 @@
             ],
             "support": {
                 "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v2.14.7"
+                "source": "https://github.com/twigphp/Twig/tree/v2.14.11"
             },
             "funding": [
                 {
@@ -12362,7 +12598,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-09-17T08:39:54+00:00"
+            "time": "2022-02-04T06:57:25+00:00"
         },
         {
             "name": "typo3/phar-stream-wrapper",
@@ -12852,16 +13088,16 @@
         },
         {
             "name": "dflydev/placeholder-resolver",
-            "version": "v1.0.2",
+            "version": "v1.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dflydev/dflydev-placeholder-resolver.git",
-                "reference": "c498d0cae91b1bb36cc7d60906dab8e62bb7c356"
+                "reference": "d0161b4be1e15838327b01b21d0149f382d69906"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dflydev/dflydev-placeholder-resolver/zipball/c498d0cae91b1bb36cc7d60906dab8e62bb7c356",
-                "reference": "c498d0cae91b1bb36cc7d60906dab8e62bb7c356",
+                "url": "https://api.github.com/repos/dflydev/dflydev-placeholder-resolver/zipball/d0161b4be1e15838327b01b21d0149f382d69906",
+                "reference": "d0161b4be1e15838327b01b21d0149f382d69906",
                 "shasum": ""
             },
             "require": {
@@ -12902,9 +13138,9 @@
             ],
             "support": {
                 "issues": "https://github.com/dflydev/dflydev-placeholder-resolver/issues",
-                "source": "https://github.com/dflydev/dflydev-placeholder-resolver/tree/v1.0.2"
+                "source": "https://github.com/dflydev/dflydev-placeholder-resolver/tree/v1.0.3"
             },
-            "time": "2012-10-28T21:08:28+00:00"
+            "time": "2021-12-03T16:48:58+00:00"
         },
         {
             "name": "doctrine/cache",
@@ -13301,8 +13537,8 @@
             },
             "autoload": {
                 "psr-4": {
-                    "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector",
-                    "Doctrine\\Inflector\\": "lib/Doctrine/Inflector"
+                    "Doctrine\\Inflector\\": "lib/Doctrine/Inflector",
+                    "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -14151,23 +14387,23 @@
         },
         {
             "name": "pdepend/pdepend",
-            "version": "2.10.2",
+            "version": "2.10.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pdepend/pdepend.git",
-                "reference": "c8c1d2af43fb8c2b5387d50e9c42a9c56de13686"
+                "reference": "da3166a06b4a89915920a42444f707122a1584c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/c8c1d2af43fb8c2b5387d50e9c42a9c56de13686",
-                "reference": "c8c1d2af43fb8c2b5387d50e9c42a9c56de13686",
+                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/da3166a06b4a89915920a42444f707122a1584c9",
+                "reference": "da3166a06b4a89915920a42444f707122a1584c9",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.7",
-                "symfony/config": "^2.3.0|^3|^4|^5",
-                "symfony/dependency-injection": "^2.3.0|^3|^4|^5",
-                "symfony/filesystem": "^2.3.0|^3|^4|^5"
+                "symfony/config": "^2.3.0|^3|^4|^5|^6.0",
+                "symfony/dependency-injection": "^2.3.0|^3|^4|^5|^6.0",
+                "symfony/filesystem": "^2.3.0|^3|^4|^5|^6.0"
             },
             "require-dev": {
                 "easy-doc/easy-doc": "0.0.0|^1.2.3",
@@ -14196,7 +14432,7 @@
             "description": "Official version of pdepend to be handled with Composer",
             "support": {
                 "issues": "https://github.com/pdepend/pdepend/issues",
-                "source": "https://github.com/pdepend/pdepend/tree/2.10.2"
+                "source": "https://github.com/pdepend/pdepend/tree/2.10.3"
             },
             "funding": [
                 {
@@ -14204,7 +14440,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-16T20:05:32+00:00"
+            "time": "2022-02-23T07:53:09+00:00"
         },
         {
             "name": "phpcompatibility/php-compatibility",
@@ -14270,16 +14506,16 @@
         },
         {
             "name": "phpmd/phpmd",
-            "version": "2.11.0",
+            "version": "2.11.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpmd/phpmd.git",
-                "reference": "3637949092e6471aeaeca66bc6c016f45e459e24"
+                "reference": "08b60a2eb7e14c23f46ff8865b510ae08b75d0fd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/3637949092e6471aeaeca66bc6c016f45e459e24",
-                "reference": "3637949092e6471aeaeca66bc6c016f45e459e24",
+                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/08b60a2eb7e14c23f46ff8865b510ae08b75d0fd",
+                "reference": "08b60a2eb7e14c23f46ff8865b510ae08b75d0fd",
                 "shasum": ""
             },
             "require": {
@@ -14341,7 +14577,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/phpmd",
                 "issues": "https://github.com/phpmd/phpmd/issues",
-                "source": "https://github.com/phpmd/phpmd/tree/2.11.0"
+                "source": "https://github.com/phpmd/phpmd/tree/2.11.1"
             },
             "funding": [
                 {
@@ -14349,7 +14585,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-29T14:05:52+00:00"
+            "time": "2021-12-17T11:25:43+00:00"
         },
         {
             "name": "phpspec/prophecy-phpunit",
@@ -14454,16 +14690,16 @@
         },
         {
             "name": "symfony/config",
-            "version": "v4.4.34",
+            "version": "v4.4.37",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "e99b65a18faa34fde57078095c39a1bc91a22492"
+                "reference": "e8c2d2c951ddedecb6d28954d336cb7d2e852d0e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/e99b65a18faa34fde57078095c39a1bc91a22492",
-                "reference": "e99b65a18faa34fde57078095c39a1bc91a22492",
+                "url": "https://api.github.com/repos/symfony/config/zipball/e8c2d2c951ddedecb6d28954d336cb7d2e852d0e",
+                "reference": "e8c2d2c951ddedecb6d28954d336cb7d2e852d0e",
                 "shasum": ""
             },
             "require": {
@@ -14512,7 +14748,7 @@
             "description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/config/tree/v4.4.34"
+                "source": "https://github.com/symfony/config/tree/v4.4.37"
             },
             "funding": [
                 {
@@ -14528,20 +14764,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-29T15:43:26+00:00"
+            "time": "2022-01-03T09:46:22+00:00"
         },
         {
             "name": "symfony/polyfill-php81",
-            "version": "v1.23.0",
+            "version": "v1.24.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php81.git",
-                "reference": "e66119f3de95efc359483f810c4c3e6436279436"
+                "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/e66119f3de95efc359483f810c4c3e6436279436",
-                "reference": "e66119f3de95efc359483f810c4c3e6436279436",
+                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/5de4ba2d41b15f9bd0e19b2ab9674135813ec98f",
+                "reference": "5de4ba2d41b15f9bd0e19b2ab9674135813ec98f",
                 "shasum": ""
             },
             "require": {
@@ -14558,12 +14794,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php81\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php81\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -14591,7 +14827,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/v1.23.0"
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.24.0"
             },
             "funding": [
                 {
@@ -14607,7 +14843,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-21T13:25:03+00:00"
+            "time": "2021-09-13T13:58:11+00:00"
         },
         {
             "name": "weitzman/drupal-test-traits",
@@ -14695,5 +14931,5 @@
         "php": ">=8.0"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.2.0"
 }
diff --git a/symfony.lock b/symfony.lock
index 2e4594c92..544a3b46f 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -23,6 +23,9 @@
     "composer/composer": {
         "version": "2.1.14"
     },
+    "composer/installers": {
+        "version": "v1.12.0"
+    },
     "composer/metadata-minifier": {
         "version": "1.0.0"
     },
@@ -65,9 +68,15 @@
     "consolidation/site-process": {
         "version": "4.1.0"
     },
+    "cweagans/composer-patches": {
+        "version": "1.7.2"
+    },
     "d4h/finediff": {
         "version": "1.0.1"
     },
+    "dealerdirect/phpcodesniffer-composer-installer": {
+        "version": "v0.7.2"
+    },
     "dflydev/dot-access-configuration": {
         "version": "v1.0.3"
     },
@@ -116,6 +125,9 @@
     "doctrine/reflection": {
         "version": "1.2.2"
     },
+    "drupal-composer/preserve-paths": {
+        "version": "0.1.6"
+    },
     "drupal/admin_denied": {
         "version": "1.1.0"
     },
@@ -152,6 +164,9 @@
     "drupal/core": {
         "version": "9.3.0"
     },
+    "drupal/core-composer-scaffold": {
+        "version": "9.3.6"
+    },
     "drupal/core-dev": {
         "version": "9.3.0"
     },
@@ -374,6 +389,9 @@
     "phpspec/prophecy-phpunit": {
         "version": "v2.0.1"
     },
+    "phpstan/phpdoc-parser": {
+        "version": "1.2.0"
+    },
     "phpunit/php-code-coverage": {
         "version": "9.2.10"
     },
@@ -496,6 +514,9 @@
     "sirbrillig/phpcs-variable-analysis": {
         "version": "v2.11.2"
     },
+    "slevomat/coding-standard": {
+        "version": "7.0.18"
+    },
     "squizlabs/php_codesniffer": {
         "version": "3.6",
         "recipe": {

From 77cd35550505e92155d5d9b8ddd42d9a72a410cd Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 24 Feb 2022 12:41:26 +0100
Subject: [PATCH 530/720] CD-356 remove preprocess in favour of fix in base
 theme

---
 .../common_design_subtheme.theme                    | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.theme b/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
index 465df02b8..e2ff5716a 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
@@ -282,19 +282,6 @@ function common_design_subtheme_preprocess_inline_entity_form_entity_table(array
   }
 }
 
-/**
- * Implements hook_preprocess_datetime_wrapper().
- *
- * Ensure the title is not displayed when instructed to be hidden.
- *
- * @todo remove when https://humanitarian.atlassian.net/browse/CD-356 is merged.
- */
-function common_design_subtheme_preprocess_datetime_wrapper(&$variables) {
-  if (isset($variables['element']['#title_display']) && $variables['element']['#title_display'] === 'invisible') {
-    $variables['title_attributes']['class'][] = 'visually-hidden';
-  }
-}
-
 /**
  * Implements hook_reliefweb_form_mark_optional_alter().
  *

From 621c3d25eb922ac47ec1184111c0fee8790d27bb Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 24 Feb 2022 12:42:01 +0100
Subject: [PATCH 531/720] CD-356 update base theme branch to latest commit

---
 composer.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.lock b/composer.lock
index 64096ab75..aa14a6249 100644
--- a/composer.lock
+++ b/composer.lock
@@ -12483,12 +12483,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/UN-OCHA/common_design.git",
-                "reference": "1d101edc8e39ad4cdc35e3d9a55eb7d5feb77850"
+                "reference": "8e7dd6d96fbfbe83b63ef4a65dbe12588534245a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/1d101edc8e39ad4cdc35e3d9a55eb7d5feb77850",
-                "reference": "1d101edc8e39ad4cdc35e3d9a55eb7d5feb77850",
+                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/8e7dd6d96fbfbe83b63ef4a65dbe12588534245a",
+                "reference": "8e7dd6d96fbfbe83b63ef4a65dbe12588534245a",
                 "shasum": ""
             },
             "require": {
@@ -12503,7 +12503,7 @@
                 "source": "https://github.com/UN-OCHA/common_design/tree/cd-304-forms",
                 "issues": "https://github.com/UN-OCHA/common_design/issues"
             },
-            "time": "2022-02-01T20:19:59+00:00"
+            "time": "2022-02-24T11:23:19+00:00"
         },
         {
             "name": "webflo/drupal-finder",

From b3fa613d231f34f9a6a1ae1589de5aa3f2f953be Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 25 Feb 2022 07:23:59 +0000
Subject: [PATCH 532/720] [RW-282] Update CommonMark to v2, update drush and
 api-indexer for compatibility, and add imagemagick module to solve PNG issues

---
 composer.json                                 |    8 +-
 composer.lock                                 | 1838 +++++++++--------
 composer.patches.json                         |    3 +
 config/core.extension.yml                     |    3 +
 ..._mdm.file_metadata_plugin.getimagesize.yml |    9 +
 config/file_mdm.settings.yml                  |    6 +
 ...e_metadata_plugin.imagemagick_identify.yml |    9 +
 config/imagemagick.settings.yml               |   61 +
 config/sophron.settings.yml                   |    5 +
 symfony.lock                                  |  175 +-
 10 files changed, 1219 insertions(+), 898 deletions(-)
 create mode 100644 config/file_mdm.file_metadata_plugin.getimagesize.yml
 create mode 100644 config/file_mdm.settings.yml
 create mode 100644 config/imagemagick.file_metadata_plugin.imagemagick_identify.yml
 create mode 100644 config/imagemagick.settings.yml
 create mode 100644 config/sophron.settings.yml

diff --git a/composer.json b/composer.json
index 32fc7040d..90440700d 100644
--- a/composer.json
+++ b/composer.json
@@ -67,6 +67,7 @@
         "drupal/google_tag": "^1.4",
         "drupal/guidelines": "^1.0",
         "drupal/imageapi_optimize_binaries": "^1.0-alpha2",
+        "drupal/imagemagick": "^3.3",
         "drupal/inline_entity_form": "^1.0@RC",
         "drupal/mailsystem": "^4.3",
         "drupal/maintenance200": "^1.1",
@@ -84,11 +85,11 @@
         "drupal/theme_switcher": "^1.2",
         "drupal/token": "^1.10",
         "drupal/user_display_name": "^1.0",
-        "drush/drush": "^10.6",
-        "league/commonmark": "^1.6",
+        "drush/drush": "^11.0",
+        "league/commonmark": "^2.2",
         "league/html-to-markdown": "^5.0",
         "pelago/emogrifier": "^6.0",
-        "reliefweb/api-indexer": "^v2.1.1",
+        "reliefweb/api-indexer": "^v2.2",
         "reliefweb/simple-autocomplete": "^v1.3.0",
         "reliefweb/simple-datepicker": "^v1.3.1",
         "symfony/flex": "^2.0",
@@ -99,7 +100,6 @@
     "require-dev": {
         "drupal/coder": "^8.3",
         "drupal/config_filter": "^2.2",
-        "drupal/console": "^1.9",
         "drupal/devel": "^4.1",
         "drupal/devel_php": "^1.3",
         "drupal/stage_file_proxy": "^1.2",
diff --git a/composer.lock b/composer.lock
index 76e92841c..a2883cc09 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "38124281bae16948fa9feebfd9ce4ab7",
+    "content-hash": "ee3764bf603ee2d0958121e6182a1818",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -195,27 +195,40 @@
         },
         {
             "name": "chi-teck/drupal-code-generator",
-            "version": "1.33.1",
+            "version": "2.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Chi-teck/drupal-code-generator.git",
-                "reference": "5f814e980b6f9cf1ca8c74cc9385c3d81090d388"
+                "reference": "cd3912e25e20bb12b6dce8d522793f3abd71ab8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Chi-teck/drupal-code-generator/zipball/5f814e980b6f9cf1ca8c74cc9385c3d81090d388",
-                "reference": "5f814e980b6f9cf1ca8c74cc9385c3d81090d388",
+                "url": "https://api.github.com/repos/Chi-teck/drupal-code-generator/zipball/cd3912e25e20bb12b6dce8d522793f3abd71ab8c",
+                "reference": "cd3912e25e20bb12b6dce8d522793f3abd71ab8c",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "php": ">=5.5.9",
-                "symfony/console": "^3.4 || ^4.0",
-                "symfony/filesystem": "^2.7 || ^3.4 || ^4.0",
-                "twig/twig": "^1.41 || ^2.12"
+                "php": ">=7.4",
+                "psr/log": "^1.1 || ^2.0",
+                "symfony/console": "^4.4.15 || ^5.1",
+                "symfony/filesystem": "^4.4 || ^5.1 || ^6",
+                "symfony/polyfill-php80": "^1.23",
+                "symfony/string": "^5.1 || ^6",
+                "twig/twig": "^2.14.11 || ^3.1"
             },
             "conflict": {
-                "drush/drush": "< 10.3.2"
+                "squizlabs/php_codesniffer": "<3.6"
+            },
+            "require-dev": {
+                "chi-teck/drupal-coder-extension": "^1.2",
+                "drupal/coder": "^8.3.14",
+                "friendsoftwig/twigcs": "^5.0",
+                "phpspec/prophecy-phpunit": "^2.0",
+                "phpunit/phpunit": "^9.4",
+                "squizlabs/php_codesniffer": "^3.5",
+                "symfony/var-dumper": "^5.2",
+                "symfony/yaml": "^5.2"
             },
             "bin": [
                 "bin/dcg"
@@ -223,13 +236,10 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.x-dev"
+                    "dev-master": "2.x-dev"
                 }
             },
             "autoload": {
-                "files": [
-                    "src/bootstrap.php"
-                ],
                 "psr-4": {
                     "DrupalCodeGenerator\\": "src"
                 }
@@ -241,9 +251,9 @@
             "description": "Drupal code generator",
             "support": {
                 "issues": "https://github.com/Chi-teck/drupal-code-generator/issues",
-                "source": "https://github.com/Chi-teck/drupal-code-generator/tree/1.33.1"
+                "source": "https://github.com/Chi-teck/drupal-code-generator/tree/2.5.1"
             },
-            "time": "2020-12-05T05:59:11+00:00"
+            "time": "2022-02-24T10:39:38+00:00"
         },
         {
             "name": "composer/ca-bundle",
@@ -874,16 +884,16 @@
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "2.0.4",
+            "version": "2.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "0c1a3925ec58a4ec98e992b9c7d171e9e184be0a"
+                "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/0c1a3925ec58a4ec98e992b9c7d171e9e184be0a",
-                "reference": "0c1a3925ec58a4ec98e992b9c7d171e9e184be0a",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/9e36aeed4616366d2b690bdce11f71e9178c579a",
+                "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a",
                 "shasum": ""
             },
             "require": {
@@ -920,7 +930,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/2.0.4"
+                "source": "https://github.com/composer/xdebug-handler/tree/2.0.5"
             },
             "funding": [
                 {
@@ -936,7 +946,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-04T17:06:45+00:00"
+            "time": "2022-02-24T20:20:32+00:00"
         },
         {
             "name": "consolidation/annotated-command",
@@ -996,65 +1006,40 @@
         },
         {
             "name": "consolidation/config",
-            "version": "1.2.1",
+            "version": "2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/config.git",
-                "reference": "cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1"
+                "reference": "0c15841b2bf60d9af1ce29884673e7d9d50c3b75"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/config/zipball/cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1",
-                "reference": "cac1279bae7efb5c7fb2ca4c3ba4b8eb741a96c1",
+                "url": "https://api.github.com/repos/consolidation/config/zipball/0c15841b2bf60d9af1ce29884673e7d9d50c3b75",
+                "reference": "0c15841b2bf60d9af1ce29884673e7d9d50c3b75",
                 "shasum": ""
             },
             "require": {
-                "dflydev/dot-access-data": "^1.1.0",
-                "grasmash/expander": "^1",
-                "php": ">=5.4.0"
+                "dflydev/dot-access-data": "^1.1.0 || ^2 || ^3",
+                "grasmash/expander": "^2.0.1",
+                "php": ">=7.1.3",
+                "symfony/event-dispatcher": "^4 || ^5 || ^6"
             },
             "require-dev": {
-                "g1a/composer-test-scenarios": "^3",
-                "php-coveralls/php-coveralls": "^1",
-                "phpunit/phpunit": "^5",
-                "squizlabs/php_codesniffer": "2.*",
-                "symfony/console": "^2.5|^3|^4",
-                "symfony/yaml": "^2.8.11|^3|^4"
+                "ext-json": "*",
+                "phpunit/phpunit": ">=7.5.20",
+                "squizlabs/php_codesniffer": "^3",
+                "symfony/console": "^4 || ^5 || ^6",
+                "symfony/yaml": "^4 || ^5 || ^6",
+                "yoast/phpunit-polyfills": "^1"
             },
             "suggest": {
+                "symfony/event-dispatcher": "Required to inject configuration into Command options",
                 "symfony/yaml": "Required to use Consolidation\\Config\\Loader\\YamlConfigLoader"
             },
             "type": "library",
             "extra": {
-                "scenarios": {
-                    "symfony4": {
-                        "require-dev": {
-                            "symfony/console": "^4.0"
-                        },
-                        "config": {
-                            "platform": {
-                                "php": "7.1.3"
-                            }
-                        }
-                    },
-                    "symfony2": {
-                        "require-dev": {
-                            "symfony/console": "^2.8",
-                            "symfony/event-dispatcher": "^2.8",
-                            "phpunit/phpunit": "^4.8.36"
-                        },
-                        "remove": [
-                            "php-coveralls/php-coveralls"
-                        ],
-                        "config": {
-                            "platform": {
-                                "php": "5.4.8"
-                            }
-                        }
-                    }
-                },
                 "branch-alias": {
-                    "dev-master": "1.x-dev"
+                    "dev-main": "2.x-dev"
                 }
             },
             "autoload": {
@@ -1075,57 +1060,37 @@
             "description": "Provide configuration services for a commandline tool.",
             "support": {
                 "issues": "https://github.com/consolidation/config/issues",
-                "source": "https://github.com/consolidation/config/tree/master"
+                "source": "https://github.com/consolidation/config/tree/2.1.0"
             },
-            "time": "2019-03-03T19:37:04+00:00"
+            "time": "2022-02-24T00:32:42+00:00"
         },
         {
             "name": "consolidation/filter-via-dot-access-data",
-            "version": "1.0.0",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/filter-via-dot-access-data.git",
-                "reference": "a53e96c6b9f7f042f5e085bf911f3493cea823c6"
+                "reference": "cb2eeba41f8e2e3c61698a5cf70ef048ff6c9d5b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/filter-via-dot-access-data/zipball/a53e96c6b9f7f042f5e085bf911f3493cea823c6",
-                "reference": "a53e96c6b9f7f042f5e085bf911f3493cea823c6",
+                "url": "https://api.github.com/repos/consolidation/filter-via-dot-access-data/zipball/cb2eeba41f8e2e3c61698a5cf70ef048ff6c9d5b",
+                "reference": "cb2eeba41f8e2e3c61698a5cf70ef048ff6c9d5b",
                 "shasum": ""
             },
             "require": {
-                "dflydev/dot-access-data": "^1.1.0",
-                "php": ">=5.5.0"
+                "dflydev/dot-access-data": "^1.1.0 || ^2.0.0 || ^3.0.0",
+                "php": ">=7.1.3"
             },
             "require-dev": {
-                "consolidation/robo": "^1.2.3",
-                "g1a/composer-test-scenarios": "^3",
-                "knplabs/github-api": "^2.7",
-                "php-coveralls/php-coveralls": "^1",
-                "php-http/guzzle6-adapter": "^1.1",
-                "phpunit/phpunit": "^5",
-                "squizlabs/php_codesniffer": "^2.8",
-                "symfony/console": "^2.8|^3|^4"
+                "phpunit/phpunit": "^7.5.20 || ^8 || ^9",
+                "squizlabs/php_codesniffer": "^3",
+                "yoast/phpunit-polyfills": "^0.2.0"
             },
             "type": "library",
             "extra": {
-                "scenarios": {
-                    "phpunit5": {
-                        "require-dev": {
-                            "phpunit/phpunit": "^5.7.27"
-                        },
-                        "remove": [
-                            "php-coveralls/php-coveralls"
-                        ],
-                        "config": {
-                            "platform": {
-                                "php": "5.6.33"
-                            }
-                        }
-                    }
-                },
                 "branch-alias": {
-                    "dev-master": "1.x-dev"
+                    "dev-main": "2.x-dev"
                 }
             },
             "autoload": {
@@ -1145,9 +1110,9 @@
             ],
             "description": "This project uses dflydev/dot-access-data to provide simple output filtering for applications built with annotated-command / Robo.",
             "support": {
-                "source": "https://github.com/consolidation/filter-via-dot-access-data/tree/1.0.0"
+                "source": "https://github.com/consolidation/filter-via-dot-access-data/tree/2.0.2"
             },
-            "time": "2019-01-18T06:05:07+00:00"
+            "time": "2021-12-30T03:56:08+00:00"
         },
         {
             "name": "consolidation/log",
@@ -1716,30 +1681,37 @@
         },
         {
             "name": "dflydev/dot-access-data",
-            "version": "v1.1.0",
+            "version": "v3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dflydev/dflydev-dot-access-data.git",
-                "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a"
+                "reference": "0992cc19268b259a39e86f296da5f0677841f42c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/3fbd874921ab2c041e899d044585a2ab9795df8a",
-                "reference": "3fbd874921ab2c041e899d044585a2ab9795df8a",
+                "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/0992cc19268b259a39e86f296da5f0677841f42c",
+                "reference": "0992cc19268b259a39e86f296da5f0677841f42c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.2"
+                "php": "^7.1 || ^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^0.12.42",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.3",
+                "scrutinizer/ocular": "1.6.0",
+                "squizlabs/php_codesniffer": "^3.5",
+                "vimeo/psalm": "^3.14"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-main": "3.x-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Dflydev\\DotAccessData": "src"
+                "psr-4": {
+                    "Dflydev\\DotAccessData\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1761,6 +1733,11 @@
                     "name": "Carlos Frutos",
                     "email": "carlos@kiwing.it",
                     "homepage": "https://github.com/cfrutos"
+                },
+                {
+                    "name": "Colin O'Dell",
+                    "email": "colinodell@gmail.com",
+                    "homepage": "https://www.colinodell.com"
                 }
             ],
             "description": "Given a deep data structure, access data by dot notation.",
@@ -1773,9 +1750,9 @@
             ],
             "support": {
                 "issues": "https://github.com/dflydev/dflydev-dot-access-data/issues",
-                "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/master"
+                "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/v3.0.1"
             },
-            "time": "2017-01-20T21:14:22+00:00"
+            "time": "2021-08-13T13:06:58+00:00"
         },
         {
             "name": "doctrine/annotations",
@@ -2997,6 +2974,57 @@
                 "issues": "https://www.drupal.org/project/issues/ctools"
             }
         },
+        {
+            "name": "drupal/file_mdm",
+            "version": "2.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupalcode.org/project/file_mdm.git",
+                "reference": "8.x-2.4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/file_mdm-8.x-2.4.zip",
+                "reference": "8.x-2.4",
+                "shasum": "f0611a95417d35e98b7792dfffb569afe8bd6e7c"
+            },
+            "require": {
+                "drupal/core": "^9.2",
+                "lsolesen/pel": "^0.9.12",
+                "phenx/php-font-lib": "^0.5.4"
+            },
+            "require-dev": {
+                "drupal/image_effects": "*",
+                "drupal/vendor_stream_wrapper": "^2",
+                "fileeye/linuxlibertine-fonts": "^5.3"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "drupal": {
+                    "version": "8.x-2.4",
+                    "datestamp": "1645440700",
+                    "security-coverage": {
+                        "status": "covered",
+                        "message": "Covered by Drupal's security advisory policy"
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "mondrake",
+                    "homepage": "https://www.drupal.org/user/1307444"
+                }
+            ],
+            "description": "Provides a service to manage file metadata.",
+            "homepage": "https://www.drupal.org/project/file_mdm",
+            "support": {
+                "source": "https://git.drupalcode.org/project/file_mdm"
+            }
+        },
         {
             "name": "drupal/geofield",
             "version": "1.36.0",
@@ -3249,6 +3277,92 @@
                 "source": "https://git.drupalcode.org/project/imageapi_optimize_binaries"
             }
         },
+        {
+            "name": "drupal/imagemagick",
+            "version": "3.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupalcode.org/project/imagemagick.git",
+                "reference": "8.x-3.3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/imagemagick-8.x-3.3.zip",
+                "reference": "8.x-3.3",
+                "shasum": "b950caf621f23642b6f7bcbe8ae74d4d57f9ac3f"
+            },
+            "require": {
+                "drupal/core": "^9.2",
+                "drupal/file_mdm": "^2",
+                "drupal/sophron": "^1.2"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "drupal": {
+                    "version": "8.x-3.3",
+                    "datestamp": "1638027743",
+                    "security-coverage": {
+                        "status": "covered",
+                        "message": "Covered by Drupal's security advisory policy"
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Chris Charlton",
+                    "homepage": "https://www.drupal.org/user/17089"
+                },
+                {
+                    "name": "chx",
+                    "homepage": "https://www.drupal.org/user/9446"
+                },
+                {
+                    "name": "claudiu.cristea",
+                    "homepage": "https://www.drupal.org/user/56348"
+                },
+                {
+                    "name": "dman",
+                    "homepage": "https://www.drupal.org/user/33240"
+                },
+                {
+                    "name": "dopry",
+                    "homepage": "https://www.drupal.org/user/22202"
+                },
+                {
+                    "name": "drewish",
+                    "homepage": "https://www.drupal.org/user/34869"
+                },
+                {
+                    "name": "gdl",
+                    "homepage": "https://www.drupal.org/user/507326"
+                },
+                {
+                    "name": "mondrake",
+                    "homepage": "https://www.drupal.org/user/1307444"
+                },
+                {
+                    "name": "quicksketch",
+                    "homepage": "https://www.drupal.org/user/35821"
+                },
+                {
+                    "name": "sun",
+                    "homepage": "https://www.drupal.org/user/54136"
+                },
+                {
+                    "name": "walkah",
+                    "homepage": "https://www.drupal.org/user/1531"
+                }
+            ],
+            "description": "Provides an image toolkit to integrate ImageMagick with the Image API.",
+            "homepage": "https://www.drupal.org/project/imagemagick",
+            "support": {
+                "source": "https://git.drupalcode.org/project/imagemagick"
+            }
+        },
         {
             "name": "drupal/inline_entity_form",
             "version": "1.0.0-rc9",
@@ -4101,6 +4215,56 @@
                 "issues": "https://www.drupal.org/project/issues/social_auth_hid"
             }
         },
+        {
+            "name": "drupal/sophron",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupalcode.org/project/sophron.git",
+                "reference": "8.x-1.2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/sophron-8.x-1.2.zip",
+                "reference": "8.x-1.2",
+                "shasum": "f222f4db7d43ee604c6c7a8f5a17a76c16a66e93"
+            },
+            "require": {
+                "drupal/core": "^9.2",
+                "fileeye/mimemap": "^1.2.1"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "drupal": {
+                    "version": "8.x-1.2",
+                    "datestamp": "1637954244",
+                    "security-coverage": {
+                        "status": "covered",
+                        "message": "Covered by Drupal's security advisory policy"
+                    }
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Drupal\\sophron\\": "src/"
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "mondrake",
+                    "homepage": "https://www.drupal.org/user/1307444"
+                }
+            ],
+            "description": "Provides an extensive MIME types management API",
+            "homepage": "https://www.drupal.org/project/sophron",
+            "support": {
+                "source": "https://git.drupalcode.org/project/sophron"
+            }
+        },
         {
             "name": "drupal/svg_image",
             "version": "1.15.0",
@@ -4405,42 +4569,43 @@
         },
         {
             "name": "drush/drush",
-            "version": "10.6.2",
+            "version": "11.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drush-ops/drush.git",
-                "reference": "0a570a16ec63259eb71195aba5feab532318b337"
+                "reference": "c4817becc94e3d58ae5f21c29d338c3e035630b3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drush-ops/drush/zipball/0a570a16ec63259eb71195aba5feab532318b337",
-                "reference": "0a570a16ec63259eb71195aba5feab532318b337",
+                "url": "https://api.github.com/repos/drush-ops/drush/zipball/c4817becc94e3d58ae5f21c29d338c3e035630b3",
+                "reference": "c4817becc94e3d58ae5f21c29d338c3e035630b3",
                 "shasum": ""
             },
             "require": {
-                "chi-teck/drupal-code-generator": "^1.32.1",
+                "chi-teck/drupal-code-generator": "^2.4",
                 "composer/semver": "^1.4 || ^3",
-                "consolidation/config": "^1.2",
-                "consolidation/filter-via-dot-access-data": "^1",
-                "consolidation/robo": "^1.4.11 || ^2 || ^3",
-                "consolidation/site-alias": "^3.0.0@stable",
-                "consolidation/site-process": "^2.1 || ^4",
+                "consolidation/annotated-command": "^4.5",
+                "consolidation/config": "^2",
+                "consolidation/filter-via-dot-access-data": "^2",
+                "consolidation/robo": "^3.0.9",
+                "consolidation/site-alias": "^3.1.3",
+                "consolidation/site-process": "^4.1.3 || ^5",
                 "enlightn/security-checker": "^1",
                 "ext-dom": "*",
-                "grasmash/yaml-expander": "^1.1.1",
                 "guzzlehttp/guzzle": "^6.3 || ^7.0",
-                "league/container": "^2.5 || ^3.4",
-                "php": ">=7.1.3",
-                "psr/log": "~1.0",
-                "psy/psysh": ">=0.6 <0.11",
-                "symfony/event-dispatcher": "^3.4 || ^4.0",
-                "symfony/finder": "^3.4 || ^4.0 || ^5",
-                "symfony/var-dumper": "^3.4 || ^4.0 || ^5.0",
-                "symfony/yaml": "^3.4 || ^4.0",
+                "league/container": "^3.4 || ^4",
+                "php": ">=7.4",
+                "psy/psysh": "~0.11",
+                "symfony/event-dispatcher": "^4.0 || ^5.0 || ^6.0",
+                "symfony/finder": "^4.0 || ^5 || ^6",
+                "symfony/polyfill-php80": "^1.23",
+                "symfony/var-dumper": "^4.0 || ^5.0 || ^6.0",
+                "symfony/yaml": "^4.0 || ^5.0 || ^6.0",
                 "webflo/drupal-finder": "^1.2",
                 "webmozart/path-util": "^2.1.0"
             },
             "conflict": {
+                "drupal/core": "< 9.2",
                 "drupal/migrate_run": "*",
                 "drupal/migrate_tools": "<= 5"
             },
@@ -4448,13 +4613,15 @@
                 "composer/installers": "^1.7",
                 "cweagans/composer-patches": "~1.0",
                 "david-garcia/phpwhois": "4.3.0",
-                "drupal/alinks": "1.0.0",
-                "drupal/core-recommended": "^8.8",
+                "drupal/core-recommended": "^9 || ^10",
+                "drupal/semver_example": "2.3.0",
                 "phpunit/phpunit": ">=7.5.20",
-                "squizlabs/php_codesniffer": "^2.7 || ^3",
+                "rector/rector": "^0.12",
+                "squizlabs/php_codesniffer": "^3.6",
                 "vlucas/phpdotenv": "^2.4",
                 "yoast/phpunit-polyfills": "^0.2.0"
             },
+            "default-branch": true,
             "bin": [
                 "drush"
             ],
@@ -4489,8 +4656,7 @@
             },
             "autoload": {
                 "psr-4": {
-                    "Drush\\": "src/",
-                    "Drush\\Internal\\": "src/internal-forks"
+                    "Drush\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -4538,7 +4704,7 @@
                 "irc": "irc://irc.freenode.org/drush",
                 "issues": "https://github.com/drush-ops/drush/issues",
                 "slack": "https://drupal.slack.com/messages/C62H9CWQM",
-                "source": "https://github.com/drush-ops/drush/tree/10.6.2"
+                "source": "https://github.com/drush-ops/drush/tree/11.x"
             },
             "funding": [
                 {
@@ -4546,7 +4712,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-12-15T17:09:54+00:00"
+            "time": "2022-02-24T12:32:15+00:00"
         },
         {
             "name": "easyrdf/easyrdf",
@@ -4802,6 +4968,66 @@
             },
             "time": "2022-02-21T09:13:59+00:00"
         },
+        {
+            "name": "fileeye/mimemap",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/FileEye/MimeMap.git",
+                "reference": "4ceb1162e179b2e74683f3229543225db56798f1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/4ceb1162e179b2e74683f3229543225db56798f1",
+                "reference": "4ceb1162e179b2e74683f3229543225db56798f1",
+                "shasum": ""
+            },
+            "require": {
+                "composer-runtime-api": "^2.0.0",
+                "php": ">=5.6"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5 | ^6 | ^7 | ^8 | ^9",
+                "sebastian/comparator": "*",
+                "sebastian/diff": "*",
+                "squizlabs/php_codesniffer": "*",
+                "symfony/console": "*",
+                "symfony/filesystem": "*",
+                "symfony/var-dumper": "*",
+                "symfony/yaml": "*"
+            },
+            "bin": [
+                "bin/fileeye-mimemap"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "FileEye\\MimeMap\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0-or-later"
+            ],
+            "description": "A PHP library to handle MIME Content-Type fields and their related file extensions.",
+            "homepage": "https://github.com/FileEye/MimeMap",
+            "keywords": [
+                "mime",
+                "mime-database",
+                "mime-parser",
+                "mime-type"
+            ],
+            "support": {
+                "issues": "https://github.com/FileEye/MimeMap/issues",
+                "source": "https://github.com/FileEye/MimeMap/tree/1.2.1"
+            },
+            "time": "2021-11-22T13:10:38+00:00"
+        },
         {
             "name": "friends-of-behat/mink-browserkit-driver",
             "version": "v1.6.1",
@@ -4866,27 +5092,28 @@
         },
         {
             "name": "grasmash/expander",
-            "version": "1.0.0",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/grasmash/expander.git",
-                "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f"
+                "reference": "f4df21d01d1fbda38269cca89e3dbb6ba223da7f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/grasmash/expander/zipball/95d6037344a4be1dd5f8e0b0b2571a28c397578f",
-                "reference": "95d6037344a4be1dd5f8e0b0b2571a28c397578f",
+                "url": "https://api.github.com/repos/grasmash/expander/zipball/f4df21d01d1fbda38269cca89e3dbb6ba223da7f",
+                "reference": "f4df21d01d1fbda38269cca89e3dbb6ba223da7f",
                 "shasum": ""
             },
             "require": {
-                "dflydev/dot-access-data": "^1.1.0",
-                "php": ">=5.4"
+                "dflydev/dot-access-data": "^3.0.0",
+                "php": ">=5.6",
+                "psr/log": "^1 | ^2"
             },
             "require-dev": {
                 "greg-1-anderson/composer-test-scenarios": "^1",
-                "phpunit/phpunit": "^4|^5.5.4",
-                "satooshi/php-coveralls": "^1.0.2|dev-master",
-                "squizlabs/php_codesniffer": "^2.7"
+                "php-coveralls/php-coveralls": "^2.0",
+                "phpunit/phpunit": "^6.0 || ^8.0 || ^9",
+                "squizlabs/php_codesniffer": "^2.7 || ^3.3"
             },
             "type": "library",
             "extra": {
@@ -4911,95 +5138,43 @@
             "description": "Expands internal property references in PHP arrays file.",
             "support": {
                 "issues": "https://github.com/grasmash/expander/issues",
-                "source": "https://github.com/grasmash/expander/tree/master"
+                "source": "https://github.com/grasmash/expander/tree/2.0.2"
             },
-            "time": "2017-12-21T22:14:55+00:00"
+            "time": "2022-02-24T03:58:20+00:00"
         },
         {
-            "name": "grasmash/yaml-expander",
-            "version": "1.4.0",
+            "name": "guzzlehttp/guzzle",
+            "version": "6.5.5",
             "source": {
                 "type": "git",
-                "url": "https://github.com/grasmash/yaml-expander.git",
-                "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1"
+                "url": "https://github.com/guzzle/guzzle.git",
+                "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/grasmash/yaml-expander/zipball/3f0f6001ae707a24f4d9733958d77d92bf9693b1",
-                "reference": "3f0f6001ae707a24f4d9733958d77d92bf9693b1",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
+                "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
                 "shasum": ""
             },
             "require": {
-                "dflydev/dot-access-data": "^1.1.0",
-                "php": ">=5.4",
-                "symfony/yaml": "^2.8.11|^3|^4"
+                "ext-json": "*",
+                "guzzlehttp/promises": "^1.0",
+                "guzzlehttp/psr7": "^1.6.1",
+                "php": ">=5.5",
+                "symfony/polyfill-intl-idn": "^1.17.0"
             },
             "require-dev": {
-                "greg-1-anderson/composer-test-scenarios": "^1",
-                "phpunit/phpunit": "^4.8|^5.5.4",
-                "satooshi/php-coveralls": "^1.0.2|dev-master",
-                "squizlabs/php_codesniffer": "^2.7"
+                "ext-curl": "*",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
+                "psr/log": "^1.1"
+            },
+            "suggest": {
+                "psr/log": "Required for using the Log middleware"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Grasmash\\YamlExpander\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Matthew Grasmick"
-                }
-            ],
-            "description": "Expands internal property references in a yaml file.",
-            "support": {
-                "issues": "https://github.com/grasmash/yaml-expander/issues",
-                "source": "https://github.com/grasmash/yaml-expander/tree/master"
-            },
-            "time": "2017-12-16T16:06:03+00:00"
-        },
-        {
-            "name": "guzzlehttp/guzzle",
-            "version": "6.5.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
-                "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
-                "shasum": ""
-            },
-            "require": {
-                "ext-json": "*",
-                "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.6.1",
-                "php": ">=5.5",
-                "symfony/polyfill-intl-idn": "^1.17.0"
-            },
-            "require-dev": {
-                "ext-curl": "*",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
-                "psr/log": "^1.1"
-            },
-            "suggest": {
-                "psr/log": "Required for using the Log middleware"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "6.5-dev"
+                    "dev-master": "6.5-dev"
                 }
             },
             "autoload": {
@@ -5664,42 +5839,52 @@
         },
         {
             "name": "league/commonmark",
-            "version": "1.6.7",
+            "version": "2.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "2b8185c13bc9578367a5bf901881d1c1b5bbd09b"
+                "reference": "13d7751377732637814f0cda0e3f6d3243f9f769"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/2b8185c13bc9578367a5bf901881d1c1b5bbd09b",
-                "reference": "2b8185c13bc9578367a5bf901881d1c1b5bbd09b",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/13d7751377732637814f0cda0e3f6d3243f9f769",
+                "reference": "13d7751377732637814f0cda0e3f6d3243f9f769",
                 "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
-                "php": "^7.1 || ^8.0"
-            },
-            "conflict": {
-                "scrutinizer/ocular": "1.7.*"
-            },
-            "require-dev": {
-                "cebe/markdown": "~1.0",
-                "commonmark/commonmark.js": "0.29.2",
-                "erusev/parsedown": "~1.0",
+                "league/config": "^1.1.1",
+                "php": "^7.4 || ^8.0",
+                "psr/event-dispatcher": "^1.0",
+                "symfony/deprecation-contracts": "^2.1 || ^3.0",
+                "symfony/polyfill-php80": "^1.15"
+            },
+            "require-dev": {
+                "cebe/markdown": "^1.0",
+                "commonmark/cmark": "0.30.0",
+                "commonmark/commonmark.js": "0.30.0",
+                "composer/package-versions-deprecated": "^1.8",
+                "erusev/parsedown": "^1.0",
                 "ext-json": "*",
                 "github/gfm": "0.29.0",
-                "michelf/php-markdown": "~1.4",
-                "mikehaertl/php-shellcommand": "^1.4",
-                "phpstan/phpstan": "^0.12.90",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.2",
-                "scrutinizer/ocular": "^1.5",
-                "symfony/finder": "^4.2"
+                "michelf/php-markdown": "^1.4",
+                "phpstan/phpstan": "^0.12.88 || ^1.0.0",
+                "phpunit/phpunit": "^9.5.5",
+                "scrutinizer/ocular": "^1.8.1",
+                "symfony/finder": "^5.3",
+                "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0",
+                "unleashedtech/php-coding-standard": "^3.1",
+                "vimeo/psalm": "^4.7.3"
+            },
+            "suggest": {
+                "symfony/yaml": "v2.3+ required if using the Front Matter extension"
             },
-            "bin": [
-                "bin/commonmark"
-            ],
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "2.3-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "League\\CommonMark\\": "src"
@@ -5717,7 +5902,7 @@
                     "role": "Lead Developer"
                 }
             ],
-            "description": "Highly-extensible PHP Markdown parser which fully supports the CommonMark spec and Github-Flavored Markdown (GFM)",
+            "description": "Highly-extensible PHP Markdown parser which fully supports the CommonMark spec and GitHub-Flavored Markdown (GFM)",
             "homepage": "https://commonmark.thephpleague.com",
             "keywords": [
                 "commonmark",
@@ -5731,6 +5916,7 @@
             ],
             "support": {
                 "docs": "https://commonmark.thephpleague.com/",
+                "forum": "https://github.com/thephpleague/commonmark/discussions",
                 "issues": "https://github.com/thephpleague/commonmark/issues",
                 "rss": "https://github.com/thephpleague/commonmark/releases.atom",
                 "source": "https://github.com/thephpleague/commonmark"
@@ -5753,25 +5939,107 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-13T17:18:13+00:00"
+            "time": "2022-02-13T15:00:57+00:00"
+        },
+        {
+            "name": "league/config",
+            "version": "v1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/config.git",
+                "reference": "a9d39eeeb6cc49d10a6e6c36f22c4c1f4a767f3e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/config/zipball/a9d39eeeb6cc49d10a6e6c36f22c4c1f4a767f3e",
+                "reference": "a9d39eeeb6cc49d10a6e6c36f22c4c1f4a767f3e",
+                "shasum": ""
+            },
+            "require": {
+                "dflydev/dot-access-data": "^3.0.1",
+                "nette/schema": "^1.2",
+                "php": "^7.4 || ^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^0.12.90",
+                "phpunit/phpunit": "^9.5.5",
+                "scrutinizer/ocular": "^1.8.1",
+                "unleashedtech/php-coding-standard": "^3.1",
+                "vimeo/psalm": "^4.7.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "League\\Config\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Colin O'Dell",
+                    "email": "colinodell@gmail.com",
+                    "homepage": "https://www.colinodell.com",
+                    "role": "Lead Developer"
+                }
+            ],
+            "description": "Define configuration arrays with strict schemas and access values with dot notation",
+            "homepage": "https://config.thephpleague.com",
+            "keywords": [
+                "array",
+                "config",
+                "configuration",
+                "dot",
+                "dot-access",
+                "nested",
+                "schema"
+            ],
+            "support": {
+                "docs": "https://config.thephpleague.com/",
+                "issues": "https://github.com/thephpleague/config/issues",
+                "rss": "https://github.com/thephpleague/config/releases.atom",
+                "source": "https://github.com/thephpleague/config"
+            },
+            "funding": [
+                {
+                    "url": "https://www.colinodell.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.paypal.me/colinpodell/10.00",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/colinodell",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-08-14T12:15:32+00:00"
         },
         {
             "name": "league/container",
-            "version": "3.4.1",
+            "version": "4.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/container.git",
-                "reference": "84ecbc2dbecc31bd23faf759a0e329ee49abddbd"
+                "reference": "375d13cb828649599ef5d48a339c4af7a26cd0ab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/container/zipball/84ecbc2dbecc31bd23faf759a0e329ee49abddbd",
-                "reference": "84ecbc2dbecc31bd23faf759a0e329ee49abddbd",
+                "url": "https://api.github.com/repos/thephpleague/container/zipball/375d13cb828649599ef5d48a339c4af7a26cd0ab",
+                "reference": "375d13cb828649599ef5d48a339c4af7a26cd0ab",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.0 || ^8.0",
-                "psr/container": "^1.0.0"
+                "php": "^7.2 || ^8.0",
+                "psr/container": "^1.1 || ^2.0"
             },
             "provide": {
                 "psr/container-implementation": "^1.0"
@@ -5780,15 +6048,19 @@
                 "orno/di": "~2.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6.0 || ^7.0",
+                "nette/php-generator": "^3.4",
+                "nikic/php-parser": "^4.10",
+                "phpstan/phpstan": "^0.12.47",
+                "phpunit/phpunit": "^8.5.17",
                 "roave/security-advisories": "dev-latest",
                 "scrutinizer/ocular": "^1.8",
-                "squizlabs/php_codesniffer": "^3.5"
+                "squizlabs/php_codesniffer": "^3.6"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.x-dev",
+                    "dev-master": "4.x-dev",
+                    "dev-4.x": "4.x-dev",
                     "dev-3.x": "3.x-dev",
                     "dev-2.x": "2.x-dev",
                     "dev-1.x": "1.x-dev"
@@ -5806,8 +6078,7 @@
             "authors": [
                 {
                     "name": "Phil Bennett",
-                    "email": "philipobenito@gmail.com",
-                    "homepage": "http://www.philipobenito.com",
+                    "email": "mail@philbennett.co.uk",
                     "role": "Developer"
                 }
             ],
@@ -5824,7 +6095,7 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/container/issues",
-                "source": "https://github.com/thephpleague/container/tree/3.4.1"
+                "source": "https://github.com/thephpleague/container/tree/4.2.0"
             },
             "funding": [
                 {
@@ -5832,7 +6103,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-07-09T08:23:52+00:00"
+            "time": "2021-11-16T10:29:06+00:00"
         },
         {
             "name": "league/html-to-markdown",
@@ -5993,6 +6264,66 @@
             },
             "time": "2021-12-22T16:42:49+00:00"
         },
+        {
+            "name": "lsolesen/pel",
+            "version": "0.9.12",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pel/pel.git",
+                "reference": "b95fe29cdacf9d36330da277f10910a13648c84c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pel/pel/zipball/b95fe29cdacf9d36330da277f10910a13648c84c",
+                "reference": "b95fe29cdacf9d36330da277f10910a13648c84c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1.0"
+            },
+            "require-dev": {
+                "ext-exif": "*",
+                "ext-gd": "*",
+                "php-coveralls/php-coveralls": ">2.4",
+                "squizlabs/php_codesniffer": ">3.5",
+                "symfony/phpunit-bridge": "^4 || ^5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "lsolesen\\pel\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "Lars Olesen",
+                    "email": "lars@intraface.dk",
+                    "homepage": "http://intraface.dk",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Martin Geisler",
+                    "email": "martin@geisler.net",
+                    "homepage": "http://geisler.net",
+                    "role": "Developer"
+                }
+            ],
+            "description": "PHP Exif Library. A library for reading and writing Exif headers in JPEG and TIFF images using PHP.",
+            "homepage": "http://pel.github.com/pel/",
+            "keywords": [
+                "exif",
+                "image"
+            ],
+            "support": {
+                "issues": "https://github.com/pel/pel/issues",
+                "source": "https://github.com/pel/pel/tree/0.9.12"
+            },
+            "time": "2022-02-18T13:20:54+00:00"
+        },
         {
             "name": "masterminds/html5",
             "version": "2.7.5",
@@ -6168,6 +6499,153 @@
             ],
             "time": "2020-11-13T09:40:50+00:00"
         },
+        {
+            "name": "nette/schema",
+            "version": "v1.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nette/schema.git",
+                "reference": "9a39cef03a5b34c7de64f551538cbba05c2be5df"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nette/schema/zipball/9a39cef03a5b34c7de64f551538cbba05c2be5df",
+                "reference": "9a39cef03a5b34c7de64f551538cbba05c2be5df",
+                "shasum": ""
+            },
+            "require": {
+                "nette/utils": "^2.5.7 || ^3.1.5 ||  ^4.0",
+                "php": ">=7.1 <8.2"
+            },
+            "require-dev": {
+                "nette/tester": "^2.3 || ^2.4",
+                "phpstan/phpstan-nette": "^0.12",
+                "tracy/tracy": "^2.7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause",
+                "GPL-2.0-only",
+                "GPL-3.0-only"
+            ],
+            "authors": [
+                {
+                    "name": "David Grudl",
+                    "homepage": "https://davidgrudl.com"
+                },
+                {
+                    "name": "Nette Community",
+                    "homepage": "https://nette.org/contributors"
+                }
+            ],
+            "description": "📐 Nette Schema: validating data structures against a given Schema.",
+            "homepage": "https://nette.org",
+            "keywords": [
+                "config",
+                "nette"
+            ],
+            "support": {
+                "issues": "https://github.com/nette/schema/issues",
+                "source": "https://github.com/nette/schema/tree/v1.2.2"
+            },
+            "time": "2021-10-15T11:40:02+00:00"
+        },
+        {
+            "name": "nette/utils",
+            "version": "v3.2.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nette/utils.git",
+                "reference": "0af4e3de4df9f1543534beab255ccf459e7a2c99"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nette/utils/zipball/0af4e3de4df9f1543534beab255ccf459e7a2c99",
+                "reference": "0af4e3de4df9f1543534beab255ccf459e7a2c99",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2 <8.2"
+            },
+            "conflict": {
+                "nette/di": "<3.0.6"
+            },
+            "require-dev": {
+                "nette/tester": "~2.0",
+                "phpstan/phpstan": "^1.0",
+                "tracy/tracy": "^2.3"
+            },
+            "suggest": {
+                "ext-gd": "to use Image",
+                "ext-iconv": "to use Strings::webalize(), toAscii(), chr() and reverse()",
+                "ext-intl": "to use Strings::webalize(), toAscii(), normalize() and compare()",
+                "ext-json": "to use Nette\\Utils\\Json",
+                "ext-mbstring": "to use Strings::lower() etc...",
+                "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()",
+                "ext-xml": "to use Strings::length() etc. when mbstring is not available"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause",
+                "GPL-2.0-only",
+                "GPL-3.0-only"
+            ],
+            "authors": [
+                {
+                    "name": "David Grudl",
+                    "homepage": "https://davidgrudl.com"
+                },
+                {
+                    "name": "Nette Community",
+                    "homepage": "https://nette.org/contributors"
+                }
+            ],
+            "description": "🛠  Nette Utils: lightweight utilities for string & array manipulation, image handling, safe JSON encoding/decoding, validation, slug or strong password generating etc.",
+            "homepage": "https://nette.org",
+            "keywords": [
+                "array",
+                "core",
+                "datetime",
+                "images",
+                "json",
+                "nette",
+                "paginator",
+                "password",
+                "slugify",
+                "string",
+                "unicode",
+                "utf-8",
+                "utility",
+                "validation"
+            ],
+            "support": {
+                "issues": "https://github.com/nette/utils/issues",
+                "source": "https://github.com/nette/utils/tree/v3.2.7"
+            },
+            "time": "2022-01-24T11:29:14+00:00"
+        },
         {
             "name": "nikic/php-parser",
             "version": "v4.13.2",
@@ -6742,25 +7220,69 @@
             "time": "2014-12-02T06:11:22+00:00"
         },
         {
-            "name": "phpdocumentor/reflection-common",
-            "version": "2.2.0",
+            "name": "phenx/php-font-lib",
+            "version": "0.5.4",
             "source": {
                 "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
+                "url": "https://github.com/dompdf/php-font-lib.git",
+                "reference": "dd448ad1ce34c63d09baccd05415e361300c35b4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+                "url": "https://api.github.com/repos/dompdf/php-font-lib/zipball/dd448ad1ce34c63d09baccd05415e361300c35b4",
+                "reference": "dd448ad1ce34c63d09baccd05415e361300c35b4",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0"
+                "ext-mbstring": "*"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "^3 || ^4 || ^5"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
+            "autoload": {
+                "psr-4": {
+                    "FontLib\\": "src/FontLib"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Ménager",
+                    "email": "fabien.menager@gmail.com"
+                }
+            ],
+            "description": "A library to read, parse, export and make subsets of different types of font files.",
+            "homepage": "https://github.com/PhenX/php-font-lib",
+            "support": {
+                "issues": "https://github.com/dompdf/php-font-lib/issues",
+                "source": "https://github.com/dompdf/php-font-lib/tree/0.5.4"
+            },
+            "time": "2021-12-17T19:44:54+00:00"
+        },
+        {
+            "name": "phpdocumentor/reflection-common",
+            "version": "2.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
                     "dev-2.x": "2.x-dev"
                 }
             },
@@ -7535,6 +8057,56 @@
             },
             "time": "2021-03-05T17:36:06+00:00"
         },
+        {
+            "name": "psr/event-dispatcher",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/event-dispatcher.git",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\EventDispatcher\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Standard interfaces for event handling.",
+            "keywords": [
+                "events",
+                "psr",
+                "psr-14"
+            ],
+            "support": {
+                "issues": "https://github.com/php-fig/event-dispatcher/issues",
+                "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
+            },
+            "time": "2019-01-08T18:20:26+00:00"
+        },
         {
             "name": "psr/http-factory",
             "version": "1.0.1",
@@ -7695,29 +8267,29 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.10.12",
+            "version": "v0.11.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "a0d9981aa07ecfcbea28e4bfa868031cca121e7d"
+                "reference": "570292577277f06f590635381a7f761a6cf4f026"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/a0d9981aa07ecfcbea28e4bfa868031cca121e7d",
-                "reference": "a0d9981aa07ecfcbea28e4bfa868031cca121e7d",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/570292577277f06f590635381a7f761a6cf4f026",
+                "reference": "570292577277f06f590635381a7f761a6cf4f026",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "ext-tokenizer": "*",
-                "nikic/php-parser": "~4.0|~3.0|~2.0|~1.3",
-                "php": "^8.0 || ^7.0 || ^5.5.9",
-                "symfony/console": "~5.0|~4.0|~3.0|^2.4.2|~2.3.10",
-                "symfony/var-dumper": "~5.0|~4.0|~3.0|~2.7"
+                "nikic/php-parser": "^4.0 || ^3.1",
+                "php": "^8.0 || ^7.0.8",
+                "symfony/console": "^6.0 || ^5.0 || ^4.0 || ^3.4",
+                "symfony/var-dumper": "^6.0 || ^5.0 || ^4.0 || ^3.4"
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.2",
-                "hoa/console": "3.17.*"
+                "hoa/console": "3.17.05.02"
             },
             "suggest": {
                 "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)",
@@ -7732,7 +8304,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "0.10.x-dev"
+                    "dev-main": "0.11.x-dev"
                 }
             },
             "autoload": {
@@ -7764,9 +8336,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.10.12"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.11.1"
             },
-            "time": "2021-11-30T14:05:36+00:00"
+            "time": "2022-01-03T13:58:38+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -7890,20 +8462,20 @@
         },
         {
             "name": "reliefweb/api-indexer",
-            "version": "v2.1.1",
+            "version": "v2.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/UN-OCHA/rwint-api-indexer.git",
-                "reference": "2178a619c256dad06022896f6bca0efa1889188d"
+                "reference": "ba9313e6d384b2921a39600fe93ca7897dedb4f2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/UN-OCHA/rwint-api-indexer/zipball/2178a619c256dad06022896f6bca0efa1889188d",
-                "reference": "2178a619c256dad06022896f6bca0efa1889188d",
+                "url": "https://api.github.com/repos/UN-OCHA/rwint-api-indexer/zipball/ba9313e6d384b2921a39600fe93ca7897dedb4f2",
+                "reference": "ba9313e6d384b2921a39600fe93ca7897dedb4f2",
                 "shasum": ""
             },
             "require": {
-                "league/commonmark": "^1.6",
+                "league/commonmark": "^2.2",
                 "php": ">=8.0"
             },
             "require-dev": {
@@ -7939,10 +8511,10 @@
                 "reliefweb"
             ],
             "support": {
-                "source": "https://github.com/UN-OCHA/rwint-api-indexer/tree/v2.1.1",
+                "source": "https://github.com/UN-OCHA/rwint-api-indexer/tree/v2.2.1",
                 "issues": "https://github.com/UN-OCHA/rwint-api-indexer/issues"
             },
-            "time": "2022-02-07T05:27:53+00:00"
+            "time": "2022-02-25T07:15:03+00:00"
         },
         {
             "name": "reliefweb/simple-autocomplete",
@@ -10848,12 +11420,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -10976,6 +11548,87 @@
             ],
             "time": "2021-05-27T09:27:20+00:00"
         },
+        {
+            "name": "symfony/polyfill-intl-grapheme",
+            "version": "v1.24.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
+                "reference": "81b86b50cf841a64252b439e738e97f4a34e2783"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783",
+                "reference": "81b86b50cf841a64252b439e738e97f4a34e2783",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.23-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's grapheme_* functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "grapheme",
+                "intl",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.24.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2021-11-23T21:10:46+00:00"
+        },
         {
             "name": "symfony/polyfill-intl-idn",
             "version": "v1.23.0",
@@ -11963,6 +12616,91 @@
             ],
             "time": "2021-11-04T16:48:04+00:00"
         },
+        {
+            "name": "symfony/string",
+            "version": "v6.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/string.git",
+                "reference": "522144f0c4c004c80d56fa47e40e17028e2eefc2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/string/zipball/522144f0c4c004c80d56fa47e40e17028e2eefc2",
+                "reference": "522144f0c4c004c80d56fa47e40e17028e2eefc2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0.2",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-intl-grapheme": "~1.0",
+                "symfony/polyfill-intl-normalizer": "~1.0",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "conflict": {
+                "symfony/translation-contracts": "<2.0"
+            },
+            "require-dev": {
+                "symfony/error-handler": "^5.4|^6.0",
+                "symfony/http-client": "^5.4|^6.0",
+                "symfony/translation-contracts": "^2.0|^3.0",
+                "symfony/var-exporter": "^5.4|^6.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\String\\": ""
+                },
+                "files": [
+                    "Resources/functions.php"
+                ],
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "grapheme",
+                "i18n",
+                "string",
+                "unicode",
+                "utf-8",
+                "utf8"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/string/tree/v6.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-01-02T09:55:41+00:00"
+        },
         {
             "name": "symfony/translation",
             "version": "v4.4.34",
@@ -12719,12 +13457,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/UN-OCHA/common_design.git",
-                "reference": "1d101edc8e39ad4cdc35e3d9a55eb7d5feb77850"
+                "reference": "8e7dd6d96fbfbe83b63ef4a65dbe12588534245a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/1d101edc8e39ad4cdc35e3d9a55eb7d5feb77850",
-                "reference": "1d101edc8e39ad4cdc35e3d9a55eb7d5feb77850",
+                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/8e7dd6d96fbfbe83b63ef4a65dbe12588534245a",
+                "reference": "8e7dd6d96fbfbe83b63ef4a65dbe12588534245a",
                 "shasum": ""
             },
             "require": {
@@ -12739,7 +13477,7 @@
                 "source": "https://github.com/UN-OCHA/common_design/tree/cd-304-forms",
                 "issues": "https://github.com/UN-OCHA/common_design/issues"
             },
-            "time": "2022-02-01T20:19:59+00:00"
+            "time": "2022-02-24T11:23:19+00:00"
         },
         {
             "name": "webflo/drupal-finder",
@@ -12896,74 +13634,6 @@
         }
     ],
     "packages-dev": [
-        {
-            "name": "alchemy/zippy",
-            "version": "0.4.9",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/alchemy-fr/Zippy.git",
-                "reference": "59fbeefb9a249122867ef25e53addfcce31850d7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/alchemy-fr/Zippy/zipball/59fbeefb9a249122867ef25e53addfcce31850d7",
-                "reference": "59fbeefb9a249122867ef25e53addfcce31850d7",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/collections": "~1.0",
-                "php": ">=5.5",
-                "symfony/filesystem": "^2.0.5 || ^3.0 || ^4.0",
-                "symfony/polyfill-mbstring": "^1.3",
-                "symfony/process": "^2.1 || ^3.0 || ^4.0"
-            },
-            "require-dev": {
-                "ext-zip": "*",
-                "guzzle/guzzle": "~3.0",
-                "guzzlehttp/guzzle": "^6.0",
-                "phpunit/phpunit": "^4.0 || ^5.0",
-                "symfony/finder": "^2.0.5 || ^3.0 || ^4.0"
-            },
-            "suggest": {
-                "ext-zip": "To use the ZipExtensionAdapter",
-                "guzzle/guzzle": "To use the GuzzleTeleporter with Guzzle 3",
-                "guzzlehttp/guzzle": "To use the GuzzleTeleporter with Guzzle 6"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.4.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Alchemy\\Zippy\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Alchemy",
-                    "email": "dev.team@alchemy.fr",
-                    "homepage": "http://www.alchemy.fr/"
-                }
-            ],
-            "description": "Zippy, the archive manager companion",
-            "keywords": [
-                "bzip",
-                "compression",
-                "tar",
-                "zip"
-            ],
-            "support": {
-                "issues": "https://github.com/alchemy-fr/Zippy/issues",
-                "source": "https://github.com/alchemy-fr/Zippy/tree/master"
-            },
-            "time": "2018-02-22T13:58:36+00:00"
-        },
         {
             "name": "behat/mink-goutte-driver",
             "version": "v1.3.0",
@@ -13023,128 +13693,8 @@
             "time": "2021-10-12T11:35:46+00:00"
         },
         {
-            "name": "dflydev/dot-access-configuration",
-            "version": "v1.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/dflydev/dflydev-dot-access-configuration.git",
-                "reference": "2e6eb0c8b8830b26bb23defcfc38d4276508fc49"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-configuration/zipball/2e6eb0c8b8830b26bb23defcfc38d4276508fc49",
-                "reference": "2e6eb0c8b8830b26bb23defcfc38d4276508fc49",
-                "shasum": ""
-            },
-            "require": {
-                "dflydev/dot-access-data": "1.*",
-                "dflydev/placeholder-resolver": "1.*",
-                "php": ">=5.3.2"
-            },
-            "require-dev": {
-                "symfony/yaml": "~2.1"
-            },
-            "suggest": {
-                "symfony/yaml": "Required for using the YAML Configuration Builders"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Dflydev\\DotAccessConfiguration": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Dragonfly Development Inc.",
-                    "email": "info@dflydev.com",
-                    "homepage": "http://dflydev.com"
-                },
-                {
-                    "name": "Beau Simensen",
-                    "email": "beau@dflydev.com",
-                    "homepage": "http://beausimensen.com"
-                }
-            ],
-            "description": "Given a deep data structure representing a configuration, access configuration by dot notation.",
-            "homepage": "https://github.com/dflydev/dflydev-dot-access-configuration",
-            "keywords": [
-                "config",
-                "configuration"
-            ],
-            "support": {
-                "issues": "https://github.com/dflydev/dflydev-dot-access-configuration/issues",
-                "source": "https://github.com/dflydev/dflydev-dot-access-configuration/tree/master"
-            },
-            "time": "2018-09-08T23:00:17+00:00"
-        },
-        {
-            "name": "dflydev/placeholder-resolver",
-            "version": "v1.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/dflydev/dflydev-placeholder-resolver.git",
-                "reference": "d0161b4be1e15838327b01b21d0149f382d69906"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/dflydev/dflydev-placeholder-resolver/zipball/d0161b4be1e15838327b01b21d0149f382d69906",
-                "reference": "d0161b4be1e15838327b01b21d0149f382d69906",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Dflydev\\PlaceholderResolver": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Dragonfly Development Inc.",
-                    "email": "info@dflydev.com",
-                    "homepage": "http://dflydev.com"
-                },
-                {
-                    "name": "Beau Simensen",
-                    "email": "beau@dflydev.com",
-                    "homepage": "http://beausimensen.com"
-                }
-            ],
-            "description": "Given a data source representing key => value pairs, resolve placeholders like ${foo.bar} to the value associated with the 'foo.bar' key in the data source.",
-            "homepage": "https://github.com/dflydev/dflydev-placeholder-resolver",
-            "keywords": [
-                "placeholder",
-                "resolver"
-            ],
-            "support": {
-                "issues": "https://github.com/dflydev/dflydev-placeholder-resolver/issues",
-                "source": "https://github.com/dflydev/dflydev-placeholder-resolver/tree/v1.0.3"
-            },
-            "time": "2021-12-03T16:48:58+00:00"
-        },
-        {
-            "name": "doctrine/cache",
-            "version": "1.12.1",
+            "name": "doctrine/cache",
+            "version": "1.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/cache.git",
@@ -13772,291 +14322,6 @@
                 "slack": "https://drupal.slack.com/archives/C45342CDD"
             }
         },
-        {
-            "name": "drupal/console",
-            "version": "1.9.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hechoendrupal/drupal-console.git",
-                "reference": "d292c940c07d164e32bbe9525e909311ca65e8cb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hechoendrupal/drupal-console/zipball/d292c940c07d164e32bbe9525e909311ca65e8cb",
-                "reference": "d292c940c07d164e32bbe9525e909311ca65e8cb",
-                "shasum": ""
-            },
-            "require": {
-                "alchemy/zippy": "~0.4",
-                "composer/installers": "~1.0",
-                "doctrine/annotations": "^1.2",
-                "doctrine/collections": "^1.3",
-                "drupal/console-core": "1.9.7",
-                "drupal/console-extend-plugin": "~0.9.5",
-                "php": ">=7.0.8",
-                "psy/psysh": "0.6.* || ~0.8",
-                "symfony/css-selector": "~3.0|~4.0",
-                "symfony/dom-crawler": "~3.0|~4.0",
-                "symfony/http-foundation": "~3.0|~4.0"
-            },
-            "suggest": {
-                "symfony/thanks": "Thank your favorite PHP projects on GitHub using the CLI",
-                "vlucas/phpdotenv": "Loads environment variables from .env to getenv(), $_ENV and $_SERVER automagically"
-            },
-            "bin": [
-                "bin/drupal"
-            ],
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Drupal\\Console\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "GPL-2.0-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "David Flores",
-                    "email": "dmousex@gmail.com",
-                    "homepage": "http://dmouse.net"
-                },
-                {
-                    "name": "Jesus Manuel Olivas",
-                    "email": "jesus.olivas@gmail.com",
-                    "homepage": "http://jmolivas.com"
-                },
-                {
-                    "name": "Eduardo Garcia",
-                    "email": "enzo@enzolutions.com",
-                    "homepage": "http://enzolutions.com/"
-                },
-                {
-                    "name": "Omar Aguirre",
-                    "email": "omersguchigu@gmail.com"
-                },
-                {
-                    "name": "Drupal Console Contributors",
-                    "homepage": "https://github.com/hechoendrupal/drupal-console/graphs/contributors"
-                }
-            ],
-            "description": "The Drupal CLI. A tool to generate boilerplate code, interact with and debug Drupal.",
-            "homepage": "http://drupalconsole.com/",
-            "keywords": [
-                "console",
-                "development",
-                "drupal",
-                "symfony"
-            ],
-            "support": {
-                "docs": "https://docs.drupalconsole.com/",
-                "forum": "https://gitter.im/hechoendrupal/DrupalConsole",
-                "issues": "https://github.com/hechoendrupal/drupal-console/issues",
-                "source": "https://github.com/hechoendrupal/drupal-console/tree/1.9.8"
-            },
-            "funding": [
-                {
-                    "url": "https://opencollective.com/drupalconsole",
-                    "type": "open_collective"
-                }
-            ],
-            "time": "2021-11-29T17:09:44+00:00"
-        },
-        {
-            "name": "drupal/console-core",
-            "version": "1.9.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hechoendrupal/drupal-console-core.git",
-                "reference": "ab3abc2631761c9588230ba88189d9ba4eb9ed63"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hechoendrupal/drupal-console-core/zipball/ab3abc2631761c9588230ba88189d9ba4eb9ed63",
-                "reference": "ab3abc2631761c9588230ba88189d9ba4eb9ed63",
-                "shasum": ""
-            },
-            "require": {
-                "dflydev/dot-access-configuration": "^1.0",
-                "drupal/console-en": "1.9.7",
-                "guzzlehttp/guzzle": "~6.1",
-                "php": ">=7.0.8",
-                "stecman/symfony-console-completion": "~0.7",
-                "symfony/config": "~3.0|^4.4",
-                "symfony/console": "~3.0|^4.4",
-                "symfony/debug": "~3.0|^4.4",
-                "symfony/dependency-injection": "~3.0|^4.4",
-                "symfony/event-dispatcher": "~3.0|^4.4",
-                "symfony/filesystem": "~3.0|^4.4",
-                "symfony/finder": "~3.0|^4.4",
-                "symfony/process": "~3.0|^4.4",
-                "symfony/translation": "~3.0|^4.4",
-                "symfony/yaml": "~3.0|^4.4",
-                "twig/twig": "^1.38.2|^2.12.0",
-                "webflo/drupal-finder": "^1.0",
-                "webmozart/path-util": "^2.3"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "src/functions.php"
-                ],
-                "psr-4": {
-                    "Drupal\\Console\\Core\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "GPL-2.0-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "David Flores",
-                    "email": "dmousex@gmail.com",
-                    "homepage": "http://dmouse.net"
-                },
-                {
-                    "name": "Jesus Manuel Olivas",
-                    "email": "jesus.olivas@gmail.com",
-                    "homepage": "http://jmolivas.com"
-                },
-                {
-                    "name": "Eduardo Garcia",
-                    "email": "enzo@enzolutions.com",
-                    "homepage": "http://enzolutions.com/"
-                },
-                {
-                    "name": "Omar Aguirre",
-                    "email": "omersguchigu@gmail.com"
-                },
-                {
-                    "name": "Drupal Console Contributors",
-                    "homepage": "https://github.com/hechoendrupal/DrupalConsole/graphs/contributors"
-                }
-            ],
-            "description": "Drupal Console Core",
-            "homepage": "http://drupalconsole.com/",
-            "keywords": [
-                "console",
-                "development",
-                "drupal",
-                "symfony"
-            ],
-            "support": {
-                "docs": "http://docs.drupalconsole.com/",
-                "forum": "https://gitter.im/hechoendrupal/DrupalConsole",
-                "issues": "https://github.com/hechoendrupal/DrupalConsole/issues",
-                "source": "https://github.com/hechoendrupal/drupal-console-core/tree/1.9.7"
-            },
-            "time": "2020-11-30T01:45:57+00:00"
-        },
-        {
-            "name": "drupal/console-en",
-            "version": "v1.9.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hechoendrupal/drupal-console-en.git",
-                "reference": "7594601fff153c2799a62bd678ff80749baeee0c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hechoendrupal/drupal-console-en/zipball/7594601fff153c2799a62bd678ff80749baeee0c",
-                "reference": "7594601fff153c2799a62bd678ff80749baeee0c",
-                "shasum": ""
-            },
-            "type": "library",
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "GPL-2.0-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "David Flores",
-                    "email": "dmousex@gmail.com",
-                    "homepage": "http://dmouse.net"
-                },
-                {
-                    "name": "Jesus Manuel Olivas",
-                    "email": "jesus.olivas@gmail.com",
-                    "homepage": "http://jmolivas.com"
-                },
-                {
-                    "name": "Eduardo Garcia",
-                    "email": "enzo@enzolutions.com",
-                    "homepage": "http://enzolutions.com/"
-                },
-                {
-                    "name": "Omar Aguirre",
-                    "email": "omersguchigu@gmail.com"
-                },
-                {
-                    "name": "Drupal Console Contributors",
-                    "homepage": "https://github.com/hechoendrupal/DrupalConsole/graphs/contributors"
-                }
-            ],
-            "description": "Drupal Console English Language",
-            "homepage": "http://drupalconsole.com/",
-            "keywords": [
-                "console",
-                "development",
-                "drupal",
-                "symfony"
-            ],
-            "support": {
-                "docs": "https://docs.drupalconsole.com",
-                "forum": "https://gitter.im/hechoendrupal/DrupalConsole",
-                "issues": "https://github.com/hechoendrupal/DrupalConsole/issues",
-                "source": "https://github.com/hechoendrupal/drupal-console-en/tree/master"
-            },
-            "time": "2020-08-15T03:34:54+00:00"
-        },
-        {
-            "name": "drupal/console-extend-plugin",
-            "version": "0.9.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/hechoendrupal/drupal-console-extend-plugin.git",
-                "reference": "eff6da99cfb5fe1fc60990672d2667c402eb3585"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/hechoendrupal/drupal-console-extend-plugin/zipball/eff6da99cfb5fe1fc60990672d2667c402eb3585",
-                "reference": "eff6da99cfb5fe1fc60990672d2667c402eb3585",
-                "shasum": ""
-            },
-            "require": {
-                "composer-plugin-api": "^1.0 || ^2.0",
-                "composer/installers": "^1.2",
-                "symfony/finder": "~3.0|^4.4",
-                "symfony/yaml": "~3.0|^4.4"
-            },
-            "type": "composer-plugin",
-            "extra": {
-                "class": "Drupal\\Console\\Composer\\Plugin\\Extender"
-            },
-            "autoload": {
-                "psr-4": {
-                    "Drupal\\Console\\Composer\\Plugin\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "GPL-2.0+"
-            ],
-            "authors": [
-                {
-                    "name": "Jesus Manuel Olivas",
-                    "email": "jesus.olivas@gmail.com"
-                }
-            ],
-            "description": "Drupal Console Extend Plugin",
-            "support": {
-                "issues": "https://github.com/hechoendrupal/drupal-console-extend-plugin/issues",
-                "source": "https://github.com/hechoendrupal/drupal-console-extend-plugin/tree/0.9.5"
-            },
-            "time": "2020-11-18T00:15:28+00:00"
-        },
         {
             "name": "drupal/devel",
             "version": "4.1.3",
@@ -14639,55 +14904,6 @@
             },
             "time": "2020-07-09T08:33:42+00:00"
         },
-        {
-            "name": "stecman/symfony-console-completion",
-            "version": "0.11.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/stecman/symfony-console-completion.git",
-                "reference": "a9502dab59405e275a9f264536c4e1cb61fc3518"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/stecman/symfony-console-completion/zipball/a9502dab59405e275a9f264536c4e1cb61fc3518",
-                "reference": "a9502dab59405e275a9f264536c4e1cb61fc3518",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2",
-                "symfony/console": "~2.3 || ~3.0 || ~4.0 || ~5.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.8.36 || ~5.7 || ~6.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "0.10.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Stecman\\Component\\Symfony\\Console\\BashCompletion\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Stephen Holdaway",
-                    "email": "stephen@stecman.co.nz"
-                }
-            ],
-            "description": "Automatic BASH completion for Symfony Console Component based applications.",
-            "support": {
-                "issues": "https://github.com/stecman/symfony-console-completion/issues",
-                "source": "https://github.com/stecman/symfony-console-completion/tree/0.11.0"
-            },
-            "time": "2019-11-24T17:03:06+00:00"
-        },
         {
             "name": "symfony/config",
             "version": "v4.4.37",
diff --git a/composer.patches.json b/composer.patches.json
index d08a5214e..37d0ed7df 100644
--- a/composer.patches.json
+++ b/composer.patches.json
@@ -3,6 +3,9 @@
         "drupal/core" : {
             "https://www.drupal.org/project/drupal/issues/3047110": "patches/core--drupal--3047110-taxonomy-term-moderation-class.patch"
         },
+        "drupal/inline_entity_form": {
+            "https://www.drupal.org/project/inline_entity_form/issues/3226253": "https://git.drupalcode.org/project/inline_entity_form/-/merge_requests/33.diff"
+        },
         "drupal/migrate_tools" : {
             "Invalid placeholder: https://www.drupal.org/project/migrate_tools/issues/3256236": "https://www.drupal.org/files/issues/2021-12-28/invalid_placeholder-3256236-3.patch"
         },
diff --git a/config/core.extension.yml b/config/core.extension.yml
index c7896c30a..0e2244ec1 100644
--- a/config/core.extension.yml
+++ b/config/core.extension.yml
@@ -20,6 +20,7 @@ module:
   field: 0
   field_ui: 0
   file: 0
+  file_mdm: 0
   filter: 0
   geofield: 0
   google_tag: 0
@@ -27,6 +28,7 @@ module:
   image: 0
   imageapi_optimize: 0
   imageapi_optimize_binaries: 0
+  imagemagick: 0
   inline_entity_form: 0
   inline_form_errors: 0
   language: 0
@@ -77,6 +79,7 @@ module:
   social_api: 0
   social_auth: 0
   social_auth_hid: 0
+  sophron: 0
   svg_image: 0
   syslog: 0
   system: 0
diff --git a/config/file_mdm.file_metadata_plugin.getimagesize.yml b/config/file_mdm.file_metadata_plugin.getimagesize.yml
new file mode 100644
index 000000000..363a4455e
--- /dev/null
+++ b/config/file_mdm.file_metadata_plugin.getimagesize.yml
@@ -0,0 +1,9 @@
+_core:
+  default_config_hash: o53U_2I-21Es-9iqxeUMDRcRxN0spL1OiHuAVQhh2oI
+configuration:
+  cache:
+    override: false
+    settings:
+      enabled: true
+      expiration: 172800
+      disallowed_paths: {  }
diff --git a/config/file_mdm.settings.yml b/config/file_mdm.settings.yml
new file mode 100644
index 000000000..1721cdf2c
--- /dev/null
+++ b/config/file_mdm.settings.yml
@@ -0,0 +1,6 @@
+_core:
+  default_config_hash: Q8ZrmO8RU36KGMcNEaWFQOqYYO3z5Q4IZoS-xYy8MlA
+metadata_cache:
+  enabled: true
+  expiration: 172800
+  disallowed_paths: {  }
diff --git a/config/imagemagick.file_metadata_plugin.imagemagick_identify.yml b/config/imagemagick.file_metadata_plugin.imagemagick_identify.yml
new file mode 100644
index 000000000..363a4455e
--- /dev/null
+++ b/config/imagemagick.file_metadata_plugin.imagemagick_identify.yml
@@ -0,0 +1,9 @@
+_core:
+  default_config_hash: o53U_2I-21Es-9iqxeUMDRcRxN0spL1OiHuAVQhh2oI
+configuration:
+  cache:
+    override: false
+    settings:
+      enabled: true
+      expiration: 172800
+      disallowed_paths: {  }
diff --git a/config/imagemagick.settings.yml b/config/imagemagick.settings.yml
new file mode 100644
index 000000000..37333701a
--- /dev/null
+++ b/config/imagemagick.settings.yml
@@ -0,0 +1,61 @@
+_core:
+  default_config_hash: do7QLcSY6lDV82NBI3jy5FNsUwWFjjJzXmHPTGsSvIQ
+quality: 75
+binaries: imagemagick
+path_to_binaries: ''
+prepend: ''
+log_warnings: true
+debug: false
+locale: en_US.UTF-8
+advanced:
+  density: 0
+  colorspace: '0'
+  profile: ''
+  coalesce: false
+image_formats:
+  PNG:
+    mime_type: image/png
+  JPEG:
+    mime_type: image/jpeg
+  JPG:
+    mime_type: image/jpeg
+    weight: 10
+    enabled: false
+  GIF:
+    mime_type: image/gif
+  GIF87:
+    mime_type: image/gif
+    weight: 10
+    enabled: false
+  SVG:
+    mime_type: image/svg+xml
+    enabled: false
+  WEBP:
+    mime_type: image/webp
+  AVIF:
+    mime_type: image/avif
+    enabled: false
+  TIFF:
+    mime_type: image/tiff
+    enabled: false
+  PDF:
+    mime_type: application/pdf
+    enabled: false
+  HEIC:
+    mime_type: image/heif
+    enabled: false
+  BMP:
+    mime_type: image/x-ms-bmp
+    enabled: false
+  PSD:
+    mime_type: image/x-photoshop
+    enabled: false
+  WBMP:
+    mime_type: image/vnd.wap.wbmp
+    enabled: false
+  XBM:
+    mime_type: image/x-xbitmap
+    enabled: false
+  ICO:
+    mime_type: image/vnd.microsoft.icon
+    enabled: false
diff --git a/config/sophron.settings.yml b/config/sophron.settings.yml
new file mode 100644
index 000000000..2a815fabd
--- /dev/null
+++ b/config/sophron.settings.yml
@@ -0,0 +1,5 @@
+_core:
+  default_config_hash: kS--VUM7Yhfb5AIcnoXV8-JW90t-aIuQbzxPa1hbooU
+map_option: 0
+map_class: ''
+map_commands: {  }
diff --git a/symfony.lock b/symfony.lock
index 544a3b46f..573978865 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -1,7 +1,4 @@
 {
-    "alchemy/zippy": {
-        "version": "0.4.9"
-    },
     "asm89/stack-cors": {
         "version": "1.3.0"
     },
@@ -15,13 +12,13 @@
         "version": "v1.5.0"
     },
     "chi-teck/drupal-code-generator": {
-        "version": "1.33.1"
+        "version": "2.5.1"
     },
     "composer/ca-bundle": {
         "version": "1.3.1"
     },
     "composer/composer": {
-        "version": "2.1.14"
+        "version": "2.2.6"
     },
     "composer/installers": {
         "version": "v1.12.0"
@@ -30,7 +27,7 @@
         "version": "1.0.0"
     },
     "composer/pcre": {
-        "version": "1.0.0"
+        "version": "1.0.1"
     },
     "composer/semver": {
         "version": "3.2.6"
@@ -39,34 +36,34 @@
         "version": "1.5.6"
     },
     "composer/xdebug-handler": {
-        "version": "2.0.3"
+        "version": "2.0.5"
     },
     "consolidation/annotated-command": {
-        "version": "4.4.0"
+        "version": "4.5.2"
     },
     "consolidation/config": {
-        "version": "1.2.1"
+        "version": "2.1.0"
     },
     "consolidation/filter-via-dot-access-data": {
-        "version": "1.0.0"
+        "version": "2.0.2"
     },
     "consolidation/log": {
-        "version": "2.0.2"
+        "version": "2.1.1"
     },
     "consolidation/output-formatters": {
-        "version": "4.1.2"
+        "version": "4.2.2"
     },
     "consolidation/robo": {
-        "version": "3.0.6"
+        "version": "3.0.10"
     },
     "consolidation/self-update": {
-        "version": "2.0.1"
+        "version": "2.0.5"
     },
     "consolidation/site-alias": {
-        "version": "3.1.1"
+        "version": "3.1.5"
     },
     "consolidation/site-process": {
-        "version": "4.1.0"
+        "version": "4.2.0"
     },
     "cweagans/composer-patches": {
         "version": "1.7.2"
@@ -77,14 +74,8 @@
     "dealerdirect/phpcodesniffer-composer-installer": {
         "version": "v0.7.2"
     },
-    "dflydev/dot-access-configuration": {
-        "version": "v1.0.3"
-    },
     "dflydev/dot-access-data": {
-        "version": "v1.1.0"
-    },
-    "dflydev/placeholder-resolver": {
-        "version": "v1.0.2"
+        "version": "v3.0.1"
     },
     "doctrine/annotations": {
         "version": "1.13",
@@ -132,10 +123,10 @@
         "version": "1.1.0"
     },
     "drupal/allowed_formats": {
-        "version": "1.3.0"
+        "version": "1.4.0"
     },
     "drupal/coder": {
-        "version": "8.3.13"
+        "version": "8.3.14"
     },
     "drupal/components": {
         "version": "2.4.0"
@@ -146,32 +137,20 @@
     "drupal/config_split": {
         "version": "2.0.0-beta5"
     },
-    "drupal/console": {
-        "version": "1.9.8"
-    },
-    "drupal/console-core": {
-        "version": "1.9.7"
-    },
-    "drupal/console-en": {
-        "version": "v1.9.7"
-    },
-    "drupal/console-extend-plugin": {
-        "version": "0.9.5"
-    },
     "drupal/content_entity_clone": {
         "version": "1.0.0"
     },
     "drupal/core": {
-        "version": "9.3.0"
+        "version": "9.3.6"
     },
     "drupal/core-composer-scaffold": {
         "version": "9.3.6"
     },
     "drupal/core-dev": {
-        "version": "9.3.0"
+        "version": "9.3.6"
     },
     "drupal/core-recommended": {
-        "version": "9.3.0"
+        "version": "9.3.6"
     },
     "drupal/ctools": {
         "version": "3.7.0"
@@ -182,14 +161,17 @@
     "drupal/devel_php": {
         "version": "1.3.0"
     },
+    "drupal/file_mdm": {
+        "version": "2.4.0"
+    },
     "drupal/geofield": {
-        "version": "1.35.0"
+        "version": "1.36.0"
     },
     "drupal/google_tag": {
         "version": "1.4.0"
     },
     "drupal/guidelines": {
-        "version": "1.0.0"
+        "version": "1.0.2"
     },
     "drupal/imageapi_optimize": {
         "version": "4.0.0"
@@ -197,6 +179,9 @@
     "drupal/imageapi_optimize_binaries": {
         "version": "1.0.0-alpha2"
     },
+    "drupal/imagemagick": {
+        "version": "3.3.0"
+    },
     "drupal/inline_entity_form": {
         "version": "1.0.0-rc9"
     },
@@ -207,19 +192,19 @@
         "version": "1.1.0"
     },
     "drupal/metatag": {
-        "version": "1.16.0"
+        "version": "1.19.0"
     },
     "drupal/migrate_plus": {
-        "version": "5.1.0"
+        "version": "5.2.0"
     },
     "drupal/migrate_tools": {
-        "version": "5.x-dev"
+        "version": "5.1.0"
     },
     "drupal/mimemail": {
         "version": "1.0.0-alpha4"
     },
     "drupal/pathauto": {
-        "version": "1.8.0"
+        "version": "1.9.0"
     },
     "drupal/redirect": {
         "version": "1.7.0"
@@ -234,7 +219,10 @@
         "version": "3.0.2"
     },
     "drupal/social_auth_hid": {
-        "version": "2.7.0"
+        "version": "3.0.0"
+    },
+    "drupal/sophron": {
+        "version": "1.2.0"
     },
     "drupal/stage_file_proxy": {
         "version": "1.2.0"
@@ -258,7 +246,7 @@
         "version": "1.0.1"
     },
     "drush/drush": {
-        "version": "10.6.2"
+        "version": "11.x-dev"
     },
     "easyrdf/easyrdf": {
         "version": "1.1.1"
@@ -267,22 +255,22 @@
         "version": "3.1.2"
     },
     "enlightn/security-checker": {
-        "version": "v1.9.0"
+        "version": "v1.10.0"
     },
     "enshrined/svg-sanitize": {
-        "version": "0.14.1"
+        "version": "0.15.4"
     },
     "fabpot/goutte": {
         "version": "v3.3.1"
     },
+    "fileeye/mimemap": {
+        "version": "1.2.1"
+    },
     "friends-of-behat/mink-browserkit-driver": {
         "version": "v1.6.1"
     },
     "grasmash/expander": {
-        "version": "1.0.0"
-    },
-    "grasmash/yaml-expander": {
-        "version": "1.4.0"
+        "version": "2.0.2"
     },
     "guzzlehttp/guzzle": {
         "version": "6.5.5"
@@ -315,16 +303,22 @@
         "version": "3.6.1"
     },
     "league/commonmark": {
-        "version": "1.6.6"
+        "version": "2.2.2"
+    },
+    "league/config": {
+        "version": "v1.1.1"
     },
     "league/container": {
-        "version": "3.4.1"
+        "version": "4.2.0"
     },
     "league/html-to-markdown": {
         "version": "5.0.2"
     },
     "league/oauth2-client": {
-        "version": "2.6.0"
+        "version": "2.6.1"
+    },
+    "lsolesen/pel": {
+        "version": "0.9.12"
     },
     "masterminds/html5": {
         "version": "2.7.5"
@@ -335,6 +329,12 @@
     "myclabs/deep-copy": {
         "version": "1.10.2"
     },
+    "nette/schema": {
+        "version": "v1.2.2"
+    },
+    "nette/utils": {
+        "version": "v3.2.7"
+    },
     "nikic/php-parser": {
         "version": "v4.13.2"
     },
@@ -342,7 +342,7 @@
         "version": "v9.99.100"
     },
     "pdepend/pdepend": {
-        "version": "2.10.2"
+        "version": "2.10.3"
     },
     "pear/archive_tar": {
         "version": "1.4.14"
@@ -363,11 +363,14 @@
         "version": "2.0.3"
     },
     "phar-io/version": {
-        "version": "3.1.0"
+        "version": "3.2.1"
     },
     "phayes/geophp": {
         "version": "1.2"
     },
+    "phenx/php-font-lib": {
+        "version": "0.5.4"
+    },
     "phpcompatibility/php-compatibility": {
         "version": "9.3.5"
     },
@@ -378,10 +381,10 @@
         "version": "5.3.0"
     },
     "phpdocumentor/type-resolver": {
-        "version": "1.5.1"
+        "version": "1.6.0"
     },
     "phpmd/phpmd": {
-        "version": "2.11.0"
+        "version": "2.11.1"
     },
     "phpspec/prophecy": {
         "version": "v1.15.0"
@@ -393,7 +396,7 @@
         "version": "1.2.0"
     },
     "phpunit/php-code-coverage": {
-        "version": "9.2.10"
+        "version": "9.2.13"
     },
     "phpunit/php-file-iterator": {
         "version": "3.0.6"
@@ -427,6 +430,9 @@
     "psr/container": {
         "version": "1.1.1"
     },
+    "psr/event-dispatcher": {
+        "version": "1.0.0"
+    },
     "psr/http-factory": {
         "version": "1.0.1"
     },
@@ -437,16 +443,16 @@
         "version": "1.1.4"
     },
     "psy/psysh": {
-        "version": "v0.10.12"
+        "version": "v0.11.1"
     },
     "ralouphie/getallheaders": {
         "version": "3.0.3"
     },
     "react/promise": {
-        "version": "v2.8.0"
+        "version": "v2.9.0"
     },
     "reliefweb/api-indexer": {
-        "version": "v2.1.1"
+        "version": "v2.2.0"
     },
     "reliefweb/simple-autocomplete": {
         "version": "v1.3.0"
@@ -482,7 +488,7 @@
         "version": "4.0.4"
     },
     "sebastian/global-state": {
-        "version": "5.0.3"
+        "version": "5.0.5"
     },
     "sebastian/lines-of-code": {
         "version": "1.0.3"
@@ -512,7 +518,7 @@
         "version": "1.2.0"
     },
     "sirbrillig/phpcs-variable-analysis": {
-        "version": "v2.11.2"
+        "version": "v2.11.3"
     },
     "slevomat/coding-standard": {
         "version": "7.0.18"
@@ -532,17 +538,14 @@
     "stack/builder": {
         "version": "v1.0.6"
     },
-    "stecman/symfony-console-completion": {
-        "version": "0.11.0"
-    },
     "symfony-cmf/routing": {
         "version": "2.3.4"
     },
     "symfony/browser-kit": {
-        "version": "v4.4.27"
+        "version": "v4.4.37"
     },
     "symfony/config": {
-        "version": "v4.4.34"
+        "version": "v4.4.37"
     },
     "symfony/console": {
         "version": "4.4",
@@ -558,7 +561,7 @@
         ]
     },
     "symfony/css-selector": {
-        "version": "v4.4.27"
+        "version": "v4.4.37"
     },
     "symfony/debug": {
         "version": "v4.4.31"
@@ -570,7 +573,7 @@
         "version": "v2.5.0"
     },
     "symfony/dom-crawler": {
-        "version": "v4.4.30"
+        "version": "v4.4.37"
     },
     "symfony/error-handler": {
         "version": "v4.4.34"
@@ -582,13 +585,13 @@
         "version": "v1.1.11"
     },
     "symfony/filesystem": {
-        "version": "v4.4.27"
+        "version": "v4.4.37"
     },
     "symfony/finder": {
-        "version": "v4.4.30"
+        "version": "v4.4.37"
     },
     "symfony/flex": {
-        "version": "2.0",
+        "version": "2.1",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "master",
@@ -644,6 +647,9 @@
     "symfony/polyfill-iconv": {
         "version": "v1.23.0"
     },
+    "symfony/polyfill-intl-grapheme": {
+        "version": "v1.24.0"
+    },
     "symfony/polyfill-intl-idn": {
         "version": "v1.23.0"
     },
@@ -654,19 +660,19 @@
         "version": "v1.23.1"
     },
     "symfony/polyfill-php72": {
-        "version": "v1.23.0"
+        "version": "v1.24.0"
     },
     "symfony/polyfill-php73": {
-        "version": "v1.23.0"
+        "version": "v1.24.0"
     },
     "symfony/polyfill-php80": {
         "version": "v1.23.1"
     },
     "symfony/polyfill-php81": {
-        "version": "v1.23.0"
+        "version": "v1.24.0"
     },
     "symfony/polyfill-uuid": {
-        "version": "v1.23.0"
+        "version": "v1.24.0"
     },
     "symfony/process": {
         "version": "v4.4.35"
@@ -694,6 +700,9 @@
     "symfony/service-contracts": {
         "version": "v2.5.0"
     },
+    "symfony/string": {
+        "version": "v6.0.3"
+    },
     "symfony/translation": {
         "version": "4.4",
         "recipe": {
@@ -711,7 +720,7 @@
         "version": "v2.5.0"
     },
     "symfony/uid": {
-        "version": "v6.0.1"
+        "version": "v6.0.3"
     },
     "symfony/validator": {
         "version": "4.4",
@@ -736,7 +745,7 @@
         "version": "1.2.1"
     },
     "twig/twig": {
-        "version": "v2.14.7"
+        "version": "v2.14.11"
     },
     "typo3/phar-stream-wrapper": {
         "version": "v3.1.7"

From b4ef13d0b9d4feab31ff18453f96cdce5efa90fa Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 25 Feb 2022 07:25:20 +0000
Subject: [PATCH 533/720] [RW-282] Fix compatibility with drush 11

---
 .../src/Command/ReliefwebImportCommand.php    | 13 ++++++-----
 .../Command/ReliefwebXmlsitemapCommand.php    | 23 ++++++++++---------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php b/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php
index f33141d7c..1a530460c 100644
--- a/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php
+++ b/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php
@@ -9,6 +9,7 @@
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Logger\LoggerChannelFactoryInterface;
+use Drupal\Core\Logger\LoggerChannelInterface;
 use Drupal\Core\State\State;
 use Drupal\reliefweb_entities\Entity\Job;
 use Drupal\reliefweb_import\Exception\ReliefwebImportException;
@@ -139,13 +140,13 @@ public function jobs($limit = 50) {
 
       if (!empty($this->errors)) {
         foreach ($this->errors as $error) {
-          $this->logger()->error($error);
+          $this->getLogger()->error($error);
         }
       }
 
       if (!empty($this->warnings)) {
         foreach ($this->warnings as $warning) {
-          $this->logger()->warning($warning);
+          $this->getLogger()->warning($warning);
         }
       }
     }
@@ -168,7 +169,7 @@ public function fetchJobs(Term $term) {
     $uid = $term->field_job_import_feed->first()->uid ?? FALSE;
     $this->url = $term->field_job_import_feed->first()->feed_url;
 
-    $this->logger()->info('Processing @name, fetching jobs from @url.', [
+    $this->getLogger()->info('Processing @name, fetching jobs from @url.', [
       '@name' => $label,
       '@url' => $this->url,
     ]);
@@ -249,13 +250,13 @@ protected function processXml($body, $uid, $base_url, $source_id) {
 
         // Check if job already exist.
         if ($this->jobExists((string) $item->link)) {
-          $this->logger()->notice(strtr('Update job for @link', [
+          $this->getLogger()->notice(strtr('Update job for @link', [
             '@link' => $item->link,
           ]));
           $this->updateJob($this->loadJobById((string) $item->link), $item);
         }
         else {
-          $this->logger()->notice(strtr('Create new job for @link', [
+          $this->getLogger()->notice(strtr('Create new job for @link', [
             '@link' => $item->link,
           ]));
           $this->createJob($item, $uid);
@@ -434,7 +435,7 @@ protected function validateAndSaveJob(Job $job) {
   /**
    * Our logger.
    */
-  protected function logger() {
+  protected function getLogger(): LoggerChannelInterface {
     return $this->loggerFactory->get('reliefweb_import');
   }
 
diff --git a/html/modules/custom/reliefweb_xmlsitemap/src/Command/ReliefwebXmlsitemapCommand.php b/html/modules/custom/reliefweb_xmlsitemap/src/Command/ReliefwebXmlsitemapCommand.php
index bba590c4a..7fccc452e 100644
--- a/html/modules/custom/reliefweb_xmlsitemap/src/Command/ReliefwebXmlsitemapCommand.php
+++ b/html/modules/custom/reliefweb_xmlsitemap/src/Command/ReliefwebXmlsitemapCommand.php
@@ -8,6 +8,7 @@
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\Database\Connection;
 use Drupal\Core\File\FileSystemInterface;
+use Drupal\Core\Logger\LoggerChannelInterface;
 use Drupal\Core\Logger\LoggerChannelFactoryInterface;
 use Drupal\Core\State\State;
 use Drush\Commands\DrushCommands;
@@ -101,9 +102,9 @@ public function __construct(
    * Ensure messages are logged into all the logging facilities (ex: syslog)
    * and use the classic Drupal placeholder replacement.
    *
-   * By default DrushCommands::logger() returns a \Drush\Log\Logger that only
-   * logs to the console and uses a different placeholder replacement:
-   * {placeholder} rather than @placeholder.
+   * We cannot rely on DrushCommands::logger() because, by default, it returns a
+   * \Drush\Log\Logger that only logs to the console and uses a different
+   * placeholder replacement: {placeholder} rather than @placeholder.
    *
    * However this drush command file being provided by a module, the boostrap
    * level is full by default, so we have access to the normal log stack and
@@ -118,7 +119,7 @@ public function __construct(
    * is called and all the loggers haven't been added to the logger channel
    * yet at that time.
    */
-  protected function logger() {
+  protected function getLogger(): LoggerChannelInterface {
     return $this->loggerFactory->get('reliefweb_xmlsitemap');
   }
 
@@ -212,7 +213,7 @@ public function generate() {
     $this->writeIndex($page_count);
 
     // Log the result.
-    $this->logger()->info('Successfully created @page_count sitemap page file(s) for a total of @processed links.', [
+    $this->getLogger()->info('Successfully created @page_count sitemap page file(s) for a total of @processed links.', [
       '@page_count' => $page_count,
       '@processed' => $processed,
     ]);
@@ -234,7 +235,7 @@ public function prepareDirectory() {
 
     $result = $this->fileSystem->prepareDirectory($directory, FileSystemInterface::CREATE_DIRECTORY | FileSystemInterface::MODIFY_PERMISSIONS);
     if (!$result) {
-      $this->logger()->error('The directory %directory does not exist or is not writable.', [
+      $this->getLogger()->error('The directory %directory does not exist or is not writable.', [
         '%directory' => $directory,
       ]);
     }
@@ -269,7 +270,7 @@ public function clearDirectory(array $options = [
         // If the path couldn't be deleted, stop the process and log the error.
         if (!$this->fileSystem->deleteRecursive($path)) {
           $dir->close();
-          $this->logger()->error('Enable to delete %path', [
+          $this->getLogger()->error('Enable to delete %path', [
             '%path' => $path,
           ]);
 
@@ -310,7 +311,7 @@ public function copyXslStylesheet() {
 
         // Copy the file.
         if (!$this->fileSystem->copy($source, $destination, TRUE)) {
-          $this->logger()->error('Unable to copy file @file', [
+          $this->getLogger()->error('Unable to copy file @file', [
             '@file' => $destination,
           ]);
         }
@@ -332,7 +333,7 @@ public function submit() {
     // Check that the xmlsitemap actually exists before trying to submit it.
     $directory = $this->getDirectory();
     if (!file_exists($directory . '/sitemap.xml')) {
-      $this->logger()->error('Sitemap missing. Unable to submit it to search engines.');
+      $this->getLogger()->error('Sitemap missing. Unable to submit it to search engines.');
       return;
     }
 
@@ -344,13 +345,13 @@ public function submit() {
       $ping_url = str_replace('[sitemap]', $sitemap, $engine['url']);
       $response = $this->httpClient->request('GET', $ping_url);
       if (!empty($response->error)) {
-        $this->logger()->error('Failed to submit sitemap to @engine with error: @error.', [
+        $this->getLogger()->error('Failed to submit sitemap to @engine with error: @error.', [
           '@engine' => $engine['name'],
           '@error' => $response->error,
         ]);
       }
       else {
-        $this->logger()->info('Sitemap successfully submitted to @engine.', [
+        $this->getLogger()->info('Sitemap successfully submitted to @engine.', [
           '@engine' => $engine['name'],
         ]);
       }

From e727b196d0bb6c80ea80a74d8239b8dbcc1db6cf Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 25 Feb 2022 07:27:03 +0000
Subject: [PATCH 534/720] [RW-155] Fix issues with markdown conversion to work
 like previous libraries used on D7

---
 .../src/Plugin/Filter/Markdown.php            | 130 ++++++++++++++++--
 1 file changed, 122 insertions(+), 8 deletions(-)

diff --git a/html/modules/custom/reliefweb_utility/src/Plugin/Filter/Markdown.php b/html/modules/custom/reliefweb_utility/src/Plugin/Filter/Markdown.php
index 058b1355d..876b138c8 100644
--- a/html/modules/custom/reliefweb_utility/src/Plugin/Filter/Markdown.php
+++ b/html/modules/custom/reliefweb_utility/src/Plugin/Filter/Markdown.php
@@ -7,7 +7,7 @@
 use Drupal\Core\Render\Markup;
 use Drupal\filter\FilterProcessResult;
 use Drupal\filter\Plugin\FilterBase;
-use League\CommonMark\Environment;
+use League\CommonMark\Environment\Environment;
 use League\CommonMark\Extension\Attributes\AttributesExtension;
 use League\CommonMark\Extension\Autolink\AutolinkExtension;
 use League\CommonMark\Extension\ExternalLink\ExternalLinkExtension;
@@ -26,15 +26,134 @@
  */
 class Markdown extends FilterBase {
 
+  /**
+   * List of HTML block level elements.
+   *
+   * @var array
+   */
+  public static $htmlBlockElements = [
+    "address",
+    "article",
+    "aside",
+    "base",
+    "basefont",
+    "blockquote",
+    "body",
+    "caption",
+    "center",
+    "col",
+    "colgroup",
+    "dd",
+    "details",
+    "dialog",
+    "dir",
+    "div",
+    "dl",
+    "dt",
+    "fieldset",
+    "figcaption",
+    "figure",
+    "footer",
+    "form",
+    "frame",
+    "frameset",
+    "h1",
+    "h2",
+    "h3",
+    "h4",
+    "h5",
+    "h6",
+    "head",
+    "header",
+    "hr",
+    "html",
+    "iframe",
+    "legend",
+    "li",
+    "link",
+    "main",
+    "menu",
+    "menuitem",
+    "nav",
+    "noframes",
+    "ol",
+    "optgroup",
+    "option",
+    "p",
+    "param",
+    "section",
+    "source",
+    "summary",
+    "table",
+    "tbody",
+    "td",
+    "tfoot",
+    "th",
+    "thead",
+    "title",
+    "tr",
+    "track",
+    "ul",
+    // Extra elements that need to be followed by a blank line for the following
+    // text to be converted to markdown.
+    "pre",
+    "script",
+    "style",
+    "textarea",
+  ];
+
   /**
    * {@inheritdoc}
    */
   public function process($text, $langcode) {
+    $html = static::convertToHtml($text, [
+      \Drupal::request()->getHost(),
+      'reliefweb.int',
+    ]);
+    return new FilterProcessResult($html);
+  }
+
+  /**
+   * Convert a markdown text to HTML.
+   *
+   * @param string $text
+   *   Markdown text to convert.
+   * @param array $internal_hosts
+   *   List of internal hosts to determine if a link is external or not.
+   *
+   * @return string
+   *   HTML.
+   *
+   * @todo this is the same code as \RWApiIndexer\Processor::convertToHtml().
+   *   See if we can consolidate that somehow while keeping this and the API
+   *   indexer independent. In the meantime any change here should probably
+   *   reflected in the API indexer.
+   *
+   * @see \RWApiIndexer\Processor::convertToHtml()
+   */
+  public static function convertToHtml($text, array $internal_hosts = ['reliefweb.int']) {
+    static $pattern;
+
+    // CommonMark specs consider text following an HTML block element without
+    // a blank line to seperate them, as part of the HTML block. This is a
+    // breaking change compared to what Michel Fortin's PHP markdown or
+    // hoedown libraries were doing so use the following regex to ensure there
+    // is a blank line.
+    // @see https://spec.commonmark.org/0.30/#html-blocks
+    // @see https://talk.commonmark.org/t/beyond-markdown/2787/4
+    if (!isset($pattern)) {
+      $pattern = '#(</' . implode('>|</', static::$htmlBlockElements) . '>)\s*#m';
+    }
+    $text = preg_replace($pattern, "$1\n\n", $text);
+
     // Add a space before the heading '#' which is fine as ReliefWeb doesn't use
     // hash tags.
     // @see https://talk.commonmark.org/t/heading-not-working/819/42
     $text = preg_replace('/^(#+)([^# ])/m', '$1 $2', $text);
 
+    // No need for extra blanks.
+    $text = trim($text);
+
     // Obtain a pre-configured Environment with all the CommonMark
     // parsers/renderers ready-to-go.
     $environment = Environment::createCommonMarkEnvironment();
@@ -42,10 +161,7 @@ public function process($text, $langcode) {
     // Configuration to add attributes to external links.
     $external_link_config = [
       'external_link' => [
-        'internal_hosts' => [
-          \Drupal::request()->getHost(),
-          'reliefweb.int',
-        ],
+        'internal_hosts' => $internal_hosts,
         'open_in_new_window' => TRUE,
       ],
     ];
@@ -67,9 +183,7 @@ public function process($text, $langcode) {
     $converter = new MarkdownConverter($environment);
 
     // Convert to HTML.
-    $html = $converter->convertToHtml($text);
-
-    return new FilterProcessResult($html);
+    return $converter->convertToHtml($text);
   }
 
   /**

From 02113cdd47ff1550e70516da06a3f4f8fed293dc Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 25 Feb 2022 07:31:50 +0000
Subject: [PATCH 535/720] [RW-402] Export config changes due to update of
 allowed_contents module

---
 ...d.field.guideline.field_guideline.field_description.yml | 7 ++-----
 config/field.field.node.announcement.body.yml              | 3 ++-
 config/field.field.node.blog_post.body.yml                 | 7 +++----
 config/field.field.node.book.body.yml                      | 5 ++---
 config/field.field.node.job.body.yml                       | 7 ++-----
 config/field.field.node.job.field_how_to_apply.yml         | 7 ++-----
 config/field.field.node.report.body.yml                    | 5 ++---
 config/field.field.node.topic.body.yml                     | 6 ++----
 config/field.field.node.topic.field_overview.yml           | 6 ++----
 config/field.field.node.topic.field_resources.yml          | 6 ++----
 config/field.field.node.training.body.yml                  | 7 ++-----
 config/field.field.node.training.field_how_to_register.yml | 7 ++-----
 12 files changed, 25 insertions(+), 48 deletions(-)

diff --git a/config/field.field.guideline.field_guideline.field_description.yml b/config/field.field.guideline.field_guideline.field_description.yml
index b173f6465..d3e7c9da5 100644
--- a/config/field.field.guideline.field_guideline.field_description.yml
+++ b/config/field.field.guideline.field_guideline.field_description.yml
@@ -10,11 +10,8 @@ dependencies:
     - text
 third_party_settings:
   allowed_formats:
-    guideline: guideline
-    markdown: '0'
-    plain_text: '0'
-    html: '0'
-    token_markdown: '0'
+    allowed_formats:
+      - guideline
 id: guideline.field_guideline.field_description
 field_name: field_description
 entity_type: guideline
diff --git a/config/field.field.node.announcement.body.yml b/config/field.field.node.announcement.body.yml
index c85a60f8b..7456c4de7 100644
--- a/config/field.field.node.announcement.body.yml
+++ b/config/field.field.node.announcement.body.yml
@@ -10,7 +10,8 @@ dependencies:
     - text
 third_party_settings:
   allowed_formats:
-    plain_text: plain_text
+    allowed_formats:
+      - plain_text
 id: node.announcement.body
 field_name: body
 entity_type: node
diff --git a/config/field.field.node.blog_post.body.yml b/config/field.field.node.blog_post.body.yml
index f1be010d5..67b88ee51 100644
--- a/config/field.field.node.blog_post.body.yml
+++ b/config/field.field.node.blog_post.body.yml
@@ -10,10 +10,9 @@ dependencies:
     - text
 third_party_settings:
   allowed_formats:
-    markdown: markdown
-    html: html
-    plain_text: '0'
-    token_markdown: '0'
+    allowed_formats:
+      - markdown
+      - html
 id: node.blog_post.body
 field_name: body
 entity_type: node
diff --git a/config/field.field.node.book.body.yml b/config/field.field.node.book.body.yml
index 3841e195d..36b6f0845 100644
--- a/config/field.field.node.book.body.yml
+++ b/config/field.field.node.book.body.yml
@@ -10,9 +10,8 @@ dependencies:
     - text
 third_party_settings:
   allowed_formats:
-    markdown: markdown
-    html: '0'
-    plain_text: '0'
+    allowed_formats:
+      - markdown
 _core:
   default_config_hash: 718sPNbCWIXxNeDj1kRMyvll4TdMM9sxlzPrShb1dKU
 id: node.book.body
diff --git a/config/field.field.node.job.body.yml b/config/field.field.node.job.body.yml
index 6e1e5759c..9bf37ff96 100644
--- a/config/field.field.node.job.body.yml
+++ b/config/field.field.node.job.body.yml
@@ -10,11 +10,8 @@ dependencies:
     - text
 third_party_settings:
   allowed_formats:
-    markdown_editor: markdown_editor
-    markdown: '0'
-    plain_text: '0'
-    html: '0'
-    token_markdown: '0'
+    allowed_formats:
+      - markdown_editor
 id: node.job.body
 field_name: body
 entity_type: node
diff --git a/config/field.field.node.job.field_how_to_apply.yml b/config/field.field.node.job.field_how_to_apply.yml
index 6a63df6c1..fa2f24d67 100644
--- a/config/field.field.node.job.field_how_to_apply.yml
+++ b/config/field.field.node.job.field_how_to_apply.yml
@@ -10,11 +10,8 @@ dependencies:
     - text
 third_party_settings:
   allowed_formats:
-    markdown_editor: markdown_editor
-    markdown: '0'
-    plain_text: '0'
-    html: '0'
-    token_markdown: '0'
+    allowed_formats:
+      - markdown_editor
 id: node.job.field_how_to_apply
 field_name: field_how_to_apply
 entity_type: node
diff --git a/config/field.field.node.report.body.yml b/config/field.field.node.report.body.yml
index 6311bbcc6..1ad4e6f71 100644
--- a/config/field.field.node.report.body.yml
+++ b/config/field.field.node.report.body.yml
@@ -10,9 +10,8 @@ dependencies:
     - text
 third_party_settings:
   allowed_formats:
-    markdown: markdown
-    html: '0'
-    plain_text: '0'
+    allowed_formats:
+      - markdown
 id: node.report.body
 field_name: body
 entity_type: node
diff --git a/config/field.field.node.topic.body.yml b/config/field.field.node.topic.body.yml
index 642ba3e62..b6a5d2ac1 100644
--- a/config/field.field.node.topic.body.yml
+++ b/config/field.field.node.topic.body.yml
@@ -10,10 +10,8 @@ dependencies:
     - text
 third_party_settings:
   allowed_formats:
-    markdown: markdown
-    plain_text: '0'
-    html: '0'
-    token_markdown: '0'
+    allowed_formats:
+      - markdown
 id: node.topic.body
 field_name: body
 entity_type: node
diff --git a/config/field.field.node.topic.field_overview.yml b/config/field.field.node.topic.field_overview.yml
index e424b83d8..a1b81446e 100644
--- a/config/field.field.node.topic.field_overview.yml
+++ b/config/field.field.node.topic.field_overview.yml
@@ -10,10 +10,8 @@ dependencies:
     - text
 third_party_settings:
   allowed_formats:
-    token_markdown: token_markdown
-    markdown: '0'
-    plain_text: '0'
-    html: '0'
+    allowed_formats:
+      - token_markdown
 id: node.topic.field_overview
 field_name: field_overview
 entity_type: node
diff --git a/config/field.field.node.topic.field_resources.yml b/config/field.field.node.topic.field_resources.yml
index d356afcab..279705c72 100644
--- a/config/field.field.node.topic.field_resources.yml
+++ b/config/field.field.node.topic.field_resources.yml
@@ -10,10 +10,8 @@ dependencies:
     - text
 third_party_settings:
   allowed_formats:
-    token_markdown: token_markdown
-    markdown: '0'
-    plain_text: '0'
-    html: '0'
+    allowed_formats:
+      - token_markdown
 id: node.topic.field_resources
 field_name: field_resources
 entity_type: node
diff --git a/config/field.field.node.training.body.yml b/config/field.field.node.training.body.yml
index 103b18eb5..b93bbe308 100644
--- a/config/field.field.node.training.body.yml
+++ b/config/field.field.node.training.body.yml
@@ -10,11 +10,8 @@ dependencies:
     - text
 third_party_settings:
   allowed_formats:
-    markdown_editor: markdown_editor
-    markdown: '0'
-    plain_text: '0'
-    html: '0'
-    token_markdown: '0'
+    allowed_formats:
+      - markdown_editor
 id: node.training.body
 field_name: body
 entity_type: node
diff --git a/config/field.field.node.training.field_how_to_register.yml b/config/field.field.node.training.field_how_to_register.yml
index e5d5b03fd..3507b5be7 100644
--- a/config/field.field.node.training.field_how_to_register.yml
+++ b/config/field.field.node.training.field_how_to_register.yml
@@ -10,11 +10,8 @@ dependencies:
     - text
 third_party_settings:
   allowed_formats:
-    markdown_editor: markdown_editor
-    markdown: '0'
-    plain_text: '0'
-    html: '0'
-    token_markdown: '0'
+    allowed_formats:
+      - markdown_editor
 id: node.training.field_how_to_register
 field_name: field_how_to_register
 entity_type: node

From abb17e0656e7446564e0ac9c868cd46fd90e4aad Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 1 Mar 2022 06:33:29 +0000
Subject: [PATCH 536/720] [RW-403] Move markdown conversion to a helper class

---
 .../src/Helpers/HtmlSanitizer.php             |  12 +-
 .../src/Helpers/MarkdownHelper.php            | 166 ++++++++++++++++++
 .../{Markdown.php => MarkdownFilter.php}      | 160 +----------------
 ...arkdownTest.php => MarkdownFilterTest.php} |  22 +--
 .../tests/src/Unit/MarkdownHelperTest.php     | 100 +++++++++++
 5 files changed, 281 insertions(+), 179 deletions(-)
 create mode 100644 html/modules/custom/reliefweb_utility/src/Helpers/MarkdownHelper.php
 rename html/modules/custom/reliefweb_utility/src/Plugin/Filter/{Markdown.php => MarkdownFilter.php} (53%)
 rename html/modules/custom/reliefweb_utility/tests/src/Unit/{MarkdownTest.php => MarkdownFilterTest.php} (82%)
 create mode 100644 html/modules/custom/reliefweb_utility/tests/src/Unit/MarkdownHelperTest.php

diff --git a/html/modules/custom/reliefweb_utility/src/Helpers/HtmlSanitizer.php b/html/modules/custom/reliefweb_utility/src/Helpers/HtmlSanitizer.php
index a1fa87f64..f4b4cf310 100644
--- a/html/modules/custom/reliefweb_utility/src/Helpers/HtmlSanitizer.php
+++ b/html/modules/custom/reliefweb_utility/src/Helpers/HtmlSanitizer.php
@@ -3,8 +3,6 @@
 namespace Drupal\reliefweb_utility\Helpers;
 
 use Drupal\Component\Render\MarkupInterface;
-use Drupal\Component\Utility\UrlHelper;
-use League\CommonMark\CommonMarkConverter;
 
 /**
  * Helper to sanitize HTML.
@@ -90,15 +88,7 @@ public static function sanitize($html, $iframe = FALSE, $heading_offset = 2, arr
    *   Sanitized HTML string.
    */
   public static function sanitizeFromMarkdown($text, $iframe = FALSE, $heading_offset = 2, array $allowed_attributes = []) {
-    // Add a space before the heading '#' which is fine as ReliefWeb doesn't use
-    // hash tags.
-    // @see https://talk.commonmark.org/t/heading-not-working/819/42
-    $text = preg_replace('/^(#+)([^# ])/m', '$1 $2', $text);
-
-    // Convert markdown to HTML.
-    // @todo add options notably to allow ID attributes.
-    $converter = new CommonMarkConverter();
-    $html = $converter->convertToHtml($text);
+    $html = MarkdownHelper::convertToHtml($text);
 
     return static::sanitize($html, $iframe, $heading_offset, $allowed_attributes);
   }
diff --git a/html/modules/custom/reliefweb_utility/src/Helpers/MarkdownHelper.php b/html/modules/custom/reliefweb_utility/src/Helpers/MarkdownHelper.php
new file mode 100644
index 000000000..89e178b8f
--- /dev/null
+++ b/html/modules/custom/reliefweb_utility/src/Helpers/MarkdownHelper.php
@@ -0,0 +1,166 @@
+<?php
+
+namespace Drupal\reliefweb_utility\Helpers;
+
+use League\CommonMark\Environment\Environment;
+use League\CommonMark\Extension\Attributes\AttributesExtension;
+use League\CommonMark\Extension\Autolink\AutolinkExtension;
+use League\CommonMark\Extension\ExternalLink\ExternalLinkExtension;
+use League\CommonMark\Extension\Table\TableExtension;
+use League\CommonMark\MarkdownConverter;
+
+/**
+ * Helper to convert from and to markdown.
+ */
+class MarkdownHelper {
+
+  /**
+   * List of HTML block level elements.
+   *
+   * @var array
+   */
+  public static $htmlBlockElements = [
+    "address",
+    "article",
+    "aside",
+    "base",
+    "basefont",
+    "blockquote",
+    "body",
+    "caption",
+    "center",
+    "col",
+    "colgroup",
+    "dd",
+    "details",
+    "dialog",
+    "dir",
+    "div",
+    "dl",
+    "dt",
+    "fieldset",
+    "figcaption",
+    "figure",
+    "footer",
+    "form",
+    "frame",
+    "frameset",
+    "h1",
+    "h2",
+    "h3",
+    "h4",
+    "h5",
+    "h6",
+    "head",
+    "header",
+    "hr",
+    "html",
+    "iframe",
+    "legend",
+    "li",
+    "link",
+    "main",
+    "menu",
+    "menuitem",
+    "nav",
+    "noframes",
+    "ol",
+    "optgroup",
+    "option",
+    "p",
+    "param",
+    "section",
+    "source",
+    "summary",
+    "table",
+    "tbody",
+    "td",
+    "tfoot",
+    "th",
+    "thead",
+    "title",
+    "tr",
+    "track",
+    "ul",
+    // Extra elements that need to be followed by a blank line for the following
+    // text to be converted to markdown.
+    "pre",
+    "script",
+    "style",
+    "textarea",
+  ];
+
+  /**
+   * Convert a markdown text to HTML.
+   *
+   * @param string $text
+   *   Markdown text to convert.
+   * @param array $internal_hosts
+   *   List of internal hosts to determine if a link is external or not.
+   *
+   * @return string
+   *   HTML.
+   *
+   * @todo this is the same code as \RWApiIndexer\Processor::convertToHtml().
+   *   See if we can consolidate that somehow while keeping this and the API
+   *   indexer independent. In the meantime any change here should probably
+   *   reflected in the API indexer.
+   *
+   * @see \RWApiIndexer\Processor::convertToHtml()
+   */
+  public static function convertToHtml($text, array $internal_hosts = ['reliefweb.int']) {
+    static $pattern;
+
+    // CommonMark specs consider text following an HTML block element without
+    // a blank line to seperate them, as part of the HTML block. This is a
+    // breaking change compared to what Michel Fortin's PHP markdown or
+    // hoedown libraries were doing so use the following regex to ensure there
+    // is a blank line.
+    // @see https://spec.commonmark.org/0.30/#html-blocks
+    // @see https://talk.commonmark.org/t/beyond-markdown/2787/4
+    if (!isset($pattern)) {
+      $pattern = '#(</' . implode('>|</', static::$htmlBlockElements) . '>)\s*#m';
+    }
+    $text = preg_replace($pattern, "$1\n\n", $text);
+
+    // Add a space before the heading '#' which is fine as ReliefWeb doesn't use
+    // hash tags.
+    // @see https://talk.commonmark.org/t/heading-not-working/819/42
+    $text = preg_replace('/^(#+)([^# ])/m', '$1 $2', $text);
+
+    // No need for extra blanks.
+    $text = trim($text);
+
+    // Obtain a pre-configured Environment with all the CommonMark
+    // parsers/renderers ready-to-go.
+    $environment = Environment::createCommonMarkEnvironment();
+
+    // Configuration to add attributes to external links.
+    $external_link_config = [
+      'external_link' => [
+        'internal_hosts' => $internal_hosts,
+        'open_in_new_window' => TRUE,
+      ],
+    ];
+    $environment->mergeConfig($external_link_config);
+
+    // Add the extension to convert external links.
+    $environment->addExtension(new ExternalLinkExtension());
+
+    // Add the extension to convert ID attributes.
+    $environment->addExtension(new AttributesExtension());
+
+    // Add the extension to convert links.
+    $environment->addExtension(new AutolinkExtension());
+
+    // Add the extension to convert the tables.
+    $environment->addExtension(new TableExtension());
+
+    // Create the converter with the extension(s).
+    $converter = new MarkdownConverter($environment);
+
+    // Convert to HTML.
+    return (string) $converter->convertToHtml($text);
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_utility/src/Plugin/Filter/Markdown.php b/html/modules/custom/reliefweb_utility/src/Plugin/Filter/MarkdownFilter.php
similarity index 53%
rename from html/modules/custom/reliefweb_utility/src/Plugin/Filter/Markdown.php
rename to html/modules/custom/reliefweb_utility/src/Plugin/Filter/MarkdownFilter.php
index 876b138c8..47c7bb348 100644
--- a/html/modules/custom/reliefweb_utility/src/Plugin/Filter/Markdown.php
+++ b/html/modules/custom/reliefweb_utility/src/Plugin/Filter/MarkdownFilter.php
@@ -7,12 +7,7 @@
 use Drupal\Core\Render\Markup;
 use Drupal\filter\FilterProcessResult;
 use Drupal\filter\Plugin\FilterBase;
-use League\CommonMark\Environment\Environment;
-use League\CommonMark\Extension\Attributes\AttributesExtension;
-use League\CommonMark\Extension\Autolink\AutolinkExtension;
-use League\CommonMark\Extension\ExternalLink\ExternalLinkExtension;
-use League\CommonMark\Extension\Table\TableExtension;
-use League\CommonMark\MarkdownConverter;
+use Drupal\reliefweb_utility\Helpers\MarkdownHelper;
 
 /**
  * Provides a filter to display any HTML as plain text.
@@ -24,168 +19,19 @@
  *   weight = -20
  * )
  */
-class Markdown extends FilterBase {
-
-  /**
-   * List of HTML block level elements.
-   *
-   * @var array
-   */
-  public static $htmlBlockElements = [
-    "address",
-    "article",
-    "aside",
-    "base",
-    "basefont",
-    "blockquote",
-    "body",
-    "caption",
-    "center",
-    "col",
-    "colgroup",
-    "dd",
-    "details",
-    "dialog",
-    "dir",
-    "div",
-    "dl",
-    "dt",
-    "fieldset",
-    "figcaption",
-    "figure",
-    "footer",
-    "form",
-    "frame",
-    "frameset",
-    "h1",
-    "h2",
-    "h3",
-    "h4",
-    "h5",
-    "h6",
-    "head",
-    "header",
-    "hr",
-    "html",
-    "iframe",
-    "legend",
-    "li",
-    "link",
-    "main",
-    "menu",
-    "menuitem",
-    "nav",
-    "noframes",
-    "ol",
-    "optgroup",
-    "option",
-    "p",
-    "param",
-    "section",
-    "source",
-    "summary",
-    "table",
-    "tbody",
-    "td",
-    "tfoot",
-    "th",
-    "thead",
-    "title",
-    "tr",
-    "track",
-    "ul",
-    // Extra elements that need to be followed by a blank line for the following
-    // text to be converted to markdown.
-    "pre",
-    "script",
-    "style",
-    "textarea",
-  ];
+class MarkdownFilter extends FilterBase {
 
   /**
    * {@inheritdoc}
    */
   public function process($text, $langcode) {
-    $html = static::convertToHtml($text, [
+    $html = MarkdownHelper::convertToHtml($text, [
       \Drupal::request()->getHost(),
       'reliefweb.int',
     ]);
     return new FilterProcessResult($html);
   }
 
-  /**
-   * Convert a markdown text to HTML.
-   *
-   * @param string $text
-   *   Markdown text to convert.
-   * @param array $internal_hosts
-   *   List of internal hosts to determine if a link is external or not.
-   *
-   * @return string
-   *   HTML.
-   *
-   * @todo this is the same code as \RWApiIndexer\Processor::convertToHtml().
-   *   See if we can consolidate that somehow while keeping this and the API
-   *   indexer independent. In the meantime any change here should probably
-   *   reflected in the API indexer.
-   *
-   * @see \RWApiIndexer\Processor::convertToHtml()
-   */
-  public static function convertToHtml($text, array $internal_hosts = ['reliefweb.int']) {
-    static $pattern;
-
-    // CommonMark specs consider text following an HTML block element without
-    // a blank line to seperate them, as part of the HTML block. This is a
-    // breaking change compared to what Michel Fortin's PHP markdown or
-    // hoedown libraries were doing so use the following regex to ensure there
-    // is a blank line.
-    // @see https://spec.commonmark.org/0.30/#html-blocks
-    // @see https://talk.commonmark.org/t/beyond-markdown/2787/4
-    if (!isset($pattern)) {
-      $pattern = '#(</' . implode('>|</', static::$htmlBlockElements) . '>)\s*#m';
-    }
-    $text = preg_replace($pattern, "$1\n\n", $text);
-
-    // Add a space before the heading '#' which is fine as ReliefWeb doesn't use
-    // hash tags.
-    // @see https://talk.commonmark.org/t/heading-not-working/819/42
-    $text = preg_replace('/^(#+)([^# ])/m', '$1 $2', $text);
-
-    // No need for extra blanks.
-    $text = trim($text);
-
-    // Obtain a pre-configured Environment with all the CommonMark
-    // parsers/renderers ready-to-go.
-    $environment = Environment::createCommonMarkEnvironment();
-
-    // Configuration to add attributes to external links.
-    $external_link_config = [
-      'external_link' => [
-        'internal_hosts' => $internal_hosts,
-        'open_in_new_window' => TRUE,
-      ],
-    ];
-    $environment->mergeConfig($external_link_config);
-
-    // Add the extension to convert external links.
-    $environment->addExtension(new ExternalLinkExtension());
-
-    // Add the extension to convert ID attributes.
-    $environment->addExtension(new AttributesExtension());
-
-    // Add the extension to convert links.
-    $environment->addExtension(new AutolinkExtension());
-
-    // Add the extension to convert the tables.
-    $environment->addExtension(new TableExtension());
-
-    // Create the converter with the extension(s).
-    $converter = new MarkdownConverter($environment);
-
-    // Convert to HTML.
-    return $converter->convertToHtml($text);
-  }
-
   /**
    * {@inheritdoc}
    */
diff --git a/html/modules/custom/reliefweb_utility/tests/src/Unit/MarkdownTest.php b/html/modules/custom/reliefweb_utility/tests/src/Unit/MarkdownFilterTest.php
similarity index 82%
rename from html/modules/custom/reliefweb_utility/tests/src/Unit/MarkdownTest.php
rename to html/modules/custom/reliefweb_utility/tests/src/Unit/MarkdownFilterTest.php
index ce77310bc..0fac5134a 100644
--- a/html/modules/custom/reliefweb_utility/tests/src/Unit/MarkdownTest.php
+++ b/html/modules/custom/reliefweb_utility/tests/src/Unit/MarkdownFilterTest.php
@@ -4,22 +4,22 @@
 
 namespace Drupal\Tests\reliefweb_utility\Unit;
 
-use Drupal\reliefweb_utility\Plugin\Filter\Markdown;
+use Drupal\reliefweb_utility\Plugin\Filter\MarkdownFilter;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
- * Tests date helper.
+ * Tests markdown filter.
  *
- * @covers \Drupal\reliefweb_utility\Plugin\Filter\Markdown
- * @coversDefaultClass \Drupal\reliefweb_utility\Plugin\Filter\Markdown
+ * @covers \Drupal\reliefweb_utility\Plugin\Filter\MarkdownFilter
+ * @coversDefaultClass \Drupal\reliefweb_utility\Plugin\Filter\MarkdownFilter
  */
-class MarkdownTest extends UnitTestCase {
+class MarkdownFilterTest extends UnitTestCase {
 
   /**
-   * @var \Drupal\reliefweb_utility\Plugin\Filter\Markdown
+   * @var \Drupal\reliefweb_utility\Plugin\Filter\MarkdownFilter
    */
   protected $filter;
 
@@ -41,7 +41,7 @@ protected function setUp() {
     $container->set('request_stack', $request_stack->reveal());
 
     $configuration['settings'] = [];
-    $this->filter = new Markdown($configuration, 'filter_markdown', [
+    $this->filter = new MarkdownFilter($configuration, 'filter_markdown', [
       'provider' => 'test',
     ]);
 
@@ -55,15 +55,15 @@ protected function setUp() {
    *
    * @dataProvider providerMarkdown
    *
-   * @param string $html
-   *   Input HTML.
+   * @param string $text
+   *   Markdown text.
    * @param array $expected
    *   The expected output string.
    */
-  public function testMarkdown($html, $expected) {
+  public function testMarkdown($text, $expected) {
     $this
       ->assertSame($expected, $this->filter
-      ->process($html, 'en')->__toString());
+      ->process($text, 'en')->__toString());
   }
 
   /**
diff --git a/html/modules/custom/reliefweb_utility/tests/src/Unit/MarkdownHelperTest.php b/html/modules/custom/reliefweb_utility/tests/src/Unit/MarkdownHelperTest.php
new file mode 100644
index 000000000..4fad7abc9
--- /dev/null
+++ b/html/modules/custom/reliefweb_utility/tests/src/Unit/MarkdownHelperTest.php
@@ -0,0 +1,100 @@
+<?php
+
+// phpcs:ignoreFile
+
+namespace Drupal\Tests\reliefweb_utility\Unit;
+
+use Drupal\reliefweb_utility\Helpers\MarkdownHelper;
+use Drupal\Tests\UnitTestCase;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+/**
+ * Tests markdown helper.
+ *
+ * @covers \Drupal\reliefweb_utility\Helpers\MarkdownHelper
+ */
+class MarkdownHelperTest extends UnitTestCase {
+
+  /**
+   * @covers \Drupal\reliefweb_utility\Helpers\MarkdownHelper::convertToHtml
+   *
+   * @dataProvider providerMarkdown
+   *
+   * @param string $text
+   *   Markdown text.
+   * @param array $expected
+   *   The expected output string.
+   * @param array $internal_hosts
+   *   List of internal hosts to determine if a link is external or not.
+   */
+  public function testConvertToHtml($text, $expected, array $internal_hosts = ['reliefweb.int']) {
+    $this->assertEquals($expected, MarkdownHelper::convertToHtml($text, $internal_hosts));
+  }
+
+  /**
+   * Provides data for testMarkdown.
+   *
+   * @return array
+   *   An array of test data.
+   */
+  public function providerMarkdown() {
+    return [
+      [
+        'Just a string',
+        '<p>Just a string</p>' . "\n",
+      ],
+      [
+        '#foo',
+        '<h1>foo</h1>' . "\n",
+      ],
+      [
+        '#bar #',
+        '<h1>bar</h1>' . "\n",
+      ],
+      [
+        '#bar#',
+        '<h1>bar#</h1>' . "\n",
+      ],
+      [
+        '##baz',
+        '<h2>baz</h2>' . "\n",
+      ],
+      [
+        '##baz #',
+        '<h2>baz</h2>' . "\n",
+      ],
+      [
+        '##quz ##',
+        '<h2>quz</h2>' . "\n",
+      ],
+      [
+        '##quz##',
+        '<h2>quz##</h2>' . "\n",
+      ],
+      [
+        'heading' . "\n" . '===============',
+        '<h1>heading</h1>' . "\n",
+      ],
+      [
+        '[Internal](https://internal.test)',
+        '<p><a rel="noopener noreferrer" target="_blank" href="https://internal.test">Internal</a></p>' . "\n",
+      ],
+      [
+        '[Internal](https://internal.test)',
+        '<p><a href="https://internal.test">Internal</a></p>' . "\n",
+        ['internal.test'],
+      ],
+      [
+        '[Internal](https://reliefweb.int)',
+        '<p><a href="https://reliefweb.int">Internal</a></p>' . "\n",
+      ],
+      [
+        '[External](https://external.test)',
+        '<p><a rel="noopener noreferrer" target="_blank" href="https://external.test">External</a></p>' . "\n",
+      ],
+    ];
+  }
+
+}

From c6670216f716d52fa4602fb17928f364a3c83da2 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 1 Mar 2022 06:35:20 +0000
Subject: [PATCH 537/720] [RW-403] Adjust to recent Drupal and stylelint
 linting rules

---
 .../Field/FieldWidget/ReliefWebImportInfo.php |   6 +-
 .../reliefweb-guidelines.css                  |  35 +-
 .../Plugin/migrate/process/Unserialize.php    |   2 +-
 .../migrate/source/FieldableEntityBase.php    |   2 +-
 .../src/Controller/ModerationPage.php         |   2 +-
 .../src/Form/ModerationPageFilterForm.php     |   2 +-
 .../reliefweb_rivers/src/Parameters.php       |   6 +-
 .../src/CronExpressionParser.php              |   6 +-
 .../src/Controller/UserPostsPage.php          |   2 +-
 .../src/Form/UserPageFilterForm.php           |  14 +-
 .../components/cd-button/cd-button.css        |   4 +-
 .../components/rw-dsr/rw-dsr.css              |   4 +-
 .../rw-entity-text/rw-entity-text.css         |   2 +-
 .../rw-icons/rw-icons-generator.php           |   4 +-
 .../components/rw-icons/rw-icons.css          | 780 +++++++++---------
 .../rw-site-slogan/rw-site-slogan.css         |   4 +-
 16 files changed, 427 insertions(+), 448 deletions(-)

diff --git a/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebImportInfo.php b/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebImportInfo.php
index cf756342d..9c5861569 100644
--- a/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebImportInfo.php
+++ b/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebImportInfo.php
@@ -31,21 +31,21 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
     $element['feed_url'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Feed Url'),
-      '#default_value' => isset($items[$delta]->feed_url) ? $items[$delta]->feed_url : NULL,
+      '#default_value' => $items[$delta]->feed_url ?? NULL,
       '#description' => $this->t('For automatic job imports. This URL is a feed url of an updated list of the job offers for the organization. It must start with "https://" or "http://".'),
     ];
 
     $element['base_url'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Base Url'),
-      '#default_value' => isset($items[$delta]->base_url) ? $items[$delta]->base_url : NULL,
+      '#default_value' => $items[$delta]->base_url ?? NULL,
       '#description' => $this->t('Job postings published by this organization must match this URL. It must start with "https://" or "http://".'),
     ];
 
     $element['uid'] = [
       '#type' => 'textfield',
       '#title' => $this->t('User Id'),
-      '#default_value' => isset($items[$delta]->uid) ? $items[$delta]->uid : NULL,
+      '#default_value' => $items[$delta]->uid ?? NULL,
       '#description' => $this->t('ID of user for automated job imports from this source.'),
     ];
 
diff --git a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
index 3ffd2e186..12eb2f601 100644
--- a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
+++ b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
@@ -4,9 +4,7 @@
   right: 0;
   bottom: 0;
   left: 0;
-  display: -webkit-flex;
   display: flex;
-  -webkit-flex-direction: row;
   flex-direction: row;
   margin: 0;
   padding: 0;
@@ -21,9 +19,7 @@
 }
 .rw-guidelines-list aside {
   z-index: 3;
-  display: -webkit-flex;
   display: flex;
-  -webkit-flex-direction: column;
   flex-direction: column;
   width: 260px;
   color: white;
@@ -37,12 +33,10 @@
 .rw-guidelines-list aside > nav {
   overflow-x: hidden;
   overflow-y: auto;
-  -webkit-flex: 1;
   flex: 1;
 }
 .rw-guidelines-list aside h1 {
   position: relative;
-  -webkit-flex: 0 0 auto;
   flex: 0 0 auto;
   width: 100%;
   height: 50px;
@@ -60,7 +54,7 @@
   margin: 5px;
   content: "";
   cursor: default;
-  background-image: url(./assets/logo.svg);
+  background-image: url("./assets/logo.svg");
   background-repeat: no-repeat;
 }
 .rw-guidelines-list aside h1 a {
@@ -71,7 +65,6 @@
   font-weight: normal;
 }
 .rw-guidelines-list aside form {
-  -webkit-flex: 0 0 auto;
   flex: 0 0 auto;
 }
 .rw-guidelines-list aside form input {
@@ -145,18 +138,14 @@ aside nav a.active + a {
 .rw-guidelines-list main {
   position: relative;
   z-index: 1;
-  display: -webkit-flex;
   display: flex;
-  -webkit-flex: 1 0 0;
   flex: 1 0 0;
-  -webkit-flex-direction: column;
   flex-direction: column;
 }
 .rw-guidelines-list main > div {
   position: relative;
   overflow-x: hidden;
   overflow-y: auto;
-  -webkit-flex: 1;
   flex: 1;
   background-color: #fff;
 }
@@ -171,9 +160,8 @@ aside nav a.active + a {
   margin-left: -200px;
   content: "";
   opacity: 0.4;
-  -webkit-filter: grayscale(100%);
   filter: grayscale(100%);
-  background-image: url(./assets/logo.svg);
+  background-image: url("./assets/logo.svg");
   background-repeat: no-repeat;
 }
 
@@ -189,8 +177,6 @@ aside nav a.active + a {
   font-family: "Helvetica Neue", Helvetica, "Segoe UI", Arial, freesans, sans-serif;
   font-size: 16px;
   line-height: 1.6;
-  -ms-text-size-adjust: 100%;
-  -webkit-text-size-adjust: 100%;
 }
 .rw-guidelines-list a:target + article,
 .rw-guidelines-list article:target {
@@ -208,7 +194,7 @@ aside nav a.active + a {
   float: right;
   width: 20px;
   height: 40px;
-  background-image: url(../images/trello.svg);
+  background-image: url("../images/trello.svg");
   background-repeat: no-repeat;
   background-position: 0 10px;
   background-size: 20px 20px;
@@ -237,7 +223,6 @@ aside nav a.active + a {
   margin-right: 5px;
   margin-left: 5px;
   content: "";
-  -webkit-transform: rotate(45deg);
   transform: rotate(45deg);
   border-top: 5px solid #333;
   border-right: 5px solid #333;
@@ -259,7 +244,6 @@ aside nav a.active + a {
   margin-right: 3px;
   margin-left: 3px;
   content: "";
-  -webkit-transform: rotate(45deg);
   transform: rotate(45deg);
   border-top: 3px solid #4183c4;
   border-right: 3px solid #4183c4;
@@ -293,11 +277,11 @@ aside nav a.active + a {
 }
 .rw-guidelines-list .scroll::-webkit-scrollbar-track {
   background-color: #f5f5f5;
-  -webkit-box-shadow: inset 0 0 10px rgba(0, 0, 0, 0.3);
+  box-shadow: inset 0 0 10px rgba(0, 0, 0, 0.3);
 }
 .rw-guidelines-list .scroll::-webkit-scrollbar-thumb {
   background-color: #bbb;
-  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+  box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
 }
 
 /**
@@ -307,7 +291,7 @@ aside nav a.active + a {
  */
 @font-face {
   font-family: octicons-anchor;
-  src: url(data:font/woff;charset=utf-8;base64,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) format("woff");
+  src: url("data:font/woff;charset=utf-8;base64,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") format("woff");
 }
 
 .rw-guidelines-list article a {
@@ -332,8 +316,6 @@ aside nav a.active + a {
   padding: 10px;
   border: 0;
   background-color: #fff;
-  -moz-box-shadow: 0 0 5px 0 #ddd;
-  -webkit-box-shadow: 0 0 5px 0 #ddd;
   box-shadow: 0 0 5px 0 #ddd;
 }
 
@@ -498,9 +480,6 @@ aside nav a.active + a {
 
 .rw-guidelines-list article .octicon {
   display: inline-block;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
   user-select: none;
   text-decoration: none;
   font: normal normal normal 16px/1 octicons-anchor, monospace;
@@ -855,5 +834,5 @@ aside nav a.active + a {
   margin: -2px 0 0 6px;
   content: "";
   vertical-align: middle;
-  background: url(./assets/external-link.svg) 0 0 no-repeat;
+  background: url("./assets/external-link.svg") 0 0 no-repeat;
 }
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/process/Unserialize.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/process/Unserialize.php
index 46d36e9a6..9ca7ae9e2 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/process/Unserialize.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/process/Unserialize.php
@@ -28,7 +28,7 @@ public function transform($value, MigrateExecutableInterface $migrate_executable
     if (!is_string($value)) {
       throw new MigrateException(sprintf("Input should be a string, instead it was of type '%s'", gettype($value)));
     }
-    $data = unserialize($value);
+    $data = unserialize($value, ['allowed_classes' => FALSE]);
     $new_value = NestedArray::getValue($data, $this->configuration['index'], $key_exists);
 
     if (!$key_exists) {
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/FieldableEntityBase.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/FieldableEntityBase.php
index ae7ffb275..60bf2379b 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/FieldableEntityBase.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/FieldableEntityBase.php
@@ -296,7 +296,7 @@ protected function setRowDestinationUrlAlias($id, Row $row) {
    *   The field instances, keyed by field name.
    */
   protected function getFields($entity_type, $bundle = NULL) {
-    $bundle = isset($bundle) ? $bundle : $entity_type;
+    $bundle = $bundle ?? $entity_type;
 
     if (!isset($this->fieldInstances[$entity_type][$bundle])) {
       $query = $this->select('field_config_instance', 'fci')
diff --git a/html/modules/custom/reliefweb_moderation/src/Controller/ModerationPage.php b/html/modules/custom/reliefweb_moderation/src/Controller/ModerationPage.php
index 6cedf5331..80d7578be 100644
--- a/html/modules/custom/reliefweb_moderation/src/Controller/ModerationPage.php
+++ b/html/modules/custom/reliefweb_moderation/src/Controller/ModerationPage.php
@@ -97,7 +97,7 @@ public function getPageContent(ModerationServiceInterface $service) {
                 $value = $item;
               }
               else {
-                list($value,) = explode(':', $item, 2);
+                [$value] = explode(':', $item, 2);
               }
               // For compatibility with the other type of filters we set the
               // selected value as key with 1 value to flag it as selected.
diff --git a/html/modules/custom/reliefweb_moderation/src/Form/ModerationPageFilterForm.php b/html/modules/custom/reliefweb_moderation/src/Form/ModerationPageFilterForm.php
index 34b1f0b45..a1c672d6b 100644
--- a/html/modules/custom/reliefweb_moderation/src/Form/ModerationPageFilterForm.php
+++ b/html/modules/custom/reliefweb_moderation/src/Form/ModerationPageFilterForm.php
@@ -180,7 +180,7 @@ public function buildForm(array $form, FormStateInterface $form_state, Moderatio
               $label = $item;
             }
             else {
-              list($value, $label) = explode(':', $item, 2);
+              [$value, $label] = explode(':', $item, 2);
             }
             $selection .= new FormattableMarkup(implode('', [
               '<div data-value="@value">',
diff --git a/html/modules/custom/reliefweb_rivers/src/Parameters.php b/html/modules/custom/reliefweb_rivers/src/Parameters.php
index 34439dff8..bdb5c02f2 100644
--- a/html/modules/custom/reliefweb_rivers/src/Parameters.php
+++ b/html/modules/custom/reliefweb_rivers/src/Parameters.php
@@ -291,7 +291,7 @@ protected function parseSearchlight() {
           continue;
         }
         elseif (preg_match('/^[a-z0-9_]+-[0-9:]+$/', $parameter) === 1) {
-          list($field, $values) = explode('-', $parameter, 2);
+          [$field, $values] = explode('-', $parameter, 2);
           if (isset($mapping[$field])) {
             $field = $mapping[$field];
             $values = explode(':', $values);
@@ -326,7 +326,7 @@ protected function parseSearchapi() {
       $fields = ['term' => [], 'date' => []];
       foreach ($parameters as $parameter) {
         if (is_string($parameter) && strpos($parameter, ':') > 0) {
-          list($field, $value) = explode(':', $parameter, 2);
+          [$field, $value] = explode(':', $parameter, 2);
           $field = urldecode($field);
 
           if (isset($mapping[$field])) {
@@ -445,7 +445,7 @@ protected function parseExtendedSearch() {
 
             foreach ($items as $key => $item) {
               if (is_array($item) && count($item) === 2 && is_string($item[0]) && is_string($item[1])) {
-                list(, $operator) = explode('|', strtoupper($item[0]), 2);
+                [, $operator] = explode('|', strtoupper($item[0]), 2);
                 $operator = $key === 0 ? '|' : $operator;
 
                 // Skip if unrecognized operator.
diff --git a/html/modules/custom/reliefweb_subscriptions/src/CronExpressionParser.php b/html/modules/custom/reliefweb_subscriptions/src/CronExpressionParser.php
index 55ef72da7..1429ed58f 100644
--- a/html/modules/custom/reliefweb_subscriptions/src/CronExpressionParser.php
+++ b/html/modules/custom/reliefweb_subscriptions/src/CronExpressionParser.php
@@ -426,7 +426,7 @@ public static function parseComponent($type, $component) {
       'weekday' => [0, 6],
     ];
 
-    list($min, $max) = $minmax[$type];
+    [$min, $max] = $minmax[$type];
 
     switch ($type) {
       case 'month':
@@ -540,7 +540,7 @@ public static function getAllowedValues($value, $min, $max) {
       if (substr_count($value, '/') > 1) {
         throw new Exception();
       }
-      list($value, $step) = explode('/', $value);
+      [$value, $step] = explode('/', $value);
       $step = static::checkInt($step, 1, $max);
     }
 
@@ -554,7 +554,7 @@ public static function getAllowedValues($value, $min, $max) {
       if (substr_count($value, '-') > 1) {
         throw new Exception();
       }
-      list($start, $end) = explode('-', $value);
+      [$start, $end] = explode('-', $value);
       $start = self::checkInt($start, 0, $max);
       $end = self::checkInt($end, 1, $max);
       if ($start >= $end) {
diff --git a/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php b/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php
index ceac707ad..edb595ba7 100644
--- a/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php
+++ b/html/modules/custom/reliefweb_user_posts/src/Controller/UserPostsPage.php
@@ -110,7 +110,7 @@ public function getContent(UserInterface $user, ModerationServiceInterface $serv
                 $value = $item;
               }
               else {
-                list($value,) = explode(':', $item, 2);
+                [$value] = explode(':', $item, 2);
               }
               // For compatibility with the other type of filters we set the
               // selected value as key with 1 value to flag it as selected.
diff --git a/html/modules/custom/reliefweb_users/src/Form/UserPageFilterForm.php b/html/modules/custom/reliefweb_users/src/Form/UserPageFilterForm.php
index c4b1a0d94..44ead7350 100644
--- a/html/modules/custom/reliefweb_users/src/Form/UserPageFilterForm.php
+++ b/html/modules/custom/reliefweb_users/src/Form/UserPageFilterForm.php
@@ -82,49 +82,49 @@ public function buildForm(array $form, FormStateInterface $form_state, AccountIn
       '#type' => 'checkboxes',
       '#title' => $this->t('Role'),
       '#options' => $roles,
-      '#default_value' => isset($filters['role']) ? $filters['role'] : [],
+      '#default_value' => $filters['role'] ?? [],
     ];
 
     $form['filters']['status'] = [
       '#type' => 'radios',
       '#title' => $this->t('Status'),
       '#options' => ['any' => 'Any'] + $statuses,
-      '#default_value' => isset($filters['status']) ? $filters['status'] : 'any',
+      '#default_value' => $filters['status'] ?? 'any',
     ];
 
     $form['filters']['posted'] = [
       '#title' => $this->t('Posted'),
       '#type' => 'checkboxes',
       '#options' => $content_types,
-      '#default_value' => isset($filters['posted']) ? $filters['posted'] : [],
+      '#default_value' => $filters['posted'] ?? [],
     ];
 
     $form['filters']['job_rights'] = [
       '#type' => 'radios',
       '#title' => $this->t('Job posting rights'),
       '#options' => ['any' => 'Any'] + $rights,
-      '#default_value' => isset($filters['job_rights']) ? $filters['job_rights'] : 'any',
+      '#default_value' => $filters['job_rights'] ?? 'any',
     ];
 
     $form['filters']['training_rights'] = [
       '#type' => 'radios',
       '#title' => $this->t('Training posting rights'),
       '#options' => ['any' => 'Any'] + $rights,
-      '#default_value' => isset($filters['training_rights']) ? $filters['training_rights'] : 'any',
+      '#default_value' => $filters['training_rights'] ?? 'any',
     ];
 
     $form['filters']['name'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Name'),
       '#maxlength' => 2048,
-      '#default_value' => isset($filters['name']) ? $filters['name'] : '',
+      '#default_value' => $filters['name'] ?? '',
     ];
 
     $form['filters']['mail'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Mail'),
       '#maxlength' => 2048,
-      '#default_value' => isset($filters['mail']) ? $filters['mail'] : '',
+      '#default_value' => $filters['mail'] ?? '',
     ];
 
     $form['actions'] = [
diff --git a/html/themes/custom/common_design_subtheme/components/cd-button/cd-button.css b/html/themes/custom/common_design_subtheme/components/cd-button/cd-button.css
index 6cbe1177d..235206871 100755
--- a/html/themes/custom/common_design_subtheme/components/cd-button/cd-button.css
+++ b/html/themes/custom/common_design_subtheme/components/cd-button/cd-button.css
@@ -115,7 +115,7 @@
   color: var(--cd-primary-color);
   border-color: var(--cd-primary-color);
   background-color: var(--cd-white);
-  fill: currentColor;
+  fill: currentcolor;
 }
 
 /* For IE11 */
@@ -151,7 +151,7 @@
 
 .cd-button--light:hover svg,
 .cd-button--light:focus svg {
-  fill: currentColor;
+  fill: currentcolor;
 }
 
 /* For IE11 */
diff --git a/html/themes/custom/common_design_subtheme/components/rw-dsr/rw-dsr.css b/html/themes/custom/common_design_subtheme/components/rw-dsr/rw-dsr.css
index 61e6fff12..149fa7578 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-dsr/rw-dsr.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-dsr/rw-dsr.css
@@ -34,8 +34,8 @@
   margin-top: -11px;
   content: "";
   /* The logo has a white background and will be display above the text. */
-  background: url(../../img/logos/ocha-logo-sprite.png) 0 -57px no-repeat;
-  background: rgba(0, 0, 0, 0) url(../../img/logos/ocha-logo-sprite.svg) 0 -57px no-repeat;
+  background: url("../../img/logos/ocha-logo-sprite.png") 0 -57px no-repeat;
+  background: rgba(0, 0, 0, 0) url("../../img/logos/ocha-logo-sprite.svg") 0 -57px no-repeat;
 }
 .rw-dsr ul {
   padding-left: 18px;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-entity-text/rw-entity-text.css b/html/themes/custom/common_design_subtheme/components/rw-entity-text/rw-entity-text.css
index cc54fa3b2..1ebd5eebf 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-entity-text/rw-entity-text.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-entity-text/rw-entity-text.css
@@ -37,7 +37,7 @@
   fill: var(--cd-reliefweb-brand-blue--dark);
 }
 .js .rw-entity-text--collapsible button svg {
-  fill: currentColor;
+  fill: currentcolor;
 }
 .js .rw-entity-text--collapsible button:hover,
 .js .rw-entity-text--collapsible button:active,
diff --git a/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons-generator.php b/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons-generator.php
index c3ba6a612..0b588e8ea 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons-generator.php
+++ b/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons-generator.php
@@ -77,7 +77,7 @@ function extract_css_variables(array $settings) {
 
   if (preg_match_all($pattern, $style, $matches)) {
     foreach ($matches['variable'] as $variable) {
-      list($name, $value) = explode(':', $variable, 2);
+      [$name, $value] = explode(':', $variable, 2);
       $variables[trim($name)] = trim($value);
     }
   }
@@ -257,7 +257,7 @@ function generate_css(array $settings, array $icons) {
   $categories = [];
 
   // Generate the CSS file.
-  $base = 'url(' . $path . '/img/rw-icons-sprite.svg) @x @y no-repeat;';
+  $base = 'url("' . $path . '/img/rw-icons-sprite.svg") @x @y no-repeat;';
   $x = 0;
   foreach ($icons as $category => $ids) {
     $sizes = $settings['icons'][$category]['sizes'];
diff --git a/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.css b/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.css
index 0a016a912..98521448c 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-icons/rw-icons.css
@@ -7,239 +7,239 @@
   --rw-icons--common--18--dark-red--x: -66px;
   --rw-icons--common--18--dark-grey--x: -84px;
   --rw-icons--common--18--white--x: -102px;
-  --rw-icons--common--add--12--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) 0 0 no-repeat;
-  --rw-icons--common--add--12--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -12px 0 no-repeat;
-  --rw-icons--common--add--12--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -24px 0 no-repeat;
-  --rw-icons--common--add--12--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -36px 0 no-repeat;
-  --rw-icons--common--add--18--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -48px 0 no-repeat;
-  --rw-icons--common--add--18--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -66px 0 no-repeat;
-  --rw-icons--common--add--18--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -84px 0 no-repeat;
-  --rw-icons--common--add--18--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -102px 0 no-repeat;
-  --rw-icons--common--admin--12--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) 0 -12px no-repeat;
-  --rw-icons--common--admin--12--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -12px -12px no-repeat;
-  --rw-icons--common--admin--12--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -24px -12px no-repeat;
-  --rw-icons--common--admin--12--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -36px -12px no-repeat;
-  --rw-icons--common--admin--18--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -48px -18px no-repeat;
-  --rw-icons--common--admin--18--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -66px -18px no-repeat;
-  --rw-icons--common--admin--18--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -84px -18px no-repeat;
-  --rw-icons--common--admin--18--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -102px -18px no-repeat;
-  --rw-icons--common--arrow-left--12--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) 0 -24px no-repeat;
-  --rw-icons--common--arrow-left--12--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -12px -24px no-repeat;
-  --rw-icons--common--arrow-left--12--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -24px -24px no-repeat;
-  --rw-icons--common--arrow-left--12--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -36px -24px no-repeat;
-  --rw-icons--common--arrow-left--18--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -48px -36px no-repeat;
-  --rw-icons--common--arrow-left--18--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -66px -36px no-repeat;
-  --rw-icons--common--arrow-left--18--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -84px -36px no-repeat;
-  --rw-icons--common--arrow-left--18--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -102px -36px no-repeat;
-  --rw-icons--common--arrow-right--12--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) 0 -36px no-repeat;
-  --rw-icons--common--arrow-right--12--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -12px -36px no-repeat;
-  --rw-icons--common--arrow-right--12--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -24px -36px no-repeat;
-  --rw-icons--common--arrow-right--12--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -36px -36px no-repeat;
-  --rw-icons--common--arrow-right--18--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -48px -54px no-repeat;
-  --rw-icons--common--arrow-right--18--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -66px -54px no-repeat;
-  --rw-icons--common--arrow-right--18--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -84px -54px no-repeat;
-  --rw-icons--common--arrow-right--18--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -102px -54px no-repeat;
-  --rw-icons--common--bookmark--12--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) 0 -48px no-repeat;
-  --rw-icons--common--bookmark--12--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -12px -48px no-repeat;
-  --rw-icons--common--bookmark--12--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -24px -48px no-repeat;
-  --rw-icons--common--bookmark--12--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -36px -48px no-repeat;
-  --rw-icons--common--bookmark--18--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -48px -72px no-repeat;
-  --rw-icons--common--bookmark--18--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -66px -72px no-repeat;
-  --rw-icons--common--bookmark--18--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -84px -72px no-repeat;
-  --rw-icons--common--bookmark--18--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -102px -72px no-repeat;
-  --rw-icons--common--calendar--12--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) 0 -60px no-repeat;
-  --rw-icons--common--calendar--12--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -12px -60px no-repeat;
-  --rw-icons--common--calendar--12--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -24px -60px no-repeat;
-  --rw-icons--common--calendar--12--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -36px -60px no-repeat;
-  --rw-icons--common--calendar--18--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -48px -90px no-repeat;
-  --rw-icons--common--calendar--18--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -66px -90px no-repeat;
-  --rw-icons--common--calendar--18--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -84px -90px no-repeat;
-  --rw-icons--common--calendar--18--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -102px -90px no-repeat;
-  --rw-icons--common--close--12--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) 0 -72px no-repeat;
-  --rw-icons--common--close--12--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -12px -72px no-repeat;
-  --rw-icons--common--close--12--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -24px -72px no-repeat;
-  --rw-icons--common--close--12--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -36px -72px no-repeat;
-  --rw-icons--common--close--18--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -48px -108px no-repeat;
-  --rw-icons--common--close--18--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -66px -108px no-repeat;
-  --rw-icons--common--close--18--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -84px -108px no-repeat;
-  --rw-icons--common--close--18--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -102px -108px no-repeat;
-  --rw-icons--common--double-arrow-left--12--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) 0 -84px no-repeat;
-  --rw-icons--common--double-arrow-left--12--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -12px -84px no-repeat;
-  --rw-icons--common--double-arrow-left--12--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -24px -84px no-repeat;
-  --rw-icons--common--double-arrow-left--12--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -36px -84px no-repeat;
-  --rw-icons--common--double-arrow-left--18--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -48px -126px no-repeat;
-  --rw-icons--common--double-arrow-left--18--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -66px -126px no-repeat;
-  --rw-icons--common--double-arrow-left--18--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -84px -126px no-repeat;
-  --rw-icons--common--double-arrow-left--18--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -102px -126px no-repeat;
-  --rw-icons--common--double-arrow-right--12--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) 0 -96px no-repeat;
-  --rw-icons--common--double-arrow-right--12--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -12px -96px no-repeat;
-  --rw-icons--common--double-arrow-right--12--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -24px -96px no-repeat;
-  --rw-icons--common--double-arrow-right--12--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -36px -96px no-repeat;
-  --rw-icons--common--double-arrow-right--18--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -48px -144px no-repeat;
-  --rw-icons--common--double-arrow-right--18--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -66px -144px no-repeat;
-  --rw-icons--common--double-arrow-right--18--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -84px -144px no-repeat;
-  --rw-icons--common--double-arrow-right--18--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -102px -144px no-repeat;
-  --rw-icons--common--download--12--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) 0 -108px no-repeat;
-  --rw-icons--common--download--12--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -12px -108px no-repeat;
-  --rw-icons--common--download--12--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -24px -108px no-repeat;
-  --rw-icons--common--download--12--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -36px -108px no-repeat;
-  --rw-icons--common--download--18--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -48px -162px no-repeat;
-  --rw-icons--common--download--18--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -66px -162px no-repeat;
-  --rw-icons--common--download--18--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -84px -162px no-repeat;
-  --rw-icons--common--download--18--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -102px -162px no-repeat;
-  --rw-icons--common--email--12--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) 0 -120px no-repeat;
-  --rw-icons--common--email--12--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -12px -120px no-repeat;
-  --rw-icons--common--email--12--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -24px -120px no-repeat;
-  --rw-icons--common--email--12--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -36px -120px no-repeat;
-  --rw-icons--common--email--18--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -48px -180px no-repeat;
-  --rw-icons--common--email--18--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -66px -180px no-repeat;
-  --rw-icons--common--email--18--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -84px -180px no-repeat;
-  --rw-icons--common--email--18--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -102px -180px no-repeat;
-  --rw-icons--common--external-link--12--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) 0 -132px no-repeat;
-  --rw-icons--common--external-link--12--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -12px -132px no-repeat;
-  --rw-icons--common--external-link--12--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -24px -132px no-repeat;
-  --rw-icons--common--external-link--12--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -36px -132px no-repeat;
-  --rw-icons--common--external-link--18--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -48px -198px no-repeat;
-  --rw-icons--common--external-link--18--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -66px -198px no-repeat;
-  --rw-icons--common--external-link--18--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -84px -198px no-repeat;
-  --rw-icons--common--external-link--18--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -102px -198px no-repeat;
-  --rw-icons--common--filter--12--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) 0 -144px no-repeat;
-  --rw-icons--common--filter--12--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -12px -144px no-repeat;
-  --rw-icons--common--filter--12--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -24px -144px no-repeat;
-  --rw-icons--common--filter--12--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -36px -144px no-repeat;
-  --rw-icons--common--filter--18--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -48px -216px no-repeat;
-  --rw-icons--common--filter--18--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -66px -216px no-repeat;
-  --rw-icons--common--filter--18--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -84px -216px no-repeat;
-  --rw-icons--common--filter--18--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -102px -216px no-repeat;
-  --rw-icons--common--help--12--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) 0 -156px no-repeat;
-  --rw-icons--common--help--12--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -12px -156px no-repeat;
-  --rw-icons--common--help--12--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -24px -156px no-repeat;
-  --rw-icons--common--help--12--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -36px -156px no-repeat;
-  --rw-icons--common--help--18--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -48px -234px no-repeat;
-  --rw-icons--common--help--18--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -66px -234px no-repeat;
-  --rw-icons--common--help--18--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -84px -234px no-repeat;
-  --rw-icons--common--help--18--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -102px -234px no-repeat;
-  --rw-icons--common--link--12--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) 0 -168px no-repeat;
-  --rw-icons--common--link--12--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -12px -168px no-repeat;
-  --rw-icons--common--link--12--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -24px -168px no-repeat;
-  --rw-icons--common--link--12--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -36px -168px no-repeat;
-  --rw-icons--common--link--18--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -48px -252px no-repeat;
-  --rw-icons--common--link--18--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -66px -252px no-repeat;
-  --rw-icons--common--link--18--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -84px -252px no-repeat;
-  --rw-icons--common--link--18--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -102px -252px no-repeat;
-  --rw-icons--common--next--12--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) 0 -180px no-repeat;
-  --rw-icons--common--next--12--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -12px -180px no-repeat;
-  --rw-icons--common--next--12--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -24px -180px no-repeat;
-  --rw-icons--common--next--12--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -36px -180px no-repeat;
-  --rw-icons--common--next--18--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -48px -270px no-repeat;
-  --rw-icons--common--next--18--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -66px -270px no-repeat;
-  --rw-icons--common--next--18--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -84px -270px no-repeat;
-  --rw-icons--common--next--18--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -102px -270px no-repeat;
-  --rw-icons--common--previous--12--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) 0 -192px no-repeat;
-  --rw-icons--common--previous--12--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -12px -192px no-repeat;
-  --rw-icons--common--previous--12--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -24px -192px no-repeat;
-  --rw-icons--common--previous--12--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -36px -192px no-repeat;
-  --rw-icons--common--previous--18--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -48px -288px no-repeat;
-  --rw-icons--common--previous--18--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -66px -288px no-repeat;
-  --rw-icons--common--previous--18--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -84px -288px no-repeat;
-  --rw-icons--common--previous--18--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -102px -288px no-repeat;
-  --rw-icons--common--print--12--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) 0 -204px no-repeat;
-  --rw-icons--common--print--12--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -12px -204px no-repeat;
-  --rw-icons--common--print--12--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -24px -204px no-repeat;
-  --rw-icons--common--print--12--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -36px -204px no-repeat;
-  --rw-icons--common--print--18--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -48px -306px no-repeat;
-  --rw-icons--common--print--18--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -66px -306px no-repeat;
-  --rw-icons--common--print--18--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -84px -306px no-repeat;
-  --rw-icons--common--print--18--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -102px -306px no-repeat;
-  --rw-icons--common--remove--12--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) 0 -216px no-repeat;
-  --rw-icons--common--remove--12--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -12px -216px no-repeat;
-  --rw-icons--common--remove--12--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -24px -216px no-repeat;
-  --rw-icons--common--remove--12--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -36px -216px no-repeat;
-  --rw-icons--common--remove--18--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -48px -324px no-repeat;
-  --rw-icons--common--remove--18--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -66px -324px no-repeat;
-  --rw-icons--common--remove--18--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -84px -324px no-repeat;
-  --rw-icons--common--remove--18--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -102px -324px no-repeat;
-  --rw-icons--common--selected--12--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) 0 -228px no-repeat;
-  --rw-icons--common--selected--12--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -12px -228px no-repeat;
-  --rw-icons--common--selected--12--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -24px -228px no-repeat;
-  --rw-icons--common--selected--12--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -36px -228px no-repeat;
-  --rw-icons--common--selected--18--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -48px -342px no-repeat;
-  --rw-icons--common--selected--18--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -66px -342px no-repeat;
-  --rw-icons--common--selected--18--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -84px -342px no-repeat;
-  --rw-icons--common--selected--18--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -102px -342px no-repeat;
-  --rw-icons--common--user--12--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) 0 -240px no-repeat;
-  --rw-icons--common--user--12--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -12px -240px no-repeat;
-  --rw-icons--common--user--12--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -24px -240px no-repeat;
-  --rw-icons--common--user--12--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -36px -240px no-repeat;
-  --rw-icons--common--user--18--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -48px -360px no-repeat;
-  --rw-icons--common--user--18--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -66px -360px no-repeat;
-  --rw-icons--common--user--18--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -84px -360px no-repeat;
-  --rw-icons--common--user--18--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -102px -360px no-repeat;
+  --rw-icons--common--add--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") 0 0 no-repeat;
+  --rw-icons--common--add--12--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -12px 0 no-repeat;
+  --rw-icons--common--add--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -24px 0 no-repeat;
+  --rw-icons--common--add--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -36px 0 no-repeat;
+  --rw-icons--common--add--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -48px 0 no-repeat;
+  --rw-icons--common--add--18--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -66px 0 no-repeat;
+  --rw-icons--common--add--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -84px 0 no-repeat;
+  --rw-icons--common--add--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -102px 0 no-repeat;
+  --rw-icons--common--admin--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") 0 -12px no-repeat;
+  --rw-icons--common--admin--12--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -12px -12px no-repeat;
+  --rw-icons--common--admin--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -24px -12px no-repeat;
+  --rw-icons--common--admin--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -36px -12px no-repeat;
+  --rw-icons--common--admin--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -48px -18px no-repeat;
+  --rw-icons--common--admin--18--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -66px -18px no-repeat;
+  --rw-icons--common--admin--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -84px -18px no-repeat;
+  --rw-icons--common--admin--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -102px -18px no-repeat;
+  --rw-icons--common--arrow-left--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") 0 -24px no-repeat;
+  --rw-icons--common--arrow-left--12--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -12px -24px no-repeat;
+  --rw-icons--common--arrow-left--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -24px -24px no-repeat;
+  --rw-icons--common--arrow-left--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -36px -24px no-repeat;
+  --rw-icons--common--arrow-left--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -48px -36px no-repeat;
+  --rw-icons--common--arrow-left--18--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -66px -36px no-repeat;
+  --rw-icons--common--arrow-left--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -84px -36px no-repeat;
+  --rw-icons--common--arrow-left--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -102px -36px no-repeat;
+  --rw-icons--common--arrow-right--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") 0 -36px no-repeat;
+  --rw-icons--common--arrow-right--12--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -12px -36px no-repeat;
+  --rw-icons--common--arrow-right--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -24px -36px no-repeat;
+  --rw-icons--common--arrow-right--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -36px -36px no-repeat;
+  --rw-icons--common--arrow-right--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -48px -54px no-repeat;
+  --rw-icons--common--arrow-right--18--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -66px -54px no-repeat;
+  --rw-icons--common--arrow-right--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -84px -54px no-repeat;
+  --rw-icons--common--arrow-right--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -102px -54px no-repeat;
+  --rw-icons--common--bookmark--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") 0 -48px no-repeat;
+  --rw-icons--common--bookmark--12--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -12px -48px no-repeat;
+  --rw-icons--common--bookmark--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -24px -48px no-repeat;
+  --rw-icons--common--bookmark--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -36px -48px no-repeat;
+  --rw-icons--common--bookmark--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -48px -72px no-repeat;
+  --rw-icons--common--bookmark--18--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -66px -72px no-repeat;
+  --rw-icons--common--bookmark--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -84px -72px no-repeat;
+  --rw-icons--common--bookmark--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -102px -72px no-repeat;
+  --rw-icons--common--calendar--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") 0 -60px no-repeat;
+  --rw-icons--common--calendar--12--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -12px -60px no-repeat;
+  --rw-icons--common--calendar--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -24px -60px no-repeat;
+  --rw-icons--common--calendar--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -36px -60px no-repeat;
+  --rw-icons--common--calendar--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -48px -90px no-repeat;
+  --rw-icons--common--calendar--18--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -66px -90px no-repeat;
+  --rw-icons--common--calendar--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -84px -90px no-repeat;
+  --rw-icons--common--calendar--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -102px -90px no-repeat;
+  --rw-icons--common--close--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") 0 -72px no-repeat;
+  --rw-icons--common--close--12--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -12px -72px no-repeat;
+  --rw-icons--common--close--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -24px -72px no-repeat;
+  --rw-icons--common--close--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -36px -72px no-repeat;
+  --rw-icons--common--close--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -48px -108px no-repeat;
+  --rw-icons--common--close--18--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -66px -108px no-repeat;
+  --rw-icons--common--close--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -84px -108px no-repeat;
+  --rw-icons--common--close--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -102px -108px no-repeat;
+  --rw-icons--common--double-arrow-left--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") 0 -84px no-repeat;
+  --rw-icons--common--double-arrow-left--12--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -12px -84px no-repeat;
+  --rw-icons--common--double-arrow-left--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -24px -84px no-repeat;
+  --rw-icons--common--double-arrow-left--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -36px -84px no-repeat;
+  --rw-icons--common--double-arrow-left--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -48px -126px no-repeat;
+  --rw-icons--common--double-arrow-left--18--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -66px -126px no-repeat;
+  --rw-icons--common--double-arrow-left--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -84px -126px no-repeat;
+  --rw-icons--common--double-arrow-left--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -102px -126px no-repeat;
+  --rw-icons--common--double-arrow-right--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") 0 -96px no-repeat;
+  --rw-icons--common--double-arrow-right--12--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -12px -96px no-repeat;
+  --rw-icons--common--double-arrow-right--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -24px -96px no-repeat;
+  --rw-icons--common--double-arrow-right--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -36px -96px no-repeat;
+  --rw-icons--common--double-arrow-right--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -48px -144px no-repeat;
+  --rw-icons--common--double-arrow-right--18--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -66px -144px no-repeat;
+  --rw-icons--common--double-arrow-right--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -84px -144px no-repeat;
+  --rw-icons--common--double-arrow-right--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -102px -144px no-repeat;
+  --rw-icons--common--download--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") 0 -108px no-repeat;
+  --rw-icons--common--download--12--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -12px -108px no-repeat;
+  --rw-icons--common--download--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -24px -108px no-repeat;
+  --rw-icons--common--download--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -36px -108px no-repeat;
+  --rw-icons--common--download--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -48px -162px no-repeat;
+  --rw-icons--common--download--18--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -66px -162px no-repeat;
+  --rw-icons--common--download--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -84px -162px no-repeat;
+  --rw-icons--common--download--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -102px -162px no-repeat;
+  --rw-icons--common--email--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") 0 -120px no-repeat;
+  --rw-icons--common--email--12--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -12px -120px no-repeat;
+  --rw-icons--common--email--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -24px -120px no-repeat;
+  --rw-icons--common--email--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -36px -120px no-repeat;
+  --rw-icons--common--email--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -48px -180px no-repeat;
+  --rw-icons--common--email--18--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -66px -180px no-repeat;
+  --rw-icons--common--email--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -84px -180px no-repeat;
+  --rw-icons--common--email--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -102px -180px no-repeat;
+  --rw-icons--common--external-link--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") 0 -132px no-repeat;
+  --rw-icons--common--external-link--12--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -12px -132px no-repeat;
+  --rw-icons--common--external-link--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -24px -132px no-repeat;
+  --rw-icons--common--external-link--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -36px -132px no-repeat;
+  --rw-icons--common--external-link--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -48px -198px no-repeat;
+  --rw-icons--common--external-link--18--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -66px -198px no-repeat;
+  --rw-icons--common--external-link--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -84px -198px no-repeat;
+  --rw-icons--common--external-link--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -102px -198px no-repeat;
+  --rw-icons--common--filter--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") 0 -144px no-repeat;
+  --rw-icons--common--filter--12--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -12px -144px no-repeat;
+  --rw-icons--common--filter--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -24px -144px no-repeat;
+  --rw-icons--common--filter--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -36px -144px no-repeat;
+  --rw-icons--common--filter--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -48px -216px no-repeat;
+  --rw-icons--common--filter--18--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -66px -216px no-repeat;
+  --rw-icons--common--filter--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -84px -216px no-repeat;
+  --rw-icons--common--filter--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -102px -216px no-repeat;
+  --rw-icons--common--help--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") 0 -156px no-repeat;
+  --rw-icons--common--help--12--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -12px -156px no-repeat;
+  --rw-icons--common--help--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -24px -156px no-repeat;
+  --rw-icons--common--help--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -36px -156px no-repeat;
+  --rw-icons--common--help--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -48px -234px no-repeat;
+  --rw-icons--common--help--18--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -66px -234px no-repeat;
+  --rw-icons--common--help--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -84px -234px no-repeat;
+  --rw-icons--common--help--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -102px -234px no-repeat;
+  --rw-icons--common--link--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") 0 -168px no-repeat;
+  --rw-icons--common--link--12--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -12px -168px no-repeat;
+  --rw-icons--common--link--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -24px -168px no-repeat;
+  --rw-icons--common--link--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -36px -168px no-repeat;
+  --rw-icons--common--link--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -48px -252px no-repeat;
+  --rw-icons--common--link--18--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -66px -252px no-repeat;
+  --rw-icons--common--link--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -84px -252px no-repeat;
+  --rw-icons--common--link--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -102px -252px no-repeat;
+  --rw-icons--common--next--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") 0 -180px no-repeat;
+  --rw-icons--common--next--12--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -12px -180px no-repeat;
+  --rw-icons--common--next--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -24px -180px no-repeat;
+  --rw-icons--common--next--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -36px -180px no-repeat;
+  --rw-icons--common--next--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -48px -270px no-repeat;
+  --rw-icons--common--next--18--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -66px -270px no-repeat;
+  --rw-icons--common--next--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -84px -270px no-repeat;
+  --rw-icons--common--next--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -102px -270px no-repeat;
+  --rw-icons--common--previous--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") 0 -192px no-repeat;
+  --rw-icons--common--previous--12--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -12px -192px no-repeat;
+  --rw-icons--common--previous--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -24px -192px no-repeat;
+  --rw-icons--common--previous--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -36px -192px no-repeat;
+  --rw-icons--common--previous--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -48px -288px no-repeat;
+  --rw-icons--common--previous--18--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -66px -288px no-repeat;
+  --rw-icons--common--previous--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -84px -288px no-repeat;
+  --rw-icons--common--previous--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -102px -288px no-repeat;
+  --rw-icons--common--print--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") 0 -204px no-repeat;
+  --rw-icons--common--print--12--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -12px -204px no-repeat;
+  --rw-icons--common--print--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -24px -204px no-repeat;
+  --rw-icons--common--print--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -36px -204px no-repeat;
+  --rw-icons--common--print--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -48px -306px no-repeat;
+  --rw-icons--common--print--18--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -66px -306px no-repeat;
+  --rw-icons--common--print--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -84px -306px no-repeat;
+  --rw-icons--common--print--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -102px -306px no-repeat;
+  --rw-icons--common--remove--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") 0 -216px no-repeat;
+  --rw-icons--common--remove--12--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -12px -216px no-repeat;
+  --rw-icons--common--remove--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -24px -216px no-repeat;
+  --rw-icons--common--remove--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -36px -216px no-repeat;
+  --rw-icons--common--remove--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -48px -324px no-repeat;
+  --rw-icons--common--remove--18--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -66px -324px no-repeat;
+  --rw-icons--common--remove--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -84px -324px no-repeat;
+  --rw-icons--common--remove--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -102px -324px no-repeat;
+  --rw-icons--common--selected--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") 0 -228px no-repeat;
+  --rw-icons--common--selected--12--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -12px -228px no-repeat;
+  --rw-icons--common--selected--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -24px -228px no-repeat;
+  --rw-icons--common--selected--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -36px -228px no-repeat;
+  --rw-icons--common--selected--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -48px -342px no-repeat;
+  --rw-icons--common--selected--18--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -66px -342px no-repeat;
+  --rw-icons--common--selected--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -84px -342px no-repeat;
+  --rw-icons--common--selected--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -102px -342px no-repeat;
+  --rw-icons--common--user--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") 0 -240px no-repeat;
+  --rw-icons--common--user--12--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -12px -240px no-repeat;
+  --rw-icons--common--user--12--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -24px -240px no-repeat;
+  --rw-icons--common--user--12--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -36px -240px no-repeat;
+  --rw-icons--common--user--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -48px -360px no-repeat;
+  --rw-icons--common--user--18--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -66px -360px no-repeat;
+  --rw-icons--common--user--18--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -84px -360px no-repeat;
+  --rw-icons--common--user--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -102px -360px no-repeat;
   --rw-icons--search--18--dark-blue--x: -120px;
   --rw-icons--search--18--dark-red--x: -138px;
   --rw-icons--search--26--white--x: -156px;
-  --rw-icons--search--search--18--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -120px 0 no-repeat;
-  --rw-icons--search--search--18--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -138px 0 no-repeat;
-  --rw-icons--search--search--26--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -156px 0 no-repeat;
+  --rw-icons--search--search--18--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -120px 0 no-repeat;
+  --rw-icons--search--search--18--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -138px 0 no-repeat;
+  --rw-icons--search--search--26--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -156px 0 no-repeat;
   --rw-icons--toggle--9--dark-blue--x: -182px;
   --rw-icons--toggle--9--dark-red--x: -191px;
   --rw-icons--toggle--9--dark-grey--x: -200px;
   --rw-icons--toggle--9--white--x: -209px;
   --rw-icons--toggle--12--dark-blue--x: -218px;
   --rw-icons--toggle--18--white--x: -230px;
-  --rw-icons--toggle--down--9--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -182px 0 no-repeat;
-  --rw-icons--toggle--down--9--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -191px 0 no-repeat;
-  --rw-icons--toggle--down--9--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -200px 0 no-repeat;
-  --rw-icons--toggle--down--9--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -209px 0 no-repeat;
-  --rw-icons--toggle--down--12--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -218px 0 no-repeat;
-  --rw-icons--toggle--down--18--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -230px 0 no-repeat;
-  --rw-icons--toggle--up--9--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -182px -9px no-repeat;
-  --rw-icons--toggle--up--9--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -191px -9px no-repeat;
-  --rw-icons--toggle--up--9--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -200px -9px no-repeat;
-  --rw-icons--toggle--up--9--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -209px -9px no-repeat;
-  --rw-icons--toggle--up--12--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -218px -12px no-repeat;
-  --rw-icons--toggle--up--18--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -230px -18px no-repeat;
+  --rw-icons--toggle--down--9--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -182px 0 no-repeat;
+  --rw-icons--toggle--down--9--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -191px 0 no-repeat;
+  --rw-icons--toggle--down--9--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -200px 0 no-repeat;
+  --rw-icons--toggle--down--9--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -209px 0 no-repeat;
+  --rw-icons--toggle--down--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -218px 0 no-repeat;
+  --rw-icons--toggle--down--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -230px 0 no-repeat;
+  --rw-icons--toggle--up--9--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -182px -9px no-repeat;
+  --rw-icons--toggle--up--9--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -191px -9px no-repeat;
+  --rw-icons--toggle--up--9--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -200px -9px no-repeat;
+  --rw-icons--toggle--up--9--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -209px -9px no-repeat;
+  --rw-icons--toggle--up--12--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -218px -12px no-repeat;
+  --rw-icons--toggle--up--18--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -230px -18px no-repeat;
   --rw-icons--status--20--blue--x: -248px;
   --rw-icons--status--20--green--x: -268px;
   --rw-icons--status--20--orange--x: -288px;
   --rw-icons--status--20--red--x: -308px;
-  --rw-icons--status--error--20--blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -248px 0 no-repeat;
-  --rw-icons--status--error--20--green: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -268px 0 no-repeat;
-  --rw-icons--status--error--20--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -288px 0 no-repeat;
-  --rw-icons--status--error--20--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -308px 0 no-repeat;
-  --rw-icons--status--info--20--blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -248px -20px no-repeat;
-  --rw-icons--status--info--20--green: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -268px -20px no-repeat;
-  --rw-icons--status--info--20--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -288px -20px no-repeat;
-  --rw-icons--status--info--20--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -308px -20px no-repeat;
-  --rw-icons--status--ok--20--blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -248px -40px no-repeat;
-  --rw-icons--status--ok--20--green: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -268px -40px no-repeat;
-  --rw-icons--status--ok--20--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -288px -40px no-repeat;
-  --rw-icons--status--ok--20--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -308px -40px no-repeat;
-  --rw-icons--status--warning--20--blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -248px -60px no-repeat;
-  --rw-icons--status--warning--20--green: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -268px -60px no-repeat;
-  --rw-icons--status--warning--20--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -288px -60px no-repeat;
-  --rw-icons--status--warning--20--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -308px -60px no-repeat;
+  --rw-icons--status--error--20--blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -248px 0 no-repeat;
+  --rw-icons--status--error--20--green: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -268px 0 no-repeat;
+  --rw-icons--status--error--20--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -288px 0 no-repeat;
+  --rw-icons--status--error--20--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -308px 0 no-repeat;
+  --rw-icons--status--info--20--blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -248px -20px no-repeat;
+  --rw-icons--status--info--20--green: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -268px -20px no-repeat;
+  --rw-icons--status--info--20--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -288px -20px no-repeat;
+  --rw-icons--status--info--20--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -308px -20px no-repeat;
+  --rw-icons--status--ok--20--blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -248px -40px no-repeat;
+  --rw-icons--status--ok--20--green: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -268px -40px no-repeat;
+  --rw-icons--status--ok--20--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -288px -40px no-repeat;
+  --rw-icons--status--ok--20--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -308px -40px no-repeat;
+  --rw-icons--status--warning--20--blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -248px -60px no-repeat;
+  --rw-icons--status--warning--20--green: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -268px -60px no-repeat;
+  --rw-icons--status--warning--20--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -288px -60px no-repeat;
+  --rw-icons--status--warning--20--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -308px -60px no-repeat;
   --rw-icons--content--16--dark-grey--x: -328px;
   --rw-icons--content--24--grey--x: -344px;
   --rw-icons--content--36--dark-blue--x: -368px;
-  --rw-icons--content--infographic--16--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -328px 0 no-repeat;
-  --rw-icons--content--infographic--24--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -344px 0 no-repeat;
-  --rw-icons--content--infographic--36--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -368px 0 no-repeat;
-  --rw-icons--content--interactive--16--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -328px -16px no-repeat;
-  --rw-icons--content--interactive--24--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -344px -24px no-repeat;
-  --rw-icons--content--interactive--36--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -368px -36px no-repeat;
-  --rw-icons--content--job--16--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -328px -32px no-repeat;
-  --rw-icons--content--job--24--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -344px -48px no-repeat;
-  --rw-icons--content--job--36--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -368px -72px no-repeat;
-  --rw-icons--content--map--16--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -328px -48px no-repeat;
-  --rw-icons--content--map--24--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -344px -72px no-repeat;
-  --rw-icons--content--map--36--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -368px -108px no-repeat;
-  --rw-icons--content--report--16--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -328px -64px no-repeat;
-  --rw-icons--content--report--24--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -344px -96px no-repeat;
-  --rw-icons--content--report--36--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -368px -144px no-repeat;
-  --rw-icons--content--training--16--dark-grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -328px -80px no-repeat;
-  --rw-icons--content--training--24--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -344px -120px no-repeat;
-  --rw-icons--content--training--36--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -368px -180px no-repeat;
+  --rw-icons--content--infographic--16--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -328px 0 no-repeat;
+  --rw-icons--content--infographic--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -344px 0 no-repeat;
+  --rw-icons--content--infographic--36--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -368px 0 no-repeat;
+  --rw-icons--content--interactive--16--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -328px -16px no-repeat;
+  --rw-icons--content--interactive--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -344px -24px no-repeat;
+  --rw-icons--content--interactive--36--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -368px -36px no-repeat;
+  --rw-icons--content--job--16--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -328px -32px no-repeat;
+  --rw-icons--content--job--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -344px -48px no-repeat;
+  --rw-icons--content--job--36--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -368px -72px no-repeat;
+  --rw-icons--content--map--16--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -328px -48px no-repeat;
+  --rw-icons--content--map--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -344px -72px no-repeat;
+  --rw-icons--content--map--36--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -368px -108px no-repeat;
+  --rw-icons--content--report--16--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -328px -64px no-repeat;
+  --rw-icons--content--report--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -344px -96px no-repeat;
+  --rw-icons--content--report--36--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -368px -144px no-repeat;
+  --rw-icons--content--training--16--dark-grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -328px -80px no-repeat;
+  --rw-icons--content--training--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -344px -120px no-repeat;
+  --rw-icons--content--training--36--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -368px -180px no-repeat;
   --rw-icons--disaster-type--16--white--x: -404px;
   --rw-icons--disaster-type--16--grey--x: -420px;
   --rw-icons--disaster-type--16--orange--x: -436px;
@@ -248,174 +248,174 @@
   --rw-icons--disaster-type--24--orange--x: -492px;
   --rw-icons--disaster-type--24--red--x: -516px;
   --rw-icons--disaster-type--32--white--x: -540px;
-  --rw-icons--disaster-type--AC--16--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -404px 0 no-repeat;
-  --rw-icons--disaster-type--AC--16--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -420px 0 no-repeat;
-  --rw-icons--disaster-type--AC--16--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -436px 0 no-repeat;
-  --rw-icons--disaster-type--AC--16--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -452px 0 no-repeat;
-  --rw-icons--disaster-type--AC--24--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -468px 0 no-repeat;
-  --rw-icons--disaster-type--AC--24--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -492px 0 no-repeat;
-  --rw-icons--disaster-type--AC--24--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -516px 0 no-repeat;
-  --rw-icons--disaster-type--AC--32--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -540px 0 no-repeat;
-  --rw-icons--disaster-type--AV--16--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -404px -16px no-repeat;
-  --rw-icons--disaster-type--AV--16--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -420px -16px no-repeat;
-  --rw-icons--disaster-type--AV--16--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -436px -16px no-repeat;
-  --rw-icons--disaster-type--AV--16--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -452px -16px no-repeat;
-  --rw-icons--disaster-type--AV--24--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -468px -24px no-repeat;
-  --rw-icons--disaster-type--AV--24--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -492px -24px no-repeat;
-  --rw-icons--disaster-type--AV--24--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -516px -24px no-repeat;
-  --rw-icons--disaster-type--AV--32--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -540px -32px no-repeat;
-  --rw-icons--disaster-type--CW--16--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -404px -32px no-repeat;
-  --rw-icons--disaster-type--CW--16--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -420px -32px no-repeat;
-  --rw-icons--disaster-type--CW--16--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -436px -32px no-repeat;
-  --rw-icons--disaster-type--CW--16--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -452px -32px no-repeat;
-  --rw-icons--disaster-type--CW--24--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -468px -48px no-repeat;
-  --rw-icons--disaster-type--CW--24--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -492px -48px no-repeat;
-  --rw-icons--disaster-type--CW--24--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -516px -48px no-repeat;
-  --rw-icons--disaster-type--CW--32--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -540px -64px no-repeat;
-  --rw-icons--disaster-type--DR--16--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -404px -48px no-repeat;
-  --rw-icons--disaster-type--DR--16--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -420px -48px no-repeat;
-  --rw-icons--disaster-type--DR--16--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -436px -48px no-repeat;
-  --rw-icons--disaster-type--DR--16--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -452px -48px no-repeat;
-  --rw-icons--disaster-type--DR--24--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -468px -72px no-repeat;
-  --rw-icons--disaster-type--DR--24--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -492px -72px no-repeat;
-  --rw-icons--disaster-type--DR--24--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -516px -72px no-repeat;
-  --rw-icons--disaster-type--DR--32--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -540px -96px no-repeat;
-  --rw-icons--disaster-type--EC--16--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -404px -64px no-repeat;
-  --rw-icons--disaster-type--EC--16--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -420px -64px no-repeat;
-  --rw-icons--disaster-type--EC--16--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -436px -64px no-repeat;
-  --rw-icons--disaster-type--EC--16--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -452px -64px no-repeat;
-  --rw-icons--disaster-type--EC--24--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -468px -96px no-repeat;
-  --rw-icons--disaster-type--EC--24--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -492px -96px no-repeat;
-  --rw-icons--disaster-type--EC--24--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -516px -96px no-repeat;
-  --rw-icons--disaster-type--EC--32--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -540px -128px no-repeat;
-  --rw-icons--disaster-type--EP--16--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -404px -80px no-repeat;
-  --rw-icons--disaster-type--EP--16--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -420px -80px no-repeat;
-  --rw-icons--disaster-type--EP--16--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -436px -80px no-repeat;
-  --rw-icons--disaster-type--EP--16--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -452px -80px no-repeat;
-  --rw-icons--disaster-type--EP--24--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -468px -120px no-repeat;
-  --rw-icons--disaster-type--EP--24--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -492px -120px no-repeat;
-  --rw-icons--disaster-type--EP--24--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -516px -120px no-repeat;
-  --rw-icons--disaster-type--EP--32--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -540px -160px no-repeat;
-  --rw-icons--disaster-type--EQ--16--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -404px -96px no-repeat;
-  --rw-icons--disaster-type--EQ--16--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -420px -96px no-repeat;
-  --rw-icons--disaster-type--EQ--16--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -436px -96px no-repeat;
-  --rw-icons--disaster-type--EQ--16--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -452px -96px no-repeat;
-  --rw-icons--disaster-type--EQ--24--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -468px -144px no-repeat;
-  --rw-icons--disaster-type--EQ--24--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -492px -144px no-repeat;
-  --rw-icons--disaster-type--EQ--24--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -516px -144px no-repeat;
-  --rw-icons--disaster-type--EQ--32--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -540px -192px no-repeat;
-  --rw-icons--disaster-type--FF--16--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -404px -112px no-repeat;
-  --rw-icons--disaster-type--FF--16--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -420px -112px no-repeat;
-  --rw-icons--disaster-type--FF--16--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -436px -112px no-repeat;
-  --rw-icons--disaster-type--FF--16--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -452px -112px no-repeat;
-  --rw-icons--disaster-type--FF--24--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -468px -168px no-repeat;
-  --rw-icons--disaster-type--FF--24--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -492px -168px no-repeat;
-  --rw-icons--disaster-type--FF--24--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -516px -168px no-repeat;
-  --rw-icons--disaster-type--FF--32--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -540px -224px no-repeat;
-  --rw-icons--disaster-type--FL--16--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -404px -128px no-repeat;
-  --rw-icons--disaster-type--FL--16--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -420px -128px no-repeat;
-  --rw-icons--disaster-type--FL--16--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -436px -128px no-repeat;
-  --rw-icons--disaster-type--FL--16--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -452px -128px no-repeat;
-  --rw-icons--disaster-type--FL--24--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -468px -192px no-repeat;
-  --rw-icons--disaster-type--FL--24--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -492px -192px no-repeat;
-  --rw-icons--disaster-type--FL--24--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -516px -192px no-repeat;
-  --rw-icons--disaster-type--FL--32--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -540px -256px no-repeat;
-  --rw-icons--disaster-type--FR--16--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -404px -144px no-repeat;
-  --rw-icons--disaster-type--FR--16--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -420px -144px no-repeat;
-  --rw-icons--disaster-type--FR--16--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -436px -144px no-repeat;
-  --rw-icons--disaster-type--FR--16--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -452px -144px no-repeat;
-  --rw-icons--disaster-type--FR--24--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -468px -216px no-repeat;
-  --rw-icons--disaster-type--FR--24--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -492px -216px no-repeat;
-  --rw-icons--disaster-type--FR--24--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -516px -216px no-repeat;
-  --rw-icons--disaster-type--FR--32--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -540px -288px no-repeat;
-  --rw-icons--disaster-type--HT--16--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -404px -160px no-repeat;
-  --rw-icons--disaster-type--HT--16--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -420px -160px no-repeat;
-  --rw-icons--disaster-type--HT--16--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -436px -160px no-repeat;
-  --rw-icons--disaster-type--HT--16--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -452px -160px no-repeat;
-  --rw-icons--disaster-type--HT--24--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -468px -240px no-repeat;
-  --rw-icons--disaster-type--HT--24--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -492px -240px no-repeat;
-  --rw-icons--disaster-type--HT--24--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -516px -240px no-repeat;
-  --rw-icons--disaster-type--HT--32--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -540px -320px no-repeat;
-  --rw-icons--disaster-type--IN--16--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -404px -176px no-repeat;
-  --rw-icons--disaster-type--IN--16--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -420px -176px no-repeat;
-  --rw-icons--disaster-type--IN--16--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -436px -176px no-repeat;
-  --rw-icons--disaster-type--IN--16--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -452px -176px no-repeat;
-  --rw-icons--disaster-type--IN--24--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -468px -264px no-repeat;
-  --rw-icons--disaster-type--IN--24--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -492px -264px no-repeat;
-  --rw-icons--disaster-type--IN--24--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -516px -264px no-repeat;
-  --rw-icons--disaster-type--IN--32--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -540px -352px no-repeat;
-  --rw-icons--disaster-type--LS--16--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -404px -192px no-repeat;
-  --rw-icons--disaster-type--LS--16--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -420px -192px no-repeat;
-  --rw-icons--disaster-type--LS--16--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -436px -192px no-repeat;
-  --rw-icons--disaster-type--LS--16--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -452px -192px no-repeat;
-  --rw-icons--disaster-type--LS--24--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -468px -288px no-repeat;
-  --rw-icons--disaster-type--LS--24--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -492px -288px no-repeat;
-  --rw-icons--disaster-type--LS--24--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -516px -288px no-repeat;
-  --rw-icons--disaster-type--LS--32--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -540px -384px no-repeat;
-  --rw-icons--disaster-type--MS--16--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -404px -208px no-repeat;
-  --rw-icons--disaster-type--MS--16--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -420px -208px no-repeat;
-  --rw-icons--disaster-type--MS--16--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -436px -208px no-repeat;
-  --rw-icons--disaster-type--MS--16--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -452px -208px no-repeat;
-  --rw-icons--disaster-type--MS--24--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -468px -312px no-repeat;
-  --rw-icons--disaster-type--MS--24--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -492px -312px no-repeat;
-  --rw-icons--disaster-type--MS--24--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -516px -312px no-repeat;
-  --rw-icons--disaster-type--MS--32--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -540px -416px no-repeat;
-  --rw-icons--disaster-type--SS--16--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -404px -224px no-repeat;
-  --rw-icons--disaster-type--SS--16--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -420px -224px no-repeat;
-  --rw-icons--disaster-type--SS--16--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -436px -224px no-repeat;
-  --rw-icons--disaster-type--SS--16--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -452px -224px no-repeat;
-  --rw-icons--disaster-type--SS--24--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -468px -336px no-repeat;
-  --rw-icons--disaster-type--SS--24--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -492px -336px no-repeat;
-  --rw-icons--disaster-type--SS--24--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -516px -336px no-repeat;
-  --rw-icons--disaster-type--SS--32--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -540px -448px no-repeat;
-  --rw-icons--disaster-type--ST--16--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -404px -240px no-repeat;
-  --rw-icons--disaster-type--ST--16--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -420px -240px no-repeat;
-  --rw-icons--disaster-type--ST--16--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -436px -240px no-repeat;
-  --rw-icons--disaster-type--ST--16--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -452px -240px no-repeat;
-  --rw-icons--disaster-type--ST--24--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -468px -360px no-repeat;
-  --rw-icons--disaster-type--ST--24--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -492px -360px no-repeat;
-  --rw-icons--disaster-type--ST--24--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -516px -360px no-repeat;
-  --rw-icons--disaster-type--ST--32--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -540px -480px no-repeat;
-  --rw-icons--disaster-type--TC--16--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -404px -256px no-repeat;
-  --rw-icons--disaster-type--TC--16--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -420px -256px no-repeat;
-  --rw-icons--disaster-type--TC--16--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -436px -256px no-repeat;
-  --rw-icons--disaster-type--TC--16--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -452px -256px no-repeat;
-  --rw-icons--disaster-type--TC--24--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -468px -384px no-repeat;
-  --rw-icons--disaster-type--TC--24--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -492px -384px no-repeat;
-  --rw-icons--disaster-type--TC--24--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -516px -384px no-repeat;
-  --rw-icons--disaster-type--TC--32--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -540px -512px no-repeat;
-  --rw-icons--disaster-type--TS--16--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -404px -272px no-repeat;
-  --rw-icons--disaster-type--TS--16--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -420px -272px no-repeat;
-  --rw-icons--disaster-type--TS--16--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -436px -272px no-repeat;
-  --rw-icons--disaster-type--TS--16--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -452px -272px no-repeat;
-  --rw-icons--disaster-type--TS--24--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -468px -408px no-repeat;
-  --rw-icons--disaster-type--TS--24--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -492px -408px no-repeat;
-  --rw-icons--disaster-type--TS--24--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -516px -408px no-repeat;
-  --rw-icons--disaster-type--TS--32--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -540px -544px no-repeat;
-  --rw-icons--disaster-type--VO--16--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -404px -288px no-repeat;
-  --rw-icons--disaster-type--VO--16--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -420px -288px no-repeat;
-  --rw-icons--disaster-type--VO--16--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -436px -288px no-repeat;
-  --rw-icons--disaster-type--VO--16--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -452px -288px no-repeat;
-  --rw-icons--disaster-type--VO--24--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -468px -432px no-repeat;
-  --rw-icons--disaster-type--VO--24--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -492px -432px no-repeat;
-  --rw-icons--disaster-type--VO--24--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -516px -432px no-repeat;
-  --rw-icons--disaster-type--VO--32--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -540px -576px no-repeat;
-  --rw-icons--disaster-type--WF--16--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -404px -304px no-repeat;
-  --rw-icons--disaster-type--WF--16--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -420px -304px no-repeat;
-  --rw-icons--disaster-type--WF--16--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -436px -304px no-repeat;
-  --rw-icons--disaster-type--WF--16--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -452px -304px no-repeat;
-  --rw-icons--disaster-type--WF--24--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -468px -456px no-repeat;
-  --rw-icons--disaster-type--WF--24--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -492px -456px no-repeat;
-  --rw-icons--disaster-type--WF--24--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -516px -456px no-repeat;
-  --rw-icons--disaster-type--WF--32--white: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -540px -608px no-repeat;
+  --rw-icons--disaster-type--AC--16--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -404px 0 no-repeat;
+  --rw-icons--disaster-type--AC--16--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -420px 0 no-repeat;
+  --rw-icons--disaster-type--AC--16--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -436px 0 no-repeat;
+  --rw-icons--disaster-type--AC--16--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -452px 0 no-repeat;
+  --rw-icons--disaster-type--AC--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -468px 0 no-repeat;
+  --rw-icons--disaster-type--AC--24--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -492px 0 no-repeat;
+  --rw-icons--disaster-type--AC--24--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -516px 0 no-repeat;
+  --rw-icons--disaster-type--AC--32--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -540px 0 no-repeat;
+  --rw-icons--disaster-type--AV--16--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -404px -16px no-repeat;
+  --rw-icons--disaster-type--AV--16--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -420px -16px no-repeat;
+  --rw-icons--disaster-type--AV--16--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -436px -16px no-repeat;
+  --rw-icons--disaster-type--AV--16--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -452px -16px no-repeat;
+  --rw-icons--disaster-type--AV--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -468px -24px no-repeat;
+  --rw-icons--disaster-type--AV--24--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -492px -24px no-repeat;
+  --rw-icons--disaster-type--AV--24--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -516px -24px no-repeat;
+  --rw-icons--disaster-type--AV--32--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -540px -32px no-repeat;
+  --rw-icons--disaster-type--CW--16--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -404px -32px no-repeat;
+  --rw-icons--disaster-type--CW--16--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -420px -32px no-repeat;
+  --rw-icons--disaster-type--CW--16--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -436px -32px no-repeat;
+  --rw-icons--disaster-type--CW--16--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -452px -32px no-repeat;
+  --rw-icons--disaster-type--CW--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -468px -48px no-repeat;
+  --rw-icons--disaster-type--CW--24--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -492px -48px no-repeat;
+  --rw-icons--disaster-type--CW--24--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -516px -48px no-repeat;
+  --rw-icons--disaster-type--CW--32--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -540px -64px no-repeat;
+  --rw-icons--disaster-type--DR--16--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -404px -48px no-repeat;
+  --rw-icons--disaster-type--DR--16--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -420px -48px no-repeat;
+  --rw-icons--disaster-type--DR--16--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -436px -48px no-repeat;
+  --rw-icons--disaster-type--DR--16--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -452px -48px no-repeat;
+  --rw-icons--disaster-type--DR--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -468px -72px no-repeat;
+  --rw-icons--disaster-type--DR--24--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -492px -72px no-repeat;
+  --rw-icons--disaster-type--DR--24--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -516px -72px no-repeat;
+  --rw-icons--disaster-type--DR--32--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -540px -96px no-repeat;
+  --rw-icons--disaster-type--EC--16--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -404px -64px no-repeat;
+  --rw-icons--disaster-type--EC--16--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -420px -64px no-repeat;
+  --rw-icons--disaster-type--EC--16--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -436px -64px no-repeat;
+  --rw-icons--disaster-type--EC--16--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -452px -64px no-repeat;
+  --rw-icons--disaster-type--EC--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -468px -96px no-repeat;
+  --rw-icons--disaster-type--EC--24--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -492px -96px no-repeat;
+  --rw-icons--disaster-type--EC--24--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -516px -96px no-repeat;
+  --rw-icons--disaster-type--EC--32--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -540px -128px no-repeat;
+  --rw-icons--disaster-type--EP--16--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -404px -80px no-repeat;
+  --rw-icons--disaster-type--EP--16--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -420px -80px no-repeat;
+  --rw-icons--disaster-type--EP--16--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -436px -80px no-repeat;
+  --rw-icons--disaster-type--EP--16--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -452px -80px no-repeat;
+  --rw-icons--disaster-type--EP--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -468px -120px no-repeat;
+  --rw-icons--disaster-type--EP--24--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -492px -120px no-repeat;
+  --rw-icons--disaster-type--EP--24--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -516px -120px no-repeat;
+  --rw-icons--disaster-type--EP--32--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -540px -160px no-repeat;
+  --rw-icons--disaster-type--EQ--16--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -404px -96px no-repeat;
+  --rw-icons--disaster-type--EQ--16--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -420px -96px no-repeat;
+  --rw-icons--disaster-type--EQ--16--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -436px -96px no-repeat;
+  --rw-icons--disaster-type--EQ--16--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -452px -96px no-repeat;
+  --rw-icons--disaster-type--EQ--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -468px -144px no-repeat;
+  --rw-icons--disaster-type--EQ--24--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -492px -144px no-repeat;
+  --rw-icons--disaster-type--EQ--24--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -516px -144px no-repeat;
+  --rw-icons--disaster-type--EQ--32--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -540px -192px no-repeat;
+  --rw-icons--disaster-type--FF--16--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -404px -112px no-repeat;
+  --rw-icons--disaster-type--FF--16--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -420px -112px no-repeat;
+  --rw-icons--disaster-type--FF--16--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -436px -112px no-repeat;
+  --rw-icons--disaster-type--FF--16--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -452px -112px no-repeat;
+  --rw-icons--disaster-type--FF--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -468px -168px no-repeat;
+  --rw-icons--disaster-type--FF--24--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -492px -168px no-repeat;
+  --rw-icons--disaster-type--FF--24--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -516px -168px no-repeat;
+  --rw-icons--disaster-type--FF--32--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -540px -224px no-repeat;
+  --rw-icons--disaster-type--FL--16--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -404px -128px no-repeat;
+  --rw-icons--disaster-type--FL--16--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -420px -128px no-repeat;
+  --rw-icons--disaster-type--FL--16--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -436px -128px no-repeat;
+  --rw-icons--disaster-type--FL--16--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -452px -128px no-repeat;
+  --rw-icons--disaster-type--FL--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -468px -192px no-repeat;
+  --rw-icons--disaster-type--FL--24--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -492px -192px no-repeat;
+  --rw-icons--disaster-type--FL--24--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -516px -192px no-repeat;
+  --rw-icons--disaster-type--FL--32--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -540px -256px no-repeat;
+  --rw-icons--disaster-type--FR--16--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -404px -144px no-repeat;
+  --rw-icons--disaster-type--FR--16--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -420px -144px no-repeat;
+  --rw-icons--disaster-type--FR--16--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -436px -144px no-repeat;
+  --rw-icons--disaster-type--FR--16--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -452px -144px no-repeat;
+  --rw-icons--disaster-type--FR--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -468px -216px no-repeat;
+  --rw-icons--disaster-type--FR--24--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -492px -216px no-repeat;
+  --rw-icons--disaster-type--FR--24--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -516px -216px no-repeat;
+  --rw-icons--disaster-type--FR--32--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -540px -288px no-repeat;
+  --rw-icons--disaster-type--HT--16--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -404px -160px no-repeat;
+  --rw-icons--disaster-type--HT--16--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -420px -160px no-repeat;
+  --rw-icons--disaster-type--HT--16--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -436px -160px no-repeat;
+  --rw-icons--disaster-type--HT--16--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -452px -160px no-repeat;
+  --rw-icons--disaster-type--HT--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -468px -240px no-repeat;
+  --rw-icons--disaster-type--HT--24--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -492px -240px no-repeat;
+  --rw-icons--disaster-type--HT--24--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -516px -240px no-repeat;
+  --rw-icons--disaster-type--HT--32--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -540px -320px no-repeat;
+  --rw-icons--disaster-type--IN--16--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -404px -176px no-repeat;
+  --rw-icons--disaster-type--IN--16--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -420px -176px no-repeat;
+  --rw-icons--disaster-type--IN--16--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -436px -176px no-repeat;
+  --rw-icons--disaster-type--IN--16--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -452px -176px no-repeat;
+  --rw-icons--disaster-type--IN--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -468px -264px no-repeat;
+  --rw-icons--disaster-type--IN--24--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -492px -264px no-repeat;
+  --rw-icons--disaster-type--IN--24--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -516px -264px no-repeat;
+  --rw-icons--disaster-type--IN--32--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -540px -352px no-repeat;
+  --rw-icons--disaster-type--LS--16--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -404px -192px no-repeat;
+  --rw-icons--disaster-type--LS--16--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -420px -192px no-repeat;
+  --rw-icons--disaster-type--LS--16--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -436px -192px no-repeat;
+  --rw-icons--disaster-type--LS--16--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -452px -192px no-repeat;
+  --rw-icons--disaster-type--LS--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -468px -288px no-repeat;
+  --rw-icons--disaster-type--LS--24--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -492px -288px no-repeat;
+  --rw-icons--disaster-type--LS--24--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -516px -288px no-repeat;
+  --rw-icons--disaster-type--LS--32--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -540px -384px no-repeat;
+  --rw-icons--disaster-type--MS--16--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -404px -208px no-repeat;
+  --rw-icons--disaster-type--MS--16--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -420px -208px no-repeat;
+  --rw-icons--disaster-type--MS--16--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -436px -208px no-repeat;
+  --rw-icons--disaster-type--MS--16--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -452px -208px no-repeat;
+  --rw-icons--disaster-type--MS--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -468px -312px no-repeat;
+  --rw-icons--disaster-type--MS--24--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -492px -312px no-repeat;
+  --rw-icons--disaster-type--MS--24--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -516px -312px no-repeat;
+  --rw-icons--disaster-type--MS--32--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -540px -416px no-repeat;
+  --rw-icons--disaster-type--SS--16--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -404px -224px no-repeat;
+  --rw-icons--disaster-type--SS--16--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -420px -224px no-repeat;
+  --rw-icons--disaster-type--SS--16--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -436px -224px no-repeat;
+  --rw-icons--disaster-type--SS--16--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -452px -224px no-repeat;
+  --rw-icons--disaster-type--SS--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -468px -336px no-repeat;
+  --rw-icons--disaster-type--SS--24--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -492px -336px no-repeat;
+  --rw-icons--disaster-type--SS--24--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -516px -336px no-repeat;
+  --rw-icons--disaster-type--SS--32--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -540px -448px no-repeat;
+  --rw-icons--disaster-type--ST--16--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -404px -240px no-repeat;
+  --rw-icons--disaster-type--ST--16--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -420px -240px no-repeat;
+  --rw-icons--disaster-type--ST--16--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -436px -240px no-repeat;
+  --rw-icons--disaster-type--ST--16--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -452px -240px no-repeat;
+  --rw-icons--disaster-type--ST--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -468px -360px no-repeat;
+  --rw-icons--disaster-type--ST--24--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -492px -360px no-repeat;
+  --rw-icons--disaster-type--ST--24--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -516px -360px no-repeat;
+  --rw-icons--disaster-type--ST--32--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -540px -480px no-repeat;
+  --rw-icons--disaster-type--TC--16--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -404px -256px no-repeat;
+  --rw-icons--disaster-type--TC--16--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -420px -256px no-repeat;
+  --rw-icons--disaster-type--TC--16--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -436px -256px no-repeat;
+  --rw-icons--disaster-type--TC--16--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -452px -256px no-repeat;
+  --rw-icons--disaster-type--TC--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -468px -384px no-repeat;
+  --rw-icons--disaster-type--TC--24--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -492px -384px no-repeat;
+  --rw-icons--disaster-type--TC--24--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -516px -384px no-repeat;
+  --rw-icons--disaster-type--TC--32--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -540px -512px no-repeat;
+  --rw-icons--disaster-type--TS--16--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -404px -272px no-repeat;
+  --rw-icons--disaster-type--TS--16--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -420px -272px no-repeat;
+  --rw-icons--disaster-type--TS--16--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -436px -272px no-repeat;
+  --rw-icons--disaster-type--TS--16--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -452px -272px no-repeat;
+  --rw-icons--disaster-type--TS--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -468px -408px no-repeat;
+  --rw-icons--disaster-type--TS--24--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -492px -408px no-repeat;
+  --rw-icons--disaster-type--TS--24--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -516px -408px no-repeat;
+  --rw-icons--disaster-type--TS--32--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -540px -544px no-repeat;
+  --rw-icons--disaster-type--VO--16--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -404px -288px no-repeat;
+  --rw-icons--disaster-type--VO--16--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -420px -288px no-repeat;
+  --rw-icons--disaster-type--VO--16--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -436px -288px no-repeat;
+  --rw-icons--disaster-type--VO--16--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -452px -288px no-repeat;
+  --rw-icons--disaster-type--VO--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -468px -432px no-repeat;
+  --rw-icons--disaster-type--VO--24--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -492px -432px no-repeat;
+  --rw-icons--disaster-type--VO--24--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -516px -432px no-repeat;
+  --rw-icons--disaster-type--VO--32--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -540px -576px no-repeat;
+  --rw-icons--disaster-type--WF--16--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -404px -304px no-repeat;
+  --rw-icons--disaster-type--WF--16--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -420px -304px no-repeat;
+  --rw-icons--disaster-type--WF--16--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -436px -304px no-repeat;
+  --rw-icons--disaster-type--WF--16--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -452px -304px no-repeat;
+  --rw-icons--disaster-type--WF--24--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -468px -456px no-repeat;
+  --rw-icons--disaster-type--WF--24--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -492px -456px no-repeat;
+  --rw-icons--disaster-type--WF--24--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -516px -456px no-repeat;
+  --rw-icons--disaster-type--WF--32--white: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -540px -608px no-repeat;
   --rw-icons--social-media--48--dark-blue--x: -572px;
   --rw-icons--social-media--48--dark-red--x: -620px;
-  --rw-icons--social-media--facebook-full--48--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -572px 0 no-repeat;
-  --rw-icons--social-media--facebook-full--48--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -620px 0 no-repeat;
-  --rw-icons--social-media--linkedin-full--48--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -572px -48px no-repeat;
-  --rw-icons--social-media--linkedin-full--48--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -620px -48px no-repeat;
-  --rw-icons--social-media--twitter-full--48--dark-blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -572px -96px no-repeat;
-  --rw-icons--social-media--twitter-full--48--dark-red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -620px -96px no-repeat;
+  --rw-icons--social-media--facebook-full--48--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -572px 0 no-repeat;
+  --rw-icons--social-media--facebook-full--48--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -620px 0 no-repeat;
+  --rw-icons--social-media--linkedin-full--48--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -572px -48px no-repeat;
+  --rw-icons--social-media--linkedin-full--48--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -620px -48px no-repeat;
+  --rw-icons--social-media--twitter-full--48--dark-blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -572px -96px no-repeat;
+  --rw-icons--social-media--twitter-full--48--dark-red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -620px -96px no-repeat;
   --rw-icons--map-marker--16--grey--x: -668px;
   --rw-icons--map-marker--16--orange--x: -684px;
   --rw-icons--map-marker--16--red--x: -700px;
@@ -423,11 +423,11 @@
   --rw-icons--map-marker--44--grey--x: -760px;
   --rw-icons--map-marker--44--orange--x: -804px;
   --rw-icons--map-marker--44--red--x: -848px;
-  --rw-icons--map-marker--marker--16--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -668px 0 no-repeat;
-  --rw-icons--map-marker--marker--16--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -684px 0 no-repeat;
-  --rw-icons--map-marker--marker--16--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -700px 0 no-repeat;
-  --rw-icons--map-marker--marker--44--blue: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -716px 0 no-repeat;
-  --rw-icons--map-marker--marker--44--grey: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -760px 0 no-repeat;
-  --rw-icons--map-marker--marker--44--orange: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -804px 0 no-repeat;
-  --rw-icons--map-marker--marker--44--red: url(/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg) -848px 0 no-repeat;
+  --rw-icons--map-marker--marker--16--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -668px 0 no-repeat;
+  --rw-icons--map-marker--marker--16--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -684px 0 no-repeat;
+  --rw-icons--map-marker--marker--16--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -700px 0 no-repeat;
+  --rw-icons--map-marker--marker--44--blue: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -716px 0 no-repeat;
+  --rw-icons--map-marker--marker--44--grey: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -760px 0 no-repeat;
+  --rw-icons--map-marker--marker--44--orange: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -804px 0 no-repeat;
+  --rw-icons--map-marker--marker--44--red: url("/themes/custom/common_design_subtheme/components/rw-icons/img/rw-icons-sprite.svg") -848px 0 no-repeat;
 }
diff --git a/html/themes/custom/common_design_subtheme/components/rw-site-slogan/rw-site-slogan.css b/html/themes/custom/common_design_subtheme/components/rw-site-slogan/rw-site-slogan.css
index 0dc98d140..aafd6761c 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-site-slogan/rw-site-slogan.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-site-slogan/rw-site-slogan.css
@@ -61,8 +61,8 @@
   width: 81px;
   height: 20px;
   content: "";
-  background: url(../../img/logos/ocha-logo-sprite.png) 0 -37px no-repeat;
-  background: rgba(0, 0, 0, 0) url(../../img/logos/ocha-logo-sprite.svg) 0 -37px no-repeat;
+  background: url("../../img/logos/ocha-logo-sprite.png") 0 -37px no-repeat;
+  background: rgba(0, 0, 0, 0) url("../../img/logos/ocha-logo-sprite.svg") 0 -37px no-repeat;
 }
 /* Reduce the size so that it looks better when the lines wrap. */
 @media all and (max-width: 767px) {

From 4e652580e4c7d52fd143039ce2915c6cef3e663d Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 1 Mar 2022 06:36:47 +0000
Subject: [PATCH 538/720] [RW-403] Remove outdated command to set code sniffer
 rules

---
 .travis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 31486797a..c679b501b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,9 +41,6 @@ script:
   # Install the dev dependencies.
   - docker exec -it -w /srv/www rwint9-test-site composer install
 
-  # Ensure the drupal coding standards config is installed.
-  - docker exec -it -u appuser -w /srv/www rwint9-test-site ./vendor/bin/phpcs --config-set installed_paths vendor/drupal/coder/coder_sniffer
-
   # Check coding standards.
   - docker exec -it -u appuser -w /srv/www rwint9-test-site ./vendor/bin/phpcs -p --report=full ./html/modules/custom ./html/themes/custom
 

From 0ef7aa48cb6127e091e1e6e1a3c43320493e6bd3 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 1 Mar 2022 06:40:05 +0000
Subject: [PATCH 539/720] [RW-403] Add command to run the travis-like tests
 locally

---
 tests/test.sh | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100755 tests/test.sh

diff --git a/tests/test.sh b/tests/test.sh
new file mode 100755
index 000000000..816cb7f63
--- /dev/null
+++ b/tests/test.sh
@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+
+# Build local image.
+echo "Build local image."
+make
+
+# Create the site, redis and mysql containers.
+echo "Create the site, redis and mysql containers."
+docker-compose -p rwint9-test -f tests/docker-compose.yml up -d
+
+# Dump some information about the created containers.
+echo "Dump some information about the created containers."
+docker ps -a
+
+# Wait a bit for redis and mysql to be ready.
+echo "Wait a bit for redis and mysql to be ready."
+sleep 10
+
+# Install the dev dependencies.
+echo "docker exec -it -w /srv/www rwint9-test-site composer install"
+docker exec -it -w /srv/www rwint9-test-site composer install
+
+# Check coding standards.
+echo "Check coding standards."
+docker exec -it -u appuser -w /srv/www rwint9-test-site ./vendor/bin/phpcs -p --report=full ./html/modules/custom ./html/themes/custom
+
+# Run unit tests.
+echo "Run unit tests."
+docker exec -it -u root -w /srv/www rwint9-test-site mkdir -p /srv/www/html/sites/default/files/browser_output
+docker exec -it -u root -w /srv/www -e BROWSERTEST_OUTPUT_DIRECTORY=/srv/www/html/sites/default/files/browser_output rwint9-test-site php -d zend_extension=xdebug ./vendor/bin/phpunit --testsuite Unit --debug
+
+# Install the site with the existing config.
+echo "Install the site with the existing config."
+docker exec -it rwint9-test-site drush -y si --existing-config
+docker exec -it rwint9-test-site drush -y en dblog
+
+# Ensure the file directories are writable.
+echo "Ensure the file directories are writable."
+docker exec -it rwint9-test-site chmod -R 777 /srv/www/html/sites/default/files /srv/www/html/sites/default/private
+
+# Create the build logs directory and make sure it's writable.
+echo "Create the build logs directory and make sure it's writable."
+docker exec -it -u root rwint9-test-site mkdir -p /srv/www/html/build/logs
+docker exec -it -u root rwint9-test-site chmod -R 777 /srv/www/html/build/logs
+
+# Run all tests and generate coverage report.
+echo "Run all tests and generate coverage report."
+docker exec -it -u root -w /srv/www -e XDEBUG_MODE=coverage -e BROWSERTEST_OUTPUT_DIRECTORY=/srv/www/html/sites/default/files/browser_output -e DTT_BASE_URL=http://127.0.0.1 rwint9-test-site php -d zend_extension=xdebug ./vendor/bin/phpunit --coverage-clover /srv/www/html/build/logs/clover.xml --debug

From 0016bb04642f9be01ea955cd08907e74f7b03896 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 1 Mar 2022 07:09:10 +0000
Subject: [PATCH 540/720] [RW-402] Adjust text format treatment to be
 compatible with recent allowed_formats module config changes

---
 html/modules/custom/reliefweb_form/reliefweb_form.module | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_form/reliefweb_form.module b/html/modules/custom/reliefweb_form/reliefweb_form.module
index 149b7c20f..f1fb5cc68 100644
--- a/html/modules/custom/reliefweb_form/reliefweb_form.module
+++ b/html/modules/custom/reliefweb_form/reliefweb_form.module
@@ -346,7 +346,7 @@ function reliefweb_form_hide_format_help($form_element, FormStateInterface $form
 
     // Ensure the format is displayed even it's only one, except for plain text.
     if (isset($form_element['#allowed_formats']) && count($form_element['#allowed_formats']) === 1) {
-      $allowed_format = key($form_element['#allowed_formats']);
+      $allowed_format = reset($form_element['#allowed_formats']);
 
       // Select a default format if not already.
       if (empty($form_element['format']['format']['#default_value'])) {

From b06c94aa95f1e58d168989b47be349b6459a6a38 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 1 Mar 2022 14:17:54 +0100
Subject: [PATCH 541/720] update base theme branch latest commit after merging
 main

---
 composer.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/composer.lock b/composer.lock
index a2883cc09..556776c5f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -13457,12 +13457,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/UN-OCHA/common_design.git",
-                "reference": "8e7dd6d96fbfbe83b63ef4a65dbe12588534245a"
+                "reference": "7d92d474d8f191b3f9540700542fe1c44b573946"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/8e7dd6d96fbfbe83b63ef4a65dbe12588534245a",
-                "reference": "8e7dd6d96fbfbe83b63ef4a65dbe12588534245a",
+                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/7d92d474d8f191b3f9540700542fe1c44b573946",
+                "reference": "7d92d474d8f191b3f9540700542fe1c44b573946",
                 "shasum": ""
             },
             "require": {
@@ -13477,7 +13477,7 @@
                 "source": "https://github.com/UN-OCHA/common_design/tree/cd-304-forms",
                 "issues": "https://github.com/UN-OCHA/common_design/issues"
             },
-            "time": "2022-02-24T11:23:19+00:00"
+            "time": "2022-03-01T09:25:35+00:00"
         },
         {
             "name": "webflo/drupal-finder",
@@ -15147,5 +15147,5 @@
         "php": ">=8.0"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.1.0"
 }

From be1d6463ca58d583c53f55811d4252366a498e64 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 1 Mar 2022 14:18:22 +0100
Subject: [PATCH 542/720] update stylelint config from base theme

---
 .../common_design_subtheme/.stylelintrc.json  | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/.stylelintrc.json b/html/themes/custom/common_design_subtheme/.stylelintrc.json
index f452c1a06..aee04504e 100644
--- a/html/themes/custom/common_design_subtheme/.stylelintrc.json
+++ b/html/themes/custom/common_design_subtheme/.stylelintrc.json
@@ -1,12 +1,36 @@
 {
   "extends": [
+    "stylelint-config-standard-scss",
     "../../../core/.stylelintrc.json",
     "stylelint-config-recommended-scss"
   ],
   "rules": {
+    "alpha-value-notation": "number",
+    "color-function-notation": "legacy",
+    "custom-property-pattern": "^(--)?[a-zA-Z0-9]+((-|--|__)?[a-zA-Z0-9]+)*$",
+    "declaration-block-no-redundant-longhand-properties": null,
+    "max-line-length": 130,
     "no-descending-specificity": null,
+    "property-no-vendor-prefix": null,
+    "selector-class-pattern": "^[a-zA-Z0-9]+((-|--|__)?[a-zA-Z0-9]+)*$",
+    "selector-no-vendor-prefix": null,
     "unit-no-unknown": null,
-    "unit-allowed-list": ["deg", "em", "ex", "ms", "rem", "%", "s", "px", "vw", "vh", "fr", "pt", "$cd-container-padding"]
+    "unit-allowed-list": ["ch", "deg", "em", "ex", "ms", "rem", "%", "s", "px", "vw", "vh", "fr", "pt", "$cd-container-padding"],
+    "value-keyword-case": null,
+    "value-no-vendor-prefix": null,
+
+    "scss/at-else-empty-line-before": null,
+    "scss/at-extend-no-missing-placeholder": null,
+    "scss/at-if-closing-brace-newline-after": null,
+    "scss/at-if-closing-brace-space-after": null,
+    "scss/comment-no-empty": null,
+    "scss/dollar-variable-empty-line-before": null,
+    "scss/double-slash-comment-empty-line-before": null,
+    "scss/double-slash-comment-whitespace-inside": null,
+    "scss/dollar-variable-colon-space-after": null,
+    "scss/dollar-variable-pattern": "^(--)?[a-zA-Z0-9]+((-|--|__)?[a-zA-Z0-9]+)*$",
+    "scss/no-global-function-names": null,
+    "scss/operator-no-unspaced": null
   },
   "defaultSeverity": "error"
 }

From cd81a06b256888ed55b7f9305a743400d9995e6a Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 1 Mar 2022 14:18:44 +0100
Subject: [PATCH 543/720] update package from base theme, regen lock

---
 .../common_design_subtheme/package-lock.json  | 1403 ++++++-----------
 .../common_design_subtheme/package.json       |   28 +-
 2 files changed, 462 insertions(+), 969 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/package-lock.json b/html/themes/custom/common_design_subtheme/package-lock.json
index c59512f18..904ac4d1f 100644
--- a/html/themes/custom/common_design_subtheme/package-lock.json
+++ b/html/themes/custom/common_design_subtheme/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "common-design",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -15,12 +15,14 @@
     "@babel/compat-data": {
       "version": "7.15.0",
       "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz",
-      "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA=="
+      "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==",
+      "dev": true
     },
     "@babel/core": {
       "version": "7.15.5",
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.5.tgz",
       "integrity": "sha512-pYgXxiwAgQpgM1bNkZsDEq85f0ggXMA5L7c+o3tskGMh2BunCI9QUwB9Z4jpvXUOuMdyGKiGKQiRe11VS6Jzvg==",
+      "dev": true,
       "requires": {
         "@babel/code-frame": "^7.14.5",
         "@babel/generator": "^7.15.4",
@@ -43,6 +45,7 @@
       "version": "7.15.4",
       "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.4.tgz",
       "integrity": "sha512-d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw==",
+      "dev": true,
       "requires": {
         "@babel/types": "^7.15.4",
         "jsesc": "^2.5.1",
@@ -72,6 +75,7 @@
       "version": "7.15.4",
       "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz",
       "integrity": "sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==",
+      "dev": true,
       "requires": {
         "@babel/compat-data": "^7.15.0",
         "@babel/helper-validator-option": "^7.14.5",
@@ -132,6 +136,7 @@
       "version": "7.15.4",
       "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz",
       "integrity": "sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==",
+      "dev": true,
       "requires": {
         "@babel/helper-get-function-arity": "^7.15.4",
         "@babel/template": "^7.15.4",
@@ -142,6 +147,7 @@
       "version": "7.15.4",
       "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz",
       "integrity": "sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==",
+      "dev": true,
       "requires": {
         "@babel/types": "^7.15.4"
       }
@@ -150,6 +156,7 @@
       "version": "7.15.4",
       "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz",
       "integrity": "sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==",
+      "dev": true,
       "requires": {
         "@babel/types": "^7.15.4"
       }
@@ -158,6 +165,7 @@
       "version": "7.15.4",
       "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz",
       "integrity": "sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==",
+      "dev": true,
       "requires": {
         "@babel/types": "^7.15.4"
       }
@@ -166,6 +174,7 @@
       "version": "7.15.4",
       "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz",
       "integrity": "sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==",
+      "dev": true,
       "requires": {
         "@babel/types": "^7.15.4"
       }
@@ -174,6 +183,7 @@
       "version": "7.15.4",
       "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.4.tgz",
       "integrity": "sha512-9fHHSGE9zTC++KuXLZcB5FKgvlV83Ox+NLUmQTawovwlJ85+QMhk1CnVk406CQVj97LaWod6KVjl2Sfgw9Aktw==",
+      "dev": true,
       "requires": {
         "@babel/helper-module-imports": "^7.15.4",
         "@babel/helper-replace-supers": "^7.15.4",
@@ -189,6 +199,7 @@
       "version": "7.15.4",
       "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz",
       "integrity": "sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==",
+      "dev": true,
       "requires": {
         "@babel/types": "^7.15.4"
       }
@@ -214,6 +225,7 @@
       "version": "7.15.4",
       "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz",
       "integrity": "sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==",
+      "dev": true,
       "requires": {
         "@babel/helper-member-expression-to-functions": "^7.15.4",
         "@babel/helper-optimise-call-expression": "^7.15.4",
@@ -225,6 +237,7 @@
       "version": "7.15.4",
       "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz",
       "integrity": "sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==",
+      "dev": true,
       "requires": {
         "@babel/types": "^7.15.4"
       }
@@ -242,6 +255,7 @@
       "version": "7.15.4",
       "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz",
       "integrity": "sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==",
+      "dev": true,
       "requires": {
         "@babel/types": "^7.15.4"
       }
@@ -254,7 +268,8 @@
     "@babel/helper-validator-option": {
       "version": "7.14.5",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz",
-      "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow=="
+      "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==",
+      "dev": true
     },
     "@babel/helper-wrap-function": {
       "version": "7.15.4",
@@ -272,6 +287,7 @@
       "version": "7.15.4",
       "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz",
       "integrity": "sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==",
+      "dev": true,
       "requires": {
         "@babel/template": "^7.15.4",
         "@babel/traverse": "^7.15.4",
@@ -337,7 +353,8 @@
     "@babel/parser": {
       "version": "7.15.5",
       "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.5.tgz",
-      "integrity": "sha512-2hQstc6I7T6tQsWzlboMh3SgMRPaS4H6H7cPQsJkdzTzEGqQrpLDsE2BGASU5sBPoEQyHzeqU6C8uKbFeEk6sg=="
+      "integrity": "sha512-2hQstc6I7T6tQsWzlboMh3SgMRPaS4H6H7cPQsJkdzTzEGqQrpLDsE2BGASU5sBPoEQyHzeqU6C8uKbFeEk6sg==",
+      "dev": true
     },
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
       "version": "7.15.4",
@@ -1071,6 +1088,7 @@
       "version": "7.15.4",
       "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz",
       "integrity": "sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==",
+      "dev": true,
       "requires": {
         "@babel/code-frame": "^7.14.5",
         "@babel/parser": "^7.15.4",
@@ -1081,6 +1099,7 @@
       "version": "7.15.4",
       "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz",
       "integrity": "sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==",
+      "dev": true,
       "requires": {
         "@babel/code-frame": "^7.14.5",
         "@babel/generator": "^7.15.4",
@@ -1097,6 +1116,7 @@
       "version": "7.15.4",
       "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.4.tgz",
       "integrity": "sha512-0f1HJFuGmmbrKTCZtbm3cU+b/AqdEYk5toj5iQur58xkVMlS0JWaKxTBSmCXd47uiN7vbcozAupm6Mvs80GNhw==",
+      "dev": true,
       "requires": {
         "@babel/helper-validator-identifier": "^7.14.9",
         "to-fast-properties": "^2.0.0"
@@ -1133,6 +1153,7 @@
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
       "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
+      "dev": true,
       "requires": {
         "ajv": "^6.12.4",
         "debug": "^4.1.1",
@@ -1149,6 +1170,7 @@
           "version": "6.12.6",
           "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
           "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
             "fast-json-stable-stringify": "^2.0.0",
@@ -1160,6 +1182,7 @@
           "version": "13.11.0",
           "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
           "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
+          "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
           }
@@ -1167,17 +1190,20 @@
         "ignore": {
           "version": "4.0.6",
           "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
+          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+          "dev": true
         },
         "json-schema-traverse": {
           "version": "0.4.1",
           "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
         },
         "type-fest": {
           "version": "0.20.2",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+          "dev": true
         }
       }
     },
@@ -1200,6 +1226,7 @@
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
       "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+      "dev": true,
       "requires": {
         "@humanwhocodes/object-schema": "^1.2.0",
         "debug": "^4.1.1",
@@ -1209,7 +1236,8 @@
     "@humanwhocodes/object-schema": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz",
-      "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w=="
+      "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==",
+      "dev": true
     },
     "@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
@@ -1508,23 +1536,6 @@
         "@sinonjs/commons": "^1.7.0"
       }
     },
-    "@stylelint/postcss-css-in-js": {
-      "version": "0.37.2",
-      "resolved": "https://registry.npmjs.org/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.2.tgz",
-      "integrity": "sha512-nEhsFoJurt8oUmieT8qy4nk81WRHmJynmVwn/Vts08PL9fhgIsMhk1GId5yAN643OzqEEb5S/6At2TZW7pqPDA==",
-      "requires": {
-        "@babel/core": ">=7.9.0"
-      }
-    },
-    "@stylelint/postcss-markdown": {
-      "version": "0.36.2",
-      "resolved": "https://registry.npmjs.org/@stylelint/postcss-markdown/-/postcss-markdown-0.36.2.tgz",
-      "integrity": "sha512-2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ==",
-      "requires": {
-        "remark": "^13.0.0",
-        "unist-util-find-all-after": "^3.0.2"
-      }
-    },
     "@tootallnate/once": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
@@ -1605,14 +1616,6 @@
         "@types/istanbul-lib-report": "*"
       }
     },
-    "@types/mdast": {
-      "version": "3.0.10",
-      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz",
-      "integrity": "sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==",
-      "requires": {
-        "@types/unist": "*"
-      }
-    },
     "@types/minimist": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
@@ -1652,11 +1655,6 @@
       "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
       "dev": true
     },
-    "@types/unist": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz",
-      "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ=="
-    },
     "@types/yargs": {
       "version": "15.0.14",
       "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz",
@@ -1683,9 +1681,9 @@
       }
     },
     "@xmldom/xmldom": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.4.tgz",
-      "integrity": "sha512-wdxC79cvO7PjSM34jATd/RYZuYWQ8y/R7MidZl1NYYlbpFn1+spfjkiR3ZsJfcaTs2IyslBN7VwBBJwrYKM+zw==",
+      "version": "0.7.5",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz",
+      "integrity": "sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A==",
       "dev": true
     },
     "abab": {
@@ -1697,7 +1695,8 @@
     "acorn": {
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true
     },
     "acorn-globals": {
       "version": "6.0.0",
@@ -1712,7 +1711,8 @@
     "acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "dev": true
     },
     "acorn-walk": {
       "version": "7.2.0",
@@ -1743,7 +1743,8 @@
     "ansi-colors": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "dev": true
     },
     "ansi-escapes": {
       "version": "4.3.2",
@@ -1788,6 +1789,7 @@
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
       "requires": {
         "sprintf-js": "~1.0.2"
       }
@@ -2019,11 +2021,6 @@
         "babel-preset-current-node-syntax": "^1.0.0"
       }
     },
-    "bail": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz",
-      "integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ=="
-    },
     "balanced-match": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
@@ -2299,21 +2296,6 @@
       "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
       "dev": true
     },
-    "character-entities": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz",
-      "integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw=="
-    },
-    "character-entities-legacy": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz",
-      "integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA=="
-    },
-    "character-reference-invalid": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz",
-      "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg=="
-    },
     "chokidar": {
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
@@ -2608,6 +2590,11 @@
         "simple-swizzle": "^0.2.2"
       }
     },
+    "colord": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz",
+      "integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ=="
+    },
     "colorette": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
@@ -2697,6 +2684,7 @@
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
       "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+      "dev": true,
       "requires": {
         "safe-buffer": "~5.1.1"
       }
@@ -2708,9 +2696,9 @@
       "dev": true
     },
     "core-js": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
+      "version": "3.21.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.21.1.tgz",
+      "integrity": "sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig==",
       "dev": true
     },
     "core-js-compat": {
@@ -2770,6 +2758,11 @@
         }
       }
     },
+    "css-functions-list": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.0.1.tgz",
+      "integrity": "sha512-PriDuifDt4u4rkDgnqRCLnjfMatufLmWNfQnGCq34xZwpY3oabwhB9SqRBmuvWUgndbemCFlKqg+nO7C2q0SBw=="
+    },
     "css-select": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
@@ -2936,6 +2929,7 @@
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
       "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "dev": true,
       "requires": {
         "ms": "2.1.2"
       }
@@ -2976,7 +2970,8 @@
     "deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
     },
     "deepmerge": {
       "version": "4.2.2",
@@ -3075,6 +3070,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
       "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dev": true,
       "requires": {
         "esutils": "^2.0.2"
       }
@@ -3083,6 +3079,7 @@
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
       "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
+      "dev": true,
       "requires": {
         "domelementtype": "^2.0.1",
         "entities": "^2.0.0"
@@ -3091,19 +3088,22 @@
         "domelementtype": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
-          "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="
+          "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
+          "dev": true
         },
         "entities": {
           "version": "2.2.0",
           "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="
+          "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+          "dev": true
         }
       }
     },
     "domelementtype": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+      "dev": true
     },
     "domexception": {
       "version": "2.0.1",
@@ -3122,18 +3122,11 @@
         }
       }
     },
-    "domhandler": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
-      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
-      "requires": {
-        "domelementtype": "1"
-      }
-    },
     "domutils": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
       "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+      "dev": true,
       "requires": {
         "dom-serializer": "0",
         "domelementtype": "1"
@@ -3184,15 +3177,11 @@
       "version": "2.3.6",
       "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
       "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "dev": true,
       "requires": {
         "ansi-colors": "^4.1.1"
       }
     },
-    "entities": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="
-    },
     "error-ex": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
@@ -3325,6 +3314,7 @@
       "version": "7.32.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
       "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
+      "dev": true,
       "requires": {
         "@babel/code-frame": "7.12.11",
         "@eslint/eslintrc": "^0.4.3",
@@ -3372,6 +3362,7 @@
           "version": "7.12.11",
           "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
           "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
+          "dev": true,
           "requires": {
             "@babel/highlight": "^7.10.4"
           }
@@ -3380,6 +3371,7 @@
           "version": "6.12.6",
           "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
           "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+          "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
             "fast-json-stable-stringify": "^2.0.0",
@@ -3391,6 +3383,7 @@
           "version": "7.0.3",
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
           "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+          "dev": true,
           "requires": {
             "path-key": "^3.1.0",
             "shebang-command": "^2.0.0",
@@ -3400,12 +3393,14 @@
         "escape-string-regexp": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+          "dev": true
         },
         "globals": {
           "version": "13.11.0",
           "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
           "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
+          "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
           }
@@ -3413,22 +3408,26 @@
         "ignore": {
           "version": "4.0.6",
           "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
+          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+          "dev": true
         },
         "json-schema-traverse": {
           "version": "0.4.1",
           "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+          "dev": true
         },
         "path-key": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+          "dev": true
         },
         "semver": {
           "version": "7.3.5",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
           "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
           }
@@ -3437,6 +3436,7 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
           "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+          "dev": true,
           "requires": {
             "shebang-regex": "^3.0.0"
           }
@@ -3444,17 +3444,20 @@
         "shebang-regex": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+          "dev": true
         },
         "type-fest": {
           "version": "0.20.2",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+          "dev": true
         },
         "which": {
           "version": "2.0.2",
           "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
           "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
           "requires": {
             "isexe": "^2.0.0"
           }
@@ -3465,6 +3468,7 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dev": true,
       "requires": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
@@ -3474,6 +3478,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
       "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+      "dev": true,
       "requires": {
         "eslint-visitor-keys": "^1.1.0"
       },
@@ -3481,19 +3486,22 @@
         "eslint-visitor-keys": {
           "version": "1.3.0",
           "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+          "dev": true
         }
       }
     },
     "eslint-visitor-keys": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "dev": true
     },
     "espree": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
       "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+      "dev": true,
       "requires": {
         "acorn": "^7.4.0",
         "acorn-jsx": "^5.3.1",
@@ -3503,19 +3511,22 @@
         "eslint-visitor-keys": {
           "version": "1.3.0",
           "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+          "dev": true
         }
       }
     },
     "esprima": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "dev": true
     },
     "esquery": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
       "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "dev": true,
       "requires": {
         "estraverse": "^5.1.0"
       },
@@ -3523,7 +3534,8 @@
         "estraverse": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+          "dev": true
         }
       }
     },
@@ -3531,6 +3543,7 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dev": true,
       "requires": {
         "estraverse": "^5.2.0"
       },
@@ -3538,19 +3551,22 @@
         "estraverse": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+          "dev": true
         }
       }
     },
     "estraverse": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "dev": true
     },
     "esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "dev": true
     },
     "exec-sh": {
       "version": "0.3.6",
@@ -3669,7 +3685,8 @@
     "extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true
     },
     "extend-shallow": {
       "version": "3.0.2",
@@ -3806,12 +3823,14 @@
     "fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
     },
     "fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true
     },
     "fast-safe-stringify": {
       "version": "2.1.1",
@@ -4025,12 +4044,14 @@
     "functional-red-black-tree": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+      "dev": true
     },
     "gensync": {
       "version": "1.0.0-beta.2",
       "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true
     },
     "get-caller-file": {
       "version": "2.0.5",
@@ -4135,7 +4156,8 @@
     "globals": {
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true
     },
     "globby": {
       "version": "11.0.4",
@@ -4155,14 +4177,6 @@
       "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
       "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM="
     },
-    "gonzales-pe": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.3.0.tgz",
-      "integrity": "sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==",
-      "requires": {
-        "minimist": "^1.2.5"
-      }
-    },
     "graceful-fs": {
       "version": "4.2.8",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
@@ -4328,9 +4342,9 @@
       }
     },
     "hosted-git-info": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz",
-      "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
       "requires": {
         "lru-cache": "^6.0.0"
       }
@@ -4355,19 +4369,6 @@
       "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.1.0.tgz",
       "integrity": "sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg=="
     },
-    "htmlparser2": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
-      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
-      "requires": {
-        "domelementtype": "^1.3.1",
-        "domhandler": "^2.3.0",
-        "domutils": "^1.5.1",
-        "entities": "^1.1.1",
-        "inherits": "^2.0.1",
-        "readable-stream": "^3.1.1"
-      }
-    },
     "http-proxy-agent": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
@@ -4539,20 +4540,6 @@
         }
       }
     },
-    "is-alphabetical": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
-      "integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg=="
-    },
-    "is-alphanumerical": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
-      "integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
-      "requires": {
-        "is-alphabetical": "^1.0.0",
-        "is-decimal": "^1.0.0"
-      }
-    },
     "is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -4585,11 +4572,6 @@
         "has-tostringtag": "^1.0.0"
       }
     },
-    "is-buffer": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
-      "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="
-    },
     "is-callable": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
@@ -4648,11 +4630,6 @@
         "has-tostringtag": "^1.0.0"
       }
     },
-    "is-decimal": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
-      "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw=="
-    },
     "is-descriptor": {
       "version": "0.1.6",
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -4709,11 +4686,6 @@
         "is-extglob": "^2.1.1"
       }
     },
-    "is-hexadecimal": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz",
-      "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw=="
-    },
     "is-negative-zero": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
@@ -4735,9 +4707,9 @@
       }
     },
     "is-plain-obj": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-      "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA=="
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4="
     },
     "is-plain-object": {
       "version": "2.0.4",
@@ -4802,12 +4774,8 @@
     "is-typedarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
-    },
-    "is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
     },
     "is-windows": {
       "version": "1.0.2",
@@ -5739,6 +5707,7 @@
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
       "requires": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -5796,7 +5765,8 @@
     "jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true
     },
     "json-parse-even-better-errors": {
       "version": "2.3.1",
@@ -5804,9 +5774,9 @@
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
     },
     "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
+      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
       "dev": true
     },
     "json-schema-traverse": {
@@ -5817,7 +5787,8 @@
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
     },
     "json-stringify-safe": {
       "version": "5.0.1",
@@ -5829,6 +5800,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
       "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+      "dev": true,
       "requires": {
         "minimist": "^1.2.5"
       }
@@ -5852,6 +5824,14 @@
         "extsprintf": "1.3.0",
         "json-schema": "0.2.3",
         "verror": "1.10.0"
+      },
+      "dependencies": {
+        "json-schema": {
+          "version": "0.2.3",
+          "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+          "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+          "dev": true
+        }
       }
     },
     "kew": {
@@ -5881,9 +5861,9 @@
       "dev": true
     },
     "known-css-properties": {
-      "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.21.0.tgz",
-      "integrity": "sha512-sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw=="
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.24.0.tgz",
+      "integrity": "sha512-RTSoaUAfLvpR357vWzAz/50Q/BmHfmE6ETSWfutT0AJiw10e6CmcdYRQJlLRd95B53D0Y2aD1jSxD3V3ySF+PA=="
     },
     "kuler": {
       "version": "2.0.0",
@@ -5907,6 +5887,7 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
       "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
       "requires": {
         "prelude-ls": "^1.2.1",
         "type-check": "~0.4.0"
@@ -5938,7 +5919,8 @@
     "lodash.clonedeep": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+      "dev": true
     },
     "lodash.debounce": {
       "version": "4.0.8",
@@ -5969,7 +5951,8 @@
     "lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
     },
     "lodash.sortby": {
       "version": "4.7.0",
@@ -5981,15 +5964,6 @@
       "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
       "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM="
     },
-    "log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-      "requires": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      }
-    },
     "logform": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/logform/-/logform-2.2.0.tgz",
@@ -6003,11 +5977,6 @@
         "triple-beam": "^1.3.0"
       }
     },
-    "longest-streak": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz",
-      "integrity": "sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg=="
-    },
     "lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -6041,9 +6010,9 @@
       "dev": true
     },
     "map-obj": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz",
-      "integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ=="
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
+      "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ=="
     },
     "map-visit": {
       "version": "1.0.0",
@@ -6059,36 +6028,6 @@
       "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
       "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg=="
     },
-    "mdast-util-from-markdown": {
-      "version": "0.8.5",
-      "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz",
-      "integrity": "sha512-2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==",
-      "requires": {
-        "@types/mdast": "^3.0.0",
-        "mdast-util-to-string": "^2.0.0",
-        "micromark": "~2.11.0",
-        "parse-entities": "^2.0.0",
-        "unist-util-stringify-position": "^2.0.0"
-      }
-    },
-    "mdast-util-to-markdown": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz",
-      "integrity": "sha512-XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==",
-      "requires": {
-        "@types/unist": "^2.0.0",
-        "longest-streak": "^2.0.0",
-        "mdast-util-to-string": "^2.0.0",
-        "parse-entities": "^2.0.0",
-        "repeat-string": "^1.0.0",
-        "zwitch": "^1.0.0"
-      }
-    },
-    "mdast-util-to-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz",
-      "integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w=="
-    },
     "mdn-data": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
@@ -6114,6 +6053,11 @@
         "yargs-parser": "^20.2.3"
       },
       "dependencies": {
+        "trim-newlines": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
+          "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw=="
+        },
         "yargs-parser": {
           "version": "20.2.9",
           "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
@@ -6160,15 +6104,6 @@
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="
     },
-    "micromark": {
-      "version": "2.11.4",
-      "resolved": "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz",
-      "integrity": "sha512-+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==",
-      "requires": {
-        "debug": "^4.0.0",
-        "parse-entities": "^2.0.0"
-      }
-    },
     "micromatch": {
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
@@ -6215,7 +6150,8 @@
     "minimist": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "dev": true
     },
     "minimist-options": {
       "version": "4.1.0",
@@ -6225,13 +6161,6 @@
         "arrify": "^1.0.1",
         "is-plain-obj": "^1.1.0",
         "kind-of": "^6.0.3"
-      },
-      "dependencies": {
-        "is-plain-obj": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-          "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4="
-        }
       }
     },
     "mixin-deep": {
@@ -6300,9 +6229,9 @@
       "dev": true
     },
     "nanoid": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz",
-      "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA=="
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
+      "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw=="
     },
     "nanomatch": {
       "version": "1.2.13",
@@ -6326,7 +6255,8 @@
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+      "dev": true
     },
     "nice-try": {
       "version": "1.0.5",
@@ -6475,11 +6405,6 @@
         "boolbase": "^1.0.0"
       }
     },
-    "num2fraction": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
-      "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4="
-    },
     "nwsapi": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
@@ -6623,6 +6548,7 @@
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
       "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dev": true,
       "requires": {
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
@@ -6679,19 +6605,6 @@
         "callsites": "^3.0.0"
       }
     },
-    "parse-entities": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
-      "integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
-      "requires": {
-        "character-entities": "^1.0.0",
-        "character-entities-legacy": "^1.0.0",
-        "character-reference-invalid": "^1.0.0",
-        "is-alphanumerical": "^1.0.0",
-        "is-decimal": "^1.0.0",
-        "is-hexadecimal": "^1.0.0"
-      }
-    },
     "parse-json": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
@@ -6831,6 +6744,11 @@
         }
       }
     },
+    "picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+    },
     "picomatch": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
@@ -6881,13 +6799,13 @@
       "dev": true
     },
     "postcss": {
-      "version": "8.3.6",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.3.6.tgz",
-      "integrity": "sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A==",
+      "version": "8.4.4",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.4.tgz",
+      "integrity": "sha512-joU6fBsN6EIer28Lj6GDFoC/5yOZzLCfn0zHAn/MYXI7aPt4m4hK5KC5ovEZXy+lnCjmYIbQWngvju2ddyEr8Q==",
       "requires": {
-        "colorette": "^1.2.2",
-        "nanoid": "^3.1.23",
-        "source-map-js": "^0.6.2"
+        "nanoid": "^3.1.30",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.1"
       }
     },
     "postcss-cli": {
@@ -6909,20 +6827,65 @@
         "yargs": "^16.0.0"
       }
     },
-    "postcss-html": {
-      "version": "0.36.0",
-      "resolved": "https://registry.npmjs.org/postcss-html/-/postcss-html-0.36.0.tgz",
-      "integrity": "sha512-HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==",
+    "postcss-load-config": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.0.tgz",
+      "integrity": "sha512-ipM8Ds01ZUophjDTQYSVP70slFSYg3T0/zyfII5vzhN6V57YSxMgG5syXuwi5VtS8wSf3iL30v0uBdoIVx4Q0g==",
+      "requires": {
+        "import-cwd": "^3.0.0",
+        "lilconfig": "^2.0.3",
+        "yaml": "^1.10.2"
+      }
+    },
+    "postcss-media-query-parser": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
+      "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ="
+    },
+    "postcss-reporter": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.0.2.tgz",
+      "integrity": "sha512-JyQ96NTQQsso42y6L1H1RqHfWH1C3Jr0pt91mVv5IdYddZAE9DUZxuferNgk6q0o6vBVOrfVJb10X1FgDzjmDw==",
+      "requires": {
+        "colorette": "^1.2.1",
+        "lodash.difference": "^4.5.0",
+        "lodash.forown": "^4.4.0",
+        "lodash.get": "^4.4.2",
+        "lodash.groupby": "^4.6.0",
+        "lodash.sortby": "^4.7.0"
+      }
+    },
+    "postcss-resolve-nested-selector": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
+      "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4="
+    },
+    "postcss-safe-parser": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
+      "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ=="
+    },
+    "postcss-scss": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.3.tgz",
+      "integrity": "sha512-j4KxzWovfdHsyxwl1BxkUal/O4uirvHgdzMKS1aWJBAV0qh2qj5qAZqpeBfVUYGWv+4iK9Az7SPyZ4fyNju1uA=="
+    },
+    "postcss-selector-parser": {
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
+      "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
       "requires": {
-        "htmlparser2": "^3.10.0"
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
       }
     },
-    "postcss-less": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-3.1.4.tgz",
-      "integrity": "sha512-7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==",
+    "postcss-sorting": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-5.0.1.tgz",
+      "integrity": "sha512-Y9fUFkIhfrm6i0Ta3n+89j56EFqaNRdUKqXyRp6kvTcSXnmgEjaVowCXH+JBe9+YKWqd4nc28r2sgwnzJalccA==",
       "requires": {
-        "postcss": "^7.0.14"
+        "lodash": "^4.17.14",
+        "postcss": "^7.0.17"
       },
       "dependencies": {
         "ansi-styles": {
@@ -6996,380 +6959,16 @@
         }
       }
     },
-    "postcss-load-config": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.0.tgz",
-      "integrity": "sha512-ipM8Ds01ZUophjDTQYSVP70slFSYg3T0/zyfII5vzhN6V57YSxMgG5syXuwi5VtS8wSf3iL30v0uBdoIVx4Q0g==",
-      "requires": {
-        "import-cwd": "^3.0.0",
-        "lilconfig": "^2.0.3",
-        "yaml": "^1.10.2"
-      }
-    },
-    "postcss-media-query-parser": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
-      "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ="
-    },
-    "postcss-reporter": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.0.2.tgz",
-      "integrity": "sha512-JyQ96NTQQsso42y6L1H1RqHfWH1C3Jr0pt91mVv5IdYddZAE9DUZxuferNgk6q0o6vBVOrfVJb10X1FgDzjmDw==",
-      "requires": {
-        "colorette": "^1.2.1",
-        "lodash.difference": "^4.5.0",
-        "lodash.forown": "^4.4.0",
-        "lodash.get": "^4.4.2",
-        "lodash.groupby": "^4.6.0",
-        "lodash.sortby": "^4.7.0"
-      }
-    },
-    "postcss-resolve-nested-selector": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
-      "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4="
-    },
-    "postcss-safe-parser": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz",
-      "integrity": "sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==",
-      "requires": {
-        "postcss": "^7.0.26"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
-        },
-        "postcss": {
-          "version": "7.0.36",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
-          "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "postcss-sass": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.4.4.tgz",
-      "integrity": "sha512-BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg==",
-      "requires": {
-        "gonzales-pe": "^4.3.0",
-        "postcss": "^7.0.21"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
-        },
-        "postcss": {
-          "version": "7.0.36",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
-          "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "postcss-scss": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-2.1.1.tgz",
-      "integrity": "sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==",
-      "requires": {
-        "postcss": "^7.0.6"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
-        },
-        "postcss": {
-          "version": "7.0.36",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
-          "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "postcss-selector-parser": {
-      "version": "6.0.6",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
-      "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
-      "requires": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      }
-    },
-    "postcss-sorting": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-5.0.1.tgz",
-      "integrity": "sha512-Y9fUFkIhfrm6i0Ta3n+89j56EFqaNRdUKqXyRp6kvTcSXnmgEjaVowCXH+JBe9+YKWqd4nc28r2sgwnzJalccA==",
-      "requires": {
-        "lodash": "^4.17.14",
-        "postcss": "^7.0.17"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
-        },
-        "postcss": {
-          "version": "7.0.36",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
-          "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "postcss-syntax": {
-      "version": "0.36.2",
-      "resolved": "https://registry.npmjs.org/postcss-syntax/-/postcss-syntax-0.36.2.tgz",
-      "integrity": "sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w=="
-    },
-    "postcss-value-parser": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
-      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="
+    "postcss-value-parser": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
+      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="
     },
     "prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "dev": true
     },
     "pretty-format": {
       "version": "26.6.2",
@@ -7403,7 +7002,8 @@
     "progress": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "dev": true
     },
     "prompts": {
       "version": "2.4.1",
@@ -7558,6 +7158,7 @@
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
       "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
       "requires": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -7624,7 +7225,8 @@
     "regexpp": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "dev": true
     },
     "regexpu-core": {
       "version": "4.7.1",
@@ -7663,32 +7265,6 @@
         }
       }
     },
-    "remark": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/remark/-/remark-13.0.0.tgz",
-      "integrity": "sha512-HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA==",
-      "requires": {
-        "remark-parse": "^9.0.0",
-        "remark-stringify": "^9.0.0",
-        "unified": "^9.1.0"
-      }
-    },
-    "remark-parse": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz",
-      "integrity": "sha512-geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==",
-      "requires": {
-        "mdast-util-from-markdown": "^0.8.0"
-      }
-    },
-    "remark-stringify": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-9.0.1.tgz",
-      "integrity": "sha512-mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg==",
-      "requires": {
-        "mdast-util-to-markdown": "^0.6.0"
-      }
-    },
     "remove-trailing-separator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
@@ -7704,7 +7280,8 @@
     "repeat-string": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true
     },
     "replace-ext": {
       "version": "1.0.1",
@@ -7908,7 +7485,8 @@
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
     },
     "safe-regex": {
       "version": "1.1.0",
@@ -8098,7 +7676,8 @@
     "semver": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true
     },
     "set-blocking": {
       "version": "2.0.0",
@@ -8187,7 +7766,8 @@
     "signal-exit": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
+      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
+      "dev": true
     },
     "simple-swizzle": {
       "version": "0.2.2",
@@ -8358,12 +7938,13 @@
     "source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true
     },
     "source-map-js": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-0.6.2.tgz",
-      "integrity": "sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug=="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
     },
     "source-map-resolve": {
       "version": "0.5.3",
@@ -8459,7 +8040,8 @@
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
     },
     "sshpk": {
       "version": "1.16.1",
@@ -8572,6 +8154,7 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
       "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
       "requires": {
         "safe-buffer": "~5.2.0"
       },
@@ -8579,7 +8162,8 @@
         "safe-buffer": {
           "version": "5.2.1",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
         }
       }
     },
@@ -8620,7 +8204,8 @@
     "strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "dev": true
     },
     "style-search": {
       "version": "0.1.0",
@@ -8628,173 +8213,220 @@
       "integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI="
     },
     "stylelint": {
-      "version": "13.13.1",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.13.1.tgz",
-      "integrity": "sha512-Mv+BQr5XTUrKqAXmpqm6Ddli6Ief+AiPZkRsIrAoUKFuq/ElkUh9ZMYxXD0iQNZ5ADghZKLOWz1h7hTClB7zgQ==",
+      "version": "14.5.3",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.5.3.tgz",
+      "integrity": "sha512-omHETL+kGHR+fCXFK1SkZD/A+emCP9esggAdWEl8GPjTNeyRYj+H6uetRDcU+7E451zwWiUYGVAX+lApsAZgsQ==",
       "requires": {
-        "@stylelint/postcss-css-in-js": "^0.37.2",
-        "@stylelint/postcss-markdown": "^0.36.2",
-        "autoprefixer": "^9.8.6",
         "balanced-match": "^2.0.0",
-        "chalk": "^4.1.1",
-        "cosmiconfig": "^7.0.0",
-        "debug": "^4.3.1",
+        "colord": "^2.9.2",
+        "cosmiconfig": "^7.0.1",
+        "css-functions-list": "^3.0.1",
+        "debug": "^4.3.3",
         "execall": "^2.0.0",
-        "fast-glob": "^3.2.5",
+        "fast-glob": "^3.2.11",
         "fastest-levenshtein": "^1.0.12",
         "file-entry-cache": "^6.0.1",
         "get-stdin": "^8.0.0",
         "global-modules": "^2.0.0",
-        "globby": "^11.0.3",
+        "globby": "^11.1.0",
         "globjoin": "^0.1.4",
         "html-tags": "^3.1.0",
-        "ignore": "^5.1.8",
+        "ignore": "^5.2.0",
         "import-lazy": "^4.0.0",
         "imurmurhash": "^0.1.4",
-        "known-css-properties": "^0.21.0",
-        "lodash": "^4.17.21",
-        "log-symbols": "^4.1.0",
+        "is-plain-object": "^5.0.0",
+        "known-css-properties": "^0.24.0",
         "mathml-tag-names": "^2.1.3",
         "meow": "^9.0.0",
         "micromatch": "^4.0.4",
+        "normalize-path": "^3.0.0",
         "normalize-selector": "^0.2.0",
-        "postcss": "^7.0.35",
-        "postcss-html": "^0.36.0",
-        "postcss-less": "^3.1.4",
+        "picocolors": "^1.0.0",
+        "postcss": "^8.4.6",
         "postcss-media-query-parser": "^0.2.3",
         "postcss-resolve-nested-selector": "^0.1.1",
-        "postcss-safe-parser": "^4.0.2",
-        "postcss-sass": "^0.4.4",
-        "postcss-scss": "^2.1.1",
-        "postcss-selector-parser": "^6.0.5",
-        "postcss-syntax": "^0.36.2",
-        "postcss-value-parser": "^4.1.0",
+        "postcss-safe-parser": "^6.0.0",
+        "postcss-selector-parser": "^6.0.9",
+        "postcss-value-parser": "^4.2.0",
         "resolve-from": "^5.0.0",
-        "slash": "^3.0.0",
         "specificity": "^0.4.1",
-        "string-width": "^4.2.2",
-        "strip-ansi": "^6.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
         "style-search": "^0.1.0",
-        "sugarss": "^2.0.0",
+        "supports-hyperlinks": "^2.2.0",
         "svg-tags": "^1.0.0",
-        "table": "^6.6.0",
+        "table": "^6.8.0",
         "v8-compile-cache": "^2.3.0",
-        "write-file-atomic": "^3.0.3"
+        "write-file-atomic": "^4.0.1"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+        "debug": {
+          "version": "4.3.3",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+          "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
           "requires": {
-            "color-convert": "^1.9.0"
+            "ms": "2.1.2"
           }
         },
-        "autoprefixer": {
-          "version": "9.8.6",
-          "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz",
-          "integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==",
+        "fast-glob": {
+          "version": "3.2.11",
+          "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
+          "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
           "requires": {
-            "browserslist": "^4.12.0",
-            "caniuse-lite": "^1.0.30001109",
-            "colorette": "^1.2.1",
-            "normalize-range": "^0.1.2",
-            "num2fraction": "^1.2.2",
-            "postcss": "^7.0.32",
-            "postcss-value-parser": "^4.1.0"
+            "@nodelib/fs.stat": "^2.0.2",
+            "@nodelib/fs.walk": "^1.2.3",
+            "glob-parent": "^5.1.2",
+            "merge2": "^1.3.0",
+            "micromatch": "^4.0.4"
           }
         },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+        "globby": {
+          "version": "11.1.0",
+          "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+          "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
           "requires": {
-            "color-name": "1.1.3"
+            "array-union": "^2.1.0",
+            "dir-glob": "^3.0.1",
+            "fast-glob": "^3.2.9",
+            "ignore": "^5.2.0",
+            "merge2": "^1.4.1",
+            "slash": "^3.0.0"
           }
         },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+        "ignore": {
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+          "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="
         },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+        "is-plain-object": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+          "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="
+        },
+        "nanoid": {
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
+          "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw=="
         },
         "postcss": {
-          "version": "7.0.36",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
-          "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
+          "version": "8.4.7",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.7.tgz",
+          "integrity": "sha512-L9Ye3r6hkkCeOETQX6iOaWZgjp3LL6Lpqm6EtgbKrgqGGteRMNb9vzBfRL96YOSu8o7x3MfIH9Mo5cPJFGrW6A==",
           "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          },
-          "dependencies": {
-            "chalk": {
-              "version": "2.4.2",
-              "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-              "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-              "requires": {
-                "ansi-styles": "^3.2.1",
-                "escape-string-regexp": "^1.0.5",
-                "supports-color": "^5.3.0"
-              },
-              "dependencies": {
-                "supports-color": {
-                  "version": "5.5.0",
-                  "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-                  "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-                  "requires": {
-                    "has-flag": "^3.0.0"
-                  }
-                }
-              }
-            }
+            "nanoid": "^3.3.1",
+            "picocolors": "^1.0.0",
+            "source-map-js": "^1.0.2"
           }
         },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+        "postcss-selector-parser": {
+          "version": "6.0.9",
+          "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz",
+          "integrity": "sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ==",
+          "requires": {
+            "cssesc": "^3.0.0",
+            "util-deprecate": "^1.0.2"
+          }
         },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+        "postcss-value-parser": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+          "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
+        },
+        "signal-exit": {
+          "version": "3.0.7",
+          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+          "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
+        },
+        "source-map-js": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+          "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
+        },
+        "string-width": {
+          "version": "4.2.3",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+          "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
           "requires": {
-            "has-flag": "^3.0.0"
+            "emoji-regex": "^8.0.0",
+            "is-fullwidth-code-point": "^3.0.0",
+            "strip-ansi": "^6.0.1"
+          }
+        },
+        "strip-ansi": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+          "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+          "requires": {
+            "ansi-regex": "^5.0.1"
+          }
+        },
+        "table": {
+          "version": "6.8.0",
+          "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
+          "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
+          "requires": {
+            "ajv": "^8.0.1",
+            "lodash.truncate": "^4.4.2",
+            "slice-ansi": "^4.0.0",
+            "string-width": "^4.2.3",
+            "strip-ansi": "^6.0.1"
+          }
+        },
+        "write-file-atomic": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz",
+          "integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==",
+          "requires": {
+            "imurmurhash": "^0.1.4",
+            "signal-exit": "^3.0.7"
           }
         }
       }
     },
     "stylelint-config-recommended": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-5.0.0.tgz",
-      "integrity": "sha512-c8aubuARSu5A3vEHLBeOSJt1udOdS+1iue7BmJDTSXoCBmfEQmmWX+59vYIj3NQdJBY6a/QRv1ozVFpaB9jaqA=="
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
+      "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw=="
     },
     "stylelint-config-recommended-scss": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-4.3.0.tgz",
-      "integrity": "sha512-/noGjXlO8pJTr/Z3qGMoaRFK8n1BFfOqmAbX1RjTIcl4Yalr+LUb1zb9iQ7pRx1GsEBXOAm4g2z5/jou/pfMPg==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-5.0.2.tgz",
+      "integrity": "sha512-b14BSZjcwW0hqbzm9b0S/ScN2+3CO3O4vcMNOw2KGf8lfVSwJ4p5TbNEXKwKl1+0FMtgRXZj6DqVUe/7nGnuBg==",
       "requires": {
-        "stylelint-config-recommended": "^5.0.0"
+        "postcss-scss": "^4.0.2",
+        "stylelint-config-recommended": "^6.0.0",
+        "stylelint-scss": "^4.0.0"
+      },
+      "dependencies": {
+        "stylelint-scss": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.1.0.tgz",
+          "integrity": "sha512-BNYTo7MMamhFOlcaAWp2dMpjg6hPyM/FFqfDIYzmYVLMmQJqc8lWRIiTqP4UX5bresj9Vo0dKC6odSh43VP2NA==",
+          "requires": {
+            "lodash": "^4.17.21",
+            "postcss-media-query-parser": "^0.2.3",
+            "postcss-resolve-nested-selector": "^0.1.1",
+            "postcss-selector-parser": "^6.0.6",
+            "postcss-value-parser": "^4.1.0"
+          }
+        }
       }
     },
     "stylelint-config-standard": {
-      "version": "21.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-21.0.0.tgz",
-      "integrity": "sha512-Yf6mx5oYEbQQJxWuW7X3t1gcxqbUx52qC9SMS3saC2ruOVYEyqmr5zSW6k3wXflDjjFrPhar3kp68ugRopmlzg==",
+      "version": "24.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-24.0.0.tgz",
+      "integrity": "sha512-+RtU7fbNT+VlNbdXJvnjc3USNPZRiRVp/d2DxOF/vBDDTi0kH5RX2Ny6errdtZJH3boO+bmqIYEllEmok4jiuw==",
       "requires": {
-        "stylelint-config-recommended": "^4.0.0"
-      },
-      "dependencies": {
-        "stylelint-config-recommended": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-4.0.0.tgz",
-          "integrity": "sha512-sgna89Ng+25Hr9kmmaIxpGWt2LStVm1xf1807PdcWasiPDaOTkOHRL61sINw0twky7QMzafCGToGDnHT/kTHtQ=="
-        }
+        "stylelint-config-recommended": "^6.0.0"
+      }
+    },
+    "stylelint-config-standard-scss": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-standard-scss/-/stylelint-config-standard-scss-3.0.0.tgz",
+      "integrity": "sha512-zt3ZbzIbllN1iCmc94e4pDxqpkzeR6CJo5DDXzltshuXr+82B8ylHyMMARNnUYrZH80B7wgY7UkKTYCFM0UUyw==",
+      "requires": {
+        "stylelint-config-recommended-scss": "^5.0.2",
+        "stylelint-config-standard": "^24.0.0"
       }
     },
     "stylelint-order": {
@@ -8890,85 +8522,6 @@
         "postcss-value-parser": "^4.1.0"
       }
     },
-    "sugarss": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-2.0.0.tgz",
-      "integrity": "sha512-WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ==",
-      "requires": {
-        "postcss": "^7.0.2"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-          "requires": {
-            "color-convert": "^1.9.0"
-          }
-        },
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-          "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
-          },
-          "dependencies": {
-            "supports-color": {
-              "version": "5.5.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-              "requires": {
-                "has-flag": "^3.0.0"
-              }
-            }
-          }
-        },
-        "color-convert": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-          "requires": {
-            "color-name": "1.1.3"
-          }
-        },
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-        },
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
-        },
-        "postcss": {
-          "version": "7.0.36",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
-          "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
-          "requires": {
-            "chalk": "^2.4.2",
-            "source-map": "^0.6.1",
-            "supports-color": "^6.1.0"
-          }
-        },
-        "source-map": {
-          "version": "0.6.1",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
     "supports-color": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -8981,7 +8534,6 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
       "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
-      "dev": true,
       "requires": {
         "has-flag": "^4.0.0",
         "supports-color": "^7.0.0"
@@ -9149,6 +8701,7 @@
       "version": "6.7.1",
       "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
       "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
+      "dev": true,
       "requires": {
         "ajv": "^8.0.1",
         "lodash.clonedeep": "^4.5.0",
@@ -9213,7 +8766,8 @@
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+      "dev": true
     },
     "throat": {
       "version": "5.0.0",
@@ -9242,7 +8796,8 @@
     "to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+      "dev": true
     },
     "to-object-path": {
       "version": "0.3.0",
@@ -9331,9 +8886,10 @@
       "dev": true
     },
     "trim-newlines": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
-      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw=="
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-4.0.2.tgz",
+      "integrity": "sha512-GJtWyq9InR/2HRiLZgpIKv+ufIKrVrvjQWEj7PxAXNc5dwbNJkqhAUoAGgzRmULAnoOM5EIpveYd3J2VeSAIew==",
+      "dev": true
     },
     "triple-beam": {
       "version": "1.3.0",
@@ -9341,11 +8897,6 @@
       "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==",
       "dev": true
     },
-    "trough": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz",
-      "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA=="
-    },
     "tslib": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
@@ -9371,6 +8922,7 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
       "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dev": true,
       "requires": {
         "prelude-ls": "^1.2.1"
       }
@@ -9396,6 +8948,7 @@
       "version": "3.1.5",
       "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
       "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "dev": true,
       "requires": {
         "is-typedarray": "^1.0.0"
       }
@@ -9450,19 +9003,6 @@
       "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==",
       "dev": true
     },
-    "unified": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz",
-      "integrity": "sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==",
-      "requires": {
-        "bail": "^1.0.0",
-        "extend": "^3.0.0",
-        "is-buffer": "^2.0.0",
-        "is-plain-obj": "^2.0.0",
-        "trough": "^1.0.0",
-        "vfile": "^4.0.0"
-      }
-    },
     "union-value": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
@@ -9498,27 +9038,6 @@
         }
       }
     },
-    "unist-util-find-all-after": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz",
-      "integrity": "sha512-xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ==",
-      "requires": {
-        "unist-util-is": "^4.0.0"
-      }
-    },
-    "unist-util-is": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz",
-      "integrity": "sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg=="
-    },
-    "unist-util-stringify-position": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz",
-      "integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==",
-      "requires": {
-        "@types/unist": "^2.0.2"
-      }
-    },
     "universalify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -9666,26 +9185,6 @@
         }
       }
     },
-    "vfile": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz",
-      "integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==",
-      "requires": {
-        "@types/unist": "^2.0.0",
-        "is-buffer": "^2.0.0",
-        "unist-util-stringify-position": "^2.0.0",
-        "vfile-message": "^2.0.0"
-      }
-    },
-    "vfile-message": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz",
-      "integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==",
-      "requires": {
-        "@types/unist": "^2.0.0",
-        "unist-util-stringify-position": "^2.0.0"
-      }
-    },
     "vinyl": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
@@ -9932,7 +9431,8 @@
     "word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true
     },
     "wrap-ansi": {
       "version": "7.0.0",
@@ -9953,6 +9453,7 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
       "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+      "dev": true,
       "requires": {
         "imurmurhash": "^0.1.4",
         "is-typedarray": "^1.0.0",
@@ -9978,11 +9479,6 @@
       "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
       "dev": true
     },
-    "xmldom": {
-      "version": "github:xmldom/xmldom#c568938641cc1f121cef5b4df80fcfda1e489b6e",
-      "from": "github:xmldom/xmldom#0.7.0",
-      "dev": true
-    },
     "xpath": {
       "version": "0.0.32",
       "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.32.tgz",
@@ -10044,11 +9540,6 @@
         "buffer-crc32": "~0.2.3",
         "fd-slicer": "~1.1.0"
       }
-    },
-    "zwitch": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz",
-      "integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw=="
     }
   }
 }
diff --git a/html/themes/custom/common_design_subtheme/package.json b/html/themes/custom/common_design_subtheme/package.json
index 3ac515544..b2b306167 100644
--- a/html/themes/custom/common_design_subtheme/package.json
+++ b/html/themes/custom/common_design_subtheme/package.json
@@ -1,6 +1,6 @@
 {
   "name": "common-design",
-  "version": "5.0.1",
+  "version": "5.0.2",
   "description": "OCHA Common Design base theme for Drupal 8",
   "repository": "git@github.com:UN-OCHA/common_design.git",
   "author": "UN OCHA",
@@ -20,37 +20,39 @@
     "test": "jest _tests/*.test.js"
   },
   "engines": {
-    "node": "^12.21.0",
-    "npm": "^7.6.1"
+    "node": "^16.13.2",
+    "npm": "^8.1.2"
   },
   "dependencies": {
     "autoprefixer": "^10.2.5",
-    "eslint": "^7.23.0",
-    "postcss": "^8.2.9",
+    "postcss": "^8.4.4",
     "postcss-cli": "^8.3.1",
     "sass": "^1.32.8",
-    "stylelint": "^13.12.0",
-    "stylelint-config-recommended-scss": "^4.2.0",
-    "stylelint-config-standard": "^21.0.0",
+    "stylelint": "^14.3.0",
+    "stylelint-config-recommended-scss": "^5.0.2",
+    "stylelint-config-standard": "^24.0.0",
+    "stylelint-config-standard-scss": "^3.0.0",
     "stylelint-order": "^4.1.0",
     "stylelint-scss": "^3.19.0"
   },
   "devDependencies": {
-    "axios": ">=0.21.2",
     "@babel/preset-env": "^7.13.10",
+    "@xmldom/xmldom": "^0.7.5",
+    "axios": ">=0.21.2",
     "babel-jest": "^26.6.3",
-    "core-js": "^2.6.12",
+    "core-js": "^3.20.0",
     "css-what": ">=5.0.1",
+    "eslint": "^7.23.0",
     "jest": "^26.6.3",
     "jest-puppeteer": "^5.0.3",
-    "nth-check": ">=2.0.1",
+    "json-schema": ">=0.4.0",
     "minimist": "^1.2.5",
+    "nth-check": ">=2.0.1",
     "puppeteer": "^9.1.1",
     "set-value": ">=4.0.1",
     "svg-sprite": "^1.5.0",
     "trim": ">=0.0.3",
-    "trim-newlines": ">=3.0.1",
-    "xmldom": "github:xmldom/xmldom#0.7.0",
+    "trim-newlines": "^4.0.2",
     "yargs-parser": "^18.1.3"
   }
 }

From 1cd6a184917a3ce25c43ab040208257ddcbe31d0 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 1 Mar 2022 14:20:57 +0100
Subject: [PATCH 544/720] update jest test config files form base theme

---
 .../common_design_subtheme/jest-puppeteer.config.js | 13 ++++++++-----
 .../custom/common_design_subtheme/jest.config.js    |  5 +++--
 .../custom/common_design_subtheme/jest.setup.js     | 12 ++++++++++++
 3 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 html/themes/custom/common_design_subtheme/jest.setup.js

diff --git a/html/themes/custom/common_design_subtheme/jest-puppeteer.config.js b/html/themes/custom/common_design_subtheme/jest-puppeteer.config.js
index 8b5c19ee2..e32fd828a 100644
--- a/html/themes/custom/common_design_subtheme/jest-puppeteer.config.js
+++ b/html/themes/custom/common_design_subtheme/jest-puppeteer.config.js
@@ -1,19 +1,22 @@
-// Determine which mode we're running.
-const DEBUG_MODE = process.argv.includes('--debug');
-
 // Default config
 const config = {
+  browserContext: 'incognito',
   launch: {
     slowMo: 10,
+    headless: true,
+    ignoreHTTPSErrors: true,
   },
-  browserContext: 'incognito',
+  testTimeout: 10000,
 };
 
+// Determine which mode we're running.
+const DEBUG_MODE = process.argv.includes('--debug');
+
 // When debugging we want to see the browser do its work.
 if (DEBUG_MODE) {
   config.launch.headless = false;
   config.testTimeout = 10000;
-  config.launch.slowMo = 1000;
+  config.launch.slowMo = 100;
 }
 
 // Export
diff --git a/html/themes/custom/common_design_subtheme/jest.config.js b/html/themes/custom/common_design_subtheme/jest.config.js
index 90085fcbf..016e2bacc 100644
--- a/html/themes/custom/common_design_subtheme/jest.config.js
+++ b/html/themes/custom/common_design_subtheme/jest.config.js
@@ -1,11 +1,12 @@
-const E2E_MODE = process.env.npm_lifecycle_event === 'e2e';
+const E2E_MODE = ['e2e', 'ci'].includes(process.env.npm_lifecycle_event);
 
 const config = {
   verbose: true,
   preset: 'babel-jest',
   transform: {
-    "^.+\\.(js|jsx)$": "babel-jest",
+    '^.+\\.(js|jsx)$': 'babel-jest',
   },
+  setupFilesAfterEnv: ['expect-puppeteer', './jest.setup.js'],
 };
 
 // E2E requires a special preset
diff --git a/html/themes/custom/common_design_subtheme/jest.setup.js b/html/themes/custom/common_design_subtheme/jest.setup.js
new file mode 100644
index 000000000..20ee994a4
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/jest.setup.js
@@ -0,0 +1,12 @@
+/**
+ * This file is run once for every test in order to provide setup/defaults to
+ * each test automatically.
+ *
+ * The following globals are available:
+ * - jest
+ * - page
+ */
+import env from './_tests/_env';
+
+jest.setTimeout(env.testTimeout);
+page.setDefaultNavigationTimeout(0);

From 5c914c67db67feec8c13fe7b8fedd7c90e10b93f Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 1 Mar 2022 14:31:19 +0100
Subject: [PATCH 545/720] Correct linting errors

---
 .../components/rw-headlines/rw-headlines.css              | 8 ++++++--
 .../components/rw-homepage/rw-homepage--grid.css          | 4 +++-
 html/themes/custom/common_design_subtheme/css/styles.css  | 2 +-
 .../sass/cd/cd-footer/_cd-footer.scss                     | 4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-headlines/rw-headlines.css b/html/themes/custom/common_design_subtheme/components/rw-headlines/rw-headlines.css
index 75ea7d992..fd540f3b1 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-headlines/rw-headlines.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-headlines/rw-headlines.css
@@ -90,7 +90,9 @@
   /* !* Headlines grid: 1 column. *! */
   .rw-river--headlines .rw-river__articles {
     display: grid;
-    grid-template-areas: "header" "article1" "article2" "article3" "article4" "article5" "article6" "article7" "article8" "footer";
+    grid-template-areas:
+      "header" "article1" "article2" "article3" "article4"
+      "article5" "article6" "article7" "article8" "footer";
     grid-template-rows: repeat(10, min-content);
     grid-template-columns: 1fr;
   }
@@ -146,7 +148,9 @@
   /* Headlines grid: 2 columns. */
   @media screen and (min-width: 480px) {
     .rw-river--headlines .rw-river__articles {
-      grid-template-areas: "header header" "article1 article2" "article3 article4" "article5 article6" "article7 article8" "footer footer";
+      grid-template-areas:
+        "header header" "article1 article2" "article3 article4"
+        "article5 article6" "article7 article8" "footer footer";
       grid-template-rows: repeat(6, min-content);
       grid-template-columns: 1fr 1fr;
     }
diff --git a/html/themes/custom/common_design_subtheme/components/rw-homepage/rw-homepage--grid.css b/html/themes/custom/common_design_subtheme/components/rw-homepage/rw-homepage--grid.css
index 733d18562..38d855d0e 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-homepage/rw-homepage--grid.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-homepage/rw-homepage--grid.css
@@ -46,7 +46,9 @@
 
   @media screen and (min-width: 768px) {
     .path-frontpage .rw-homepage-sections {
-      grid-template-areas: "messages messages" "headlines announcement" "headlines disasters" "headlines disasters" "headlines blog" "headlines blog" "headlines opportunities" "headlines updates" "headlines updates";
+      grid-template-areas:
+        "messages messages" "headlines announcement" "headlines disasters" "headlines disasters" "headlines blog"
+        "headlines blog" "headlines opportunities" "headlines updates" "headlines updates";
       grid-template-rows: repeat(8, min-content) 1fr;
       grid-template-columns: 65% 35%;
     }
diff --git a/html/themes/custom/common_design_subtheme/css/styles.css b/html/themes/custom/common_design_subtheme/css/styles.css
index 9fd35c98a..2c256cc5a 100644
--- a/html/themes/custom/common_design_subtheme/css/styles.css
+++ b/html/themes/custom/common_design_subtheme/css/styles.css
@@ -1 +1 @@
-@import"https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400%3B500%3B700&display=swap";@import"https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,300%3B0,400%3B0,500%3B0,700%3B0,900%3B1,400%3B1,700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400%3B700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@400%3B700&display=swap";:root{--cd-reliefweb-brand-blue: #0988bb;--cd-reliefweb-brand-red: #f65c51;--cd-reliefweb-brand-blue--dark: #055372;--cd-reliefweb-brand-red--dark: #eb1405;--cd-reliefweb-brand-grey--dark: #2e3436;--cd-reliefweb-brand-grey--mid: #4d5254;--cd-reliefweb-brand-grey--light: #e6ecef;--cd-rgb-reliefweb-brand-blue: 9, 136, 187;--cd-rgb-reliefweb-brand-red: 246, 92, 81;--cd-rgb-reliefweb-brand-blue--dark: 4, 82, 112;--cd-rgb-reliefweb-brand-red--dark: 235, 20, 5;--cd-rgb-reliefweb-brand-grey--dark: 46, 52, 54;--cd-rgb-reliefweb-brand-grey--light: 230, 236, 239;--cd-reliefweb-grey--light: #d9d9d9;--cd-reliefweb-grey--light--bg: rgba(217, 217, 217, 0.2);--cd-reliefweb-orange: #f49e2c;--cd-reliefweb-orange--bg: rgba(244, 158, 44, 0.2);--cd-reliefweb-blue: #076d96;--cd-reliefweb-blue--bg: rgba(7, 109, 150, 0.2);--cd-reliefweb-green: #88bb09;--cd-reliefweb-green--bg: rgba(136, 187, 9, 0.2);--cd-reliefweb-red: #da190b;--cd-reliefweb-red--bg: rgba(218, 25, 11, 0.2);--cd-reliefweb-purple: #9509bb;--cd-reliefweb-purple--bg: rgba(149, 9, 187, 0.2);--cd-reliefweb-grey: #4b4b4b;--cd-reliefweb-grey--bg: rgba(75, 75, 75, 0.2);--cd-reliefweb-brown: #8f5507;--cd-reliefweb-brown--bg: rgba(143, 85, 7, 0.2);--cd-reliefweb-yellow: #f5cb2f;--cd-reliefweb-yellow--bg: rgba(245, 203, 47, 0.2);--cd-reliefweb-cyan: #56c9f7;--cd-reliefweb-cyan--bg: rgba(86, 201, 247, 0.2);--cd-reliefweb-orange--alert: #eb8705;--cd-reliefweb-pink: rgba(246, 92, 81, 0.2);--cd-reliefweb-grey--disable: rgba(230, 236, 239, 0.5);--cd-ocha-blue: #1f69b3;--cd-blue--dark: #144372;--cd-blue--bright: #82b5e9;--cd-blue--light: #d4e5f7;--cd-highlight-red: #e56a54;--cd-contrast-red: #e00000;--cd-white: #fff;--cd-grey--light: #f2f2f2;--cd-grey--mid: #595959;--cd-grey--dark: #4a4a4a;--cd-default-text-color: var(--cd-grey--dark);--cd-black: #000;--cd-blue-grey: #e6ecf1;--cd-blue-grey--dark: #d3dde5;--cd-blue-grey--light: #ebf0f4;--cd-rgb-ocha-blue: 2, 108, 182;--cd-rgb-grey--mid: 89, 89, 89;--cd-rgb-grey--dark: 74, 74, 74;--cd-rgb-highlight-red: 229, 106, 84;--cd-rgb-blue-grey--dark: 211, 221, 229;--cd-max-content-width: 820px;--cd-max-body-width: 1400px;--cd-max-width: 1220px;--cd-container-padding: 0.75rem;--cd-container-padding-tablet: 1.5rem;--cd-container-padding-xlarge: 2.5rem;--cd-flow-space: 1rem;--cd-bumper-space: 1rem;--cd-footer-row-number: 5;--cd-red: #cd3a1f;--cd-red--light: #f8d8d3;--cd-orange: #db7b18;--cd-orange--light: #fae6d1;--cd-yellow: #d5de26;--cd-yellow--light: #f7f8d3;--cd-green: #7fb92f;--cd-green--light: #e8f5d6;--cd-font-size--tiny: 0.75rem;--cd-font-size--small: 0.875rem;--cd-font-size--base: 1.125rem;--cd-font-size--medium: 1.375rem;--cd-font-size--large: 1.5rem;--cd-font-size--2xbase: 1.875rem;--cd-font-size--2xmedium: 2.375rem;--cd-font-size--2xlarge: 2.875rem;--cd-font: helvetica, arial, sans-serif;--cd-font--system: system-ui;--cd-font--noto: "Noto Sans", sans-serif;--cd-font--noto-kufi: "Noto Kufi Arabic", sans-serif;--cd-font--roboto: "Roboto", helvetica, arial, sans-serif;--cd-font--roboto-condensed: "Roboto Condensed", helvetica, arial, sans-serif;--cd-font--roboto-slab: "Roboto Slab", helvetica, arial, sans-serif}@supports(display: grid){@media(min-width: 768px){.cd-layout-container{grid-template-rows:151px auto 1fr auto}}}@media(min-width: 768px){.cd-layout-container .cd-layout-content-wrapper{display:flex;flex-wrap:wrap}}@media(min-width: 768px){.cd-layout-content{flex-basis:0;flex-grow:999}}.cd-global-header__dropdown{background:var(--cd-reliefweb-brand-blue--dark)}.cd-global-header button[aria-expanded=true]::before{border-color:transparent transparent var(--cd-reliefweb-brand-blue--dark)}@media(max-width: 767px){.cd-global-header button[aria-expanded] span[class*=__btn-label]{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}.cd-header button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header{background:var(--cd-reliefweb-brand-blue--dark);background-image:linear-gradient(-180deg, var(--cd-reliefweb-brand-blue--dark) 67%, #04415a 97%)}@supports(display: grid){.cd-site-header__inner{grid-template-columns:52px 1fr}@media(min-width: 768px){.cd-site-header__inner{grid-template-columns:186px 1fr}}}.cd-language-switcher__btn:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-user-menu__dropdown li a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-site-logo{width:52px}.cd-site-logo:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}@media(max-width: 767px){.cd-site-logo{background:url("../img/logos/rw-logo-mobile.svg") center no-repeat;background:linear-gradient(transparent, transparent),url("../img/logos/rw-logo-mobile.svg") center no-repeat}}@media(min-width: 768px){.cd-site-logo{width:140px}}.menu--main button[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red--dark)}.cd-nav__btn[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red--dark)}.cd-nav__btn[aria-expanded=true]::before{background:var(--cd-reliefweb-brand-red--dark)}@media(max-width: 1023px){.cd-site-header__nav-holder .cd-nav>ul>li>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>button.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>button.is-active::before{background:rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.6)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}}@media(min-width: 1024px){.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail button::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a:focus::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button:focus::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul a.is-active,.cd-site-header__nav-holder .cd-nav>.menu>li>ul button.is-active{border-left:3px solid var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul>li.menu-item--active-trail .is-active{border-left:3px solid var(--cd-reliefweb-brand-red--dark)}}.cd-ocha-dropdown__link a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-search__btn{color:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn svg{fill:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn:hover,.cd-search__btn:focus{color:#04415a}.cd-search__btn:hover svg,.cd-search__btn:focus svg{fill:#04415a}.cd-search__btn:focus{color:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn:focus svg{fill:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn[aria-expanded=true]{color:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn[aria-expanded=true] svg{fill:var(--cd-reliefweb-brand-red--dark)}.cd-search__submit:focus{background-color:var(--cd-reliefweb-brand-red--dark)}.cd-user-menu--no-language-switcher li:last-child a,.cd-user-menu--no-language-switcher li:last-child button{padding-right:0}.cd-user-menu--no-language-switcher li:last-child a::after,.cd-user-menu--no-language-switcher li:last-child button::after{content:none}.cd-user-menu__item:focus,.cd-global-header .menu>li a:focus,.cd-global-header .menu>li button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button{padding-right:0}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a::after,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button::after{content:none}@media(max-width: 767px){.cd-global-header__user-menu a svg+span{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}[dir=ltr] .admin-menu__btn svg+span{margin-left:10px}[dir=rtl] .admin-menu__btn svg+span{margin-right:10px}.admin-menu__btn .cd-icon:not(.cd-icon--arrow-down){display:inline-block;width:14px;height:14px;vertical-align:middle;fill:var(--cd-white)}.cd-footer{background:var(--cd-reliefweb-brand-blue--dark)}.cd-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-footer-copyright{display:block;margin-top:0;text-align:right;color:#fff;font-size:12px;font-weight:lighter}.cd-footer-copyright p{margin:0}.cd-footer-copyright a{display:inline-block;overflow:hidden;width:140px;height:60px;margin:0 0 -4px 0;padding:0 0 0 140px;background:url(../img/logos/rw-logo-sprite.png) 0 -60px no-repeat;background:rgba(0,0,0,0) url(../img/logos/rw-logo-sprite.svg) 0 -60px no-repeat}.cd-footer-copyright a:hover,.cd-footer-copyright a:active,.cd-footer-copyright a:focus{opacity:.8}@media all and (max-width: 1023px){.cd-footer-copyright{width:100%;text-align:center}}.cd-soft-footer{background:rgba(var(--cd-rgb-ocha-blue), 0.9)}.cd-soft-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}a{color:var(--cd-reliefweb-brand-blue--dark)}a:hover,a:focus{color:var(--cd-reliefweb-brand-blue--dark)}h1,h2{margin:0 0 24px 0;letter-spacing:.5px;font-size:24px;font-weight:bold;line-height:1.3}@media screen and (min-width: 480px){h1{font-size:var(--cd-font-size--2xbase)}h2{font-size:var(--cd-font-size--large)}}h3{margin:0 0 16px 0;letter-spacing:.5px;font-size:20px;font-weight:bold;line-height:1.3}h4{margin:0 0 16px 0;letter-spacing:.5px;font-size:18px;font-weight:bold;line-height:1.3}h5{margin:0 0 16px 0;letter-spacing:.5px;font-size:17px;font-weight:bold;font-style:italic}h6{margin:0 0 16px 0;letter-spacing:.5px;font-size:16px;font-weight:bold}.rw-article__content *+h3,.rw-article__content *+h4,.rw-article__content *+h5,.rw-article__content *+h6{margin-top:16px}@media all and (max-width: 479px){#main h2{font-size:24px}}p{margin:1rem 0;line-height:1.6}p:first-child{margin-top:0}p:last-child{margin-bottom:0}input[type=search]{-moz-appearance:none;-webkit-appearance:none;appearance:none}input::-webkit-search-decoration{-webkit-appearance:none}input:-ms-input-placeholder{opacity:.7;color:inherit;font-style:italic}input::-moz-placeholder{opacity:.7;color:inherit;font-style:italic}input::placeholder{opacity:.7;color:inherit;font-style:italic}select{max-width:100%}select:not([multitple]){-moz-appearance:menulist-button;-webkit-appearance:menulist-button}fieldset{min-inline-size:auto}table{width:100%;border-collapse:collapse}table caption{margin:12px 0;font-weight:bold}table th,table td{padding:8px;border:1px solid var(--cd-reliefweb-brand-grey--light)}table th{border-left-color:#fff;background:var(--cd-reliefweb-brand-grey--light)}table thead th{border-left-color:#fff}th.field-label>h4.label{margin:0}table thead th:first-child{border-left-color:var(--cd-reliefweb-brand-grey--light)}table tbody th{border-top-color:#fff}table tbody th:first-child{border-top-color:var(--cd-reliefweb-brand-grey--light)}code{padding:2px;background:var(--cd-reliefweb-brand-grey--light);font-family:monospace}
+@import"https://fonts.googleapis.com/css2?family=Noto+Sans:wght@400%3B500%3B700&display=swap";@import"https://fonts.googleapis.com/css?family=Roboto:ital,wght@0,300%3B0,400%3B0,500%3B0,700%3B0,900%3B1,400%3B1,700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Condensed:wght@400%3B700&display=swap";@import"https://fonts.googleapis.com/css2?family=Roboto+Slab:wght@400%3B700&display=swap";:root{--cd-reliefweb-brand-blue: #0988bb;--cd-reliefweb-brand-red: #f65c51;--cd-reliefweb-brand-blue--dark: #055372;--cd-reliefweb-brand-red--dark: #eb1405;--cd-reliefweb-brand-grey--dark: #2e3436;--cd-reliefweb-brand-grey--mid: #4d5254;--cd-reliefweb-brand-grey--light: #e6ecef;--cd-rgb-reliefweb-brand-blue: 9, 136, 187;--cd-rgb-reliefweb-brand-red: 246, 92, 81;--cd-rgb-reliefweb-brand-blue--dark: 4, 82, 112;--cd-rgb-reliefweb-brand-red--dark: 235, 20, 5;--cd-rgb-reliefweb-brand-grey--dark: 46, 52, 54;--cd-rgb-reliefweb-brand-grey--light: 230, 236, 239;--cd-reliefweb-grey--light: #d9d9d9;--cd-reliefweb-grey--light--bg: rgba(217, 217, 217, 0.2);--cd-reliefweb-orange: #f49e2c;--cd-reliefweb-orange--bg: rgba(244, 158, 44, 0.2);--cd-reliefweb-blue: #076d96;--cd-reliefweb-blue--bg: rgba(7, 109, 150, 0.2);--cd-reliefweb-green: #88bb09;--cd-reliefweb-green--bg: rgba(136, 187, 9, 0.2);--cd-reliefweb-red: #da190b;--cd-reliefweb-red--bg: rgba(218, 25, 11, 0.2);--cd-reliefweb-purple: #9509bb;--cd-reliefweb-purple--bg: rgba(149, 9, 187, 0.2);--cd-reliefweb-grey: #4b4b4b;--cd-reliefweb-grey--bg: rgba(75, 75, 75, 0.2);--cd-reliefweb-brown: #8f5507;--cd-reliefweb-brown--bg: rgba(143, 85, 7, 0.2);--cd-reliefweb-yellow: #f5cb2f;--cd-reliefweb-yellow--bg: rgba(245, 203, 47, 0.2);--cd-reliefweb-cyan: #56c9f7;--cd-reliefweb-cyan--bg: rgba(86, 201, 247, 0.2);--cd-reliefweb-orange--alert: #eb8705;--cd-reliefweb-pink: rgba(246, 92, 81, 0.2);--cd-reliefweb-grey--disable: rgba(230, 236, 239, 0.5);--cd-ocha-blue: #1f69b3;--cd-blue--dark: #144372;--cd-blue--bright: #82b5e9;--cd-blue--light: #d4e5f7;--cd-highlight-red: #e56a54;--cd-contrast-red: #e00000;--cd-white: #fff;--cd-grey--light: #f2f2f2;--cd-grey--mid: #595959;--cd-grey--dark: #4a4a4a;--cd-default-text-color: var(--cd-grey--dark);--cd-black: #000;--cd-blue-grey: #e6ecf1;--cd-blue-grey--dark: #d3dde5;--cd-blue-grey--light: #ebf0f4;--cd-rgb-ocha-blue: 2, 108, 182;--cd-rgb-grey--mid: 89, 89, 89;--cd-rgb-grey--dark: 74, 74, 74;--cd-rgb-highlight-red: 229, 106, 84;--cd-rgb-blue-grey--dark: 211, 221, 229;--cd-max-content-width: 820px;--cd-max-body-width: 1400px;--cd-max-width: 1220px;--cd-container-padding: 0.75rem;--cd-container-padding-tablet: 1.5rem;--cd-container-padding-xlarge: 2.5rem;--cd-flow-space: 1rem;--cd-bumper-space: 1rem;--cd-footer-row-number: 5;--cd-red: #cd3a1f;--cd-red--light: #f8d8d3;--cd-orange: #db7b18;--cd-orange--light: #fae6d1;--cd-yellow: #d5de26;--cd-yellow--light: #f7f8d3;--cd-green: #7fb92f;--cd-green--light: #e8f5d6;--cd-font-size--tiny: 0.75rem;--cd-font-size--small: 0.875rem;--cd-font-size--base: 1.125rem;--cd-font-size--medium: 1.375rem;--cd-font-size--large: 1.5rem;--cd-font-size--2xbase: 1.875rem;--cd-font-size--2xmedium: 2.375rem;--cd-font-size--2xlarge: 2.875rem;--cd-font: helvetica, arial, sans-serif;--cd-font--system: system-ui;--cd-font--noto: "Noto Sans", sans-serif;--cd-font--noto-kufi: "Noto Kufi Arabic", sans-serif;--cd-font--roboto: "Roboto", helvetica, arial, sans-serif;--cd-font--roboto-condensed: "Roboto Condensed", helvetica, arial, sans-serif;--cd-font--roboto-slab: "Roboto Slab", helvetica, arial, sans-serif}@supports(display: grid){@media(min-width: 768px){.cd-layout-container{grid-template-rows:151px auto 1fr auto}}}@media(min-width: 768px){.cd-layout-container .cd-layout-content-wrapper{display:flex;flex-wrap:wrap}}@media(min-width: 768px){.cd-layout-content{flex-basis:0;flex-grow:999}}.cd-global-header__dropdown{background:var(--cd-reliefweb-brand-blue--dark)}.cd-global-header button[aria-expanded=true]::before{border-color:transparent transparent var(--cd-reliefweb-brand-blue--dark)}@media(max-width: 767px){.cd-global-header button[aria-expanded] span[class*=__btn-label]{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}.cd-header button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header{background:var(--cd-reliefweb-brand-blue--dark);background-image:linear-gradient(-180deg, var(--cd-reliefweb-brand-blue--dark) 67%, #04415a 97%)}@supports(display: grid){.cd-site-header__inner{grid-template-columns:52px 1fr}@media(min-width: 768px){.cd-site-header__inner{grid-template-columns:186px 1fr}}}.cd-language-switcher__btn:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-user-menu__dropdown li a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-site-logo{width:52px}.cd-site-logo:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}@media(max-width: 767px){.cd-site-logo{background:url("../img/logos/rw-logo-mobile.svg") center no-repeat;background:linear-gradient(transparent, transparent),url("../img/logos/rw-logo-mobile.svg") center no-repeat}}@media(min-width: 768px){.cd-site-logo{width:140px}}.menu--main button[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red--dark)}.cd-nav__btn[aria-expanded] .cd-icon--arrow-down{fill:var(--cd-reliefweb-brand-red--dark)}.cd-nav__btn[aria-expanded=true]::before{background:var(--cd-reliefweb-brand-red--dark)}@media(max-width: 1023px){.cd-site-header__nav-holder .cd-nav>ul>li>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--collapsed>button.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--expanded>button.is-active::before{background:rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.2)}.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button::before{background:rgba(var(--cd-rgb-reliefweb-brand-red--dark), 0.6)}.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail a.is-active::before,.cd-site-header__nav-holder .cd-nav>ul>li>ul>li.menu-item--active-trail button.is-active::before{background:var(--cd-reliefweb-brand-red--dark)}}@media(min-width: 1024px){.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail a::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item.menu-item--active-trail button::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item>a:focus::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button.is-active::before,.cd-site-header__nav-holder .cd-nav>.menu>.menu-item button:focus::before{background:var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul a.is-active,.cd-site-header__nav-holder .cd-nav>.menu>li>ul button.is-active{border-left:3px solid var(--cd-reliefweb-brand-red--dark)}.cd-site-header__nav-holder .cd-nav>.menu>li>ul>li.menu-item--active-trail .is-active{border-left:3px solid var(--cd-reliefweb-brand-red--dark)}}.cd-ocha-dropdown__link a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-search__btn{color:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn svg{fill:var(--cd-reliefweb-brand-blue--dark)}.cd-search__btn:hover,.cd-search__btn:focus{color:#04415a}.cd-search__btn:hover svg,.cd-search__btn:focus svg{fill:#04415a}.cd-search__btn:focus{color:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn:focus svg{fill:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn[aria-expanded=true]{color:var(--cd-reliefweb-brand-red--dark)}.cd-search__btn[aria-expanded=true] svg{fill:var(--cd-reliefweb-brand-red--dark)}.cd-search__submit:focus{background-color:var(--cd-reliefweb-brand-red--dark)}.cd-user-menu--no-language-switcher li:last-child a,.cd-user-menu--no-language-switcher li:last-child button{padding-right:0}.cd-user-menu--no-language-switcher li:last-child a::after,.cd-user-menu--no-language-switcher li:last-child button::after{content:none}.cd-user-menu__item:focus,.cd-global-header .menu>li a:focus,.cd-global-header .menu>li button:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button{padding-right:0}.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child a::after,.cd-global-header__user-menu+.cd-global-header__user-menu li:last-child button::after{content:none}@media(max-width: 767px){.cd-global-header__user-menu a svg+span{position:absolute !important;overflow:hidden;clip:rect(1px, 1px, 1px, 1px);width:1px;height:1px;word-wrap:normal}}[dir=ltr] .admin-menu__btn svg+span{margin-left:10px}[dir=rtl] .admin-menu__btn svg+span{margin-right:10px}.admin-menu__btn .cd-icon:not(.cd-icon--arrow-down){display:inline-block;width:14px;height:14px;vertical-align:middle;fill:var(--cd-white)}.cd-footer{background:var(--cd-reliefweb-brand-blue--dark)}.cd-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}.cd-footer-copyright{display:block;margin-top:0;text-align:right;color:#fff;font-size:12px;font-weight:lighter}.cd-footer-copyright p{margin:0}.cd-footer-copyright a{display:inline-block;overflow:hidden;width:140px;height:60px;margin:0 0 -4px 0;padding:0 0 0 140px;background:url("../img/logos/rw-logo-sprite.png") 0 -60px no-repeat;background:rgba(0,0,0,0) url("../img/logos/rw-logo-sprite.svg") 0 -60px no-repeat}.cd-footer-copyright a:hover,.cd-footer-copyright a:active,.cd-footer-copyright a:focus{opacity:.8}@media all and (max-width: 1023px){.cd-footer-copyright{width:100%;text-align:center}}.cd-soft-footer{background:rgba(var(--cd-rgb-ocha-blue), 0.9)}.cd-soft-footer a:focus{outline:3px solid var(--cd-reliefweb-brand-blue)}a{color:var(--cd-reliefweb-brand-blue--dark)}a:hover,a:focus{color:var(--cd-reliefweb-brand-blue--dark)}h1,h2{margin:0 0 24px 0;letter-spacing:.5px;font-size:24px;font-weight:bold;line-height:1.3}@media screen and (min-width: 480px){h1{font-size:var(--cd-font-size--2xbase)}h2{font-size:var(--cd-font-size--large)}}h3{margin:0 0 16px 0;letter-spacing:.5px;font-size:20px;font-weight:bold;line-height:1.3}h4{margin:0 0 16px 0;letter-spacing:.5px;font-size:18px;font-weight:bold;line-height:1.3}h5{margin:0 0 16px 0;letter-spacing:.5px;font-size:17px;font-weight:bold;font-style:italic}h6{margin:0 0 16px 0;letter-spacing:.5px;font-size:16px;font-weight:bold}.rw-article__content *+h3,.rw-article__content *+h4,.rw-article__content *+h5,.rw-article__content *+h6{margin-top:16px}@media all and (max-width: 479px){#main h2{font-size:24px}}p{margin:1rem 0;line-height:1.6}p:first-child{margin-top:0}p:last-child{margin-bottom:0}input[type=search]{-moz-appearance:none;-webkit-appearance:none;appearance:none}input::-webkit-search-decoration{-webkit-appearance:none}input:-ms-input-placeholder{opacity:.7;color:inherit;font-style:italic}input::-moz-placeholder{opacity:.7;color:inherit;font-style:italic}input::placeholder{opacity:.7;color:inherit;font-style:italic}select{max-width:100%}select:not([multitple]){-moz-appearance:menulist-button;-webkit-appearance:menulist-button}fieldset{min-inline-size:auto}table{width:100%;border-collapse:collapse}table caption{margin:12px 0;font-weight:bold}table th,table td{padding:8px;border:1px solid var(--cd-reliefweb-brand-grey--light)}table th{border-left-color:#fff;background:var(--cd-reliefweb-brand-grey--light)}table thead th{border-left-color:#fff}th.field-label>h4.label{margin:0}table thead th:first-child{border-left-color:var(--cd-reliefweb-brand-grey--light)}table tbody th{border-top-color:#fff}table tbody th:first-child{border-top-color:var(--cd-reliefweb-brand-grey--light)}code{padding:2px;background:var(--cd-reliefweb-brand-grey--light);font-family:monospace}
diff --git a/html/themes/custom/common_design_subtheme/sass/cd/cd-footer/_cd-footer.scss b/html/themes/custom/common_design_subtheme/sass/cd/cd-footer/_cd-footer.scss
index 750fb8bbe..8663153c7 100644
--- a/html/themes/custom/common_design_subtheme/sass/cd/cd-footer/_cd-footer.scss
+++ b/html/themes/custom/common_design_subtheme/sass/cd/cd-footer/_cd-footer.scss
@@ -36,8 +36,8 @@
   margin: 0 0 -4px 0;
   /* The padding combined with the overflow: hidden, hides the text. */
   padding: 0 0 0 140px;
-  background: url(../img/logos/rw-logo-sprite.png) 0 -60px no-repeat;
-  background: rgba(0, 0, 0, 0) url(../img/logos/rw-logo-sprite.svg) 0 -60px no-repeat;
+  background: url("../img/logos/rw-logo-sprite.png") 0 -60px no-repeat;
+  background: rgba(0, 0, 0, 0) url("../img/logos/rw-logo-sprite.svg") 0 -60px no-repeat;
 }
 .cd-footer-copyright a:hover,
 .cd-footer-copyright a:active,

From c9efefd5063ac7c03ab453128421bbd3870e422e Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 1 Mar 2022 14:36:14 +0100
Subject: [PATCH 546/720] keep es-lint as a dependency

---
 .../common_design_subtheme/package-lock.json  | 134 +++++-------------
 .../common_design_subtheme/package.json       |   2 +-
 2 files changed, 37 insertions(+), 99 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/package-lock.json b/html/themes/custom/common_design_subtheme/package-lock.json
index 904ac4d1f..b8c12f3d1 100644
--- a/html/themes/custom/common_design_subtheme/package-lock.json
+++ b/html/themes/custom/common_design_subtheme/package-lock.json
@@ -1153,7 +1153,6 @@
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
       "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
-      "dev": true,
       "requires": {
         "ajv": "^6.12.4",
         "debug": "^4.1.1",
@@ -1170,7 +1169,6 @@
           "version": "6.12.6",
           "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
           "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
             "fast-json-stable-stringify": "^2.0.0",
@@ -1182,7 +1180,6 @@
           "version": "13.11.0",
           "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
           "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
-          "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
           }
@@ -1190,20 +1187,17 @@
         "ignore": {
           "version": "4.0.6",
           "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-          "dev": true
+          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
         },
         "json-schema-traverse": {
           "version": "0.4.1",
           "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
         },
         "type-fest": {
           "version": "0.20.2",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-          "dev": true
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="
         }
       }
     },
@@ -1226,7 +1220,6 @@
       "version": "0.5.0",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
       "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
-      "dev": true,
       "requires": {
         "@humanwhocodes/object-schema": "^1.2.0",
         "debug": "^4.1.1",
@@ -1236,8 +1229,7 @@
     "@humanwhocodes/object-schema": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz",
-      "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==",
-      "dev": true
+      "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w=="
     },
     "@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
@@ -1695,8 +1687,7 @@
     "acorn": {
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
-      "dev": true
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
     },
     "acorn-globals": {
       "version": "6.0.0",
@@ -1711,8 +1702,7 @@
     "acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
-      "dev": true
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="
     },
     "acorn-walk": {
       "version": "7.2.0",
@@ -1743,8 +1733,7 @@
     "ansi-colors": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
-      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
-      "dev": true
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="
     },
     "ansi-escapes": {
       "version": "4.3.2",
@@ -1789,7 +1778,6 @@
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
       "requires": {
         "sprintf-js": "~1.0.2"
       }
@@ -2929,7 +2917,6 @@
       "version": "4.3.2",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
       "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
-      "dev": true,
       "requires": {
         "ms": "2.1.2"
       }
@@ -2970,8 +2957,7 @@
     "deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
     },
     "deepmerge": {
       "version": "4.2.2",
@@ -3070,7 +3056,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
       "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
       "requires": {
         "esutils": "^2.0.2"
       }
@@ -3177,7 +3162,6 @@
       "version": "2.3.6",
       "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
       "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-      "dev": true,
       "requires": {
         "ansi-colors": "^4.1.1"
       }
@@ -3314,7 +3298,6 @@
       "version": "7.32.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
       "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
-      "dev": true,
       "requires": {
         "@babel/code-frame": "7.12.11",
         "@eslint/eslintrc": "^0.4.3",
@@ -3362,7 +3345,6 @@
           "version": "7.12.11",
           "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
           "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
-          "dev": true,
           "requires": {
             "@babel/highlight": "^7.10.4"
           }
@@ -3371,7 +3353,6 @@
           "version": "6.12.6",
           "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
           "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-          "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
             "fast-json-stable-stringify": "^2.0.0",
@@ -3383,7 +3364,6 @@
           "version": "7.0.3",
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
           "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-          "dev": true,
           "requires": {
             "path-key": "^3.1.0",
             "shebang-command": "^2.0.0",
@@ -3393,14 +3373,12 @@
         "escape-string-regexp": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-          "dev": true
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
         },
         "globals": {
           "version": "13.11.0",
           "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
           "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
-          "dev": true,
           "requires": {
             "type-fest": "^0.20.2"
           }
@@ -3408,26 +3386,22 @@
         "ignore": {
           "version": "4.0.6",
           "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-          "dev": true
+          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="
         },
         "json-schema-traverse": {
           "version": "0.4.1",
           "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
+          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
         },
         "path-key": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-          "dev": true
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
         },
         "semver": {
           "version": "7.3.5",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
           "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
-          "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
           }
@@ -3436,7 +3410,6 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
           "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-          "dev": true,
           "requires": {
             "shebang-regex": "^3.0.0"
           }
@@ -3444,20 +3417,17 @@
         "shebang-regex": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-          "dev": true
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
         },
         "type-fest": {
           "version": "0.20.2",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-          "dev": true
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="
         },
         "which": {
           "version": "2.0.2",
           "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
           "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-          "dev": true,
           "requires": {
             "isexe": "^2.0.0"
           }
@@ -3468,7 +3438,6 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "dev": true,
       "requires": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
@@ -3478,7 +3447,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
       "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
-      "dev": true,
       "requires": {
         "eslint-visitor-keys": "^1.1.0"
       },
@@ -3486,22 +3454,19 @@
         "eslint-visitor-keys": {
           "version": "1.3.0",
           "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-          "dev": true
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="
         }
       }
     },
     "eslint-visitor-keys": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
-      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
-      "dev": true
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="
     },
     "espree": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
       "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
-      "dev": true,
       "requires": {
         "acorn": "^7.4.0",
         "acorn-jsx": "^5.3.1",
@@ -3511,22 +3476,19 @@
         "eslint-visitor-keys": {
           "version": "1.3.0",
           "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-          "dev": true
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="
         }
       }
     },
     "esprima": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
     },
     "esquery": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
       "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
-      "dev": true,
       "requires": {
         "estraverse": "^5.1.0"
       },
@@ -3534,8 +3496,7 @@
         "estraverse": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-          "dev": true
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="
         }
       }
     },
@@ -3543,7 +3504,6 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
-      "dev": true,
       "requires": {
         "estraverse": "^5.2.0"
       },
@@ -3551,22 +3511,19 @@
         "estraverse": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
-          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
-          "dev": true
+          "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="
         }
       }
     },
     "estraverse": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="
     },
     "esutils": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
     },
     "exec-sh": {
       "version": "0.3.6",
@@ -3823,14 +3780,12 @@
     "fast-json-stable-stringify": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
     },
     "fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
     },
     "fast-safe-stringify": {
       "version": "2.1.1",
@@ -4044,8 +3999,7 @@
     "functional-red-black-tree": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
     },
     "gensync": {
       "version": "1.0.0-beta.2",
@@ -5707,7 +5661,6 @@
       "version": "3.14.1",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
       "requires": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -5787,8 +5740,7 @@
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "dev": true
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
     },
     "json-stringify-safe": {
       "version": "5.0.1",
@@ -5887,7 +5839,6 @@
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
       "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
       "requires": {
         "prelude-ls": "^1.2.1",
         "type-check": "~0.4.0"
@@ -5919,8 +5870,7 @@
     "lodash.clonedeep": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
-      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
-      "dev": true
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
     },
     "lodash.debounce": {
       "version": "4.0.8",
@@ -5951,8 +5901,7 @@
     "lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
     },
     "lodash.sortby": {
       "version": "4.7.0",
@@ -6255,8 +6204,7 @@
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
     },
     "nice-try": {
       "version": "1.0.5",
@@ -6548,7 +6496,6 @@
       "version": "0.9.1",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
       "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
-      "dev": true,
       "requires": {
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
@@ -6967,8 +6914,7 @@
     "prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
-      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
-      "dev": true
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="
     },
     "pretty-format": {
       "version": "26.6.2",
@@ -7002,8 +6948,7 @@
     "progress": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-      "dev": true
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
     },
     "prompts": {
       "version": "2.4.1",
@@ -7225,8 +7170,7 @@
     "regexpp": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
-      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
-      "dev": true
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="
     },
     "regexpu-core": {
       "version": "4.7.1",
@@ -8040,8 +7984,7 @@
     "sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
     },
     "sshpk": {
       "version": "1.16.1",
@@ -8204,8 +8147,7 @@
     "strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "dev": true
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
     },
     "style-search": {
       "version": "0.1.0",
@@ -8701,7 +8643,6 @@
       "version": "6.7.1",
       "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
       "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
-      "dev": true,
       "requires": {
         "ajv": "^8.0.1",
         "lodash.clonedeep": "^4.5.0",
@@ -8766,8 +8707,7 @@
     "text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
     },
     "throat": {
       "version": "5.0.0",
@@ -8922,7 +8862,6 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
       "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
-      "dev": true,
       "requires": {
         "prelude-ls": "^1.2.1"
       }
@@ -9431,8 +9370,7 @@
     "word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
-      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
-      "dev": true
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="
     },
     "wrap-ansi": {
       "version": "7.0.0",
diff --git a/html/themes/custom/common_design_subtheme/package.json b/html/themes/custom/common_design_subtheme/package.json
index b2b306167..7240d0c89 100644
--- a/html/themes/custom/common_design_subtheme/package.json
+++ b/html/themes/custom/common_design_subtheme/package.json
@@ -25,6 +25,7 @@
   },
   "dependencies": {
     "autoprefixer": "^10.2.5",
+    "eslint": "^7.23.0",
     "postcss": "^8.4.4",
     "postcss-cli": "^8.3.1",
     "sass": "^1.32.8",
@@ -42,7 +43,6 @@
     "babel-jest": "^26.6.3",
     "core-js": "^3.20.0",
     "css-what": ">=5.0.1",
-    "eslint": "^7.23.0",
     "jest": "^26.6.3",
     "jest-puppeteer": "^5.0.3",
     "json-schema": ">=0.4.0",

From f82c56002b947665f5c9c3df6d1ce95bbd1afe84 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 2 Mar 2022 05:11:13 +0000
Subject: [PATCH 547/720] [RW-238] Improve handling of text fields when
 importing jobs and add more tests

---
 .../src/Command/ReliefwebImportCommand.php    | 31 +++----
 .../src/Unit/ReliefwebImporterStringTest.php  | 88 ++++++++++++++++++-
 .../Unit/Stub/ReliefwebImportCommandStub.php  |  4 +-
 .../src/Helpers/HtmlSanitizer.php             |  6 +-
 4 files changed, 109 insertions(+), 20 deletions(-)

diff --git a/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php b/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php
index 1a530460c..715379227 100644
--- a/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php
+++ b/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php
@@ -543,7 +543,7 @@ protected function validateSource($source, $source_id) {
    */
   protected function validateBody($data) {
     // Clean the body field.
-    $body = $this->sanitizeText('body', $data, 'markdown');
+    $body = $this->sanitizeText('body', $data);
 
     // Ensure the body field size is reasonable.
     $length = mb_strlen($body);
@@ -564,7 +564,7 @@ protected function validateBody($data) {
    */
   protected function validateHowToApply($data) {
     // Clean the field.
-    $field_how_to_apply = $this->sanitizeText('field_how_to_apply', $data, 'markdown', 3);
+    $field_how_to_apply = $this->sanitizeText('field_how_to_apply', $data, 3);
 
     // Ensure the field size is reasonable.
     $length = mb_strlen($field_how_to_apply);
@@ -636,15 +636,13 @@ protected function validateJobClosingDate($data) {
    *   Field name.
    * @param string $text
    *   Field text content.
-   * @param string $format
-   *   Format to which conver the text if not already HTML.
    * @param int $max_heading_level
    *   Maximum heading level.
    *
    * @return string
    *   Sanitized content.
    */
-  protected function sanitizeText($field, $text, $format = 'plain_text', $max_heading_level = 2) {
+  protected function sanitizeText($field, $text, $max_heading_level = 2) {
     if (!is_string($text)) {
       return '';
     }
@@ -670,6 +668,10 @@ protected function sanitizeText($field, $text, $format = 'plain_text', $max_head
       $end = mb_strpos($text, ']]>');
       $text = mb_substr($text, 9, $end !== FALSE ? $end - 9 : NULL);
     }
+    elseif (mb_stripos($text, '&lt;![CDATA[') === 0) {
+      $end = mb_strpos($text, ']]&gt;');
+      $text = mb_substr($text, 12, $end !== FALSE ? $end - 12 : NULL);
+    }
 
     // Check if the content contains some non encoded html tags, in which case
     // we will assume that the text is non encoded html/markdown. For that we
@@ -678,25 +680,24 @@ protected function sanitizeText($field, $text, $format = 'plain_text', $max_head
       $text = html_entity_decode($text, ENT_QUOTES, 'UTF-8');
     }
 
-    // Convert the text to HTML, source might be markdown.
-    if (function_exists('check_markup')) {
-      $text = check_markup($text, $format)->__toString();
-    }
-
-    // We then sanitize the HTML string.
-    $text = HtmlSanitizer::sanitize($text, FALSE, $max_heading_level - 1);
+    // We assume the input is in markdow as recommended in the specificiations.
+    // We convert it to HTML and sanitize the output to remove any unsupported
+    // HTML markup.
+    $html = HtmlSanitizer::sanitizeFromMarkdown($text, FALSE, $max_heading_level - 1);
 
     // Remove embedded content.
-    $text = TextHelper::stripEmbeddedContent($text);
+    $html = TextHelper::stripEmbeddedContent($html);
 
-    // Finally we convert it to markdown.
+    // Finally we convert the HTML to markdown which is our storage format.
     $converter = new HtmlConverter();
     $converter->getConfig()->setOption('strip_tags', TRUE);
     $converter->getConfig()->setOption('use_autolinks', FALSE);
     $converter->getConfig()->setOption('header_style', 'atx');
     $converter->getConfig()->setOption('strip_placeholder_links', TRUE);
+    $converter->getConfig()->setOption('italic_style', '*');
+    $converter->getConfig()->setOption('bold_style', '**');
 
-    $text = trim($converter->convert($text));
+    $text = trim($converter->convert($html));
 
     return $text;
   }
diff --git a/html/modules/custom/reliefweb_import/tests/src/Unit/ReliefwebImporterStringTest.php b/html/modules/custom/reliefweb_import/tests/src/Unit/ReliefwebImporterStringTest.php
index 2f6c99e2c..725da3a28 100644
--- a/html/modules/custom/reliefweb_import/tests/src/Unit/ReliefwebImporterStringTest.php
+++ b/html/modules/custom/reliefweb_import/tests/src/Unit/ReliefwebImporterStringTest.php
@@ -2,6 +2,8 @@
 
 namespace Drupal\Tests\reliefweb_import\Unit;
 
+use Drupal\Component\Utility\Html;
+
 /**
  * Tests reliefweb importer.
  *
@@ -83,13 +85,97 @@ public function testsanitizeTextClosingTag() {
   }
 
   /**
-   * Tests for sanize text.
+   * Tests for sanize text wrapped in CDATA.
    */
   public function testsanitizeTextCdata() {
     $test_string = $this->random->sentences(300);
     $this->assertEquals($test_string, $this->reliefwebImporter->sanitizeText('body', '<![CDATA[' . $test_string . ']]>'));
   }
 
+  /**
+   * Tests for sanize markdown text.
+   */
+  public function testsanitizeMarkdown() {
+    $test_string = "This is a test.\n\nWith a bith of __bold__ text and a [link](https://example.test)";
+    $expected = "This is a test.\n\nWith a bith of **bold** text and a [link](https://example.test)";
+    $this->assertEquals($expected, $this->reliefwebImporter->sanitizeText('body', $test_string));
+  }
+
+  /**
+   * Tests for sanize markdown text wrapped in CDATA.
+   */
+  public function testsanitizeMarkdownWithCdata() {
+    $test_string = "This is a test.\n\nWith a bith of __bold__ text and a [link](https://example.test)";
+    $expected = "This is a test.\n\nWith a bith of **bold** text and a [link](https://example.test)";
+    $this->assertEquals($expected, $this->reliefwebImporter->sanitizeText('body', '<![CDATA[' . $test_string . ']]>'));
+  }
+
+  /**
+   * Tests for sanize markdown text wrapped in encoded CDATA.
+   */
+  public function testsanitizeMarkdownWithEncodedCdata() {
+    $test_string = "This is a test.\n\nWith a bith of __bold__ text and a [link](https://example.test)";
+    $expected = "This is a test.\n\nWith a bith of **bold** text and a [link](https://example.test)";
+    $this->assertEquals($expected, $this->reliefwebImporter->sanitizeText('body', '&lt;![CDATA[' . $test_string . ']]&gt;'));
+  }
+
+  /**
+   * Tests for sanize text with raw HTML.
+   */
+  public function testsanitizeHtml() {
+    $test_string = '<p>This is a test.</p><p style="font-size: 16px;">With a bith of <strong>bold</strong> text and a <a unrecognized="attribute" href="https://example.test">link</a></p>';
+    $expected = "This is a test.\n\nWith a bith of **bold** text and a [link](https://example.test)";
+    $this->assertEquals($expected, $this->reliefwebImporter->sanitizeText('body', $test_string));
+  }
+
+  /**
+   * Tests for sanize text with raw HTML wrapped in CDATA.
+   */
+  public function testsanitizeHtmlWithCdata() {
+    $test_string = '<p>This is a test.</p><p style="font-size: 16px;">With a bith of <strong>bold</strong> text and a <a unrecognized="attribute" href="https://example.test">link</a></p>';
+    $expected = "This is a test.\n\nWith a bith of **bold** text and a [link](https://example.test)";
+    $this->assertEquals($expected, $this->reliefwebImporter->sanitizeText('body', '<![CDATA[' . $test_string . ']]>'));
+  }
+
+  /**
+   * Tests for sanize text with raw HTML wrapped in CDATA.
+   */
+  public function testsanitizeHtmlWithEncodedCdata() {
+    $test_string = '<p>This is a test.</p><p style="font-size: 16px;">With a bith of <strong>bold</strong> text and a <a unrecognized="attribute" href="https://example.test">link</a></p>';
+    $expected = "This is a test.\n\nWith a bith of **bold** text and a [link](https://example.test)";
+    $this->assertEquals($expected, $this->reliefwebImporter->sanitizeText('body', '&lt;![CDATA[' . $test_string . ']]&gt;'));
+  }
+
+  /**
+   * Tests for sanize text with encoded HTML.
+   */
+  public function testsanitizeEncodedHtml() {
+    $test_string = '<p>This is a test.</p><p style="font-size: 16px;">With a bith of <strong>bold</strong> text and a <a unrecognized="attribute" href="https://example.test">link</a></p>';
+    $test_string = Html::escape($test_string);
+    $expected = "This is a test.\n\nWith a bith of **bold** text and a [link](https://example.test)";
+    $this->assertEquals($expected, $this->reliefwebImporter->sanitizeText('body', $test_string));
+  }
+
+  /**
+   * Tests for sanize text with encoded HTML wrapped in encoded CDATA.
+   */
+  public function testsanitizeEncodedHtmlWithCdata() {
+    $test_string = '<p>This is a test.</p><p style="font-size: 16px;">With a bith of <strong>bold</strong> text and a <a unrecognized="attribute" href="https://example.test">link</a></p>';
+    $test_string = Html::escape($test_string);
+    $expected = "This is a test.\n\nWith a bith of **bold** text and a [link](https://example.test)";
+    $this->assertEquals($expected, $this->reliefwebImporter->sanitizeText('body', '<![CDATA[' . $test_string . ']]>'));
+  }
+
+  /**
+   * Tests for sanize text with encoded HTML wrapped in encoded CDATA.
+   */
+  public function testsanitizeEncodedHtmlWithEncodedCdata() {
+    $test_string = '<p>This is a test.</p><p style="font-size: 16px;">With a bith of <strong>bold</strong> text and a <a unrecognized="attribute" href="https://example.test">link</a></p>';
+    $test_string = Html::escape($test_string);
+    $expected = "This is a test.\n\nWith a bith of **bold** text and a [link](https://example.test)";
+    $this->assertEquals($expected, $this->reliefwebImporter->sanitizeText('body', '&lt;![CDATA[' . $test_string . ']]&gt;'));
+  }
+
   /**
    * Tests for sanize text.
    */
diff --git a/html/modules/custom/reliefweb_import/tests/src/Unit/Stub/ReliefwebImportCommandStub.php b/html/modules/custom/reliefweb_import/tests/src/Unit/Stub/ReliefwebImportCommandStub.php
index c73d5186d..d128c6b6b 100644
--- a/html/modules/custom/reliefweb_import/tests/src/Unit/Stub/ReliefwebImportCommandStub.php
+++ b/html/modules/custom/reliefweb_import/tests/src/Unit/Stub/ReliefwebImportCommandStub.php
@@ -28,8 +28,8 @@ public function validateBody($data) {
   /**
    * {@inheritdoc}
    */
-  public function sanitizeText($field, $text, $format = 'plain_text', $max_heading_level = 2) {
-    return parent::sanitizeText($field, $text, $format);
+  public function sanitizeText($field, $text, $max_heading_level = 2) {
+    return parent::sanitizeText($field, $text, $max_heading_level);
   }
 
   /**
diff --git a/html/modules/custom/reliefweb_utility/src/Helpers/HtmlSanitizer.php b/html/modules/custom/reliefweb_utility/src/Helpers/HtmlSanitizer.php
index f4b4cf310..45fc8847c 100644
--- a/html/modules/custom/reliefweb_utility/src/Helpers/HtmlSanitizer.php
+++ b/html/modules/custom/reliefweb_utility/src/Helpers/HtmlSanitizer.php
@@ -83,12 +83,14 @@ public static function sanitize($html, $iframe = FALSE, $heading_offset = 2, arr
    *   Offset for the conversion of the headings to perserve the hierarchy.
    * @param array $allowed_attributes
    *   List of attributes that should be preserved (ex: data-disaster-map).
+   * @param array $internal_hosts
+   *   List of internal hosts to determine if a link is external or not.
    *
    * @return string
    *   Sanitized HTML string.
    */
-  public static function sanitizeFromMarkdown($text, $iframe = FALSE, $heading_offset = 2, array $allowed_attributes = []) {
-    $html = MarkdownHelper::convertToHtml($text);
+  public static function sanitizeFromMarkdown($text, $iframe = FALSE, $heading_offset = 2, array $allowed_attributes = [], array $internal_hosts = ['reliefweb.int']) {
+    $html = MarkdownHelper::convertToHtml($text, $internal_hosts);
 
     return static::sanitize($html, $iframe, $heading_offset, $allowed_attributes);
   }

From 4aaebcb270a309973c8c9cfd439fcda3201a3079 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 2 Mar 2022 07:15:03 +0000
Subject: [PATCH 548/720] [RW-180] Add the theme and disaster type fields for
 the topics

---
 ...entity_form_display.node.topic.default.yml | 18 ++++++++++++
 ...entity_view_display.node.topic.default.yml | 18 ++++++++++++
 ....entity_view_display.node.topic.teaser.yml |  4 +++
 ...d.field.node.topic.field_disaster_type.yml | 29 +++++++++++++++++++
 config/field.field.node.topic.field_theme.yml | 29 +++++++++++++++++++
 .../src/Services/TopicFormAlter.php           |  4 +++
 6 files changed, 102 insertions(+)
 create mode 100644 config/field.field.node.topic.field_disaster_type.yml
 create mode 100644 config/field.field.node.topic.field_theme.yml

diff --git a/config/core.entity_form_display.node.topic.default.yml b/config/core.entity_form_display.node.topic.default.yml
index 4c3e516a2..085d2a9c1 100644
--- a/config/core.entity_form_display.node.topic.default.yml
+++ b/config/core.entity_form_display.node.topic.default.yml
@@ -5,6 +5,7 @@ dependencies:
   config:
     - field.field.node.topic.body
     - field.field.node.topic.field_bury
+    - field.field.node.topic.field_disaster_type
     - field.field.node.topic.field_disasters_search
     - field.field.node.topic.field_featured
     - field.field.node.topic.field_icon
@@ -13,6 +14,7 @@ dependencies:
     - field.field.node.topic.field_reports_search
     - field.field.node.topic.field_resources
     - field.field.node.topic.field_sections
+    - field.field.node.topic.field_theme
     - field.field.node.topic.field_training_search
     - node.type.topic
   module:
@@ -46,6 +48,14 @@ content:
     settings:
       display_label: true
     third_party_settings: {  }
+  field_disaster_type:
+    type: reliefweb_entity_reference_select
+    weight: 26
+    region: content
+    settings:
+      sort: label
+      extra_data: {  }
+    third_party_settings: {  }
   field_disasters_search:
     type: reliefweb_section_links
     weight: 9
@@ -106,6 +116,14 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
+  field_theme:
+    type: reliefweb_entity_reference_select
+    weight: 27
+    region: content
+    settings:
+      sort: label
+      extra_data: {  }
+    third_party_settings: {  }
   field_training_search:
     type: reliefweb_section_links
     weight: 8
diff --git a/config/core.entity_view_display.node.topic.default.yml b/config/core.entity_view_display.node.topic.default.yml
index bbbc6932d..ef87ce508 100644
--- a/config/core.entity_view_display.node.topic.default.yml
+++ b/config/core.entity_view_display.node.topic.default.yml
@@ -5,6 +5,7 @@ dependencies:
   config:
     - field.field.node.topic.body
     - field.field.node.topic.field_bury
+    - field.field.node.topic.field_disaster_type
     - field.field.node.topic.field_disasters_search
     - field.field.node.topic.field_featured
     - field.field.node.topic.field_icon
@@ -13,6 +14,7 @@ dependencies:
     - field.field.node.topic.field_reports_search
     - field.field.node.topic.field_resources
     - field.field.node.topic.field_sections
+    - field.field.node.topic.field_theme
     - field.field.node.topic.field_training_search
     - node.type.topic
   module:
@@ -41,6 +43,14 @@ content:
     third_party_settings: {  }
     weight: 10
     region: content
+  field_disaster_type:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 11
+    region: content
   field_disasters_search:
     type: reliefweb_section_links
     label: above
@@ -102,6 +112,14 @@ content:
     third_party_settings: {  }
     weight: 3
     region: content
+  field_theme:
+    type: entity_reference_label
+    label: above
+    settings:
+      link: true
+    third_party_settings: {  }
+    weight: 12
+    region: content
   field_training_search:
     type: reliefweb_section_links
     label: above
diff --git a/config/core.entity_view_display.node.topic.teaser.yml b/config/core.entity_view_display.node.topic.teaser.yml
index 0127a2518..b55603b9d 100644
--- a/config/core.entity_view_display.node.topic.teaser.yml
+++ b/config/core.entity_view_display.node.topic.teaser.yml
@@ -6,6 +6,7 @@ dependencies:
     - core.entity_view_mode.node.teaser
     - field.field.node.topic.body
     - field.field.node.topic.field_bury
+    - field.field.node.topic.field_disaster_type
     - field.field.node.topic.field_disasters_search
     - field.field.node.topic.field_featured
     - field.field.node.topic.field_icon
@@ -14,6 +15,7 @@ dependencies:
     - field.field.node.topic.field_reports_search
     - field.field.node.topic.field_resources
     - field.field.node.topic.field_sections
+    - field.field.node.topic.field_theme
     - field.field.node.topic.field_training_search
     - node.type.topic
   module:
@@ -36,6 +38,7 @@ content:
 hidden:
   body: true
   field_bury: true
+  field_disaster_type: true
   field_disasters_search: true
   field_featured: true
   field_icon: true
@@ -44,5 +47,6 @@ hidden:
   field_reports_search: true
   field_resources: true
   field_sections: true
+  field_theme: true
   field_training_search: true
   langcode: true
diff --git a/config/field.field.node.topic.field_disaster_type.yml b/config/field.field.node.topic.field_disaster_type.yml
new file mode 100644
index 000000000..61d9ac20b
--- /dev/null
+++ b/config/field.field.node.topic.field_disaster_type.yml
@@ -0,0 +1,29 @@
+uuid: 6d3d2eb2-bf47-4751-91a3-51c81776a40b
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_disaster_type
+    - node.type.topic
+    - taxonomy.vocabulary.disaster_type
+id: node.topic.field_disaster_type
+field_name: field_disaster_type
+entity_type: node
+bundle: topic
+label: 'Related disaster types'
+description: 'Disaster types related to the topic.'
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:taxonomy_term'
+  handler_settings:
+    target_bundles:
+      disaster_type: disaster_type
+    sort:
+      field: name
+      direction: asc
+    auto_create: false
+    auto_create_bundle: ''
+field_type: entity_reference
diff --git a/config/field.field.node.topic.field_theme.yml b/config/field.field.node.topic.field_theme.yml
new file mode 100644
index 000000000..913833d79
--- /dev/null
+++ b/config/field.field.node.topic.field_theme.yml
@@ -0,0 +1,29 @@
+uuid: 876b9dd3-9bbd-47ef-87fa-e43842dd82f4
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_theme
+    - node.type.topic
+    - taxonomy.vocabulary.theme
+id: node.topic.field_theme
+field_name: field_theme
+entity_type: node
+bundle: topic
+label: 'Related themes'
+description: 'Themes related to the topic.'
+required: false
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:taxonomy_term'
+  handler_settings:
+    target_bundles:
+      theme: theme
+    sort:
+      field: name
+      direction: asc
+    auto_create: false
+    auto_create_bundle: ''
+field_type: entity_reference
diff --git a/html/modules/custom/reliefweb_entities/src/Services/TopicFormAlter.php b/html/modules/custom/reliefweb_entities/src/Services/TopicFormAlter.php
index a97242ae9..48277b49e 100644
--- a/html/modules/custom/reliefweb_entities/src/Services/TopicFormAlter.php
+++ b/html/modules/custom/reliefweb_entities/src/Services/TopicFormAlter.php
@@ -17,6 +17,10 @@ class TopicFormAlter extends EntityFormAlterServiceBase {
   protected function addBundleFormAlterations(array &$form, FormStateInterface $form_state) {
     // Add the disaster map token help to the overview field.
     $form['field_overview']['token-help'] = static::getDisasterMapTokenHelp();
+
+    // Add an autocomplete widget to the tags.
+    $form['field_disaster_type']['#attributes']['data-with-autocomplete'] = '';
+    $form['field_theme']['#attributes']['data-with-autocomplete'] = '';
   }
 
   /**

From 9be23bad1d42e8d20e9c9f451fcfd7c09a49dd28 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 2 Mar 2022 07:27:13 +0000
Subject: [PATCH 549/720] [RW-180] Migrate theme and disaster type fields for
 topics and fix issue with storage classes

---
 .../migrate_plus.migration.reliefweb_node__topic.yml | 10 ++++++++++
 ...plus.migration.reliefweb_node_revision__topic.yml | 10 ++++++++++
 .../migrate_plus.migration.reliefweb_node__topic.yml | 12 ++++++++++++
 ...plus.migration.reliefweb_node_revision__topic.yml | 12 ++++++++++++
 ...eStorage.php => AccumulatedBundleNodeStorage.php} |  4 ++--
 ....php => AccumulatedBundleTaxonomyTermStorage.php} |  4 ++--
 6 files changed, 48 insertions(+), 4 deletions(-)
 rename html/modules/custom/reliefweb_migrate/src/Entity/{AccumulatedNodeStorage.php => AccumulatedBundleNodeStorage.php} (50%)
 rename html/modules/custom/reliefweb_migrate/src/Entity/{AccumulatedTermStorage.php => AccumulatedBundleTaxonomyTermStorage.php} (73%)

diff --git a/config/migrate_plus.migration.reliefweb_node__topic.yml b/config/migrate_plus.migration.reliefweb_node__topic.yml
index 2714ec5b9..c088b1eb1 100644
--- a/config/migrate_plus.migration.reliefweb_node__topic.yml
+++ b/config/migrate_plus.migration.reliefweb_node__topic.yml
@@ -108,5 +108,15 @@ process:
           source: attributes
           index:
             - title
+  field_disaster_type:
+    plugin: sub_process
+    source: field_disaster_type
+    process:
+      target_id: tid
+  field_theme:
+    plugin: sub_process
+    source: field_theme
+    process:
+      target_id: tid
 destination: null
 migration_dependencies: null
diff --git a/config/migrate_plus.migration.reliefweb_node_revision__topic.yml b/config/migrate_plus.migration.reliefweb_node_revision__topic.yml
index 95b5b5931..6c75371a9 100644
--- a/config/migrate_plus.migration.reliefweb_node_revision__topic.yml
+++ b/config/migrate_plus.migration.reliefweb_node_revision__topic.yml
@@ -108,6 +108,16 @@ process:
           source: attributes
           index:
             - title
+  field_disaster_type:
+    plugin: sub_process
+    source: field_disaster_type
+    process:
+      target_id: tid
+  field_theme:
+    plugin: sub_process
+    source: field_theme
+    process:
+      target_id: tid
 destination: null
 migration_dependencies:
   required:
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node__topic.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node__topic.yml
index 550f6694d..9fcffdad9 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node__topic.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node__topic.yml
@@ -109,3 +109,15 @@ process:
           source: attributes
           index:
             - title
+
+  field_disaster_type:
+    plugin: sub_process
+    source: field_disaster_type
+    process:
+      target_id: tid
+
+  field_theme:
+    plugin: sub_process
+    source: field_theme
+    process:
+      target_id: tid
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__topic.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__topic.yml
index 977f24db3..92c7eee59 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__topic.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_node_revision__topic.yml
@@ -110,6 +110,18 @@ process:
           index:
             - title
 
+  field_disaster_type:
+    plugin: sub_process
+    source: field_disaster_type
+    process:
+      target_id: tid
+
+  field_theme:
+    plugin: sub_process
+    source: field_theme
+    process:
+      target_id: tid
+
 migration_dependencies:
   required:
     - reliefweb_node__topic
diff --git a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedNodeStorage.php b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedBundleNodeStorage.php
similarity index 50%
rename from html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedNodeStorage.php
rename to html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedBundleNodeStorage.php
index 22767e9f6..581406f64 100644
--- a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedNodeStorage.php
+++ b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedBundleNodeStorage.php
@@ -2,12 +2,12 @@
 
 namespace Drupal\reliefweb_migrate\Entity;
 
-use Drupal\node\NodeStorage;
+use Drupal\reliefweb_entities\BundleNodeStorage;
 
 /**
  * Node SQL storage for the migrations that regroup queries.
  */
-class AccumulatedNodeStorage extends NodeStorage implements AccumulatedSqlContentEntityStorageInterface {
+class AccumulatedBundleNodeStorage extends BundleNodeStorage implements AccumulatedSqlContentEntityStorageInterface {
 
   use AccumulatedSqlContentEntityStorageTrait;
 
diff --git a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedTermStorage.php b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedBundleTaxonomyTermStorage.php
similarity index 73%
rename from html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedTermStorage.php
rename to html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedBundleTaxonomyTermStorage.php
index ce2248c72..be0ec7ccd 100644
--- a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedTermStorage.php
+++ b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedBundleTaxonomyTermStorage.php
@@ -3,12 +3,12 @@
 namespace Drupal\reliefweb_migrate\Entity;
 
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\taxonomy\TermStorage;
+use Drupal\reliefweb_entities\BundleTaxonomyTermStorage;
 
 /**
  * Term SQL storage for the migrations that regroup queries.
  */
-class AccumulatedTermStorage extends TermStorage implements AccumulatedSqlContentEntityStorageInterface {
+class AccumulatedBundleTaxonomyTermStorage extends BundleTaxonomyTermStorage implements AccumulatedSqlContentEntityStorageInterface {
 
   use AccumulatedSqlContentEntityStorageTrait;
 

From e7031389ddb624fe69fc2fe6b4efebe62ff8ec85 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 2 Mar 2022 08:12:45 +0000
Subject: [PATCH 550/720] [RW-218] Add more validation for the reliefweb
 subscriptions queue drush command

---
 .../custom/reliefweb_subscriptions/README.md   |  2 +-
 .../reliefweb_subscriptions.module             |  7 +++++++
 .../src/ReliefwebSubscriptionsMailer.php       | 18 +++++++++++-------
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/html/modules/custom/reliefweb_subscriptions/README.md b/html/modules/custom/reliefweb_subscriptions/README.md
index 5210885bb..47fdaf2dd 100644
--- a/html/modules/custom/reliefweb_subscriptions/README.md
+++ b/html/modules/custom/reliefweb_subscriptions/README.md
@@ -22,7 +22,7 @@ fin drush reliefweb_subscriptions:send --verbose
 fin drush reliefweb_subscriptions:queue training --verbose
 fin drush reliefweb_subscriptions:send --verbose
 
-fin drush reliefweb_subscriptions:queue disaster --verbose --entity_type=taxonomy_term --entity_id=42169
+fin drush reliefweb_subscriptions:queue disaster --verbose --entity_id=42169
 fin drush reliefweb_subscriptions:send --verbose
 
 fin drush reliefweb_subscriptions:queue ocha_sitrep --verbose
diff --git a/html/modules/custom/reliefweb_subscriptions/reliefweb_subscriptions.module b/html/modules/custom/reliefweb_subscriptions/reliefweb_subscriptions.module
index 46e3a1ccd..50f46d094 100644
--- a/html/modules/custom/reliefweb_subscriptions/reliefweb_subscriptions.module
+++ b/html/modules/custom/reliefweb_subscriptions/reliefweb_subscriptions.module
@@ -36,6 +36,7 @@ function reliefweb_subscriptions_subscriptions() {
     'subject' => 'Today\'s ReliefWeb Headlines',
     'title' => 'ReliefWeb Headlines',
     'bundle' => 'report',
+    'entity_type_id' => 'node',
     'resource' => 'reports',
     'payload' => [
       'filter' => [
@@ -75,6 +76,7 @@ function reliefweb_subscriptions_subscriptions() {
     'subject' => 'New Appeals',
     'title' => 'Latest Appeals',
     'bundle' => 'report',
+    'entity_type_id' => 'node',
     'resource' => 'reports',
     'payload' => [
       'filter' => [
@@ -113,6 +115,7 @@ function reliefweb_subscriptions_subscriptions() {
     'subject' => 'New Job Announcements',
     'title' => 'New Job Announcements',
     'bundle' => 'job',
+    'entity_type_id' => 'node',
     'resource' => 'jobs',
     'payload' => [
       'fields' => [
@@ -146,6 +149,7 @@ function reliefweb_subscriptions_subscriptions() {
     'subject' => 'New Training Programs',
     'title' => 'New Training Programs',
     'bundle' => 'training',
+    'entity_type_id' => 'node',
     'resource' => 'training',
     'payload' => [
       'fields' => [
@@ -178,6 +182,7 @@ function reliefweb_subscriptions_subscriptions() {
     'template' => 'disaster',
     'subject callback' => 'disasterSubject',
     'bundle' => 'disaster',
+    'entity_type_id' => 'taxonomy_term',
     'resource' => 'disasters',
     'payload' => [
       'filter' => [
@@ -211,6 +216,7 @@ function reliefweb_subscriptions_subscriptions() {
     'template' => 'ocha_sitrep',
     'subject callback' => 'ochaSitrepSubject',
     'bundle' => 'report',
+    'entity_type_id' => 'node',
     'resource' => 'reports',
     'payload' => [
       'filter' => [
@@ -270,6 +276,7 @@ function reliefweb_subscriptions_subscriptions() {
       'subject' => $name . ' Updates',
       'title' => $name . ' Updates',
       'bundle' => 'report',
+      'entity_type_id' => 'node',
       'resource' => 'reports',
       'payload' => [
         'filter' => [
diff --git a/html/modules/custom/reliefweb_subscriptions/src/ReliefwebSubscriptionsMailer.php b/html/modules/custom/reliefweb_subscriptions/src/ReliefwebSubscriptionsMailer.php
index a2411198b..d3854c619 100644
--- a/html/modules/custom/reliefweb_subscriptions/src/ReliefwebSubscriptionsMailer.php
+++ b/html/modules/custom/reliefweb_subscriptions/src/ReliefwebSubscriptionsMailer.php
@@ -266,15 +266,12 @@ public function send($notifications) {
    * @usage reliefweb_subscriptions:queue
    *   Queue emails.
    * @validate-module-enabled reliefweb_subscriptions
-   * @option entity_type
-   *   Entity type.
    * @option entity_id
    *   Entity Id.
    * @option last
    *   Timestamp to use as the last time notifications were sent.
    */
   public function queue($sid, array $options = [
-    'entity_type' => '',
     'entity_id' => 0,
     'last' => 0,
   ]) {
@@ -292,22 +289,29 @@ public function queue($sid, array $options = [
 
     // Attempt to queue triggered notification.
     if ($subscription['type'] === 'triggered') {
-      $entity_type = $options['entity_type'];
       $entity_id = $options['entity_id'];
 
-      if (empty($entity_type) || empty($entity_id)) {
-        $this->logger->error('Invalid entity type or id');
+      if (empty($entity_id)) {
+        $this->logger->error('Missing entity id');
+        return;
+      }
+      if (!is_numeric($entity_id)) {
+        $this->logger->error('Invalid entity id');
         return;
       }
 
       // Check if the entity exists.
       $entity = $this->entityTypeManager
-        ->getStorage($entity_type)
+        ->getStorage($subscription['entity_type_id'])
         ?->load($entity_id);
       if (empty($entity)) {
         $this->logger->warning('Entity not found, skipping');
         return;
       }
+      elseif ($entity->bundle() !== $subscription['bundle']) {
+        $this->logger->error('Entity bundle mismatch');
+        return;
+      }
 
       $this->queueTriggered($entity);
     }

From 29bc4fba8ba5c76874d43fd4c358c1989a13b999 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 3 Mar 2022 01:19:57 +0000
Subject: [PATCH 551/720] [RW-405] Update common_design dependency

---
 composer.json |  2 +-
 composer.lock | 17 +++++++++--------
 symfony.lock  |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/composer.json b/composer.json
index 90440700d..63ac52798 100644
--- a/composer.json
+++ b/composer.json
@@ -94,7 +94,7 @@
         "reliefweb/simple-datepicker": "^v1.3.1",
         "symfony/flex": "^2.0",
         "symfony/uid": "^6.0",
-        "unocha/common_design": "dev-cd-304-forms",
+        "unocha/common_design": "dev-main#99d344e1b84bab55dfeb7b40ea7a20576d8f56c5",
         "webflo/drupal-finder": "^1.2.2"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
index 556776c5f..15b870ca8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "ee3764bf603ee2d0958121e6182a1818",
+    "content-hash": "df030aa0e6c620304254c990c4ab8271",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -13453,31 +13453,32 @@
         },
         {
             "name": "unocha/common_design",
-            "version": "dev-cd-304-forms",
+            "version": "dev-main",
             "source": {
                 "type": "git",
                 "url": "https://github.com/UN-OCHA/common_design.git",
-                "reference": "7d92d474d8f191b3f9540700542fe1c44b573946"
+                "reference": "99d344e1b84bab55dfeb7b40ea7a20576d8f56c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/7d92d474d8f191b3f9540700542fe1c44b573946",
-                "reference": "7d92d474d8f191b3f9540700542fe1c44b573946",
+                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/99d344e1b84bab55dfeb7b40ea7a20576d8f56c5",
+                "reference": "99d344e1b84bab55dfeb7b40ea7a20576d8f56c5",
                 "shasum": ""
             },
             "require": {
                 "composer/installers": "^1.2"
             },
+            "default-branch": true,
             "type": "drupal-theme",
             "license": [
                 "GPL-2.0-only"
             ],
             "description": "OCHA Common Design base theme for Drupal 8",
             "support": {
-                "source": "https://github.com/UN-OCHA/common_design/tree/cd-304-forms",
+                "source": "https://github.com/UN-OCHA/common_design/tree/main",
                 "issues": "https://github.com/UN-OCHA/common_design/issues"
             },
-            "time": "2022-03-01T09:25:35+00:00"
+            "time": "2022-03-02T15:22:05+00:00"
         },
         {
             "name": "webflo/drupal-finder",
@@ -15147,5 +15148,5 @@
         "php": ">=8.0"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.2.0"
 }
diff --git a/symfony.lock b/symfony.lock
index 573978865..f67f58c7d 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -754,7 +754,7 @@
         "version": "v1.0.2"
     },
     "unocha/common_design": {
-        "version": "dev-cd-304-forms"
+        "version": "dev-main#99d344e1b84bab55dfeb7b40ea7a20576d8f56c5"
     },
     "webflo/drupal-finder": {
         "version": "1.2.2"

From 97962f6dcd3e8a4cc624e025ec49a7c9edcffd8e Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 8 Mar 2022 08:31:42 +0000
Subject: [PATCH 552/720] [RW-405] Update common design to 5.1.0

---
 composer.json |  2 +-
 composer.lock | 18 ++++++++----------
 symfony.lock  |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/composer.json b/composer.json
index 63ac52798..8402632fb 100644
--- a/composer.json
+++ b/composer.json
@@ -94,7 +94,7 @@
         "reliefweb/simple-datepicker": "^v1.3.1",
         "symfony/flex": "^2.0",
         "symfony/uid": "^6.0",
-        "unocha/common_design": "dev-main#99d344e1b84bab55dfeb7b40ea7a20576d8f56c5",
+        "unocha/common_design": "^v5.1.0",
         "webflo/drupal-finder": "^1.2.2"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
index 15b870ca8..080ad057e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "df030aa0e6c620304254c990c4ab8271",
+    "content-hash": "bdedf210a51f49a00d037de2afd0cf1e",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -13453,32 +13453,31 @@
         },
         {
             "name": "unocha/common_design",
-            "version": "dev-main",
+            "version": "v5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/UN-OCHA/common_design.git",
-                "reference": "99d344e1b84bab55dfeb7b40ea7a20576d8f56c5"
+                "reference": "5a8af3f99af48d37818ae812db4135f0119bf563"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/99d344e1b84bab55dfeb7b40ea7a20576d8f56c5",
-                "reference": "99d344e1b84bab55dfeb7b40ea7a20576d8f56c5",
+                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/5a8af3f99af48d37818ae812db4135f0119bf563",
+                "reference": "5a8af3f99af48d37818ae812db4135f0119bf563",
                 "shasum": ""
             },
             "require": {
                 "composer/installers": "^1.2"
             },
-            "default-branch": true,
             "type": "drupal-theme",
             "license": [
                 "GPL-2.0-only"
             ],
             "description": "OCHA Common Design base theme for Drupal 8",
             "support": {
-                "source": "https://github.com/UN-OCHA/common_design/tree/main",
+                "source": "https://github.com/UN-OCHA/common_design/tree/v5.1.0",
                 "issues": "https://github.com/UN-OCHA/common_design/issues"
             },
-            "time": "2022-03-02T15:22:05+00:00"
+            "time": "2021-11-18T19:47:47+00:00"
         },
         {
             "name": "webflo/drupal-finder",
@@ -15139,8 +15138,7 @@
     "minimum-stability": "dev",
     "stability-flags": {
         "drupal/inline_entity_form": 5,
-        "drupal/taxonomy_term_revision": 20,
-        "unocha/common_design": 20
+        "drupal/taxonomy_term_revision": 20
     },
     "prefer-stable": true,
     "prefer-lowest": false,
diff --git a/symfony.lock b/symfony.lock
index f67f58c7d..39a86a2f0 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -754,7 +754,7 @@
         "version": "v1.0.2"
     },
     "unocha/common_design": {
-        "version": "dev-main#99d344e1b84bab55dfeb7b40ea7a20576d8f56c5"
+        "version": "v5.1.0"
     },
     "webflo/drupal-finder": {
         "version": "1.2.2"

From d0c86763ce95be036bfb7bb8b6ce749eba56dec6 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 8 Mar 2022 10:05:22 +0000
Subject: [PATCH 553/720] [RW-405] Revert common_design version to main branch
 until 6.0.0 is out

---
 composer.json |  2 +-
 composer.lock | 17 +++++++++--------
 symfony.lock  |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/composer.json b/composer.json
index 8402632fb..bdfc5e588 100644
--- a/composer.json
+++ b/composer.json
@@ -94,7 +94,7 @@
         "reliefweb/simple-datepicker": "^v1.3.1",
         "symfony/flex": "^2.0",
         "symfony/uid": "^6.0",
-        "unocha/common_design": "^v5.1.0",
+        "unocha/common_design": "dev-main",
         "webflo/drupal-finder": "^1.2.2"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
index 080ad057e..8e5302001 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "bdedf210a51f49a00d037de2afd0cf1e",
+    "content-hash": "7be541e270ba736de977d0537280b27c",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -13453,16 +13453,16 @@
         },
         {
             "name": "unocha/common_design",
-            "version": "v5.1.0",
+            "version": "dev-main",
             "source": {
                 "type": "git",
                 "url": "https://github.com/UN-OCHA/common_design.git",
-                "reference": "5a8af3f99af48d37818ae812db4135f0119bf563"
+                "reference": "99d344e1b84bab55dfeb7b40ea7a20576d8f56c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/5a8af3f99af48d37818ae812db4135f0119bf563",
-                "reference": "5a8af3f99af48d37818ae812db4135f0119bf563",
+                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/99d344e1b84bab55dfeb7b40ea7a20576d8f56c5",
+                "reference": "99d344e1b84bab55dfeb7b40ea7a20576d8f56c5",
                 "shasum": ""
             },
             "require": {
@@ -13474,10 +13474,10 @@
             ],
             "description": "OCHA Common Design base theme for Drupal 8",
             "support": {
-                "source": "https://github.com/UN-OCHA/common_design/tree/v5.1.0",
+                "source": "https://github.com/UN-OCHA/common_design/tree/main",
                 "issues": "https://github.com/UN-OCHA/common_design/issues"
             },
-            "time": "2021-11-18T19:47:47+00:00"
+            "time": "2022-03-02T15:22:05+00:00"
         },
         {
             "name": "webflo/drupal-finder",
@@ -15138,7 +15138,8 @@
     "minimum-stability": "dev",
     "stability-flags": {
         "drupal/inline_entity_form": 5,
-        "drupal/taxonomy_term_revision": 20
+        "drupal/taxonomy_term_revision": 20,
+        "unocha/common_design": 20
     },
     "prefer-stable": true,
     "prefer-lowest": false,
diff --git a/symfony.lock b/symfony.lock
index 39a86a2f0..ac8f1d5fa 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -754,7 +754,7 @@
         "version": "v1.0.2"
     },
     "unocha/common_design": {
-        "version": "v5.1.0"
+        "version": "dev-main"
     },
     "webflo/drupal-finder": {
         "version": "1.2.2"

From 86bebbe54c16a364c3ec0ce1db99ddf9efe5db6d Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 8 Mar 2022 14:44:42 +0100
Subject: [PATCH 554/720] RW-177 remove sub theme template overrides in favour
 of base theme

---
 .../form--node-preview-form-select.html.twig  | 19 -------------------
 .../form--term-preview-form-select.html.twig  | 19 -------------------
 2 files changed, 38 deletions(-)
 delete mode 100644 html/themes/custom/common_design_subtheme/templates/form/form--node-preview-form-select.html.twig
 delete mode 100644 html/themes/custom/common_design_subtheme/templates/form/form--term-preview-form-select.html.twig

diff --git a/html/themes/custom/common_design_subtheme/templates/form/form--node-preview-form-select.html.twig b/html/themes/custom/common_design_subtheme/templates/form/form--node-preview-form-select.html.twig
deleted file mode 100644
index f181b1dae..000000000
--- a/html/themes/custom/common_design_subtheme/templates/form/form--node-preview-form-select.html.twig
+++ /dev/null
@@ -1,19 +0,0 @@
-{#
-/**
- * @file
- * Theme override for a 'form' element.
- *
- * Available variables
- * - attributes: A list of HTML attributes for the wrapper element.
- * - children: The child elements of the form.
- *
- * @see template_preprocess_form()
- */
-#}
-{{ attach_library('common_design_subtheme/rw-preview') }}
-<header>
-  <h3>{{ 'Preview'|t }}</h3>
-</header>
-<form{{ attributes }}>
-  {{ children }}
-</form>
diff --git a/html/themes/custom/common_design_subtheme/templates/form/form--term-preview-form-select.html.twig b/html/themes/custom/common_design_subtheme/templates/form/form--term-preview-form-select.html.twig
deleted file mode 100644
index f181b1dae..000000000
--- a/html/themes/custom/common_design_subtheme/templates/form/form--term-preview-form-select.html.twig
+++ /dev/null
@@ -1,19 +0,0 @@
-{#
-/**
- * @file
- * Theme override for a 'form' element.
- *
- * Available variables
- * - attributes: A list of HTML attributes for the wrapper element.
- * - children: The child elements of the form.
- *
- * @see template_preprocess_form()
- */
-#}
-{{ attach_library('common_design_subtheme/rw-preview') }}
-<header>
-  <h3>{{ 'Preview'|t }}</h3>
-</header>
-<form{{ attributes }}>
-  {{ children }}
-</form>

From 6789044e28bb7d5354024a49f7f74ebf20856477 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 8 Mar 2022 14:45:46 +0100
Subject: [PATCH 555/720] RW-177 extend base theme library with sub theme css,
 remove all rules bar RW customisation in favour of base theme

---
 .../common_design_subtheme.info.yml           |  3 ++
 .../components/rw-preview/rw-preview.css      | 34 -------------------
 2 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.info.yml b/html/themes/custom/common_design_subtheme/common_design_subtheme.info.yml
index ad740c42c..ac86cb768 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.info.yml
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.info.yml
@@ -32,6 +32,9 @@ libraries-extend:
   common_design/cd-button:
     - common_design_subtheme/cd-button
 
+  common_design/cd-form--preview:
+    - common_design_subtheme/rw-preview
+
   reliefweb_fields/reliefweb-links:
     - common_design_subtheme/rw-links
 
diff --git a/html/themes/custom/common_design_subtheme/components/rw-preview/rw-preview.css b/html/themes/custom/common_design_subtheme/components/rw-preview/rw-preview.css
index 02eaa5a60..1283075f6 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-preview/rw-preview.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-preview/rw-preview.css
@@ -1,37 +1,7 @@
-.node-preview-container,
-.term-preview-container {
-  padding: 0;
-}
 .node-preview-container header,
 .term-preview-container header {
-  position: sticky;
-  height: 40px;
-  text-align: center;
-  color: var(--cd-white);
   background: var(--cd-reliefweb-brand-red--dark);
 }
-.node-preview-container header h3,
-.term-preview-container header h3 {
-  height: 40px;
-  margin: 0;
-  color: var(--cd-white);
-  line-height: 40px;
-}
-.node-preview-form-select .node-preview-backlink,
-.term-preview-form-select .term-preview-backlink {
-  position: absolute;
-  z-index: 1000;
-  top: 40px; /* Height of Preview header */
-  left: 50%;
-  display: inline-block;
-  padding: 2px 8px 4px;
-  transform: translateX(-50%);
-  color: var(--cd-white);
-  border-radius: 0 0 10px 10px;
-  background: var(--cd-black);
-  font-size: var(--cd-font-size--small);
-  font-weight: 500;
-}
 .node-preview-form-select .node-preview-backlink:hover,
 .term-preview-form-select .term-preview-backlink:hover {
   background: var(--cd-reliefweb-brand-blue);
@@ -41,7 +11,3 @@
 .term-preview-form-select .form-item-view-mode {
   display: none;
 }
-/* Push whole containing element down so header can be sticky */
-.dialog-off-canvas-main-canvas {
-  padding-top: 40px; /* Height of Preview header */
-}

From 798fe1a4443c43b741f8c672e368bc137da1d54d Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 8 Mar 2022 23:25:42 +0000
Subject: [PATCH 556/720] [RW-289] Hide published checkbox for nodes and terms
 as it's not displayed anyway

---
 ...form_display.node.announcement.default.yml |  8 +--
 ...ty_form_display.node.blog_post.default.yml | 16 ++----
 ....entity_form_display.node.book.default.yml | 10 +---
 ...e.entity_form_display.node.job.default.yml | 10 +---
 ...ntity_form_display.node.report.default.yml | 52 ++++++++-----------
 ...entity_form_display.node.topic.default.yml | 14 ++---
 ...ity_form_display.node.training.default.yml | 10 +---
 ..._display.taxonomy_term.country.default.yml | 10 +---
 ...display.taxonomy_term.disaster.default.yml | 10 +---
 ...m_display.taxonomy_term.source.default.yml |  8 +--
 10 files changed, 44 insertions(+), 104 deletions(-)

diff --git a/config/core.entity_form_display.node.announcement.default.yml b/config/core.entity_form_display.node.announcement.default.yml
index 09e9ee91a..b95433944 100644
--- a/config/core.entity_form_display.node.announcement.default.yml
+++ b/config/core.entity_form_display.node.announcement.default.yml
@@ -52,13 +52,6 @@ content:
       placeholder_url: ''
       placeholder_title: ''
     third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 4
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
   title:
     type: string_textfield
     weight: 0
@@ -72,6 +65,7 @@ hidden:
   langcode: true
   path: true
   promote: true
+  status: true
   sticky: true
   uid: true
   url_redirects: true
diff --git a/config/core.entity_form_display.node.blog_post.default.yml b/config/core.entity_form_display.node.blog_post.default.yml
index 58579fdd0..9882a9c0c 100644
--- a/config/core.entity_form_display.node.blog_post.default.yml
+++ b/config/core.entity_form_display.node.blog_post.default.yml
@@ -21,7 +21,7 @@ mode: default
 content:
   body:
     type: text_textarea_with_summary
-    weight: 4
+    weight: 3
     region: content
     settings:
       rows: 20
@@ -34,7 +34,7 @@ content:
         hide_guidelines: '1'
   field_attached_images:
     type: media_library_widget
-    weight: 6
+    weight: 5
     region: content
     settings:
       media_types: {  }
@@ -49,7 +49,7 @@ content:
     third_party_settings: {  }
   field_image:
     type: media_library_widget
-    weight: 5
+    weight: 4
     region: content
     settings:
       media_types: {  }
@@ -66,17 +66,10 @@ content:
     third_party_settings: {  }
   path:
     type: path
-    weight: 9
+    weight: 6
     region: content
     settings: {  }
     third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 7
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
   title:
     type: string_textfield
     weight: 0
@@ -89,6 +82,7 @@ hidden:
   created: true
   langcode: true
   promote: true
+  status: true
   sticky: true
   uid: true
   url_redirects: true
diff --git a/config/core.entity_form_display.node.book.default.yml b/config/core.entity_form_display.node.book.default.yml
index e46c50ed5..c955f5bf9 100644
--- a/config/core.entity_form_display.node.book.default.yml
+++ b/config/core.entity_form_display.node.book.default.yml
@@ -40,17 +40,10 @@ content:
     third_party_settings: {  }
   path:
     type: path
-    weight: 5
+    weight: 3
     region: content
     settings: {  }
     third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 4
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
   title:
     type: string_textfield
     weight: 0
@@ -63,6 +56,7 @@ hidden:
   created: true
   langcode: true
   promote: true
+  status: true
   sticky: true
   uid: true
   url_redirects: true
diff --git a/config/core.entity_form_display.node.job.default.yml b/config/core.entity_form_display.node.job.default.yml
index e0379de9f..6eeab7d9d 100644
--- a/config/core.entity_form_display.node.job.default.yml
+++ b/config/core.entity_form_display.node.job.default.yml
@@ -170,16 +170,9 @@ content:
     third_party_settings: {  }
   path:
     type: path
-    weight: 13
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
     weight: 11
     region: content
-    settings:
-      display_label: true
+    settings: {  }
     third_party_settings: {  }
   title:
     type: string_textfield
@@ -194,6 +187,7 @@ hidden:
   field_job_id: true
   langcode: true
   promote: true
+  status: true
   sticky: true
   uid: true
   url_redirects: true
diff --git a/config/core.entity_form_display.node.report.default.yml b/config/core.entity_form_display.node.report.default.yml
index 17137c0e7..856a5c4ce 100644
--- a/config/core.entity_form_display.node.report.default.yml
+++ b/config/core.entity_form_display.node.report.default.yml
@@ -57,14 +57,14 @@ content:
         hide_guidelines: '1'
   field_bury:
     type: boolean_checkbox
-    weight: 22
+    weight: 21
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   field_content_format:
     type: reliefweb_entity_reference_select
-    weight: 15
+    weight: 14
     region: content
     settings:
       sort: label
@@ -72,7 +72,7 @@ content:
     third_party_settings: {  }
   field_country:
     type: reliefweb_entity_reference_select
-    weight: 11
+    weight: 10
     region: content
     settings:
       sort: label
@@ -108,7 +108,7 @@ content:
     third_party_settings: {  }
   field_disaster:
     type: reliefweb_disaster
-    weight: 13
+    weight: 12
     region: content
     settings:
       sort: id
@@ -146,7 +146,7 @@ content:
     third_party_settings: {  }
   field_disaster_type:
     type: reliefweb_entity_reference_select
-    weight: 14
+    weight: 13
     region: content
     settings:
       sort: label
@@ -154,7 +154,7 @@ content:
     third_party_settings: {  }
   field_embargo_date:
     type: datetime_datelist
-    weight: 6
+    weight: 5
     region: content
     settings:
       increment: 1
@@ -163,26 +163,26 @@ content:
     third_party_settings: {  }
   field_feature:
     type: options_buttons
-    weight: 21
+    weight: 20
     region: content
     settings: {  }
     third_party_settings: {  }
   field_file:
     type: reliefweb_file
-    weight: 101
+    weight: 24
     region: content
     settings: {  }
     third_party_settings: {  }
   field_headline:
     type: boolean_checkbox
-    weight: 17
+    weight: 16
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   field_headline_image:
     type: inline_entity_form_complex
-    weight: 19
+    weight: 18
     region: content
     settings:
       form_mode: media_library
@@ -199,7 +199,7 @@ content:
     third_party_settings: {  }
   field_headline_summary:
     type: string_textarea
-    weight: 20
+    weight: 19
     region: content
     settings:
       rows: 5
@@ -207,7 +207,7 @@ content:
     third_party_settings: {  }
   field_headline_title:
     type: string_textfield
-    weight: 18
+    weight: 17
     region: content
     settings:
       size: 60
@@ -215,7 +215,7 @@ content:
     third_party_settings: {  }
   field_image:
     type: inline_entity_form_complex
-    weight: 4
+    weight: 3
     region: content
     settings:
       form_mode: media_library
@@ -238,7 +238,7 @@ content:
     third_party_settings: {  }
   field_notify:
     type: string_textarea
-    weight: 23
+    weight: 22
     region: content
     settings:
       rows: 3
@@ -246,19 +246,19 @@ content:
     third_party_settings: {  }
   field_ocha_product:
     type: options_buttons
-    weight: 8
+    weight: 7
     region: content
     settings: {  }
     third_party_settings: {  }
   field_origin:
     type: options_buttons
-    weight: 9
+    weight: 8
     region: content
     settings: {  }
     third_party_settings: {  }
   field_origin_notes:
     type: string_textfield
-    weight: 10
+    weight: 9
     region: content
     settings:
       size: 60
@@ -266,13 +266,13 @@ content:
     third_party_settings: {  }
   field_original_publication_date:
     type: reliefweb_datetime
-    weight: 5
+    weight: 4
     region: content
     settings: {  }
     third_party_settings: {  }
   field_primary_country:
     type: reliefweb_entity_reference_select
-    weight: 12
+    weight: 11
     region: content
     settings:
       sort: label
@@ -308,7 +308,7 @@ content:
     third_party_settings: {  }
   field_source:
     type: reliefweb_source
-    weight: 7
+    weight: 6
     region: content
     settings:
       sort: label
@@ -352,7 +352,7 @@ content:
     third_party_settings: {  }
   field_theme:
     type: reliefweb_entity_reference_select
-    weight: 16
+    weight: 15
     region: content
     settings:
       sort: label
@@ -360,17 +360,10 @@ content:
     third_party_settings: {  }
   path:
     type: path
-    weight: 25
+    weight: 23
     region: content
     settings: {  }
     third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 24
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
   title:
     type: string_textfield
     weight: 1
@@ -384,6 +377,7 @@ hidden:
   field_vulnerable_groups: true
   langcode: true
   promote: true
+  status: true
   sticky: true
   uid: true
   url_redirects: true
diff --git a/config/core.entity_form_display.node.topic.default.yml b/config/core.entity_form_display.node.topic.default.yml
index 085d2a9c1..6e70d6ca8 100644
--- a/config/core.entity_form_display.node.topic.default.yml
+++ b/config/core.entity_form_display.node.topic.default.yml
@@ -50,7 +50,7 @@ content:
     third_party_settings: {  }
   field_disaster_type:
     type: reliefweb_entity_reference_select
-    weight: 26
+    weight: 13
     region: content
     settings:
       sort: label
@@ -118,7 +118,7 @@ content:
     third_party_settings: {  }
   field_theme:
     type: reliefweb_entity_reference_select
-    weight: 27
+    weight: 14
     region: content
     settings:
       sort: label
@@ -132,16 +132,9 @@ content:
     third_party_settings: {  }
   path:
     type: path
-    weight: 14
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
     weight: 12
     region: content
-    settings:
-      display_label: true
+    settings: {  }
     third_party_settings: {  }
   title:
     type: string_textfield
@@ -155,6 +148,7 @@ hidden:
   created: true
   langcode: true
   promote: true
+  status: true
   sticky: true
   uid: true
   url_redirects: true
diff --git a/config/core.entity_form_display.node.training.default.yml b/config/core.entity_form_display.node.training.default.yml
index fd3cdb863..369b2ed1c 100644
--- a/config/core.entity_form_display.node.training.default.yml
+++ b/config/core.entity_form_display.node.training.default.yml
@@ -216,16 +216,9 @@ content:
     third_party_settings: {  }
   path:
     type: path
-    weight: 19
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
     weight: 17
     region: content
-    settings:
-      display_label: true
+    settings: {  }
     third_party_settings: {  }
   title:
     type: string_textfield
@@ -239,6 +232,7 @@ hidden:
   created: true
   langcode: true
   promote: true
+  status: true
   sticky: true
   uid: true
   url_redirects: true
diff --git a/config/core.entity_form_display.taxonomy_term.country.default.yml b/config/core.entity_form_display.taxonomy_term.country.default.yml
index 08efe74c8..407bd8e88 100644
--- a/config/core.entity_form_display.taxonomy_term.country.default.yml
+++ b/config/core.entity_form_display.taxonomy_term.country.default.yml
@@ -97,19 +97,13 @@ content:
     third_party_settings: {  }
   path:
     type: path
-    weight: 11
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
     weight: 9
     region: content
-    settings:
-      display_label: true
+    settings: {  }
     third_party_settings: {  }
 hidden:
   field_appeals_response_plans: true
   field_key_content: true
   field_useful_links: true
   langcode: true
+  status: true
diff --git a/config/core.entity_form_display.taxonomy_term.disaster.default.yml b/config/core.entity_form_display.taxonomy_term.disaster.default.yml
index cc88d2eea..7ff991469 100644
--- a/config/core.entity_form_display.taxonomy_term.disaster.default.yml
+++ b/config/core.entity_form_display.taxonomy_term.disaster.default.yml
@@ -171,19 +171,13 @@ content:
     third_party_settings: {  }
   path:
     type: path
-    weight: 13
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
     weight: 11
     region: content
-    settings:
-      display_label: true
+    settings: {  }
     third_party_settings: {  }
 hidden:
   field_appeals_response_plans: true
   field_key_content: true
   field_useful_links: true
   langcode: true
+  status: true
diff --git a/config/core.entity_form_display.taxonomy_term.source.default.yml b/config/core.entity_form_display.taxonomy_term.source.default.yml
index cda3ad8f7..b3ed35330 100644
--- a/config/core.entity_form_display.taxonomy_term.source.default.yml
+++ b/config/core.entity_form_display.taxonomy_term.source.default.yml
@@ -210,14 +210,8 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 19
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
 hidden:
   field_job_import_feed_url: true
   field_user_posting_rights: true
   langcode: true
+  status: true

From a36c7ad097c5cf435479fec58a05a137f02c1173 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 8 Mar 2022 23:26:18 +0000
Subject: [PATCH 557/720] [RW-289] Only allow external links for guideline
 links

---
 config/field.field.guideline.field_guideline.field_links.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/field.field.guideline.field_guideline.field_links.yml b/config/field.field.guideline.field_guideline.field_links.yml
index f5ec9800d..d6b2b34c4 100644
--- a/config/field.field.guideline.field_guideline.field_links.yml
+++ b/config/field.field.guideline.field_guideline.field_links.yml
@@ -19,5 +19,5 @@ default_value: {  }
 default_value_callback: ''
 settings:
   title: 1
-  link_type: 17
+  link_type: 16
 field_type: link

From 2b7197a3fcbcd5d10ea0305a3babea5ed4083e08 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 8 Mar 2022 23:32:05 +0000
Subject: [PATCH 558/720] [RW-408] Do not run some code of preSave methods of
 bundle entities when migrating and fixes a few issues with job/training
 entities

---
 .../src/Entity/BlogPost.php                   |  6 +++++
 .../reliefweb_entities/src/Entity/Job.php     | 27 ++++++++++++++++++-
 .../reliefweb_entities/src/Entity/Report.php  | 11 ++++++++
 .../src/Entity/Training.php                   | 25 ++++++++++++++++-
 .../src/OpportunityDocumentInterface.php      |  8 ++++++
 .../src/OpportunityDocumentTrait.php          | 19 ++++++++++++-
 6 files changed, 93 insertions(+), 3 deletions(-)

diff --git a/html/modules/custom/reliefweb_entities/src/Entity/BlogPost.php b/html/modules/custom/reliefweb_entities/src/Entity/BlogPost.php
index aed4e7b98..d4ae90015 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/BlogPost.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/BlogPost.php
@@ -112,6 +112,12 @@ public function getLatestBlogPosts($limit = 8) {
    * {@inheritdoc}
    */
   public function preSave(EntityStorageInterface $storage) {
+    // @todo remove when removing `reliefweb_migrate`.
+    if (!empty($this->_is_migrating)) {
+      parent::preSave($storage);
+      return;
+    }
+
     // Set the creation date to the changed date when publishing the blog
     // post from an unpublished state.
     if (isset($this->original) &&
diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Job.php b/html/modules/custom/reliefweb_entities/src/Entity/Job.php
index b7583f272..7994167c3 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Job.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Job.php
@@ -14,6 +14,7 @@
 use Drupal\reliefweb_moderation\EntityModeratedTrait;
 use Drupal\reliefweb_revisions\EntityRevisionedInterface;
 use Drupal\reliefweb_revisions\EntityRevisionedTrait;
+use Drupal\reliefweb_utility\Helpers\DateHelper;
 
 /**
  * Bundle class for job nodes.
@@ -50,6 +51,8 @@ public static function addFieldConstraints(&$fields) {
     ]);
 
     // Closing date cannot be in the past.
+    // @todo remove this constraint and add it to the form only as we want to
+    // be able to save expired jobs for example when importing.
     $fields['field_job_closing_date']->addConstraint('DateNotInPast', [
       'statuses' => ['pending', 'published'],
       'permission' => 'edit any job content',
@@ -119,12 +122,21 @@ public function preSave(EntityStorageInterface $storage) {
       $this->set('field_theme', $themes);
     }
 
+    // @todo remove when removing `reliefweb_migrate`.
+    if (!empty($this->_is_migrating)) {
+      parent::preSave($storage);
+      return;
+    }
+
     // Update the entity status based on the user posting rights.
     $this->updateModerationStatusFromPostingRights();
 
-    // Update the entity statys based on the source(s) moderation status.
+    // Update the entity status based on the source(s) moderation status.
     $this->updateModerationStatusFromSourceStatus();
 
+    // Update the entity status based on the expiration date.
+    $this->updateModerationStatusFromExpirationDate();
+
     // Update the creation date when published for the first time so that
     // the opportunity can appear at the top of the opportunity river.
     $this->updateDateWhenPublished();
@@ -138,10 +150,23 @@ public function preSave(EntityStorageInterface $storage) {
   public function postSave(EntityStorageInterface $storage, $update = TRUE) {
     parent::postSave($storage, $update);
 
+    // @todo remove when removing `reliefweb_migrate`.
+    if (!empty($this->_is_migrating)) {
+      return;
+    }
+
     // Make the sources active.
     $this->updateSourceModerationStatus();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function hasExpired() {
+    $timestamp = DateHelper::getDateTimeStamp($this->field_job_closing_date->value);
+    return empty($timestamp) || ($timestamp < gmmktime(0, 0, 0));
+  }
+
   /**
    * Get the list of job categories for which themes are irrelevant.
    *
diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Report.php b/html/modules/custom/reliefweb_entities/src/Entity/Report.php
index 049eafa1a..0a2e096bf 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Report.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Report.php
@@ -195,6 +195,12 @@ public function getAttachments(?array $build = NULL) {
    * {@inheritdoc}
    */
   public function preSave(EntityStorageInterface $storage) {
+    // @todo remove when removing `reliefweb_migrate`.
+    if (!empty($this->_is_migrating)) {
+      parent::preSave($storage);
+      return;
+    }
+
     parent::preSave($storage);
 
     // Change the publication date if bury is selected, to the original
@@ -249,6 +255,11 @@ public function preSave(EntityStorageInterface $storage) {
   public function postSave(EntityStorageInterface $storage, $update = TRUE) {
     parent::postSave($storage, $update);
 
+    // @todo remove when removing `reliefweb_migrate`.
+    if (!empty($this->_is_migrating)) {
+      return;
+    }
+
     $this->sendPublicationNotification();
   }
 
diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Training.php b/html/modules/custom/reliefweb_entities/src/Entity/Training.php
index 1f0953244..3d63ff39b 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Training.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Training.php
@@ -15,6 +15,7 @@
 use Drupal\reliefweb_revisions\EntityRevisionedInterface;
 use Drupal\reliefweb_revisions\EntityRevisionedTrait;
 use Drupal\reliefweb_rivers\RiverServiceBase;
+use Drupal\reliefweb_utility\Helpers\DateHelper;
 use Drupal\reliefweb_utility\Helpers\UrlHelper;
 
 /**
@@ -101,12 +102,21 @@ public function getEntityMeta() {
    * {@inheritdoc}
    */
   public function preSave(EntityStorageInterface $storage) {
+    // @todo remove when removing `reliefweb_migrate`.
+    if (!empty($this->_is_migrating)) {
+      parent::preSave($storage);
+      return;
+    }
+
     // Update the entity status based on the user posting rights.
     $this->updateModerationStatusFromPostingRights();
 
-    // Update the entity statys based on the source(s) moderation status.
+    // Update the entity status based on the source(s) moderation status.
     $this->updateModerationStatusFromSourceStatus();
 
+    // Update the entity status based on the expiration date.
+    $this->updateModerationStatusFromExpirationDate();
+
     // Update the creation date when published for the first time so that
     // the opportunity can appear at the top of the opportunity river.
     $this->updateDateWhenPublished();
@@ -120,8 +130,21 @@ public function preSave(EntityStorageInterface $storage) {
   public function postSave(EntityStorageInterface $storage, $update = TRUE) {
     parent::postSave($storage, $update);
 
+    // @todo remove when removing `reliefweb_migrate`.
+    if (!empty($this->_is_migrating)) {
+      return;
+    }
+
     // Make the sources active.
     $this->updateSourceModerationStatus();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function hasExpired() {
+    $timestamp = DateHelper::getDateTimeStamp($this->field_registration_deadline->value);
+    return empty($timestamp) || ($timestamp < gmmktime(0, 0, 0));
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_entities/src/OpportunityDocumentInterface.php b/html/modules/custom/reliefweb_entities/src/OpportunityDocumentInterface.php
index b6619b04a..e2b2d883d 100644
--- a/html/modules/custom/reliefweb_entities/src/OpportunityDocumentInterface.php
+++ b/html/modules/custom/reliefweb_entities/src/OpportunityDocumentInterface.php
@@ -7,4 +7,12 @@
  */
 interface OpportunityDocumentInterface {
 
+  /**
+   * Check if the opportunity has expired.
+   *
+   * @return bool
+   *   TRUE if the opportunity has expired.
+   */
+  public function hasExpired();
+
 }
diff --git a/html/modules/custom/reliefweb_entities/src/OpportunityDocumentTrait.php b/html/modules/custom/reliefweb_entities/src/OpportunityDocumentTrait.php
index 0a7436e94..06e333e3a 100644
--- a/html/modules/custom/reliefweb_entities/src/OpportunityDocumentTrait.php
+++ b/html/modules/custom/reliefweb_entities/src/OpportunityDocumentTrait.php
@@ -20,12 +20,20 @@ trait OpportunityDocumentTrait {
    * Update the status for the entity based on the user posting rights.
    */
   protected function updateModerationStatusFromPostingRights() {
+    // In theory the revision user here, is the current user saving the entity.
     $user = $this->getRevisionUser();
     $status = $this->getModerationStatus();
 
+    // Skip if there is no revision user. That should normally not happen with
+    // new content but some old revisions may reference users that don't exist
+    // anymore (which should not happen either but...).
+    if (empty($user)) {
+      return;
+    }
+
     // For non editors, we determine the real status based on the user
     // posting rights for the selected sources.
-    if (!UserHelper::userHasRoles(['editor']) && $status === 'pending') {
+    if (!UserHelper::userHasRoles(['editor'], $user) && $status === 'pending') {
       // Retrieve the list of sources and check the user rights.
       if (!$this->field_source->isEmpty()) {
         // Extract source ids.
@@ -86,6 +94,15 @@ protected function updateModerationStatusFromPostingRights() {
     }
   }
 
+  /**
+   * Update the status for the entity based on the expiration date.
+   */
+  protected function updateModerationStatusFromExpirationDate() {
+    if ($this->getModerationStatus() === 'published' && $this->hasExpired()) {
+      $this->setModerationStatus('expired');
+    }
+  }
+
   /**
    * Update the status to refused if any of the sources is blocked.
    */

From 3a030552b700440ec5a48b1ad9b7b54c46405b87 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 8 Mar 2022 23:33:13 +0000
Subject: [PATCH 559/720] [RW-409] Do not mark form title as optional

---
 html/modules/custom/reliefweb_form/reliefweb_form.module | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/html/modules/custom/reliefweb_form/reliefweb_form.module b/html/modules/custom/reliefweb_form/reliefweb_form.module
index f1fb5cc68..b73b05065 100644
--- a/html/modules/custom/reliefweb_form/reliefweb_form.module
+++ b/html/modules/custom/reliefweb_form/reliefweb_form.module
@@ -126,6 +126,10 @@ function reliefweb_form_date_element_process(array $element, FormStateInterface
  *   The modified form element.
  */
 function reliefweb_form_mark_optional(array $element, FormStateInterface $form_state, array $form) {
+  if ($element === $form) {
+    return $element;
+  }
+
   $context = [
     'form_state' => $form_state,
     'form' => $form,

From 6d1a916e0d236b63a8eba4213b7ce9bd7a07d272 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 9 Mar 2022 00:04:26 +0000
Subject: [PATCH 560/720] [RW-409] Move logic to mark job/training as expired
 when saving to their bundle entity preSave

---
 .../src/Services/JobModeration.php            | 21 -------------------
 .../src/Services/TrainingModeration.php       | 21 -------------------
 2 files changed, 42 deletions(-)

diff --git a/html/modules/custom/reliefweb_moderation/src/Services/JobModeration.php b/html/modules/custom/reliefweb_moderation/src/Services/JobModeration.php
index 69bd7700a..f2d42beb8 100644
--- a/html/modules/custom/reliefweb_moderation/src/Services/JobModeration.php
+++ b/html/modules/custom/reliefweb_moderation/src/Services/JobModeration.php
@@ -7,7 +7,6 @@
 use Drupal\reliefweb_moderation\EntityModeratedInterface;
 use Drupal\reliefweb_moderation\Helpers\UserPostingRightsHelper;
 use Drupal\reliefweb_moderation\ModerationServiceBase;
-use Drupal\reliefweb_utility\Helpers\DateHelper;
 use Drupal\reliefweb_utility\Helpers\UserHelper;
 
 /**
@@ -164,26 +163,6 @@ public function isEditableStatus($status, ?AccountInterface $account = NULL) {
     ]);
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function entityPresave(EntityModeratedInterface $entity) {
-    // Set the status of the entity as expired if past the deadline.
-    $status = $entity->getModerationStatus();
-
-    if ($status === 'published') {
-      $time = gmmktime(0, 0, 0);
-      $date = DateHelper::getDateTimeStamp($entity->field_job_closing_date->value);
-
-      // Set status to expired if the current date is past the deadline.
-      if (!empty($date) && $date < $time) {
-        $entity->setModerationStatus('expired');
-      }
-    }
-
-    parent::entityPresave($entity);
-  }
-
   /**
    * {@inheritdoc}
    */
diff --git a/html/modules/custom/reliefweb_moderation/src/Services/TrainingModeration.php b/html/modules/custom/reliefweb_moderation/src/Services/TrainingModeration.php
index 170734a9b..6f63edcfe 100644
--- a/html/modules/custom/reliefweb_moderation/src/Services/TrainingModeration.php
+++ b/html/modules/custom/reliefweb_moderation/src/Services/TrainingModeration.php
@@ -7,7 +7,6 @@
 use Drupal\reliefweb_moderation\EntityModeratedInterface;
 use Drupal\reliefweb_moderation\Helpers\UserPostingRightsHelper;
 use Drupal\reliefweb_moderation\ModerationServiceBase;
-use Drupal\reliefweb_utility\Helpers\DateHelper;
 use Drupal\reliefweb_utility\Helpers\UserHelper;
 
 /**
@@ -189,26 +188,6 @@ public function isEditableStatus($status, ?AccountInterface $account = NULL) {
     ]);
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function entityPresave(EntityModeratedInterface $entity) {
-    // Set the status of the entity as expired if past the deadline.
-    $status = $entity->getModerationStatus();
-
-    if ($status === 'published') {
-      $time = gmmktime(0, 0, 0);
-      $date = DateHelper::getDateTimeStamp($entity->field_registration_deadline->value);
-
-      // Set status to expired if the current date is past the deadline.
-      if (!empty($date) && $date < $time) {
-        $entity->setModerationStatus('expired');
-      }
-    }
-
-    parent::entityPresave($entity);
-  }
-
   /**
    * {@inheritdoc}
    */

From c53396eead5976404fbd62e965cc75646c75c32e Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 9 Mar 2022 00:40:37 +0000
Subject: [PATCH 561/720] [RW-289] Change guideline field widget to a select
 with autocomplete

---
 ...play.guideline.field_guideline.default.yml |  12 +-
 .../ReliefWebEntityReferenceSelect.php        |   1 +
 .../GuidelineFieldTargetDefaultFormatter.php  | 193 ++++++++++++++++++
 .../GuidelineFieldTargetSelectWidget.php      | 147 +++++++++++++
 .../src/Services/GuidelineFormAlter.php       |   3 +-
 5 files changed, 350 insertions(+), 6 deletions(-)
 create mode 100644 html/modules/custom/reliefweb_guidelines/src/Plugin/Field/FieldFormatter/GuidelineFieldTargetDefaultFormatter.php
 create mode 100644 html/modules/custom/reliefweb_guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetSelectWidget.php

diff --git a/config/core.entity_form_display.guideline.field_guideline.default.yml b/config/core.entity_form_display.guideline.field_guideline.default.yml
index 15e3b572c..b9bc1d777 100644
--- a/config/core.entity_form_display.guideline.field_guideline.default.yml
+++ b/config/core.entity_form_display.guideline.field_guideline.default.yml
@@ -12,8 +12,9 @@ dependencies:
     - guidelines.guideline_type.field_guideline
     - image.style.thumbnail
   module:
-    - guidelines
+    - allowed_formats
     - link
+    - reliefweb_guidelines
     - svg_image
     - text
 id: guideline.field_guideline.default
@@ -26,11 +27,14 @@ content:
     weight: 1
     region: content
     settings:
-      rows: 5
+      rows: 20
       placeholder: ''
-    third_party_settings: {  }
+    third_party_settings:
+      allowed_formats:
+        hide_help: '0'
+        hide_guidelines: '1'
   field_field:
-    type: guideline_field_target_widget
+    type: guideline_field_target_select_widget
     weight: 4
     region: content
     settings:
diff --git a/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebEntityReferenceSelect.php b/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebEntityReferenceSelect.php
index e6dfdc152..b6d711410 100644
--- a/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebEntityReferenceSelect.php
+++ b/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebEntityReferenceSelect.php
@@ -8,6 +8,7 @@
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Field\Plugin\Field\FieldWidget\OptionsSelectWidget;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Form\OptGroup;
 use Drupal\reliefweb_utility\Helpers\LocalizationHelper;
 use Drupal\reliefweb_utility\Traits\EntityDatabaseInfoTrait;
 
diff --git a/html/modules/custom/reliefweb_guidelines/src/Plugin/Field/FieldFormatter/GuidelineFieldTargetDefaultFormatter.php b/html/modules/custom/reliefweb_guidelines/src/Plugin/Field/FieldFormatter/GuidelineFieldTargetDefaultFormatter.php
new file mode 100644
index 000000000..a735b0571
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/src/Plugin/Field/FieldFormatter/GuidelineFieldTargetDefaultFormatter.php
@@ -0,0 +1,193 @@
+<?php
+
+namespace Drupal\reliefweb_guidelines\Plugin\Field\FieldFormatter;
+
+use Drupal\Core\Entity\EntityFieldManagerInterface;
+use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Field\FieldDefinitionInterface;
+use Drupal\Core\Field\FieldItemInterface;
+use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\Field\FormatterBase;
+use Drupal\Core\Form\FormStateInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Implementation of the 'guideline_field_target_default_formatter' formatter.
+ *
+ * @FieldFormatter(
+ *   id = "guideline_field_target_default_formatter",
+ *   label = @Translation("Guideline field target default formatter"),
+ *   field_types = {
+ *     "guideline_field_target_type"
+ *   }
+ * )
+ */
+class GuidelineFieldTargetDefaultFormatter extends FormatterBase {
+
+  /**
+   * The entity field manager.
+   *
+   * @var \Drupal\Core\Entity\EntityFieldManagerInterface
+   */
+  protected $entityFieldManager;
+
+  /**
+   * The entity type bundle info service.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeBundleInfoInterface
+   */
+  protected $entityTypeBundleInfo;
+
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * Constructs a FormatterBase object.
+   *
+   * @param string $plugin_id
+   *   The plugin_id for the formatter.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
+   *   The definition of the field to which the formatter is associated.
+   * @param array $settings
+   *   The formatter settings.
+   * @param string $label
+   *   The formatter label display setting.
+   * @param string $view_mode
+   *   The view mode.
+   * @param array $third_party_settings
+   *   Any third party settings.
+   * @param \Drupal\Core\Entity\EntityFieldManagerInterface $entity_field_manager
+   *   The entity field manager.
+   * @param \Drupal\Core\Entity\EntityTypeBundleInfoInterface $entity_type_bundle_info
+   *   The entity type bundle info service.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager.
+   */
+  public function __construct(
+    $plugin_id,
+    $plugin_definition,
+    FieldDefinitionInterface $field_definition,
+    array $settings,
+    $label,
+    $view_mode,
+    array $third_party_settings,
+    EntityFieldManagerInterface $entity_field_manager,
+    EntityTypeBundleInfoInterface $entity_type_bundle_info,
+    EntityTypeManagerInterface $entity_type_manager
+  ) {
+    parent::__construct(
+      $plugin_id,
+      $plugin_definition,
+      $field_definition,
+      $settings,
+      $label,
+      $view_mode,
+      $third_party_settings
+    );
+    $this->entityFieldManager = $entity_field_manager;
+    $this->entityTypeBundleInfo = $entity_type_bundle_info;
+    $this->entityTypeManager = $entity_type_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $plugin_id,
+      $plugin_definition,
+      $configuration['field_definition'],
+      $configuration['settings'],
+      $configuration['label'],
+      $configuration['view_mode'],
+      $configuration['third_party_settings'],
+      $container->get('entity_field.manager'),
+      $container->get('entity_type.bundle.info'),
+      $container->get('entity_type.manager')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function defaultSettings() {
+    return [
+      // Implement default settings.
+    ] + parent::defaultSettings();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function settingsForm(array $form, FormStateInterface $form_state) {
+    return [
+      // Implement settings form.
+    ] + parent::settingsForm($form, $form_state);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function settingsSummary() {
+    $summary = [];
+
+    return $summary;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function viewElements(FieldItemListInterface $items, $langcode) {
+    $elements = [];
+
+    foreach ($items as $delta => $item) {
+      $elements[$delta] = ['#markup' => $this->viewValue($item)];
+    }
+
+    return $elements;
+  }
+
+  /**
+   * Generate the output appropriate for one field item.
+   *
+   * @param \Drupal\Core\Field\FieldItemInterface $item
+   *   One field item.
+   *
+   * @return string
+   *   The textual output generated.
+   */
+  protected function viewValue(FieldItemInterface $item) {
+    if (!$item->isEmpty()) {
+      [$entity_type_id, $bundle, $field_name] = explode('.', $item->value);
+
+      $entity_type = $this->entityTypeManager
+        ->getDefinition($entity_type_id);
+
+      $bundle_info = $this->entityTypeBundleInfo
+        ->getBundleInfo($entity_type_id);
+
+      $field_definitions = $this->entityFieldManager
+        ->getFieldDefinitions($entity_type_id, $bundle);
+
+      $field_label = $field_name;
+      if (isset($field_definitions[$field_name])) {
+        $field_label = $field_definitions[$field_name]->getLabel();
+      }
+
+      return implode(' > ', [
+        isset($entity_type) ? $entity_type->getLabel() : $entity_type_id,
+        $bundle_info[$bundle]['label'] ?? $bundle,
+        $field_label,
+      ]);
+    }
+    return '';
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetSelectWidget.php b/html/modules/custom/reliefweb_guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetSelectWidget.php
new file mode 100644
index 000000000..941d5829e
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetSelectWidget.php
@@ -0,0 +1,147 @@
+<?php
+
+namespace Drupal\reliefweb_guidelines\Plugin\Field\FieldWidget;
+
+use Drupal\Core\Field\Plugin\Field\FieldWidget\OptionsSelectWidget;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Form\OptGroup;
+use Drupal\Core\Entity\ContentEntityTypeInterface;
+use Drupal\Core\Entity\FieldableEntityInterface;
+
+/**
+ * Plugin implementation of the 'guideline_field_target_select_widget' widget.
+ *
+ * @FieldWidget(
+ *   id = "guideline_field_target_select_widget",
+ *   module = "reliefweb_guidelines",
+ *   label = @Translation("Guideline field target select widget"),
+ *   multiple_values = true,
+ *   field_types = {
+ *     "guideline_field_target_type"
+ *   }
+ * )
+ */
+class GuidelineFieldTargetSelectWidget extends OptionsSelectWidget {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function defaultSettings() {
+    return [
+      'enabled_entities' => [],
+    ] + parent::defaultSettings();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function settingsForm(array $form, FormStateInterface $form_state) {
+    $elements = [];
+
+    /** @var \Drupal\Core\Entity\EntityFieldManager $entity_field_manager */
+    $entity_type_manager = \Drupal::service('entity_type.manager');
+
+    /** @var \Drupal\Core\Entity\EntityTypeBundleInfo $entity_type_bundle_info */
+    $entity_type_bundle_info = \Drupal::service('entity_type.bundle.info');
+
+    $entity_types = $entity_type_manager->getDefinitions();
+    $bundle_info = $entity_type_bundle_info->getAllBundleInfo();
+
+    $options = [];
+    foreach ($entity_types as $entity_type_id => $entity_type) {
+      if ($entity_type instanceof ContentEntityTypeInterface && isset($bundle_info[$entity_type_id])) {
+        foreach ($bundle_info[$entity_type_id] as $bundle => $info) {
+          $options[$entity_type_id][$entity_type_id . '.' . $bundle] = $info['label'];
+        }
+      }
+    }
+
+    $elements['enabled_entities'] = [
+      '#type' => 'select',
+      '#title' => $this->t('Enabled entities'),
+      '#default_value' => $this->getSetting('enabled_entities'),
+      '#required' => FALSE,
+      '#multiple' => TRUE,
+      '#options' => $options,
+    ];
+
+    return $elements;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function settingsSummary() {
+    $summary = [];
+
+    $summary[] = $this->t('Enabled entities: @enabled_entities', [
+      '@enabled_entities' => implode(', ', array_filter($this->getSetting('enabled_entities'))),
+    ]);
+
+    return $summary;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getOptions(FieldableEntityInterface $entity) {
+    if (!isset($this->options)) {
+      $options = ['_none' => $this->getEmptyLabel()];
+
+      /** @var \Drupal\Core\Entity\EntityFieldManager $entity_field_manager */
+      $entity_field_manager = \Drupal::service('entity_field.manager');
+
+      /** @var \Drupal\Core\Entity\EntityTypeBundleInfo $entity_type_bundle_info */
+      $entity_type_bundle_info = \Drupal::service('entity_type.bundle.info');
+
+      $bundle_info = $entity_type_bundle_info->getAllBundleInfo();
+
+      $enabled_entities = array_filter($this->getSetting('enabled_entities'));
+      foreach ($enabled_entities as $enabled_entity) {
+        [$entity_type_id, $bundle] = explode('.', $enabled_entity);
+        $bundle_label = $bundle_info[$entity_type_id][$bundle]['label'] ?? $bundle;
+
+        // Retrieve the list of fields displayed in the default entity form.
+        // Only those fields can have attached guidelines.
+        $form_fields = \Drupal::entityTypeManager()
+          ->getStorage('entity_form_display')
+          ?->load($entity_type_id . '.' . $bundle . '.default')
+          ?->getComponents();
+
+        $field_definitions = $entity_field_manager->getFieldDefinitions($entity_type_id, $bundle);
+        foreach ($field_definitions as $field_name => $field_definition) {
+          // Skip if the field is not supposed to be editable.
+          if (!isset($form_fields[$field_name])) {
+            continue;
+          }
+
+          // Skip computed, internal and read-only fields.
+          if ($field_definition->isComputed() || $field_definition->isInternal() || $field_definition->isReadOnly()) {
+            continue;
+          }
+
+          $key = $entity_type_id . '.' . $bundle . '.' . $field_name;
+          $options[$key] = $bundle_label . ' > ' . $field_definition->getLabel() . ' (' . $field_name . ')';
+        }
+      }
+
+      // Options might be nested ("optgroups"). If the widget does not support
+      // nested options, flatten the list.
+      if (!$this->supportsGroups()) {
+        $options = OptGroup::flattenOptions($options);
+      }
+
+      $this->options = $options;
+    }
+
+    return $this->options;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEmptyLabel() {
+    return !$this->required ? $this->t('- None -') : $this->t('- Select a value -');
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineFormAlter.php b/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineFormAlter.php
index 12a309d19..24e41b33d 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineFormAlter.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineFormAlter.php
@@ -31,9 +31,8 @@ protected function addBundleFormAlterations(array &$form, FormStateInterface $fo
     $form['field_images']['widget']['#theme_wrappers'] = ['fieldset'];
 
     // Transform the field selector into a select with autocomplete.
-    $form['field_field']['widget']['#type'] = 'select';
     $form['field_field']['widget']['#attributes']['data-with-autocomplete'] = '';
-    $form['field_field']['widget']['#description'] = $this->t('Select the node or term field this guideline is for.');
+    $form['field_field']['widget']['#description'] = $this->t('Select the node or term field(s) this guideline is for.');
 
     // Url to create a new guideline list.
     $new_list_url = Url::fromRoute('entity.guideline.add_form', [

From c66ecfe689c8955cce4461e92be92b89294eecb4 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 9 Mar 2022 01:10:13 +0000
Subject: [PATCH 562/720] [RW-410] Improve guidelines sort form

---
 .../reliefweb_guidelines.module               |   4 +
 .../src/Form/GuidelineSortForm.php            | 155 ++++++++++++++++++
 .../common_design_subtheme.theme              |   8 +-
 .../components/rw-form/rw-form--widget.css    |  36 ++++
 4 files changed, 200 insertions(+), 3 deletions(-)
 create mode 100644 html/modules/custom/reliefweb_guidelines/src/Form/GuidelineSortForm.php

diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
index 8221cf90e..b6573f70e 100644
--- a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
@@ -11,6 +11,7 @@ use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\reliefweb_entities\EntityFormAlterServiceBase;
 use Drupal\reliefweb_guidelines\Controller\GuidelineSinglePageController;
 use Drupal\reliefweb_guidelines\Entity\Guideline;
+use Drupal\reliefweb_guidelines\Form\GuidelineSortForm;
 use Drupal\reliefweb_guidelines\ModeratedGuidelineStorageSchema;
 use Drupal\reliefweb_revisions\Services\EntityHistory;
 
@@ -63,6 +64,9 @@ function reliefweb_guidelines_entity_base_field_info(EntityTypeInterface $entity
 function reliefweb_guidelines_entity_type_alter(array &$entity_types) {
   if (isset($entity_types['guideline'])) {
     $entity_types['guideline']->setHandlerClass('storage_schema', ModeratedGuidelineStorageSchema::class);
+
+    // Replace the sort form handler.
+    $entity_types['guideline']->setFormClass('sort', GuidelineSortForm::class);
   }
 }
 
diff --git a/html/modules/custom/reliefweb_guidelines/src/Form/GuidelineSortForm.php b/html/modules/custom/reliefweb_guidelines/src/Form/GuidelineSortForm.php
new file mode 100644
index 000000000..e277e1856
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/src/Form/GuidelineSortForm.php
@@ -0,0 +1,155 @@
+<?php
+
+namespace Drupal\reliefweb_guidelines\Form;
+
+use Drupal\Core\Entity\ContentEntityForm;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\FieldableEntityInterface;
+use Drupal\Core\Form\FormStateInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Form controller for Guideline edit forms.
+ *
+ * @ingroup guidelines
+ */
+class GuidelineSortForm extends ContentEntityForm {
+
+  /**
+   * The current user account.
+   *
+   * @var \Drupal\Core\Session\AccountProxyInterface
+   */
+  protected $account;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    // Instantiates this form class.
+    $instance = parent::create($container);
+    $instance->account = $container->get('current_user');
+    return $instance;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'guideline_sort_form';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    /** @var \Drupal\guidelines\Entity\Guideline $guideline */
+    $guideline = $this->entity;
+
+    $form['#title'] = $this->t('Sort guidelines under %list', [
+      '%list' => $guideline->label(),
+    ]);
+
+    $children = $guideline->getChildren();
+    if (empty($children)) {
+      return;
+    }
+
+    // Build table.
+    $group_class = 'group-order-weight';
+    $form['items'] = [
+      '#type' => 'table',
+      '#header' => [
+        $this->t('Guideline'),
+        $this->t('Weight'),
+      ],
+      '#empty' => $this->t('No items.'),
+      '#tableselect' => FALSE,
+      '#tabledrag' => [
+        [
+          'action' => 'order',
+          'relationship' => 'sibling',
+          'group' => $group_class,
+          'hidden' => TRUE,
+        ],
+      ],
+    ];
+
+    // Build rows.
+    foreach ($children as $child) {
+      $id = $child->id();
+
+      $form['items'][$id]['#attributes']['class'][] = 'draggable';
+      $form['items'][$id]['#weight'] = $child->getWeight();
+
+      // Label.
+      $form['items'][$id]['label'] = [
+        '#markup' => $child->toLink($child->label(), 'edit-form')->toString(),
+      ];
+
+      // Weight.
+      $form['items'][$id]['weight'] = [
+        '#type' => 'weight',
+        '#title' => $this->t('Weight for @title', [
+          '@title' => $child->label(),
+        ]),
+        '#title_display' => 'invisible',
+        '#default_value' => $child->getWeight(),
+        '#attributes' => [
+          'class' => [
+            $group_class,
+          ],
+        ],
+      ];
+    }
+
+    $form['actions']['#type'] = 'actions';
+    $form['actions']['submit'] = [
+      '#type' => 'submit',
+      '#value' => $this->t('Save'),
+      '#button_type' => 'primary',
+    ];
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function extractFormValues(FieldableEntityInterface $entity, array &$form, FormStateInterface $form_state) {
+    return [];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function copyFormValuesToEntity(EntityInterface $entity, array $form, FormStateInterface $form_state) {
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    /** @var \Drupal\guidelines\Entity\Guideline $guideline */
+    $guideline = $this->entity;
+
+    $children = $guideline->getChildren();
+    $new_weights = $form_state->getValue('items');
+
+    foreach ($children as $child) {
+      if (isset($new_weights[$child->id()])) {
+        if ($child->getWeight() !== $new_weights[$child->id()]['weight']) {
+          $child->setWeight($new_weights[$child->id()]['weight']);
+          $child->save();
+        }
+      }
+    }
+  }
+
+}
diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.theme b/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
index e2ff5716a..884469b51 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
@@ -181,10 +181,12 @@ function common_design_subtheme_theme(array $existing, $type, $theme, $path) {
 }
 
 /**
- * Implements hook_form_node_HOOK_alter().
+ * Implements hook_form_guideline_HOOK_alter().
  */
-function common_design_subtheme_form_guideline_form_alter(&$form, FormStateInterface $form_state) {
-  common_design_add_entity_edit_form_theme($form, $form_state);
+function common_design_subtheme_form_guideline_form_alter(&$form, FormStateInterface $form_state, $form_id) {
+  if (!empty($form_state->get('form_display'))) {
+    common_design_add_entity_edit_form_theme($form, $form_state);
+  }
 }
 
 /**
diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
index a08ab0659..ad8289692 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
@@ -264,3 +264,39 @@ form .ief-form .fieldset-wrapper {
 .rw-file-widget .warning.tabledrag-changed {
   color: red;
 }
+
+/* Table drag. */
+.tabledrag-toggle-weight-wrapper {
+  margin-bottom: 0;
+}
+.messages.tabledrag-changed-warning {
+  color: red;
+}
+.draggable a.tabledrag-handle {
+  display: inline-flex;
+  float: none;
+  align-items: center;
+  justify-content: center;
+  width: 28px;
+  height: 32px;
+  margin-left: 0;
+}
+.draggable a.tabledrag-handle .handle {
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  padding: 0;
+}
+.draggable .warning.tabledrag-changed {
+  margin-left: 4px;
+  color: red;
+}
+
+.cd-flow > .tabledrag-toggle-weight-wrapper {
+  margin-top: var(--cd-flow-space, 1rem);
+}
+.cd-flow > .tabledrag-toggle-weight-wrapper ~ table,
+.cd-flow > .tabledrag-toggle-weight-wrapper ~ .tableresponsive-toggle-columns,
+.cd-flow > .tabledrag-toggle-weight-wrapper ~ .tabledrag-changed-warning {
+  margin-top: 0;
+}

From c60213f3e0eb5255c200e931aabd75970a6d50d6 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 9 Mar 2022 01:13:31 +0000
Subject: [PATCH 563/720] [RW-412] Improve guideline moderation backend

---
 .../src/Entity/Guideline.php                  | 11 ++++
 .../src/Services/GuidelineListModeration.php  | 16 +++++
 .../src/Services/GuidelineModeration.php      | 60 ++++++++++++++++++-
 3 files changed, 85 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/reliefweb_guidelines/src/Entity/Guideline.php b/html/modules/custom/reliefweb_guidelines/src/Entity/Guideline.php
index 9a6aac3a6..2061d817d 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Entity/Guideline.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Entity/Guideline.php
@@ -97,4 +97,15 @@ public function getDefaultModerationStatus() {
     return 'published';
   }
 
+  /**
+   * Get the list, this guideline belongs to.
+   *
+   * @return \Drupal\reliefweb_guidelines\Entity\GuidelineList|null
+   *   Guideline List.
+   */
+  public function getGuidelineList() {
+    $parents = $this->getParents();
+    return !empty($parents) ? reset($parents) : NULL;
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineListModeration.php b/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineListModeration.php
index f8d063027..066522f8e 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineListModeration.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineListModeration.php
@@ -3,7 +3,9 @@
 namespace Drupal\reliefweb_guidelines\Services;
 
 use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Link;
 use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Url;
 use Drupal\reliefweb_moderation\EntityModeratedInterface;
 use Drupal\reliefweb_moderation\ModerationServiceBase;
 
@@ -78,6 +80,20 @@ public function getRows(array $results) {
       // Entity data cell.
       $data = [];
 
+      // Add link to the sort form.
+      $children = $entity->getChildren();
+      if (!empty($children)) {
+        $label = $this->formatPlural(count($children), '1 child guideline', '@count child guidelines');
+        // Sigh... we cannot use `$entity->toLink($label, 'sort-form')` because
+        // that would make Drupal look for a `entity.guideline.sort_form` route
+        // which doesn't exist because the route for the sort form is
+        // defined as `entity.{entity_type_id}.sort`...
+        $url = Url::fromRoute('entity.' . $entity->getEntityTypeId() . '.sort', [
+          'guideline' => $entity->id(),
+        ]);
+        $data['info']['sort'] = Link::fromTextAndUrl($label, $url);
+      }
+
       // Title.
       $data['title'] = $entity->toLink()->toString();
 
diff --git a/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineModeration.php b/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineModeration.php
index 1679e8274..9db5a0ec9 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineModeration.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineModeration.php
@@ -3,7 +3,9 @@
 namespace Drupal\reliefweb_guidelines\Services;
 
 use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Link;
 use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Url;
 use Drupal\reliefweb_moderation\EntityModeratedInterface;
 use Drupal\reliefweb_moderation\ModerationServiceBase;
 
@@ -79,13 +81,35 @@ public function getRows(array $results) {
       $data = [];
 
       // Title.
-      $data['title'] = $entity->toLink()->toString();
+      $data['title'] = Link::fromTextAndUrl($entity->label(), Url::fromUserInput('/guidelines', [
+        'fragment' => $entity->getShortId(),
+      ]));
 
       // Information.
       $info = [];
-      // @todo add parent guideline list.
+      $list = $entity->getGuidelineList();
+      if (!empty($list)) {
+        $info['list'] = $list->toLink()->toString();
+      }
       $data['info'] = array_filter($info);
 
+      $details = [];
+      if (!$entity->field_field->isEmpty()) {
+        $fields = [];
+        foreach ($entity->field_field as $item) {
+          $field_label = static::getTargetFieldName($item->value);
+          if (!empty($field_label)) {
+            $fields[] = $field_label;
+          }
+        }
+        if (!empty($fields)) {
+          $details['fields'] = $this->formatPlural(count($fields), '<strong>Field:</strong> @fields', '<strong>Fields:</strong> @fields', [
+            '@fields' => implode(', ', $fields),
+          ]);
+        }
+      }
+      $data['details'] = array_filter($details);
+
       // Revision information.
       $data['revision'] = $this->getEntityRevisionData($entity);
 
@@ -103,6 +127,38 @@ public function getRows(array $results) {
     return $rows;
   }
 
+  /**
+   * Get the label of a guideline target field.
+   *
+   * @param string $value
+   *   Target field in the form `entity_type.bunde.field_name`.
+   *
+   * @return string
+   *   The field label.
+   */
+  protected static function getTargetFieldName($value) {
+    if (empty($value)) {
+      return '';
+    }
+    [$entity_type_id, $bundle, $field_name] = explode('.', $value);
+
+    $bundle_info = \Drupal::service('entity_type.bundle.info')
+      ->getBundleInfo($entity_type_id);
+
+    $field_definitions = \Drupal::service('entity_field.manager')
+      ->getFieldDefinitions($entity_type_id, $bundle);
+
+    $field_label = $field_name;
+    if (isset($field_definitions[$field_name])) {
+      $field_label = $field_definitions[$field_name]->getLabel();
+    }
+
+    return implode(' > ', [
+      $bundle_info[$bundle]['label'] ?? $bundle,
+      $field_label,
+    ]);
+  }
+
   /**
    * {@inheritdoc}
    */

From 52e24d02bf375e6c20522a68957933ee648eb89c Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 9 Mar 2022 01:21:19 +0000
Subject: [PATCH 564/720] [RW-413] Fix spacing between title and content on
 guideline pages

---
 .../rw-page-title/rw-page-title.css           |  5 +++++
 ...guideline--field-guideline--full.html.twig | 22 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 html/themes/custom/common_design_subtheme/templates/rw-modules/guideline/guideline--field-guideline--full.html.twig

diff --git a/html/themes/custom/common_design_subtheme/components/rw-page-title/rw-page-title.css b/html/themes/custom/common_design_subtheme/components/rw-page-title/rw-page-title.css
index 60fd76245..ba111f862 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-page-title/rw-page-title.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-page-title/rw-page-title.css
@@ -9,3 +9,8 @@
 .rw-404 .rw-page-title {
   margin-bottom: 24px;
 }
+
+/* Avoid having a h1.rw-page-title attached to the page content. */
+.rw-page-title + .rw-page-content {
+  margin-top: 24px;
+}
diff --git a/html/themes/custom/common_design_subtheme/templates/rw-modules/guideline/guideline--field-guideline--full.html.twig b/html/themes/custom/common_design_subtheme/templates/rw-modules/guideline/guideline--field-guideline--full.html.twig
new file mode 100644
index 000000000..476d38ed7
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/templates/rw-modules/guideline/guideline--field-guideline--full.html.twig
@@ -0,0 +1,22 @@
+{#
+/**
+ * @file guideline.html.twig
+ * Default theme implementation to present Guideline data.
+ *
+ * This template is used when viewing Guideline pages.
+ *
+ *
+ * Available variables:
+ * - content: A list of content items. Use 'content' to print all content, or
+ * - attributes: HTML attributes for the container element.
+ *
+ * @see template_preprocess_guideline()
+ *
+ * @ingroup themeable
+ */
+#}
+<div class="rw-page-content">
+{% if content %}
+  {{- content -}}
+{% endif %}
+</div>

From 900e412af64ff9f62550cfa618ac8da91ab471b4 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 9 Mar 2022 07:01:33 +0000
Subject: [PATCH 565/720] [RW-406] Add link to guidelines in header

---
 ...migration.reliefweb_menu_link__header.yml} |  17 ++-
 config/user.role.editor.yml                   |   2 +
 config/user.role.webmaster.yml                |   2 +
 .../reliefweb_guidelines.permissions.yml      |   3 +
 .../reliefweb_guidelines.routing.yml          |   2 +-
 ...migration.reliefweb_menu_link__header.yml} |  13 ++-
 .../templates/navigation/menu--help.html.twig | 106 ++++++++++++++++++
 7 files changed, 136 insertions(+), 9 deletions(-)
 rename config/{migrate_plus.migration.reliefweb_menu_link__help.yml => migrate_plus.migration.reliefweb_menu_link__header.yml} (71%)
 create mode 100644 html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.permissions.yml
 rename html/modules/custom/reliefweb_migrate/config/install/{migrate_plus.migration.reliefweb_menu_link__help.yml => migrate_plus.migration.reliefweb_menu_link__header.yml} (76%)
 create mode 100644 html/themes/custom/common_design_subtheme/templates/navigation/menu--help.html.twig

diff --git a/config/migrate_plus.migration.reliefweb_menu_link__help.yml b/config/migrate_plus.migration.reliefweb_menu_link__header.yml
similarity index 71%
rename from config/migrate_plus.migration.reliefweb_menu_link__help.yml
rename to config/migrate_plus.migration.reliefweb_menu_link__header.yml
index 1afab646a..70b9e45b2 100644
--- a/config/migrate_plus.migration.reliefweb_menu_link__help.yml
+++ b/config/migrate_plus.migration.reliefweb_menu_link__header.yml
@@ -1,4 +1,4 @@
-uuid: d1a1a842-2f6d-48f6-b49f-9be1ecf61061
+uuid: 1988fe46-36e3-4c14-88af-0cbb86413b56
 langcode: en
 status: true
 dependencies:
@@ -6,8 +6,8 @@ dependencies:
     module:
       - reliefweb_migrate
 _core:
-  default_config_hash: oMGwjRYiH0smHUBnxss8xQ1S_QnyNsZRCpVunpTxj8M
-id: reliefweb_menu_link__help
+  default_config_hash: pi8p-ZwjH0M6dxQ1YNfCO4hlMVjQpYFgDDIFZWR2b88
+id: reliefweb_menu_link__header
 class: null
 field_plugin_method: null
 cck_plugin_method: null
@@ -15,7 +15,7 @@ migration_tags:
   - 'Drupal 7'
   - Content
 migration_group: reliefweb_base
-label: 'Migrate ReliefWeb help menu links.'
+label: 'Migrate ReliefWeb header menu links.'
 source:
   plugin: embedded_data
   data_rows:
@@ -26,6 +26,13 @@ source:
       link_uri: 'base:/help'
       external: 0
       weight: 0
+    -
+      id: 14
+      title: Guidelines
+      description: Guidelines
+      link_uri: 'internal:/guidelines'
+      external: 0
+      weight: -1
   ids:
     id:
       type: integer
@@ -52,4 +59,4 @@ destination:
   no_stub: true
 migration_dependencies:
   required:
-    - rw_menu_link__main
+    - rw_menu_link__footer
diff --git a/config/user.role.editor.yml b/config/user.role.editor.yml
index 692756ae2..5b9bd99ff 100644
--- a/config/user.role.editor.yml
+++ b/config/user.role.editor.yml
@@ -33,6 +33,7 @@ dependencies:
     - reliefweb_docstore
     - reliefweb_fields
     - reliefweb_form
+    - reliefweb_guidelines
     - reliefweb_homepage
     - reliefweb_moderation
     - reliefweb_revisions
@@ -48,6 +49,7 @@ is_admin: null
 permissions:
   - 'access content moderation backend'
   - 'access content moderation features'
+  - 'access editorial guidelines'
   - 'access media overview'
   - 'access reliefweb links field validation'
   - 'access reliefweb private files'
diff --git a/config/user.role.webmaster.yml b/config/user.role.webmaster.yml
index 4bc173c71..0061073f3 100644
--- a/config/user.role.webmaster.yml
+++ b/config/user.role.webmaster.yml
@@ -26,6 +26,7 @@ dependencies:
     - filter
     - google_tag
     - guidelines
+    - reliefweb_guidelines
     - reliefweb_users
     - taxonomy
     - taxonomy_term_revision
@@ -34,6 +35,7 @@ label: Webmaster
 weight: 4
 is_admin: null
 permissions:
+  - 'access editorial guidelines'
   - 'add content to books'
   - 'add guideline entities'
   - 'administer google tag manager'
diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.permissions.yml b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.permissions.yml
new file mode 100644
index 000000000..d6d7ed4a9
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.permissions.yml
@@ -0,0 +1,3 @@
+access editorial guidelines:
+  title: 'Access editorial guidelines'
+  description: 'Allow users to access the editorial guidelines.'
diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.routing.yml b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.routing.yml
index 0d76e6032..ecda459d9 100644
--- a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.routing.yml
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.routing.yml
@@ -4,4 +4,4 @@ reliefweb_guidelines.guidelines:
     _title: 'Guidelines'
     _controller: '\Drupal\reliefweb_guidelines\Controller\GuidelineSinglePageController::getPageContent'
   requirements:
-    _permission: 'access content'
+    _permission: 'access editorial guidelines'
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_menu_link__help.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_menu_link__header.yml
similarity index 76%
rename from html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_menu_link__help.yml
rename to html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_menu_link__header.yml
index 0478a8574..c5607c7c9 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_menu_link__help.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_menu_link__header.yml
@@ -1,5 +1,5 @@
-id: reliefweb_menu_link__help
-label: Migrate ReliefWeb help menu links.
+id: reliefweb_menu_link__header
+label: Migrate ReliefWeb header menu links.
 migration_group: reliefweb_base
 dependencies:
   enforced:
@@ -19,6 +19,13 @@ source:
       link_uri: base:/help
       external: 0
       weight: 0
+    -
+      id: 14
+      title: Guidelines
+      description: Guidelines
+      link_uri: internal:/guidelines
+      external: 0
+      weight: -1
   ids:
     id:
       type: integer
@@ -45,4 +52,4 @@ process:
   parent: constants/parent
 migration_dependencies:
   required:
-    - rw_menu_link__main
+    - rw_menu_link__footer
diff --git a/html/themes/custom/common_design_subtheme/templates/navigation/menu--help.html.twig b/html/themes/custom/common_design_subtheme/templates/navigation/menu--help.html.twig
new file mode 100644
index 000000000..c951328b9
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/templates/navigation/menu--help.html.twig
@@ -0,0 +1,106 @@
+{#
+/**
+ * @file
+ * Theme override to display a menu.
+ *
+ * Available variables:
+ * - menu_name: The machine name of the menu.
+ * - items: A nested list of menu items. Each menu item contains:
+ *   - attributes: HTML attributes for the menu item.
+ *   - below: The menu item child items.
+ *   - title: The menu link title.
+ *   - url: The menu link url, instance of \Drupal\Core\Url
+ *   - localized_options: Menu link localized options.
+ *   - is_expanded: TRUE if the link has visible children within the current
+ *     menu tree.
+ *   - is_collapsed: TRUE if the link has children within the current menu tree
+ *     that are not currently visible.
+ *   - in_active_trail: TRUE if the link is in the active trail.
+ */
+#}
+{% import _self as menus %}
+
+{#
+  We call a macro which calls itself to render the full tree.
+  @see https://twig.symfony.com/doc/1.x/tags/macro.html
+#}
+{{ menus.menu_links(items, attributes, 0) }}
+{% macro menu_links(items, attributes, menu_level) %}
+  {% import _self as menus %}
+  {% if items %}
+
+    {%
+      set menu_classes = [
+        'menu',
+        menu_level > 0 ? 'cd-global-header__dropdown',
+        menu_level > 0 ? 'cd-user-menu__dropdown'
+      ]
+    %}
+
+    <ul{{ attributes.addClass(menu_classes) }}>
+
+    {% for item in items %}
+      {%
+        set classes = [
+          'menu-item',
+          item.is_expanded ? 'menu-item--expanded',
+          item.is_collapsed ? 'menu-item--collapsed',
+          item.in_active_trail ? 'menu-item--active-trail',
+        ]
+      %}
+
+      {% set title = item.title %}
+      {% set id = ('cd-help-menu-item-' ~ menu_level ~ '-' ~ loop.index)|clean_id %}
+
+      <li{{ item.attributes.addClass(classes) }}>
+
+        {#
+          Progressive enhancement: make sure there is always a menu entry.
+          If the menu item has children and javascript is enabled then this will
+          be replaced with a button to show the child menu.
+        #}
+        {% spaceless %}
+        <a href="{{ item.url }}" id="{{ id }}">
+          {# Add the user icon for the first menu item of the root element. #}
+          {% if menu_level == 0 and item.url|render == '/help' %}
+            <svg class="cd-icon cd-icon--help" aria-hidden="true" focusable="false" width="16" height="16">
+              <use xlink:href="#cd-icon--help"></use>
+            </svg>
+          {% endif %}
+          <span>{{ title }}</span>
+        </a>
+        {% endspaceless %}
+
+        {# If the menu item has children then we mark it as toggable and we'll
+           let the dropdown javascript handle the rest. #}
+        {% if item.is_expanded and item.below %}
+
+          {%
+            set attributes =  create_attribute({
+              'data-cd-toggable': title,
+              'data-cd-icon': 'arrow-down',
+              'data-cd-component': 'cd-help-menu',
+              'data-cd-replace': id,
+              'id': ('cd-help-menu-' ~ menu_level ~ '-' ~ loop.index)|clean_id,
+            })
+          %}
+
+          {# Add the help icon for the first menu item of the root element. #}
+          {% if menu_level == 0 and loop.index == 1 %}
+          {%
+            do attributes
+              .setAttribute('data-cd-logo', 'help')
+              .setAttribute('data-cd-logo-only', '')
+          %}
+          {% endif %}
+
+          {{ menus.menu_links(item.below, attributes, menu_level + 1) }}
+
+        {% endif %}
+
+      </li>
+
+    {% endfor %}
+    </ul>
+  {% endif %}
+{% endmacro %}

From 785eecdb0a86e0e356035bdfc2161545c6d6f4e0 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 9 Mar 2022 07:04:10 +0000
Subject: [PATCH 566/720] [RW-407] Add guideline list and target field filters
 to guideline moderation page

---
 .../GuidelineFieldTargetSelectWidget.php      |  88 ++++++-----
 .../src/Services/GuidelineModeration.php      | 140 ++++++++++++++++++
 2 files changed, 192 insertions(+), 36 deletions(-)

diff --git a/html/modules/custom/reliefweb_guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetSelectWidget.php b/html/modules/custom/reliefweb_guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetSelectWidget.php
index 941d5829e..fa38442c9 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetSelectWidget.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Plugin/Field/FieldWidget/GuidelineFieldTargetSelectWidget.php
@@ -87,54 +87,70 @@ public function settingsSummary() {
   protected function getOptions(FieldableEntityInterface $entity) {
     if (!isset($this->options)) {
       $options = ['_none' => $this->getEmptyLabel()];
+      $options += static::getAvailableFormFields($this->getSetting('enabled_entities'));
 
-      /** @var \Drupal\Core\Entity\EntityFieldManager $entity_field_manager */
-      $entity_field_manager = \Drupal::service('entity_field.manager');
+      // Options might be nested ("optgroups"). If the widget does not support
+      // nested options, flatten the list.
+      if (!$this->supportsGroups()) {
+        $options = OptGroup::flattenOptions($options);
+      }
 
-      /** @var \Drupal\Core\Entity\EntityTypeBundleInfo $entity_type_bundle_info */
-      $entity_type_bundle_info = \Drupal::service('entity_type.bundle.info');
+      $this->options = $options;
+    }
 
-      $bundle_info = $entity_type_bundle_info->getAllBundleInfo();
+    return $this->options;
+  }
 
-      $enabled_entities = array_filter($this->getSetting('enabled_entities'));
-      foreach ($enabled_entities as $enabled_entity) {
-        [$entity_type_id, $bundle] = explode('.', $enabled_entity);
-        $bundle_label = $bundle_info[$entity_type_id][$bundle]['label'] ?? $bundle;
+  /**
+   * Get the list of available form fields for the given entity bundles.
+   *
+   * @param array $enabled_entities
+   *   List of entity_type + bundle that are allowed as targets. The list items
+   *   are in the form "entity_type_id.bundle".
+   *
+   * @return array
+   *   List of available target form fields.
+   */
+  public static function getAvailableFormFields(array $enabled_entities) {
+    $options = [];
 
-        // Retrieve the list of fields displayed in the default entity form.
-        // Only those fields can have attached guidelines.
-        $form_fields = \Drupal::entityTypeManager()
-          ->getStorage('entity_form_display')
-          ?->load($entity_type_id . '.' . $bundle . '.default')
-          ?->getComponents();
+    /** @var \Drupal\Core\Entity\EntityFieldManager $entity_field_manager */
+    $entity_field_manager = \Drupal::service('entity_field.manager');
 
-        $field_definitions = $entity_field_manager->getFieldDefinitions($entity_type_id, $bundle);
-        foreach ($field_definitions as $field_name => $field_definition) {
-          // Skip if the field is not supposed to be editable.
-          if (!isset($form_fields[$field_name])) {
-            continue;
-          }
+    /** @var \Drupal\Core\Entity\EntityTypeBundleInfo $entity_type_bundle_info */
+    $entity_type_bundle_info = \Drupal::service('entity_type.bundle.info');
 
-          // Skip computed, internal and read-only fields.
-          if ($field_definition->isComputed() || $field_definition->isInternal() || $field_definition->isReadOnly()) {
-            continue;
-          }
+    $bundle_info = $entity_type_bundle_info->getAllBundleInfo();
 
-          $key = $entity_type_id . '.' . $bundle . '.' . $field_name;
-          $options[$key] = $bundle_label . ' > ' . $field_definition->getLabel() . ' (' . $field_name . ')';
+    $enabled_entities = array_filter($enabled_entities);
+    foreach ($enabled_entities as $enabled_entity) {
+      [$entity_type_id, $bundle] = explode('.', $enabled_entity);
+      $bundle_label = $bundle_info[$entity_type_id][$bundle]['label'] ?? $bundle;
+
+      // Retrieve the list of fields displayed in the default entity form.
+      // Only those fields can have attached guidelines.
+      $form_fields = \Drupal::entityTypeManager()
+        ->getStorage('entity_form_display')
+        ?->load($entity_type_id . '.' . $bundle . '.default')
+        ?->getComponents();
+
+      $field_definitions = $entity_field_manager->getFieldDefinitions($entity_type_id, $bundle);
+      foreach ($field_definitions as $field_name => $field_definition) {
+        // Skip if the field is not supposed to be editable.
+        if (!isset($form_fields[$field_name])) {
+          continue;
         }
-      }
 
-      // Options might be nested ("optgroups"). If the widget does not support
-      // nested options, flatten the list.
-      if (!$this->supportsGroups()) {
-        $options = OptGroup::flattenOptions($options);
-      }
+        // Skip computed, internal and read-only fields.
+        if ($field_definition->isComputed() || $field_definition->isInternal() || $field_definition->isReadOnly()) {
+          continue;
+        }
 
-      $this->options = $options;
+        $key = $entity_type_id . '.' . $bundle . '.' . $field_name;
+        $options[$key] = $bundle_label . ' > ' . $field_definition->getLabel() . ' (' . $field_name . ')';
+      }
     }
-
-    return $this->options;
+    return $options;
   }
 
   /**
diff --git a/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineModeration.php b/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineModeration.php
index 9db5a0ec9..950565513 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineModeration.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineModeration.php
@@ -6,6 +6,7 @@
 use Drupal\Core\Link;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Url;
+use Drupal\reliefweb_guidelines\Plugin\Field\FieldWidget\GuidelineFieldTargetSelectWidget;
 use Drupal\reliefweb_moderation\EntityModeratedInterface;
 use Drupal\reliefweb_moderation\ModerationServiceBase;
 
@@ -250,6 +251,30 @@ protected function initFilterDefinitions(array $filters = []) {
       'form' => 'omnibox',
       'widget' => 'datepicker',
     ];
+    $definitions['list'] = [
+      'type' => 'field',
+      'field' => 'parent',
+      'column' => 'target_id',
+      'label' => $this->t('Guideline List'),
+      'shortcut' => 'gl',
+      'form' => 'omnibox',
+      'widget' => 'autocomplete',
+      'autocomplete_callback' => 'getGuidelineListAutocompleteSuggestions',
+      'operator' => 'OR',
+      'allow_no_value' => TRUE,
+    ];
+    $definitions['field'] = [
+      'type' => 'field',
+      'field' => 'field_field',
+      'column' => 'value',
+      'label' => $this->t('Form field'),
+      'shortcut' => 'ff',
+      'form' => 'omnibox',
+      'widget' => 'autocomplete',
+      'autocomplete_callback' => 'getGuidelineTargetFieldAutocompleteSuggestions',
+      'operator' => 'OR',
+      'allow_no_value' => TRUE,
+    ];
     return $definitions;
   }
 
@@ -261,4 +286,119 @@ public function checkModerationPageAccess(AccountInterface $account) {
       ->andIf(AccessResult::allowedIfHasPermission($account, 'edit guideline entities'));
   }
 
+  /**
+   * Get guideline list suggestions for the given term.
+   *
+   * @param string $filter
+   *   Filter name.
+   * @param string $term
+   *   Autocomplete search term.
+   * @param string $conditions
+   *   Stringified database conditions in the form:
+   *   "(@field = 'bar' AND @field = 'bar')".
+   *   This conditions will be duplicated for each passed field and combined
+   *   into a OR condition.
+   * @param array $replacements
+   *   Value replacements for the search condition.
+   *
+   * @return array
+   *   List of suggestions. Each suggestion is an object with a value, label
+   *   and optional abbreviation (abbr).
+   */
+  protected function getGuidelineListAutocompleteSuggestions($filter, $term, $conditions, array $replacements) {
+    $entity_type_id = $this->getEntityTypeId();
+
+    $table = $this->getEntityTypeDataTable($entity_type_id);
+    $alias = $table;
+    $id_field = $this->getEntityTypeIdField($entity_type_id);
+    $label_field = $this->getEntityTypeLabelField($entity_type_id);
+    $bundle_field = $this->getEntityTypeBundleField($entity_type_id);
+
+    // List of fields used for the condition replacements.
+    $fields = [$alias . '.' . $label_field];
+
+    // Base query.
+    $query = $this->getDatabase()->select($table, $alias);
+    $query->addField($alias, $id_field, 'value');
+    $query->addField($alias, $label_field, 'label');
+    $query->condition($alias . '.' . $bundle_field, 'guideline_list', '=');
+    $query->range(0, 10);
+    $query->distinct();
+
+    // Add conditions.
+    $conditions = $this->buildFilterConditions($conditions, $fields);
+    $query->where($conditions, $replacements);
+
+    // Sort by name.
+    $query->orderBy($alias . '.name', 'ASC');
+
+    return $query->execute()?->fetchAll() ?? [];
+  }
+
+  /**
+   * Get guideline target field suggestions for the given term.
+   *
+   * @param string $filter
+   *   Filter name.
+   * @param string $term
+   *   Autocomplete search term.
+   * @param string $conditions
+   *   Stringified database conditions in the form:
+   *   "(@field = 'bar' AND @field = 'bar')".
+   *   This conditions will be duplicated for each passed field and combined
+   *   into a OR condition.
+   * @param array $replacements
+   *   Value replacements for the search condition.
+   *
+   * @return array
+   *   List of suggestions. Each suggestion is an object with a value, label
+   *   and optional abbreviation (abbr).
+   */
+  protected function getGuidelineTargetFieldAutocompleteSuggestions($filter, $term, $conditions, array $replacements) {
+    $form_fields = static::getAvailableTargetFormFields();
+    if (empty($form_fields)) {
+      return [];
+    }
+
+    $parts = explode(' ', $term);
+
+    $suggestions = [];
+    foreach ($form_fields as $value => $label) {
+      foreach ($parts as $part) {
+        if (mb_strpos($label, $part) === FALSE && mb_strpos($value, $part) === FALSE) {
+          continue 2;
+        }
+      }
+      $suggestions[] = (object) [
+        'value' => $value,
+        'label' => $label,
+      ];
+    }
+
+    return $suggestions;
+  }
+
+  /**
+   * Get the list of available target form fields.
+   *
+   * @return array
+   *   Associative array of available form fields with keys in the form
+   *   `entity_type_id.bundle.field_name` and with labels as values.
+   */
+  protected static function getAvailableTargetFormFields() {
+    static $fields;
+
+    if (!isset($fields)) {
+      $component = \Drupal::service('entity_display.repository')
+        ->getFormDisplay('guideline', 'field_guideline', 'default')
+        ?->getComponent('field_field') ?? [];
+
+      $enabled_entities = $component['settings']['enabled_entities'] ?? [];
+
+      $fields = GuidelineFieldTargetSelectWidget::getAvailableFormFields($enabled_entities);
+    }
+
+    return $fields;
+  }
+
 }

From 5e22346dd1a381affc3f42981e2114c819eeeea1 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 9 Mar 2022 11:48:36 +0100
Subject: [PATCH 567/720] RW-406 subtheme function to attach svg sprite

---
 .../common_design_subtheme.theme                 | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.theme b/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
index 884469b51..a732a7191 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
@@ -426,3 +426,19 @@ function common_design_subtheme_add_optional_mark_to_title($title) {
     '@title' => $title,
   ]);
 }
+
+/**
+ * Implements hook_preprocess_html().
+ */
+function common_design_subtheme_preprocess_html(&$vars) {
+  // SVG sprite
+  // Get the contents of the SVG sprite.
+  $icons = file_get_contents(\Drupal::service('extension.list.theme')->getPath('common_design_subtheme') . '/img/icons/cd-icons-sprite.svg');
+
+  // Add a new render array to page_bottom so the icons
+  // get added to the page.
+  $vars['page_bottom']['icons'] = [
+    '#type' => 'inline_template',
+    '#template' => '<span class="hidden">' . $icons . '</span>',
+  ];
+}

From 3d18386d91d89ec2f1a5d636f4fb77b410d7a079 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 9 Mar 2022 11:49:00 +0100
Subject: [PATCH 568/720] RW-406 condition for guidelines menu item and add avg

---
 .../templates/navigation/menu--help.html.twig                | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/templates/navigation/menu--help.html.twig b/html/themes/custom/common_design_subtheme/templates/navigation/menu--help.html.twig
index c951328b9..b8d036743 100644
--- a/html/themes/custom/common_design_subtheme/templates/navigation/menu--help.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/navigation/menu--help.html.twig
@@ -67,6 +67,11 @@
               <use xlink:href="#cd-icon--help"></use>
             </svg>
           {% endif %}
+          {% if menu_level == 0 and item.url|render == '/guidelines' %}
+            <svg class="cd-icon cd-icon--education" aria-hidden="true" focusable="false" width="16" height="16">
+              <use xlink:href="#cd-icon--education"></use>
+            </svg>
+          {% endif %}
           <span>{{ title }}</span>
         </a>
         {% endspaceless %}

From 065a3e9480fd4ae23d2acd14cfb1c5f7fec80ebe Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 9 Mar 2022 11:49:44 +0100
Subject: [PATCH 569/720] RW-406 copy icons from base theme, add education
 icon, copy config from base theme, generate sprite

---
 .../_config/svg-sprite.config.json            |    5 +
 .../img/icons/about.svg                       |    1 +
 .../img/icons/add--white.svg                  |    1 +
 .../common_design_subtheme/img/icons/add.svg  |    1 +
 .../img/icons/admin.svg                       |    3 +
 .../img/icons/alert.svg                       |    2 +
 .../img/icons/arrow-down--highlighted.svg     |    1 +
 .../img/icons/arrow-down.svg                  |    1 +
 .../img/icons/arrow-left.svg                  |    1 +
 .../img/icons/arrow-right.svg                 |    1 +
 .../img/icons/arrow-up--highlighted.svg       |    1 +
 .../img/icons/arrow-up.svg                    |    1 +
 .../img/icons/cd-icons-sprite.svg             |    1 +
 .../img/icons/copyurl.svg                     |    1 +
 .../img/icons/creative-commons.svg            |    6 +
 .../img/icons/education.svg                   |    1 +
 .../img/icons/expand-left.svg                 |    1 +
 .../img/icons/expand-right.svg                |    1 +
 .../img/icons/external-link.svg               |    4 +
 .../img/icons/form-error.svg                  |    1 +
 .../img/icons/form-required.svg               |    1 +
 .../common_design_subtheme/img/icons/help.svg |    1 +
 .../img/icons/ocha-logo.svg                   |    1 +
 .../common_design_subtheme/img/icons/pdf.svg  |    1 +
 .../img/icons/search.svg                      |    1 +
 .../img/icons/selected--highlighted.svg       |    1 +
 .../img/icons/selected.svg                    |    1 +
 .../img/icons/sm-fb-def.svg                   |    1 +
 .../img/icons/sm-fb-full.svg                  |    1 +
 .../img/icons/sm-gh-def.svg                   |    1 +
 .../img/icons/sm-gh-full.svg                  |    1 +
 .../img/icons/sm-ig-def.svg                   |    1 +
 .../img/icons/sm-ig-full.svg                  |    1 +
 .../img/icons/sm-ln-def.svg                   |    1 +
 .../img/icons/sm-ln-full.svg                  |    1 +
 .../img/icons/sm-rss-def.svg                  |    1 +
 .../img/icons/sm-rss-full.svg                 |    1 +
 .../img/icons/sm-tt-def.svg                   |    1 +
 .../img/icons/sm-tt-full.svg                  |    1 +
 .../img/icons/sm-yt-def.svg                   |    1 +
 .../img/icons/sm-yt-full.svg                  |    1 +
 .../img/icons/social-links--facebook.svg      |    1 +
 .../img/icons/social-links--linkedin.svg      |    1 +
 .../img/icons/social-links--twitter.svg       |    1 +
 .../img/icons/sprite.symbol.html              | 1185 +++++++++++++++++
 .../img/icons/user--white.svg                 |    1 +
 .../common_design_subtheme/img/icons/user.svg |    1 +
 47 files changed, 1246 insertions(+)
 create mode 100644 html/themes/custom/common_design_subtheme/_config/svg-sprite.config.json
 create mode 100755 html/themes/custom/common_design_subtheme/img/icons/about.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/add--white.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/add.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/admin.svg
 create mode 100755 html/themes/custom/common_design_subtheme/img/icons/alert.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/arrow-down--highlighted.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/arrow-down.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/arrow-left.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/arrow-right.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/arrow-up--highlighted.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/arrow-up.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/cd-icons-sprite.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/copyurl.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/creative-commons.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/education.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/expand-left.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/expand-right.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/external-link.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/form-error.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/form-required.svg
 create mode 100755 html/themes/custom/common_design_subtheme/img/icons/help.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/ocha-logo.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/pdf.svg
 create mode 100755 html/themes/custom/common_design_subtheme/img/icons/search.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/selected--highlighted.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/selected.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/sm-fb-def.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/sm-fb-full.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/sm-gh-def.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/sm-gh-full.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/sm-ig-def.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/sm-ig-full.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/sm-ln-def.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/sm-ln-full.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/sm-rss-def.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/sm-rss-full.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/sm-tt-def.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/sm-tt-full.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/sm-yt-def.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/sm-yt-full.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/social-links--facebook.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/social-links--linkedin.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/social-links--twitter.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/sprite.symbol.html
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/user--white.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/user.svg

diff --git a/html/themes/custom/common_design_subtheme/_config/svg-sprite.config.json b/html/themes/custom/common_design_subtheme/_config/svg-sprite.config.json
new file mode 100644
index 000000000..2d943415f
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/_config/svg-sprite.config.json
@@ -0,0 +1,5 @@
+{
+  "class": "cd-icons-sprite"
+}
+
+
diff --git a/html/themes/custom/common_design_subtheme/img/icons/about.svg b/html/themes/custom/common_design_subtheme/img/icons/about.svg
new file mode 100755
index 000000000..e4b0294a3
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/about.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 42 42"><path d="M38,0H4A3.99992,3.99992,0,0,0,0,4V38a4,4,0,0,0,4,4H38a4,4,0,0,0,4-4V4A3.99992,3.99992,0,0,0,38,0ZM24,35H20a2.00006,2.00006,0,0,1-2-2V18h4a2,2,0,0,1,2,2ZM21,13a3,3,0,1,1,3-3A3,3,0,0,1,21,13Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/add--white.svg b/html/themes/custom/common_design_subtheme/img/icons/add--white.svg
new file mode 100644
index 000000000..d25962e92
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/add--white.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path fill="#ffffff" d="M44,20H28V4a4,4,0,0,0-4-4h0a4,4,0,0,0-4,4V20H4a4,4,0,0,0,0,8H20V44a4,4,0,0,0,4,4h0a4,4,0,0,0,4-4V28H44a4,4,0,0,0,0-8Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/add.svg b/html/themes/custom/common_design_subtheme/img/icons/add.svg
new file mode 100644
index 000000000..049fcbb97
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/add.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M44,20H28V4a4,4,0,0,0-4-4h0a4,4,0,0,0-4,4V20H4a4,4,0,0,0,0,8H20V44a4,4,0,0,0,4,4h0a4,4,0,0,0,4-4V28H44a4,4,0,0,0,0-8Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/admin.svg b/html/themes/custom/common_design_subtheme/img/icons/admin.svg
new file mode 100644
index 000000000..3e4698885
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/admin.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48">
+  <path d="M45 21h-1.25a19.867 19.867 0 0 0-3.668-8.84l.889-.888a3 3 0 1 0-4.242-4.243l-.89.889A19.868 19.868 0 0 0 27 4.25V3a3 3 0 0 0-6 0v1.25a19.868 19.868 0 0 0-8.84 3.668l-.888-.889a3 3 0 1 0-4.243 4.243l.889.889A19.867 19.867 0 0 0 4.25 21H3a3 3 0 0 0 0 6h1.25a19.867 19.867 0 0 0 3.668 8.84l-.889.888a3 3 0 0 0 4.242 4.243l.89-.889A19.868 19.868 0 0 0 21 43.75V45a3 3 0 0 0 6 0v-1.25a19.868 19.868 0 0 0 8.84-3.668l.888.889a3 3 0 1 0 4.243-4.243l-.889-.889A19.867 19.867 0 0 0 43.75 27H45a3 3 0 0 0 0-6zM24 38a14 14 0 1 1 14-14 14.016 14.016 0 0 1-14 14z"/>
+</svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/alert.svg b/html/themes/custom/common_design_subtheme/img/icons/alert.svg
new file mode 100755
index 000000000..93183c967
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/alert.svg
@@ -0,0 +1,2 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 47.99562 41.00998">
+  <path class="cls-1" d="M47.66779,37.40988,27.1178,1.8a3.604,3.604,0,0,0-6.24,0L.32783,37.40988A2.39789,2.39789,0,0,0,2.40778,41.01H45.58784A2.39789,2.39789,0,0,0,47.66779,37.40988Zm-23.67-3.3999a2,2,0,1,1,2-2A2.00591,2.00591,0,0,1,23.99781,34.01Zm2-9a2,2,0,0,1-4,0v-11a2,2,0,1,1,4,0Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/arrow-down--highlighted.svg b/html/themes/custom/common_design_subtheme/img/icons/arrow-down--highlighted.svg
new file mode 100644
index 000000000..c1e4d6055
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/arrow-down--highlighted.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path fill="#EB5C6D" d="M48,14a4,4,0,0,1-1.17,2.83l-20,20a4,4,0,0,1-5.66,0l-20-20a4,4,0,0,1,5.66-5.66L24,28.34,41.17,11.17A4,4,0,0,1,48,14Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/arrow-down.svg b/html/themes/custom/common_design_subtheme/img/icons/arrow-down.svg
new file mode 100644
index 000000000..71285268b
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/arrow-down.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M48,14a4,4,0,0,1-1.17,2.83l-20,20a4,4,0,0,1-5.66,0l-20-20a4,4,0,0,1,5.66-5.66L24,28.34,41.17,11.17A4,4,0,0,1,48,14Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/arrow-left.svg b/html/themes/custom/common_design_subtheme/img/icons/arrow-left.svg
new file mode 100644
index 000000000..445e2dddc
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/arrow-left.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M34,48a4,4,0,0,1-2.83-1.17l-20-20a4,4,0,0,1,0-5.66l20-20a4,4,0,0,1,5.66,5.66L19.66,24,36.83,41.17A4,4,0,0,1,34,48Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/arrow-right.svg b/html/themes/custom/common_design_subtheme/img/icons/arrow-right.svg
new file mode 100644
index 000000000..40d395b0d
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/arrow-right.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M14,48a4,4,0,0,1-2.83-6.83L28.34,24,11.17,6.83a4,4,0,0,1,5.66-5.66l20,20a4,4,0,0,1,0,5.66l-20,20A4,4,0,0,1,14,48Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/arrow-up--highlighted.svg b/html/themes/custom/common_design_subtheme/img/icons/arrow-up--highlighted.svg
new file mode 100644
index 000000000..8e68e558f
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/arrow-up--highlighted.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path fill="#EB5C6D" d="M0,34a4,4,0,0,1,1.17-2.83l20-20a4,4,0,0,1,5.66,0l20,20a4,4,0,1,1-5.66,5.66L24,19.66,6.83,36.83A4,4,0,0,1,0,34Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/arrow-up.svg b/html/themes/custom/common_design_subtheme/img/icons/arrow-up.svg
new file mode 100644
index 000000000..dee777e63
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/arrow-up.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M0,34a4,4,0,0,1,1.17-2.83l20-20a4,4,0,0,1,5.66,0l20,20a4,4,0,1,1-5.66,5.66L24,19.66,6.83,36.83A4,4,0,0,1,0,34Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/cd-icons-sprite.svg b/html/themes/custom/common_design_subtheme/img/icons/cd-icons-sprite.svg
new file mode 100644
index 000000000..b39adb57b
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/cd-icons-sprite.svg
@@ -0,0 +1 @@
+<svg class="cd-icons-sprite" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><symbol viewBox="0 0 42 42" id="cd-icon--about" xmlns="http://www.w3.org/2000/svg"><path d="M38 0H4a4 4 0 00-4 4v34a4 4 0 004 4h34a4 4 0 004-4V4a4 4 0 00-4-4zM24 35h-4a2 2 0 01-2-2V18h4a2 2 0 012 2zm-3-22a3 3 0 113-3 3 3 0 01-3 3z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--add" xmlns="http://www.w3.org/2000/svg"><path d="M44 20H28V4a4 4 0 00-4-4 4 4 0 00-4 4v16H4a4 4 0 000 8h16v16a4 4 0 004 4 4 4 0 004-4V28h16a4 4 0 000-8z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--add--white" xmlns="http://www.w3.org/2000/svg"><path fill="#fff" d="M44 20H28V4a4 4 0 00-4-4 4 4 0 00-4 4v16H4a4 4 0 000 8h16v16a4 4 0 004 4 4 4 0 004-4V28h16a4 4 0 000-8z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--admin" xmlns="http://www.w3.org/2000/svg"><path d="M45 21h-1.25a19.867 19.867 0 00-3.668-8.84l.889-.888a3 3 0 10-4.242-4.243l-.89.889A19.868 19.868 0 0027 4.25V3a3 3 0 00-6 0v1.25a19.868 19.868 0 00-8.84 3.668l-.888-.889a3 3 0 10-4.243 4.243l.889.889A19.867 19.867 0 004.25 21H3a3 3 0 000 6h1.25a19.867 19.867 0 003.668 8.84l-.889.888a3 3 0 004.242 4.243l.89-.889A19.868 19.868 0 0021 43.75V45a3 3 0 006 0v-1.25a19.868 19.868 0 008.84-3.668l.888.889a3 3 0 104.243-4.243l-.889-.889A19.867 19.867 0 0043.75 27H45a3 3 0 000-6zM24 38a14 14 0 1114-14 14.016 14.016 0 01-14 14z"/></symbol><symbol viewBox="0 0 47.996 41.01" id="cd-icon--alert" xmlns="http://www.w3.org/2000/svg"><path class="aecls-1" d="M47.668 37.41L27.118 1.8a3.604 3.604 0 00-6.24 0L.328 37.41a2.398 2.398 0 002.08 3.6h43.18a2.398 2.398 0 002.08-3.6zm-23.67-3.4a2 2 0 112-2 2.006 2.006 0 01-2 2zm2-9a2 2 0 01-4 0v-11a2 2 0 114 0z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--arrow-down" xmlns="http://www.w3.org/2000/svg"><path d="M48 14a4 4 0 01-1.17 2.83l-20 20a4 4 0 01-5.66 0l-20-20a4 4 0 015.66-5.66L24 28.34l17.17-17.17A4 4 0 0148 14z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--arrow-down--highlighted" xmlns="http://www.w3.org/2000/svg"><path fill="#EB5C6D" d="M48 14a4 4 0 01-1.17 2.83l-20 20a4 4 0 01-5.66 0l-20-20a4 4 0 015.66-5.66L24 28.34l17.17-17.17A4 4 0 0148 14z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--arrow-left" xmlns="http://www.w3.org/2000/svg"><path d="M34 48a4 4 0 01-2.83-1.17l-20-20a4 4 0 010-5.66l20-20a4 4 0 015.66 5.66L19.66 24l17.17 17.17A4 4 0 0134 48z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--arrow-right" xmlns="http://www.w3.org/2000/svg"><path d="M14 48a4 4 0 01-2.83-6.83L28.34 24 11.17 6.83a4 4 0 015.66-5.66l20 20a4 4 0 010 5.66l-20 20A4 4 0 0114 48z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--arrow-up" xmlns="http://www.w3.org/2000/svg"><path d="M0 34a4 4 0 011.17-2.83l20-20a4 4 0 015.66 0l20 20a4 4 0 11-5.66 5.66L24 19.66 6.83 36.83A4 4 0 010 34z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--arrow-up--highlighted" xmlns="http://www.w3.org/2000/svg"><path fill="#EB5C6D" d="M0 34a4 4 0 011.17-2.83l20-20a4 4 0 015.66 0l20 20a4 4 0 11-5.66 5.66L24 19.66 6.83 36.83A4 4 0 010 34z"/></symbol><symbol viewBox="0 0 0 0" id="cd-icon--cd-icons-sprite" xmlns="http://www.w3.org/2000/svg"/><symbol viewBox="0 0 14 14" id="cd-icon--copyurl" xmlns="http://www.w3.org/2000/svg"><path data-name="Path 533" d="M12.635 1.365a4.674 4.674 0 00-6.6 0L5.02 2.381a.718.718 0 001.015 1.015L7.05 2.38a3.232 3.232 0 114.571 4.571l-1.015 1.015a.718.718 0 101.015 1.015l1.015-1.015a4.673 4.673 0 00-.001-6.601zm-4.668 9.239L6.952 11.62a3.232 3.232 0 01-4.571-4.571l1.015-1.016a.718.718 0 10-1.015-1.015L1.365 6.033a4.668 4.668 0 006.6 6.6l1.015-1.016a.718.718 0 10-1.015-1.015zm.86-6.446L4.158 8.826a.718.718 0 101.015 1.016l4.669-4.668a.718.718 0 00-1.015-1.016z"/></symbol><symbol viewBox="0 0 64 64" id="cd-icon--creative-commons" xmlns="http://www.w3.org/2000/svg"><path d="M31.957.311c-8.682 0-16.322 3.213-22.226 9.203C3.653 15.678.354 23.666.354 32c0 8.422 3.212 16.236 9.29 22.313 6.078 6.078 13.978 9.377 22.313 9.377 8.334 0 16.409-3.299 22.66-9.463C60.521 48.41 63.646 40.683 63.646 32c0-8.595-3.125-16.408-9.116-22.399C48.453 3.523 40.639.311 31.957.311zm.086 5.73c7.12 0 13.458 2.691 18.406 7.641 4.862 4.861 7.466 11.286 7.466 18.318 0 7.119-2.518 13.371-7.379 18.146-5.123 5.035-11.721 7.727-18.493 7.727-6.858 0-13.283-2.691-18.232-7.641C8.862 45.283 6.084 38.772 6.084 32c0-6.858 2.778-13.369 7.727-18.406 4.862-4.948 11.113-7.553 18.232-7.553z"/><path id="ana" d="M31.635 26.734c-1.79-3.264-4.844-4.563-8.389-4.563-5.16 0-9.267 3.65-9.267 9.828 0 6.283 3.861 9.829 9.442 9.829 3.581 0 6.635-1.966 8.319-4.949l-3.931-2.001c-.878 2.105-2.212 2.738-3.896 2.738-2.914 0-4.248-2.422-4.248-5.617 0-3.193 1.124-5.616 4.248-5.616.842 0 2.527.456 3.51 2.563l4.212-2.212z"/><use xlink:href="#ana" transform="translate(18.281)"/></symbol><symbol viewBox="0 0 34 42" id="cd-icon--education" xmlns="http://www.w3.org/2000/svg"><path d="M33 0h-4v8l-3-1-3 1V0H0v42h33a.98.98 0 001-.95V.95A.98.98 0 0033 0zM6 38.5a.495.495 0 01-.5.5h-2a.495.495 0 01-.5-.5v-35a.495.495 0 01.5-.5h2a.495.495 0 01.5.5zM25.5 23h-13a1.5 1.5 0 010-3h13a1.5 1.5 0 010 3zm0-6h-13a1.5 1.5 0 010-3h13a1.5 1.5 0 010 3z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--expand-left" xmlns="http://www.w3.org/2000/svg"><path d="M44 48a3.989 3.989 0 01-2.828-1.171l-19-20a4 4 0 010-5.658l19-20a4 4 0 015.657 5.657L31 24l15.829 17.171A4 4 0 0144 48zm-18.17-1.171a4 4 0 000-5.658L10 24 25.829 6.828a4 4 0 00-5.657-5.657l-19 20a4 4 0 000 5.658l19 20a4 4 0 005.657 0z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--expand-right" xmlns="http://www.w3.org/2000/svg"><path d="M4 0A3.989 3.989 0 016.83 1.171l19 20a4 4 0 010 5.658l-19 20a4 4 0 01-5.657-5.657L17 24 1.172 6.829A4 4 0 014 0zm18.172 1.171a4 4 0 000 5.658L38 24 22.172 41.172a4 4 0 005.657 5.657l19-20a4 4 0 000-5.658l-19-20a4 4 0 00-5.657 0z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--external-link" xmlns="http://www.w3.org/2000/svg"><path d="M35 20.65V42H6V18h16.09l9-9H4.2A2.2 2.2 0 002 11.2v32.6A2.2 2.2 0 004.2 46h32.6a2.2 2.2 0 002.2-2.2V16.65zM12.5 12a1.5 1.5 0 11-1.5 1.5 1.5 1.5 0 011.5-1.5zm-5 0A1.5 1.5 0 116 13.5 1.5 1.5 0 017.5 12z"/><path d="M44 2H23a2 2 0 000 4h16L16.51 28.52a2.1 2.1 0 003 3L42 9v16a2 2 0 004 0V4a2 2 0 00-2-2z"/></symbol><symbol fill="#e32700" viewBox="0 0 16 16" id="cd-icon--form-error" xmlns="http://www.w3.org/2000/svg"><path d="M8.002 1a7 7 0 100 14 7 7 0 000-14zm4.025 9.284c.062.063.1.149.1.239a.34.34 0 01-.1.24l-1.262 1.262a.34.34 0 01-.48 0L8.002 9.742l-2.286 2.283a.34.34 0 01-.48 0l-1.261-1.262a.336.336 0 010-.478L6.258 8 3.975 5.716a.34.34 0 010-.48l1.262-1.262a.34.34 0 01.48 0l2.285 2.284 2.283-2.284a.34.34 0 01.48 0l1.262 1.262c.062.063.1.149.1.24a.345.345 0 01-.1.24L9.744 8l2.283 2.284z"/></symbol><symbol viewBox="0 0 16 16" id="cd-icon--form-required" xmlns="http://www.w3.org/2000/svg"><path fill="#E00" d="M0 7.562l1.114-3.438c2.565.906 4.43 1.688 5.59 2.35-.306-2.921-.467-4.93-.484-6.027h3.511c-.05 1.597-.234 3.6-.558 6.003 1.664-.838 3.566-1.613 5.714-2.325L16 7.562c-2.05.678-4.06 1.131-6.028 1.356.984.856 2.372 2.381 4.166 4.575l-2.906 2.059c-.935-1.274-2.041-3.009-3.316-5.206-1.194 2.275-2.244 4.013-3.147 5.206l-2.856-2.059c1.872-2.307 3.211-3.832 4.017-4.575A86.77 86.77 0 010 7.562"/></symbol><symbol viewBox="0 0 28 48" id="cd-icon--help" xmlns="http://www.w3.org/2000/svg"><circle class="aucls-1" cx="14" cy="44" r="4"/><path class="aucls-1" d="M28 14a14 14 0 00-28 0 4 4 0 008 0 6 6 0 116 6 4 4 0 00-4 4v9a4 4 0 008 0v-5.59A14.02 14.02 0 0028 14z"/></symbol><symbol viewBox="0 0 41.9 37" id="cd-icon--ocha-logo" xmlns="http://www.w3.org/2000/svg"><path class="avcls-1" d="M17.6 15.6a3.3 3.3 0 113.3 3.3v-.4a2.9 2.9 0 10-2.9-2.9 2.9 2.9 0 002.9 2.9v.4a3.33 3.33 0 01-3.3-3.3"/><path data-name="Shape" class="avcls-1" d="M15 15.6a6 6 0 116 6v-.4a5.6 5.6 0 10-5.6-5.6 5.59 5.59 0 005.6 5.6v.4a6 6 0 01-6-6"/><path data-name="Shape" class="avcls-1" d="M12.1 15.6a8.9 8.9 0 118.9 8.9V24a8.54 8.54 0 008.5-8.4 8.5 8.5 0 10-17 0A8.41 8.41 0 0021 24v.4a8.77 8.77 0 01-8.9-8.8"/><path data-name="Shape" class="avcls-1" d="M9.3 15.6A11.65 11.65 0 1121 27.2v-.4A11.2 11.2 0 109.8 15.6 11.18 11.18 0 0021 26.8v.4A11.63 11.63 0 019.3 15.6"/><path data-name="Shape" class="avcls-1" d="M6.3 15.6A14.7 14.7 0 1121 30.3v-.4A14.3 14.3 0 106.7 15.6 14.3 14.3 0 0021 29.9v.4A14.66 14.66 0 016.3 15.6"/><path class="avcls-1" d="M20.7 1.1h.4v11.4h-.4z"/><path data-name="Shape" class="avcls-1" d="M10.6 5.5l.3-.3 8 8-.3.3-8-8z"/><path data-name="Rectangle-path" class="avcls-1" d="M6.5 15.4h11.4v.4H6.5z"/><path data-name="Shape" class="avcls-1" d="M10.6 25.7l8-8 .3.3-8 8-.3-.3z"/><path data-name="Rectangle-path" class="avcls-1" d="M20.7 18.7h.4v11.4h-.4zM23.014 17.902l.283-.282 7.967 8.014-.284.282zM24.1 15.4h11.4v.4H24.1z"/><path data-name="Shape" class="avcls-1" d="M23 13.2l8.1-8 .2.3-8 8-.3-.3zM18.7 16.5c.1 0 .1.1.1.2h.1a2.51 2.51 0 00.4-.7.1.1 0 00.1-.1c0-.1-.2-.2-.2-.3-.1.2-.3 0-.4.1v.1h.1v.2a.37.37 0 00-.3-.1c.1 0 0 0 0 .1a.75.75 0 00-.5.1c-.1 0-.1 0-.2-.1-.1.1-.1.2-.2.2l-.1-.1c.1-.1.2-.1.2-.2v-.3c.1-.1.1-.2.2-.2s.3.1.4 0l.1.1v.1c-.1.1-.2.1-.2.2s0 .1.1.1.1-.1.2-.1h.4c.1 0 .1-.3 0-.4v-.2c0-.1.2-.1.2 0v.1s0 .1.1 0v-.2a.35.35 0 00.2.1h.2c.1 0 .1-.1 0-.2h-.1a.31.31 0 01-.2.1c-.1 0-.1-.1-.2-.1s-.2.1-.2 0-.1-.1-.1-.2l.1-.1a.37.37 0 00.3-.1.35.35 0 01.1-.2h.1a.37.37 0 00.3-.1c.1 0 .2-.1.3-.2s.1-.1.2-.1a.1.1 0 01.1-.1v-.5a.1.1 0 01.1-.1h-.1s-.1-.1 0-.1.2 0 .2-.1a.19.19 0 00-.1-.3c-.1-.1-.2 0-.3 0a.1.1 0 01-.1.1c-.1 0-.2-.1-.1-.2v-.1h-.1l-.3.3v.1c0 .1 0 .2-.1.2h-.1c0 .1.2.1.1.2s-.2.1-.4.2a2.72 2.72 0 01-.9 0h-.5c-.1 0-.1.1-.2.2v-.2c0-.1-.1 0-.1-.1-.2-.4-.7-.3-1.1-.3a.1.1 0 00-.1.1c-.1.1-.2 0-.3 0l-.1.1c-.1 0-.2-.1-.3 0s-.1.1-.2.1v.1h-.1c-.1 0-.3 0-.3.1s0 .3-.1.3a.6.6 0 00-.4.1c-.1 0-.1.1-.2.1a2.45 2.45 0 00-.4 1.2v.1c-.2.4-.3.6-.6 1.1-.1.2-.2.6 0 .7s0 .2-.2.2-.4 0-.4-.2-.2-.1-.3-.1h-.4c-.2 0-.2.3-.3.4s-.3.1-.3.2v.2a.1.1 0 00-.1.1v.1c0 .2-.1.3 0 .5v.1a.9.9 0 01-.1.5c-.1.2-.3.2-.5.2h-1c-.1 0-.1-.1-.2-.1a.31.31 0 01-.1-.2c-.1-.1-.3 0-.4.1.1 0 0 .1 0 .1s-.2.1-.3.2-.2-.2-.2-.3-.1-.1-.2-.1v.1h-.1c-.1.1.1.1.1.1v.1h-.1a.1.1 0 01-.1.1c-.1 0-.1.1-.1 0v-.2h-.1c0 .1 0 .1-.1.1v.1h.2a.37.37 0 01.1.3c0 .1 0 .2-.1.1s0-.2 0-.3h-.1c.1.2-.1.3.1.5s-.2.2-.1.2a.35.35 0 00.2.1v-.1s.1-.1.1 0v.1H8v.4c0 .1.2 0 .2.1s-.1.1 0 .2a.1.1 0 01.1.1v.1a.1.1 0 01.1.1c.1 0 .1 0 .1-.1s.1-.1.1-.2 0-.1-.1 0V21c0-.1-.1-.1-.1-.2s.1 0 .2-.1a.1.1 0 01.1.1v.1a.1.1 0 01.1.1c.1 0 .1.1.2.2h.3v-.1l.1.1a.37.37 0 00.1.3h.1l.1.1h.1a.1.1 0 01.1.1c.1 0 .2 0 .2.1s.1.2.2.4a29772.51 29772.51 0 01.2.2.37.37 0 00.3.1.35.35 0 01.2-.1h.1c.1.2.1.4.3.4s.1.1.2.2h.2a.1.1 0 00.1.1c.1.1.2.1.2.2v.1c.1 0 .2-.1.2 0s.2.1.2.2h.1v-.1c0-.1.1 0 .2-.1s.1-.2.1-.2.2.1.3.2h.1c.1.1.1.3.2.3s.2.1.4.2.2.1.3.1h.1c.1 0 .1 0 .2-.1s.3-.1.4-.2l.1-.1c.2-.1.5.1.7 0s.1 0 .2-.1.2-.3.1-.4-.2-.5-.3-.7l-.3-.3h-.1c-.1 0-.1-.1-.1-.2a.1.1 0 01-.1-.1v-.3c-.1 0-.2-.1-.4-.1a.1.1 0 01-.1-.1v-.1a.37.37 0 01.3-.1v-.3a.1.1 0 00-.1-.1c0-.1.1-.2 0-.3s-.2-.2-.2-.3a.1.1 0 01-.1-.1v-.5c0-.1-.1-.1 0-.2l.1-.1c.1 0 .1-.1.1-.2a.14.14 0 00-.2 0v-.3l-.1-.1v-.2s0-.1-.1 0v-.2c0-.1-.1-.2-.2-.1a.14.14 0 01-.2 0V18a.1.1 0 00.1-.1.14.14 0 000-.2c-.1-.1-.2-.2-.1-.3-.1 0-.3 0-.3-.2s0-.3-.1-.4v-.3a.1.1 0 01.1-.1c.2 0 .4 0 .4-.1s-.1-.3 0-.3.4 0 .6-.2c.1 0 .1-.1 0-.2a.35.35 0 00-.1-.2c-.1-.1-.2 0-.3-.2V15c0-.1.1-.1.2-.2s.3 0 .5.1l.1.1v.1c0 .2.1.4 0 .6s-.1.1-.1.2h.1c0 .1.1.3 0 .4s-.1 0-.3 0-.1 0-.1.1l.1.1c.4.1.5.1.9.2.1 0 .1.1.2.1h.3a.1.1 0 00.1.1c.1.1.1.3.2.3a.14.14 0 01.2 0c-.1.1 0 .2 0 .3s.2.1.3.2.2.1.2 0-.1-.2 0-.3c.1.2 0 .4.1.6.1.1.1.2.2.2s.1-.1.1-.2v-.1c0-.1 0-.1.1-.2s.1-.2.1-.3v-.1c0-.1.2-.2.3-.2V17c.1 0 0-.2.1-.2s.1-.1.1-.2.1-.1 0-.1c.5.1.5 0 .5 0"/><path data-name="Shape" class="avcls-1" d="M14.5 16.3h-.1v.1l.1.1v.3c0 .1.1.2.2.1s.2-.3.1-.4-.1-.1-.3-.2M14.3 17.2c.1.2.2.1.3.1v-.1c-.1-.1-.1-.1-.3 0 .1-.1 0-.1 0-.1v.1M14.6 17.6c0-.2-.1-.2-.2-.1s0 .3.1.4a.1.1 0 00.1.1c0 .1.1 0 .2 0s0-.1.1-.1c-.1-.1-.2-.3-.3-.3"/><path data-name="Shape" class="avcls-1" d="M14.3 16.8c0-.1-.1-.1 0 0-.1 0-.1 0-.1.1s0 .2.1.2a.1.1 0 00.1-.1c-.1-.1-.1-.1-.1-.2M14.7 17.4l.1-.1h.1v-.1c-.1 0-.1.1-.2.1s0 .1 0 .1M14.6 18.3c0 .1 0 .1.1.1h.1v-.1h-.2M14.8 19c0-.1.1-.1 0-.2h-.1a.35.35 0 00.1.2M8.5 21.5v.1h.2c-.1 0-.1-.2-.2-.1M9.1 22.2c-.1.1.1.2.2.2v-.2a.14.14 0 00-.2 0M9.4 22.6c0 .2.1.3.2.3.1-.2 0-.3-.2-.3M19.5 17.4a1.27 1.27 0 01.6-.1c.4 0 .4-.6.6-.9a.6.6 0 00-.1-.4c-.1-.2-.6 0-.7-.2s.3.1.3-.1 0-.1-.1-.2h-.2a2 2 0 00-.4.8 5.38 5.38 0 00-.9 1.2c0 .1 0 .1.1.2.3.1.6-.2.8-.3M21.3 16.4c-.1 0-.1 0-.2.1v.2h.1c0-.1 0-.1-.1-.1.2-.1.2-.2.2-.2M20 17.9c.1.2.5.1.5 0s-.3-.2-.4-.2.1.1-.1.2M20.5 19.2a.37.37 0 00.1-.3l-.3.3h.2M22.3 16.5v-.1h-.2c-.1 0-.1-.1-.1-.2s-.1-.2-.1-.3-.1.2-.1.2c.2.2.3.5.5.4M19.9 15.3c-.1-.1-.1 0 0 0-.1.1 0 .1 0 0M8.1 19.1A.1.1 0 008 19h-.1v.1a.14.14 0 00.2 0M8.8 19.1c.1 0 .2-.1.1-.2s-.3 0-.2.1c-.1.1 0 .2.1.1M20.2 12.1c0-.1.1-.1.1-.2h-.1c-.1 0-.1.1 0 .2M20.5 12s.1-.1 0-.1h-.1a.1.1 0 00.1.1M19.4 14.6c0 .1.2.3.3.2a.14.14 0 000-.2.19.19 0 00-.3 0M19.7 15.4v-.1h-.3a.1.1 0 00.1.1c0-.1.1 0 .2 0M19.4 15.6c-.1 0 0 .1 0 .2s.1 0 .2-.1.1-.2 0-.2-.2 0-.2.1M19.2 15.3c0 .1-.1.2 0 .3s.1 0 .1 0 0-.2.1-.2h-.1v-.1h-.1M26.8 22.4c.1 0 0-.1 0 0"/><path data-name="Shape" class="avcls-1" d="M21 18.5l-.1-.1c0-.1-.1.1-.2 0 .1.1 0 .1-.1.2a.1.1 0 00.1.1c0 .1-.1.1 0 .2l-.1.1s-.1.1 0 .1.2-.1.3-.1h.1c.1 0 .1-.1.2-.2H21s-.1 0 0-.3M21.6 20.4c0 .1.1.1 0 0 .1 0 .1-.1.1-.2h-.1v.2M21.7 20.2c.1 0 0-.1 0-.1h-.1a.1.1 0 00.1.1M22.3 20.5c-.1 0-.1-.1-.2 0H22v.1c.2-.1.2-.1.3-.1M23.3 20.4v-.1c-.1 0-.2.1-.3 0v.1h-.1c.2.1.3 0 .4 0M23.7 20c0 .2.2.1.2 0s0-.1-.2 0l.1-.1a.1.1 0 01-.1.1M28.5 16.8c0 .1.1.1.2.1a.37.37 0 00.3-.1.27.27 0 00-.3-.3c-.2.1-.2.2-.2.3M28.5 21.9h-.1c-.1.5-.6 1.2 0 1.5.2.2.5-.1.6-.3s0-1-.5-1.2M27 19.7c-.1 0-.1.2 0 .2a.1.1 0 00.1-.1v-.1H27M27.4 24.8v.2s.2-.1 0-.2M29.7 13.1h-.1v.2c-.2.4-.7.9-.4 1.4a1.38 1.38 0 00.3-.4 10.37 10.37 0 00.4-1s-.1-.2-.2-.2M28.8 14.9c0 .1 0 .1.1.1s.1-.1 0-.1 0-.1-.1 0M23.7 11.8c-.1-.2-.2 0-.3 0l-.1-.1h-.1c-.1 0 0 .2.1.2s.1-.1.1 0 0 .3.2.2.2-.1.3-.1.1-.1.1-.2.2-.1.3 0a.1.1 0 00.1.1c0 .1.1.1.2.1a.37.37 0 00.3-.1.19.19 0 000-.3h-.2c-.1 0-.1-.1-.2-.1-.4-.1-.6.2-.8.3M22.7 12h.3c0-.2-.2-.1-.3-.1.1-.1.1 0 0 .1"/><path data-name="Shape" class="avcls-1" d="M23.1 12.6c.1-.1.3-.2.4-.3v-.1c0-.1-.1-.1-.2-.2a.1.1 0 01-.1.1c-.1.1-.2.1-.2.2v.2c.1.3.1.2.1.1M21.6 11.6v.1c.1.1.1 0 0-.1M18 9.4a.6.6 0 00.4.1l.1-.1c-.1-.1-.2 0-.2-.1h-.1c-.1-.1-.2 0-.2.1M27.1 11c0 .1-.1 0-.2.1v.1c.1.1.2 0 .3 0s.1-.1.1 0v.1a.1.1 0 00-.1.1h-.3v.2c-.1.1-.4.2-.3.4a.75.75 0 00.5.1c0-.2.1-.2.2-.3a.1.1 0 00-.1-.1v-.1a.1.1 0 00.1-.1v-.1a.35.35 0 00.2-.1c0-.1-.1-.2-.1-.3a.1.1 0 01.1-.1v-.1h-.1s-.1 0 0 .1a.37.37 0 00-.3.1c0-.2.1 0 0 0M26.1 12c0 .1.1.1.2 0h-.2M27.5 11.8c-.1.1.1.1.2.1 0-.1-.1-.1-.2-.1M27.9 11.3c-.1 0-.1.1 0 0M25.6 7.3c.1.1.2.1.2.2v.4l.1.1v.2c0 .1.1.3.1.4a.1.1 0 01.1.1c0 .1 0 .1.1.2s.1 0 .2.1.2.3.3.4a.1.1 0 01.1.1v.1c.2 0 .5.1.4.4.1-.1.2-.1.2-.2s.1-.3 0-.4l-.2-.2V9a.1.1 0 00-.1-.1c0-.1-.1-.3.1-.3v-.1H27v-.1a.35.35 0 00-.4-.4c-.1-.1-.1-.1-.2-.1h-.2a2.09 2.09 0 01-.4-.6.19.19 0 00-.3 0c.1-.1.1-.1.1 0"/><path data-name="Shape" class="avcls-1" d="M24.7 7.6a.14.14 0 000 .2h.4a.1.1 0 00.1-.1c.1-.1.2 0 .4-.1 0 .1 0 .1.1.1s0-.2-.1-.2-.1-.2-.2-.3h-.1c0 .2-.1.1-.3.2v.1-.1h-.2a.35.35 0 01-.1.2M22.4 3.7c-.1-.2-.3-.4-.2-.7a1.39 1.39 0 00.9 0c.2-.1.5 0 .7-.1v-.2c-.3.1-.5-.2-.7-.1a3.18 3.18 0 01-.9.3c-.2.1-.9 0-.9.4.3 0 .7 0 .9.3 0 .1.1.1.2.1M23.4 5.2a.4.4 0 00.4.2c0-.1 0-.1-.1-.2h-.3M23.1 5.7c-.1 0 0 .1.1.2 0-.1.1-.3-.1-.2M22.9 5.4c.1-.1 0-.2-.1-.2v.1l.1.1M23.8 6.5a.31.31 0 00.1-.2h-.1a.14.14 0 000 .2M24.1 6.5v.1c.1.1.1 0 0-.1.1 0 0 .1 0 0M24 6.8l.1-.1c0-.1-.1-.1-.2 0s.1 0 .1.1M24.1 6.8c0 .1.1.2.2.1s.1-.1 0-.1zM24.6 7a.35.35 0 00-.1-.2s-.1.1 0 .1 0 .1.1.1M24.7 7.3h.1v-.2h-.2v.1l.1.1M24.5 7.5c.1-.1.1-.1 0-.2h-.1a.1.1 0 01-.1.1c.1.1.1.1.2.1M24.2 2.5c-.1-.1-.1-.1-.2-.1.1.1.1.2.2.1M27.6 5c.1.1.2 0 .2.1s.1.2.2.2.1 0 .1-.1 0-.4-.2-.4h-.5c-.1 0-.1.1-.1.2a.19.19 0 01.3 0"/><path data-name="Shape" class="avcls-1" d="M31.7 10.2c-.1-.1-.1-.3-.2-.4s-.2-.1-.3-.2v-.2l-.1-.1c-.1-.2-.1-.3-.3-.3 0-.2-.1-.2-.3-.3v-.1a.1.1 0 00-.1-.1h-.1c-.1-.1-.2-.2-.2-.3s-.2-.2-.3-.3l-.1-.1c-.1 0-.2 0-.2-.1s-.2-.3-.3-.4 0-.4-.1-.7c0-.1-.1-.1-.2-.1a.1.1 0 01-.1-.1c-.1-.1 0-.3-.1-.4s-.3-.3-.4-.5a.37.37 0 00-.3-.1h-.1l-.1-.1c-.1-.1-.2-.2-.3-.2s-.4 0-.6-.1-.4 0-.5.2-.3.2-.5.2 0 .1 0 .2-.2.2-.1.2h.2a.1.1 0 01.1.1c.1.1.2.2.2.3a.14.14 0 000 .2.37.37 0 01.1.3c0 .1.1 0 .1 0a.25.25 0 01.1.4v.3c.1.2.1.4.2.5l.1-.1c.1 0 .1-.1.2-.1.2-.2.4.2.5.3s0 .4.1.6a1.38 1.38 0 00.3.4.31.31 0 00.1.2l.1.1a.1.1 0 01.1-.1h.1c.2.2.2.6.5.6a.1.1 0 00.1.1c.1 0 .1-.1.2 0a.35.35 0 00.1.2h.3c.1 0 .1.1.2.2l.1.1c.2.2.3.5.5.7s.2.2.3.1v-.1a.22.22 0 00.2-.2l.3-.3c.1-.1.2-.1.3-.2.3 0 .2-.2.2-.2M27.5 10.3c0 .1.1.1.2.1s.1.2.2.2.1-.1.1-.2h.1c.1-.1 0-.3-.1-.4s-.1-.2-.3-.2-.1 0-.2.1 0 .2 0 .3v.1M28.2 10.7c-.1.2 0 .4 0 .6s-.2.1-.2.2a.14.14 0 000 .2c0 .1.2.1.3.2a1.17 1.17 0 01.6.6.37.37 0 01.1.3c.1.1.2.1.2.2s.1.1.1 0a.3.3 0 000-.4c-.1-.1-.1-.1-.1-.2a2.35 2.35 0 00-.2-.8l-.3-.3v-.1c0-.1.1-.1.1-.2s-.1-.2-.2-.3c-.2-.1-.3-.1-.4 0M29.7 12.1v-.2c0-.2-.2-.2-.3-.2h-.1v.2a2.93 2.93 0 01.3 1c0 .1.3 0 .3-.1v-.2c0-.1-.1-.1-.1-.2s-.1-.2-.1-.3M29.3 11.2c-.1.1 0 .2 0 .3.1 0 .1 0 .1-.1s0-.1-.1-.2M29.3 11c0-.1 0-.1-.1-.1s-.1.1-.2.1 0 .1.1.2c.2 0 .3-.1.2-.2M28.8 10.5c.1.1 0 .2.1.2s.2.1.3 0 0-.1-.1-.1v-.1H29c-.1-.1.1-.1 0-.2v-.1h-.1v.1c-.1.1-.2.2-.1.2M28.7 9.9c-.1 0-.2 0-.2-.1h-.1s-.1.1 0 .1a.1.1 0 01.1.1c0 .1.1 0 .1.1s.1.1.1 0V10s.1-.1 0-.1M21.6 14.5a.14.14 0 000-.2.1.1 0 00-.1.1c.1 0 .1 0 .1.1"/><path data-name="Shape" class="avcls-1" d="M29.4 13.2a.6.6 0 00-.4.1c-.2.1-.3.4-.4.6a.52.52 0 01-.4.2.1.1 0 01-.1-.1v-.2l.1-.1c.1-.1 0-.2 0-.3s-.3-.4-.5-.3-.3.3-.5.5c-.1-.1-.2-.2-.2-.3v-.1c.1 0 .2.2.2.1s0-.2-.1-.2-.1-.1-.2-.1-.1-.1-.2-.2 0-.3-.1-.3a.37.37 0 01-.3-.1h-.2v-.1c.1 0 .3 0 .2-.2s-.1-.1-.2-.1H26v.3a.37.37 0 01-.3.1h-.1c-.1 0-.2-.1-.3-.1s-.1.2-.2.2-.1 0-.2.1-.1.2 0 .3v.1a.1.1 0 01-.1-.1c0-.1-.1-.2-.1-.3s.1-.2.2-.3v-.2c-.1-.1-.1-.1-.2-.1s-.3.4-.5.3-.2-.2-.3-.2-.1-.1-.2 0a2.19 2.19 0 01-.5.3c-.1.1-.3.2-.3.4a.38.38 0 01-.6.1c-.1-.1-.2-.2-.3-.2s-.2.2-.3.2-.1 0-.2-.1v-.1l.6-.3c.1 0 .1-.1.1-.2V12a.68.68 0 00-.6.4.1.1 0 01-.1.1c-.2 0-.3.1-.5 0l-.1-.2c-.1.1-.1.2-.2.2l-.1.1c-.1.1.1.3 0 .4s-.2.1-.3.1v.2c0 .1.1 0 .1.1s.1.3.2.3.3 0 .5.1.2.1.3.2.1.1.1.2a.1.1 0 00.1.1h.2c.1 0 0 .1.1.2a.76.76 0 00.1.4s0 .2-.1.2a.1.1 0 00-.1.1v.3h.1c.1.1.1.2.2.3l.1.1a.1.1 0 00-.1.1.14.14 0 00.2 0c.1 0 .1-.1.2-.1a.1.1 0 00.1-.1.35.35 0 01.1.2c-.1.1-.3 0-.4.1s-.1 0-.2.1a.1.1 0 00.1.1c.2.1.1.4-.1.6v.2H22c-.2 0-.5-.1-.7 0s-.1.1-.1.2a.1.1 0 00-.1.1v.2c-.2.2-.2.5-.3.7a.1.1 0 00.1.1c.1 0 .1-.1.2-.1s.1.2.1.2.2.1.2 0a.37.37 0 01.1-.3c0-.1-.1-.2-.1-.3s0-.2.1-.2a.1.1 0 01.1.1v.4a.14.14 0 010 .2.1.1 0 01-.1.1v.2c-.1.1-.1.1-.1.2-.2 0-.4-.1-.3-.3-.1 0-.1 0-.2.1v.3c-.1.1-.1.2-.2.3v.1c-.1.1-.2.2-.3.2-.1.1-.2 0-.2.1s.1.2.1.3 0 .1-.1.2h-.4a.37.37 0 01-.1.3c-.1.1 0 .2.1.2s.1.2.2.2.1.1.2.1a.22.22 0 00.2-.2c0-.1.1 0 .2 0h.1a.14.14 0 000-.2l.4-.4c.1 0 .1-.1.2-.1s.1.1.2.1.1.1.2.1h.1c.1 0 .2.2.3.2a.37.37 0 00-.1-.3c-.1-.1-.2-.2-.3-.2v-.1c.1.1.1.1.2.1s.1.2.2.3.1.1.2.1a.37.37 0 00.3-.1c0-.1 0-.1-.1-.1s0-.1.1-.2 0-.2 0-.3v-.1c.1-.1 0-.2 0-.4 0 .1.1.1.2.1a.22.22 0 00.2-.2.19.19 0 01.3.1c0 .1 0 .2-.1.2a.76.76 0 00-.5.2l-.1.1c-.1.1-.1.1-.1.2l-.1.1a.1.1 0 01.1.1.37.37 0 00.3-.1v-.2c.1 0 .1-.1.2-.1s.3.2.2.3h-.1c-.1.1-.2.3-.3.3s-.5.1-.7.2-.1.2-.2.2-.2.1-.3 0c0 .1-.2 0-.3 0a.31.31 0 00-.1-.2h-.1v-.1h-.8a.1.1 0 00-.1.1l-.1.1a.37.37 0 01-.3.1.37.37 0 00-.3.1c-.2 0-.3.2-.4.3a.37.37 0 01-.3.1v.1c-.2 0-.3.3-.4.5v.2c-.1.1-.1.3-.3.4v.1c.1.2.3.3.5.5a.1.1 0 00.1.1c.1.1.1.2.2.4s.3.2.5.2a.35.35 0 01.2.1c.2 0 .5.1.7 0 .3.1.7 0 1 .1.1 0 .1.1.1.2s.2.3.3.4a.6.6 0 00.4.1.31.31 0 00.1.2c0 .1 0 .1.1.2s.1.1.1.2-.1.2-.1.4v.2a2.65 2.65 0 00.6.5s.1 0 0 .1c.1 0 .1.1.2.2s0 .1.1.2l.3.3a.6.6 0 00.4.1.1.1 0 01.1.1c.1 0 .3.1.4 0s.1-.2.2-.2a.6.6 0 01.4-.1.1.1 0 00.1-.1c0-.1.1-.1.1-.2s.2-.1.3-.1.3-.3.5-.4.4-.1.5-.2 0-.4 0-.6.1-.2.1-.3v-.5c0-.1-.1-.2-.1-.3s.1-.1.2-.1.1-.3.2-.4a.1.1 0 00.1-.1c.1 0 0-.1 0-.2a.1.1 0 01-.1-.1 1.21 1.21 0 00-.5-.5.1.1 0 01-.1-.1v-.1c-.1 0 0-.1-.1-.1h.1c.1-.1.1-.3.2-.4a.1.1 0 00.1-.1v-.3c-.1-.1 0-.3 0-.4a2.2 2.2 0 00-.1-.8c0-.1-.1-.1-.2-.1a.1.1 0 01-.1.1.31.31 0 01-.1.2c0 .1-.2.1-.2.2s0 .1-.1.2l-.1.1c.4-.3.3-.3.3-.2h-.3a14.24 14.24 0 00-1.6-.5h.3c.1 0 0-.1 0-.1s.2.1.3.2.5.1.7.2.3.2.5.2.3-.1.4-.1v-.1c.1-.1.2-.2.2-.3v-.3l.1-.1v-.4a.1.1 0 00.1-.1v-.3a.75.75 0 00-.1-.5c0-.1-.1-.1-.2-.1a.1.1 0 01-.1.1c-.1 0-.2 0-.2.1a.1.1 0 00-.1.1.52.52 0 01-.4.2c-.1 0-.2 0-.2-.1s.2-.2.4-.2l.1-.1a.22.22 0 01.2-.2h.2c.1 0 .1-.1.2-.1a.31.31 0 01.1-.2c0-.1.1-.1.2-.2s.1-.4.2-.6 0 .1.1.2a.19.19 0 00.3 0c.1-.1 0-.2.1-.2h.1c.1 0 .1.1.2.1a.35.35 0 01.2-.1h.3c.2-.1.6 0 .6-.2a.86.86 0 00-.6-.7c-.2-.1-.1-.4-.3-.6-.1 0 0-.1-.1-.2l-.1-.1-.1-.1v-.5c0-.1.1-.1.2-.1s.2-.1.2-.2v-.4l.1-.1c.2 0 .5.1.7-.1.1 0 .1-.1.1-.2a1 1 0 00.4-.8c-.1.1 0 .1 0-.1.1.1.1 0 0 0m-4.5 5.4c-.1.1-.1.1-.2 0s-.1-.1-.1-.2-.1 0-.1.1h-.2c0-.1-.1-.1-.1-.2s0-.2.1-.2.1 0 .1.1v.1c.1.1.1 0 .2 0h.3c0 .1.1.2 0 .3M15.6 36c1.3-1.9 5.2-3.9 9-3.9s8 2.2 9.6 1a8.38 8.38 0 01-5.1 1.4c-3.4 0-4.7-1.7-7-1.7s-4.8 1.9-5.9 3.5zM27.7 31.8a5.34 5.34 0 001.7-1.9 14.44 14.44 0 013.7-4.4s-1.7 5.5-3.5 5.7c0 0-.3.2.2.1s2.8-.9 3.6-1.1a8.58 8.58 0 003.3-1.1 1.48 1.48 0 01.8-.4s-2.2 3.7-6.2 3.7a17.1 17.1 0 01-3.6-.6"/><path data-name="Shape" class="avcls-1" d="M32.4 29.9a3.92 3.92 0 00.5-1.7 14.64 14.64 0 012.7-6.3s.3 4.3-1.9 7c0 0-.1.4.1.1a22.93 22.93 0 014.6-3.9s1.5-1.3 1.6-1.7c0-.1-1.2 6.1-7.6 6.5"/><path data-name="Shape" class="avcls-1" d="M36.1 25.8a5.62 5.62 0 00.2-1.3c0-.6-.3-2.6-.3-3.5a7.53 7.53 0 01.8-3.7 4.5 4.5 0 00.2 1.4 12.29 12.29 0 01.5 2.5 10.27 10.27 0 01-.4 2.5 2.13 2.13 0 00.6-.8 12.81 12.81 0 012.2-2.8 5.62 5.62 0 001.4-2.1 6.08 6.08 0 01-1.2 4.1c-1.5 2.1-2.1 1.8-2.9 2.6a11.41 11.41 0 01-1.1 1.1"/><path data-name="Shape" class="avcls-1" d="M38.4 20.9a3.87 3.87 0 00-.3-1.6 10.5 10.5 0 01-1.3-5.9s.2-.2.6 1 1 1.6 1.2 2.8a12 12 0 01.2 1.7s.1.2.1 0a9 9 0 01.8-3.2c.7-1.5 1.6-2.9 1.5-3.9 0 0 .4 0 .3 1.6.1 1.6-.3 4.4-3.1 7.5"/><path data-name="Shape" class="avcls-1" d="M39.2 16.1a12 12 0 00-.8-1.5c-.3-.4-2.7-3.7-2.9-5.3 0 0 .2-.1.4.3a12.94 12.94 0 001.5 1.7 5 5 0 011.5 2.8s.1.1-.1-2.1.7-3.7-.1-5.3c0 0 1.1.2 1.7 4.8a9.68 9.68 0 01-.9 3.6c.1-.1-.2 1-.3 1"/><path data-name="Shape" class="avcls-1" d="M38.3 11a9.94 9.94 0 00-1.6-1.3 9.58 9.58 0 01-3.3-4.3s.1-.2.8.7c.5.7 1.1.4 2.7 2.4 0 0 .2.5.3.4s-.1-.5-.1-.5-.1-1.2-.1-1.6a15.83 15.83 0 00-.9-3.1 5.82 5.82 0 012.5 4.7c-.1 0-.2 2.5-.3 2.6"/><path data-name="Shape" class="avcls-1" d="M36.5 7.3s.1-3-3.8-4.6c0 0 1.4 2.8 2.4 3.5a11.57 11.57 0 011.4 1.1M26.3 36c-1.3-1.9-5.2-3.9-9-3.9s-8 2.2-9.6 1a8.38 8.38 0 005.1 1.4c3.4 0 4.7-1.7 7-1.7s4.8 1.9 5.9 3.5zM14.2 31.8a5.34 5.34 0 01-1.7-1.9 14.44 14.44 0 00-3.7-4.4s1.7 5.5 3.5 5.7c0 0 .3.2-.2.1s-2.8-.9-3.6-1.1a8.58 8.58 0 01-3.3-1.1 1.24 1.24 0 00-.8-.4s2.2 3.7 6.2 3.7a17.1 17.1 0 003.6-.6"/><path data-name="Shape" class="avcls-1" d="M9.5 29.9a3.92 3.92 0 01-.5-1.7 14.64 14.64 0 00-2.7-6.3s-.3 4.3 1.9 7c0 0 .1.4-.1.1a22.93 22.93 0 00-4.6-3.9S2 23.8 1.9 23.4c0-.1 1.2 6.1 7.6 6.5"/><path data-name="Shape" class="avcls-1" d="M5.8 25.8a5.62 5.62 0 01-.2-1.3c0-.6.3-2.6.3-3.5a7.53 7.53 0 00-.8-3.7 4.5 4.5 0 01-.2 1.4 12.29 12.29 0 00-.5 2.5 10.27 10.27 0 00.4 2.5 2.13 2.13 0 01-.6-.8A12.81 12.81 0 002 20.1 5.62 5.62 0 01.6 18a6.08 6.08 0 001.2 4.1c1.5 2.1 2.1 1.8 2.9 2.6.1 0 1 1.1 1.1 1.1"/><path data-name="Shape" class="avcls-1" d="M3.5 20.9a6.93 6.93 0 01.3-1.6 10.5 10.5 0 001.3-5.9s-.2-.2-.6 1-1 1.6-1.2 2.8a8.18 8.18 0 00-.3 1.7s-.1.2-.1 0a9 9 0 00-.8-3.2C1.4 14.2.5 12.8.6 11.8c0 0-.4 0-.3 1.6a11 11 0 003.2 7.5"/><path data-name="Shape" class="avcls-1" d="M2.7 16.1a12 12 0 01.8-1.5c.3-.4 2.7-3.7 2.9-5.3 0 0-.2-.1-.4.3a12.94 12.94 0 01-1.5 1.7A5 5 0 003 14.1s-.1.1.1-2.1-.7-3.7.1-5.3c0 0-1.1.2-1.7 4.8a9.68 9.68 0 00.9 3.6c-.1-.1.2 1 .3 1"/><path data-name="Shape" class="avcls-1" d="M3.6 11a9.94 9.94 0 011.6-1.3 9.58 9.58 0 003.3-4.3s-.1-.2-.8.7c-.5.7-1.1.4-2.7 2.4 0 0-.2.5-.3.4s.1-.5.1-.5a13.88 13.88 0 00.3-1.7A15.83 15.83 0 016 3.6a5.82 5.82 0 00-2.5 4.7 12.21 12.21 0 00.1 2.7"/><path data-name="Shape" class="avcls-1" d="M5.4 7.3s-.1-3 3.8-4.6c0 0-1.4 2.8-2.4 3.5a11.57 11.57 0 00-1.4 1.1"/></symbol><symbol viewBox="0 0 19.25 14" id="cd-icon--pdf" xmlns="http://www.w3.org/2000/svg"><path data-name="Path 1010" d="M16.188.411V0l3.063 3.063H16.53a.342.342 0 01-.341-.341zm3.063 3.526v9.188a.875.875 0 01-.875.875H.876a.875.875 0 01-.875-.875V.875A.875.875 0 01.876 0h14.438v2.721a1.218 1.218 0 001.216 1.216zM7.439 6.562A1.314 1.314 0 006.127 5.25H4.815a.437.437 0 00-.437.438v4.375a.438.438 0 00.875 0v-1.75h.875a1.314 1.314 0 001.313-1.312zm3.938 0a1.314 1.314 0 00-1.312-1.312H8.75a.437.437 0 00-.437.438v4.375a.437.437 0 00.438.438h1.313a1.314 1.314 0 001.313-1.312zm3.938-.875a.437.437 0 00-.437-.437h-2.187a.437.437 0 00-.437.438v4.375a.438.438 0 00.875 0v-1.75H14a.438.438 0 000-.875h-.875V6.126h1.75a.437.437 0 00.438-.438zm-5.25.438H9.19v3.5h.875a.438.438 0 00.438-.437V6.563a.438.438 0 00-.44-.438zm-3.937 0h-.875v1.313h.875a.438.438 0 00.438-.437v-.437a.438.438 0 00-.441-.439z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--search" xmlns="http://www.w3.org/2000/svg"><path d="M46.829 41.172L38.4 32.744a21.018 21.018 0 10-5.657 5.657l8.427 8.427a4 4 0 005.658-5.656zM8 21a13 13 0 1122.325 9.046c-.05.045-.106.078-.154.126s-.08.104-.125.154A12.992 12.992 0 018 21z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--selected" xmlns="http://www.w3.org/2000/svg"><path d="M18.5 39.75a4 4 0 01-2.83-1.17l-12.5-12.5a4 4 0 015.66-5.66l9.67 9.67L39.17 9.42a4 4 0 015.66 5.66l-23.5 23.5a4 4 0 01-2.83 1.17z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--selected--highlighted" xmlns="http://www.w3.org/2000/svg"><path fill="#80CBFF" d="M18.5 39.75a4 4 0 01-2.83-1.17l-12.5-12.5a4 4 0 015.66-5.66l9.67 9.67L39.17 9.42a4 4 0 015.66 5.66l-23.5 23.5a4 4 0 01-2.83 1.17z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-fb-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><path d="M29.16 13h-3.52c-2.09 0-4.41.88-4.41 3.9v3.2h-2.41v3.84h2.49V35h4.57V23.87h3l.27-3.78h-3.34v-2.17c0-1.2 1.24-1.13 1.32-1.13h2V13z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-fb-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm4.9 21.87h-3V35h-4.59V23.94h-2.49V20.1h2.41v-3.2c0-3 2.32-3.9 4.41-3.9h3.52v3.79h-2c-.07 0-1.32-.07-1.32 1.13v2.17h3.37z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-gh-def" xmlns="http://www.w3.org/2000/svg"><path d="M14.46 26.8a.16.16 0 010-.26.71.71 0 01.66-.2 1.15 1.15 0 01.46.13 3 3 0 011 .89 6.7 6.7 0 00.89 1 2.45 2.45 0 003.23.2 2 2 0 01.43-.79 2 2 0 01.56-.46q.26-.13.92-.39a12.25 12.25 0 01-3.52-.76A6 6 0 0117 24.69a5.52 5.52 0 01-1.28-3.09 7.92 7.92 0 01.3-3.49 5.8 5.8 0 011.12-1.78 5.89 5.89 0 01.2-3.75A6.84 6.84 0 0121.1 14a14.42 14.42 0 016.85 0 12.37 12.37 0 011.42-.82 5.79 5.79 0 012.4-.56 7.1 7.1 0 01.36 1.71 5.66 5.66 0 01-.1 1.84 6.07 6.07 0 011.58 4.21 7.48 7.48 0 01-.72 3.49 5.56 5.56 0 01-2.57 2.3 9.15 9.15 0 01-3.29.72 4.36 4.36 0 011.35 1 2.9 2.9 0 01.56 1.55v2.07l.07 2a2.47 2.47 0 00.92.89.22.22 0 01.13.3q-.07.2-.53.2a2.19 2.19 0 01-1.78-.9 1.51 1.51 0 01-.2-.79v-3.12a1 1 0 00-.26-.76 1.28 1.28 0 00-.53-.3v4.15a2.6 2.6 0 00.24 1.45 1.55 1.55 0 01.33.66s0 .08-.1.1a1.27 1.27 0 01-.56-.1 1.63 1.63 0 01-1.18-.89 3.4 3.4 0 01-.33-1.48v-4.08h-.86v4.08a3.62 3.62 0 01-.3 1.51 1.85 1.85 0 01-1.71 1q-.2-.07-.2-.13a5.58 5.58 0 00.39-.66 3.05 3.05 0 00.16-.53 3.82 3.82 0 00.1-.92V29a1.07 1.07 0 00-.49.3 1 1 0 00-.23.76v3.16a1.51 1.51 0 01-.2.79 2.08 2.08 0 01-1.78.79q-.46 0-.53-.2a.18.18 0 010-.23 2 2 0 01.3-.23 2 2 0 00.26-.2 1.2 1.2 0 00.39-.53 2.5 2.5 0 00.1-1.38 6.64 6.64 0 010-1.45 3.8 3.8 0 01-3.47-.58A6.43 6.43 0 0116 28.51a6.64 6.64 0 00-1.58-1.71z"/><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-gh-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm8.89 21.84a5.56 5.56 0 01-2.57 2.3 9.15 9.15 0 01-3.29.72 4.36 4.36 0 011.35 1 2.9 2.9 0 01.56 1.55v2.07l.07 2a2.47 2.47 0 00.92.89.22.22 0 01.13.3q-.07.2-.53.2a2.19 2.19 0 01-1.78-.87 1.51 1.51 0 01-.2-.79v-3.12a1 1 0 00-.26-.76 1.28 1.28 0 00-.53-.3v4.15a2.6 2.6 0 00.24 1.45 1.55 1.55 0 01.33.66s0 .08-.1.1a1.27 1.27 0 01-.56-.1 1.63 1.63 0 01-1.18-.89 3.4 3.4 0 01-.33-1.48v-4.08h-.86v4.08a3.62 3.62 0 01-.3 1.51 1.85 1.85 0 01-1.71 1q-.2-.07-.2-.13a5.56 5.56 0 00.39-.66 3 3 0 00.16-.53 3.82 3.82 0 00.1-.92V29a1.07 1.07 0 00-.49.3 1 1 0 00-.23.76v3.16a1.51 1.51 0 01-.2.79 2.08 2.08 0 01-1.78.79q-.46 0-.53-.2a.18.18 0 010-.23 2 2 0 01.3-.23 2 2 0 00.26-.2 1.2 1.2 0 00.39-.53 2.5 2.5 0 00.1-1.38 6.64 6.64 0 010-1.45 3.8 3.8 0 01-3.47-.58A6.43 6.43 0 0116 28.51a6.64 6.64 0 00-1.58-1.71.16.16 0 010-.26.71.71 0 01.66-.2 1.14 1.14 0 01.46.13 3 3 0 011 .89 6.69 6.69 0 00.89 1 2.45 2.45 0 003.23.2 2.12 2.12 0 011-1.25q.26-.13.92-.4a12.25 12.25 0 01-3.52-.76A6 6 0 0117 24.69a5.52 5.52 0 01-1.28-3.09 7.92 7.92 0 01.3-3.49 5.79 5.79 0 011.12-1.78 5.89 5.89 0 01.2-3.75A6.83 6.83 0 0121.1 14a14.42 14.42 0 016.85 0 12.37 12.37 0 011.42-.82 5.79 5.79 0 012.4-.56 7.1 7.1 0 01.36 1.71 5.66 5.66 0 01-.1 1.84 6.06 6.06 0 011.58 4.21 7.48 7.48 0 01-.72 3.46z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-ig-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm0 41a19 19 0 1119-19 19 19 0 01-19 19z"/><path d="M24 18.09A5.91 5.91 0 1029.91 24 5.9 5.9 0 0024 18.09zm0 9.74A3.83 3.83 0 1127.83 24 3.83 3.83 0 0124 27.83z"/><circle cx="30.14" cy="17.86" r="1.38"/><path d="M34.9 16.47a5.88 5.88 0 00-3.36-3.36 8.43 8.43 0 00-2.79-.53c-1.23-.06-1.62-.07-4.74-.07s-3.52 0-4.74.07a8.44 8.44 0 00-2.79.53 5.88 5.88 0 00-3.36 3.36 8.44 8.44 0 00-.53 2.79c-.06 1.23-.07 1.62-.07 4.74s0 3.52.07 4.74a8.44 8.44 0 00.53 2.79 5.88 5.88 0 003.36 3.36 8.44 8.44 0 002.79.53c1.23.06 1.62.07 4.74.07s3.52 0 4.74-.07a8.44 8.44 0 002.79-.53 5.88 5.88 0 003.36-3.36 8.41 8.41 0 00.53-2.79c.06-1.23.07-1.62.07-4.74s0-3.52-.07-4.74a8.44 8.44 0 00-.53-2.79zm-1.54 12.18a6.38 6.38 0 01-.4 2.14A3.81 3.81 0 0130.78 33a6.35 6.35 0 01-2.14.4c-1.21.06-1.58.07-4.65.07s-3.43 0-4.65-.07a6.35 6.35 0 01-2.14-.4 3.81 3.81 0 01-2.2-2.22 6.35 6.35 0 01-.4-2.14c-.06-1.21-.07-1.58-.07-4.65s0-3.43.07-4.65a6.38 6.38 0 01.4-2.14 3.81 3.81 0 012.22-2.2 6.35 6.35 0 012.14-.4c1.21-.06 1.58-.07 4.65-.07s3.43 0 4.65.07a6.38 6.38 0 012.14.4 3.81 3.81 0 012.2 2.22 6.35 6.35 0 01.4 2.14c.06 1.21.07 1.58.07 4.65s-.05 3.42-.11 4.64z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-ig-full" xmlns="http://www.w3.org/2000/svg"><circle cx="24" cy="24" r="3.83"/><path d="M33 17.22A3.81 3.81 0 0030.78 15a6.38 6.38 0 00-2.14-.4c-1.21-.05-1.58-.07-4.65-.07s-3.43 0-4.65.07a6.35 6.35 0 00-2.14.4 3.81 3.81 0 00-2.2 2.22 6.38 6.38 0 00-.4 2.14c-.05 1.21-.07 1.58-.07 4.65s0 3.44.07 4.65a6.36 6.36 0 00.4 2.14 3.81 3.81 0 002.22 2.2 6.35 6.35 0 002.14.4c1.21.06 1.58.07 4.65.07s3.44 0 4.65-.07a6.35 6.35 0 002.14-.4 3.81 3.81 0 002.2-2.22 6.38 6.38 0 00.4-2.14c.06-1.21.07-1.58.07-4.65s0-3.43-.07-4.65a6.35 6.35 0 00-.4-2.12zm-9 12.69A5.91 5.91 0 1129.91 24 5.9 5.9 0 0124 29.91zm6.14-10.66a1.38 1.38 0 111.38-1.38 1.38 1.38 0 01-1.38 1.37z"/><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm11.43 26.74a8.41 8.41 0 01-.53 2.79 5.88 5.88 0 01-3.36 3.36 8.44 8.44 0 01-2.79.53c-1.23.06-1.62.07-4.74.07s-3.51 0-4.74-.07a8.44 8.44 0 01-2.79-.53 5.88 5.88 0 01-3.36-3.36 8.44 8.44 0 01-.53-2.79c-.06-1.23-.07-1.62-.07-4.74s0-3.52.07-4.74a8.44 8.44 0 01.53-2.79 5.88 5.88 0 013.36-3.36 8.44 8.44 0 012.79-.53c1.23-.06 1.62-.07 4.74-.07s3.51 0 4.74.07a8.43 8.43 0 012.79.53 5.88 5.88 0 013.36 3.36 8.44 8.44 0 01.53 2.79c.06 1.23.07 1.62.07 4.74s-.01 3.51-.07 4.74z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-ln-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><ellipse cx="16.07" cy="14.58" rx="2.56" ry="2.58"/><path d="M13.92 19h4.33v14h-4.33zM29.4 18.57a4.88 4.88 0 00-4.22 2.31V19H21v14h4.16v-7.35c0-2 .91-3.14 2.64-3.14s2.36 1.13 2.36 3.14V33h4.31v-8.86c.02-3.75-2.1-5.57-5.07-5.57z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-ln-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm-5.74 31h-4.34V19h4.33zm-2.19-15.83a2.58 2.58 0 112.56-2.58 2.57 2.57 0 01-2.56 2.58zM34.49 33h-4.31v-7.35c0-2-.77-3.14-2.36-3.14s-2.64 1.17-2.64 3.14V33H21V19h4.16v1.89a4.88 4.88 0 014.22-2.31c3 0 5.09 1.81 5.09 5.56z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-rss-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><path d="M20.7 31.18a2.85 2.85 0 11-2.85-2.81 2.84 2.84 0 012.85 2.81zM37 34a22 22 0 00-22-22v5a17.49 17.49 0 0114.92 8.2 16.65 16.65 0 012.49 8.8H37zm-7.78 0A14 14 0 0024 23.13 14.27 14.27 0 0015 20v4.2a9.94 9.94 0 018.67 5 9.79 9.79 0 011.25 4.8h4.3z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-rss-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm-6.15 32a2.81 2.81 0 112.85-2.81A2.84 2.84 0 0117.85 34zm11.37 0h-4.3a9.79 9.79 0 00-1.25-4.78 9.94 9.94 0 00-8.67-5V20a14.27 14.27 0 019 3.15A14 14 0 0129.22 34zM37 34h-4.59a16.65 16.65 0 00-2.49-8.72A17.49 17.49 0 0015 17.06V12a22 22 0 0122 22z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-tt-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><path d="M36 16.56a9.83 9.83 0 01-2.83.78 4.94 4.94 0 002.16-2.72 9.84 9.84 0 01-3.13 1.19 4.93 4.93 0 00-8.52 3.37 5 5 0 00.13 1.12 14 14 0 01-10.15-5.14 4.93 4.93 0 001.52 6.57 4.9 4.9 0 01-2.18-.62v.06A4.93 4.93 0 0016.91 26a4.9 4.9 0 01-1.3.17 5 5 0 01-.93-.09 4.93 4.93 0 004.6 3.42 9.91 9.91 0 01-7.29 2 14 14 0 0021.57-11.76v-.64A10 10 0 0036 16.56z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-tt-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm9.54 17.11v.64A14 14 0 0112 31.54a9.92 9.92 0 007.29-2 4.93 4.93 0 01-4.6-3.42 5 5 0 00.93.09 4.9 4.9 0 001.3-.17A4.93 4.93 0 0113 21.17v-.06a4.9 4.9 0 002.23.62 4.93 4.93 0 01-1.52-6.57 14 14 0 0010.15 5.14 5 5 0 01-.13-1.12 4.93 4.93 0 018.52-3.37 9.83 9.83 0 003.13-1.19 4.94 4.94 0 01-2.16 2.72 9.83 9.83 0 002.78-.78 10 10 0 01-2.46 2.55z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-yt-def" xmlns="http://www.w3.org/2000/svg"><path d="M32.58 16.83c-1.72-.45-8.59-.45-8.59-.45s-6.75 0-8.46.42a3 3 0 00-2.11 2A26.77 26.77 0 0013 24a26.77 26.77 0 00.42 5.24 3 3 0 002.11 2c1.72.46 8.46.42 8.46.42s6.75 0 8.46-.42a3 3 0 002.08-2A27.91 27.91 0 0035 24a28.42 28.42 0 00-.47-5.24 2.74 2.74 0 00-1.95-1.93zM21.26 27.38v-6.76L26.74 24z"/><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm0 41a19 19 0 1119-19 19 19 0 01-19 19z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-yt-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm10.54 27.24a3 3 0 01-2.08 2c-1.72.45-8.46.42-8.46.42s-6.75 0-8.46-.42a3 3 0 01-2.11-2A26.77 26.77 0 0113 24a26.77 26.77 0 01.42-5.24 3 3 0 012.11-2c1.72-.45 8.46-.42 8.46-.42s6.87 0 8.59.45a2.74 2.74 0 011.94 1.93A28.42 28.42 0 0135 24a27.91 27.91 0 01-.46 5.24z"/><path d="M21.25 27.38l5.5-3.38-5.5-3.38v6.76z"/></symbol><symbol viewBox="0 0 14 14" id="cd-icon--social-links--facebook" xmlns="http://www.w3.org/2000/svg"><path data-name="svgexport-14" d="M13.411 0H.589A.589.589 0 000 .589v12.822A.586.586 0 00.589 14h6.853V8.746H5.688V6.558h1.754V4.8a2.5 2.5 0 012.756-2.7 15.8 15.8 0 011.621.081v1.901h-1.105c-.884 0-1.091.42-1.091 1.032v1.444h2.188l-.442 2.188H9.623l.037 5.246h3.758A.589.589 0 0014 13.4V.589a.589.589 0 00-.589-.582"/></symbol><symbol viewBox="0 0 14 14" id="cd-icon--social-links--linkedin" xmlns="http://www.w3.org/2000/svg"><path data-name="Path 530" d="M12.968 0H1.032A1.007 1.007 0 000 1.032v12.01A.993.993 0 001.032 14h11.936A1.007 1.007 0 0014 12.968V1.032A1.007 1.007 0 0012.968 0zM4.274 11.716H2.137V5.379h2.137zM3.168 4.495a1.066 1.066 0 01-1.179-1.106 1.1 1.1 0 011.179-1.105 1.066 1.066 0 011.179 1.105c.074.664-.442 1.106-1.179 1.106zm8.695 7.221H9.726v-3.39c0-.884-.295-1.474-1.105-1.474a1.162 1.162 0 00-1.105.737 1.254 1.254 0 00-.074.516v3.537H5.305V5.305h2.137v.884a2.132 2.132 0 011.916-1.032c1.4 0 2.432.884 2.432 2.874v3.684z"/></symbol><symbol viewBox="0 0 17.219 14" id="cd-icon--social-links--twitter" xmlns="http://www.w3.org/2000/svg"><path data-name="svgexport-12" d="M14.531 1.141A3.492 3.492 0 0011.95 0a3.539 3.539 0 00-3.539 3.539 7.247 7.247 0 00.063.82A10.078 10.078 0 011.211.633a3.984 3.984 0 00-.508 1.766A3.634 3.634 0 002.281 5.36a3.359 3.359 0 01-1.578-.445v.062a3.555 3.555 0 002.836 3.469 7.632 7.632 0 01-.945.125l-.633-.063a3.547 3.547 0 003.281 2.461A7.469 7.469 0 01.82 12.484L0 12.42A10.086 10.086 0 005.422 14 9.966 9.966 0 0015.45 3.961c.016-.187 0-.336 0-.508a6.781 6.781 0 001.769-1.833 6.552 6.552 0 01-2.031.563A3.414 3.414 0 0016.711.222a7.051 7.051 0 01-2.211.883z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--user" xmlns="http://www.w3.org/2000/svg"><path d="M23 24h2a16 16 0 0116 16v4H7v-4a16 16 0 0116-16z"/><rect x="15" y="4" width="18" height="18" rx="9" ry="9"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--user--white" xmlns="http://www.w3.org/2000/svg"><path fill="#fff" d="M23 24h2a16 16 0 0116 16v4H7v-4a16 16 0 0116-16z"/><rect fill="#fff" x="15" y="4" width="18" height="18" rx="9" ry="9"/></symbol></svg>
\ No newline at end of file
diff --git a/html/themes/custom/common_design_subtheme/img/icons/copyurl.svg b/html/themes/custom/common_design_subtheme/img/icons/copyurl.svg
new file mode 100644
index 000000000..6c115b4c5
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/copyurl.svg
@@ -0,0 +1 @@
+<svg data-name="Component 10 – 110" xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path data-name="Path 533" d="M12.635 1.365a4.674 4.674 0 00-6.6 0L5.02 2.381a.718.718 0 001.015 1.015L7.05 2.38a3.232 3.232 0 114.571 4.571l-1.015 1.015a.718.718 0 101.015 1.015l1.015-1.015a4.673 4.673 0 00-.001-6.601zm-4.668 9.239L6.952 11.62a3.232 3.232 0 01-4.571-4.571l1.015-1.016a.718.718 0 10-1.015-1.015L1.365 6.033a4.668 4.668 0 006.6 6.6l1.015-1.016a.718.718 0 10-1.015-1.015zm.86-6.446L4.158 8.826a.718.718 0 101.015 1.016l4.669-4.668a.718.718 0 00-1.015-1.016z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/creative-commons.svg b/html/themes/custom/common_design_subtheme/img/icons/creative-commons.svg
new file mode 100644
index 000000000..7ee425866
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/creative-commons.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64px" height="64px">
+  <path d="M31.957,0.311c-8.682,0-16.322,3.213-22.226,9.203  C3.653,15.678,0.354,23.666,0.354,32c0,8.422,3.212,16.236,9.29,22.313c6.078,6.078,13.978,9.377,22.313,9.377  c8.334,0,16.409-3.299,22.66-9.463c5.904-5.817,9.029-13.544,9.029-22.227c0-8.595-3.125-16.408-9.116-22.399  C48.453,3.523,40.639,0.311,31.957,0.311z M32.043,6.041c7.12,0,13.458,2.691,18.406,7.641c4.862,4.861,7.466,11.286,7.466,18.318  c0,7.119-2.518,13.371-7.379,18.146c-5.123,5.035-11.721,7.727-18.493,7.727c-6.858,0-13.283-2.691-18.232-7.641  C8.862,45.283,6.084,38.772,6.084,32c0-6.858,2.778-13.369,7.727-18.406C18.673,8.646,24.924,6.041,32.043,6.041z"/>
+  <path id="c" d="M31.635,26.734c-1.79-3.264-4.844-4.563-8.389-4.563  c-5.16,0-9.267,3.65-9.267,9.828c0,6.283,3.861,9.829,9.442,9.829c3.581,0,6.635-1.966,8.319-4.949l-3.931-2.001  c-0.878,2.105-2.212,2.738-3.896,2.738c-2.914,0-4.248-2.422-4.248-5.617c0-3.193,1.124-5.616,4.248-5.616  c0.842,0,2.527,0.456,3.51,2.563L31.635,26.734z"/>
+  <use xlink:href="#c" transform="translate(18.281)"/>
+</svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/education.svg b/html/themes/custom/common_design_subtheme/img/icons/education.svg
new file mode 100644
index 000000000..3c91821c4
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/education.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 34 42"><path d="M33,0H29V8L26,7,23,8V0H0V42H33a.98043.98043,0,0,0,1-.95V.95A.98043.98043,0,0,0,33,0ZM6,38.5a.49511.49511,0,0,1-.5.5h-2a.49511.49511,0,0,1-.5-.5V3.5A.49511.49511,0,0,1,3.5,3h2a.49511.49511,0,0,1,.5.5ZM25.5,23h-13a1.5,1.5,0,0,1,0-3h13a1.5,1.5,0,0,1,0,3Zm0-6h-13a1.5,1.5,0,0,1,0-3h13a1.5,1.5,0,0,1,0,3Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/expand-left.svg b/html/themes/custom/common_design_subtheme/img/icons/expand-left.svg
new file mode 100644
index 000000000..143213203
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/expand-left.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M44 48a3.989 3.989 0 0 1-2.828-1.171l-19-20a4 4 0 0 1 0-5.658l19-20a4 4 0 0 1 5.657 5.657L31 24l15.829 17.171A4 4 0 0 1 44 48zM25.83 46.829a4 4 0 0 0 0-5.658L10 24 25.829 6.828a4 4 0 0 0-5.657-5.657l-19 20a4 4 0 0 0 0 5.658l19 20a4 4 0 0 0 5.657 0z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/expand-right.svg b/html/themes/custom/common_design_subtheme/img/icons/expand-right.svg
new file mode 100644
index 000000000..d71574e96
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/expand-right.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48.00024 48"><path d="M4.00012,0A3.98883,3.98883,0,0,1,6.82874,1.17139l19,20a4.0006,4.0006,0,0,1,0,5.65722l-19,20.00025a4.00027,4.00027,0,0,1-5.65723-5.65723L17.00024,24,1.17151,6.82861A4,4,0,0,1,4.00012,0ZM22.17151,1.17139a4.0006,4.0006,0,0,0,0,5.65722L38.00024,24,22.17151,41.17163a4.00027,4.00027,0,0,0,5.65723,5.65723l19-20.00025a4.0006,4.0006,0,0,0,0-5.65722l-19-20a4.0009,4.0009,0,0,0-5.65723,0Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/external-link.svg b/html/themes/custom/common_design_subtheme/img/icons/external-link.svg
new file mode 100644
index 000000000..8b36e0b10
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/external-link.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48">
+  <path d="M35,20.65V42H6V18H22.09l9-9H4.2A2.2,2.2,0,0,0,2,11.2V43.8A2.2,2.2,0,0,0,4.2,46H36.8A2.2,2.2,0,0,0,39,43.8V16.65ZM12.5,12A1.5,1.5,0,1,1,11,13.5,1.5,1.5,0,0,1,12.5,12Zm-5,0A1.5,1.5,0,1,1,6,13.5,1.5,1.5,0,0,1,7.5,12Z"/>
+  <path d="M44,2H23a2,2,0,0,0,0,4H39L16.51,28.52a2.1,2.1,0,0,0,3,3L42,9V25a2,2,0,0,0,4,0V4A2,2,0,0,0,44,2Z"/>
+</svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/form-error.svg b/html/themes/custom/common_design_subtheme/img/icons/form-error.svg
new file mode 100644
index 000000000..151a1e67c
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/form-error.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#e32700"><path d="M8.002 1c-3.868 0-7.002 3.134-7.002 7s3.134 7 7.002 7c3.865 0 7-3.134 7-7s-3.135-7-7-7zm4.025 9.284c.062.063.1.149.1.239 0 .091-.037.177-.1.24l-1.262 1.262c-.064.062-.15.1-.24.1s-.176-.036-.24-.1l-2.283-2.283-2.286 2.283c-.064.062-.15.1-.24.1s-.176-.036-.24-.1l-1.261-1.262c-.063-.062-.1-.148-.1-.24 0-.088.036-.176.1-.238l2.283-2.285-2.283-2.284c-.063-.064-.1-.15-.1-.24s.036-.176.1-.24l1.262-1.262c.063-.063.149-.1.24-.1.089 0 .176.036.24.1l2.285 2.284 2.283-2.284c.064-.063.15-.1.24-.1s.176.036.24.1l1.262 1.262c.062.063.1.149.1.24 0 .089-.037.176-.1.24l-2.283 2.284 2.283 2.284z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/form-required.svg b/html/themes/custom/common_design_subtheme/img/icons/form-required.svg
new file mode 100644
index 000000000..f7882d6df
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/form-required.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#EE0000"  d="M0,7.562l1.114-3.438c2.565,0.906,4.43,1.688,5.59,2.35C6.398,3.553,6.237,1.544,6.22,0.447h3.511 c-0.05,1.597-0.234,3.6-0.558,6.003c1.664-0.838,3.566-1.613,5.714-2.325L16,7.562c-2.05,0.678-4.06,1.131-6.028,1.356 c0.984,0.856,2.372,2.381,4.166,4.575l-2.906,2.059c-0.935-1.274-2.041-3.009-3.316-5.206c-1.194,2.275-2.244,4.013-3.147,5.206 l-2.856-2.059c1.872-2.307,3.211-3.832,4.017-4.575C3.849,8.516,1.872,8.062,0,7.562"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/help.svg b/html/themes/custom/common_design_subtheme/img/icons/help.svg
new file mode 100755
index 000000000..3719dcb17
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/help.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 48"><circle class="cls-1" cx="14" cy="44" r="4"/><path class="cls-1" d="M28,14A14,14,0,0,0,0,14a4,4,0,0,0,8,0,6,6,0,1,1,6,6,4.0002,4.0002,0,0,0-4,4v9a4,4,0,0,0,8,0V27.4104A14.01952,14.01952,0,0,0,28,14Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/ocha-logo.svg b/html/themes/custom/common_design_subtheme/img/icons/ocha-logo.svg
new file mode 100644
index 000000000..8668e3aa0
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/ocha-logo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 41.9 37"><title>UN Logo</title><g id="Page-1"><g id="Artboard"><g id="ocha-logo"><g id="Group"><path id="Shape" class="cls-1" d="M17.6,15.6a3.3,3.3,0,1,1,3.3,3.3v-.4A2.9,2.9,0,1,0,18,15.6a2.9,2.9,0,0,0,2.9,2.9v.4a3.33,3.33,0,0,1-3.3-3.3"/><path id="Shape-2" data-name="Shape" class="cls-1" d="M15,15.6a6,6,0,1,1,6,6v-.4a5.6,5.6,0,1,0-5.6-5.6A5.59,5.59,0,0,0,21,21.2v.4a6,6,0,0,1-6-6"/><path id="Shape-3" data-name="Shape" class="cls-1" d="M12.1,15.6A8.9,8.9,0,1,1,21,24.5V24a8.54,8.54,0,0,0,8.5-8.4,8.5,8.5,0,1,0-17,0A8.41,8.41,0,0,0,21,24v.4a8.77,8.77,0,0,1-8.9-8.8"/><path id="Shape-4" data-name="Shape" class="cls-1" d="M9.3,15.6A11.65,11.65,0,1,1,21,27.2v-.4A11.2,11.2,0,1,0,9.8,15.6,11.18,11.18,0,0,0,21,26.8v.4A11.63,11.63,0,0,1,9.3,15.6"/><path id="Shape-5" data-name="Shape" class="cls-1" d="M6.3,15.6A14.7,14.7,0,1,1,21,30.3v-.4A14.3,14.3,0,1,0,6.7,15.6,14.3,14.3,0,0,0,21,29.9v.4A14.66,14.66,0,0,1,6.3,15.6"/><rect id="Rectangle-path" class="cls-1" x="20.7" y="1.1" width="0.4" height="11.4"/><polygon id="Shape-6" data-name="Shape" class="cls-1" points="10.6 5.5 10.9 5.2 18.9 13.2 18.6 13.5 10.6 5.5"/><rect id="Rectangle-path-2" data-name="Rectangle-path" class="cls-1" x="6.5" y="15.4" width="11.4" height="0.4"/><polygon id="Shape-7" data-name="Shape" class="cls-1" points="10.6 25.7 18.6 17.7 18.9 18 10.9 26 10.6 25.7"/><rect id="Rectangle-path-3" data-name="Rectangle-path" class="cls-1" x="20.7" y="18.7" width="0.4" height="11.4"/><rect id="Rectangle-path-4" data-name="Rectangle-path" class="cls-1" x="26.94" y="16.11" width="0.4" height="11.3" transform="translate(-7.45 25.47) rotate(-44.83)"/><rect id="Rectangle-path-5" data-name="Rectangle-path" class="cls-1" x="24.1" y="15.4" width="11.4" height="0.4"/><polygon id="Shape-8" data-name="Shape" class="cls-1" points="23 13.2 31.1 5.2 31.3 5.5 23.3 13.5 23 13.2"/><path id="Shape-9" data-name="Shape" class="cls-1" d="M18.7,16.5c.1,0,.1.1.1.2h.1a2.51,2.51,0,0,0,.4-.7.1.1,0,0,0,.1-.1c0-.1-.2-.2-.2-.3-.1.2-.3,0-.4.1v.1h.1V16h0a.37.37,0,0,0-.3-.1c.1,0,0,0,0,.1a.75.75,0,0,0-.5.1c-.1,0-.1,0-.2-.1-.1.1-.1.2-.2.2l-.1-.1c.1-.1.2-.1.2-.2v-.3c.1-.1.1-.2.2-.2s.3.1.4,0l.1.1v.1c-.1.1-.2.1-.2.2s0,.1.1.1.1-.1.2-.1.1,0,.1,0H19c.1,0,.1-.3,0-.4v-.2c0-.1.2-.1.2,0v.1s0,.1.1,0h0v-.2a.35.35,0,0,0,.2.1h.2c.1,0,.1-.1,0-.2h-.1a.31.31,0,0,1-.2.1c-.1,0-.1-.1-.2-.1s-.2.1-.2,0-.1-.1-.1-.2l.1-.1a.37.37,0,0,0,.3-.1.35.35,0,0,1,.1-.2h.1a.37.37,0,0,0,.3-.1c.1,0,.2-.1.3-.2s.1-.1.2-.1a.1.1,0,0,1,.1-.1v-.5a.1.1,0,0,1,.1-.1h-.1s-.1-.1,0-.1.2,0,.2-.1a.19.19,0,0,0-.1-.3c-.1-.1-.2,0-.3,0a.1.1,0,0,1-.1.1c-.1,0-.2-.1-.1-.2h0v-.1h-.1l-.3.3V13h0c0,.1,0,.2-.1.2h-.1c0,.1.2.1.1.2s-.2.1-.4.2a2.72,2.72,0,0,1-.9,0h-.5c-.1,0-.1.1-.2.2h0v-.2c0-.1-.1,0-.1-.1-.2-.4-.7-.3-1.1-.3a.1.1,0,0,0-.1.1c-.1.1-.2,0-.3,0l-.1.1c-.1,0-.2-.1-.3,0s-.1.1-.2.1v.1h-.1c-.1,0-.3,0-.3.1h0c0,.1,0,.3-.1.3a.6.6,0,0,0-.4.1c-.1,0-.1.1-.2.1a2.45,2.45,0,0,0-.4,1.2h0v.1c-.2.4-.3.6-.6,1.1-.1.2-.2.6,0,.7s0,.2-.2.2-.4,0-.4-.2-.2-.1-.3-.1h-.4c-.2,0-.2.3-.3.4s-.3.1-.3.2V18a.1.1,0,0,0-.1.1v.1c0,.2-.1.3,0,.5v.1a.9.9,0,0,1-.1.5c-.1.2-.3.2-.5.2h-1c-.1,0-.1-.1-.2-.1a.31.31,0,0,1-.1-.2c-.1-.1-.3,0-.4.1.1,0,0,.1,0,.1s-.2.1-.3.2-.2-.2-.2-.3-.1-.1-.2-.1v.1H8.1c-.1.1.1.1.1.1v.1H8.1a.1.1,0,0,1-.1.1H8c-.1,0-.1.1-.1,0v-.2H7.8c0,.1,0,.1-.1.1v.1h.2a.37.37,0,0,1,.1.3H8c0,.1,0,.2-.1.1s0-.2,0-.3H7.8c.1.2-.1.3.1.5s-.2.2-.1.2a.35.35,0,0,0,.2.1v-.1s.1-.1.1,0v.1H8v.4c0,.1.2,0,.2.1s-.1.1,0,.2a.1.1,0,0,1,.1.1v.1a.1.1,0,0,1,.1.1c.1,0,.1,0,.1-.1s.1-.1.1-.2,0-.1-.1,0V21c0-.1-.1-.1-.1-.2s.1,0,.2-.1a.1.1,0,0,1,.1.1v.1a.1.1,0,0,1,.1.1c.1,0,.1.1.2.2h.3v-.1l.1.1a.37.37,0,0,0,.1.3h.1l.1.1h.1a.1.1,0,0,1,.1.1h0c.1,0,.2,0,.2.1s.1.2.2.4a29772.51,29772.51,0,0,1,.2.2.37.37,0,0,0,.3.1.35.35,0,0,1,.2-.1h.1c.1.2.1.4.3.4s.1.1.2.2h.2a.1.1,0,0,0,.1.1c.1.1.2.1.2.2v.1c.1,0,.2-.1.2,0s.2.1.2.2h.1v-.1c0-.1.1,0,.2-.1s.1-.2.1-.2.2.1.3.2h.1c.1.1.1.3.2.3s.2.1.4.2.2.1.3.1h.1c.1,0,.1,0,.2-.1s.3-.1.4-.2l.1-.1c.2-.1.5.1.7,0s.1,0,.2-.1.2-.3.1-.4-.2-.5-.3-.7l-.3-.3h-.1c-.1,0-.1-.1-.1-.2a.1.1,0,0,1-.1-.1v-.3c-.1,0-.2-.1-.4-.1a.1.1,0,0,1-.1-.1v-.1a.37.37,0,0,1,.3-.1v-.3a.1.1,0,0,0-.1-.1c0-.1.1-.2,0-.3s-.2-.2-.2-.3a.1.1,0,0,1-.1-.1v-.5c0-.1-.1-.1,0-.2l.1-.1c.1,0,.1-.1.1-.2a.14.14,0,0,0-.2,0v-.3l-.1-.1v-.2s0-.1-.1,0v-.2c0-.1-.1-.2-.2-.1h0a.14.14,0,0,1-.2,0V18a.1.1,0,0,0,.1-.1.14.14,0,0,0,0-.2c-.1-.1-.2-.2-.1-.3-.1,0-.3,0-.3-.2s0-.3-.1-.4v-.3a.1.1,0,0,1,.1-.1c.2,0,.4,0,.4-.1s-.1-.3,0-.3.4,0,.6-.2c.1,0,.1-.1,0-.2a.35.35,0,0,0-.1-.2c-.1-.1-.2,0-.3-.2V15c0-.1.1-.1.2-.2s.3,0,.5.1l.1.1v.1c0,.2.1.4,0,.6s-.1.1-.1.2H15c0,.1.1.3,0,.4s-.1,0-.3,0-.1,0-.1.1l.1.1c.4.1.5.1.9.2.1,0,.1.1.2.1h.3a.1.1,0,0,0,.1.1c.1.1.1.3.2.3a.14.14,0,0,1,.2,0c-.1.1,0,.2,0,.3s.2.1.3.2.2.1.2,0-.1-.2,0-.3c.1.2,0,.4.1.6h0c.1.1.1.2.2.2s.1-.1.1-.2v-.1c0-.1,0-.1.1-.2s.1-.2.1-.3v-.1c0-.1.2-.2.3-.2V17c.1,0,0-.2.1-.2s.1-.1.1-.2.1-.1,0-.1c.5.1.5,0,.5,0"/><path id="Shape-10" data-name="Shape" class="cls-1" d="M14.5,16.3h-.1v.1l.1.1v.3c0,.1.1.2.2.1s.2-.3.1-.4-.1-.1-.3-.2"/><path id="Shape-11" data-name="Shape" class="cls-1" d="M14.3,17.2h0c.1.2.2.1.3.1v-.1c-.1-.1-.1-.1-.3,0,.1-.1,0-.1,0-.1v.1"/><path id="Shape-12" data-name="Shape" class="cls-1" d="M14.6,17.6c0-.2-.1-.2-.2-.1s0,.3.1.4a.1.1,0,0,0,.1.1c0,.1.1,0,.2,0s0-.1.1-.1c-.1-.1-.2-.3-.3-.3"/><path id="Shape-13" data-name="Shape" class="cls-1" d="M14.3,16.8c0-.1-.1-.1,0,0-.1,0-.1,0-.1.1s0,.2.1.2a.1.1,0,0,0,.1-.1c-.1-.1-.1-.1-.1-.2"/><path id="Shape-14" data-name="Shape" class="cls-1" d="M14.7,17.4l.1-.1h.1v-.1c-.1,0-.1.1-.2.1s0,.1,0,.1"/><path id="Shape-15" data-name="Shape" class="cls-1" d="M14.6,18.3c0,.1,0,.1.1.1h.1v-.1h-.2"/><path id="Shape-16" data-name="Shape" class="cls-1" d="M14.8,19c0-.1.1-.1,0-.2h-.1a.35.35,0,0,0,.1.2"/><path id="Shape-17" data-name="Shape" class="cls-1" d="M8.5,21.5v.1h.2c-.1,0-.1-.2-.2-.1"/><path id="Shape-18" data-name="Shape" class="cls-1" d="M9.1,22.2c-.1.1.1.2.2.2v-.2a.14.14,0,0,0-.2,0"/><path id="Shape-19" data-name="Shape" class="cls-1" d="M9.4,22.6c0,.2.1.3.2.3.1-.2,0-.3-.2-.3"/><path id="Shape-20" data-name="Shape" class="cls-1" d="M19.5,17.4a1.27,1.27,0,0,1,.6-.1c.4,0,.4-.6.6-.9a.6.6,0,0,0-.1-.4c-.1-.2-.6,0-.7-.2s.3.1.3-.1,0-.1-.1-.2h-.2a2,2,0,0,0-.4.8,5.38,5.38,0,0,0-.9,1.2c0,.1,0,.1.1.2.3.1.6-.2.8-.3"/><path id="Shape-21" data-name="Shape" class="cls-1" d="M21.3,16.4c-.1,0-.1,0-.2.1v.2h.1c0-.1,0-.1-.1-.1.2-.1.2-.2.2-.2"/><path id="Shape-22" data-name="Shape" class="cls-1" d="M20,17.9c.1.2.5.1.5,0s-.3-.2-.4-.2.1.1-.1.2"/><path id="Shape-23" data-name="Shape" class="cls-1" d="M20.5,19.2a.37.37,0,0,0,.1-.3l-.3.3h.2"/><path id="Shape-24" data-name="Shape" class="cls-1" d="M22.3,16.5v-.1h-.2c-.1,0-.1-.1-.1-.2s-.1-.2-.1-.3-.1.2-.1.2c.2.2.3.5.5.4"/><path id="Shape-25" data-name="Shape" class="cls-1" d="M19.9,15.3c-.1-.1-.1,0,0,0-.1.1,0,.1,0,0h0"/><path id="Shape-26" data-name="Shape" class="cls-1" d="M8.1,19.1A.1.1,0,0,0,8,19H7.9v.1a.14.14,0,0,0,.2,0"/><path id="Shape-27" data-name="Shape" class="cls-1" d="M8.8,19.1c.1,0,.2-.1.1-.2h0c-.1-.1-.3,0-.2.1-.1.1,0,.2.1.1"/><path id="Shape-28" data-name="Shape" class="cls-1" d="M20.2,12.1c0-.1.1-.1.1-.2h-.1c-.1,0-.1.1,0,.2h0"/><path id="Shape-29" data-name="Shape" class="cls-1" d="M20.5,12s.1-.1,0-.1h-.1a.1.1,0,0,0,.1.1"/><path id="Shape-30" data-name="Shape" class="cls-1" d="M19.4,14.6c0,.1.2.3.3.2a.14.14,0,0,0,0-.2.19.19,0,0,0-.3,0"/><path id="Shape-31" data-name="Shape" class="cls-1" d="M19.7,15.4v-.1h-.3a.1.1,0,0,0,.1.1c0-.1.1,0,.2,0"/><path id="Shape-32" data-name="Shape" class="cls-1" d="M19.4,15.6c-.1,0,0,.1,0,.2s.1,0,.2-.1.1-.2,0-.2-.2,0-.2.1"/><path id="Shape-33" data-name="Shape" class="cls-1" d="M19.2,15.3c0,.1-.1.2,0,.3s.1,0,.1,0,0-.2.1-.2h-.1v-.1h-.1"/><path id="Shape-34" data-name="Shape" class="cls-1" d="M26.8,22.4c.1,0,0-.1,0,0h0"/><path id="Shape-35" data-name="Shape" class="cls-1" d="M21,18.5h0l-.1-.1c0-.1-.1.1-.2,0h0c.1.1,0,.1-.1.2a.1.1,0,0,0,.1.1c0,.1-.1.1,0,.2l-.1.1s-.1.1,0,.1.2-.1.3-.1H21c.1,0,.1-.1.2-.2H21s-.1,0,0-.3h0"/><path id="Shape-36" data-name="Shape" class="cls-1" d="M21.6,20.4c0,.1.1.1,0,0,.1,0,.1-.1.1-.2h-.1v.2"/><path id="Shape-37" data-name="Shape" class="cls-1" d="M21.7,20.2c.1,0,0-.1,0-.1h-.1a.1.1,0,0,0,.1.1"/><path id="Shape-38" data-name="Shape" class="cls-1" d="M22.3,20.5h0c-.1,0-.1-.1-.2,0H22v.1c.2-.1.2-.1.3-.1"/><path id="Shape-39" data-name="Shape" class="cls-1" d="M23.3,20.4v-.1c-.1,0-.2.1-.3,0v.1h-.1c.2.1.3,0,.4,0"/><path id="Shape-40" data-name="Shape" class="cls-1" d="M23.7,20c0,.2.2.1.2,0s0-.1-.2,0l.1-.1a.1.1,0,0,1-.1.1"/><path id="Shape-41" data-name="Shape" class="cls-1" d="M28.5,16.8c0,.1.1.1.2.1a.37.37,0,0,0,.3-.1.27.27,0,0,0-.3-.3c-.2.1-.2.2-.2.3"/><path id="Shape-42" data-name="Shape" class="cls-1" d="M28.5,21.9h-.1c-.1.5-.6,1.2,0,1.5.2.2.5-.1.6-.3s0-1-.5-1.2"/><path id="Shape-43" data-name="Shape" class="cls-1" d="M27,19.7c-.1,0-.1.2,0,.2a.1.1,0,0,0,.1-.1v-.1H27"/><path id="Shape-44" data-name="Shape" class="cls-1" d="M27.4,24.8V25s.2-.1,0-.2h0"/><path id="Shape-45" data-name="Shape" class="cls-1" d="M29.7,13.1h-.1v.2c-.2.4-.7.9-.4,1.4h0a1.38,1.38,0,0,0,.3-.4,10.37,10.37,0,0,0,.4-1s-.1-.2-.2-.2"/><path id="Shape-46" data-name="Shape" class="cls-1" d="M28.8,14.9c0,.1,0,.1.1.1s.1-.1,0-.1,0-.1-.1,0"/><path id="Shape-47" data-name="Shape" class="cls-1" d="M23.7,11.8c-.1-.2-.2,0-.3,0l-.1-.1h-.1c-.1,0,0,.2.1.2s.1-.1.1,0,0,.3.2.2.2-.1.3-.1.1-.1.1-.2.2-.1.3,0a.1.1,0,0,0,.1.1c0,.1.1.1.2.1a.37.37,0,0,0,.3-.1.19.19,0,0,0,0-.3h-.2c-.1,0-.1-.1-.2-.1-.4-.1-.6.2-.8.3"/><path id="Shape-48" data-name="Shape" class="cls-1" d="M22.7,12H23c0-.2-.2-.1-.3-.1.1-.1.1,0,0,.1h0"/><path id="Shape-49" data-name="Shape" class="cls-1" d="M23.1,12.6c.1-.1.3-.2.4-.3v-.1h0c0-.1-.1-.1-.2-.2a.1.1,0,0,1-.1.1c-.1.1-.2.1-.2.2v.2c.1.3.1.2.1.1"/><path id="Shape-50" data-name="Shape" class="cls-1" d="M21.6,11.6v.1c.1.1.1,0,0-.1h0"/><path id="Shape-51" data-name="Shape" class="cls-1" d="M18,9.4a.6.6,0,0,0,.4.1l.1-.1c-.1-.1-.2,0-.2-.1h-.1c-.1-.1-.2,0-.2.1h0"/><path id="Shape-52" data-name="Shape" class="cls-1" d="M27.1,11c0,.1-.1,0-.2.1v.1c.1.1.2,0,.3,0h0s.1-.1.1,0v.1a.1.1,0,0,0-.1.1h-.3v.2c-.1.1-.4.2-.3.4a.75.75,0,0,0,.5.1h0c0-.2.1-.2.2-.3a.1.1,0,0,0-.1-.1v-.1a.1.1,0,0,0,.1-.1v-.1a.35.35,0,0,0,.2-.1c0-.1-.1-.2-.1-.3a.1.1,0,0,1,.1-.1v-.1h-.1s-.1,0,0,.1a.37.37,0,0,0-.3.1c0-.2.1,0,0,0"/><path id="Shape-53" data-name="Shape" class="cls-1" d="M26.1,12c0,.1.1.1.2,0h-.2"/><path id="Shape-54" data-name="Shape" class="cls-1" d="M27.5,11.8c-.1.1.1.1.2.1h0c0-.1-.1-.1-.2-.1"/><path id="Shape-55" data-name="Shape" class="cls-1" d="M27.9,11.3h0c-.1,0-.1.1,0,0h0"/><path id="Shape-56" data-name="Shape" class="cls-1" d="M25.6,7.3c.1.1.2.1.2.2v.4l.1.1v.2c0,.1.1.3.1.4a.1.1,0,0,1,.1.1c0,.1,0,.1.1.2s.1,0,.2.1.2.3.3.4a.1.1,0,0,1,.1.1v.1c.2,0,.5.1.4.4.1-.1.2-.1.2-.2s.1-.3,0-.4-.1-.1-.2-.2V9a.1.1,0,0,0-.1-.1c0-.1-.1-.3.1-.3V8.5H27V8.4a.35.35,0,0,0-.4-.4c-.1-.1-.1-.1-.2-.1h-.2a2.09,2.09,0,0,1-.4-.6.19.19,0,0,0-.3,0c.1-.1.1-.1.1,0h0"/><path id="Shape-57" data-name="Shape" class="cls-1" d="M24.7,7.6a.14.14,0,0,0,0,.2h.4a.1.1,0,0,0,.1-.1c.1-.1.2,0,.4-.1,0,.1,0,.1.1.1s0-.2-.1-.2-.1-.2-.2-.3h-.1c0,.2-.1.1-.3.2v.1h0V7.4h-.2a.35.35,0,0,1-.1.2"/><path id="Shape-58" data-name="Shape" class="cls-1" d="M22.4,3.7c-.1-.2-.3-.4-.2-.7a1.39,1.39,0,0,0,.9,0c.2-.1.5,0,.7-.1V2.7c-.3.1-.5-.2-.7-.1a3.18,3.18,0,0,1-.9.3c-.2.1-.9,0-.9.4.3,0,.7,0,.9.3,0,.1.1.1.2.1"/><path id="Shape-59" data-name="Shape" class="cls-1" d="M23.4,5.2a.4.4,0,0,0,.4.2c0-.1,0-.1-.1-.2h-.3"/><path id="Shape-60" data-name="Shape" class="cls-1" d="M23.1,5.7c-.1,0,0,.1.1.2,0-.1.1-.3-.1-.2"/><path id="Shape-61" data-name="Shape" class="cls-1" d="M22.9,5.4h0c.1-.1,0-.2-.1-.2v.1l.1.1"/><path id="Shape-62" data-name="Shape" class="cls-1" d="M23.8,6.5h0a.31.31,0,0,0,.1-.2h-.1a.14.14,0,0,0,0,.2"/><path id="Shape-63" data-name="Shape" class="cls-1" d="M24.1,6.5v.1c.1.1.1,0,0-.1h0c.1,0,0,.1,0,0"/><path id="Shape-64" data-name="Shape" class="cls-1" d="M24,6.8h0l.1-.1h0c0-.1-.1-.1-.2,0s.1,0,.1.1"/><path id="Shape-65" data-name="Shape" class="cls-1" d="M24.1,6.8h0c0,.1.1.2.2.1s.1-.1,0-.1Z"/><path id="Shape-66" data-name="Shape" class="cls-1" d="M24.6,7h0a.35.35,0,0,0-.1-.2s-.1.1,0,.1,0,.1.1.1"/><path id="Shape-67" data-name="Shape" class="cls-1" d="M24.7,7.3h.1V7.2h0V7.1h-.2v.1l.1.1"/><path id="Shape-68" data-name="Shape" class="cls-1" d="M24.5,7.5h0c.1-.1.1-.1,0-.2h-.1a.1.1,0,0,1-.1.1c.1.1.1.1.2.1"/><path id="Shape-69" data-name="Shape" class="cls-1" d="M24.2,2.5h0c-.1-.1-.1-.1-.2-.1.1.1.1.2.2.1"/><path id="Shape-70" data-name="Shape" class="cls-1" d="M27.6,5c.1.1.2,0,.2.1s.1.2.2.2.1,0,.1-.1,0-.4-.2-.4h-.5c-.1,0-.1.1-.1.2a.19.19,0,0,1,.3,0"/><path id="Shape-71" data-name="Shape" class="cls-1" d="M31.7,10.2c-.1-.1-.1-.3-.2-.4s-.2-.1-.3-.2V9.4l-.1-.1C31,9.1,31,9,30.8,9c0-.2-.1-.2-.3-.3V8.6a.1.1,0,0,0-.1-.1h-.1c-.1-.1-.2-.2-.2-.3s-.2-.2-.3-.3l-.1-.1c-.1,0-.2,0-.2-.1s-.2-.3-.3-.4,0-.4-.1-.7c0-.1-.1-.1-.2-.1a.1.1,0,0,1-.1-.1c-.1-.1,0-.3-.1-.4s-.3-.3-.4-.5a.37.37,0,0,0-.3-.1h-.1l-.1-.1c-.1-.1-.2-.2-.3-.2s-.4,0-.6-.1-.4,0-.5.2-.3.2-.5.2,0,.1,0,.2-.2.2-.1.2H26a.1.1,0,0,1,.1.1c.1.1.2.2.2.3a.14.14,0,0,0,0,.2.37.37,0,0,1,.1.3c0,.1.1,0,.1,0a.25.25,0,0,1,.1.4v.3c.1.2.1.4.2.5l.1-.1c.1,0,.1-.1.2-.1.2-.2.4.2.5.3s0,.4.1.6A1.38,1.38,0,0,0,28,9a.31.31,0,0,0,.1.2l.1.1a.1.1,0,0,1,.1-.1h.1c.2.2.2.6.5.6a.1.1,0,0,0,.1.1c.1,0,.1-.1.2,0a.35.35,0,0,0,.1.2h.3c.1,0,.1.1.2.2l.1.1c.2.2.3.5.5.7s.2.2.3.1v-.1a.22.22,0,0,0,.2-.2l.3-.3h0c.1-.1.2-.1.3-.2.3,0,.2-.2.2-.2"/><path id="Shape-72" data-name="Shape" class="cls-1" d="M27.5,10.3c0,.1.1.1.2.1s.1.2.2.2.1-.1.1-.2h.1c.1-.1,0-.3-.1-.4s-.1-.2-.3-.2-.1,0-.2.1,0,.2,0,.3v.1"/><path id="Shape-73" data-name="Shape" class="cls-1" d="M28.2,10.7c-.1.2,0,.4,0,.6s-.2.1-.2.2a.14.14,0,0,0,0,.2c0,.1.2.1.3.2a1.17,1.17,0,0,1,.6.6.37.37,0,0,1,.1.3c.1.1.2.1.2.2s.1.1.1,0a.3.3,0,0,0,0-.4c-.1-.1-.1-.1-.1-.2a2.35,2.35,0,0,0-.2-.8l-.3-.3v-.1c0-.1.1-.1.1-.2s-.1-.2-.2-.3h0c-.2-.1-.3-.1-.4,0"/><path id="Shape-74" data-name="Shape" class="cls-1" d="M29.7,12.1v-.2c0-.2-.2-.2-.3-.2h-.1v.2a2.93,2.93,0,0,1,.3,1c0,.1.3,0,.3-.1v-.2c0-.1-.1-.1-.1-.2s-.1-.2-.1-.3"/><path id="Shape-75" data-name="Shape" class="cls-1" d="M29.3,11.2c-.1.1,0,.2,0,.3h0c.1,0,.1,0,.1-.1s0-.1-.1-.2h0"/><path id="Shape-76" data-name="Shape" class="cls-1" d="M29.3,11c0-.1,0-.1-.1-.1s-.1.1-.2.1,0,.1.1.2h0c.2,0,.3-.1.2-.2h0"/><path id="Shape-77" data-name="Shape" class="cls-1" d="M28.8,10.5c.1.1,0,.2.1.2s.2.1.3,0,0-.1-.1-.1v-.1H29c-.1-.1.1-.1,0-.2v-.1h-.1v.1c-.1.1-.2.2-.1.2"/><path id="Shape-78" data-name="Shape" class="cls-1" d="M28.7,9.9c-.1,0-.2,0-.2-.1h-.1s-.1.1,0,.1a.1.1,0,0,1,.1.1c0,.1.1,0,.1.1s.1.1.1,0V10h0s.1-.1,0-.1"/><path id="Shape-79" data-name="Shape" class="cls-1" d="M21.6,14.5h0a.14.14,0,0,0,0-.2.1.1,0,0,0-.1.1h0c.1,0,.1,0,.1.1"/><path id="Shape-80" data-name="Shape" class="cls-1" d="M29.4,13.2a.6.6,0,0,0-.4.1c-.2.1-.3.4-.4.6a.52.52,0,0,1-.4.2.1.1,0,0,1-.1-.1v-.2l.1-.1c.1-.1,0-.2,0-.3s-.3-.4-.5-.3-.3.3-.5.5h0c-.1-.1-.2-.2-.2-.3v-.1c.1,0,.2.2.2.1s0-.2-.1-.2-.1-.1-.2-.1-.1-.1-.2-.2,0-.3-.1-.3a.37.37,0,0,1-.3-.1h-.2v-.1c.1,0,.3,0,.2-.2s-.1-.1-.2-.1H26v.3a.37.37,0,0,1-.3.1h-.1c-.1,0-.2-.1-.3-.1s-.1.2-.2.2-.1,0-.2.1-.1.2,0,.3V13a.1.1,0,0,1-.1-.1c0-.1-.1-.2-.1-.3s.1-.2.2-.3v-.2c-.1-.1-.1-.1-.2-.1s-.3.4-.5.3-.2-.2-.3-.2-.1-.1-.2,0a2.19,2.19,0,0,1-.5.3c-.1.1-.3.2-.3.4a.38.38,0,0,1-.6.1c-.1-.1-.2-.2-.3-.2s-.2.2-.3.2-.1,0-.2-.1v-.1l.6-.3c.1,0,.1-.1.1-.2V12a.68.68,0,0,0-.6.4.1.1,0,0,1-.1.1c-.2,0-.3.1-.5,0l-.1-.2c-.1.1-.1.2-.2.2l-.1.1c-.1.1.1.3,0,.4s-.2.1-.3.1v.2c0,.1.1,0,.1.1s.1.3.2.3.3,0,.5.1.2.1.3.2.1.1.1.2a.1.1,0,0,0,.1.1h.2c.1,0,0,.1.1.2a.76.76,0,0,0,.1.4s0,.2-.1.2a.1.1,0,0,0-.1.1v.3h.1c.1.1.1.2.2.3l.1.1a.1.1,0,0,0-.1.1.14.14,0,0,0,.2,0c.1,0,.1-.1.2-.1a.1.1,0,0,0,.1-.1.35.35,0,0,1,.1.2c-.1.1-.3,0-.4.1s-.1,0-.2.1a.1.1,0,0,0,.1.1c.2.1.1.4-.1.6v.2H22c-.2,0-.5-.1-.7,0s-.1.1-.1.2h0a.1.1,0,0,0-.1.1v.2c-.2.2-.2.5-.3.7a.1.1,0,0,0,.1.1c.1,0,.1-.1.2-.1s.1.2.1.2.2.1.2,0a.37.37,0,0,1,.1-.3c0-.1-.1-.2-.1-.3s0-.2.1-.2a.1.1,0,0,1,.1.1v.4a.14.14,0,0,1,0,.2.1.1,0,0,1-.1.1v.2c-.1.1-.1.1-.1.2-.2,0-.4-.1-.3-.3-.1,0-.1,0-.2.1V19c-.1.1-.1.2-.2.3v.1c-.1.1-.2.2-.3.2h0c-.1.1-.2,0-.2.1s.1.2.1.3,0,.1-.1.2h-.4a.37.37,0,0,1-.1.3c-.1.1,0,.2.1.2s.1.2.2.2.1.1.2.1a.22.22,0,0,0,.2-.2c0-.1.1,0,.2,0h.1a.14.14,0,0,0,0-.2l.4-.4c.1,0,.1-.1.2-.1s.1.1.2.1.1.1.2.1h.1c.1,0,.2.2.3.2h0a.37.37,0,0,0-.1-.3c-.1-.1-.2-.2-.3-.2v-.1h0c.1.1.1.1.2.1s.1.2.2.3.1.1.2.1a.37.37,0,0,0,.3-.1c0-.1,0-.1-.1-.1s0-.1.1-.2,0-.2,0-.3v-.1h0c.1-.1,0-.2,0-.4h0c0,.1.1.1.2.1a.22.22,0,0,0,.2-.2.19.19,0,0,1,.3.1c0,.1,0,.2-.1.2a.76.76,0,0,0-.5.2l-.1.1c-.1.1-.1.1-.1.2l-.1.1a.1.1,0,0,1,.1.1.37.37,0,0,0,.3-.1v-.2c.1,0,.1-.1.2-.1s.3.2.2.3h-.1c-.1.1-.2.3-.3.3s-.5.1-.7.2-.1.2-.2.2-.2.1-.3,0h0c0,.1-.2,0-.3,0a.31.31,0,0,0-.1-.2h-.1v-.1h-.8a.1.1,0,0,0-.1.1l-.1.1a.37.37,0,0,1-.3.1.37.37,0,0,0-.3.1c-.2,0-.3.2-.4.3a.37.37,0,0,1-.3.1v.1c-.2,0-.3.3-.4.5V22c-.1.1-.1.3-.3.4v.1c.1.2.3.3.5.5a.1.1,0,0,0,.1.1c.1.1.1.2.2.4s.3.2.5.2a.35.35,0,0,1,.2.1c.2,0,.5.1.7,0,.3.1.7,0,1,.1.1,0,.1.1.1.2s.2.3.3.4a.6.6,0,0,0,.4.1.31.31,0,0,0,.1.2c0,.1,0,.1.1.2s.1.1.1.2-.1.2-.1.4v.2a2.65,2.65,0,0,0,.6.5s.1,0,0,.1c.1,0,.1.1.2.2s0,.1.1.2l.3.3a.6.6,0,0,0,.4.1.1.1,0,0,1,.1.1c.1,0,.3.1.4,0s.1-.2.2-.2A.6.6,0,0,1,25,27a.1.1,0,0,0,.1-.1c0-.1.1-.1.1-.2s.2-.1.3-.1.3-.3.5-.4.4-.1.5-.2,0-.4,0-.6.1-.2.1-.3v-.5c0-.1-.1-.2-.1-.3s.1-.1.2-.1.1-.3.2-.4a.1.1,0,0,0,.1-.1c.1,0,0-.1,0-.2a.1.1,0,0,1-.1-.1,1.21,1.21,0,0,0-.5-.5.1.1,0,0,1-.1-.1v-.1c-.1,0,0-.1-.1-.1h.1c.1-.1.1-.3.2-.4a.1.1,0,0,0,.1-.1v-.3c-.1-.1,0-.3,0-.4a2.2,2.2,0,0,0-.1-.8c0-.1-.1-.1-.2-.1a.1.1,0,0,1-.1.1.31.31,0,0,1-.1.2c0,.1-.2.1-.2.2s0,.1-.1.2l-.1.1c.4-.3.3-.3.3-.2h-.3a14.24,14.24,0,0,0-1.6-.5h.3c.1,0,0-.1,0-.1s.2.1.3.2.5.1.7.2.3.2.5.2.3-.1.4-.1v-.1c.1-.1.2-.2.2-.3v-.3l.1-.1v-.4a.1.1,0,0,0,.1-.1v-.3a.75.75,0,0,0-.1-.5c0-.1-.1-.1-.2-.1a.1.1,0,0,1-.1.1c-.1,0-.2,0-.2.1a.1.1,0,0,0-.1.1.52.52,0,0,1-.4.2c-.1,0-.2,0-.2-.1s.2-.2.4-.2l.1-.1a.22.22,0,0,1,.2-.2h.2c.1,0,.1-.1.2-.1a.31.31,0,0,1,.1-.2c0-.1.1-.1.2-.2s.1-.4.2-.6,0,.1.1.2a.19.19,0,0,0,.3,0c.1-.1,0-.2.1-.2h.1c.1,0,.1.1.2.1a.35.35,0,0,1,.2-.1h.3c.2-.1.6,0,.6-.2a.86.86,0,0,0-.6-.7c-.2-.1-.1-.4-.3-.6-.1,0,0-.1-.1-.2l-.1-.1-.1-.1v-.5c0-.1.1-.1.2-.1s.2-.1.2-.2v-.4l.1-.1c.2,0,.5.1.7-.1.1,0,.1-.1.1-.2a1,1,0,0,0,.4-.8c-.1.1,0,.1,0-.1.1.1.1,0,0,0m-4.5,5.4h0c-.1.1-.1.1-.2,0s-.1-.1-.1-.2-.1,0-.1.1h-.2c0-.1-.1-.1-.1-.2s0-.2.1-.2.1,0,.1.1h0v.1c.1.1.1,0,.2,0h.3c0,.1.1.2,0,.3h0"/><path id="Shape-81" data-name="Shape" class="cls-1" d="M15.6,36c1.3-1.9,5.2-3.9,9-3.9s8,2.2,9.6,1a8.38,8.38,0,0,1-5.1,1.4c-3.4,0-4.7-1.7-7-1.7s-4.8,1.9-5.9,3.5Z"/><path id="Shape-82" data-name="Shape" class="cls-1" d="M27.7,31.8a5.34,5.34,0,0,0,1.7-1.9,14.44,14.44,0,0,1,3.7-4.4s-1.7,5.5-3.5,5.7c0,0-.3.2.2.1s2.8-.9,3.6-1.1a8.58,8.58,0,0,0,3.3-1.1,1.48,1.48,0,0,1,.8-.4s-2.2,3.7-6.2,3.7a17.1,17.1,0,0,1-3.6-.6"/><path id="Shape-83" data-name="Shape" class="cls-1" d="M32.4,29.9a3.92,3.92,0,0,0,.5-1.7,14.64,14.64,0,0,1,2.7-6.3s.3,4.3-1.9,7c0,0-.1.4.1.1a22.93,22.93,0,0,1,4.6-3.9s1.5-1.3,1.6-1.7c0-.1-1.2,6.1-7.6,6.5"/><path id="Shape-84" data-name="Shape" class="cls-1" d="M36.1,25.8a5.62,5.62,0,0,0,.2-1.3c0-.6-.3-2.6-.3-3.5a7.53,7.53,0,0,1,.8-3.7,4.5,4.5,0,0,0,.2,1.4,12.29,12.29,0,0,1,.5,2.5,10.27,10.27,0,0,1-.4,2.5,2.13,2.13,0,0,0,.6-.8,12.81,12.81,0,0,1,2.2-2.8A5.62,5.62,0,0,0,41.3,18a6.08,6.08,0,0,1-1.2,4.1c-1.5,2.1-2.1,1.8-2.9,2.6a11.41,11.41,0,0,1-1.1,1.1"/><path id="Shape-85" data-name="Shape" class="cls-1" d="M38.4,20.9a3.87,3.87,0,0,0-.3-1.6,10.5,10.5,0,0,1-1.3-5.9s.2-.2.6,1,1,1.6,1.2,2.8a12,12,0,0,1,.2,1.7s.1.2.1,0a9,9,0,0,1,.8-3.2c.7-1.5,1.6-2.9,1.5-3.9,0,0,.4,0,.3,1.6.1,1.6-.3,4.4-3.1,7.5"/><path id="Shape-86" data-name="Shape" class="cls-1" d="M39.2,16.1a12,12,0,0,0-.8-1.5c-.3-.4-2.7-3.7-2.9-5.3,0,0,.2-.1.4.3a12.94,12.94,0,0,0,1.5,1.7,5,5,0,0,1,1.5,2.8s.1.1-.1-2.1.7-3.7-.1-5.3c0,0,1.1.2,1.7,4.8a9.68,9.68,0,0,1-.9,3.6c.1-.1-.2,1-.3,1"/><path id="Shape-87" data-name="Shape" class="cls-1" d="M38.3,11a9.94,9.94,0,0,0-1.6-1.3,9.58,9.58,0,0,1-3.3-4.3s.1-.2.8.7c.5.7,1.1.4,2.7,2.4,0,0,.2.5.3.4s-.1-.5-.1-.5S37,7.2,37,6.8a15.83,15.83,0,0,0-.9-3.1,5.82,5.82,0,0,1,2.5,4.7c-.1,0-.2,2.5-.3,2.6"/><path id="Shape-88" data-name="Shape" class="cls-1" d="M36.5,7.3s.1-3-3.8-4.6c0,0,1.4,2.8,2.4,3.5a11.57,11.57,0,0,1,1.4,1.1"/><path id="Shape-89" data-name="Shape" class="cls-1" d="M26.3,36c-1.3-1.9-5.2-3.9-9-3.9s-8,2.2-9.6,1a8.38,8.38,0,0,0,5.1,1.4c3.4,0,4.7-1.7,7-1.7s4.8,1.9,5.9,3.5Z"/><path id="Shape-90" data-name="Shape" class="cls-1" d="M14.2,31.8a5.34,5.34,0,0,1-1.7-1.9,14.44,14.44,0,0,0-3.7-4.4s1.7,5.5,3.5,5.7c0,0,.3.2-.2.1s-2.8-.9-3.6-1.1a8.58,8.58,0,0,1-3.3-1.1,1.24,1.24,0,0,0-.8-.4s2.2,3.7,6.2,3.7a17.1,17.1,0,0,0,3.6-.6"/><path id="Shape-91" data-name="Shape" class="cls-1" d="M9.5,29.9A3.92,3.92,0,0,1,9,28.2a14.64,14.64,0,0,0-2.7-6.3s-.3,4.3,1.9,7c0,0,.1.4-.1.1a22.93,22.93,0,0,0-4.6-3.9S2,23.8,1.9,23.4c0-.1,1.2,6.1,7.6,6.5"/><path id="Shape-92" data-name="Shape" class="cls-1" d="M5.8,25.8a5.62,5.62,0,0,1-.2-1.3c0-.6.3-2.6.3-3.5a7.53,7.53,0,0,0-.8-3.7,4.5,4.5,0,0,1-.2,1.4,12.29,12.29,0,0,0-.5,2.5,10.27,10.27,0,0,0,.4,2.5,2.13,2.13,0,0,1-.6-.8A12.81,12.81,0,0,0,2,20.1,5.62,5.62,0,0,1,.6,18a6.08,6.08,0,0,0,1.2,4.1c1.5,2.1,2.1,1.8,2.9,2.6.1,0,1,1.1,1.1,1.1"/><path id="Shape-93" data-name="Shape" class="cls-1" d="M3.5,20.9a6.93,6.93,0,0,1,.3-1.6,10.5,10.5,0,0,0,1.3-5.9s-.2-.2-.6,1-1,1.6-1.2,2.8A8.18,8.18,0,0,0,3,18.9s-.1.2-.1,0a9,9,0,0,0-.8-3.2C1.4,14.2.5,12.8.6,11.8c0,0-.4,0-.3,1.6a11,11,0,0,0,3.2,7.5"/><path id="Shape-94" data-name="Shape" class="cls-1" d="M2.7,16.1a12,12,0,0,1,.8-1.5c.3-.4,2.7-3.7,2.9-5.3,0,0-.2-.1-.4.3a12.94,12.94,0,0,1-1.5,1.7A5,5,0,0,0,3,14.1s-.1.1.1-2.1-.7-3.7.1-5.3c0,0-1.1.2-1.7,4.8a9.68,9.68,0,0,0,.9,3.6c-.1-.1.2,1,.3,1"/><path id="Shape-95" data-name="Shape" class="cls-1" d="M3.6,11A9.94,9.94,0,0,1,5.2,9.7,9.58,9.58,0,0,0,8.5,5.4s-.1-.2-.8.7c-.5.7-1.1.4-2.7,2.4,0,0-.2.5-.3.4s.1-.5.1-.5a13.88,13.88,0,0,0,.3-1.7A15.83,15.83,0,0,1,6,3.6,5.82,5.82,0,0,0,3.5,8.3,12.21,12.21,0,0,0,3.6,11"/><path id="Shape-96" data-name="Shape" class="cls-1" d="M5.4,7.3s-.1-3,3.8-4.6c0,0-1.4,2.8-2.4,3.5A11.57,11.57,0,0,0,5.4,7.3"/></g></g></g></g></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/pdf.svg b/html/themes/custom/common_design_subtheme/img/icons/pdf.svg
new file mode 100644
index 000000000..938291c05
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/pdf.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="19.25" height="14"><path data-name="Path 1010" d="M16.188.411V0l3.063 3.063H16.53a.342.342 0 01-.341-.341zm3.063 3.526v9.188a.875.875 0 01-.875.875H.876a.875.875 0 01-.875-.875V.875A.875.875 0 01.876 0h14.438v2.721a1.218 1.218 0 001.216 1.216zM7.439 6.562A1.314 1.314 0 006.127 5.25H4.815a.437.437 0 00-.437.438v4.375a.438.438 0 00.875 0v-1.75h.875a1.314 1.314 0 001.313-1.312zm3.938 0a1.314 1.314 0 00-1.312-1.312H8.75a.437.437 0 00-.437.438v4.375a.437.437 0 00.438.438h1.313a1.314 1.314 0 001.313-1.312zm3.938-.875a.437.437 0 00-.437-.437h-2.187a.437.437 0 00-.437.438v4.375a.438.438 0 00.875 0v-1.75H14a.438.438 0 000-.875h-.875V6.126h1.75a.437.437 0 00.438-.438zm-5.25.438H9.19v3.5h.875a.438.438 0 00.438-.437V6.563a.438.438 0 00-.44-.438zm-3.937 0h-.875v1.313h.875a.438.438 0 00.438-.437v-.437a.438.438 0 00-.441-.439z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/search.svg b/html/themes/custom/common_design_subtheme/img/icons/search.svg
new file mode 100755
index 000000000..bb747d476
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/search.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48.00012 48"><path d="M46.82861,41.17188l-8.428-8.428a21.01836,21.01836,0,1,0-5.65673,5.65673l8.42749,8.42749a3.99991,3.99991,0,0,0,5.65722-5.65624ZM8,21a13,13,0,1,1,22.32526,9.04614c-.04969.045-.106.07782-.15387.12574s-.08069.10418-.12561.1538A12.99192,12.99192,0,0,1,8,21Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/selected--highlighted.svg b/html/themes/custom/common_design_subtheme/img/icons/selected--highlighted.svg
new file mode 100644
index 000000000..ca65b0c08
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/selected--highlighted.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path fill="#80CBFF" d="M18.5,39.75a4,4,0,0,1-2.83-1.17L3.17,26.08a4,4,0,0,1,5.66-5.66l9.67,9.67L39.17,9.42a4,4,0,0,1,5.66,5.66l-23.5,23.5A4,4,0,0,1,18.5,39.75Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/selected.svg b/html/themes/custom/common_design_subtheme/img/icons/selected.svg
new file mode 100644
index 000000000..1cfa1df9c
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/selected.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M18.5,39.75a4,4,0,0,1-2.83-1.17L3.17,26.08a4,4,0,0,1,5.66-5.66l9.67,9.67L39.17,9.42a4,4,0,0,1,5.66,5.66l-23.5,23.5A4,4,0,0,1,18.5,39.75Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sm-fb-def.svg b/html/themes/custom/common_design_subtheme/img/icons/sm-fb-def.svg
new file mode 100644
index 000000000..509fc87e8
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/sm-fb-def.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M24,5A19,19,0,1,1,5,24,19,19,0,0,1,24,5m0-3A22,22,0,1,0,46,24,22,22,0,0,0,24,2Z"/><path d="M29.16,13H25.64c-2.09,0-4.41.88-4.41,3.9,0,1.05,0,2.06,0,3.2H18.82v3.84h2.49V35h4.57V23.87h3l.27-3.78H25.81s0-1.68,0-2.17c0-1.2,1.24-1.13,1.32-1.13h2V13h0Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sm-fb-full.svg b/html/themes/custom/common_design_subtheme/img/icons/sm-fb-full.svg
new file mode 100644
index 000000000..ff993d363
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/sm-fb-full.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M24,2A22,22,0,1,0,46,24,22,22,0,0,0,24,2Zm4.9,21.87h-3V35H21.31V23.94H18.82V20.1h2.41c0-1.14,0-2.15,0-3.2,0-3,2.32-3.9,4.41-3.9h3.52v3.79h-2c-.07,0-1.32-.07-1.32,1.13,0,.49,0,2.17,0,2.17h3.37Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sm-gh-def.svg b/html/themes/custom/common_design_subtheme/img/icons/sm-gh-def.svg
new file mode 100644
index 000000000..4e253b6f9
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/sm-gh-def.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M14.46,26.8a.16.16,0,0,1,0-.26.71.71,0,0,1,.66-.2,1.15,1.15,0,0,1,.46.13,3,3,0,0,1,1,.89,6.7,6.7,0,0,0,.89,1,2.45,2.45,0,0,0,3.23.2,2,2,0,0,1,.43-.79,2,2,0,0,1,.56-.46q.26-.13.92-.39a12.25,12.25,0,0,1-3.52-.76A6,6,0,0,1,17,24.69a5.52,5.52,0,0,1-1.28-3.09,7.92,7.92,0,0,1,.3-3.49,5.8,5.8,0,0,1,1.12-1.78,5.89,5.89,0,0,1,.2-3.75A6.84,6.84,0,0,1,21.1,14,14.42,14.42,0,0,1,27.95,14a12.37,12.37,0,0,1,1.42-.82,5.79,5.79,0,0,1,2.4-.56,7.1,7.1,0,0,1,.36,1.71,5.66,5.66,0,0,1-.1,1.84,6.07,6.07,0,0,1,1.58,4.21,7.48,7.48,0,0,1-.72,3.49,5.56,5.56,0,0,1-2.57,2.3,9.15,9.15,0,0,1-3.29.72,4.36,4.36,0,0,1,1.35,1,2.9,2.9,0,0,1,.56,1.55v2.07l.07,2a2.47,2.47,0,0,0,.92.89.22.22,0,0,1,.13.3q-.07.2-.53.2A2.19,2.19,0,0,1,27.75,34a1.51,1.51,0,0,1-.2-.79V30.09a1,1,0,0,0-.26-.76,1.28,1.28,0,0,0-.53-.3v4.15A2.6,2.6,0,0,0,27,34.63a1.55,1.55,0,0,1,.33.66s0,.08-.1.1a1.27,1.27,0,0,1-.56-.1,1.63,1.63,0,0,1-1.18-.89,3.4,3.4,0,0,1-.33-1.48V28.84h-.86v4.08A3.62,3.62,0,0,1,24,34.43a1.85,1.85,0,0,1-1.71,1q-.2-.07-.2-.13a5.58,5.58,0,0,0,.39-.66,3.05,3.05,0,0,0,.16-.53,3.82,3.82,0,0,0,.1-.92V29a1.07,1.07,0,0,0-.49.3,1,1,0,0,0-.23.76v3.16a1.51,1.51,0,0,1-.2.79,2.08,2.08,0,0,1-1.78.79q-.46,0-.53-.2a.18.18,0,0,1,0-.23,2,2,0,0,1,.3-.23,2,2,0,0,0,.26-.2,1.2,1.2,0,0,0,.39-.53,2.5,2.5,0,0,0,.1-1.38,6.64,6.64,0,0,1,0-1.45A3.8,3.8,0,0,1,17.09,30,6.43,6.43,0,0,1,16,28.51a6.64,6.64,0,0,0-1.58-1.71Z"/><path d="M24,5A19,19,0,1,1,5,24,19,19,0,0,1,24,5m0-3A22,22,0,1,0,46,24,22,22,0,0,0,24,2Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sm-gh-full.svg b/html/themes/custom/common_design_subtheme/img/icons/sm-gh-full.svg
new file mode 100644
index 000000000..6f2392053
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/sm-gh-full.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M24,2A22,22,0,1,0,46,24,22,22,0,0,0,24,2Zm8.89,21.84a5.56,5.56,0,0,1-2.57,2.3,9.15,9.15,0,0,1-3.29.72,4.36,4.36,0,0,1,1.35,1,2.9,2.9,0,0,1,.56,1.55v2.07l.07,2a2.47,2.47,0,0,0,.92.89.22.22,0,0,1,.13.3q-.07.2-.53.2A2.19,2.19,0,0,1,27.75,34a1.51,1.51,0,0,1-.2-.79V30.09a1,1,0,0,0-.26-.76,1.28,1.28,0,0,0-.53-.3v4.15A2.6,2.6,0,0,0,27,34.63a1.55,1.55,0,0,1,.33.66s0,.08-.1.1a1.27,1.27,0,0,1-.56-.1,1.63,1.63,0,0,1-1.18-.89,3.4,3.4,0,0,1-.33-1.48V28.84h-.86v4.08A3.62,3.62,0,0,1,24,34.43a1.85,1.85,0,0,1-1.71,1q-.2-.07-.2-.13a5.56,5.56,0,0,0,.39-.66,3,3,0,0,0,.16-.53,3.82,3.82,0,0,0,.1-.92V29a1.07,1.07,0,0,0-.49.3,1,1,0,0,0-.23.76v3.16a1.51,1.51,0,0,1-.2.79,2.08,2.08,0,0,1-1.78.79q-.46,0-.53-.2a.18.18,0,0,1,0-.23,2,2,0,0,1,.3-.23,2,2,0,0,0,.26-.2,1.2,1.2,0,0,0,.39-.53,2.5,2.5,0,0,0,.1-1.38,6.64,6.64,0,0,1,0-1.45A3.8,3.8,0,0,1,17.09,30,6.43,6.43,0,0,1,16,28.51a6.64,6.64,0,0,0-1.58-1.71.16.16,0,0,1,0-.26.71.71,0,0,1,.66-.2,1.14,1.14,0,0,1,.46.13,3,3,0,0,1,1,.89,6.69,6.69,0,0,0,.89,1,2.45,2.45,0,0,0,3.23.2,2.12,2.12,0,0,1,1-1.25q.26-.13.92-.4a12.25,12.25,0,0,1-3.52-.76A6,6,0,0,1,17,24.69a5.52,5.52,0,0,1-1.28-3.09,7.92,7.92,0,0,1,.3-3.49,5.79,5.79,0,0,1,1.12-1.78,5.89,5.89,0,0,1,.2-3.75A6.83,6.83,0,0,1,21.1,14,14.42,14.42,0,0,1,27.95,14a12.37,12.37,0,0,1,1.42-.82,5.79,5.79,0,0,1,2.4-.56,7.1,7.1,0,0,1,.36,1.71,5.66,5.66,0,0,1-.1,1.84,6.06,6.06,0,0,1,1.58,4.21A7.48,7.48,0,0,1,32.89,23.84Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sm-ig-def.svg b/html/themes/custom/common_design_subtheme/img/icons/sm-ig-def.svg
new file mode 100644
index 000000000..7599f6328
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/sm-ig-def.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M24,2A22,22,0,1,0,46,24,22,22,0,0,0,24,2Zm0,41A19,19,0,1,1,43,24,19,19,0,0,1,24,43Z"/><path d="M24,18.09A5.91,5.91,0,1,0,29.91,24,5.9,5.9,0,0,0,24,18.09Zm0,9.74A3.83,3.83,0,1,1,27.83,24,3.83,3.83,0,0,1,24,27.83Z"/><circle cx="30.14" cy="17.86" r="1.38"/><path d="M34.9,16.47a5.88,5.88,0,0,0-3.36-3.36,8.43,8.43,0,0,0-2.79-.53c-1.23-.06-1.62-.07-4.74-.07s-3.52,0-4.74.07a8.44,8.44,0,0,0-2.79.53,5.88,5.88,0,0,0-3.36,3.36,8.44,8.44,0,0,0-.53,2.79c-.06,1.23-.07,1.62-.07,4.74s0,3.52.07,4.74a8.44,8.44,0,0,0,.53,2.79,5.88,5.88,0,0,0,3.36,3.36,8.44,8.44,0,0,0,2.79.53c1.23.06,1.62.07,4.74.07s3.52,0,4.74-.07a8.44,8.44,0,0,0,2.79-.53,5.88,5.88,0,0,0,3.36-3.36,8.41,8.41,0,0,0,.53-2.79c.06-1.23.07-1.62.07-4.74s0-3.52-.07-4.74A8.44,8.44,0,0,0,34.9,16.47ZM33.36,28.65a6.38,6.38,0,0,1-.4,2.14A3.81,3.81,0,0,1,30.78,33a6.35,6.35,0,0,1-2.14.4c-1.21.06-1.58.07-4.65.07s-3.43,0-4.65-.07a6.35,6.35,0,0,1-2.14-.4A3.81,3.81,0,0,1,15,30.78a6.35,6.35,0,0,1-.4-2.14c-.06-1.21-.07-1.58-.07-4.65s0-3.43.07-4.65a6.38,6.38,0,0,1,.4-2.14A3.81,3.81,0,0,1,17.22,15a6.35,6.35,0,0,1,2.14-.4c1.21-.06,1.58-.07,4.65-.07s3.43,0,4.65.07a6.38,6.38,0,0,1,2.14.4A3.81,3.81,0,0,1,33,17.22a6.35,6.35,0,0,1,.4,2.14c.06,1.21.07,1.58.07,4.65S33.42,27.43,33.36,28.65Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sm-ig-full.svg b/html/themes/custom/common_design_subtheme/img/icons/sm-ig-full.svg
new file mode 100644
index 000000000..105b29f55
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/sm-ig-full.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><circle cx="24" cy="24" r="3.83"/><path d="M33,17.22A3.81,3.81,0,0,0,30.78,15a6.38,6.38,0,0,0-2.14-.4c-1.21-.05-1.58-.07-4.65-.07s-3.43,0-4.65.07a6.35,6.35,0,0,0-2.14.4A3.81,3.81,0,0,0,15,17.22a6.38,6.38,0,0,0-.4,2.14c-.05,1.21-.07,1.58-.07,4.65s0,3.44.07,4.65a6.36,6.36,0,0,0,.4,2.14A3.81,3.81,0,0,0,17.22,33a6.35,6.35,0,0,0,2.14.4c1.21.06,1.58.07,4.65.07s3.44,0,4.65-.07a6.35,6.35,0,0,0,2.14-.4A3.81,3.81,0,0,0,33,30.78a6.38,6.38,0,0,0,.4-2.14c.06-1.21.07-1.58.07-4.65s0-3.43-.07-4.65A6.35,6.35,0,0,0,33,17.22ZM24,29.91A5.91,5.91,0,1,1,29.91,24,5.9,5.9,0,0,1,24,29.91Zm6.14-10.66a1.38,1.38,0,1,1,1.38-1.38A1.38,1.38,0,0,1,30.14,19.24Z"/><path d="M24,2A22,22,0,1,0,46,24,22,22,0,0,0,24,2ZM35.43,28.74a8.41,8.41,0,0,1-.53,2.79,5.88,5.88,0,0,1-3.36,3.36,8.44,8.44,0,0,1-2.79.53c-1.23.06-1.62.07-4.74.07s-3.51,0-4.74-.07a8.44,8.44,0,0,1-2.79-.53,5.88,5.88,0,0,1-3.36-3.36,8.44,8.44,0,0,1-.53-2.79c-.06-1.23-.07-1.62-.07-4.74s0-3.52.07-4.74a8.44,8.44,0,0,1,.53-2.79,5.88,5.88,0,0,1,3.36-3.36,8.44,8.44,0,0,1,2.79-.53c1.23-.06,1.62-.07,4.74-.07s3.51,0,4.74.07a8.43,8.43,0,0,1,2.79.53,5.88,5.88,0,0,1,3.36,3.36,8.44,8.44,0,0,1,.53,2.79c.06,1.23.07,1.62.07,4.74S35.49,27.51,35.43,28.74Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sm-ln-def.svg b/html/themes/custom/common_design_subtheme/img/icons/sm-ln-def.svg
new file mode 100644
index 000000000..cb23c7a10
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/sm-ln-def.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M24,5A19,19,0,1,1,5,24,19,19,0,0,1,24,5m0-3A22,22,0,1,0,46,24,22,22,0,0,0,24,2Z"/><ellipse cx="16.07" cy="14.58" rx="2.56" ry="2.58"/><rect x="13.92" y="19" width="4.33" height="14"/><path d="M29.4,18.57a4.88,4.88,0,0,0-4.22,2.31V19H21V33h4.16V25.65c0-2,.91-3.14,2.64-3.14s2.36,1.13,2.36,3.14V33h4.31V24.14C34.49,20.39,32.37,18.57,29.4,18.57Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sm-ln-full.svg b/html/themes/custom/common_design_subtheme/img/icons/sm-ln-full.svg
new file mode 100644
index 000000000..b80404c36
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/sm-ln-full.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M24,2A22,22,0,1,0,46,24,22,22,0,0,0,24,2ZM18.26,33H13.92V19h4.33ZM16.07,17.17a2.58,2.58,0,1,1,2.56-2.58A2.57,2.57,0,0,1,16.07,17.17ZM34.49,33H30.18V25.65c0-2-.77-3.14-2.36-3.14s-2.64,1.17-2.64,3.14V33H21V19h4.16v1.89a4.88,4.88,0,0,1,4.22-2.31c3,0,5.09,1.81,5.09,5.56Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sm-rss-def.svg b/html/themes/custom/common_design_subtheme/img/icons/sm-rss-def.svg
new file mode 100644
index 000000000..e1e3042e7
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/sm-rss-def.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M24,5A19,19,0,1,1,5,24,19,19,0,0,1,24,5m0-3A22,22,0,1,0,46,24,22,22,0,0,0,24,2Z"/><path d="M20.7,31.18a2.85,2.85,0,1,1-2.85-2.81,2.84,2.84,0,0,1,2.85,2.81ZM37,34A22,22,0,0,0,15,12v5a17.49,17.49,0,0,1,14.92,8.2A16.65,16.65,0,0,1,32.41,34H37Zm-7.78,0A14,14,0,0,0,24,23.13,14.27,14.27,0,0,0,15,20V24.2a9.94,9.94,0,0,1,8.67,5A9.79,9.79,0,0,1,24.92,34h4.3Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sm-rss-full.svg b/html/themes/custom/common_design_subtheme/img/icons/sm-rss-full.svg
new file mode 100644
index 000000000..e700c8ee5
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/sm-rss-full.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M24,2A22,22,0,1,0,46,24,22,22,0,0,0,24,2ZM17.85,34a2.81,2.81,0,1,1,2.85-2.81A2.84,2.84,0,0,1,17.85,34Zm11.37,0h-4.3a9.79,9.79,0,0,0-1.25-4.78,9.94,9.94,0,0,0-8.67-5V20a14.27,14.27,0,0,1,9,3.15A14,14,0,0,1,29.22,34ZM37,34H32.41a16.65,16.65,0,0,0-2.49-8.72A17.49,17.49,0,0,0,15,17.06V12A22,22,0,0,1,37,34h0Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sm-tt-def.svg b/html/themes/custom/common_design_subtheme/img/icons/sm-tt-def.svg
new file mode 100644
index 000000000..dbc52e65d
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/sm-tt-def.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M24,5A19,19,0,1,1,5,24,19,19,0,0,1,24,5m0-3A22,22,0,1,0,46,24,22,22,0,0,0,24,2Z"/><path d="M36,16.56a9.83,9.83,0,0,1-2.83.78,4.94,4.94,0,0,0,2.16-2.72,9.84,9.84,0,0,1-3.13,1.19,4.93,4.93,0,0,0-8.52,3.37,5,5,0,0,0,.13,1.12,14,14,0,0,1-10.15-5.14,4.93,4.93,0,0,0,1.52,6.57A4.9,4.9,0,0,1,13,21.11v.06A4.93,4.93,0,0,0,16.91,26a4.9,4.9,0,0,1-1.3.17,5,5,0,0,1-.93-.09,4.93,4.93,0,0,0,4.6,3.42,9.91,9.91,0,0,1-7.29,2A14,14,0,0,0,33.56,19.74q0-.32,0-.64A10,10,0,0,0,36,16.56Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sm-tt-full.svg b/html/themes/custom/common_design_subtheme/img/icons/sm-tt-full.svg
new file mode 100644
index 000000000..ce99fc5b2
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/sm-tt-full.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M24,2A22,22,0,1,0,46,24,22,22,0,0,0,24,2Zm9.54,17.11q0,.32,0,.64A14,14,0,0,1,12,31.54a9.92,9.92,0,0,0,7.29-2,4.93,4.93,0,0,1-4.6-3.42,5,5,0,0,0,.93.09,4.9,4.9,0,0,0,1.3-.17A4.93,4.93,0,0,1,13,21.17v-.06a4.9,4.9,0,0,0,2.23.62,4.93,4.93,0,0,1-1.52-6.57,14,14,0,0,0,10.15,5.14,5,5,0,0,1-.13-1.12,4.93,4.93,0,0,1,8.52-3.37,9.83,9.83,0,0,0,3.13-1.19,4.94,4.94,0,0,1-2.16,2.72A9.83,9.83,0,0,0,36,16.56,10,10,0,0,1,33.54,19.11Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sm-yt-def.svg b/html/themes/custom/common_design_subtheme/img/icons/sm-yt-def.svg
new file mode 100644
index 000000000..6fa17352d
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/sm-yt-def.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M32.58,16.83c-1.72-.45-8.59-.45-8.59-.45s-6.75,0-8.46.42a3,3,0,0,0-2.11,2A26.77,26.77,0,0,0,13,24a26.77,26.77,0,0,0,.42,5.24,3,3,0,0,0,2.11,2c1.72.46,8.46.42,8.46.42s6.75,0,8.46-.42a3,3,0,0,0,2.08-2A27.91,27.91,0,0,0,35,24a28.42,28.42,0,0,0-.47-5.24A2.74,2.74,0,0,0,32.58,16.83ZM21.26,27.38V20.62L26.74,24Z"/><path d="M24,2A22,22,0,1,0,46,24,22,22,0,0,0,24,2Zm0,41A19,19,0,1,1,43,24,19,19,0,0,1,24,43Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sm-yt-full.svg b/html/themes/custom/common_design_subtheme/img/icons/sm-yt-full.svg
new file mode 100644
index 000000000..98163ce16
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/sm-yt-full.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M24,2A22,22,0,1,0,46,24,22,22,0,0,0,24,2ZM34.54,29.24a3,3,0,0,1-2.08,2c-1.72.45-8.46.42-8.46.42s-6.75,0-8.46-.42a3,3,0,0,1-2.11-2A26.77,26.77,0,0,1,13,24a26.77,26.77,0,0,1,.42-5.24,3,3,0,0,1,2.11-2c1.72-.45,8.46-.42,8.46-.42s6.87,0,8.59.45a2.74,2.74,0,0,1,1.94,1.93A28.42,28.42,0,0,1,35,24,27.91,27.91,0,0,1,34.54,29.24Z"/><polygon points="21.25 27.38 26.75 24 21.25 20.62 21.25 27.38"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/social-links--facebook.svg b/html/themes/custom/common_design_subtheme/img/icons/social-links--facebook.svg
new file mode 100644
index 000000000..802b398e1
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/social-links--facebook.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path data-name="svgexport-14" d="M13.411 0H.589A.589.589 0 000 .589v12.822A.586.586 0 00.589 14h6.853V8.746H5.688V6.558h1.754V4.8a2.5 2.5 0 012.756-2.7 15.8 15.8 0 011.621.081v1.901h-1.105c-.884 0-1.091.42-1.091 1.032v1.444h2.188l-.442 2.188H9.623l.037 5.246h3.758A.589.589 0 0014 13.4V.589a.589.589 0 00-.589-.582"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/social-links--linkedin.svg b/html/themes/custom/common_design_subtheme/img/icons/social-links--linkedin.svg
new file mode 100644
index 000000000..b1e83c82a
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/social-links--linkedin.svg
@@ -0,0 +1 @@
+<svg data-name="Component 9 – 110" xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path data-name="Path 530" d="M12.968 0H1.032A1.007 1.007 0 000 1.032v12.01A.993.993 0 001.032 14h11.936A1.007 1.007 0 0014 12.968V1.032A1.007 1.007 0 0012.968 0zM4.274 11.716H2.137V5.379h2.137zM3.168 4.495a1.066 1.066 0 01-1.179-1.106 1.1 1.1 0 011.179-1.105 1.066 1.066 0 011.179 1.105c.074.664-.442 1.106-1.179 1.106zm8.695 7.221H9.726v-3.39c0-.884-.295-1.474-1.105-1.474a1.162 1.162 0 00-1.105.737 1.254 1.254 0 00-.074.516v3.537H5.305V5.305h2.137v.884a2.132 2.132 0 011.916-1.032c1.4 0 2.432.884 2.432 2.874v3.684z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/social-links--twitter.svg b/html/themes/custom/common_design_subtheme/img/icons/social-links--twitter.svg
new file mode 100644
index 000000000..1f9057e52
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/social-links--twitter.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="17.219" height="14"><path data-name="svgexport-12" d="M14.531 1.141A3.492 3.492 0 0011.95 0a3.539 3.539 0 00-3.539 3.539 7.247 7.247 0 00.063.82A10.078 10.078 0 011.211.633a3.984 3.984 0 00-.508 1.766A3.634 3.634 0 002.281 5.36a3.359 3.359 0 01-1.578-.445v.062a3.555 3.555 0 002.836 3.469 7.632 7.632 0 01-.945.125l-.633-.063a3.547 3.547 0 003.281 2.461A7.469 7.469 0 01.82 12.484L0 12.42A10.086 10.086 0 005.422 14 9.966 9.966 0 0015.45 3.961c.016-.187 0-.336 0-.508a6.781 6.781 0 001.769-1.833 6.552 6.552 0 01-2.031.563A3.414 3.414 0 0016.711.222a7.051 7.051 0 01-2.211.883z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sprite.symbol.html b/html/themes/custom/common_design_subtheme/img/icons/sprite.symbol.html
new file mode 100644
index 000000000..f51ba91c4
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/sprite.symbol.html
@@ -0,0 +1,1185 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta charset="utf-8"/>
+		<meta http-equiv="X-UA-Compatible" content="IE=Edge"/>
+		<script src="https://rawgit.com/jonathantneal/svg4everybody/master/dist/svg4everybody.js"></script>
+		<script>svg4everybody();</script>
+		<title>SVG &lt;symbol&gt; sprite preview | svg-sprite</title>
+		<style>@charset "UTF-8";body{padding:0;margin:0;color:#666;background:#fafafa;font-family:Arial,Helvetica,sans-serif;font-size:1em;line-height:1.4}header{display:block;padding:3em 3em 2em 3em;background-color:#fff}header p{margin:2em 0 0 0}section{border-top:1px solid #eee;padding:2em 3em 0 3em}section ul{margin:0;padding:0}section li{display:inline;display:inline-block;background-color:#fff;position:relative;margin:0 2em 2em 0;vertical-align:top;border:1px solid #ccc;padding:1em 1em 3em 1em;cursor:default}.icon-box{margin:0;width:144px;height:144px;position:relative;background:#ccc url("data:image/gif;base64,R0lGODlhDAAMAIAAAMzMzP///yH/C1hNUCBEYXRhWE1QPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS4wLWMwNjEgNjQuMTQwOTQ5LCAyMDEwLzEyLzA3LTEwOjU3OjAxICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1LjEgV2luZG93cyIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDozQjk4OTI0MUY5NTIxMUUyQkJDMEI5NEFEM0Y1QTYwQyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDozQjk4OTI0MkY5NTIxMUUyQkJDMEI5NEFEM0Y1QTYwQyI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjNCOTg5MjNGRjk1MjExRTJCQkMwQjk0QUQzRjVBNjBDIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjNCOTg5MjQwRjk1MjExRTJCQkMwQjk0QUQzRjVBNjBDIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+Af/+/fz7+vn49/b19PPy8fDv7u3s6+rp6Ofm5eTj4uHg397d3Nva2djX1tXU09LR0M/OzczLysnIx8bFxMPCwcC/vr28u7q5uLe2tbSzsrGwr66trKuqqainpqWko6KhoJ+enZybmpmYl5aVlJOSkZCPjo2Mi4qJiIeGhYSDgoGAf359fHt6eXh3dnV0c3JxcG9ubWxramloZ2ZlZGNiYWBfXl1cW1pZWFdWVVRTUlFQT05NTEtKSUhHRkVEQ0JBQD8+PTw7Ojk4NzY1NDMyMTAvLi0sKyopKCcmJSQjIiEgHx4dHBsaGRgXFhUUExIREA8ODQwLCgkIBwYFBAMCAQAAIfkEAAAAAAAsAAAAAAwADAAAAhaEH6mHmmzcgzJAUG/NVGrfOZ8YLlABADs=") top left repeat;border:1px solid #ccc;display:table-cell;vertical-align:middle;text-align:center}.icon{display:inline;display:inline-block}h1{margin-top:0}h2{margin:0;padding:0;font-size:1em;font-weight:normal;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;position:absolute;left:1em;right:1em;bottom:1em}footer{display:block;margin:0;padding:0 3em 3em 3em}footer p{margin:0;font-size:.7em}footer a{color:#0f7595;margin-left:0}</style>
+
+<!--
+
+Sprite shape dimensions
+====================================================================================================
+You will need to set the sprite shape dimensions via CSS when you use them as inline SVG, otherwise
+they would become a huge 100% in size. You may use the following dimension classes for doing so.
+They might well be outsourced to an external stylesheet of course.
+
+-->
+
+<style type="text/css">
+	cd-icon--about-dims { width: 42px; height: 42px; }
+	cd-icon--add-dims { width: 48px; height: 48px; }
+	cd-icon--add--white-dims { width: 48px; height: 48px; }
+	cd-icon--admin-dims { width: 48px; height: 48px; }
+	cd-icon--alert-dims { width: 48px; height: 41.01px; }
+	cd-icon--arrow-down-dims { width: 48px; height: 48px; }
+	cd-icon--arrow-down--highlighted-dims { width: 48px; height: 48px; }
+	cd-icon--arrow-left-dims { width: 48px; height: 48px; }
+	cd-icon--arrow-right-dims { width: 48px; height: 48px; }
+	cd-icon--arrow-up-dims { width: 48px; height: 48px; }
+	cd-icon--arrow-up--highlighted-dims { width: 48px; height: 48px; }
+	cd-icon--cd-icons-sprite-dims { width: 0px; height: 0px; }
+	cd-icon--copyurl-dims { width: 14px; height: 14px; }
+	cd-icon--creative-commons-dims { width: 64px; height: 64px; }
+	cd-icon--education-dims { width: 34px; height: 42px; }
+	cd-icon--expand-left-dims { width: 48px; height: 48px; }
+	cd-icon--expand-right-dims { width: 48px; height: 48px; }
+	cd-icon--external-link-dims { width: 48px; height: 48px; }
+	cd-icon--form-error-dims { width: 16px; height: 16px; }
+	cd-icon--form-required-dims { width: 16px; height: 16px; }
+	cd-icon--help-dims { width: 28px; height: 48px; }
+	cd-icon--ocha-logo-dims { width: 41.9px; height: 37px; }
+	cd-icon--pdf-dims { width: 19.25px; height: 14px; }
+	cd-icon--search-dims { width: 48px; height: 48px; }
+	cd-icon--selected-dims { width: 48px; height: 48px; }
+	cd-icon--selected--highlighted-dims { width: 48px; height: 48px; }
+	cd-icon--sm-fb-def-dims { width: 48px; height: 48px; }
+	cd-icon--sm-fb-full-dims { width: 48px; height: 48px; }
+	cd-icon--sm-gh-def-dims { width: 48px; height: 48px; }
+	cd-icon--sm-gh-full-dims { width: 48px; height: 48px; }
+	cd-icon--sm-ig-def-dims { width: 48px; height: 48px; }
+	cd-icon--sm-ig-full-dims { width: 48px; height: 48px; }
+	cd-icon--sm-ln-def-dims { width: 48px; height: 48px; }
+	cd-icon--sm-ln-full-dims { width: 48px; height: 48px; }
+	cd-icon--sm-rss-def-dims { width: 48px; height: 48px; }
+	cd-icon--sm-rss-full-dims { width: 48px; height: 48px; }
+	cd-icon--sm-tt-def-dims { width: 48px; height: 48px; }
+	cd-icon--sm-tt-full-dims { width: 48px; height: 48px; }
+	cd-icon--sm-yt-def-dims { width: 48px; height: 48px; }
+	cd-icon--sm-yt-full-dims { width: 48px; height: 48px; }
+	cd-icon--social-links--facebook-dims { width: 14px; height: 14px; }
+	cd-icon--social-links--linkedin-dims { width: 14px; height: 14px; }
+	cd-icon--social-links--twitter-dims { width: 17.219px; height: 14px; }
+	cd-icon--user-dims { width: 48px; height: 48px; }
+	cd-icon--user--white-dims { width: 48px; height: 48px; }
+</style>
+<!--
+====================================================================================================
+-->
+
+	</head>
+	<body>
+
+<!--
+
+Inline <symbol> SVG sprite
+====================================================================================================
+This is an inlined version of the generated SVG sprite. The single images may be <use>d everywhere
+below within this document. Please see
+
+	https://github.com/svg-sprite/svg-sprite/blob/1.5.x/docs/configuration.md#defs--symbol-mode
+
+for further details on how to create this embeddable sprite variant.
+
+-->
+
+<svg width="0" height="0" style="position:absolute">
+		<symbol viewBox="0 0 42 42" id="cd-icon--about" xmlns="http://www.w3.org/2000/svg"><path d="M38 0H4a4 4 0 00-4 4v34a4 4 0 004 4h34a4 4 0 004-4V4a4 4 0 00-4-4zM24 35h-4a2 2 0 01-2-2V18h4a2 2 0 012 2zm-3-22a3 3 0 113-3 3 3 0 01-3 3z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--add" xmlns="http://www.w3.org/2000/svg"><path d="M44 20H28V4a4 4 0 00-4-4 4 4 0 00-4 4v16H4a4 4 0 000 8h16v16a4 4 0 004 4 4 4 0 004-4V28h16a4 4 0 000-8z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--add--white" xmlns="http://www.w3.org/2000/svg"><path fill="#fff" d="M44 20H28V4a4 4 0 00-4-4 4 4 0 00-4 4v16H4a4 4 0 000 8h16v16a4 4 0 004 4 4 4 0 004-4V28h16a4 4 0 000-8z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--admin" xmlns="http://www.w3.org/2000/svg"><path d="M45 21h-1.25a19.867 19.867 0 00-3.668-8.84l.889-.888a3 3 0 10-4.242-4.243l-.89.889A19.868 19.868 0 0027 4.25V3a3 3 0 00-6 0v1.25a19.868 19.868 0 00-8.84 3.668l-.888-.889a3 3 0 10-4.243 4.243l.889.889A19.867 19.867 0 004.25 21H3a3 3 0 000 6h1.25a19.867 19.867 0 003.668 8.84l-.889.888a3 3 0 004.242 4.243l.89-.889A19.868 19.868 0 0021 43.75V45a3 3 0 006 0v-1.25a19.868 19.868 0 008.84-3.668l.888.889a3 3 0 104.243-4.243l-.889-.889A19.867 19.867 0 0043.75 27H45a3 3 0 000-6zM24 38a14 14 0 1114-14 14.016 14.016 0 01-14 14z"/></symbol>
+		<symbol viewBox="0 0 47.996 41.01" id="cd-icon--alert" xmlns="http://www.w3.org/2000/svg"><path class="aecls-1" d="M47.668 37.41L27.118 1.8a3.604 3.604 0 00-6.24 0L.328 37.41a2.398 2.398 0 002.08 3.6h43.18a2.398 2.398 0 002.08-3.6zm-23.67-3.4a2 2 0 112-2 2.006 2.006 0 01-2 2zm2-9a2 2 0 01-4 0v-11a2 2 0 114 0z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--arrow-down" xmlns="http://www.w3.org/2000/svg"><path d="M48 14a4 4 0 01-1.17 2.83l-20 20a4 4 0 01-5.66 0l-20-20a4 4 0 015.66-5.66L24 28.34l17.17-17.17A4 4 0 0148 14z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--arrow-down--highlighted" xmlns="http://www.w3.org/2000/svg"><path fill="#EB5C6D" d="M48 14a4 4 0 01-1.17 2.83l-20 20a4 4 0 01-5.66 0l-20-20a4 4 0 015.66-5.66L24 28.34l17.17-17.17A4 4 0 0148 14z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--arrow-left" xmlns="http://www.w3.org/2000/svg"><path d="M34 48a4 4 0 01-2.83-1.17l-20-20a4 4 0 010-5.66l20-20a4 4 0 015.66 5.66L19.66 24l17.17 17.17A4 4 0 0134 48z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--arrow-right" xmlns="http://www.w3.org/2000/svg"><path d="M14 48a4 4 0 01-2.83-6.83L28.34 24 11.17 6.83a4 4 0 015.66-5.66l20 20a4 4 0 010 5.66l-20 20A4 4 0 0114 48z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--arrow-up" xmlns="http://www.w3.org/2000/svg"><path d="M0 34a4 4 0 011.17-2.83l20-20a4 4 0 015.66 0l20 20a4 4 0 11-5.66 5.66L24 19.66 6.83 36.83A4 4 0 010 34z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--arrow-up--highlighted" xmlns="http://www.w3.org/2000/svg"><path fill="#EB5C6D" d="M0 34a4 4 0 011.17-2.83l20-20a4 4 0 015.66 0l20 20a4 4 0 11-5.66 5.66L24 19.66 6.83 36.83A4 4 0 010 34z"/></symbol>
+		<symbol viewBox="0 0 0 0" id="cd-icon--cd-icons-sprite" xmlns="http://www.w3.org/2000/svg"/>
+		<symbol viewBox="0 0 14 14" id="cd-icon--copyurl" xmlns="http://www.w3.org/2000/svg"><path data-name="Path 533" d="M12.635 1.365a4.674 4.674 0 00-6.6 0L5.02 2.381a.718.718 0 001.015 1.015L7.05 2.38a3.232 3.232 0 114.571 4.571l-1.015 1.015a.718.718 0 101.015 1.015l1.015-1.015a4.673 4.673 0 00-.001-6.601zm-4.668 9.239L6.952 11.62a3.232 3.232 0 01-4.571-4.571l1.015-1.016a.718.718 0 10-1.015-1.015L1.365 6.033a4.668 4.668 0 006.6 6.6l1.015-1.016a.718.718 0 10-1.015-1.015zm.86-6.446L4.158 8.826a.718.718 0 101.015 1.016l4.669-4.668a.718.718 0 00-1.015-1.016z"/></symbol>
+		<symbol viewBox="0 0 64 64" id="cd-icon--creative-commons" xmlns="http://www.w3.org/2000/svg"><path d="M31.957.311c-8.682 0-16.322 3.213-22.226 9.203C3.653 15.678.354 23.666.354 32c0 8.422 3.212 16.236 9.29 22.313 6.078 6.078 13.978 9.377 22.313 9.377 8.334 0 16.409-3.299 22.66-9.463C60.521 48.41 63.646 40.683 63.646 32c0-8.595-3.125-16.408-9.116-22.399C48.453 3.523 40.639.311 31.957.311zm.086 5.73c7.12 0 13.458 2.691 18.406 7.641 4.862 4.861 7.466 11.286 7.466 18.318 0 7.119-2.518 13.371-7.379 18.146-5.123 5.035-11.721 7.727-18.493 7.727-6.858 0-13.283-2.691-18.232-7.641C8.862 45.283 6.084 38.772 6.084 32c0-6.858 2.778-13.369 7.727-18.406 4.862-4.948 11.113-7.553 18.232-7.553z"/><path id="ana" d="M31.635 26.734c-1.79-3.264-4.844-4.563-8.389-4.563-5.16 0-9.267 3.65-9.267 9.828 0 6.283 3.861 9.829 9.442 9.829 3.581 0 6.635-1.966 8.319-4.949l-3.931-2.001c-.878 2.105-2.212 2.738-3.896 2.738-2.914 0-4.248-2.422-4.248-5.617 0-3.193 1.124-5.616 4.248-5.616.842 0 2.527.456 3.51 2.563l4.212-2.212z"/><use xlink:href="#ana" transform="translate(18.281)"/></symbol>
+		<symbol viewBox="0 0 34 42" id="cd-icon--education" xmlns="http://www.w3.org/2000/svg"><path d="M33 0h-4v8l-3-1-3 1V0H0v42h33a.98.98 0 001-.95V.95A.98.98 0 0033 0zM6 38.5a.495.495 0 01-.5.5h-2a.495.495 0 01-.5-.5v-35a.495.495 0 01.5-.5h2a.495.495 0 01.5.5zM25.5 23h-13a1.5 1.5 0 010-3h13a1.5 1.5 0 010 3zm0-6h-13a1.5 1.5 0 010-3h13a1.5 1.5 0 010 3z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--expand-left" xmlns="http://www.w3.org/2000/svg"><path d="M44 48a3.989 3.989 0 01-2.828-1.171l-19-20a4 4 0 010-5.658l19-20a4 4 0 015.657 5.657L31 24l15.829 17.171A4 4 0 0144 48zm-18.17-1.171a4 4 0 000-5.658L10 24 25.829 6.828a4 4 0 00-5.657-5.657l-19 20a4 4 0 000 5.658l19 20a4 4 0 005.657 0z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--expand-right" xmlns="http://www.w3.org/2000/svg"><path d="M4 0A3.989 3.989 0 016.83 1.171l19 20a4 4 0 010 5.658l-19 20a4 4 0 01-5.657-5.657L17 24 1.172 6.829A4 4 0 014 0zm18.172 1.171a4 4 0 000 5.658L38 24 22.172 41.172a4 4 0 005.657 5.657l19-20a4 4 0 000-5.658l-19-20a4 4 0 00-5.657 0z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--external-link" xmlns="http://www.w3.org/2000/svg"><path d="M35 20.65V42H6V18h16.09l9-9H4.2A2.2 2.2 0 002 11.2v32.6A2.2 2.2 0 004.2 46h32.6a2.2 2.2 0 002.2-2.2V16.65zM12.5 12a1.5 1.5 0 11-1.5 1.5 1.5 1.5 0 011.5-1.5zm-5 0A1.5 1.5 0 116 13.5 1.5 1.5 0 017.5 12z"/><path d="M44 2H23a2 2 0 000 4h16L16.51 28.52a2.1 2.1 0 003 3L42 9v16a2 2 0 004 0V4a2 2 0 00-2-2z"/></symbol>
+		<symbol fill="#e32700" viewBox="0 0 16 16" id="cd-icon--form-error" xmlns="http://www.w3.org/2000/svg"><path d="M8.002 1a7 7 0 100 14 7 7 0 000-14zm4.025 9.284c.062.063.1.149.1.239a.34.34 0 01-.1.24l-1.262 1.262a.34.34 0 01-.48 0L8.002 9.742l-2.286 2.283a.34.34 0 01-.48 0l-1.261-1.262a.336.336 0 010-.478L6.258 8 3.975 5.716a.34.34 0 010-.48l1.262-1.262a.34.34 0 01.48 0l2.285 2.284 2.283-2.284a.34.34 0 01.48 0l1.262 1.262c.062.063.1.149.1.24a.345.345 0 01-.1.24L9.744 8l2.283 2.284z"/></symbol>
+		<symbol viewBox="0 0 16 16" id="cd-icon--form-required" xmlns="http://www.w3.org/2000/svg"><path fill="#E00" d="M0 7.562l1.114-3.438c2.565.906 4.43 1.688 5.59 2.35-.306-2.921-.467-4.93-.484-6.027h3.511c-.05 1.597-.234 3.6-.558 6.003 1.664-.838 3.566-1.613 5.714-2.325L16 7.562c-2.05.678-4.06 1.131-6.028 1.356.984.856 2.372 2.381 4.166 4.575l-2.906 2.059c-.935-1.274-2.041-3.009-3.316-5.206-1.194 2.275-2.244 4.013-3.147 5.206l-2.856-2.059c1.872-2.307 3.211-3.832 4.017-4.575A86.77 86.77 0 010 7.562"/></symbol>
+		<symbol viewBox="0 0 28 48" id="cd-icon--help" xmlns="http://www.w3.org/2000/svg"><circle class="aucls-1" cx="14" cy="44" r="4"/><path class="aucls-1" d="M28 14a14 14 0 00-28 0 4 4 0 008 0 6 6 0 116 6 4 4 0 00-4 4v9a4 4 0 008 0v-5.59A14.02 14.02 0 0028 14z"/></symbol>
+		<symbol viewBox="0 0 41.9 37" id="cd-icon--ocha-logo" xmlns="http://www.w3.org/2000/svg"><path class="avcls-1" d="M17.6 15.6a3.3 3.3 0 113.3 3.3v-.4a2.9 2.9 0 10-2.9-2.9 2.9 2.9 0 002.9 2.9v.4a3.33 3.33 0 01-3.3-3.3"/><path data-name="Shape" class="avcls-1" d="M15 15.6a6 6 0 116 6v-.4a5.6 5.6 0 10-5.6-5.6 5.59 5.59 0 005.6 5.6v.4a6 6 0 01-6-6"/><path data-name="Shape" class="avcls-1" d="M12.1 15.6a8.9 8.9 0 118.9 8.9V24a8.54 8.54 0 008.5-8.4 8.5 8.5 0 10-17 0A8.41 8.41 0 0021 24v.4a8.77 8.77 0 01-8.9-8.8"/><path data-name="Shape" class="avcls-1" d="M9.3 15.6A11.65 11.65 0 1121 27.2v-.4A11.2 11.2 0 109.8 15.6 11.18 11.18 0 0021 26.8v.4A11.63 11.63 0 019.3 15.6"/><path data-name="Shape" class="avcls-1" d="M6.3 15.6A14.7 14.7 0 1121 30.3v-.4A14.3 14.3 0 106.7 15.6 14.3 14.3 0 0021 29.9v.4A14.66 14.66 0 016.3 15.6"/><path class="avcls-1" d="M20.7 1.1h.4v11.4h-.4z"/><path data-name="Shape" class="avcls-1" d="M10.6 5.5l.3-.3 8 8-.3.3-8-8z"/><path data-name="Rectangle-path" class="avcls-1" d="M6.5 15.4h11.4v.4H6.5z"/><path data-name="Shape" class="avcls-1" d="M10.6 25.7l8-8 .3.3-8 8-.3-.3z"/><path data-name="Rectangle-path" class="avcls-1" d="M20.7 18.7h.4v11.4h-.4zM23.014 17.902l.283-.282 7.967 8.014-.284.282zM24.1 15.4h11.4v.4H24.1z"/><path data-name="Shape" class="avcls-1" d="M23 13.2l8.1-8 .2.3-8 8-.3-.3zM18.7 16.5c.1 0 .1.1.1.2h.1a2.51 2.51 0 00.4-.7.1.1 0 00.1-.1c0-.1-.2-.2-.2-.3-.1.2-.3 0-.4.1v.1h.1v.2a.37.37 0 00-.3-.1c.1 0 0 0 0 .1a.75.75 0 00-.5.1c-.1 0-.1 0-.2-.1-.1.1-.1.2-.2.2l-.1-.1c.1-.1.2-.1.2-.2v-.3c.1-.1.1-.2.2-.2s.3.1.4 0l.1.1v.1c-.1.1-.2.1-.2.2s0 .1.1.1.1-.1.2-.1h.4c.1 0 .1-.3 0-.4v-.2c0-.1.2-.1.2 0v.1s0 .1.1 0v-.2a.35.35 0 00.2.1h.2c.1 0 .1-.1 0-.2h-.1a.31.31 0 01-.2.1c-.1 0-.1-.1-.2-.1s-.2.1-.2 0-.1-.1-.1-.2l.1-.1a.37.37 0 00.3-.1.35.35 0 01.1-.2h.1a.37.37 0 00.3-.1c.1 0 .2-.1.3-.2s.1-.1.2-.1a.1.1 0 01.1-.1v-.5a.1.1 0 01.1-.1h-.1s-.1-.1 0-.1.2 0 .2-.1a.19.19 0 00-.1-.3c-.1-.1-.2 0-.3 0a.1.1 0 01-.1.1c-.1 0-.2-.1-.1-.2v-.1h-.1l-.3.3v.1c0 .1 0 .2-.1.2h-.1c0 .1.2.1.1.2s-.2.1-.4.2a2.72 2.72 0 01-.9 0h-.5c-.1 0-.1.1-.2.2v-.2c0-.1-.1 0-.1-.1-.2-.4-.7-.3-1.1-.3a.1.1 0 00-.1.1c-.1.1-.2 0-.3 0l-.1.1c-.1 0-.2-.1-.3 0s-.1.1-.2.1v.1h-.1c-.1 0-.3 0-.3.1s0 .3-.1.3a.6.6 0 00-.4.1c-.1 0-.1.1-.2.1a2.45 2.45 0 00-.4 1.2v.1c-.2.4-.3.6-.6 1.1-.1.2-.2.6 0 .7s0 .2-.2.2-.4 0-.4-.2-.2-.1-.3-.1h-.4c-.2 0-.2.3-.3.4s-.3.1-.3.2v.2a.1.1 0 00-.1.1v.1c0 .2-.1.3 0 .5v.1a.9.9 0 01-.1.5c-.1.2-.3.2-.5.2h-1c-.1 0-.1-.1-.2-.1a.31.31 0 01-.1-.2c-.1-.1-.3 0-.4.1.1 0 0 .1 0 .1s-.2.1-.3.2-.2-.2-.2-.3-.1-.1-.2-.1v.1h-.1c-.1.1.1.1.1.1v.1h-.1a.1.1 0 01-.1.1c-.1 0-.1.1-.1 0v-.2h-.1c0 .1 0 .1-.1.1v.1h.2a.37.37 0 01.1.3c0 .1 0 .2-.1.1s0-.2 0-.3h-.1c.1.2-.1.3.1.5s-.2.2-.1.2a.35.35 0 00.2.1v-.1s.1-.1.1 0v.1H8v.4c0 .1.2 0 .2.1s-.1.1 0 .2a.1.1 0 01.1.1v.1a.1.1 0 01.1.1c.1 0 .1 0 .1-.1s.1-.1.1-.2 0-.1-.1 0V21c0-.1-.1-.1-.1-.2s.1 0 .2-.1a.1.1 0 01.1.1v.1a.1.1 0 01.1.1c.1 0 .1.1.2.2h.3v-.1l.1.1a.37.37 0 00.1.3h.1l.1.1h.1a.1.1 0 01.1.1c.1 0 .2 0 .2.1s.1.2.2.4a29772.51 29772.51 0 01.2.2.37.37 0 00.3.1.35.35 0 01.2-.1h.1c.1.2.1.4.3.4s.1.1.2.2h.2a.1.1 0 00.1.1c.1.1.2.1.2.2v.1c.1 0 .2-.1.2 0s.2.1.2.2h.1v-.1c0-.1.1 0 .2-.1s.1-.2.1-.2.2.1.3.2h.1c.1.1.1.3.2.3s.2.1.4.2.2.1.3.1h.1c.1 0 .1 0 .2-.1s.3-.1.4-.2l.1-.1c.2-.1.5.1.7 0s.1 0 .2-.1.2-.3.1-.4-.2-.5-.3-.7l-.3-.3h-.1c-.1 0-.1-.1-.1-.2a.1.1 0 01-.1-.1v-.3c-.1 0-.2-.1-.4-.1a.1.1 0 01-.1-.1v-.1a.37.37 0 01.3-.1v-.3a.1.1 0 00-.1-.1c0-.1.1-.2 0-.3s-.2-.2-.2-.3a.1.1 0 01-.1-.1v-.5c0-.1-.1-.1 0-.2l.1-.1c.1 0 .1-.1.1-.2a.14.14 0 00-.2 0v-.3l-.1-.1v-.2s0-.1-.1 0v-.2c0-.1-.1-.2-.2-.1a.14.14 0 01-.2 0V18a.1.1 0 00.1-.1.14.14 0 000-.2c-.1-.1-.2-.2-.1-.3-.1 0-.3 0-.3-.2s0-.3-.1-.4v-.3a.1.1 0 01.1-.1c.2 0 .4 0 .4-.1s-.1-.3 0-.3.4 0 .6-.2c.1 0 .1-.1 0-.2a.35.35 0 00-.1-.2c-.1-.1-.2 0-.3-.2V15c0-.1.1-.1.2-.2s.3 0 .5.1l.1.1v.1c0 .2.1.4 0 .6s-.1.1-.1.2h.1c0 .1.1.3 0 .4s-.1 0-.3 0-.1 0-.1.1l.1.1c.4.1.5.1.9.2.1 0 .1.1.2.1h.3a.1.1 0 00.1.1c.1.1.1.3.2.3a.14.14 0 01.2 0c-.1.1 0 .2 0 .3s.2.1.3.2.2.1.2 0-.1-.2 0-.3c.1.2 0 .4.1.6.1.1.1.2.2.2s.1-.1.1-.2v-.1c0-.1 0-.1.1-.2s.1-.2.1-.3v-.1c0-.1.2-.2.3-.2V17c.1 0 0-.2.1-.2s.1-.1.1-.2.1-.1 0-.1c.5.1.5 0 .5 0"/><path data-name="Shape" class="avcls-1" d="M14.5 16.3h-.1v.1l.1.1v.3c0 .1.1.2.2.1s.2-.3.1-.4-.1-.1-.3-.2M14.3 17.2c.1.2.2.1.3.1v-.1c-.1-.1-.1-.1-.3 0 .1-.1 0-.1 0-.1v.1M14.6 17.6c0-.2-.1-.2-.2-.1s0 .3.1.4a.1.1 0 00.1.1c0 .1.1 0 .2 0s0-.1.1-.1c-.1-.1-.2-.3-.3-.3"/><path data-name="Shape" class="avcls-1" d="M14.3 16.8c0-.1-.1-.1 0 0-.1 0-.1 0-.1.1s0 .2.1.2a.1.1 0 00.1-.1c-.1-.1-.1-.1-.1-.2M14.7 17.4l.1-.1h.1v-.1c-.1 0-.1.1-.2.1s0 .1 0 .1M14.6 18.3c0 .1 0 .1.1.1h.1v-.1h-.2M14.8 19c0-.1.1-.1 0-.2h-.1a.35.35 0 00.1.2M8.5 21.5v.1h.2c-.1 0-.1-.2-.2-.1M9.1 22.2c-.1.1.1.2.2.2v-.2a.14.14 0 00-.2 0M9.4 22.6c0 .2.1.3.2.3.1-.2 0-.3-.2-.3M19.5 17.4a1.27 1.27 0 01.6-.1c.4 0 .4-.6.6-.9a.6.6 0 00-.1-.4c-.1-.2-.6 0-.7-.2s.3.1.3-.1 0-.1-.1-.2h-.2a2 2 0 00-.4.8 5.38 5.38 0 00-.9 1.2c0 .1 0 .1.1.2.3.1.6-.2.8-.3M21.3 16.4c-.1 0-.1 0-.2.1v.2h.1c0-.1 0-.1-.1-.1.2-.1.2-.2.2-.2M20 17.9c.1.2.5.1.5 0s-.3-.2-.4-.2.1.1-.1.2M20.5 19.2a.37.37 0 00.1-.3l-.3.3h.2M22.3 16.5v-.1h-.2c-.1 0-.1-.1-.1-.2s-.1-.2-.1-.3-.1.2-.1.2c.2.2.3.5.5.4M19.9 15.3c-.1-.1-.1 0 0 0-.1.1 0 .1 0 0M8.1 19.1A.1.1 0 008 19h-.1v.1a.14.14 0 00.2 0M8.8 19.1c.1 0 .2-.1.1-.2s-.3 0-.2.1c-.1.1 0 .2.1.1M20.2 12.1c0-.1.1-.1.1-.2h-.1c-.1 0-.1.1 0 .2M20.5 12s.1-.1 0-.1h-.1a.1.1 0 00.1.1M19.4 14.6c0 .1.2.3.3.2a.14.14 0 000-.2.19.19 0 00-.3 0M19.7 15.4v-.1h-.3a.1.1 0 00.1.1c0-.1.1 0 .2 0M19.4 15.6c-.1 0 0 .1 0 .2s.1 0 .2-.1.1-.2 0-.2-.2 0-.2.1M19.2 15.3c0 .1-.1.2 0 .3s.1 0 .1 0 0-.2.1-.2h-.1v-.1h-.1M26.8 22.4c.1 0 0-.1 0 0"/><path data-name="Shape" class="avcls-1" d="M21 18.5l-.1-.1c0-.1-.1.1-.2 0 .1.1 0 .1-.1.2a.1.1 0 00.1.1c0 .1-.1.1 0 .2l-.1.1s-.1.1 0 .1.2-.1.3-.1h.1c.1 0 .1-.1.2-.2H21s-.1 0 0-.3M21.6 20.4c0 .1.1.1 0 0 .1 0 .1-.1.1-.2h-.1v.2M21.7 20.2c.1 0 0-.1 0-.1h-.1a.1.1 0 00.1.1M22.3 20.5c-.1 0-.1-.1-.2 0H22v.1c.2-.1.2-.1.3-.1M23.3 20.4v-.1c-.1 0-.2.1-.3 0v.1h-.1c.2.1.3 0 .4 0M23.7 20c0 .2.2.1.2 0s0-.1-.2 0l.1-.1a.1.1 0 01-.1.1M28.5 16.8c0 .1.1.1.2.1a.37.37 0 00.3-.1.27.27 0 00-.3-.3c-.2.1-.2.2-.2.3M28.5 21.9h-.1c-.1.5-.6 1.2 0 1.5.2.2.5-.1.6-.3s0-1-.5-1.2M27 19.7c-.1 0-.1.2 0 .2a.1.1 0 00.1-.1v-.1H27M27.4 24.8v.2s.2-.1 0-.2M29.7 13.1h-.1v.2c-.2.4-.7.9-.4 1.4a1.38 1.38 0 00.3-.4 10.37 10.37 0 00.4-1s-.1-.2-.2-.2M28.8 14.9c0 .1 0 .1.1.1s.1-.1 0-.1 0-.1-.1 0M23.7 11.8c-.1-.2-.2 0-.3 0l-.1-.1h-.1c-.1 0 0 .2.1.2s.1-.1.1 0 0 .3.2.2.2-.1.3-.1.1-.1.1-.2.2-.1.3 0a.1.1 0 00.1.1c0 .1.1.1.2.1a.37.37 0 00.3-.1.19.19 0 000-.3h-.2c-.1 0-.1-.1-.2-.1-.4-.1-.6.2-.8.3M22.7 12h.3c0-.2-.2-.1-.3-.1.1-.1.1 0 0 .1"/><path data-name="Shape" class="avcls-1" d="M23.1 12.6c.1-.1.3-.2.4-.3v-.1c0-.1-.1-.1-.2-.2a.1.1 0 01-.1.1c-.1.1-.2.1-.2.2v.2c.1.3.1.2.1.1M21.6 11.6v.1c.1.1.1 0 0-.1M18 9.4a.6.6 0 00.4.1l.1-.1c-.1-.1-.2 0-.2-.1h-.1c-.1-.1-.2 0-.2.1M27.1 11c0 .1-.1 0-.2.1v.1c.1.1.2 0 .3 0s.1-.1.1 0v.1a.1.1 0 00-.1.1h-.3v.2c-.1.1-.4.2-.3.4a.75.75 0 00.5.1c0-.2.1-.2.2-.3a.1.1 0 00-.1-.1v-.1a.1.1 0 00.1-.1v-.1a.35.35 0 00.2-.1c0-.1-.1-.2-.1-.3a.1.1 0 01.1-.1v-.1h-.1s-.1 0 0 .1a.37.37 0 00-.3.1c0-.2.1 0 0 0M26.1 12c0 .1.1.1.2 0h-.2M27.5 11.8c-.1.1.1.1.2.1 0-.1-.1-.1-.2-.1M27.9 11.3c-.1 0-.1.1 0 0M25.6 7.3c.1.1.2.1.2.2v.4l.1.1v.2c0 .1.1.3.1.4a.1.1 0 01.1.1c0 .1 0 .1.1.2s.1 0 .2.1.2.3.3.4a.1.1 0 01.1.1v.1c.2 0 .5.1.4.4.1-.1.2-.1.2-.2s.1-.3 0-.4l-.2-.2V9a.1.1 0 00-.1-.1c0-.1-.1-.3.1-.3v-.1H27v-.1a.35.35 0 00-.4-.4c-.1-.1-.1-.1-.2-.1h-.2a2.09 2.09 0 01-.4-.6.19.19 0 00-.3 0c.1-.1.1-.1.1 0"/><path data-name="Shape" class="avcls-1" d="M24.7 7.6a.14.14 0 000 .2h.4a.1.1 0 00.1-.1c.1-.1.2 0 .4-.1 0 .1 0 .1.1.1s0-.2-.1-.2-.1-.2-.2-.3h-.1c0 .2-.1.1-.3.2v.1-.1h-.2a.35.35 0 01-.1.2M22.4 3.7c-.1-.2-.3-.4-.2-.7a1.39 1.39 0 00.9 0c.2-.1.5 0 .7-.1v-.2c-.3.1-.5-.2-.7-.1a3.18 3.18 0 01-.9.3c-.2.1-.9 0-.9.4.3 0 .7 0 .9.3 0 .1.1.1.2.1M23.4 5.2a.4.4 0 00.4.2c0-.1 0-.1-.1-.2h-.3M23.1 5.7c-.1 0 0 .1.1.2 0-.1.1-.3-.1-.2M22.9 5.4c.1-.1 0-.2-.1-.2v.1l.1.1M23.8 6.5a.31.31 0 00.1-.2h-.1a.14.14 0 000 .2M24.1 6.5v.1c.1.1.1 0 0-.1.1 0 0 .1 0 0M24 6.8l.1-.1c0-.1-.1-.1-.2 0s.1 0 .1.1M24.1 6.8c0 .1.1.2.2.1s.1-.1 0-.1zM24.6 7a.35.35 0 00-.1-.2s-.1.1 0 .1 0 .1.1.1M24.7 7.3h.1v-.2h-.2v.1l.1.1M24.5 7.5c.1-.1.1-.1 0-.2h-.1a.1.1 0 01-.1.1c.1.1.1.1.2.1M24.2 2.5c-.1-.1-.1-.1-.2-.1.1.1.1.2.2.1M27.6 5c.1.1.2 0 .2.1s.1.2.2.2.1 0 .1-.1 0-.4-.2-.4h-.5c-.1 0-.1.1-.1.2a.19.19 0 01.3 0"/><path data-name="Shape" class="avcls-1" d="M31.7 10.2c-.1-.1-.1-.3-.2-.4s-.2-.1-.3-.2v-.2l-.1-.1c-.1-.2-.1-.3-.3-.3 0-.2-.1-.2-.3-.3v-.1a.1.1 0 00-.1-.1h-.1c-.1-.1-.2-.2-.2-.3s-.2-.2-.3-.3l-.1-.1c-.1 0-.2 0-.2-.1s-.2-.3-.3-.4 0-.4-.1-.7c0-.1-.1-.1-.2-.1a.1.1 0 01-.1-.1c-.1-.1 0-.3-.1-.4s-.3-.3-.4-.5a.37.37 0 00-.3-.1h-.1l-.1-.1c-.1-.1-.2-.2-.3-.2s-.4 0-.6-.1-.4 0-.5.2-.3.2-.5.2 0 .1 0 .2-.2.2-.1.2h.2a.1.1 0 01.1.1c.1.1.2.2.2.3a.14.14 0 000 .2.37.37 0 01.1.3c0 .1.1 0 .1 0a.25.25 0 01.1.4v.3c.1.2.1.4.2.5l.1-.1c.1 0 .1-.1.2-.1.2-.2.4.2.5.3s0 .4.1.6a1.38 1.38 0 00.3.4.31.31 0 00.1.2l.1.1a.1.1 0 01.1-.1h.1c.2.2.2.6.5.6a.1.1 0 00.1.1c.1 0 .1-.1.2 0a.35.35 0 00.1.2h.3c.1 0 .1.1.2.2l.1.1c.2.2.3.5.5.7s.2.2.3.1v-.1a.22.22 0 00.2-.2l.3-.3c.1-.1.2-.1.3-.2.3 0 .2-.2.2-.2M27.5 10.3c0 .1.1.1.2.1s.1.2.2.2.1-.1.1-.2h.1c.1-.1 0-.3-.1-.4s-.1-.2-.3-.2-.1 0-.2.1 0 .2 0 .3v.1M28.2 10.7c-.1.2 0 .4 0 .6s-.2.1-.2.2a.14.14 0 000 .2c0 .1.2.1.3.2a1.17 1.17 0 01.6.6.37.37 0 01.1.3c.1.1.2.1.2.2s.1.1.1 0a.3.3 0 000-.4c-.1-.1-.1-.1-.1-.2a2.35 2.35 0 00-.2-.8l-.3-.3v-.1c0-.1.1-.1.1-.2s-.1-.2-.2-.3c-.2-.1-.3-.1-.4 0M29.7 12.1v-.2c0-.2-.2-.2-.3-.2h-.1v.2a2.93 2.93 0 01.3 1c0 .1.3 0 .3-.1v-.2c0-.1-.1-.1-.1-.2s-.1-.2-.1-.3M29.3 11.2c-.1.1 0 .2 0 .3.1 0 .1 0 .1-.1s0-.1-.1-.2M29.3 11c0-.1 0-.1-.1-.1s-.1.1-.2.1 0 .1.1.2c.2 0 .3-.1.2-.2M28.8 10.5c.1.1 0 .2.1.2s.2.1.3 0 0-.1-.1-.1v-.1H29c-.1-.1.1-.1 0-.2v-.1h-.1v.1c-.1.1-.2.2-.1.2M28.7 9.9c-.1 0-.2 0-.2-.1h-.1s-.1.1 0 .1a.1.1 0 01.1.1c0 .1.1 0 .1.1s.1.1.1 0V10s.1-.1 0-.1M21.6 14.5a.14.14 0 000-.2.1.1 0 00-.1.1c.1 0 .1 0 .1.1"/><path data-name="Shape" class="avcls-1" d="M29.4 13.2a.6.6 0 00-.4.1c-.2.1-.3.4-.4.6a.52.52 0 01-.4.2.1.1 0 01-.1-.1v-.2l.1-.1c.1-.1 0-.2 0-.3s-.3-.4-.5-.3-.3.3-.5.5c-.1-.1-.2-.2-.2-.3v-.1c.1 0 .2.2.2.1s0-.2-.1-.2-.1-.1-.2-.1-.1-.1-.2-.2 0-.3-.1-.3a.37.37 0 01-.3-.1h-.2v-.1c.1 0 .3 0 .2-.2s-.1-.1-.2-.1H26v.3a.37.37 0 01-.3.1h-.1c-.1 0-.2-.1-.3-.1s-.1.2-.2.2-.1 0-.2.1-.1.2 0 .3v.1a.1.1 0 01-.1-.1c0-.1-.1-.2-.1-.3s.1-.2.2-.3v-.2c-.1-.1-.1-.1-.2-.1s-.3.4-.5.3-.2-.2-.3-.2-.1-.1-.2 0a2.19 2.19 0 01-.5.3c-.1.1-.3.2-.3.4a.38.38 0 01-.6.1c-.1-.1-.2-.2-.3-.2s-.2.2-.3.2-.1 0-.2-.1v-.1l.6-.3c.1 0 .1-.1.1-.2V12a.68.68 0 00-.6.4.1.1 0 01-.1.1c-.2 0-.3.1-.5 0l-.1-.2c-.1.1-.1.2-.2.2l-.1.1c-.1.1.1.3 0 .4s-.2.1-.3.1v.2c0 .1.1 0 .1.1s.1.3.2.3.3 0 .5.1.2.1.3.2.1.1.1.2a.1.1 0 00.1.1h.2c.1 0 0 .1.1.2a.76.76 0 00.1.4s0 .2-.1.2a.1.1 0 00-.1.1v.3h.1c.1.1.1.2.2.3l.1.1a.1.1 0 00-.1.1.14.14 0 00.2 0c.1 0 .1-.1.2-.1a.1.1 0 00.1-.1.35.35 0 01.1.2c-.1.1-.3 0-.4.1s-.1 0-.2.1a.1.1 0 00.1.1c.2.1.1.4-.1.6v.2H22c-.2 0-.5-.1-.7 0s-.1.1-.1.2a.1.1 0 00-.1.1v.2c-.2.2-.2.5-.3.7a.1.1 0 00.1.1c.1 0 .1-.1.2-.1s.1.2.1.2.2.1.2 0a.37.37 0 01.1-.3c0-.1-.1-.2-.1-.3s0-.2.1-.2a.1.1 0 01.1.1v.4a.14.14 0 010 .2.1.1 0 01-.1.1v.2c-.1.1-.1.1-.1.2-.2 0-.4-.1-.3-.3-.1 0-.1 0-.2.1v.3c-.1.1-.1.2-.2.3v.1c-.1.1-.2.2-.3.2-.1.1-.2 0-.2.1s.1.2.1.3 0 .1-.1.2h-.4a.37.37 0 01-.1.3c-.1.1 0 .2.1.2s.1.2.2.2.1.1.2.1a.22.22 0 00.2-.2c0-.1.1 0 .2 0h.1a.14.14 0 000-.2l.4-.4c.1 0 .1-.1.2-.1s.1.1.2.1.1.1.2.1h.1c.1 0 .2.2.3.2a.37.37 0 00-.1-.3c-.1-.1-.2-.2-.3-.2v-.1c.1.1.1.1.2.1s.1.2.2.3.1.1.2.1a.37.37 0 00.3-.1c0-.1 0-.1-.1-.1s0-.1.1-.2 0-.2 0-.3v-.1c.1-.1 0-.2 0-.4 0 .1.1.1.2.1a.22.22 0 00.2-.2.19.19 0 01.3.1c0 .1 0 .2-.1.2a.76.76 0 00-.5.2l-.1.1c-.1.1-.1.1-.1.2l-.1.1a.1.1 0 01.1.1.37.37 0 00.3-.1v-.2c.1 0 .1-.1.2-.1s.3.2.2.3h-.1c-.1.1-.2.3-.3.3s-.5.1-.7.2-.1.2-.2.2-.2.1-.3 0c0 .1-.2 0-.3 0a.31.31 0 00-.1-.2h-.1v-.1h-.8a.1.1 0 00-.1.1l-.1.1a.37.37 0 01-.3.1.37.37 0 00-.3.1c-.2 0-.3.2-.4.3a.37.37 0 01-.3.1v.1c-.2 0-.3.3-.4.5v.2c-.1.1-.1.3-.3.4v.1c.1.2.3.3.5.5a.1.1 0 00.1.1c.1.1.1.2.2.4s.3.2.5.2a.35.35 0 01.2.1c.2 0 .5.1.7 0 .3.1.7 0 1 .1.1 0 .1.1.1.2s.2.3.3.4a.6.6 0 00.4.1.31.31 0 00.1.2c0 .1 0 .1.1.2s.1.1.1.2-.1.2-.1.4v.2a2.65 2.65 0 00.6.5s.1 0 0 .1c.1 0 .1.1.2.2s0 .1.1.2l.3.3a.6.6 0 00.4.1.1.1 0 01.1.1c.1 0 .3.1.4 0s.1-.2.2-.2a.6.6 0 01.4-.1.1.1 0 00.1-.1c0-.1.1-.1.1-.2s.2-.1.3-.1.3-.3.5-.4.4-.1.5-.2 0-.4 0-.6.1-.2.1-.3v-.5c0-.1-.1-.2-.1-.3s.1-.1.2-.1.1-.3.2-.4a.1.1 0 00.1-.1c.1 0 0-.1 0-.2a.1.1 0 01-.1-.1 1.21 1.21 0 00-.5-.5.1.1 0 01-.1-.1v-.1c-.1 0 0-.1-.1-.1h.1c.1-.1.1-.3.2-.4a.1.1 0 00.1-.1v-.3c-.1-.1 0-.3 0-.4a2.2 2.2 0 00-.1-.8c0-.1-.1-.1-.2-.1a.1.1 0 01-.1.1.31.31 0 01-.1.2c0 .1-.2.1-.2.2s0 .1-.1.2l-.1.1c.4-.3.3-.3.3-.2h-.3a14.24 14.24 0 00-1.6-.5h.3c.1 0 0-.1 0-.1s.2.1.3.2.5.1.7.2.3.2.5.2.3-.1.4-.1v-.1c.1-.1.2-.2.2-.3v-.3l.1-.1v-.4a.1.1 0 00.1-.1v-.3a.75.75 0 00-.1-.5c0-.1-.1-.1-.2-.1a.1.1 0 01-.1.1c-.1 0-.2 0-.2.1a.1.1 0 00-.1.1.52.52 0 01-.4.2c-.1 0-.2 0-.2-.1s.2-.2.4-.2l.1-.1a.22.22 0 01.2-.2h.2c.1 0 .1-.1.2-.1a.31.31 0 01.1-.2c0-.1.1-.1.2-.2s.1-.4.2-.6 0 .1.1.2a.19.19 0 00.3 0c.1-.1 0-.2.1-.2h.1c.1 0 .1.1.2.1a.35.35 0 01.2-.1h.3c.2-.1.6 0 .6-.2a.86.86 0 00-.6-.7c-.2-.1-.1-.4-.3-.6-.1 0 0-.1-.1-.2l-.1-.1-.1-.1v-.5c0-.1.1-.1.2-.1s.2-.1.2-.2v-.4l.1-.1c.2 0 .5.1.7-.1.1 0 .1-.1.1-.2a1 1 0 00.4-.8c-.1.1 0 .1 0-.1.1.1.1 0 0 0m-4.5 5.4c-.1.1-.1.1-.2 0s-.1-.1-.1-.2-.1 0-.1.1h-.2c0-.1-.1-.1-.1-.2s0-.2.1-.2.1 0 .1.1v.1c.1.1.1 0 .2 0h.3c0 .1.1.2 0 .3M15.6 36c1.3-1.9 5.2-3.9 9-3.9s8 2.2 9.6 1a8.38 8.38 0 01-5.1 1.4c-3.4 0-4.7-1.7-7-1.7s-4.8 1.9-5.9 3.5zM27.7 31.8a5.34 5.34 0 001.7-1.9 14.44 14.44 0 013.7-4.4s-1.7 5.5-3.5 5.7c0 0-.3.2.2.1s2.8-.9 3.6-1.1a8.58 8.58 0 003.3-1.1 1.48 1.48 0 01.8-.4s-2.2 3.7-6.2 3.7a17.1 17.1 0 01-3.6-.6"/><path data-name="Shape" class="avcls-1" d="M32.4 29.9a3.92 3.92 0 00.5-1.7 14.64 14.64 0 012.7-6.3s.3 4.3-1.9 7c0 0-.1.4.1.1a22.93 22.93 0 014.6-3.9s1.5-1.3 1.6-1.7c0-.1-1.2 6.1-7.6 6.5"/><path data-name="Shape" class="avcls-1" d="M36.1 25.8a5.62 5.62 0 00.2-1.3c0-.6-.3-2.6-.3-3.5a7.53 7.53 0 01.8-3.7 4.5 4.5 0 00.2 1.4 12.29 12.29 0 01.5 2.5 10.27 10.27 0 01-.4 2.5 2.13 2.13 0 00.6-.8 12.81 12.81 0 012.2-2.8 5.62 5.62 0 001.4-2.1 6.08 6.08 0 01-1.2 4.1c-1.5 2.1-2.1 1.8-2.9 2.6a11.41 11.41 0 01-1.1 1.1"/><path data-name="Shape" class="avcls-1" d="M38.4 20.9a3.87 3.87 0 00-.3-1.6 10.5 10.5 0 01-1.3-5.9s.2-.2.6 1 1 1.6 1.2 2.8a12 12 0 01.2 1.7s.1.2.1 0a9 9 0 01.8-3.2c.7-1.5 1.6-2.9 1.5-3.9 0 0 .4 0 .3 1.6.1 1.6-.3 4.4-3.1 7.5"/><path data-name="Shape" class="avcls-1" d="M39.2 16.1a12 12 0 00-.8-1.5c-.3-.4-2.7-3.7-2.9-5.3 0 0 .2-.1.4.3a12.94 12.94 0 001.5 1.7 5 5 0 011.5 2.8s.1.1-.1-2.1.7-3.7-.1-5.3c0 0 1.1.2 1.7 4.8a9.68 9.68 0 01-.9 3.6c.1-.1-.2 1-.3 1"/><path data-name="Shape" class="avcls-1" d="M38.3 11a9.94 9.94 0 00-1.6-1.3 9.58 9.58 0 01-3.3-4.3s.1-.2.8.7c.5.7 1.1.4 2.7 2.4 0 0 .2.5.3.4s-.1-.5-.1-.5-.1-1.2-.1-1.6a15.83 15.83 0 00-.9-3.1 5.82 5.82 0 012.5 4.7c-.1 0-.2 2.5-.3 2.6"/><path data-name="Shape" class="avcls-1" d="M36.5 7.3s.1-3-3.8-4.6c0 0 1.4 2.8 2.4 3.5a11.57 11.57 0 011.4 1.1M26.3 36c-1.3-1.9-5.2-3.9-9-3.9s-8 2.2-9.6 1a8.38 8.38 0 005.1 1.4c3.4 0 4.7-1.7 7-1.7s4.8 1.9 5.9 3.5zM14.2 31.8a5.34 5.34 0 01-1.7-1.9 14.44 14.44 0 00-3.7-4.4s1.7 5.5 3.5 5.7c0 0 .3.2-.2.1s-2.8-.9-3.6-1.1a8.58 8.58 0 01-3.3-1.1 1.24 1.24 0 00-.8-.4s2.2 3.7 6.2 3.7a17.1 17.1 0 003.6-.6"/><path data-name="Shape" class="avcls-1" d="M9.5 29.9a3.92 3.92 0 01-.5-1.7 14.64 14.64 0 00-2.7-6.3s-.3 4.3 1.9 7c0 0 .1.4-.1.1a22.93 22.93 0 00-4.6-3.9S2 23.8 1.9 23.4c0-.1 1.2 6.1 7.6 6.5"/><path data-name="Shape" class="avcls-1" d="M5.8 25.8a5.62 5.62 0 01-.2-1.3c0-.6.3-2.6.3-3.5a7.53 7.53 0 00-.8-3.7 4.5 4.5 0 01-.2 1.4 12.29 12.29 0 00-.5 2.5 10.27 10.27 0 00.4 2.5 2.13 2.13 0 01-.6-.8A12.81 12.81 0 002 20.1 5.62 5.62 0 01.6 18a6.08 6.08 0 001.2 4.1c1.5 2.1 2.1 1.8 2.9 2.6.1 0 1 1.1 1.1 1.1"/><path data-name="Shape" class="avcls-1" d="M3.5 20.9a6.93 6.93 0 01.3-1.6 10.5 10.5 0 001.3-5.9s-.2-.2-.6 1-1 1.6-1.2 2.8a8.18 8.18 0 00-.3 1.7s-.1.2-.1 0a9 9 0 00-.8-3.2C1.4 14.2.5 12.8.6 11.8c0 0-.4 0-.3 1.6a11 11 0 003.2 7.5"/><path data-name="Shape" class="avcls-1" d="M2.7 16.1a12 12 0 01.8-1.5c.3-.4 2.7-3.7 2.9-5.3 0 0-.2-.1-.4.3a12.94 12.94 0 01-1.5 1.7A5 5 0 003 14.1s-.1.1.1-2.1-.7-3.7.1-5.3c0 0-1.1.2-1.7 4.8a9.68 9.68 0 00.9 3.6c-.1-.1.2 1 .3 1"/><path data-name="Shape" class="avcls-1" d="M3.6 11a9.94 9.94 0 011.6-1.3 9.58 9.58 0 003.3-4.3s-.1-.2-.8.7c-.5.7-1.1.4-2.7 2.4 0 0-.2.5-.3.4s.1-.5.1-.5a13.88 13.88 0 00.3-1.7A15.83 15.83 0 016 3.6a5.82 5.82 0 00-2.5 4.7 12.21 12.21 0 00.1 2.7"/><path data-name="Shape" class="avcls-1" d="M5.4 7.3s-.1-3 3.8-4.6c0 0-1.4 2.8-2.4 3.5a11.57 11.57 0 00-1.4 1.1"/></symbol>
+		<symbol viewBox="0 0 19.25 14" id="cd-icon--pdf" xmlns="http://www.w3.org/2000/svg"><path data-name="Path 1010" d="M16.188.411V0l3.063 3.063H16.53a.342.342 0 01-.341-.341zm3.063 3.526v9.188a.875.875 0 01-.875.875H.876a.875.875 0 01-.875-.875V.875A.875.875 0 01.876 0h14.438v2.721a1.218 1.218 0 001.216 1.216zM7.439 6.562A1.314 1.314 0 006.127 5.25H4.815a.437.437 0 00-.437.438v4.375a.438.438 0 00.875 0v-1.75h.875a1.314 1.314 0 001.313-1.312zm3.938 0a1.314 1.314 0 00-1.312-1.312H8.75a.437.437 0 00-.437.438v4.375a.437.437 0 00.438.438h1.313a1.314 1.314 0 001.313-1.312zm3.938-.875a.437.437 0 00-.437-.437h-2.187a.437.437 0 00-.437.438v4.375a.438.438 0 00.875 0v-1.75H14a.438.438 0 000-.875h-.875V6.126h1.75a.437.437 0 00.438-.438zm-5.25.438H9.19v3.5h.875a.438.438 0 00.438-.437V6.563a.438.438 0 00-.44-.438zm-3.937 0h-.875v1.313h.875a.438.438 0 00.438-.437v-.437a.438.438 0 00-.441-.439z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--search" xmlns="http://www.w3.org/2000/svg"><path d="M46.829 41.172L38.4 32.744a21.018 21.018 0 10-5.657 5.657l8.427 8.427a4 4 0 005.658-5.656zM8 21a13 13 0 1122.325 9.046c-.05.045-.106.078-.154.126s-.08.104-.125.154A12.992 12.992 0 018 21z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--selected" xmlns="http://www.w3.org/2000/svg"><path d="M18.5 39.75a4 4 0 01-2.83-1.17l-12.5-12.5a4 4 0 015.66-5.66l9.67 9.67L39.17 9.42a4 4 0 015.66 5.66l-23.5 23.5a4 4 0 01-2.83 1.17z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--selected--highlighted" xmlns="http://www.w3.org/2000/svg"><path fill="#80CBFF" d="M18.5 39.75a4 4 0 01-2.83-1.17l-12.5-12.5a4 4 0 015.66-5.66l9.67 9.67L39.17 9.42a4 4 0 015.66 5.66l-23.5 23.5a4 4 0 01-2.83 1.17z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--sm-fb-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><path d="M29.16 13h-3.52c-2.09 0-4.41.88-4.41 3.9v3.2h-2.41v3.84h2.49V35h4.57V23.87h3l.27-3.78h-3.34v-2.17c0-1.2 1.24-1.13 1.32-1.13h2V13z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--sm-fb-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm4.9 21.87h-3V35h-4.59V23.94h-2.49V20.1h2.41v-3.2c0-3 2.32-3.9 4.41-3.9h3.52v3.79h-2c-.07 0-1.32-.07-1.32 1.13v2.17h3.37z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--sm-gh-def" xmlns="http://www.w3.org/2000/svg"><path d="M14.46 26.8a.16.16 0 010-.26.71.71 0 01.66-.2 1.15 1.15 0 01.46.13 3 3 0 011 .89 6.7 6.7 0 00.89 1 2.45 2.45 0 003.23.2 2 2 0 01.43-.79 2 2 0 01.56-.46q.26-.13.92-.39a12.25 12.25 0 01-3.52-.76A6 6 0 0117 24.69a5.52 5.52 0 01-1.28-3.09 7.92 7.92 0 01.3-3.49 5.8 5.8 0 011.12-1.78 5.89 5.89 0 01.2-3.75A6.84 6.84 0 0121.1 14a14.42 14.42 0 016.85 0 12.37 12.37 0 011.42-.82 5.79 5.79 0 012.4-.56 7.1 7.1 0 01.36 1.71 5.66 5.66 0 01-.1 1.84 6.07 6.07 0 011.58 4.21 7.48 7.48 0 01-.72 3.49 5.56 5.56 0 01-2.57 2.3 9.15 9.15 0 01-3.29.72 4.36 4.36 0 011.35 1 2.9 2.9 0 01.56 1.55v2.07l.07 2a2.47 2.47 0 00.92.89.22.22 0 01.13.3q-.07.2-.53.2a2.19 2.19 0 01-1.78-.9 1.51 1.51 0 01-.2-.79v-3.12a1 1 0 00-.26-.76 1.28 1.28 0 00-.53-.3v4.15a2.6 2.6 0 00.24 1.45 1.55 1.55 0 01.33.66s0 .08-.1.1a1.27 1.27 0 01-.56-.1 1.63 1.63 0 01-1.18-.89 3.4 3.4 0 01-.33-1.48v-4.08h-.86v4.08a3.62 3.62 0 01-.3 1.51 1.85 1.85 0 01-1.71 1q-.2-.07-.2-.13a5.58 5.58 0 00.39-.66 3.05 3.05 0 00.16-.53 3.82 3.82 0 00.1-.92V29a1.07 1.07 0 00-.49.3 1 1 0 00-.23.76v3.16a1.51 1.51 0 01-.2.79 2.08 2.08 0 01-1.78.79q-.46 0-.53-.2a.18.18 0 010-.23 2 2 0 01.3-.23 2 2 0 00.26-.2 1.2 1.2 0 00.39-.53 2.5 2.5 0 00.1-1.38 6.64 6.64 0 010-1.45 3.8 3.8 0 01-3.47-.58A6.43 6.43 0 0116 28.51a6.64 6.64 0 00-1.58-1.71z"/><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--sm-gh-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm8.89 21.84a5.56 5.56 0 01-2.57 2.3 9.15 9.15 0 01-3.29.72 4.36 4.36 0 011.35 1 2.9 2.9 0 01.56 1.55v2.07l.07 2a2.47 2.47 0 00.92.89.22.22 0 01.13.3q-.07.2-.53.2a2.19 2.19 0 01-1.78-.87 1.51 1.51 0 01-.2-.79v-3.12a1 1 0 00-.26-.76 1.28 1.28 0 00-.53-.3v4.15a2.6 2.6 0 00.24 1.45 1.55 1.55 0 01.33.66s0 .08-.1.1a1.27 1.27 0 01-.56-.1 1.63 1.63 0 01-1.18-.89 3.4 3.4 0 01-.33-1.48v-4.08h-.86v4.08a3.62 3.62 0 01-.3 1.51 1.85 1.85 0 01-1.71 1q-.2-.07-.2-.13a5.56 5.56 0 00.39-.66 3 3 0 00.16-.53 3.82 3.82 0 00.1-.92V29a1.07 1.07 0 00-.49.3 1 1 0 00-.23.76v3.16a1.51 1.51 0 01-.2.79 2.08 2.08 0 01-1.78.79q-.46 0-.53-.2a.18.18 0 010-.23 2 2 0 01.3-.23 2 2 0 00.26-.2 1.2 1.2 0 00.39-.53 2.5 2.5 0 00.1-1.38 6.64 6.64 0 010-1.45 3.8 3.8 0 01-3.47-.58A6.43 6.43 0 0116 28.51a6.64 6.64 0 00-1.58-1.71.16.16 0 010-.26.71.71 0 01.66-.2 1.14 1.14 0 01.46.13 3 3 0 011 .89 6.69 6.69 0 00.89 1 2.45 2.45 0 003.23.2 2.12 2.12 0 011-1.25q.26-.13.92-.4a12.25 12.25 0 01-3.52-.76A6 6 0 0117 24.69a5.52 5.52 0 01-1.28-3.09 7.92 7.92 0 01.3-3.49 5.79 5.79 0 011.12-1.78 5.89 5.89 0 01.2-3.75A6.83 6.83 0 0121.1 14a14.42 14.42 0 016.85 0 12.37 12.37 0 011.42-.82 5.79 5.79 0 012.4-.56 7.1 7.1 0 01.36 1.71 5.66 5.66 0 01-.1 1.84 6.06 6.06 0 011.58 4.21 7.48 7.48 0 01-.72 3.46z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--sm-ig-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm0 41a19 19 0 1119-19 19 19 0 01-19 19z"/><path d="M24 18.09A5.91 5.91 0 1029.91 24 5.9 5.9 0 0024 18.09zm0 9.74A3.83 3.83 0 1127.83 24 3.83 3.83 0 0124 27.83z"/><circle cx="30.14" cy="17.86" r="1.38"/><path d="M34.9 16.47a5.88 5.88 0 00-3.36-3.36 8.43 8.43 0 00-2.79-.53c-1.23-.06-1.62-.07-4.74-.07s-3.52 0-4.74.07a8.44 8.44 0 00-2.79.53 5.88 5.88 0 00-3.36 3.36 8.44 8.44 0 00-.53 2.79c-.06 1.23-.07 1.62-.07 4.74s0 3.52.07 4.74a8.44 8.44 0 00.53 2.79 5.88 5.88 0 003.36 3.36 8.44 8.44 0 002.79.53c1.23.06 1.62.07 4.74.07s3.52 0 4.74-.07a8.44 8.44 0 002.79-.53 5.88 5.88 0 003.36-3.36 8.41 8.41 0 00.53-2.79c.06-1.23.07-1.62.07-4.74s0-3.52-.07-4.74a8.44 8.44 0 00-.53-2.79zm-1.54 12.18a6.38 6.38 0 01-.4 2.14A3.81 3.81 0 0130.78 33a6.35 6.35 0 01-2.14.4c-1.21.06-1.58.07-4.65.07s-3.43 0-4.65-.07a6.35 6.35 0 01-2.14-.4 3.81 3.81 0 01-2.2-2.22 6.35 6.35 0 01-.4-2.14c-.06-1.21-.07-1.58-.07-4.65s0-3.43.07-4.65a6.38 6.38 0 01.4-2.14 3.81 3.81 0 012.22-2.2 6.35 6.35 0 012.14-.4c1.21-.06 1.58-.07 4.65-.07s3.43 0 4.65.07a6.38 6.38 0 012.14.4 3.81 3.81 0 012.2 2.22 6.35 6.35 0 01.4 2.14c.06 1.21.07 1.58.07 4.65s-.05 3.42-.11 4.64z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--sm-ig-full" xmlns="http://www.w3.org/2000/svg"><circle cx="24" cy="24" r="3.83"/><path d="M33 17.22A3.81 3.81 0 0030.78 15a6.38 6.38 0 00-2.14-.4c-1.21-.05-1.58-.07-4.65-.07s-3.43 0-4.65.07a6.35 6.35 0 00-2.14.4 3.81 3.81 0 00-2.2 2.22 6.38 6.38 0 00-.4 2.14c-.05 1.21-.07 1.58-.07 4.65s0 3.44.07 4.65a6.36 6.36 0 00.4 2.14 3.81 3.81 0 002.22 2.2 6.35 6.35 0 002.14.4c1.21.06 1.58.07 4.65.07s3.44 0 4.65-.07a6.35 6.35 0 002.14-.4 3.81 3.81 0 002.2-2.22 6.38 6.38 0 00.4-2.14c.06-1.21.07-1.58.07-4.65s0-3.43-.07-4.65a6.35 6.35 0 00-.4-2.12zm-9 12.69A5.91 5.91 0 1129.91 24 5.9 5.9 0 0124 29.91zm6.14-10.66a1.38 1.38 0 111.38-1.38 1.38 1.38 0 01-1.38 1.37z"/><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm11.43 26.74a8.41 8.41 0 01-.53 2.79 5.88 5.88 0 01-3.36 3.36 8.44 8.44 0 01-2.79.53c-1.23.06-1.62.07-4.74.07s-3.51 0-4.74-.07a8.44 8.44 0 01-2.79-.53 5.88 5.88 0 01-3.36-3.36 8.44 8.44 0 01-.53-2.79c-.06-1.23-.07-1.62-.07-4.74s0-3.52.07-4.74a8.44 8.44 0 01.53-2.79 5.88 5.88 0 013.36-3.36 8.44 8.44 0 012.79-.53c1.23-.06 1.62-.07 4.74-.07s3.51 0 4.74.07a8.43 8.43 0 012.79.53 5.88 5.88 0 013.36 3.36 8.44 8.44 0 01.53 2.79c.06 1.23.07 1.62.07 4.74s-.01 3.51-.07 4.74z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--sm-ln-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><ellipse cx="16.07" cy="14.58" rx="2.56" ry="2.58"/><path d="M13.92 19h4.33v14h-4.33zM29.4 18.57a4.88 4.88 0 00-4.22 2.31V19H21v14h4.16v-7.35c0-2 .91-3.14 2.64-3.14s2.36 1.13 2.36 3.14V33h4.31v-8.86c.02-3.75-2.1-5.57-5.07-5.57z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--sm-ln-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm-5.74 31h-4.34V19h4.33zm-2.19-15.83a2.58 2.58 0 112.56-2.58 2.57 2.57 0 01-2.56 2.58zM34.49 33h-4.31v-7.35c0-2-.77-3.14-2.36-3.14s-2.64 1.17-2.64 3.14V33H21V19h4.16v1.89a4.88 4.88 0 014.22-2.31c3 0 5.09 1.81 5.09 5.56z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--sm-rss-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><path d="M20.7 31.18a2.85 2.85 0 11-2.85-2.81 2.84 2.84 0 012.85 2.81zM37 34a22 22 0 00-22-22v5a17.49 17.49 0 0114.92 8.2 16.65 16.65 0 012.49 8.8H37zm-7.78 0A14 14 0 0024 23.13 14.27 14.27 0 0015 20v4.2a9.94 9.94 0 018.67 5 9.79 9.79 0 011.25 4.8h4.3z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--sm-rss-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm-6.15 32a2.81 2.81 0 112.85-2.81A2.84 2.84 0 0117.85 34zm11.37 0h-4.3a9.79 9.79 0 00-1.25-4.78 9.94 9.94 0 00-8.67-5V20a14.27 14.27 0 019 3.15A14 14 0 0129.22 34zM37 34h-4.59a16.65 16.65 0 00-2.49-8.72A17.49 17.49 0 0015 17.06V12a22 22 0 0122 22z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--sm-tt-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><path d="M36 16.56a9.83 9.83 0 01-2.83.78 4.94 4.94 0 002.16-2.72 9.84 9.84 0 01-3.13 1.19 4.93 4.93 0 00-8.52 3.37 5 5 0 00.13 1.12 14 14 0 01-10.15-5.14 4.93 4.93 0 001.52 6.57 4.9 4.9 0 01-2.18-.62v.06A4.93 4.93 0 0016.91 26a4.9 4.9 0 01-1.3.17 5 5 0 01-.93-.09 4.93 4.93 0 004.6 3.42 9.91 9.91 0 01-7.29 2 14 14 0 0021.57-11.76v-.64A10 10 0 0036 16.56z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--sm-tt-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm9.54 17.11v.64A14 14 0 0112 31.54a9.92 9.92 0 007.29-2 4.93 4.93 0 01-4.6-3.42 5 5 0 00.93.09 4.9 4.9 0 001.3-.17A4.93 4.93 0 0113 21.17v-.06a4.9 4.9 0 002.23.62 4.93 4.93 0 01-1.52-6.57 14 14 0 0010.15 5.14 5 5 0 01-.13-1.12 4.93 4.93 0 018.52-3.37 9.83 9.83 0 003.13-1.19 4.94 4.94 0 01-2.16 2.72 9.83 9.83 0 002.78-.78 10 10 0 01-2.46 2.55z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--sm-yt-def" xmlns="http://www.w3.org/2000/svg"><path d="M32.58 16.83c-1.72-.45-8.59-.45-8.59-.45s-6.75 0-8.46.42a3 3 0 00-2.11 2A26.77 26.77 0 0013 24a26.77 26.77 0 00.42 5.24 3 3 0 002.11 2c1.72.46 8.46.42 8.46.42s6.75 0 8.46-.42a3 3 0 002.08-2A27.91 27.91 0 0035 24a28.42 28.42 0 00-.47-5.24 2.74 2.74 0 00-1.95-1.93zM21.26 27.38v-6.76L26.74 24z"/><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm0 41a19 19 0 1119-19 19 19 0 01-19 19z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--sm-yt-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm10.54 27.24a3 3 0 01-2.08 2c-1.72.45-8.46.42-8.46.42s-6.75 0-8.46-.42a3 3 0 01-2.11-2A26.77 26.77 0 0113 24a26.77 26.77 0 01.42-5.24 3 3 0 012.11-2c1.72-.45 8.46-.42 8.46-.42s6.87 0 8.59.45a2.74 2.74 0 011.94 1.93A28.42 28.42 0 0135 24a27.91 27.91 0 01-.46 5.24z"/><path d="M21.25 27.38l5.5-3.38-5.5-3.38v6.76z"/></symbol>
+		<symbol viewBox="0 0 14 14" id="cd-icon--social-links--facebook" xmlns="http://www.w3.org/2000/svg"><path data-name="svgexport-14" d="M13.411 0H.589A.589.589 0 000 .589v12.822A.586.586 0 00.589 14h6.853V8.746H5.688V6.558h1.754V4.8a2.5 2.5 0 012.756-2.7 15.8 15.8 0 011.621.081v1.901h-1.105c-.884 0-1.091.42-1.091 1.032v1.444h2.188l-.442 2.188H9.623l.037 5.246h3.758A.589.589 0 0014 13.4V.589a.589.589 0 00-.589-.582"/></symbol>
+		<symbol viewBox="0 0 14 14" id="cd-icon--social-links--linkedin" xmlns="http://www.w3.org/2000/svg"><path data-name="Path 530" d="M12.968 0H1.032A1.007 1.007 0 000 1.032v12.01A.993.993 0 001.032 14h11.936A1.007 1.007 0 0014 12.968V1.032A1.007 1.007 0 0012.968 0zM4.274 11.716H2.137V5.379h2.137zM3.168 4.495a1.066 1.066 0 01-1.179-1.106 1.1 1.1 0 011.179-1.105 1.066 1.066 0 011.179 1.105c.074.664-.442 1.106-1.179 1.106zm8.695 7.221H9.726v-3.39c0-.884-.295-1.474-1.105-1.474a1.162 1.162 0 00-1.105.737 1.254 1.254 0 00-.074.516v3.537H5.305V5.305h2.137v.884a2.132 2.132 0 011.916-1.032c1.4 0 2.432.884 2.432 2.874v3.684z"/></symbol>
+		<symbol viewBox="0 0 17.219 14" id="cd-icon--social-links--twitter" xmlns="http://www.w3.org/2000/svg"><path data-name="svgexport-12" d="M14.531 1.141A3.492 3.492 0 0011.95 0a3.539 3.539 0 00-3.539 3.539 7.247 7.247 0 00.063.82A10.078 10.078 0 011.211.633a3.984 3.984 0 00-.508 1.766A3.634 3.634 0 002.281 5.36a3.359 3.359 0 01-1.578-.445v.062a3.555 3.555 0 002.836 3.469 7.632 7.632 0 01-.945.125l-.633-.063a3.547 3.547 0 003.281 2.461A7.469 7.469 0 01.82 12.484L0 12.42A10.086 10.086 0 005.422 14 9.966 9.966 0 0015.45 3.961c.016-.187 0-.336 0-.508a6.781 6.781 0 001.769-1.833 6.552 6.552 0 01-2.031.563A3.414 3.414 0 0016.711.222a7.051 7.051 0 01-2.211.883z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--user" xmlns="http://www.w3.org/2000/svg"><path d="M23 24h2a16 16 0 0116 16v4H7v-4a16 16 0 0116-16z"/><rect x="15" y="4" width="18" height="18" rx="9" ry="9"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--user--white" xmlns="http://www.w3.org/2000/svg"><path fill="#fff" d="M23 24h2a16 16 0 0116 16v4H7v-4a16 16 0 0116-16z"/><rect fill="#fff" x="15" y="4" width="18" height="18" rx="9" ry="9"/></symbol>
+</svg>
+
+<!--
+====================================================================================================
+-->
+
+		<header>
+			<h1>SVG <code>&lt;symbol&gt;</code> sprite preview</h1>
+			<p>This preview features two methods of using the generated sprite in conjunction with inline SVG. Please have a look at the HTML source for further details and be aware of the following constraints:</p>
+			<ul>
+				<li>Your browser has to <a href="http://caniuse.com/#feat=svg-html5" target="_blank" rel="noopener noreferrer">support inline SVG</a> for these techniques to work.</li>
+				<li>The embedded sprite (A) slightly differs from the generated external one. Please <a href="https://github.com/svg-sprite/svg-sprite/blob/1.5.x/docs/configuration.md#defs--symbol-mode" target="_blank" rel="noopener noreferrer">see the documentation</a> for details on how to create such an embeddable sprite.</li>
+				<li>Internet Explorer up to version 11 doesn't support external sprites for use with inline SVG. For IE 9-11, you may polyfill this functionality with <a href="https://github.com/jonathantneal/svg4everybody" target="_blank" rel="noopener noreferrer">SVG for Everybody</a>.</li>
+			</ul>
+		</header>
+		<section>
+
+<!--
+
+A) Inline SVG with embedded sprite
+====================================================================================================
+These SVG images make use of fragment identifiers (IDs) and are extracted out of the inline sprite
+embedded above. They may be styled via CSS.
+
+-->
+
+			<h3>A) Inline SVG with embedded sprite</h3>
+			<ul>
+
+				<li title="cd-icon--about">
+					<div class="icon-box">
+
+						<!-- cd-icon--about -->
+						<svg class="cd-icon--about-dims">
+							<use xlink:href="#cd-icon--about"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--about</h2>
+				</li>
+				<li title="cd-icon--add">
+					<div class="icon-box">
+
+						<!-- cd-icon--add -->
+						<svg class="cd-icon--add-dims">
+							<use xlink:href="#cd-icon--add"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--add</h2>
+				</li>
+				<li title="cd-icon--add--white">
+					<div class="icon-box">
+
+						<!-- cd-icon--add--white -->
+						<svg class="cd-icon--add--white-dims">
+							<use xlink:href="#cd-icon--add--white"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--add--white</h2>
+				</li>
+				<li title="cd-icon--admin">
+					<div class="icon-box">
+
+						<!-- cd-icon--admin -->
+						<svg class="cd-icon--admin-dims">
+							<use xlink:href="#cd-icon--admin"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--admin</h2>
+				</li>
+				<li title="cd-icon--alert">
+					<div class="icon-box">
+
+						<!-- cd-icon--alert -->
+						<svg class="cd-icon--alert-dims">
+							<use xlink:href="#cd-icon--alert"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--alert</h2>
+				</li>
+				<li title="cd-icon--arrow-down">
+					<div class="icon-box">
+
+						<!-- cd-icon--arrow-down -->
+						<svg class="cd-icon--arrow-down-dims">
+							<use xlink:href="#cd-icon--arrow-down"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--arrow-down</h2>
+				</li>
+				<li title="cd-icon--arrow-down--highlighted">
+					<div class="icon-box">
+
+						<!-- cd-icon--arrow-down--highlighted -->
+						<svg class="cd-icon--arrow-down--highlighted-dims">
+							<use xlink:href="#cd-icon--arrow-down--highlighted"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--arrow-down--highlighted</h2>
+				</li>
+				<li title="cd-icon--arrow-left">
+					<div class="icon-box">
+
+						<!-- cd-icon--arrow-left -->
+						<svg class="cd-icon--arrow-left-dims">
+							<use xlink:href="#cd-icon--arrow-left"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--arrow-left</h2>
+				</li>
+				<li title="cd-icon--arrow-right">
+					<div class="icon-box">
+
+						<!-- cd-icon--arrow-right -->
+						<svg class="cd-icon--arrow-right-dims">
+							<use xlink:href="#cd-icon--arrow-right"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--arrow-right</h2>
+				</li>
+				<li title="cd-icon--arrow-up">
+					<div class="icon-box">
+
+						<!-- cd-icon--arrow-up -->
+						<svg class="cd-icon--arrow-up-dims">
+							<use xlink:href="#cd-icon--arrow-up"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--arrow-up</h2>
+				</li>
+				<li title="cd-icon--arrow-up--highlighted">
+					<div class="icon-box">
+
+						<!-- cd-icon--arrow-up--highlighted -->
+						<svg class="cd-icon--arrow-up--highlighted-dims">
+							<use xlink:href="#cd-icon--arrow-up--highlighted"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--arrow-up--highlighted</h2>
+				</li>
+				<li title="cd-icon--cd-icons-sprite">
+					<div class="icon-box">
+
+						<!-- cd-icon--cd-icons-sprite -->
+						<svg class="cd-icon--cd-icons-sprite-dims">
+							<use xlink:href="#cd-icon--cd-icons-sprite"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--cd-icons-sprite</h2>
+				</li>
+				<li title="cd-icon--copyurl">
+					<div class="icon-box">
+
+						<!-- cd-icon--copyurl -->
+						<svg class="cd-icon--copyurl-dims">
+							<use xlink:href="#cd-icon--copyurl"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--copyurl</h2>
+				</li>
+				<li title="cd-icon--creative-commons">
+					<div class="icon-box">
+
+						<!-- cd-icon--creative-commons -->
+						<svg class="cd-icon--creative-commons-dims">
+							<use xlink:href="#cd-icon--creative-commons"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--creative-commons</h2>
+				</li>
+				<li title="cd-icon--education">
+					<div class="icon-box">
+
+						<!-- cd-icon--education -->
+						<svg class="cd-icon--education-dims">
+							<use xlink:href="#cd-icon--education"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--education</h2>
+				</li>
+				<li title="cd-icon--expand-left">
+					<div class="icon-box">
+
+						<!-- cd-icon--expand-left -->
+						<svg class="cd-icon--expand-left-dims">
+							<use xlink:href="#cd-icon--expand-left"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--expand-left</h2>
+				</li>
+				<li title="cd-icon--expand-right">
+					<div class="icon-box">
+
+						<!-- cd-icon--expand-right -->
+						<svg class="cd-icon--expand-right-dims">
+							<use xlink:href="#cd-icon--expand-right"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--expand-right</h2>
+				</li>
+				<li title="cd-icon--external-link">
+					<div class="icon-box">
+
+						<!-- cd-icon--external-link -->
+						<svg class="cd-icon--external-link-dims">
+							<use xlink:href="#cd-icon--external-link"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--external-link</h2>
+				</li>
+				<li title="cd-icon--form-error">
+					<div class="icon-box">
+
+						<!-- cd-icon--form-error -->
+						<svg class="cd-icon--form-error-dims">
+							<use xlink:href="#cd-icon--form-error"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--form-error</h2>
+				</li>
+				<li title="cd-icon--form-required">
+					<div class="icon-box">
+
+						<!-- cd-icon--form-required -->
+						<svg class="cd-icon--form-required-dims">
+							<use xlink:href="#cd-icon--form-required"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--form-required</h2>
+				</li>
+				<li title="cd-icon--help">
+					<div class="icon-box">
+
+						<!-- cd-icon--help -->
+						<svg class="cd-icon--help-dims">
+							<use xlink:href="#cd-icon--help"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--help</h2>
+				</li>
+				<li title="cd-icon--ocha-logo">
+					<div class="icon-box">
+
+						<!-- cd-icon--ocha-logo -->
+						<svg class="cd-icon--ocha-logo-dims">
+							<use xlink:href="#cd-icon--ocha-logo"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--ocha-logo</h2>
+				</li>
+				<li title="cd-icon--pdf">
+					<div class="icon-box">
+
+						<!-- cd-icon--pdf -->
+						<svg class="cd-icon--pdf-dims">
+							<use xlink:href="#cd-icon--pdf"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--pdf</h2>
+				</li>
+				<li title="cd-icon--search">
+					<div class="icon-box">
+
+						<!-- cd-icon--search -->
+						<svg class="cd-icon--search-dims">
+							<use xlink:href="#cd-icon--search"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--search</h2>
+				</li>
+				<li title="cd-icon--selected">
+					<div class="icon-box">
+
+						<!-- cd-icon--selected -->
+						<svg class="cd-icon--selected-dims">
+							<use xlink:href="#cd-icon--selected"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--selected</h2>
+				</li>
+				<li title="cd-icon--selected--highlighted">
+					<div class="icon-box">
+
+						<!-- cd-icon--selected--highlighted -->
+						<svg class="cd-icon--selected--highlighted-dims">
+							<use xlink:href="#cd-icon--selected--highlighted"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--selected--highlighted</h2>
+				</li>
+				<li title="cd-icon--sm-fb-def">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-fb-def -->
+						<svg class="cd-icon--sm-fb-def-dims">
+							<use xlink:href="#cd-icon--sm-fb-def"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-fb-def</h2>
+				</li>
+				<li title="cd-icon--sm-fb-full">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-fb-full -->
+						<svg class="cd-icon--sm-fb-full-dims">
+							<use xlink:href="#cd-icon--sm-fb-full"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-fb-full</h2>
+				</li>
+				<li title="cd-icon--sm-gh-def">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-gh-def -->
+						<svg class="cd-icon--sm-gh-def-dims">
+							<use xlink:href="#cd-icon--sm-gh-def"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-gh-def</h2>
+				</li>
+				<li title="cd-icon--sm-gh-full">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-gh-full -->
+						<svg class="cd-icon--sm-gh-full-dims">
+							<use xlink:href="#cd-icon--sm-gh-full"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-gh-full</h2>
+				</li>
+				<li title="cd-icon--sm-ig-def">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-ig-def -->
+						<svg class="cd-icon--sm-ig-def-dims">
+							<use xlink:href="#cd-icon--sm-ig-def"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-ig-def</h2>
+				</li>
+				<li title="cd-icon--sm-ig-full">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-ig-full -->
+						<svg class="cd-icon--sm-ig-full-dims">
+							<use xlink:href="#cd-icon--sm-ig-full"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-ig-full</h2>
+				</li>
+				<li title="cd-icon--sm-ln-def">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-ln-def -->
+						<svg class="cd-icon--sm-ln-def-dims">
+							<use xlink:href="#cd-icon--sm-ln-def"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-ln-def</h2>
+				</li>
+				<li title="cd-icon--sm-ln-full">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-ln-full -->
+						<svg class="cd-icon--sm-ln-full-dims">
+							<use xlink:href="#cd-icon--sm-ln-full"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-ln-full</h2>
+				</li>
+				<li title="cd-icon--sm-rss-def">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-rss-def -->
+						<svg class="cd-icon--sm-rss-def-dims">
+							<use xlink:href="#cd-icon--sm-rss-def"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-rss-def</h2>
+				</li>
+				<li title="cd-icon--sm-rss-full">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-rss-full -->
+						<svg class="cd-icon--sm-rss-full-dims">
+							<use xlink:href="#cd-icon--sm-rss-full"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-rss-full</h2>
+				</li>
+				<li title="cd-icon--sm-tt-def">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-tt-def -->
+						<svg class="cd-icon--sm-tt-def-dims">
+							<use xlink:href="#cd-icon--sm-tt-def"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-tt-def</h2>
+				</li>
+				<li title="cd-icon--sm-tt-full">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-tt-full -->
+						<svg class="cd-icon--sm-tt-full-dims">
+							<use xlink:href="#cd-icon--sm-tt-full"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-tt-full</h2>
+				</li>
+				<li title="cd-icon--sm-yt-def">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-yt-def -->
+						<svg class="cd-icon--sm-yt-def-dims">
+							<use xlink:href="#cd-icon--sm-yt-def"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-yt-def</h2>
+				</li>
+				<li title="cd-icon--sm-yt-full">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-yt-full -->
+						<svg class="cd-icon--sm-yt-full-dims">
+							<use xlink:href="#cd-icon--sm-yt-full"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-yt-full</h2>
+				</li>
+				<li title="cd-icon--social-links--facebook">
+					<div class="icon-box">
+
+						<!-- cd-icon--social-links--facebook -->
+						<svg class="cd-icon--social-links--facebook-dims">
+							<use xlink:href="#cd-icon--social-links--facebook"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--social-links--facebook</h2>
+				</li>
+				<li title="cd-icon--social-links--linkedin">
+					<div class="icon-box">
+
+						<!-- cd-icon--social-links--linkedin -->
+						<svg class="cd-icon--social-links--linkedin-dims">
+							<use xlink:href="#cd-icon--social-links--linkedin"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--social-links--linkedin</h2>
+				</li>
+				<li title="cd-icon--social-links--twitter">
+					<div class="icon-box">
+
+						<!-- cd-icon--social-links--twitter -->
+						<svg class="cd-icon--social-links--twitter-dims">
+							<use xlink:href="#cd-icon--social-links--twitter"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--social-links--twitter</h2>
+				</li>
+				<li title="cd-icon--user">
+					<div class="icon-box">
+
+						<!-- cd-icon--user -->
+						<svg class="cd-icon--user-dims">
+							<use xlink:href="#cd-icon--user"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--user</h2>
+				</li>
+				<li title="cd-icon--user--white">
+					<div class="icon-box">
+
+						<!-- cd-icon--user--white -->
+						<svg class="cd-icon--user--white-dims">
+							<use xlink:href="#cd-icon--user--white"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--user--white</h2>
+				</li>
+			</ul>
+
+<!--
+====================================================================================================
+-->
+
+		</section>
+		<section>
+
+<!--
+
+B) Inline SVG with external sprite (IE 9-11 with polyfill only)
+====================================================================================================
+These SVG images make use of an URL + fragment identifiers (IDs) and refer to the regular external
+SVG sprite. They may be styled via CSS. (IE 9-11 with polyfill only)
+
+-->
+
+			<h3>B) Inline SVG with external sprite (IE 9-11 with polyfill only)</h3>
+			<ul>
+
+				<li title="cd-icon--about">
+					<div class="icon-box">
+
+						<!-- cd-icon--about -->
+						<svg class="cd-icon--about-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--about"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--about</h2>
+				</li>
+				<li title="cd-icon--add">
+					<div class="icon-box">
+
+						<!-- cd-icon--add -->
+						<svg class="cd-icon--add-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--add"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--add</h2>
+				</li>
+				<li title="cd-icon--add--white">
+					<div class="icon-box">
+
+						<!-- cd-icon--add--white -->
+						<svg class="cd-icon--add--white-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--add--white"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--add--white</h2>
+				</li>
+				<li title="cd-icon--admin">
+					<div class="icon-box">
+
+						<!-- cd-icon--admin -->
+						<svg class="cd-icon--admin-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--admin"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--admin</h2>
+				</li>
+				<li title="cd-icon--alert">
+					<div class="icon-box">
+
+						<!-- cd-icon--alert -->
+						<svg class="cd-icon--alert-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--alert"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--alert</h2>
+				</li>
+				<li title="cd-icon--arrow-down">
+					<div class="icon-box">
+
+						<!-- cd-icon--arrow-down -->
+						<svg class="cd-icon--arrow-down-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--arrow-down"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--arrow-down</h2>
+				</li>
+				<li title="cd-icon--arrow-down--highlighted">
+					<div class="icon-box">
+
+						<!-- cd-icon--arrow-down--highlighted -->
+						<svg class="cd-icon--arrow-down--highlighted-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--arrow-down--highlighted"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--arrow-down--highlighted</h2>
+				</li>
+				<li title="cd-icon--arrow-left">
+					<div class="icon-box">
+
+						<!-- cd-icon--arrow-left -->
+						<svg class="cd-icon--arrow-left-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--arrow-left"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--arrow-left</h2>
+				</li>
+				<li title="cd-icon--arrow-right">
+					<div class="icon-box">
+
+						<!-- cd-icon--arrow-right -->
+						<svg class="cd-icon--arrow-right-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--arrow-right"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--arrow-right</h2>
+				</li>
+				<li title="cd-icon--arrow-up">
+					<div class="icon-box">
+
+						<!-- cd-icon--arrow-up -->
+						<svg class="cd-icon--arrow-up-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--arrow-up"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--arrow-up</h2>
+				</li>
+				<li title="cd-icon--arrow-up--highlighted">
+					<div class="icon-box">
+
+						<!-- cd-icon--arrow-up--highlighted -->
+						<svg class="cd-icon--arrow-up--highlighted-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--arrow-up--highlighted"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--arrow-up--highlighted</h2>
+				</li>
+				<li title="cd-icon--cd-icons-sprite">
+					<div class="icon-box">
+
+						<!-- cd-icon--cd-icons-sprite -->
+						<svg class="cd-icon--cd-icons-sprite-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--cd-icons-sprite"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--cd-icons-sprite</h2>
+				</li>
+				<li title="cd-icon--copyurl">
+					<div class="icon-box">
+
+						<!-- cd-icon--copyurl -->
+						<svg class="cd-icon--copyurl-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--copyurl"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--copyurl</h2>
+				</li>
+				<li title="cd-icon--creative-commons">
+					<div class="icon-box">
+
+						<!-- cd-icon--creative-commons -->
+						<svg class="cd-icon--creative-commons-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--creative-commons"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--creative-commons</h2>
+				</li>
+				<li title="cd-icon--education">
+					<div class="icon-box">
+
+						<!-- cd-icon--education -->
+						<svg class="cd-icon--education-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--education"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--education</h2>
+				</li>
+				<li title="cd-icon--expand-left">
+					<div class="icon-box">
+
+						<!-- cd-icon--expand-left -->
+						<svg class="cd-icon--expand-left-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--expand-left"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--expand-left</h2>
+				</li>
+				<li title="cd-icon--expand-right">
+					<div class="icon-box">
+
+						<!-- cd-icon--expand-right -->
+						<svg class="cd-icon--expand-right-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--expand-right"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--expand-right</h2>
+				</li>
+				<li title="cd-icon--external-link">
+					<div class="icon-box">
+
+						<!-- cd-icon--external-link -->
+						<svg class="cd-icon--external-link-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--external-link"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--external-link</h2>
+				</li>
+				<li title="cd-icon--form-error">
+					<div class="icon-box">
+
+						<!-- cd-icon--form-error -->
+						<svg class="cd-icon--form-error-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--form-error"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--form-error</h2>
+				</li>
+				<li title="cd-icon--form-required">
+					<div class="icon-box">
+
+						<!-- cd-icon--form-required -->
+						<svg class="cd-icon--form-required-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--form-required"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--form-required</h2>
+				</li>
+				<li title="cd-icon--help">
+					<div class="icon-box">
+
+						<!-- cd-icon--help -->
+						<svg class="cd-icon--help-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--help"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--help</h2>
+				</li>
+				<li title="cd-icon--ocha-logo">
+					<div class="icon-box">
+
+						<!-- cd-icon--ocha-logo -->
+						<svg class="cd-icon--ocha-logo-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--ocha-logo"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--ocha-logo</h2>
+				</li>
+				<li title="cd-icon--pdf">
+					<div class="icon-box">
+
+						<!-- cd-icon--pdf -->
+						<svg class="cd-icon--pdf-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--pdf"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--pdf</h2>
+				</li>
+				<li title="cd-icon--search">
+					<div class="icon-box">
+
+						<!-- cd-icon--search -->
+						<svg class="cd-icon--search-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--search"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--search</h2>
+				</li>
+				<li title="cd-icon--selected">
+					<div class="icon-box">
+
+						<!-- cd-icon--selected -->
+						<svg class="cd-icon--selected-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--selected"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--selected</h2>
+				</li>
+				<li title="cd-icon--selected--highlighted">
+					<div class="icon-box">
+
+						<!-- cd-icon--selected--highlighted -->
+						<svg class="cd-icon--selected--highlighted-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--selected--highlighted"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--selected--highlighted</h2>
+				</li>
+				<li title="cd-icon--sm-fb-def">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-fb-def -->
+						<svg class="cd-icon--sm-fb-def-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--sm-fb-def"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-fb-def</h2>
+				</li>
+				<li title="cd-icon--sm-fb-full">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-fb-full -->
+						<svg class="cd-icon--sm-fb-full-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--sm-fb-full"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-fb-full</h2>
+				</li>
+				<li title="cd-icon--sm-gh-def">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-gh-def -->
+						<svg class="cd-icon--sm-gh-def-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--sm-gh-def"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-gh-def</h2>
+				</li>
+				<li title="cd-icon--sm-gh-full">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-gh-full -->
+						<svg class="cd-icon--sm-gh-full-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--sm-gh-full"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-gh-full</h2>
+				</li>
+				<li title="cd-icon--sm-ig-def">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-ig-def -->
+						<svg class="cd-icon--sm-ig-def-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--sm-ig-def"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-ig-def</h2>
+				</li>
+				<li title="cd-icon--sm-ig-full">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-ig-full -->
+						<svg class="cd-icon--sm-ig-full-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--sm-ig-full"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-ig-full</h2>
+				</li>
+				<li title="cd-icon--sm-ln-def">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-ln-def -->
+						<svg class="cd-icon--sm-ln-def-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--sm-ln-def"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-ln-def</h2>
+				</li>
+				<li title="cd-icon--sm-ln-full">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-ln-full -->
+						<svg class="cd-icon--sm-ln-full-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--sm-ln-full"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-ln-full</h2>
+				</li>
+				<li title="cd-icon--sm-rss-def">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-rss-def -->
+						<svg class="cd-icon--sm-rss-def-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--sm-rss-def"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-rss-def</h2>
+				</li>
+				<li title="cd-icon--sm-rss-full">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-rss-full -->
+						<svg class="cd-icon--sm-rss-full-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--sm-rss-full"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-rss-full</h2>
+				</li>
+				<li title="cd-icon--sm-tt-def">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-tt-def -->
+						<svg class="cd-icon--sm-tt-def-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--sm-tt-def"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-tt-def</h2>
+				</li>
+				<li title="cd-icon--sm-tt-full">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-tt-full -->
+						<svg class="cd-icon--sm-tt-full-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--sm-tt-full"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-tt-full</h2>
+				</li>
+				<li title="cd-icon--sm-yt-def">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-yt-def -->
+						<svg class="cd-icon--sm-yt-def-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--sm-yt-def"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-yt-def</h2>
+				</li>
+				<li title="cd-icon--sm-yt-full">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-yt-full -->
+						<svg class="cd-icon--sm-yt-full-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--sm-yt-full"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-yt-full</h2>
+				</li>
+				<li title="cd-icon--social-links--facebook">
+					<div class="icon-box">
+
+						<!-- cd-icon--social-links--facebook -->
+						<svg class="cd-icon--social-links--facebook-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--social-links--facebook"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--social-links--facebook</h2>
+				</li>
+				<li title="cd-icon--social-links--linkedin">
+					<div class="icon-box">
+
+						<!-- cd-icon--social-links--linkedin -->
+						<svg class="cd-icon--social-links--linkedin-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--social-links--linkedin"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--social-links--linkedin</h2>
+				</li>
+				<li title="cd-icon--social-links--twitter">
+					<div class="icon-box">
+
+						<!-- cd-icon--social-links--twitter -->
+						<svg class="cd-icon--social-links--twitter-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--social-links--twitter"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--social-links--twitter</h2>
+				</li>
+				<li title="cd-icon--user">
+					<div class="icon-box">
+
+						<!-- cd-icon--user -->
+						<svg class="cd-icon--user-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--user"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--user</h2>
+				</li>
+				<li title="cd-icon--user--white">
+					<div class="icon-box">
+
+						<!-- cd-icon--user--white -->
+						<svg class="cd-icon--user--white-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--user--white"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--user--white</h2>
+				</li>
+			</ul>
+
+<!--
+====================================================================================================
+-->
+
+		</section>
+		<footer>
+			<p>Generated at Wed, 09 Mar 2022 09:08:17 GMT by <a href="https://github.com/svg-sprite/svg-sprite" target="_blank" rel="noopener noreferrer">svg-sprite</a>.</p>
+		</footer>
+	</body>
+</html>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/user--white.svg b/html/themes/custom/common_design_subtheme/img/icons/user--white.svg
new file mode 100644
index 000000000..967ec00a6
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/user--white.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path fill="#ffffff" d="M23,24h2A16,16,0,0,1,41,40v4a0,0,0,0,1,0,0H7a0,0,0,0,1,0,0V40A16,16,0,0,1,23,24Z"/><rect fill="#ffffff" x="15" y="4" width="18" height="18" rx="9" ry="9"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/user.svg b/html/themes/custom/common_design_subtheme/img/icons/user.svg
new file mode 100644
index 000000000..4df6870ba
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/user.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M23,24h2A16,16,0,0,1,41,40v4a0,0,0,0,1,0,0H7a0,0,0,0,1,0,0V40A16,16,0,0,1,23,24Z"/><rect x="15" y="4" width="18" height="18" rx="9" ry="9"/></svg>

From e803fa958a5cbbf3745df2f8d56105aaab24d50b Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 9 Mar 2022 11:50:54 +0100
Subject: [PATCH 570/720] RW-405 add nvm with recent node version from base
 theme to sub theme

---
 html/themes/custom/common_design_subtheme/.nvmrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/.nvmrc b/html/themes/custom/common_design_subtheme/.nvmrc
index e68b86038..23d9c36a1 100644
--- a/html/themes/custom/common_design_subtheme/.nvmrc
+++ b/html/themes/custom/common_design_subtheme/.nvmrc
@@ -1 +1 @@
-12.21.0
+16.13.2

From ce82ca1cb765199293be81405593d7c7f23d0503 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 9 Mar 2022 11:51:46 +0100
Subject: [PATCH 571/720] RW-405 regenerate lock

---
 .../common_design_subtheme/package-lock.json  | 12407 +++++++++++++++-
 1 file changed, 12383 insertions(+), 24 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/package-lock.json b/html/themes/custom/common_design_subtheme/package-lock.json
index b8c12f3d1..e538e1703 100644
--- a/html/themes/custom/common_design_subtheme/package-lock.json
+++ b/html/themes/custom/common_design_subtheme/package-lock.json
@@ -1,8 +1,12361 @@
 {
   "name": "common-design",
   "version": "5.0.2",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
   "requires": true,
+  "packages": {
+    "": {
+      "name": "common-design",
+      "version": "5.0.2",
+      "license": "GPL-2.0",
+      "dependencies": {
+        "autoprefixer": "^10.2.5",
+        "eslint": "^7.23.0",
+        "postcss": "^8.4.4",
+        "postcss-cli": "^8.3.1",
+        "sass": "^1.32.8",
+        "stylelint": "^14.3.0",
+        "stylelint-config-recommended-scss": "^5.0.2",
+        "stylelint-config-standard": "^24.0.0",
+        "stylelint-config-standard-scss": "^3.0.0",
+        "stylelint-order": "^4.1.0",
+        "stylelint-scss": "^3.19.0"
+      },
+      "devDependencies": {
+        "@babel/preset-env": "^7.13.10",
+        "@xmldom/xmldom": "^0.7.5",
+        "axios": ">=0.21.2",
+        "babel-jest": "^26.6.3",
+        "core-js": "^3.20.0",
+        "css-what": ">=5.0.1",
+        "jest": "^26.6.3",
+        "jest-puppeteer": "^5.0.3",
+        "json-schema": ">=0.4.0",
+        "minimist": "^1.2.5",
+        "nth-check": ">=2.0.1",
+        "puppeteer": "^9.1.1",
+        "set-value": ">=4.0.1",
+        "svg-sprite": "^1.5.0",
+        "trim": ">=0.0.3",
+        "trim-newlines": "^4.0.2",
+        "yargs-parser": "^18.1.3"
+      },
+      "engines": {
+        "node": "^16.13.2",
+        "npm": "^8.1.2"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.14.5.tgz",
+      "integrity": "sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==",
+      "dependencies": {
+        "@babel/highlight": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/compat-data": {
+      "version": "7.15.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz",
+      "integrity": "sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/core": {
+      "version": "7.15.5",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.5.tgz",
+      "integrity": "sha512-pYgXxiwAgQpgM1bNkZsDEq85f0ggXMA5L7c+o3tskGMh2BunCI9QUwB9Z4jpvXUOuMdyGKiGKQiRe11VS6Jzvg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.14.5",
+        "@babel/generator": "^7.15.4",
+        "@babel/helper-compilation-targets": "^7.15.4",
+        "@babel/helper-module-transforms": "^7.15.4",
+        "@babel/helpers": "^7.15.4",
+        "@babel/parser": "^7.15.5",
+        "@babel/template": "^7.15.4",
+        "@babel/traverse": "^7.15.4",
+        "@babel/types": "^7.15.4",
+        "convert-source-map": "^1.7.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.1.2",
+        "semver": "^6.3.0",
+        "source-map": "^0.5.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@babel/generator": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.4.tgz",
+      "integrity": "sha512-d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.15.4",
+        "jsesc": "^2.5.1",
+        "source-map": "^0.5.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-annotate-as-pure": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz",
+      "integrity": "sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.15.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz",
+      "integrity": "sha512-P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-explode-assignable-expression": "^7.15.4",
+        "@babel/types": "^7.15.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz",
+      "integrity": "sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.15.0",
+        "@babel/helper-validator-option": "^7.14.5",
+        "browserslist": "^4.16.6",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-create-class-features-plugin": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz",
+      "integrity": "sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.15.4",
+        "@babel/helper-function-name": "^7.15.4",
+        "@babel/helper-member-expression-to-functions": "^7.15.4",
+        "@babel/helper-optimise-call-expression": "^7.15.4",
+        "@babel/helper-replace-supers": "^7.15.4",
+        "@babel/helper-split-export-declaration": "^7.15.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-create-regexp-features-plugin": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz",
+      "integrity": "sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.14.5",
+        "regexpu-core": "^4.7.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-define-polyfill-provider": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz",
+      "integrity": "sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-compilation-targets": "^7.13.0",
+        "@babel/helper-module-imports": "^7.12.13",
+        "@babel/helper-plugin-utils": "^7.13.0",
+        "@babel/traverse": "^7.13.0",
+        "debug": "^4.1.1",
+        "lodash.debounce": "^4.0.8",
+        "resolve": "^1.14.2",
+        "semver": "^6.1.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.4.0-0"
+      }
+    },
+    "node_modules/@babel/helper-explode-assignable-expression": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz",
+      "integrity": "sha512-J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.15.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-function-name": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz",
+      "integrity": "sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-get-function-arity": "^7.15.4",
+        "@babel/template": "^7.15.4",
+        "@babel/types": "^7.15.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-get-function-arity": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz",
+      "integrity": "sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.15.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-hoist-variables": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz",
+      "integrity": "sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.15.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-member-expression-to-functions": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz",
+      "integrity": "sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.15.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz",
+      "integrity": "sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.15.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.4.tgz",
+      "integrity": "sha512-9fHHSGE9zTC++KuXLZcB5FKgvlV83Ox+NLUmQTawovwlJ85+QMhk1CnVk406CQVj97LaWod6KVjl2Sfgw9Aktw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.15.4",
+        "@babel/helper-replace-supers": "^7.15.4",
+        "@babel/helper-simple-access": "^7.15.4",
+        "@babel/helper-split-export-declaration": "^7.15.4",
+        "@babel/helper-validator-identifier": "^7.14.9",
+        "@babel/template": "^7.15.4",
+        "@babel/traverse": "^7.15.4",
+        "@babel/types": "^7.15.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-optimise-call-expression": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz",
+      "integrity": "sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.15.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz",
+      "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-remap-async-to-generator": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz",
+      "integrity": "sha512-v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.15.4",
+        "@babel/helper-wrap-function": "^7.15.4",
+        "@babel/types": "^7.15.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-replace-supers": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz",
+      "integrity": "sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-member-expression-to-functions": "^7.15.4",
+        "@babel/helper-optimise-call-expression": "^7.15.4",
+        "@babel/traverse": "^7.15.4",
+        "@babel/types": "^7.15.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-simple-access": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz",
+      "integrity": "sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.15.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz",
+      "integrity": "sha512-BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.15.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-split-export-declaration": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz",
+      "integrity": "sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.15.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz",
+      "integrity": "sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g==",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz",
+      "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-wrap-function": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz",
+      "integrity": "sha512-Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-function-name": "^7.15.4",
+        "@babel/template": "^7.15.4",
+        "@babel/traverse": "^7.15.4",
+        "@babel/types": "^7.15.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz",
+      "integrity": "sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.15.4",
+        "@babel/traverse": "^7.15.4",
+        "@babel/types": "^7.15.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz",
+      "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==",
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.14.5",
+        "chalk": "^2.0.0",
+        "js-tokens": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
+    "node_modules/@babel/highlight/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.15.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.5.tgz",
+      "integrity": "sha512-2hQstc6I7T6tQsWzlboMh3SgMRPaS4H6H7cPQsJkdzTzEGqQrpLDsE2BGASU5sBPoEQyHzeqU6C8uKbFeEk6sg==",
+      "dev": true,
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4.tgz",
+      "integrity": "sha512-eBnpsl9tlhPhpI10kU06JHnrYXwg3+V6CaP2idsCXNef0aeslpqyITXQ74Vfk5uHgY7IG7XP0yIH8b42KSzHog==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.15.4",
+        "@babel/plugin-proposal-optional-chaining": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.13.0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-async-generator-functions": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.4.tgz",
+      "integrity": "sha512-2zt2g5vTXpMC3OmK6uyjvdXptbhBXfA77XGrd3gh93zwG8lZYBLOBImiGBEG0RANu3JqKEACCz5CGk73OJROBw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-remap-async-to-generator": "^7.15.4",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-class-properties": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz",
+      "integrity": "sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-class-static-block": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.15.4.tgz",
+      "integrity": "sha512-M682XWrrLNk3chXCjoPUQWOyYsB93B9z3mRyjtqqYJWDf2mfCdIYgDrA11cgNVhAQieaq6F2fn2f3wI0U4aTjA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.15.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.12.0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-dynamic-import": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz",
+      "integrity": "sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-export-namespace-from": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz",
+      "integrity": "sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-json-strings": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz",
+      "integrity": "sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz",
+      "integrity": "sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz",
+      "integrity": "sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-numeric-separator": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz",
+      "integrity": "sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-object-rest-spread": {
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz",
+      "integrity": "sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.14.7",
+        "@babel/helper-compilation-targets": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-optional-catch-binding": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz",
+      "integrity": "sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-optional-chaining": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz",
+      "integrity": "sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-private-methods": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz",
+      "integrity": "sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-private-property-in-object": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.15.4.tgz",
+      "integrity": "sha512-X0UTixkLf0PCCffxgu5/1RQyGGbgZuKoI+vXP4iSbJSYwPb7hu06omsFGBvQ9lJEvwgrxHdS8B5nbfcd8GyUNA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.15.4",
+        "@babel/helper-create-class-features-plugin": "^7.15.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-unicode-property-regex": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz",
+      "integrity": "sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-bigint": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-dynamic-import": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-export-namespace-from": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-arrow-functions": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz",
+      "integrity": "sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-async-to-generator": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz",
+      "integrity": "sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-remap-async-to-generator": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-block-scoped-functions": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz",
+      "integrity": "sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-block-scoping": {
+      "version": "7.15.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz",
+      "integrity": "sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-classes": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz",
+      "integrity": "sha512-Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.15.4",
+        "@babel/helper-function-name": "^7.15.4",
+        "@babel/helper-optimise-call-expression": "^7.15.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-replace-supers": "^7.15.4",
+        "@babel/helper-split-export-declaration": "^7.15.4",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-computed-properties": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz",
+      "integrity": "sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-destructuring": {
+      "version": "7.14.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz",
+      "integrity": "sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-dotall-regex": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz",
+      "integrity": "sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-duplicate-keys": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz",
+      "integrity": "sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-exponentiation-operator": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz",
+      "integrity": "sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-for-of": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz",
+      "integrity": "sha512-DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-function-name": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz",
+      "integrity": "sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-function-name": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-literals": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz",
+      "integrity": "sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-member-expression-literals": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz",
+      "integrity": "sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-amd": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz",
+      "integrity": "sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-commonjs": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz",
+      "integrity": "sha512-qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.15.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-simple-access": "^7.15.4",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-systemjs": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.15.4.tgz",
+      "integrity": "sha512-fJUnlQrl/mezMneR72CKCgtOoahqGJNVKpompKwzv3BrEXdlPspTcyxrZ1XmDTIr9PpULrgEQo3qNKp6dW7ssw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-hoist-variables": "^7.15.4",
+        "@babel/helper-module-transforms": "^7.15.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-validator-identifier": "^7.14.9",
+        "babel-plugin-dynamic-import-node": "^2.3.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-modules-umd": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz",
+      "integrity": "sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-module-transforms": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
+      "version": "7.14.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz",
+      "integrity": "sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-new-target": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz",
+      "integrity": "sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-object-super": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz",
+      "integrity": "sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-replace-supers": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-parameters": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz",
+      "integrity": "sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-property-literals": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz",
+      "integrity": "sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-regenerator": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz",
+      "integrity": "sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==",
+      "dev": true,
+      "dependencies": {
+        "regenerator-transform": "^0.14.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-reserved-words": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz",
+      "integrity": "sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-shorthand-properties": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz",
+      "integrity": "sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-spread": {
+      "version": "7.14.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz",
+      "integrity": "sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-sticky-regex": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz",
+      "integrity": "sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-template-literals": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz",
+      "integrity": "sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-typeof-symbol": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz",
+      "integrity": "sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-escapes": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz",
+      "integrity": "sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-regex": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz",
+      "integrity": "sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.14.5",
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/preset-env": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.4.tgz",
+      "integrity": "sha512-4f2nLw+q6ht8gl3sHCmNhmA5W6b1ItLzbH3UrKuJxACHr2eCpk96jwjrAfCAaXaaVwTQGnyUYHY2EWXJGt7TUQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.15.0",
+        "@babel/helper-compilation-targets": "^7.15.4",
+        "@babel/helper-plugin-utils": "^7.14.5",
+        "@babel/helper-validator-option": "^7.14.5",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.15.4",
+        "@babel/plugin-proposal-async-generator-functions": "^7.15.4",
+        "@babel/plugin-proposal-class-properties": "^7.14.5",
+        "@babel/plugin-proposal-class-static-block": "^7.15.4",
+        "@babel/plugin-proposal-dynamic-import": "^7.14.5",
+        "@babel/plugin-proposal-export-namespace-from": "^7.14.5",
+        "@babel/plugin-proposal-json-strings": "^7.14.5",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5",
+        "@babel/plugin-proposal-numeric-separator": "^7.14.5",
+        "@babel/plugin-proposal-object-rest-spread": "^7.14.7",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.14.5",
+        "@babel/plugin-proposal-optional-chaining": "^7.14.5",
+        "@babel/plugin-proposal-private-methods": "^7.14.5",
+        "@babel/plugin-proposal-private-property-in-object": "^7.15.4",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.14.5",
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5",
+        "@babel/plugin-transform-arrow-functions": "^7.14.5",
+        "@babel/plugin-transform-async-to-generator": "^7.14.5",
+        "@babel/plugin-transform-block-scoped-functions": "^7.14.5",
+        "@babel/plugin-transform-block-scoping": "^7.15.3",
+        "@babel/plugin-transform-classes": "^7.15.4",
+        "@babel/plugin-transform-computed-properties": "^7.14.5",
+        "@babel/plugin-transform-destructuring": "^7.14.7",
+        "@babel/plugin-transform-dotall-regex": "^7.14.5",
+        "@babel/plugin-transform-duplicate-keys": "^7.14.5",
+        "@babel/plugin-transform-exponentiation-operator": "^7.14.5",
+        "@babel/plugin-transform-for-of": "^7.15.4",
+        "@babel/plugin-transform-function-name": "^7.14.5",
+        "@babel/plugin-transform-literals": "^7.14.5",
+        "@babel/plugin-transform-member-expression-literals": "^7.14.5",
+        "@babel/plugin-transform-modules-amd": "^7.14.5",
+        "@babel/plugin-transform-modules-commonjs": "^7.15.4",
+        "@babel/plugin-transform-modules-systemjs": "^7.15.4",
+        "@babel/plugin-transform-modules-umd": "^7.14.5",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.9",
+        "@babel/plugin-transform-new-target": "^7.14.5",
+        "@babel/plugin-transform-object-super": "^7.14.5",
+        "@babel/plugin-transform-parameters": "^7.15.4",
+        "@babel/plugin-transform-property-literals": "^7.14.5",
+        "@babel/plugin-transform-regenerator": "^7.14.5",
+        "@babel/plugin-transform-reserved-words": "^7.14.5",
+        "@babel/plugin-transform-shorthand-properties": "^7.14.5",
+        "@babel/plugin-transform-spread": "^7.14.6",
+        "@babel/plugin-transform-sticky-regex": "^7.14.5",
+        "@babel/plugin-transform-template-literals": "^7.14.5",
+        "@babel/plugin-transform-typeof-symbol": "^7.14.5",
+        "@babel/plugin-transform-unicode-escapes": "^7.14.5",
+        "@babel/plugin-transform-unicode-regex": "^7.14.5",
+        "@babel/preset-modules": "^0.1.4",
+        "@babel/types": "^7.15.4",
+        "babel-plugin-polyfill-corejs2": "^0.2.2",
+        "babel-plugin-polyfill-corejs3": "^0.2.2",
+        "babel-plugin-polyfill-regenerator": "^0.2.2",
+        "core-js-compat": "^3.16.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/preset-modules": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
+      "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+        "@babel/plugin-transform-dotall-regex": "^7.4.4",
+        "@babel/types": "^7.4.4",
+        "esutils": "^2.0.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/runtime": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz",
+      "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==",
+      "dev": true,
+      "dependencies": {
+        "regenerator-runtime": "^0.13.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/template": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz",
+      "integrity": "sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.14.5",
+        "@babel/parser": "^7.15.4",
+        "@babel/types": "^7.15.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz",
+      "integrity": "sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.14.5",
+        "@babel/generator": "^7.15.4",
+        "@babel/helper-function-name": "^7.15.4",
+        "@babel/helper-hoist-variables": "^7.15.4",
+        "@babel/helper-split-export-declaration": "^7.15.4",
+        "@babel/parser": "^7.15.4",
+        "@babel/types": "^7.15.4",
+        "debug": "^4.1.0",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.15.4",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.4.tgz",
+      "integrity": "sha512-0f1HJFuGmmbrKTCZtbm3cU+b/AqdEYk5toj5iQur58xkVMlS0JWaKxTBSmCXd47uiN7vbcozAupm6Mvs80GNhw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.14.9",
+        "to-fast-properties": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@bcoe/v8-coverage": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+      "dev": true
+    },
+    "node_modules/@cnakazawa/watch": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",
+      "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==",
+      "dev": true,
+      "dependencies": {
+        "exec-sh": "^0.3.2",
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "watch": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.1.95"
+      }
+    },
+    "node_modules/@dabh/diagnostics": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.2.tgz",
+      "integrity": "sha512-+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q==",
+      "dev": true,
+      "dependencies": {
+        "colorspace": "1.1.x",
+        "enabled": "2.0.x",
+        "kuler": "^2.0.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
+      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.1.1",
+        "espree": "^7.3.0",
+        "globals": "^13.9.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^3.13.1",
+        "minimatch": "^3.0.4",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/globals": {
+      "version": "13.11.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
+      "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@hapi/hoek": {
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.2.0.tgz",
+      "integrity": "sha512-sqKVVVOe5ivCaXDWivIJYVSaEgdQK9ul7a4Kity5Iw7u9+wBAPbX1RMSnLLmp7O4Vzj0WOWwMAJsTL00xwaNug==",
+      "dev": true
+    },
+    "node_modules/@hapi/topo": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
+      "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==",
+      "dev": true,
+      "dependencies": {
+        "@hapi/hoek": "^9.0.0"
+      }
+    },
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
+      "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
+      "dependencies": {
+        "@humanwhocodes/object-schema": "^1.2.0",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz",
+      "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w=="
+    },
+    "node_modules/@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/console": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.6.2.tgz",
+      "integrity": "sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/core": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.6.3.tgz",
+      "integrity": "sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^26.6.2",
+        "@jest/reporters": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "jest-changed-files": "^26.6.2",
+        "jest-config": "^26.6.3",
+        "jest-haste-map": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.6.2",
+        "jest-resolve-dependencies": "^26.6.3",
+        "jest-runner": "^26.6.3",
+        "jest-runtime": "^26.6.3",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "jest-watcher": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "p-each-series": "^2.1.0",
+        "rimraf": "^3.0.0",
+        "slash": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/environment": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.6.2.tgz",
+      "integrity": "sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "jest-mock": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/fake-timers": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.6.2.tgz",
+      "integrity": "sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "@sinonjs/fake-timers": "^6.0.1",
+        "@types/node": "*",
+        "jest-message-util": "^26.6.2",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/globals": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.6.2.tgz",
+      "integrity": "sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "expect": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/reporters": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.6.2.tgz",
+      "integrity": "sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==",
+      "dev": true,
+      "dependencies": {
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jest/console": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "chalk": "^4.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.2",
+        "graceful-fs": "^4.2.4",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-instrument": "^4.0.3",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.0.2",
+        "jest-haste-map": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
+        "slash": "^3.0.0",
+        "source-map": "^0.6.0",
+        "string-length": "^4.0.1",
+        "terminal-link": "^2.0.0",
+        "v8-to-istanbul": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      },
+      "optionalDependencies": {
+        "node-notifier": "^8.0.0"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@jest/source-map": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.6.2.tgz",
+      "integrity": "sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.4",
+        "source-map": "^0.6.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/source-map/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@jest/test-result": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.6.2.tgz",
+      "integrity": "sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/test-sequencer": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz",
+      "integrity": "sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/test-result": "^26.6.2",
+        "graceful-fs": "^4.2.4",
+        "jest-haste-map": "^26.6.2",
+        "jest-runner": "^26.6.3",
+        "jest-runtime": "^26.6.3"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/transform": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.6.2.tgz",
+      "integrity": "sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.1.0",
+        "@jest/types": "^26.6.2",
+        "babel-plugin-istanbul": "^6.0.0",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^1.4.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "graceful-fs": "^4.2.4",
+        "jest-haste-map": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-util": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "pirates": "^4.0.1",
+        "slash": "^3.0.0",
+        "source-map": "^0.6.1",
+        "write-file-atomic": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/transform/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@jest/types": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@nodelib/fs.scandir": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "dependencies": {
+        "@nodelib/fs.stat": "2.0.5",
+        "run-parallel": "^1.1.9"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.stat": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@nodelib/fs.walk": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "dependencies": {
+        "@nodelib/fs.scandir": "2.1.5",
+        "fastq": "^1.6.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/@sideway/address": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.2.tgz",
+      "integrity": "sha512-idTz8ibqWFrPU8kMirL0CoPH/A29XOzzAzpyN3zQ4kAWnzmNfFmRaoMNN6VI8ske5M73HZyhIaW4OuSFIdM4oA==",
+      "dev": true,
+      "dependencies": {
+        "@hapi/hoek": "^9.0.0"
+      }
+    },
+    "node_modules/@sideway/formula": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.0.tgz",
+      "integrity": "sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg==",
+      "dev": true
+    },
+    "node_modules/@sideway/pinpoint": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
+      "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==",
+      "dev": true
+    },
+    "node_modules/@sinonjs/commons": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz",
+      "integrity": "sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==",
+      "dev": true,
+      "dependencies": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "node_modules/@sinonjs/fake-timers": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz",
+      "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==",
+      "dev": true,
+      "dependencies": {
+        "@sinonjs/commons": "^1.7.0"
+      }
+    },
+    "node_modules/@tootallnate/once": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@types/babel__core": {
+      "version": "7.1.16",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.16.tgz",
+      "integrity": "sha512-EAEHtisTMM+KaKwfWdC3oyllIqswlznXCIVCt7/oRNrh+DhgT4UEBNC/jlADNjvw7UnfbcdkGQcPVZ1xYiLcrQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
+      }
+    },
+    "node_modules/@types/babel__generator": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.3.tgz",
+      "integrity": "sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__template": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz",
+      "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__traverse": {
+      "version": "7.14.2",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.2.tgz",
+      "integrity": "sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.3.0"
+      }
+    },
+    "node_modules/@types/graceful-fs": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz",
+      "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/istanbul-lib-coverage": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
+      "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==",
+      "dev": true
+    },
+    "node_modules/@types/istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "*"
+      }
+    },
+    "node_modules/@types/istanbul-reports": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
+      "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-report": "*"
+      }
+    },
+    "node_modules/@types/minimist": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
+      "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="
+    },
+    "node_modules/@types/node": {
+      "version": "16.9.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.9.0.tgz",
+      "integrity": "sha512-nmP+VR4oT0pJUPFbKE4SXj3Yb4Q/kz3M9dSAO1GGMebRKWHQxLfDNmU/yh3xxCJha3N60nQ/JwXWwOE/ZSEVag==",
+      "dev": true
+    },
+    "node_modules/@types/normalize-package-data": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
+      "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw=="
+    },
+    "node_modules/@types/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
+    },
+    "node_modules/@types/prettier": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.3.2.tgz",
+      "integrity": "sha512-eI5Yrz3Qv4KPUa/nSIAi0h+qX0XyewOliug5F2QAtuRg6Kjg6jfmxe1GIwoIRhZspD1A0RP8ANrPwvEXXtRFog==",
+      "dev": true
+    },
+    "node_modules/@types/q": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz",
+      "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==",
+      "dev": true
+    },
+    "node_modules/@types/stack-utils": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz",
+      "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==",
+      "dev": true
+    },
+    "node_modules/@types/yargs": {
+      "version": "15.0.14",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz",
+      "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@types/yargs-parser": {
+      "version": "20.2.1",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz",
+      "integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==",
+      "dev": true
+    },
+    "node_modules/@types/yauzl": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz",
+      "integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@xmldom/xmldom": {
+      "version": "0.7.5",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.7.5.tgz",
+      "integrity": "sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/abab": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
+      "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
+      "dev": true
+    },
+    "node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-globals": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
+      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^7.1.1",
+        "acorn-walk": "^7.1.1"
+      }
+    },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/ajv": {
+      "version": "8.6.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz",
+      "integrity": "sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/ansi-colors": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
+      "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.21.3"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ansi-escapes/node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-union": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arrify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
+    "node_modules/assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/async": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.1.tgz",
+      "integrity": "sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg==",
+      "dev": true
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
+    },
+    "node_modules/at-least-node": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "dev": true,
+      "bin": {
+        "atob": "bin/atob.js"
+      },
+      "engines": {
+        "node": ">= 4.5.0"
+      }
+    },
+    "node_modules/autoprefixer": {
+      "version": "10.3.4",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.3.4.tgz",
+      "integrity": "sha512-EKjKDXOq7ug+jagLzmnoTRpTT0q1KVzEJqrJd0hCBa7FiG0WbFOBCcJCy2QkW1OckpO3qgttA1aWjVbeIPAecw==",
+      "dependencies": {
+        "browserslist": "^4.16.8",
+        "caniuse-lite": "^1.0.30001252",
+        "colorette": "^1.3.0",
+        "fraction.js": "^4.1.1",
+        "normalize-range": "^0.1.2",
+        "postcss-value-parser": "^4.1.0"
+      },
+      "bin": {
+        "autoprefixer": "bin/autoprefixer"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/aws4": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
+      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==",
+      "dev": true
+    },
+    "node_modules/axios": {
+      "version": "0.21.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
+      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
+      "dev": true,
+      "dependencies": {
+        "follow-redirects": "^1.14.0"
+      }
+    },
+    "node_modules/babel-jest": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.3.tgz",
+      "integrity": "sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/babel__core": "^7.1.7",
+        "babel-plugin-istanbul": "^6.0.0",
+        "babel-preset-jest": "^26.6.2",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/babel-plugin-dynamic-import-node": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
+      "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
+      "dev": true,
+      "dependencies": {
+        "object.assign": "^4.1.0"
+      }
+    },
+    "node_modules/babel-plugin-istanbul": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz",
+      "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^4.0.0",
+        "test-exclude": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-plugin-jest-hoist": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz",
+      "integrity": "sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/template": "^7.3.3",
+        "@babel/types": "^7.3.3",
+        "@types/babel__core": "^7.0.0",
+        "@types/babel__traverse": "^7.0.6"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs2": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz",
+      "integrity": "sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.13.11",
+        "@babel/helper-define-polyfill-provider": "^0.2.2",
+        "semver": "^6.1.1"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs3": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.4.tgz",
+      "integrity": "sha512-z3HnJE5TY/j4EFEa/qpQMSbcUJZ5JQi+3UFjXzn6pQCmIKc5Ug5j98SuYyH+m4xQnvKlMDIW4plLfgyVnd0IcQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.2.2",
+        "core-js-compat": "^3.14.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-regenerator": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz",
+      "integrity": "sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.2.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/babel-preset-current-node-syntax": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
+      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-bigint": "^7.8.3",
+        "@babel/plugin-syntax-class-properties": "^7.8.3",
+        "@babel/plugin-syntax-import-meta": "^7.8.3",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-top-level-await": "^7.8.3"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/babel-preset-jest": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz",
+      "integrity": "sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==",
+      "dev": true,
+      "dependencies": {
+        "babel-plugin-jest-hoist": "^26.6.2",
+        "babel-preset-current-node-syntax": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
+      "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA=="
+    },
+    "node_modules/base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
+      "dependencies": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/is-accessor-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/is-data-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/is-descriptor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "dev": true,
+      "dependencies": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
+    "node_modules/binary-extensions": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/bl": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
+      "dev": true,
+      "dependencies": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+    "node_modules/boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
+      "dev": true
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/brace-expansion/node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
+    },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "dependencies": {
+        "fill-range": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browser-process-hrtime": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
+      "dev": true
+    },
+    "node_modules/browserslist": {
+      "version": "4.17.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.0.tgz",
+      "integrity": "sha512-g2BJ2a0nEYvEFQC208q8mVAhfNwpZ5Mu8BwgtCdZKO3qx98HChmeg448fPdUzld8aFmfLgVh7yymqV+q1lJZ5g==",
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001254",
+        "colorette": "^1.3.0",
+        "electron-to-chromium": "^1.3.830",
+        "escalade": "^3.1.1",
+        "node-releases": "^1.1.75"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/browserslist"
+      }
+    },
+    "node_modules/bser": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+      "dev": true,
+      "dependencies": {
+        "node-int64": "^0.4.0"
+      }
+    },
+    "node_modules/buffer": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "node_modules/buffer-crc32": {
+      "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
+    },
+    "node_modules/cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "dev": true,
+      "dependencies": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cache-base/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cache-base/node_modules/set-value": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/call-bind": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camelcase-keys": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz",
+      "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "map-obj": "^4.0.0",
+        "quick-lru": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001255",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001255.tgz",
+      "integrity": "sha512-F+A3N9jTZL882f/fg/WWVnKSu6IOo3ueLz4zwaOPbPYHNmM/ZaDUyzyJwS1mZhX7Ex5jqTyW599Gdelh5PDYLQ==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/browserslist"
+      }
+    },
+    "node_modules/capture-exit": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
+      "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
+      "dev": true,
+      "dependencies": {
+        "rsvp": "^4.8.4"
+      },
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "dev": true
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/char-regex": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz",
+      "integrity": "sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==",
+      "dependencies": {
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/chownr": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+      "dev": true
+    },
+    "node_modules/ci-info": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+      "dev": true
+    },
+    "node_modules/cjs-module-lexer": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz",
+      "integrity": "sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==",
+      "dev": true
+    },
+    "node_modules/class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dev": true,
+      "dependencies": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
+    "node_modules/clone": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/clone-buffer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
+      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/clone-deep": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz",
+      "integrity": "sha1-TnPdCen7lxzDhnDF3O2cGJZIHMY=",
+      "dev": true,
+      "dependencies": {
+        "for-own": "^0.1.3",
+        "is-plain-object": "^2.0.1",
+        "kind-of": "^3.0.2",
+        "lazy-cache": "^1.0.3",
+        "shallow-clone": "^0.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/clone-deep/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/clone-deep/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/clone-regexp": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz",
+      "integrity": "sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==",
+      "dependencies": {
+        "is-regexp": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/clone-stats": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
+      "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
+      "dev": true
+    },
+    "node_modules/cloneable-readable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
+      "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "process-nextick-args": "^2.0.0",
+        "readable-stream": "^2.3.5"
+      }
+    },
+    "node_modules/cloneable-readable/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/cloneable-readable/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+      "dev": true,
+      "engines": {
+        "iojs": ">= 1.0.0",
+        "node": ">= 0.12.0"
+      }
+    },
+    "node_modules/coa": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
+      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
+      "dev": true,
+      "dependencies": {
+        "@types/q": "^1.5.1",
+        "chalk": "^2.4.1",
+        "q": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 4.0"
+      }
+    },
+    "node_modules/coa/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/coa/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/coa/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/coa/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/coa/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/coa/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/collect-v8-coverage": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz",
+      "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==",
+      "dev": true
+    },
+    "node_modules/collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+      "dev": true,
+      "dependencies": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/color": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/color/-/color-3.0.0.tgz",
+      "integrity": "sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.1",
+        "color-string": "^1.5.2"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "node_modules/color-string": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.6.0.tgz",
+      "integrity": "sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
+    },
+    "node_modules/color/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/color/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/colord": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz",
+      "integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ=="
+    },
+    "node_modules/colorette": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz",
+      "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g=="
+    },
+    "node_modules/colors": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
+      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.1.90"
+      }
+    },
+    "node_modules/colorspace": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.2.tgz",
+      "integrity": "sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ==",
+      "dev": true,
+      "dependencies": {
+        "color": "3.0.x",
+        "text-hex": "1.0.x"
+      }
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/commander": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
+      "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/component-emitter": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+      "dev": true
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "node_modules/concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
+      "engines": [
+        "node >= 0.8"
+      ],
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
+      }
+    },
+    "node_modules/concat-stream/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/concat-stream/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/convert-source-map": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz",
+      "integrity": "sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.1"
+      }
+    },
+    "node_modules/copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/core-js": {
+      "version": "3.21.1",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.21.1.tgz",
+      "integrity": "sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig==",
+      "dev": true,
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-js-compat": {
+      "version": "3.17.2",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.17.2.tgz",
+      "integrity": "sha512-lHnt7A1Oqplebl5i0MrQyFv/yyEzr9p29OjlkcsFRDDgHwwQyVckfRGJ790qzXhkwM8ba4SFHHa2sO+T5f1zGg==",
+      "dev": true,
+      "dependencies": {
+        "browserslist": "^4.16.8",
+        "semver": "7.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-js-compat/node_modules/semver": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "dev": true
+    },
+    "node_modules/cosmiconfig": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
+      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
+      "dependencies": {
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.2.1",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.10.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/cross-spawn/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/css-functions-list": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.0.1.tgz",
+      "integrity": "sha512-PriDuifDt4u4rkDgnqRCLnjfMatufLmWNfQnGCq34xZwpY3oabwhB9SqRBmuvWUgndbemCFlKqg+nO7C2q0SBw==",
+      "engines": {
+        "node": ">=12.22"
+      }
+    },
+    "node_modules/css-select": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
+      "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^3.2.1",
+        "domutils": "^1.7.0",
+        "nth-check": "^1.0.2"
+      }
+    },
+    "node_modules/css-select-base-adapter": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
+      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
+      "dev": true
+    },
+    "node_modules/css-select/node_modules/css-what": {
+      "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
+      "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/css-select/node_modules/nth-check": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
+      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "~1.0.0"
+      }
+    },
+    "node_modules/css-selector-parser": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/css-selector-parser/-/css-selector-parser-1.4.1.tgz",
+      "integrity": "sha512-HYPSb7y/Z7BNDCOrakL4raGO2zltZkbeXyAd6Tg9obzix6QhzxCotdBl6VT0Dv4vZfJGVz3WL/xaEI9Ly3ul0g==",
+      "dev": true
+    },
+    "node_modules/css-tree": {
+      "version": "1.0.0-alpha.37",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
+      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
+      "dev": true,
+      "dependencies": {
+        "mdn-data": "2.0.4",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/css-tree/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/css-what": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-5.0.1.tgz",
+      "integrity": "sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "bin": {
+        "cssesc": "bin/cssesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cssmin": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/cssmin/-/cssmin-0.4.3.tgz",
+      "integrity": "sha1-yRlAd+Dr2s1pHV9ZAVudgZ840BU=",
+      "dev": true,
+      "bin": {
+        "cssmin": "bin/cssmin"
+      }
+    },
+    "node_modules/csso": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
+      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+      "dev": true,
+      "dependencies": {
+        "css-tree": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/csso/node_modules/css-tree": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+      "dev": true,
+      "dependencies": {
+        "mdn-data": "2.0.14",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/csso/node_modules/mdn-data": {
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+      "dev": true
+    },
+    "node_modules/csso/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/cssom": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
+      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
+      "dev": true
+    },
+    "node_modules/cssstyle": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+      "dev": true,
+      "dependencies": {
+        "cssom": "~0.3.6"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cssstyle/node_modules/cssom": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+      "dev": true
+    },
+    "node_modules/cwd": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/cwd/-/cwd-0.10.0.tgz",
+      "integrity": "sha1-FyQAaUBXwioTsM8WFix+S3p/5Wc=",
+      "dev": true,
+      "dependencies": {
+        "find-pkg": "^0.1.2",
+        "fs-exists-sync": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dev": true,
+      "dependencies": {
+        "assert-plus": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/data-urls": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
+      "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
+      "dev": true,
+      "dependencies": {
+        "abab": "^2.0.3",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+      "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decamelize-keys": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz",
+      "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
+      "dependencies": {
+        "decamelize": "^1.1.0",
+        "map-obj": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decamelize-keys/node_modules/map-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decimal.js": {
+      "version": "10.3.1",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
+      "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
+      "dev": true
+    },
+    "node_modules/decode-uri-component": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="
+    },
+    "node_modules/deepmerge": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+      "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dev": true,
+      "dependencies": {
+        "object-keys": "^1.0.12"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/define-property/node_modules/is-accessor-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/define-property/node_modules/is-data-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/define-property/node_modules/is-descriptor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/dependency-graph": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.9.0.tgz",
+      "integrity": "sha512-9YLIBURXj4DJMFALxXw9K3Y3rwb5Fk0X5/8ipCzaN84+gKxoHK43tVKRNakCQbiEx07E8Uwhuq21BpUagFhZ8w==",
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/detect-newline": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/devtools-protocol": {
+      "version": "0.0.869402",
+      "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.869402.tgz",
+      "integrity": "sha512-VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==",
+      "dev": true
+    },
+    "node_modules/diff-sequences": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
+      "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+      "dependencies": {
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+      "dependencies": {
+        "esutils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/dom-serializer": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
+      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
+      "dev": true,
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "entities": "^2.0.0"
+      }
+    },
+    "node_modules/dom-serializer/node_modules/domelementtype": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
+      "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ]
+    },
+    "node_modules/dom-serializer/node_modules/entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/domelementtype": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+      "dev": true
+    },
+    "node_modules/domexception": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
+      "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+      "dev": true,
+      "dependencies": {
+        "webidl-conversions": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/domexception/node_modules/webidl-conversions": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
+      "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/domutils": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
+      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
+      "dev": true,
+      "dependencies": {
+        "dom-serializer": "0",
+        "domelementtype": "1"
+      }
+    },
+    "node_modules/ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "dev": true,
+      "dependencies": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.3.833",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.833.tgz",
+      "integrity": "sha512-h+9aVaUHjyunLqtCjJF2jrJ73tYcJqo2cCGKtVAXH9WmnBsb8hiChRQ0P1uXjdxR6Wcfxibephy41c1YlZA/pA=="
+    },
+    "node_modules/emittery": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz",
+      "integrity": "sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+    },
+    "node_modules/enabled": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz",
+      "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==",
+      "dev": true
+    },
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+      "dev": true,
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "dependencies": {
+        "ansi-colors": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/es-abstract": {
+      "version": "1.18.6",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.6.tgz",
+      "integrity": "sha512-kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "es-to-primitive": "^1.2.1",
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.1.1",
+        "get-symbol-description": "^1.0.0",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.2",
+        "internal-slot": "^1.0.3",
+        "is-callable": "^1.2.4",
+        "is-negative-zero": "^2.0.1",
+        "is-regex": "^1.1.4",
+        "is-string": "^1.0.7",
+        "object-inspect": "^1.11.0",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "string.prototype.trimend": "^1.0.4",
+        "string.prototype.trimstart": "^1.0.4",
+        "unbox-primitive": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+      "dev": true,
+      "dependencies": {
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/es6-promise": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz",
+      "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==",
+      "dev": true
+    },
+    "node_modules/escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/escodegen": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz",
+      "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==",
+      "dev": true,
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2",
+        "optionator": "^0.8.1"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/escodegen/node_modules/estraverse": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/optionator": {
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "dev": true,
+      "dependencies": {
+        "deep-is": "~0.1.3",
+        "fast-levenshtein": "~2.0.6",
+        "levn": "~0.3.0",
+        "prelude-ls": "~1.1.2",
+        "type-check": "~0.3.2",
+        "word-wrap": "~1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/escodegen/node_modules/type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/eslint": {
+      "version": "7.32.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz",
+      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
+      "dependencies": {
+        "@babel/code-frame": "7.12.11",
+        "@eslint/eslintrc": "^0.4.3",
+        "@humanwhocodes/config-array": "^0.5.0",
+        "ajv": "^6.10.0",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.0.1",
+        "doctrine": "^3.0.0",
+        "enquirer": "^2.3.5",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^2.1.0",
+        "eslint-visitor-keys": "^2.0.0",
+        "espree": "^7.3.1",
+        "esquery": "^1.4.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "functional-red-black-tree": "^1.0.1",
+        "glob-parent": "^5.1.2",
+        "globals": "^13.6.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "js-yaml": "^3.13.1",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.0.4",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.1",
+        "progress": "^2.0.0",
+        "regexpp": "^3.1.0",
+        "semver": "^7.2.1",
+        "strip-ansi": "^6.0.0",
+        "strip-json-comments": "^3.1.0",
+        "table": "^6.0.9",
+        "text-table": "^0.2.0",
+        "v8-compile-cache": "^2.0.3"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/eslint-utils": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
+      "dependencies": {
+        "eslint-visitor-keys": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/eslint-visitor-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint/node_modules/@babel/code-frame": {
+      "version": "7.12.11",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz",
+      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
+      "dependencies": {
+        "@babel/highlight": "^7.10.4"
+      }
+    },
+    "node_modules/eslint/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/eslint/node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/eslint/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/globals": {
+      "version": "13.11.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz",
+      "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==",
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/eslint/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "node_modules/eslint/node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint/node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/eslint/node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/espree": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
+      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+      "dependencies": {
+        "acorn": "^7.4.0",
+        "acorn-jsx": "^5.3.1",
+        "eslint-visitor-keys": "^1.3.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/esquery": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "dependencies": {
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/esquery/node_modules/estraverse": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esrecurse/node_modules/estraverse": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+      "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/exec-sh": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz",
+      "integrity": "sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==",
+      "dev": true
+    },
+    "node_modules/execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/execall": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz",
+      "integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==",
+      "dependencies": {
+        "clone-regexp": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+      "dev": true,
+      "dependencies": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node_modules/expand-tilde": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz",
+      "integrity": "sha1-C4HrqJflo9MdHD0QL48BRB5VlEk=",
+      "dev": true,
+      "dependencies": {
+        "os-homedir": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expect": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz",
+      "integrity": "sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "ansi-styles": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-regex-util": "^26.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/expect-puppeteer": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/expect-puppeteer/-/expect-puppeteer-5.0.4.tgz",
+      "integrity": "sha512-NV7jSiKhK+byocxg9A+0av+Q2RSCP9bcLVRz7zhHaESeCOkuomMvl9oD+uo1K+NdqRCXhNkQlUGWlmtbrpR1qw==",
+      "dev": true
+    },
+    "node_modules/extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true
+    },
+    "node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+      "dev": true,
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extend-shallow/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "dependencies": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/is-accessor-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/is-data-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/is-descriptor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extract-zip": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
+        "yauzl": "^2.10.0"
+      },
+      "bin": {
+        "extract-zip": "cli.js"
+      },
+      "engines": {
+        "node": ">= 10.17.0"
+      },
+      "optionalDependencies": {
+        "@types/yauzl": "^2.9.1"
+      }
+    },
+    "node_modules/extract-zip/node_modules/get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "dev": true,
+      "engines": [
+        "node >=0.6.0"
+      ]
+    },
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+    },
+    "node_modules/fast-glob": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
+      "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==",
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
+    },
+    "node_modules/fast-safe-stringify": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
+      "dev": true
+    },
+    "node_modules/fastest-levenshtein": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
+      "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow=="
+    },
+    "node_modules/fastq": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.12.0.tgz",
+      "integrity": "sha512-VNX0QkHK3RsXVKr9KrlUv/FoTa0NdbYoHHl7uXHv2rzyHSlxjdNAKug2twd9luJxpcyNeAgf5iPPMutJO67Dfg==",
+      "dependencies": {
+        "reusify": "^1.0.4"
+      }
+    },
+    "node_modules/fb-watchman": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz",
+      "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==",
+      "dev": true,
+      "dependencies": {
+        "bser": "2.1.1"
+      }
+    },
+    "node_modules/fd-slicer": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+      "dev": true,
+      "dependencies": {
+        "pend": "~1.2.0"
+      }
+    },
+    "node_modules/fecha": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.1.tgz",
+      "integrity": "sha512-MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q==",
+      "dev": true
+    },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-file-up": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/find-file-up/-/find-file-up-0.1.3.tgz",
+      "integrity": "sha1-z2gJG8+fMApA2kEbN9pczlovvqA=",
+      "dev": true,
+      "dependencies": {
+        "fs-exists-sync": "^0.1.0",
+        "resolve-dir": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/find-pkg": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/find-pkg/-/find-pkg-0.1.2.tgz",
+      "integrity": "sha1-G9wiwG42NlUy4qJIBGhUuXiNpVc=",
+      "dev": true,
+      "dependencies": {
+        "find-file-up": "^0.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/find-process": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/find-process/-/find-process-1.4.4.tgz",
+      "integrity": "sha512-rRSuT1LE4b+BFK588D2V8/VG9liW0Ark1XJgroxZXI0LtwmQJOb490DvDYvbm+Hek9ETFzTutGfJ90gumITPhQ==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "commander": "^5.1.0",
+        "debug": "^4.1.1"
+      },
+      "bin": {
+        "find-process": "bin/find-process.js"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/flat-cache": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
+      "dependencies": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/flatted": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz",
+      "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA=="
+    },
+    "node_modules/fn.name": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz",
+      "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==",
+      "dev": true
+    },
+    "node_modules/follow-redirects": {
+      "version": "1.14.8",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.8.tgz",
+      "integrity": "sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/for-own": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+      "dev": true,
+      "dependencies": {
+        "for-in": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/form-data": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
+      "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==",
+      "dev": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/fraction.js": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.1.tgz",
+      "integrity": "sha512-MHOhvvxHTfRFpF1geTK9czMIZ6xclsEor2wkIGYYq+PxcQqT7vStJqjhe6S1TenZrMZzo+wlqOufBDVepUEgPg==",
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "type": "patreon",
+        "url": "https://www.patreon.com/infusion"
+      }
+    },
+    "node_modules/fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+      "dev": true,
+      "dependencies": {
+        "map-cache": "^0.2.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fs-constants": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
+      "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
+      "dev": true
+    },
+    "node_modules/fs-exists-sync": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz",
+      "integrity": "sha1-mC1ok6+RjnLQjeyehnP/K1qNat0=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fs-extra": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+      "dependencies": {
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "node_modules/functional-red-black-tree": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc="
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+      "integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has": "^1.0.3",
+        "has-symbols": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/get-stdin": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
+      "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/get-symbol-description": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dev": true,
+      "dependencies": {
+        "assert-plus": "^1.0.0"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.1.7",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
+      "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/global-modules": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
+      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
+      "dependencies": {
+        "global-prefix": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/global-prefix": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
+      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
+      "dependencies": {
+        "ini": "^1.3.5",
+        "kind-of": "^6.0.2",
+        "which": "^1.3.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/globals": {
+      "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/globby": {
+      "version": "11.0.4",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
+      "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.1.1",
+        "ignore": "^5.1.4",
+        "merge2": "^1.3.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/globjoin": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
+      "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM="
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz",
+      "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="
+    },
+    "node_modules/growly": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
+      "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/har-validator": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
+      "deprecated": "this library is no longer supported",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.3",
+        "har-schema": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/har-validator/node_modules/ajv": {
+      "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
+      }
+    },
+    "node_modules/har-validator/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/hard-rejection": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
+      "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/has-bigints": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
+      "integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+      "integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "dev": true,
+      "dependencies": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/has-values/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/kind-of": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+      "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hasha": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz",
+      "integrity": "sha1-eNfL/B5tZjA/55g3NlmEUXsvbuE=",
+      "dev": true,
+      "dependencies": {
+        "is-stream": "^1.0.1",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/homedir-polyfill": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+      "dev": true,
+      "dependencies": {
+        "parse-passwd": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hosted-git-info": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
+      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/html-encoding-sniffer": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
+      "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+      "dev": true,
+      "dependencies": {
+        "whatwg-encoding": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true
+    },
+    "node_modules/html-tags": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.1.0.tgz",
+      "integrity": "sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "dev": true,
+      "dependencies": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "dev": true,
+      "dependencies": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      },
+      "engines": {
+        "node": ">=0.8",
+        "npm": ">=1.3.7"
+      }
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "dev": true,
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/human-signals": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
+      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.12.0"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dev": true,
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/ignore": {
+      "version": "5.1.8",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+      "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/import-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-3.0.0.tgz",
+      "integrity": "sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg==",
+      "dependencies": {
+        "import-from": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/import-fresh/node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/import-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/import-from/-/import-from-3.0.0.tgz",
+      "integrity": "sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==",
+      "dependencies": {
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/import-lazy": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
+      "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/import-local": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
+      "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==",
+      "dev": true,
+      "dependencies": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+    },
+    "node_modules/internal-slot": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+      "integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.0",
+        "has": "^1.0.3",
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-accessor-descriptor/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
+    },
+    "node_modules/is-bigint": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
+      "dev": true,
+      "dependencies": {
+        "has-bigints": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-boolean-object": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz",
+      "integrity": "sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-ci": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
+      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+      "dev": true,
+      "dependencies": {
+        "ci-info": "^2.0.0"
+      },
+      "bin": {
+        "is-ci": "bin.js"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz",
+      "integrity": "sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==",
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-data-descriptor/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-descriptor/node_modules/kind-of": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+      "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "dev": true,
+      "optional": true,
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-generator-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-negative-zero": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
+      "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-number-object": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz",
+      "integrity": "sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-plain-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+      "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-potential-custom-element-name": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+      "dev": true
+    },
+    "node_modules/is-primitive": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-3.0.1.tgz",
+      "integrity": "sha512-GljRxhWvlCNRfZyORiH77FwdFwGcMO620o37EOYC0ORWdq+WYNVqW0w2Juzew4M+L81l6/QS3t5gkkihyRqv9w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-regex": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-regexp": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz",
+      "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-string": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
+      "dev": true,
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
+      "dev": true,
+      "dependencies": {
+        "has-symbols": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
+    },
+    "node_modules/is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+    },
+    "node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
+    },
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
+      "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-instrument": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
+      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.7.5",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.0.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz",
+      "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==",
+      "dev": true,
+      "dependencies": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^3.0.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz",
+      "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/istanbul-reports": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz",
+      "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==",
+      "dev": true,
+      "dependencies": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-26.6.3.tgz",
+      "integrity": "sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==",
+      "dev": true,
+      "dependencies": {
+        "@jest/core": "^26.6.3",
+        "import-local": "^3.0.2",
+        "jest-cli": "^26.6.3"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-changed-files": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.6.2.tgz",
+      "integrity": "sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "execa": "^4.0.0",
+        "throat": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/execa": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
+      "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
+      "dev": true,
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "get-stream": "^5.0.0",
+        "human-signals": "^1.1.1",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.0",
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "dev": true,
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/jest-config": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
+      "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/core": "^7.1.0",
+        "@jest/test-sequencer": "^26.6.3",
+        "@jest/types": "^26.6.2",
+        "babel-jest": "^26.6.3",
+        "chalk": "^4.0.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.2.4",
+        "jest-environment-jsdom": "^26.6.2",
+        "jest-environment-node": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "jest-jasmine2": "^26.6.3",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      },
+      "peerDependencies": {
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ts-node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-dev-server": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/jest-dev-server/-/jest-dev-server-5.0.3.tgz",
+      "integrity": "sha512-aJR3a5KdY18Lsz+VbREKwx2HM3iukiui+J9rlv9o6iYTwZCSsJazSTStcD9K1q0AIF3oA+FqLOKDyo/sc7+fJw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.1.1",
+        "cwd": "^0.10.0",
+        "find-process": "^1.4.4",
+        "prompts": "^2.4.1",
+        "spawnd": "^5.0.0",
+        "tree-kill": "^1.2.2",
+        "wait-on": "^5.3.0"
+      }
+    },
+    "node_modules/jest-diff": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
+      "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-docblock": {
+      "version": "26.0.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-26.0.0.tgz",
+      "integrity": "sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==",
+      "dev": true,
+      "dependencies": {
+        "detect-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-each": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.6.2.tgz",
+      "integrity": "sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "jest-util": "^26.6.2",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-environment-jsdom": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz",
+      "integrity": "sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jsdom": "^16.4.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-environment-node": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.6.2.tgz",
+      "integrity": "sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-environment-puppeteer": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/jest-environment-puppeteer/-/jest-environment-puppeteer-5.0.4.tgz",
+      "integrity": "sha512-wd4EDOD4QRi11QZ1IV8WsL1wlnnMUtcqtU0BNm+REzRtg78K2XHn3jS6YxGeXIOnsgrJeHxsD7DlRZ/GkFteLg==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.1.1",
+        "cwd": "^0.10.0",
+        "jest-dev-server": "^5.0.3",
+        "jest-environment-node": "^27.0.1",
+        "merge-deep": "^3.0.3"
+      }
+    },
+    "node_modules/jest-environment-puppeteer/node_modules/@jest/environment": {
+      "version": "27.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.1.1.tgz",
+      "integrity": "sha512-+y882/ZdxhyqF5RzxIrNIANjHj991WH7jifdcplzMDosDUOyCACFYUyVTBGbSTocbU+s1cesroRzkwi8hZ9SHg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/fake-timers": "^27.1.1",
+        "@jest/types": "^27.1.1",
+        "@types/node": "*",
+        "jest-mock": "^27.1.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-environment-puppeteer/node_modules/@jest/fake-timers": {
+      "version": "27.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.1.1.tgz",
+      "integrity": "sha512-u8TJ5VlsVYTsGFatoyIae2l25pku4Bu15QCPTx2Gs5z+R//Ee3tHN85462Vc9yGVcdDvgADbqNkhOLxbEwPjMQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^27.1.1",
+        "@sinonjs/fake-timers": "^7.0.2",
+        "@types/node": "*",
+        "jest-message-util": "^27.1.1",
+        "jest-mock": "^27.1.1",
+        "jest-util": "^27.1.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-environment-puppeteer/node_modules/@jest/types": {
+      "version": "27.1.1",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.1.1.tgz",
+      "integrity": "sha512-yqJPDDseb0mXgKqmNqypCsb85C22K1aY5+LUxh7syIM9n/b0AsaltxNy+o6tt29VcfGDpYEve175bm3uOhcehA==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^16.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-environment-puppeteer/node_modules/@sinonjs/fake-timers": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz",
+      "integrity": "sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==",
+      "dev": true,
+      "dependencies": {
+        "@sinonjs/commons": "^1.7.0"
+      }
+    },
+    "node_modules/jest-environment-puppeteer/node_modules/@types/yargs": {
+      "version": "16.0.4",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
+      "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==",
+      "dev": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/jest-environment-puppeteer/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-environment-puppeteer/node_modules/ci-info": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz",
+      "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==",
+      "dev": true
+    },
+    "node_modules/jest-environment-puppeteer/node_modules/is-ci": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz",
+      "integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==",
+      "dev": true,
+      "dependencies": {
+        "ci-info": "^3.1.1"
+      },
+      "bin": {
+        "is-ci": "bin.js"
+      }
+    },
+    "node_modules/jest-environment-puppeteer/node_modules/jest-environment-node": {
+      "version": "27.1.1",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.1.1.tgz",
+      "integrity": "sha512-OEGeZh0PwzngNIYWYgWrvTcLygopV8OJbC9HNb0j70VBKgEIsdZkYhwcFnaURX83OHACMqf1pa9Tv5Pw5jemrg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/environment": "^27.1.1",
+        "@jest/fake-timers": "^27.1.1",
+        "@jest/types": "^27.1.1",
+        "@types/node": "*",
+        "jest-mock": "^27.1.1",
+        "jest-util": "^27.1.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-environment-puppeteer/node_modules/jest-message-util": {
+      "version": "27.1.1",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.1.1.tgz",
+      "integrity": "sha512-b697BOJV93+AVGvzLRtVZ0cTVRbd59OaWnbB2D75GRaIMc4I+Z9W0wHxbfjW01JWO+TqqW4yevT0aN7Fd0XWng==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^27.1.1",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^27.1.1",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-environment-puppeteer/node_modules/jest-mock": {
+      "version": "27.1.1",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.1.1.tgz",
+      "integrity": "sha512-SClsFKuYBf+6SSi8jtAYOuPw8DDMsTElUWEae3zq7vDhH01ayVSIHUSIa8UgbDOUalCFp6gNsaikN0rbxN4dbw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^27.1.1",
+        "@types/node": "*"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-environment-puppeteer/node_modules/jest-util": {
+      "version": "27.1.1",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.1.1.tgz",
+      "integrity": "sha512-zf9nEbrASWn2mC/L91nNb0K+GkhFvi4MP6XJG2HqnHzHvLYcs7ou/In68xYU1i1dSkJlrWcYfWXQE8nVR+nbOA==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^27.1.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "is-ci": "^3.0.0",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-environment-puppeteer/node_modules/pretty-format": {
+      "version": "27.1.1",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.1.1.tgz",
+      "integrity": "sha512-zdBi/xlstKJL42UH7goQti5Hip/B415w1Mfj+WWWYMBylAYtKESnXGUtVVcMVid9ReVjypCotUV6CEevYPHv2g==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^27.1.1",
+        "ansi-regex": "^5.0.0",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^17.0.1"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
+      }
+    },
+    "node_modules/jest-get-type": {
+      "version": "26.3.0",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
+      "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-haste-map": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz",
+      "integrity": "sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "@types/graceful-fs": "^4.1.2",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.4",
+        "jest-regex-util": "^26.0.0",
+        "jest-serializer": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "sane": "^4.0.3",
+        "walker": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      },
+      "optionalDependencies": {
+        "fsevents": "^2.1.2"
+      }
+    },
+    "node_modules/jest-jasmine2": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz",
+      "integrity": "sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/traverse": "^7.1.0",
+        "@jest/environment": "^26.6.2",
+        "@jest/source-map": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "expect": "^26.6.2",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-runtime": "^26.6.3",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "pretty-format": "^26.6.2",
+        "throat": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-leak-detector": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz",
+      "integrity": "sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==",
+      "dev": true,
+      "dependencies": {
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-matcher-utils": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz",
+      "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "jest-diff": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-message-util": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz",
+      "integrity": "sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "@jest/types": "^26.6.2",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "micromatch": "^4.0.2",
+        "pretty-format": "^26.6.2",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-mock": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.6.2.tgz",
+      "integrity": "sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "@types/node": "*"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-pnp-resolver": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
+      "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "jest-resolve": "*"
+      },
+      "peerDependenciesMeta": {
+        "jest-resolve": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-puppeteer": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/jest-puppeteer/-/jest-puppeteer-5.0.4.tgz",
+      "integrity": "sha512-IUOVKgHEaKsLqahZy/J/DvXB59SQx4AVpZKTRDvJzCdkvdGc3NVsNwUhovr6SK+HOK1TOiqAiXPTAPiIq3mkrg==",
+      "dev": true,
+      "dependencies": {
+        "expect-puppeteer": "^5.0.4",
+        "jest-environment-puppeteer": "^5.0.4"
+      },
+      "peerDependencies": {
+        "puppeteer": ">= 1.5.0 < 10"
+      }
+    },
+    "node_modules/jest-regex-util": {
+      "version": "26.0.0",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
+      "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-resolve": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
+      "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^26.6.2",
+        "read-pkg-up": "^7.0.1",
+        "resolve": "^1.18.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-resolve-dependencies": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz",
+      "integrity": "sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-snapshot": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-runner": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.6.3.tgz",
+      "integrity": "sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^26.6.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.7.1",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "jest-config": "^26.6.3",
+        "jest-docblock": "^26.0.0",
+        "jest-haste-map": "^26.6.2",
+        "jest-leak-detector": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "jest-runtime": "^26.6.3",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
+        "source-map-support": "^0.5.6",
+        "throat": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-runtime": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.3.tgz",
+      "integrity": "sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==",
+      "dev": true,
+      "dependencies": {
+        "@jest/console": "^26.6.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/globals": "^26.6.2",
+        "@jest/source-map": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^0.6.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.4",
+        "jest-config": "^26.6.3",
+        "jest-haste-map": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-mock": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.6.2",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0",
+        "yargs": "^15.4.1"
+      },
+      "bin": {
+        "jest-runtime": "bin/jest-runtime.js"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/y18n": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+      "dev": true
+    },
+    "node_modules/jest-runtime/node_modules/yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-serializer": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz",
+      "integrity": "sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "graceful-fs": "^4.2.4"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-snapshot": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.6.2.tgz",
+      "integrity": "sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.0.0",
+        "@jest/types": "^26.6.2",
+        "@types/babel__traverse": "^7.0.4",
+        "@types/prettier": "^2.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^26.6.2",
+        "graceful-fs": "^4.2.4",
+        "jest-diff": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "jest-haste-map": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^26.6.2",
+        "semver": "^7.3.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jest-util": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+      "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "is-ci": "^2.0.0",
+        "micromatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-validate": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.2.tgz",
+      "integrity": "sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "camelcase": "^6.0.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "leven": "^3.1.0",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-validate/node_modules/camelcase": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+      "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-watcher": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.6.2.tgz",
+      "integrity": "sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==",
+      "dev": true,
+      "dependencies": {
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "jest-util": "^26.6.2",
+        "string-length": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-worker": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/jest/node_modules/cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "node_modules/jest/node_modules/jest-cli": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.3.tgz",
+      "integrity": "sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/core": "^26.6.3",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "import-local": "^3.0.2",
+        "is-ci": "^2.0.0",
+        "jest-config": "^26.6.3",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "prompts": "^2.0.1",
+        "yargs": "^15.4.1"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest/node_modules/y18n": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+      "dev": true
+    },
+    "node_modules/jest/node_modules/yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/joi": {
+      "version": "17.4.2",
+      "resolved": "https://registry.npmjs.org/joi/-/joi-17.4.2.tgz",
+      "integrity": "sha512-Lm56PP+n0+Z2A2rfRvsfWVDXGEWjXxatPopkQ8qQ5mxCEhwHG+Ettgg5o98FFaxilOxozoa14cFhrE/hOzh/Nw==",
+      "dev": true,
+      "dependencies": {
+        "@hapi/hoek": "^9.0.0",
+        "@hapi/topo": "^5.0.0",
+        "@sideway/address": "^4.1.0",
+        "@sideway/formula": "^3.0.0",
+        "@sideway/pinpoint": "^2.0.0"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "dev": true
+    },
+    "node_modules/jsdom": {
+      "version": "16.7.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
+      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
+      "dev": true,
+      "dependencies": {
+        "abab": "^2.0.5",
+        "acorn": "^8.2.4",
+        "acorn-globals": "^6.0.0",
+        "cssom": "^0.4.4",
+        "cssstyle": "^2.3.0",
+        "data-urls": "^2.0.0",
+        "decimal.js": "^10.2.1",
+        "domexception": "^2.0.1",
+        "escodegen": "^2.0.0",
+        "form-data": "^3.0.0",
+        "html-encoding-sniffer": "^2.0.1",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.0",
+        "parse5": "6.0.1",
+        "saxes": "^5.0.1",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.0.0",
+        "w3c-hr-time": "^1.0.2",
+        "w3c-xmlserializer": "^2.0.0",
+        "webidl-conversions": "^6.1.0",
+        "whatwg-encoding": "^1.0.5",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.5.0",
+        "ws": "^7.4.6",
+        "xml-name-validator": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jsdom/node_modules/acorn": {
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz",
+      "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+    },
+    "node_modules/json-schema": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
+      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
+      "dev": true
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
+    },
+    "node_modules/json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
+    },
+    "node_modules/json5": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "dev": true,
+      "engines": [
+        "node >=0.6.0"
+      ],
+      "dependencies": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
+    "node_modules/jsprim/node_modules/json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+      "dev": true
+    },
+    "node_modules/kew": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz",
+      "integrity": "sha1-edk9LTM2PW/dKXCzNdkUGtWR15s=",
+      "dev": true
+    },
+    "node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/klaw": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
+      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
+      "dev": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.9"
+      }
+    },
+    "node_modules/kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/known-css-properties": {
+      "version": "0.24.0",
+      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.24.0.tgz",
+      "integrity": "sha512-RTSoaUAfLvpR357vWzAz/50Q/BmHfmE6ETSWfutT0AJiw10e6CmcdYRQJlLRd95B53D0Y2aD1jSxD3V3ySF+PA=="
+    },
+    "node_modules/kuler": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz",
+      "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==",
+      "dev": true
+    },
+    "node_modules/lazy-cache": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
+      "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/lilconfig": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.3.tgz",
+      "integrity": "sha512-EHKqr/+ZvdKCifpNrJCKxBTgk5XupZA3y/aCPY9mxfgBzmgh93Mt/WqjjQ38oMxXuvDokaKiM3lAgvSH2sjtHg==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
+      "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
+    },
+    "node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    },
+    "node_modules/lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
+    },
+    "node_modules/lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
+      "dev": true
+    },
+    "node_modules/lodash.difference": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz",
+      "integrity": "sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw="
+    },
+    "node_modules/lodash.forown": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/lodash.forown/-/lodash.forown-4.4.0.tgz",
+      "integrity": "sha1-hRFc8E9z75ZuztUlEdOJPMRmg68="
+    },
+    "node_modules/lodash.get": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
+    },
+    "node_modules/lodash.groupby": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz",
+      "integrity": "sha1-Cwih3PaDl8OXhVwyOXg4Mt90A9E="
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+    },
+    "node_modules/lodash.sortby": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg="
+    },
+    "node_modules/lodash.truncate": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM="
+    },
+    "node_modules/logform": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/logform/-/logform-2.2.0.tgz",
+      "integrity": "sha512-N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg==",
+      "dev": true,
+      "dependencies": {
+        "colors": "^1.2.1",
+        "fast-safe-stringify": "^2.0.4",
+        "fecha": "^4.2.0",
+        "ms": "^2.1.1",
+        "triple-beam": "^1.3.0"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/makeerror": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
+      "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
+      "dev": true,
+      "dependencies": {
+        "tmpl": "1.0.x"
+      }
+    },
+    "node_modules/map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/map-obj": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
+      "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+      "dev": true,
+      "dependencies": {
+        "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mathml-tag-names": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
+      "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/mdn-data": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
+      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
+      "dev": true
+    },
+    "node_modules/meow": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz",
+      "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==",
+      "dependencies": {
+        "@types/minimist": "^1.2.0",
+        "camelcase-keys": "^6.2.2",
+        "decamelize": "^1.2.0",
+        "decamelize-keys": "^1.1.0",
+        "hard-rejection": "^2.1.0",
+        "minimist-options": "4.1.0",
+        "normalize-package-data": "^3.0.0",
+        "read-pkg-up": "^7.0.1",
+        "redent": "^3.0.0",
+        "trim-newlines": "^3.0.0",
+        "type-fest": "^0.18.0",
+        "yargs-parser": "^20.2.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/meow/node_modules/trim-newlines": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz",
+      "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/meow/node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/merge-deep": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.3.tgz",
+      "integrity": "sha512-qtmzAS6t6grwEkNrunqTBdn0qKwFgNWvlxUbAV8es9M7Ot1EbyApytCnvE0jALPa46ZpKDUo527kKiaWplmlFA==",
+      "dev": true,
+      "dependencies": {
+        "arr-union": "^3.1.0",
+        "clone-deep": "^0.2.4",
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/merge-deep/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/merge-deep/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz",
+      "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==",
+      "dependencies": {
+        "braces": "^3.0.1",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.49.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.49.0.tgz",
+      "integrity": "sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.32",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.32.tgz",
+      "integrity": "sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A==",
+      "dev": true,
+      "dependencies": {
+        "mime-db": "1.49.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/min-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
+      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "dev": true
+    },
+    "node_modules/minimist-options": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
+      "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
+      "dependencies": {
+        "arrify": "^1.0.1",
+        "is-plain-obj": "^1.1.0",
+        "kind-of": "^6.0.3"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/mixin-deep": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "dev": true,
+      "dependencies": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mixin-deep/node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mixin-object": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz",
+      "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
+      "dev": true,
+      "dependencies": {
+        "for-in": "^0.1.3",
+        "is-extendable": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mixin-object/node_modules/for-in": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz",
+      "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+      "dev": true
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+    },
+    "node_modules/mustache": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz",
+      "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==",
+      "dev": true,
+      "bin": {
+        "mustache": "bin/mustache"
+      }
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
+      "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
+    },
+    "node_modules/nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
+    },
+    "node_modules/node-fetch": {
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "dev": true,
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/node-fetch/node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=",
+      "dev": true
+    },
+    "node_modules/node-fetch/node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=",
+      "dev": true
+    },
+    "node_modules/node-fetch/node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=",
+      "dev": true,
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=",
+      "dev": true
+    },
+    "node_modules/node-modules-regexp": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz",
+      "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/node-notifier": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.2.tgz",
+      "integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "growly": "^1.3.0",
+        "is-wsl": "^2.2.0",
+        "semver": "^7.3.2",
+        "shellwords": "^0.1.1",
+        "uuid": "^8.3.0",
+        "which": "^2.0.2"
+      }
+    },
+    "node_modules/node-notifier/node_modules/semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/node-notifier/node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "optional": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/node-releases": {
+      "version": "1.1.75",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.75.tgz",
+      "integrity": "sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw=="
+    },
+    "node_modules/normalize-package-data": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
+      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
+      "dependencies": {
+        "hosted-git-info": "^4.0.1",
+        "is-core-module": "^2.5.0",
+        "semver": "^7.3.4",
+        "validate-npm-package-license": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/normalize-package-data/node_modules/semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-range": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-selector": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz",
+      "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM="
+    },
+    "node_modules/npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/nth-check": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
+      "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
+      "dev": true,
+      "dependencies": {
+        "boolbase": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
+      }
+    },
+    "node_modules/nwsapi": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
+      "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==",
+      "dev": true
+    },
+    "node_modules/oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+      "dev": true,
+      "dependencies": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/object-copy/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
+      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+      "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3",
+        "has-symbols": "^1.0.1",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.getownpropertydescriptors": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz",
+      "integrity": "sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.0-next.2"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+      "dev": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.values": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.4.tgz",
+      "integrity": "sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.18.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/one-time": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz",
+      "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==",
+      "dev": true,
+      "dependencies": {
+        "fn.name": "1.x.x"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dev": true,
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/p-each-series": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
+      "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/parse5": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "dev": true
+    },
+    "node_modules/pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+    },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
+      "dev": true
+    },
+    "node_modules/performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+      "dev": true
+    },
+    "node_modules/phantomjs-prebuilt": {
+      "version": "2.1.16",
+      "resolved": "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz",
+      "integrity": "sha1-79ISpKOWbTZHaE6ouniFSb4q7+8=",
+      "deprecated": "this package is now deprecated",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "es6-promise": "^4.0.3",
+        "extract-zip": "^1.6.5",
+        "fs-extra": "^1.0.0",
+        "hasha": "^2.2.0",
+        "kew": "^0.7.0",
+        "progress": "^1.1.8",
+        "request": "^2.81.0",
+        "request-progress": "^2.0.1",
+        "which": "^1.2.10"
+      },
+      "bin": {
+        "phantomjs": "bin/phantomjs"
+      }
+    },
+    "node_modules/phantomjs-prebuilt/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/phantomjs-prebuilt/node_modules/extract-zip": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz",
+      "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==",
+      "dev": true,
+      "dependencies": {
+        "concat-stream": "^1.6.2",
+        "debug": "^2.6.9",
+        "mkdirp": "^0.5.4",
+        "yauzl": "^2.10.0"
+      },
+      "bin": {
+        "extract-zip": "cli.js"
+      }
+    },
+    "node_modules/phantomjs-prebuilt/node_modules/fs-extra": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz",
+      "integrity": "sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA=",
+      "dev": true,
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "jsonfile": "^2.1.0",
+        "klaw": "^1.0.0"
+      }
+    },
+    "node_modules/phantomjs-prebuilt/node_modules/jsonfile": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+      "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+      "dev": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/phantomjs-prebuilt/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node_modules/phantomjs-prebuilt/node_modules/progress": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
+      "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
+      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "dependencies": {
+        "pinkie": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pirates": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz",
+      "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
+      "dev": true,
+      "dependencies": {
+        "node-modules-regexp": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "8.4.4",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.4.tgz",
+      "integrity": "sha512-joU6fBsN6EIer28Lj6GDFoC/5yOZzLCfn0zHAn/MYXI7aPt4m4hK5KC5ovEZXy+lnCjmYIbQWngvju2ddyEr8Q==",
+      "dependencies": {
+        "nanoid": "^3.1.30",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      }
+    },
+    "node_modules/postcss-cli": {
+      "version": "8.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-8.3.1.tgz",
+      "integrity": "sha512-leHXsQRq89S3JC9zw/tKyiVV2jAhnfQe0J8VI4eQQbUjwIe0XxVqLrR+7UsahF1s9wi4GlqP6SJ8ydf44cgF2Q==",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "chokidar": "^3.3.0",
+        "dependency-graph": "^0.9.0",
+        "fs-extra": "^9.0.0",
+        "get-stdin": "^8.0.0",
+        "globby": "^11.0.0",
+        "postcss-load-config": "^3.0.0",
+        "postcss-reporter": "^7.0.0",
+        "pretty-hrtime": "^1.0.3",
+        "read-cache": "^1.0.0",
+        "slash": "^3.0.0",
+        "yargs": "^16.0.0"
+      },
+      "bin": {
+        "postcss": "bin/postcss"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "postcss": "^8.0.0"
+      }
+    },
+    "node_modules/postcss-load-config": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.0.tgz",
+      "integrity": "sha512-ipM8Ds01ZUophjDTQYSVP70slFSYg3T0/zyfII5vzhN6V57YSxMgG5syXuwi5VtS8wSf3iL30v0uBdoIVx4Q0g==",
+      "dependencies": {
+        "import-cwd": "^3.0.0",
+        "lilconfig": "^2.0.3",
+        "yaml": "^1.10.2"
+      },
+      "engines": {
+        "node": ">= 10"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      },
+      "peerDependencies": {
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ts-node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/postcss-media-query-parser": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
+      "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ="
+    },
+    "node_modules/postcss-reporter": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.0.2.tgz",
+      "integrity": "sha512-JyQ96NTQQsso42y6L1H1RqHfWH1C3Jr0pt91mVv5IdYddZAE9DUZxuferNgk6q0o6vBVOrfVJb10X1FgDzjmDw==",
+      "dependencies": {
+        "colorette": "^1.2.1",
+        "lodash.difference": "^4.5.0",
+        "lodash.forown": "^4.4.0",
+        "lodash.get": "^4.4.2",
+        "lodash.groupby": "^4.6.0",
+        "lodash.sortby": "^4.7.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/postcss-resolve-nested-selector": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
+      "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4="
+    },
+    "node_modules/postcss-safe-parser": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
+      "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
+      "engines": {
+        "node": ">=12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3.3"
+      }
+    },
+    "node_modules/postcss-scss": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.3.tgz",
+      "integrity": "sha512-j4KxzWovfdHsyxwl1BxkUal/O4uirvHgdzMKS1aWJBAV0qh2qj5qAZqpeBfVUYGWv+4iK9Az7SPyZ4fyNju1uA==",
+      "engines": {
+        "node": ">=12.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      },
+      "peerDependencies": {
+        "postcss": "^8.3.3"
+      }
+    },
+    "node_modules/postcss-selector-parser": {
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz",
+      "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-sorting": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-5.0.1.tgz",
+      "integrity": "sha512-Y9fUFkIhfrm6i0Ta3n+89j56EFqaNRdUKqXyRp6kvTcSXnmgEjaVowCXH+JBe9+YKWqd4nc28r2sgwnzJalccA==",
+      "dependencies": {
+        "lodash": "^4.17.14",
+        "postcss": "^7.0.17"
+      },
+      "engines": {
+        "node": ">=8.7.0"
+      }
+    },
+    "node_modules/postcss-sorting/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-sorting/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-sorting/node_modules/chalk/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-sorting/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/postcss-sorting/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
+    "node_modules/postcss-sorting/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-sorting/node_modules/postcss": {
+      "version": "7.0.36",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
+      "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
+      "dependencies": {
+        "chalk": "^2.4.2",
+        "source-map": "^0.6.1",
+        "supports-color": "^6.1.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      }
+    },
+    "node_modules/postcss-sorting/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postcss-sorting/node_modules/supports-color": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/postcss-value-parser": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
+      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/pretty-format": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
+      "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
+      "dev": true,
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "ansi-regex": "^5.0.0",
+        "ansi-styles": "^4.0.0",
+        "react-is": "^17.0.1"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/pretty-hrtime": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
+      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/prettysize": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/prettysize/-/prettysize-2.0.0.tgz",
+      "integrity": "sha512-VVtxR7sOh0VsG8o06Ttq5TrI1aiZKmC+ClSn4eBPaNf4SHr5lzbYW+kYGX3HocBL/MfpVrRfFZ9V3vCbLaiplg==",
+      "dev": true
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
+    },
+    "node_modules/progress": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/prompts": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.1.tgz",
+      "integrity": "sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==",
+      "dev": true,
+      "dependencies": {
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.5"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "dev": true
+    },
+    "node_modules/psl": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
+      "dev": true
+    },
+    "node_modules/pump": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+      "dev": true,
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/puppeteer": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-9.1.1.tgz",
+      "integrity": "sha512-W+nOulP2tYd/ZG99WuZC/I5ljjQQ7EUw/jQGcIb9eu8mDlZxNY2SgcJXTLG9h5gRvqA3uJOe4hZXYsd3EqioMw==",
+      "deprecated": "Version no longer supported. Upgrade to @latest",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "debug": "^4.1.0",
+        "devtools-protocol": "0.0.869402",
+        "extract-zip": "^2.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "node-fetch": "^2.6.1",
+        "pkg-dir": "^4.2.0",
+        "progress": "^2.0.1",
+        "proxy-from-env": "^1.1.0",
+        "rimraf": "^3.0.2",
+        "tar-fs": "^2.0.0",
+        "unbzip2-stream": "^1.3.3",
+        "ws": "^7.2.3"
+      },
+      "engines": {
+        "node": ">=10.18.1"
+      }
+    },
+    "node_modules/q": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+      "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6.0",
+        "teleport": ">=0.2.0"
+      }
+    },
+    "node_modules/qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/quick-lru": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz",
+      "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/react-is": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+      "dev": true
+    },
+    "node_modules/read-cache": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+      "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=",
+      "dependencies": {
+        "pify": "^2.3.0"
+      }
+    },
+    "node_modules/read-pkg": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+      "dependencies": {
+        "@types/normalize-package-data": "^2.4.0",
+        "normalize-package-data": "^2.5.0",
+        "parse-json": "^5.0.0",
+        "type-fest": "^0.6.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg-up": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+      "dependencies": {
+        "find-up": "^4.1.0",
+        "read-pkg": "^5.2.0",
+        "type-fest": "^0.8.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg/node_modules/hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="
+    },
+    "node_modules/read-pkg/node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dependencies": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "node_modules/read-pkg/node_modules/semver": {
+      "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/read-pkg/node_modules/type-fest": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "dev": true,
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/redent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
+      "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
+      "dependencies": {
+        "indent-string": "^4.0.0",
+        "strip-indent": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/regenerate": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
+      "dev": true
+    },
+    "node_modules/regenerate-unicode-properties": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz",
+      "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==",
+      "dev": true,
+      "dependencies": {
+        "regenerate": "^1.4.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/regenerator-runtime": {
+      "version": "0.13.9",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+      "dev": true
+    },
+    "node_modules/regenerator-transform": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz",
+      "integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.8.4"
+      }
+    },
+    "node_modules/regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/regexpp": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      }
+    },
+    "node_modules/regexpu-core": {
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz",
+      "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==",
+      "dev": true,
+      "dependencies": {
+        "regenerate": "^1.4.0",
+        "regenerate-unicode-properties": "^8.2.0",
+        "regjsgen": "^0.5.1",
+        "regjsparser": "^0.6.4",
+        "unicode-match-property-ecmascript": "^1.0.4",
+        "unicode-match-property-value-ecmascript": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/regjsgen": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz",
+      "integrity": "sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==",
+      "dev": true
+    },
+    "node_modules/regjsparser": {
+      "version": "0.6.9",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz",
+      "integrity": "sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==",
+      "dev": true,
+      "dependencies": {
+        "jsesc": "~0.5.0"
+      },
+      "bin": {
+        "regjsparser": "bin/parser"
+      }
+    },
+    "node_modules/regjsparser/node_modules/jsesc": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+      "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+      "dev": true,
+      "bin": {
+        "jsesc": "bin/jsesc"
+      }
+    },
+    "node_modules/remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+      "dev": true
+    },
+    "node_modules/repeat-element": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
+      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/replace-ext": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz",
+      "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/request": {
+      "version": "2.88.2",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
+      "dev": true,
+      "dependencies": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.3",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.5.0",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/request-progress": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz",
+      "integrity": "sha1-XTa7V5YcZzqlt4jbyBQf3yO0Tgg=",
+      "dev": true,
+      "dependencies": {
+        "throttleit": "^1.0.0"
+      }
+    },
+    "node_modules/request/node_modules/form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "dev": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 0.12"
+      }
+    },
+    "node_modules/request/node_modules/tough-cookie": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "dev": true,
+      "dependencies": {
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/request/node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "dev": true,
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-from-string": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true
+    },
+    "node_modules/resolve": {
+      "version": "1.20.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
+      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
+      "dependencies": {
+        "is-core-module": "^2.2.0",
+        "path-parse": "^1.0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dev": true,
+      "dependencies": {
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-dir": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz",
+      "integrity": "sha1-shklmlYC+sXFxJatiUpujMQwJh4=",
+      "dev": true,
+      "dependencies": {
+        "expand-tilde": "^1.2.2",
+        "global-modules": "^0.2.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve-dir/node_modules/global-modules": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz",
+      "integrity": "sha1-6lo77ULG1s6ZWk+KEmm12uIjgo0=",
+      "dev": true,
+      "dependencies": {
+        "global-prefix": "^0.1.4",
+        "is-windows": "^0.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve-dir/node_modules/global-prefix": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz",
+      "integrity": "sha1-jTvGuNo8qBEqFg2NSW/wRiv+948=",
+      "dev": true,
+      "dependencies": {
+        "homedir-polyfill": "^1.0.0",
+        "ini": "^1.3.4",
+        "is-windows": "^0.2.0",
+        "which": "^1.2.12"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve-dir/node_modules/is-windows": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
+      "integrity": "sha1-3hqm1j6indJIc3tp8f+LgALSEIw=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+      "deprecated": "https://github.com/lydell/resolve-url#deprecated",
+      "dev": true
+    },
+    "node_modules/ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/reusify": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "engines": {
+        "iojs": ">=1.0.0",
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/rsvp": {
+      "version": "4.8.5",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
+      "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
+      "dev": true,
+      "engines": {
+        "node": "6.* || >= 7.*"
+      }
+    },
+    "node_modules/run-parallel": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "dependencies": {
+        "queue-microtask": "^1.2.2"
+      }
+    },
+    "node_modules/rxjs": {
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "dev": true,
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "node_modules/safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+      "dev": true,
+      "dependencies": {
+        "ret": "~0.1.10"
+      }
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "node_modules/sane": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
+      "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
+      "deprecated": "some dependency vulnerabilities fixed, support for node < 10 dropped, and newer ECMAScript syntax/features added",
+      "dev": true,
+      "dependencies": {
+        "@cnakazawa/watch": "^1.0.3",
+        "anymatch": "^2.0.0",
+        "capture-exit": "^2.0.0",
+        "exec-sh": "^0.3.2",
+        "execa": "^1.0.0",
+        "fb-watchman": "^2.0.0",
+        "micromatch": "^3.1.4",
+        "minimist": "^1.1.1",
+        "walker": "~1.0.5"
+      },
+      "bin": {
+        "sane": "src/cli.js"
+      },
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/sane/node_modules/anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "dev": true,
+      "dependencies": {
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      }
+    },
+    "node_modules/sane/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/sane/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "dev": true,
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sass": {
+      "version": "1.39.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.39.0.tgz",
+      "integrity": "sha512-F4o+RhJkNOIG0b6QudYU8c78ZADKZjKDk5cyrf8XTKWfrgbtyVVXImFstJrc+1pkQDCggyidIOytq6gS4gCCZg==",
+      "dependencies": {
+        "chokidar": ">=3.0.0 <4.0.0"
+      },
+      "bin": {
+        "sass": "sass.js"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/sax": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true
+    },
+    "node_modules/saxes": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
+      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+      "dev": true,
+      "dependencies": {
+        "xmlchars": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+      "dev": true
+    },
+    "node_modules/set-value": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-4.1.0.tgz",
+      "integrity": "sha512-zTEg4HL0RwVrqcWs3ztF+x1vkxfm0lP+MQQFPiMJTKVceBwEV0A569Ou8l9IYQG8jOZdMVI1hGsc0tmeD2o/Lw==",
+      "dev": true,
+      "funding": [
+        "https://github.com/sponsors/jonschlinkert",
+        "https://paypal.me/jonathanschlinkert",
+        "https://jonschlinkert.dev/sponsor"
+      ],
+      "dependencies": {
+        "is-plain-object": "^2.0.4",
+        "is-primitive": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=11.0"
+      }
+    },
+    "node_modules/shallow-clone": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-0.1.2.tgz",
+      "integrity": "sha1-WQnodLp3EG1zrEFM/sH/yofZcGA=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.1",
+        "kind-of": "^2.0.1",
+        "lazy-cache": "^0.2.3",
+        "mixin-object": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/shallow-clone/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/shallow-clone/node_modules/kind-of": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-2.0.1.tgz",
+      "integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/shallow-clone/node_modules/lazy-cache": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-0.2.7.tgz",
+      "integrity": "sha1-f+3fLctu23fRHvHRF6tf/fCrG2U=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/shellwords": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
+      "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/side-channel": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.0",
+        "get-intrinsic": "^1.0.2",
+        "object-inspect": "^1.9.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
+      "dev": true
+    },
+    "node_modules/simple-swizzle": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+      "integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
+      "dev": true,
+      "dependencies": {
+        "is-arrayish": "^0.3.1"
+      }
+    },
+    "node_modules/simple-swizzle/node_modules/is-arrayish": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
+      "dev": true
+    },
+    "node_modules/sisteransi": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+      "dev": true
+    },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
+      "dependencies": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
+      "dependencies": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/is-accessor-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/is-data-descriptor": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/is-descriptor": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+      "dev": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-util/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/snapdragon-util/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-resolve": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
+      "dev": true,
+      "dependencies": {
+        "atob": "^2.1.2",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.19",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
+      "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
+      "dev": true,
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/source-map-support/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-url": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
+      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
+      "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
+      "dev": true
+    },
+    "node_modules/spawnd": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/spawnd/-/spawnd-5.0.0.tgz",
+      "integrity": "sha512-28+AJr82moMVWolQvlAIv3JcYDkjkFTEmfDc503wxrF5l2rQ3dFz6DpbXp3kD4zmgGGldfM4xM4v1sFj/ZaIOA==",
+      "dev": true,
+      "dependencies": {
+        "exit": "^0.1.2",
+        "signal-exit": "^3.0.3",
+        "tree-kill": "^1.2.2",
+        "wait-port": "^0.2.9"
+      }
+    },
+    "node_modules/spdx-correct": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
+      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-exceptions": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="
+    },
+    "node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-license-ids": {
+      "version": "3.0.10",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz",
+      "integrity": "sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA=="
+    },
+    "node_modules/specificity": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz",
+      "integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==",
+      "bin": {
+        "specificity": "bin/specificity"
+      }
+    },
+    "node_modules/split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
+    },
+    "node_modules/sshpk": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+      "dev": true,
+      "dependencies": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      },
+      "bin": {
+        "sshpk-conv": "bin/sshpk-conv",
+        "sshpk-sign": "bin/sshpk-sign",
+        "sshpk-verify": "bin/sshpk-verify"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/stable": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
+      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+      "dev": true
+    },
+    "node_modules/stack-trace": {
+      "version": "0.0.10",
+      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
+      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
+      "dev": true,
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/stack-utils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz",
+      "integrity": "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==",
+      "dev": true,
+      "dependencies": {
+        "escape-string-regexp": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/stack-utils/node_modules/escape-string-regexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+      "dev": true,
+      "dependencies": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+      "dev": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string_decoder/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/string-length": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+      "dev": true,
+      "dependencies": {
+        "char-regex": "^1.0.2",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+      "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string.prototype.trimend": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
+      "integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/string.prototype.trimstart": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
+      "integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dependencies": {
+        "ansi-regex": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/strip-indent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
+      "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
+      "dependencies": {
+        "min-indent": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/style-search": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
+      "integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI="
+    },
+    "node_modules/stylelint": {
+      "version": "14.5.3",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.5.3.tgz",
+      "integrity": "sha512-omHETL+kGHR+fCXFK1SkZD/A+emCP9esggAdWEl8GPjTNeyRYj+H6uetRDcU+7E451zwWiUYGVAX+lApsAZgsQ==",
+      "dependencies": {
+        "balanced-match": "^2.0.0",
+        "colord": "^2.9.2",
+        "cosmiconfig": "^7.0.1",
+        "css-functions-list": "^3.0.1",
+        "debug": "^4.3.3",
+        "execall": "^2.0.0",
+        "fast-glob": "^3.2.11",
+        "fastest-levenshtein": "^1.0.12",
+        "file-entry-cache": "^6.0.1",
+        "get-stdin": "^8.0.0",
+        "global-modules": "^2.0.0",
+        "globby": "^11.1.0",
+        "globjoin": "^0.1.4",
+        "html-tags": "^3.1.0",
+        "ignore": "^5.2.0",
+        "import-lazy": "^4.0.0",
+        "imurmurhash": "^0.1.4",
+        "is-plain-object": "^5.0.0",
+        "known-css-properties": "^0.24.0",
+        "mathml-tag-names": "^2.1.3",
+        "meow": "^9.0.0",
+        "micromatch": "^4.0.4",
+        "normalize-path": "^3.0.0",
+        "normalize-selector": "^0.2.0",
+        "picocolors": "^1.0.0",
+        "postcss": "^8.4.6",
+        "postcss-media-query-parser": "^0.2.3",
+        "postcss-resolve-nested-selector": "^0.1.1",
+        "postcss-safe-parser": "^6.0.0",
+        "postcss-selector-parser": "^6.0.9",
+        "postcss-value-parser": "^4.2.0",
+        "resolve-from": "^5.0.0",
+        "specificity": "^0.4.1",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "style-search": "^0.1.0",
+        "supports-hyperlinks": "^2.2.0",
+        "svg-tags": "^1.0.0",
+        "table": "^6.8.0",
+        "v8-compile-cache": "^2.3.0",
+        "write-file-atomic": "^4.0.1"
+      },
+      "bin": {
+        "stylelint": "bin/stylelint.js"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/stylelint"
+      }
+    },
+    "node_modules/stylelint-config-recommended": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
+      "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
+      "peerDependencies": {
+        "stylelint": "^14.0.0"
+      }
+    },
+    "node_modules/stylelint-config-recommended-scss": {
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-5.0.2.tgz",
+      "integrity": "sha512-b14BSZjcwW0hqbzm9b0S/ScN2+3CO3O4vcMNOw2KGf8lfVSwJ4p5TbNEXKwKl1+0FMtgRXZj6DqVUe/7nGnuBg==",
+      "dependencies": {
+        "postcss-scss": "^4.0.2",
+        "stylelint-config-recommended": "^6.0.0",
+        "stylelint-scss": "^4.0.0"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.0.0"
+      }
+    },
+    "node_modules/stylelint-config-recommended-scss/node_modules/stylelint-scss": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.1.0.tgz",
+      "integrity": "sha512-BNYTo7MMamhFOlcaAWp2dMpjg6hPyM/FFqfDIYzmYVLMmQJqc8lWRIiTqP4UX5bresj9Vo0dKC6odSh43VP2NA==",
+      "dependencies": {
+        "lodash": "^4.17.21",
+        "postcss-media-query-parser": "^0.2.3",
+        "postcss-resolve-nested-selector": "^0.1.1",
+        "postcss-selector-parser": "^6.0.6",
+        "postcss-value-parser": "^4.1.0"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.0.0"
+      }
+    },
+    "node_modules/stylelint-config-standard": {
+      "version": "24.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-24.0.0.tgz",
+      "integrity": "sha512-+RtU7fbNT+VlNbdXJvnjc3USNPZRiRVp/d2DxOF/vBDDTi0kH5RX2Ny6errdtZJH3boO+bmqIYEllEmok4jiuw==",
+      "dependencies": {
+        "stylelint-config-recommended": "^6.0.0"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.0.0"
+      }
+    },
+    "node_modules/stylelint-config-standard-scss": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/stylelint-config-standard-scss/-/stylelint-config-standard-scss-3.0.0.tgz",
+      "integrity": "sha512-zt3ZbzIbllN1iCmc94e4pDxqpkzeR6CJo5DDXzltshuXr+82B8ylHyMMARNnUYrZH80B7wgY7UkKTYCFM0UUyw==",
+      "dependencies": {
+        "stylelint-config-recommended-scss": "^5.0.2",
+        "stylelint-config-standard": "^24.0.0"
+      },
+      "peerDependencies": {
+        "stylelint": "^14.0.0"
+      }
+    },
+    "node_modules/stylelint-order": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-4.1.0.tgz",
+      "integrity": "sha512-sVTikaDvMqg2aJjh4r48jsdfmqLT+nqB1MOsaBnvM3OwLx4S+WXcsxsgk5w18h/OZoxZCxuyXMh61iBHcj9Qiw==",
+      "dependencies": {
+        "lodash": "^4.17.15",
+        "postcss": "^7.0.31",
+        "postcss-sorting": "^5.0.1"
+      },
+      "peerDependencies": {
+        "stylelint": "^10.0.1 || ^11.0.0 || ^12.0.0 || ^13.0.0"
+      }
+    },
+    "node_modules/stylelint-order/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/stylelint-order/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/stylelint-order/node_modules/chalk/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/stylelint-order/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/stylelint-order/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
+    },
+    "node_modules/stylelint-order/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/stylelint-order/node_modules/postcss": {
+      "version": "7.0.36",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.36.tgz",
+      "integrity": "sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==",
+      "dependencies": {
+        "chalk": "^2.4.2",
+        "source-map": "^0.6.1",
+        "supports-color": "^6.1.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      }
+    },
+    "node_modules/stylelint-order/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/stylelint-order/node_modules/supports-color": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+      "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/stylelint-scss": {
+      "version": "3.20.1",
+      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.20.1.tgz",
+      "integrity": "sha512-OTd55O1TTAC5nGKkVmUDLpz53LlK39R3MImv1CfuvsK7/qugktqiZAeQLuuC4UBhzxCnsc7fp9u/gfRZwFAIkA==",
+      "dependencies": {
+        "lodash": "^4.17.15",
+        "postcss-media-query-parser": "^0.2.3",
+        "postcss-resolve-nested-selector": "^0.1.1",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "peerDependencies": {
+        "stylelint": "^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0 || ^12.0.0 || ^13.0.0"
+      }
+    },
+    "node_modules/stylelint/node_modules/debug": {
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
+      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/stylelint/node_modules/fast-glob": {
+      "version": "3.2.11",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
+      "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==",
+      "dependencies": {
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
+    "node_modules/stylelint/node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/stylelint/node_modules/ignore": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
+      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/stylelint/node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
+      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/stylelint/node_modules/nanoid": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
+      "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/stylelint/node_modules/postcss": {
+      "version": "8.4.7",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.7.tgz",
+      "integrity": "sha512-L9Ye3r6hkkCeOETQX6iOaWZgjp3LL6Lpqm6EtgbKrgqGGteRMNb9vzBfRL96YOSu8o7x3MfIH9Mo5cPJFGrW6A==",
+      "dependencies": {
+        "nanoid": "^3.3.1",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      }
+    },
+    "node_modules/stylelint/node_modules/postcss-selector-parser": {
+      "version": "6.0.9",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz",
+      "integrity": "sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ==",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/stylelint/node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
+    },
+    "node_modules/stylelint/node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
+    },
+    "node_modules/stylelint/node_modules/source-map-js": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/stylelint/node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/stylelint/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/stylelint/node_modules/table": {
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz",
+      "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==",
+      "dependencies": {
+        "ajv": "^8.0.1",
+        "lodash.truncate": "^4.4.2",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/stylelint/node_modules/write-file-atomic": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz",
+      "integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==",
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^3.0.7"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-hyperlinks": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz",
+      "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==",
+      "dependencies": {
+        "has-flag": "^4.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/svg-sprite": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/svg-sprite/-/svg-sprite-1.5.2.tgz",
+      "integrity": "sha512-ifDmjrhdV0OdKJp2tSssBT2m97e7gNpwWCMaapEBqe3wHTOsv1UFolQKBzC1wdVUUXdCa62tijVYPmuVSDCTmA==",
+      "dev": true,
+      "dependencies": {
+        "@xmldom/xmldom": "^0.7.2",
+        "async": "^3.2.1",
+        "css-selector-parser": "^1.4.1",
+        "cssmin": "^0.4.3",
+        "cssom": "^0.4.4",
+        "glob": "^7.1.7",
+        "js-yaml": "^3.14.1",
+        "lodash": "^4.17.21",
+        "mkdirp": "^0.5.5",
+        "mustache": "^4.2.0",
+        "phantomjs-prebuilt": "^2.1.16",
+        "prettysize": "^2.0.0",
+        "svgo": "^1.3.2",
+        "vinyl": "^2.2.1",
+        "winston": "^3.3.3",
+        "xpath": "^0.0.32",
+        "yargs": "^15.4.1"
+      },
+      "bin": {
+        "svg-sprite": "bin/svg-sprite.js"
+      },
+      "engines": {
+        "node": ">=6.4.0"
+      }
+    },
+    "node_modules/svg-sprite/node_modules/cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "node_modules/svg-sprite/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/svg-sprite/node_modules/y18n": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+      "dev": true
+    },
+    "node_modules/svg-sprite/node_modules/yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/svg-tags": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
+      "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q="
+    },
+    "node_modules/svgo": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
+      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
+      "deprecated": "This SVGO version is no longer supported. Upgrade to v2.x.x.",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.1",
+        "coa": "^2.0.2",
+        "css-select": "^2.0.0",
+        "css-select-base-adapter": "^0.1.1",
+        "css-tree": "1.0.0-alpha.37",
+        "csso": "^4.0.2",
+        "js-yaml": "^3.13.1",
+        "mkdirp": "~0.5.1",
+        "object.values": "^1.1.0",
+        "sax": "~1.2.4",
+        "stable": "^0.1.8",
+        "unquote": "~1.1.1",
+        "util.promisify": "~1.0.0"
+      },
+      "bin": {
+        "svgo": "bin/svgo"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/svgo/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/svgo/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/svgo/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/svgo/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/svgo/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/svgo/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/symbol-tree": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+      "dev": true
+    },
+    "node_modules/table": {
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
+      "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
+      "dependencies": {
+        "ajv": "^8.0.1",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.truncate": "^4.4.2",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/tar-fs": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
+      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "dev": true,
+      "dependencies": {
+        "chownr": "^1.1.1",
+        "mkdirp-classic": "^0.5.2",
+        "pump": "^3.0.0",
+        "tar-stream": "^2.1.4"
+      }
+    },
+    "node_modules/tar-stream": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
+      "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
+      "dev": true,
+      "dependencies": {
+        "bl": "^4.0.3",
+        "end-of-stream": "^1.4.1",
+        "fs-constants": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^3.1.1"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/terminal-link": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
+      "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-escapes": "^4.2.1",
+        "supports-hyperlinks": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dev": true,
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/text-hex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
+      "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==",
+      "dev": true
+    },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
+    },
+    "node_modules/throat": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz",
+      "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==",
+      "dev": true
+    },
+    "node_modules/throttleit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",
+      "integrity": "sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=",
+      "dev": true
+    },
+    "node_modules/through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "node_modules/tmpl": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
+      "dev": true
+    },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+      "dev": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-object-path/node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "node_modules/to-object-path/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "dev": true,
+      "dependencies": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/tough-cookie": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
+      "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==",
+      "dev": true,
+      "dependencies": {
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.1.2"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tough-cookie/node_modules/universalify": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
+      "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+      "dev": true,
+      "dependencies": {
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tree-kill": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
+      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
+      "dev": true,
+      "bin": {
+        "tree-kill": "cli.js"
+      }
+    },
+    "node_modules/trim": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/trim/-/trim-1.0.1.tgz",
+      "integrity": "sha512-3JVP2YVqITUisXblCDq/Bi4P9457G/sdEamInkyvCsjbTcXLXIiG7XCb4kGMFWh6JGXesS3TKxOPtrncN/xe8w==",
+      "dev": true
+    },
+    "node_modules/trim-newlines": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-4.0.2.tgz",
+      "integrity": "sha512-GJtWyq9InR/2HRiLZgpIKv+ufIKrVrvjQWEj7PxAXNc5dwbNJkqhAUoAGgzRmULAnoOM5EIpveYd3J2VeSAIew==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/triple-beam": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.3.0.tgz",
+      "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==",
+      "dev": true
+    },
+    "node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
+    },
+    "node_modules/tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "dev": true
+    },
+    "node_modules/type-check": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+      "dependencies": {
+        "prelude-ls": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.18.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz",
+      "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
+    },
+    "node_modules/typedarray-to-buffer": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "dev": true,
+      "dependencies": {
+        "is-typedarray": "^1.0.0"
+      }
+    },
+    "node_modules/unbox-primitive": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
+      "integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1",
+        "has-bigints": "^1.0.1",
+        "has-symbols": "^1.0.2",
+        "which-boxed-primitive": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/unbzip2-stream": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
+      "integrity": "sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==",
+      "dev": true,
+      "dependencies": {
+        "buffer": "^5.2.1",
+        "through": "^2.3.8"
+      }
+    },
+    "node_modules/unicode-canonical-property-names-ecmascript": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
+      "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-match-property-ecmascript": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
+      "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
+      "dev": true,
+      "dependencies": {
+        "unicode-canonical-property-names-ecmascript": "^1.0.4",
+        "unicode-property-aliases-ecmascript": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-match-property-value-ecmascript": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz",
+      "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/unicode-property-aliases-ecmascript": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz",
+      "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/union-value": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "dev": true,
+      "dependencies": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/union-value/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+      "dev": true,
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/union-value/node_modules/set-value": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "dev": true,
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/universalify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/unquote": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
+      "integrity": "sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=",
+      "dev": true
+    },
+    "node_modules/unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+      "dev": true,
+      "dependencies": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-value": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+      "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+      "dev": true,
+      "dependencies": {
+        "get-value": "^2.0.3",
+        "has-values": "^0.1.4",
+        "isobject": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+      "dev": true,
+      "dependencies": {
+        "isarray": "1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-values": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+      "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/uri-js": {
+      "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
+      "dependencies": {
+        "punycode": "^2.1.0"
+      }
+    },
+    "node_modules/urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+      "deprecated": "Please see https://github.com/lydell/urix#deprecated",
+      "dev": true
+    },
+    "node_modules/use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    },
+    "node_modules/util.promisify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
+      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
+      "dev": true,
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.2",
+        "has-symbols": "^1.0.1",
+        "object.getownpropertydescriptors": "^2.1.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true,
+      "optional": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/v8-compile-cache": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+      "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="
+    },
+    "node_modules/v8-to-istanbul": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz",
+      "integrity": "sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==",
+      "dev": true,
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.1",
+        "convert-source-map": "^1.6.0",
+        "source-map": "^0.7.3"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/v8-to-istanbul/node_modules/source-map": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
+      "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dependencies": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "dev": true,
+      "engines": [
+        "node >=0.6.0"
+      ],
+      "dependencies": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
+    "node_modules/verror/node_modules/core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "node_modules/vinyl": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz",
+      "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==",
+      "dev": true,
+      "dependencies": {
+        "clone": "^2.1.1",
+        "clone-buffer": "^1.0.0",
+        "clone-stats": "^1.0.0",
+        "cloneable-readable": "^1.0.0",
+        "remove-trailing-separator": "^1.0.1",
+        "replace-ext": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/w3c-hr-time": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+      "dev": true,
+      "dependencies": {
+        "browser-process-hrtime": "^1.0.0"
+      }
+    },
+    "node_modules/w3c-xmlserializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
+      "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
+      "dev": true,
+      "dependencies": {
+        "xml-name-validator": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/wait-on": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-5.3.0.tgz",
+      "integrity": "sha512-DwrHrnTK+/0QFaB9a8Ol5Lna3k7WvUR4jzSKmz0YaPBpuN2sACyiPVKVfj6ejnjcajAcvn3wlbTyMIn9AZouOg==",
+      "dev": true,
+      "dependencies": {
+        "axios": "^0.21.1",
+        "joi": "^17.3.0",
+        "lodash": "^4.17.21",
+        "minimist": "^1.2.5",
+        "rxjs": "^6.6.3"
+      },
+      "bin": {
+        "wait-on": "bin/wait-on"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/wait-port": {
+      "version": "0.2.9",
+      "resolved": "https://registry.npmjs.org/wait-port/-/wait-port-0.2.9.tgz",
+      "integrity": "sha512-hQ/cVKsNqGZ/UbZB/oakOGFqic00YAMM5/PEj3Bt4vKarv2jWIWzDbqlwT94qMs/exAQAsvMOq99sZblV92zxQ==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^2.4.2",
+        "commander": "^3.0.2",
+        "debug": "^4.1.1"
+      },
+      "bin": {
+        "wait-port": "bin/wait-port.js"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/wait-port/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wait-port/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wait-port/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/wait-port/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/wait-port/node_modules/commander": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz",
+      "integrity": "sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==",
+      "dev": true
+    },
+    "node_modules/wait-port/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/wait-port/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/walker": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
+      "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
+      "dev": true,
+      "dependencies": {
+        "makeerror": "1.0.x"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
+      "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.4"
+      }
+    },
+    "node_modules/whatwg-encoding": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
+      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+      "dev": true,
+      "dependencies": {
+        "iconv-lite": "0.4.24"
+      }
+    },
+    "node_modules/whatwg-mimetype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
+      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
+      "dev": true
+    },
+    "node_modules/whatwg-url": {
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
+      "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+      "dev": true,
+      "dependencies": {
+        "lodash": "^4.7.0",
+        "tr46": "^2.1.0",
+        "webidl-conversions": "^6.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/which-boxed-primitive": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+      "dev": true,
+      "dependencies": {
+        "is-bigint": "^1.0.1",
+        "is-boolean-object": "^1.1.0",
+        "is-number-object": "^1.0.4",
+        "is-string": "^1.0.5",
+        "is-symbol": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/which-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+      "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+      "dev": true
+    },
+    "node_modules/winston": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/winston/-/winston-3.3.3.tgz",
+      "integrity": "sha512-oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw==",
+      "dev": true,
+      "dependencies": {
+        "@dabh/diagnostics": "^2.0.2",
+        "async": "^3.1.0",
+        "is-stream": "^2.0.0",
+        "logform": "^2.2.0",
+        "one-time": "^1.0.0",
+        "readable-stream": "^3.4.0",
+        "stack-trace": "0.0.x",
+        "triple-beam": "^1.3.0",
+        "winston-transport": "^4.4.0"
+      },
+      "engines": {
+        "node": ">= 6.4.0"
+      }
+    },
+    "node_modules/winston-transport": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.0.tgz",
+      "integrity": "sha512-Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw==",
+      "dev": true,
+      "dependencies": {
+        "readable-stream": "^2.3.7",
+        "triple-beam": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 6.4.0"
+      }
+    },
+    "node_modules/winston-transport/node_modules/readable-stream": {
+      "version": "2.3.7",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "dev": true,
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/winston-transport/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/winston/node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+    },
+    "node_modules/write-file-atomic": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+      "dev": true,
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "is-typedarray": "^1.0.0",
+        "signal-exit": "^3.0.2",
+        "typedarray-to-buffer": "^3.1.5"
+      }
+    },
+    "node_modules/ws": {
+      "version": "7.5.5",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
+      "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==",
+      "dev": true,
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/xml-name-validator": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
+      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
+      "dev": true
+    },
+    "node_modules/xmlchars": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+      "dev": true
+    },
+    "node_modules/xpath": {
+      "version": "0.0.32",
+      "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.32.tgz",
+      "integrity": "sha512-rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "node_modules/yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/yargs": {
+      "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "dev": true,
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/yargs/node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/yauzl": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+      "dev": true,
+      "dependencies": {
+        "buffer-crc32": "~0.2.3",
+        "fd-slicer": "~1.1.0"
+      }
+    }
+  },
   "dependencies": {
     "@babel/code-frame": {
       "version": "7.14.5",
@@ -1702,7 +14055,8 @@
     "acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
-      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
+      "requires": {}
     },
     "acorn-walk": {
       "version": "7.2.0",
@@ -5375,7 +17729,8 @@
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz",
       "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "jest-puppeteer": {
       "version": "5.0.4",
@@ -6810,12 +19165,14 @@
     "postcss-safe-parser": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
-      "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ=="
+      "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
+      "requires": {}
     },
     "postcss-scss": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.3.tgz",
-      "integrity": "sha512-j4KxzWovfdHsyxwl1BxkUal/O4uirvHgdzMKS1aWJBAV0qh2qj5qAZqpeBfVUYGWv+4iK9Az7SPyZ4fyNju1uA=="
+      "integrity": "sha512-j4KxzWovfdHsyxwl1BxkUal/O4uirvHgdzMKS1aWJBAV0qh2qj5qAZqpeBfVUYGWv+4iK9Az7SPyZ4fyNju1uA==",
+      "requires": {}
     },
     "postcss-selector-parser": {
       "version": "6.0.6",
@@ -8053,6 +20410,23 @@
         }
       }
     },
+    "string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "~5.2.0"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        }
+      }
+    },
     "string-length": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
@@ -8093,23 +20467,6 @@
         "define-properties": "^1.1.3"
       }
     },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.2.0"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.2.1",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-          "dev": true
-        }
-      }
-    },
     "strip-ansi": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
@@ -8328,7 +20685,8 @@
     "stylelint-config-recommended": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz",
-      "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw=="
+      "integrity": "sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==",
+      "requires": {}
     },
     "stylelint-config-recommended-scss": {
       "version": "5.0.2",
@@ -9403,7 +21761,8 @@
       "version": "7.5.5",
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.5.tgz",
       "integrity": "sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==",
-      "dev": true
+      "dev": true,
+      "requires": {}
     },
     "xml-name-validator": {
       "version": "3.0.0",

From 4d6ba5689146d6b068fa1db6ed90292f7b629807 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 9 Mar 2022 12:04:12 +0100
Subject: [PATCH 572/720] update main branch of base theme with latest commits

---
 composer.lock | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/composer.lock b/composer.lock
index 8e5302001..da3de9213 100644
--- a/composer.lock
+++ b/composer.lock
@@ -13457,12 +13457,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/UN-OCHA/common_design.git",
-                "reference": "99d344e1b84bab55dfeb7b40ea7a20576d8f56c5"
+                "reference": "6d8222a5d87bfb6effbd22f41676512a021a6c53"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/99d344e1b84bab55dfeb7b40ea7a20576d8f56c5",
-                "reference": "99d344e1b84bab55dfeb7b40ea7a20576d8f56c5",
+                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/6d8222a5d87bfb6effbd22f41676512a021a6c53",
+                "reference": "6d8222a5d87bfb6effbd22f41676512a021a6c53",
                 "shasum": ""
             },
             "require": {
@@ -13477,7 +13477,7 @@
                 "source": "https://github.com/UN-OCHA/common_design/tree/main",
                 "issues": "https://github.com/UN-OCHA/common_design/issues"
             },
-            "time": "2022-03-02T15:22:05+00:00"
+            "time": "2022-03-09T10:50:04+00:00"
         },
         {
             "name": "webflo/drupal-finder",
@@ -15147,5 +15147,5 @@
         "php": ">=8.0"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.1.0"
 }

From 9cb2198b409aaaa6093def1d5051fab549e97d30 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Wed, 9 Mar 2022 16:42:31 +0100
Subject: [PATCH 573/720] RW-405 set v6 base theme

---
 composer.json |  6 +-----
 composer.lock | 12 ++++++------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/composer.json b/composer.json
index bdfc5e588..b2cfb2a14 100644
--- a/composer.json
+++ b/composer.json
@@ -43,10 +43,6 @@
         {
             "type": "vcs",
             "url": "https://github.com/UN-OCHA/rwint-api-indexer.git"
-        },
-        {
-            "type": "vcs",
-            "url": "https://github.com/UN-OCHA/common_design.git"
         }
     ],
     "require": {
@@ -94,7 +90,7 @@
         "reliefweb/simple-datepicker": "^v1.3.1",
         "symfony/flex": "^2.0",
         "symfony/uid": "^6.0",
-        "unocha/common_design": "dev-main",
+        "unocha/common_design": "^6.0.0",
         "webflo/drupal-finder": "^1.2.2"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
index da3de9213..68d2b13c3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "7be541e270ba736de977d0537280b27c",
+    "content-hash": "b33c52f95904d69a6d064a667c727d0c",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -13453,7 +13453,7 @@
         },
         {
             "name": "unocha/common_design",
-            "version": "dev-main",
+            "version": "v6.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/UN-OCHA/common_design.git",
@@ -13469,13 +13469,14 @@
                 "composer/installers": "^1.2"
             },
             "type": "drupal-theme",
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "GPL-2.0-only"
             ],
             "description": "OCHA Common Design base theme for Drupal 8",
             "support": {
-                "source": "https://github.com/UN-OCHA/common_design/tree/main",
-                "issues": "https://github.com/UN-OCHA/common_design/issues"
+                "issues": "https://github.com/UN-OCHA/common_design/issues",
+                "source": "https://github.com/UN-OCHA/common_design/tree/v6.0.0"
             },
             "time": "2022-03-09T10:50:04+00:00"
         },
@@ -15138,8 +15139,7 @@
     "minimum-stability": "dev",
     "stability-flags": {
         "drupal/inline_entity_form": 5,
-        "drupal/taxonomy_term_revision": 20,
-        "unocha/common_design": 20
+        "drupal/taxonomy_term_revision": 20
     },
     "prefer-stable": true,
     "prefer-lowest": false,

From 7ed998c56a85ce25341465fd66188eb98c76c6c4 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 10 Mar 2022 07:01:29 +0000
Subject: [PATCH 574/720] [RW-411] Replace guideline form handlers and limit to
 guideline lists as parents

---
 .../reliefweb_guidelines.module               |  10 ++
 .../src/Form/GuidelineDeleteForm.php          |  25 +++
 .../src/Form/GuidelineForm.php                | 151 ++++++++++++++++++
 .../src/Services/GuidelineFormAlter.php       |  34 +---
 .../src/Services/GuidelineListFormAlter.php   |  12 +-
 5 files changed, 190 insertions(+), 42 deletions(-)
 create mode 100644 html/modules/custom/reliefweb_guidelines/src/Form/GuidelineDeleteForm.php
 create mode 100644 html/modules/custom/reliefweb_guidelines/src/Form/GuidelineForm.php

diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
index b6573f70e..5c46560ac 100644
--- a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
@@ -11,6 +11,8 @@ use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\reliefweb_entities\EntityFormAlterServiceBase;
 use Drupal\reliefweb_guidelines\Controller\GuidelineSinglePageController;
 use Drupal\reliefweb_guidelines\Entity\Guideline;
+use Drupal\reliefweb_guidelines\Form\GuidelineDeleteForm;
+use Drupal\reliefweb_guidelines\Form\GuidelineForm;
 use Drupal\reliefweb_guidelines\Form\GuidelineSortForm;
 use Drupal\reliefweb_guidelines\ModeratedGuidelineStorageSchema;
 use Drupal\reliefweb_revisions\Services\EntityHistory;
@@ -65,6 +67,14 @@ function reliefweb_guidelines_entity_type_alter(array &$entity_types) {
   if (isset($entity_types['guideline'])) {
     $entity_types['guideline']->setHandlerClass('storage_schema', ModeratedGuidelineStorageSchema::class);
 
+    // Replace the guideline edit/create form handler.
+    $entity_types['guideline']->setFormClass('default', GuidelineForm::class);
+    $entity_types['guideline']->setFormClass('add', GuidelineForm::class);
+    $entity_types['guideline']->setFormClass('edit', GuidelineForm::class);
+
+    // Replace the delete form handler.
+    $entity_types['guideline']->setFormClass('delete', GuidelineDeleteForm::class);
+
     // Replace the sort form handler.
     $entity_types['guideline']->setFormClass('sort', GuidelineSortForm::class);
   }
diff --git a/html/modules/custom/reliefweb_guidelines/src/Form/GuidelineDeleteForm.php b/html/modules/custom/reliefweb_guidelines/src/Form/GuidelineDeleteForm.php
new file mode 100644
index 000000000..2d8014ff4
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/src/Form/GuidelineDeleteForm.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Drupal\reliefweb_guidelines\Form;
+
+use Drupal\Core\Entity\ContentEntityDeleteForm;
+use Drupal\Core\Url;
+
+/**
+ * Provides a form for deleting Guideline entities.
+ *
+ * @ingroup guidelines
+ */
+class GuidelineDeleteForm extends ContentEntityDeleteForm {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getRedirectUrl() {
+    // Redirect to the moderation page for the guideline type.
+    return Url::fromRoute('reliefweb_moderation.content', [
+      'service' => $this->getEntity()->bundle(),
+    ]);
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_guidelines/src/Form/GuidelineForm.php b/html/modules/custom/reliefweb_guidelines/src/Form/GuidelineForm.php
new file mode 100644
index 000000000..e59375661
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/src/Form/GuidelineForm.php
@@ -0,0 +1,151 @@
+<?php
+
+namespace Drupal\reliefweb_guidelines\Form;
+
+use Drupal\Core\Entity\ContentEntityForm;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Link;
+use Drupal\Core\Url;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Form controller for Guideline edit forms.
+ *
+ * @ingroup guidelines
+ */
+class GuidelineForm extends ContentEntityForm {
+
+  /**
+   * The current user account.
+   *
+   * @var \Drupal\Core\Session\AccountProxyInterface
+   */
+  protected $account;
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    // Instantiates this form class.
+    $instance = parent::create($container);
+    $instance->account = $container->get('current_user');
+    return $instance;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    /** @var \Drupal\guidelines\Entity\Guideline $this->entity */
+    $form = parent::buildForm($form, $form_state);
+
+    // Only add a field to select the parent the guideline entries.
+    if ($this->entity->bundle() === 'field_guideline') {
+      $guideline_storage = $this->entityTypeManager->getStorage('guideline');
+      $guidelines = $guideline_storage->loadByProperties([
+        'type' => 'guideline_list',
+      ]);
+
+      $guideline_options = [];
+      foreach ($guidelines as $guideline) {
+        $guideline_options[$guideline->id()] = $guideline->label();
+      }
+
+      // Url to create a new guideline list.
+      $new_list_url = Url::fromRoute('entity.guideline.add_form', [
+        'guideline_type' => 'guideline_list',
+      ], [
+        'attributes' => [
+          'target' => '_blank',
+          'rel' => 'noopener noreferrer',
+        ],
+      ]);
+
+      $form['relations'] = [
+        '#type' => 'fieldset',
+        '#title' => $this->t('Relations'),
+        '#title_display' => 'invisible',
+        '#weight' => 10,
+      ];
+
+      $form['relations']['parent'] = [
+        '#type' => 'select',
+        '#title' => $this->t('Guideline list'),
+        '#options' => $guideline_options,
+        '#default_value' => $this->entity->parent?->target_id ?? NULL,
+        '#required' => TRUE,
+        '#empty_value' => '_none',
+        '#empty_option' => $this->t('- Select -'),
+        '#multiple' => FALSE,
+        '#description' => $this->t('Select the list this guideline belongs to. @new_list_link (and reload the form after).', [
+          '@new_list_link' => Link::fromTextAndUrl($this->t('Create a new list'), $new_list_url)->toString(),
+        ]),
+      ];
+    }
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildEntity(array $form, FormStateInterface $form_state) {
+    $guideline = parent::buildEntity($form, $form_state);
+
+    // Prevent leading and trailing spaces in guideline names.
+    $guideline->setName(trim($guideline->getName()));
+
+    // The parent field expects an array.
+    $parent = $form_state->getValue('parent');
+    if (empty($parent)) {
+      $guideline->parent = [];
+    }
+    elseif (is_scalar($parent)) {
+      $guideline->parent = [$parent];
+    }
+
+    return $guideline;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEditedFieldNames(FormStateInterface $form_state) {
+    if ($this->entity->bundle() === 'field_guideline') {
+      return array_merge(['parent'], parent::getEditedFieldNames($form_state));
+    }
+    else {
+      return parent::getEditedFieldNames($form_state);
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function save(array $form, FormStateInterface $form_state) {
+    $entity = $this->entity;
+
+    // Always create a new revision.
+    $entity->setNewRevision(TRUE);
+    $entity->setRevisionCreationTime($this->time->getRequestTime());
+    $entity->setRevisionUserId($this->account->id());
+
+    $status = parent::save($form, $form_state);
+
+    switch ($status) {
+      case SAVED_NEW:
+        $this->messenger()->addMessage($this->t('Created the %label Guideline.', [
+          '%label' => $entity->label(),
+        ]));
+        break;
+
+      default:
+        $this->messenger()->addMessage($this->t('Saved the %label Guideline.', [
+          '%label' => $entity->label(),
+        ]));
+    }
+
+    $form_state->setRedirect('entity.guideline.canonical', ['guideline' => $entity->id()]);
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineFormAlter.php b/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineFormAlter.php
index 24e41b33d..690f5425c 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineFormAlter.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineFormAlter.php
@@ -3,8 +3,6 @@
 namespace Drupal\reliefweb_guidelines\Services;
 
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Link;
-use Drupal\Core\Url;
 use Drupal\reliefweb_entities\EntityFormAlterServiceBase;
 
 /**
@@ -16,16 +14,6 @@ class GuidelineFormAlter extends EntityFormAlterServiceBase {
    * {@inheritdoc}
    */
   protected function addBundleFormAlterations(array &$form, FormStateInterface $form_state) {
-    // Hide the status field.
-    $form['status']['#access'] = FALSE;
-
-    // Force the new revision.
-    $form['new_revision']['#default_value'] = TRUE;
-    $form['new_revision']['#access'] = FALSE;
-
-    // More space for the description.
-    $form['field_description']['widget'][0]['#rows'] = 20;
-
     // Change the image field wrapper to a fieldset.
     $form['field_images']['widget']['#type'] = 'fieldset';
     $form['field_images']['widget']['#theme_wrappers'] = ['fieldset'];
@@ -34,27 +22,11 @@ protected function addBundleFormAlterations(array &$form, FormStateInterface $fo
     $form['field_field']['widget']['#attributes']['data-with-autocomplete'] = '';
     $form['field_field']['widget']['#description'] = $this->t('Select the node or term field(s) this guideline is for.');
 
-    // Url to create a new guideline list.
-    $new_list_url = Url::fromRoute('entity.guideline.add_form', [
-      'guideline_type' => 'guideline_list',
-    ], [
-      'attributes' => [
-        'target' => '_blank',
-        'rel' => 'noopener noreferrer',
-      ],
-    ]);
-
-    // @todo limit the list to guideline lists and make it mandotory.
-    $form['relations']['#type'] = 'fieldset';
-    $form['relations']['#title_display'] = 'invisible';
-    $form['relations']['parent']['#title'] = $this->t('Guideline list');
-    $form['relations']['parent']['#description'] = $this->t('Select the list this guideline belongs to. @new_list_link.', [
-      '@new_list_link' => Link::fromTextAndUrl($this->t('Create a new list'), $new_list_url)->toString(),
-    ]);
+    // Transform the parent selector into a select with autocomplete.
     $form['relations']['parent']['#attributes']['data-with-autocomplete'] = '';
-    $form['relations']['weight']['#description'] = $this->t('Guidelines are displayed in ascending order by weight.');
 
-    // Hide the url alias.
+    // Hide the url alias because we have a special rule to generate alias based
+    // on the guideline shortlink to allow easy internal linking.
     $form['path']['#access'] = FALSE;
   }
 
diff --git a/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineListFormAlter.php b/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineListFormAlter.php
index 17e4a3da5..d794dc813 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineListFormAlter.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineListFormAlter.php
@@ -14,17 +14,7 @@ class GuidelineListFormAlter extends EntityFormAlterServiceBase {
    * {@inheritdoc}
    */
   protected function addBundleFormAlterations(array &$form, FormStateInterface $form_state) {
-    // Hide the status field.
-    $form['status']['#access'] = FALSE;
-
-    // Force the new revision.
-    $form['new_revision']['#default_value'] = TRUE;
-    $form['new_revision']['#access'] = FALSE;
-
-    // Disallow selecting parents for guideline lists.
-    $form['relations']['#access'] = FALSE;
-
-    // Hide the url alias.
+    // Hide the url alias as it's not used for guideline lists.
     $form['path']['#access'] = FALSE;
   }
 

From 5d3541bde23dca0df63f0dee4e23230cf0926a5f Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 10 Mar 2022 07:02:24 +0000
Subject: [PATCH 575/720] [RW-416] Ensure error links on forms work

---
 .../custom/reliefweb_form/js/widget.autocomplete.js       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_form/js/widget.autocomplete.js b/html/modules/custom/reliefweb_form/js/widget.autocomplete.js
index 2f040754e..af8b623ed 100644
--- a/html/modules/custom/reliefweb_form/js/widget.autocomplete.js
+++ b/html/modules/custom/reliefweb_form/js/widget.autocomplete.js
@@ -604,6 +604,11 @@
         }
 
         var multiple = element.hasAttribute('multiple');
+        var id = element.id;
+
+        // Remove the id from the element, we'll add it to the input so that
+        // error links for example or clicking on the label for focus work.
+        element.removeAttribute('id');
 
         // Mark the select as being processed for autocomplete.
         element.classList.add('rw-autocomplete-select');
@@ -621,6 +626,7 @@
         input.setAttribute('type', 'search');
         input.setAttribute('autocomplete', 'off');
         input.setAttribute('placeholder', t('type and select...'));
+        input.setAttribute('id', id);
         input.classList.add('rw-autocomplete-input');
 
         // Toggler button to display all the options.
@@ -633,7 +639,7 @@
         // Prepare the selection container.
         var selection = document.createElement('div');
         selection.setAttribute('data-selection', '');
-        selection.setAttribute('id', element.id + '--selection');
+        selection.setAttribute('id', id + '--selection');
         selection.classList.add('rw-selection');
 
         // Wrapper for the autocomplete components.

From 54c29051ba756de38ba1e6d3ad198d01248c3520 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 10 Mar 2022 07:03:20 +0000
Subject: [PATCH 576/720] [RW-418] Fix spacing between title and content on
 generic forms and revision pages

---
 .../src/EntityFormAlterServiceBase.php                 |  2 ++
 .../components/rw-form/rw-form.css                     | 10 ----------
 .../components/rw-page-title/rw-page-title.css         | 10 ++++++++++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php b/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
index 7d57b399b..1755ae020 100644
--- a/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
+++ b/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
@@ -127,6 +127,8 @@ public function alterForm(array &$form, FormStateInterface $form_state) {
       return;
     }
 
+    $form['#attributes']['class'][] = 'rw-entity-form-altered';
+
     // Add the form alterations specific to the bundle.
     $this->addBundleFormAlterations($form, $form_state);
 
diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 619805d50..4c6c25d91 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -475,16 +475,6 @@ form [data-lengthchecker-status="ok"] {
 .node-form fieldset.field-new-source-wrapper {
   margin-top: 24px;
 }
-/* Term and Node edit forms */
-.taxonomy-term-country-profile-form,
-.taxonomy-term-disaster-profile-form,
-.taxonomy-term-source-user-posting-rights-form,
-.taxonomy-term-confirm-form,
-.node-confirm-form,
-.node-revision-revert-confirm,
-.node-revision-delete-confirm {
-  padding-top: 24px;
-}
 
 /**
  * Text formatter buttons.
diff --git a/html/themes/custom/common_design_subtheme/components/rw-page-title/rw-page-title.css b/html/themes/custom/common_design_subtheme/components/rw-page-title/rw-page-title.css
index ba111f862..a099b8785 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-page-title/rw-page-title.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-page-title/rw-page-title.css
@@ -14,3 +14,13 @@
 .rw-page-title + .rw-page-content {
   margin-top: 24px;
 }
+
+/* Spacing between page title and content on generic forms. */
+.rw-page-title + form:not(.rw-entity-form-altered) {
+  margin-top: 24px;
+}
+
+/* Spacing between page title and table (ex: revisions). */
+.rw-page-title + table {
+  margin-top: 24px;
+}

From 3e7ffe07060b81bd9544aed66a6abce20772207a Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 10 Mar 2022 07:04:58 +0000
Subject: [PATCH 577/720] [RW-417] Untag guidelines when guideline list is
 deleted

---
 .../src/Entity/GuidelineList.php              | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/html/modules/custom/reliefweb_guidelines/src/Entity/GuidelineList.php b/html/modules/custom/reliefweb_guidelines/src/Entity/GuidelineList.php
index 7777c94dd..49bf41f1f 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Entity/GuidelineList.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Entity/GuidelineList.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\reliefweb_guidelines\Entity;
 
+use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\guidelines\Entity\Guideline as GuidelineBase;
 use Drupal\reliefweb_moderation\EntityModeratedInterface;
 use Drupal\reliefweb_moderation\EntityModeratedTrait;
@@ -23,4 +24,31 @@ public function getDefaultModerationStatus() {
     return 'published';
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public static function postDelete(EntityStorageInterface $storage, array $entities) {
+    // Remove reference to the guideline list from guidelines that have it as
+    // parent.
+    if (!empty($entities)) {
+      $ids = [];
+      foreach ($entities as $entity) {
+        $ids[$entity->id()] = $entity->id();
+      }
+
+      $guidelines = $storage->loadByProperties([
+        'parent' => $ids,
+      ]);
+
+      foreach ($guidelines as $guideline) {
+        $guideline->parent->filter(function ($item) use ($ids) {
+          return !isset($ids[$item->target_id]);
+        });
+        $guideline->save();
+      }
+    }
+
+    parent::postDelete($storage, $entities);
+  }
+
 }

From 2e1e902a0d177c12dc2bb7dd1d7c0b7ab2a38c17 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 11 Mar 2022 04:59:19 +0000
Subject: [PATCH 578/720] [RW-414] Add form to sort guideline lists and fix
 some permission issues

---
 config/theme_switcher.rule.request_path.yml   |   2 +-
 config/user.role.editor.yml                   |  17 --
 config/user.role.webmaster.yml                |   1 +
 .../reliefweb-guidelines.css                  |   8 +
 .../reliefweb_guidelines.module               |  28 +++
 .../reliefweb_guidelines.permissions.yml      |   4 +
 .../reliefweb_guidelines.routing.yml          |   8 +
 .../reliefweb_guidelines.services.yml         |   4 +
 .../src/Form/GuidelineListSortForm.php        | 177 ++++++++++++++++++
 .../src/Form/GuidelineSortForm.php            |  42 ++++-
 .../src/Routing/RouteSubscriber.php           |  30 +++
 .../reliefweb-guidelines-list.html.twig       |   1 +
 12 files changed, 302 insertions(+), 20 deletions(-)
 create mode 100644 html/modules/custom/reliefweb_guidelines/src/Form/GuidelineListSortForm.php
 create mode 100644 html/modules/custom/reliefweb_guidelines/src/Routing/RouteSubscriber.php

diff --git a/config/theme_switcher.rule.request_path.yml b/config/theme_switcher.rule.request_path.yml
index b8d32f29f..09e3c4835 100644
--- a/config/theme_switcher.rule.request_path.yml
+++ b/config/theme_switcher.rule.request_path.yml
@@ -13,4 +13,4 @@ visibility:
   request_path:
     id: request_path
     negate: false
-    pages: "/moderation/content/*\r\n/user/*/edit\r\n/user/*/notifications\r\n/user/*/bookmarks\r\n/user/*/posts\r\n/user/*/contact\r\n/admin/community-topics\r\n/admin/reliefweb_revisions/history/*/*\r\n/admin/people\r\n/admin/structure/guideline/*"
+    pages: "/moderation/content/*\r\n/user/*/edit\r\n/user/*/notifications\r\n/user/*/bookmarks\r\n/user/*/posts\r\n/user/*/contact\r\n/admin/community-topics\r\n/admin/reliefweb_revisions/history/*/*\r\n/admin/people\r\n/admin/structure/guideline/*\r\n/admin/structure/guideline_list/*"
diff --git a/config/user.role.editor.yml b/config/user.role.editor.yml
index 5b9bd99ff..9d199c111 100644
--- a/config/user.role.editor.yml
+++ b/config/user.role.editor.yml
@@ -57,7 +57,6 @@ permissions:
   - 'access user contact forms'
   - 'access user profiles'
   - 'add content to books'
-  - 'add guideline entities'
   - 'administer community topics'
   - 'administer url aliases'
   - 'archive content'
@@ -124,7 +123,6 @@ permissions:
   - 'edit any report content'
   - 'edit any topic content'
   - 'edit any training content'
-  - 'edit guideline entities'
   - 'edit homepage headlines'
   - 'edit own announcement content'
   - 'edit own blog_post content'
@@ -144,18 +142,6 @@ permissions:
   - 'edit terms in source'
   - 'edit terms in tag'
   - 'edit user posting rights'
-  - 'field_guideline create entities'
-  - 'field_guideline delete any entities'
-  - 'field_guideline delete own entities'
-  - 'field_guideline edit any entities'
-  - 'field_guideline edit own entities'
-  - 'field_guideline view revisions'
-  - 'guideline_list create entities'
-  - 'guideline_list delete any entities'
-  - 'guideline_list delete own entities'
-  - 'guideline_list edit any entities'
-  - 'guideline_list edit own entities'
-  - 'guideline_list view revisions'
   - 'revert announcement revisions'
   - 'revert blog_post revisions'
   - 'revert book revisions'
@@ -164,14 +150,12 @@ permissions:
   - 'revert term revision'
   - 'revert topic revisions'
   - 'revert training revisions'
-  - 'sort all guideline'
   - 'update any media'
   - 'update media'
   - 'use enhanced input forms'
   - 'use text format guideline'
   - 'use text format html'
   - 'use text format markdown'
-  - 'view all guideline revisions'
   - 'view all media revisions'
   - 'view announcement revisions'
   - 'view any content'
@@ -190,5 +174,4 @@ permissions:
   - 'view term revision list'
   - 'view topic revisions'
   - 'view training revisions'
-  - 'view unpublished guideline entities'
   - 'view user email addresses'
diff --git a/config/user.role.webmaster.yml b/config/user.role.webmaster.yml
index 0061073f3..e150a8614 100644
--- a/config/user.role.webmaster.yml
+++ b/config/user.role.webmaster.yml
@@ -114,6 +114,7 @@ permissions:
   - 'revert all guideline revisions'
   - 'revert term revision'
   - 'sort all guideline'
+  - 'sort editorial guidelines'
   - 'use text format guideline'
   - 'view all guideline revisions'
   - 'view published guideline entities'
diff --git a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
index 12eb2f601..9cdcdbb55 100644
--- a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
+++ b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
@@ -836,3 +836,11 @@ aside nav a.active + a {
   vertical-align: middle;
   background: url("./assets/external-link.svg") 0 0 no-repeat;
 }
+
+.rw-guidelines-exit-link {
+  position: absolute;
+  top: 18px;
+  left: 220px;
+  color: white;
+  font-size: 12px;
+}
diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
index 5c46560ac..8334656ac 100644
--- a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.module
@@ -8,6 +8,7 @@
 use Drupal\Core\Cache\RefinableCacheableDependencyInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Url;
 use Drupal\reliefweb_entities\EntityFormAlterServiceBase;
 use Drupal\reliefweb_guidelines\Controller\GuidelineSinglePageController;
 use Drupal\reliefweb_guidelines\Entity\Guideline;
@@ -15,6 +16,7 @@ use Drupal\reliefweb_guidelines\Form\GuidelineDeleteForm;
 use Drupal\reliefweb_guidelines\Form\GuidelineForm;
 use Drupal\reliefweb_guidelines\Form\GuidelineSortForm;
 use Drupal\reliefweb_guidelines\ModeratedGuidelineStorageSchema;
+use Drupal\reliefweb_guidelines\Services\GuidelineListModeration;
 use Drupal\reliefweb_revisions\Services\EntityHistory;
 
 /**
@@ -60,6 +62,18 @@ function reliefweb_guidelines_entity_base_field_info(EntityTypeInterface $entity
   return $fields;
 }
 
+/**
+ * Implements hook_entity_base_field_info_alter().
+ */
+function reliefweb_guidelines_entity_base_field_info_alter(array &$fields, EntityTypeInterface $entity_type) {
+  if ($entity_type->id() === 'guideline' && isset($fields['parent'])) {
+    // Using "Guideline list" as label is a bit specific but it's ok in our case
+    // because only "normal" guidelines can have a parent and the parent is a
+    // guidele list entity.
+    $fields['parent']->setLabel('Guideline list');
+  }
+}
+
 /**
  * Implements hook_entity_type_alter().
  */
@@ -139,6 +153,20 @@ function reliefweb_guidelines_form_guideline_form_alter(array &$form, FormStateI
   EntityHistory::addHistoryToForm($form, $form_state);
 }
 
+/**
+ * Implements hook_form_HOOK_alter() for "reliefweb_moderation_page_filter_form".
+ */
+function reliefweb_guidelines_form_reliefweb_moderation_page_filter_form_alter(array &$form, FormStateInterface $form_state, $form_id) {
+  if (isset($form['#service']) && $form['#service'] instanceof GuidelineListModeration) {
+    $form['actions']['create']['#title'] = t('Create list');
+    $form['actions']['sort'] = [
+      '#type' => 'link',
+      '#url' => Url::fromRoute('reliefweb_guidelines.guideline_list.sort'),
+      '#title' => t('Sort lists'),
+    ];
+  }
+}
+
 /**
  * Implements hook_menu_local_tasks_alter().
  */
diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.permissions.yml b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.permissions.yml
index d6d7ed4a9..d5555bc59 100644
--- a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.permissions.yml
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.permissions.yml
@@ -1,3 +1,7 @@
 access editorial guidelines:
   title: 'Access editorial guidelines'
   description: 'Allow users to access the editorial guidelines.'
+
+sort editorial guidelines:
+  title: 'Sort editorial guidelines'
+  description: 'Allow users to sort editorial guidelines.'
diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.routing.yml b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.routing.yml
index ecda459d9..7015eb5e2 100644
--- a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.routing.yml
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.routing.yml
@@ -5,3 +5,11 @@ reliefweb_guidelines.guidelines:
     _controller: '\Drupal\reliefweb_guidelines\Controller\GuidelineSinglePageController::getPageContent'
   requirements:
     _permission: 'access editorial guidelines'
+
+reliefweb_guidelines.guideline_list.sort:
+  path: '/admin/structure/guideline_list/sort'
+  defaults:
+    _title: 'Sort guideline lists'
+    _form: '\Drupal\reliefweb_guidelines\Form\GuidelineListSortForm'
+  requirements:
+    _permission: 'sort editorial guidelines'
diff --git a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.services.yml b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.services.yml
index d030a2a8a..4d0b581df 100644
--- a/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.services.yml
+++ b/html/modules/custom/reliefweb_guidelines/reliefweb_guidelines.services.yml
@@ -1,4 +1,8 @@
 services:
+  reliefweb_guidelines.route_subscriber:
+    class: 'Drupal\reliefweb_guidelines\Routing\RouteSubscriber'
+    tags:
+      - { name: event_subscriber }
   reliefweb_moderation.field_guideline.moderation:
     class: Drupal\reliefweb_guidelines\Services\GuidelineModeration
     arguments: ['@current_user', '@database', '@date.formatter', '@entity_field.manager', '@entity_type.manager', '@pager.manager', '@pager.parameters', '@request_stack', '@string_translation']
diff --git a/html/modules/custom/reliefweb_guidelines/src/Form/GuidelineListSortForm.php b/html/modules/custom/reliefweb_guidelines/src/Form/GuidelineListSortForm.php
new file mode 100644
index 000000000..ed1cd7687
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/src/Form/GuidelineListSortForm.php
@@ -0,0 +1,177 @@
+<?php
+
+namespace Drupal\reliefweb_guidelines\Form;
+
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Form\FormBase;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Url;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\Core\Messenger\MessengerInterface;
+
+/**
+ * Sort guideline lists.
+ */
+class GuidelineListSortForm extends FormBase {
+
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(
+    EntityTypeManagerInterface $entity_type_manager
+  ) {
+    $this->entityTypeManager = $entity_type_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('entity_type.manager')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'guideline_list_sort_form';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildForm(array $form, FormStateInterface $form_state) {
+    /** @var \Drupal\reliefweb_guidelines\Entity\GuidelineList[] $entities */
+    $entities = $this->entityTypeManager
+      ->getStorage('guideline')
+      ->loadByProperties([
+        'type' => 'guideline_list',
+      ]);
+
+    $form['#title'] = $this->t('Sort guideline lists');
+
+    if (empty($entities)) {
+      $form['empty'] = [
+        '#markup' => $this->t('No guideline lists'),
+      ];
+      return $form;
+    }
+
+    // Sort the guideline lists by weight.
+    uasort($entities, function ($a, $b) {
+      return $a->getWeight() <=> $b->getWeight();
+    });
+
+    // Build table.
+    $group_class = 'group-order-weight';
+    $form['order'] = [
+      '#type' => 'table',
+      '#header' => [
+        $this->t('Guideline list'),
+        $this->t('Weight'),
+      ],
+      '#empty' => $this->t('No guideline lists.'),
+      '#tableselect' => FALSE,
+      '#tabledrag' => [
+        [
+          'action' => 'order',
+          'relationship' => 'sibling',
+          'group' => $group_class,
+          'hidden' => TRUE,
+        ],
+      ],
+    ];
+
+    // Build rows.
+    foreach ($entities as $entity) {
+      $id = $entity->id();
+
+      $form['order'][$id]['#attributes']['class'][] = 'draggable';
+      $form['order'][$id]['#weight'] = $entity->getWeight();
+
+      // Label.
+      $form['order'][$id]['label'] = [
+        '#markup' => $entity->toLink($entity->label(), 'edit-form')->toString(),
+      ];
+
+      // Weight.
+      $form['order'][$id]['weight'] = [
+        '#type' => 'weight',
+        '#title' => $this->t('Weight for @title', [
+          '@title' => $entity->label(),
+        ]),
+        '#title_display' => 'invisible',
+        '#default_value' => $entity->getWeight(),
+        '#attributes' => [
+          'class' => [
+            $group_class,
+          ],
+        ],
+      ];
+    }
+
+    $form['actions'] = [
+      '#type' => 'actions',
+      '#theme_wrappers' => [
+        'fieldset' => [
+          '#id' => 'actions',
+          '#title' => $this->t('Form actions'),
+          '#title_display' => 'invisible',
+        ],
+      ],
+      '#weight' => 99,
+    ];
+    $form['actions']['submit'] = [
+      '#type' => 'submit',
+      '#value' => $this->t('Save'),
+      '#button_type' => 'primary',
+    ];
+
+    return $form;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function submitForm(array &$form, FormStateInterface $form_state) {
+    /** @var \Drupal\reliefweb_guidelines\Entity\GuidelineList[] $entities */
+    $entities = $this->entityTypeManager
+      ->getStorage('guideline')
+      ->loadByProperties([
+        'type' => 'guideline_list',
+      ]);
+
+    $order = $form_state->getValue('order');
+
+    foreach ($entities as $entity) {
+      $id = $entity->id();
+      if (isset($order[$id]['weight'])) {
+        if ($entity->getWeight() !== $order[$id]['weight']) {
+          $entity->setWeight($order[$id]['weight']);
+          $entity->setNewRevision(FALSE);
+          // @todo see if we can preserve the previous revision user
+          // and timestamp.
+          $entity->save();
+        }
+      }
+    }
+
+    // Show the user a message.
+    $this->messenger()->addMessage($this->t('Guideline lists successfully re-ordered.'), MessengerInterface::TYPE_STATUS);
+
+    // Redirect to the moderation backend.
+    $form_state->setRedirectUrl(Url::fromRoute('reliefweb_moderation.content', [
+      'service' => 'guideline_list',
+    ]));
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_guidelines/src/Form/GuidelineSortForm.php b/html/modules/custom/reliefweb_guidelines/src/Form/GuidelineSortForm.php
index e277e1856..be7fcb827 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Form/GuidelineSortForm.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Form/GuidelineSortForm.php
@@ -2,10 +2,14 @@
 
 namespace Drupal\reliefweb_guidelines\Form;
 
+use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Entity\ContentEntityForm;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Messenger\MessengerInterface;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\guidelines\Entity\GuidelineInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -52,7 +56,10 @@ public function buildForm(array $form, FormStateInterface $form_state) {
 
     $children = $guideline->getChildren();
     if (empty($children)) {
-      return;
+      $form['empty'] = [
+        '#markup' => $this->t('No guideline children'),
+      ];
+      return $form;
     }
 
     // Build table.
@@ -103,7 +110,17 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       ];
     }
 
-    $form['actions']['#type'] = 'actions';
+    $form['actions'] = [
+      '#type' => 'actions',
+      '#theme_wrappers' => [
+        'fieldset' => [
+          '#id' => 'actions',
+          '#title' => $this->t('Form actions'),
+          '#title_display' => 'invisible',
+        ],
+      ],
+      '#weight' => 99,
+    ];
     $form['actions']['submit'] = [
       '#type' => 'submit',
       '#value' => $this->t('Save'),
@@ -146,10 +163,31 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
       if (isset($new_weights[$child->id()])) {
         if ($child->getWeight() !== $new_weights[$child->id()]['weight']) {
           $child->setWeight($new_weights[$child->id()]['weight']);
+          $child->setNewRevision(FALSE);
+          // @todo see if we can preserve the previous revision user
+          // and timestamp.
           $child->save();
         }
       }
     }
+
+    // Show the user a message.
+    $this->messenger()->addMessage($this->t('Guidelines successfully re-ordered.'), MessengerInterface::TYPE_STATUS);
+  }
+
+  /**
+   * Check if the form can be accessed.
+   *
+   * @param \Drupal\Core\Session\AccountInterface $account
+   *   Run access checks for this account.
+   * @param \Drupal\guidelines\Entity\GuidelineInterface $guideline
+   *   The guideline entity the form is for.
+   *
+   * @return \Drupal\Core\Access\AccessResultInterface
+   *   The access result.
+   */
+  public static function checkAccess(AccountInterface $account, GuidelineInterface $guideline) {
+    return AccessResult::allowedIf($guideline->bundle() === 'guideline_list');
   }
 
 }
diff --git a/html/modules/custom/reliefweb_guidelines/src/Routing/RouteSubscriber.php b/html/modules/custom/reliefweb_guidelines/src/Routing/RouteSubscriber.php
new file mode 100644
index 000000000..009400037
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/src/Routing/RouteSubscriber.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Drupal\reliefweb_guidelines\Routing;
+
+use Drupal\Core\Routing\RouteSubscriberBase;
+use Symfony\Component\Routing\RouteCollection;
+
+/**
+ * Listens to the dynamic route events.
+ */
+class RouteSubscriber extends RouteSubscriberBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function alterRoutes(RouteCollection $collection) {
+    // Set the proper permission to access the guideline json data.
+    if ($route = $collection->get('guidelines.form.json')) {
+      $route->setRequirement('_permission', 'access editorial guidelines');
+    }
+    // Set the proper permission to access the guideline sort form and add
+    // a custom acccess check handler to be able to deny access to non-list
+    // guidelines because they don't have children.
+    if ($route = $collection->get('entity.guideline.sort')) {
+      $route->setRequirement('_permission', 'sort editorial guidelines');
+      $route->setRequirement('_custom_access', '\Drupal\reliefweb_guidelines\Form\GuidelineSortForm::checkAccess');
+    }
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-list.html.twig b/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-list.html.twig
index 63b213d9b..b70bc9b89 100644
--- a/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-list.html.twig
+++ b/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-list.html.twig
@@ -15,6 +15,7 @@
 <div{{ attributes.addClass('rw-guidelines-list') }}>
   <aside>
     <h1>{{ title }}</h1>
+    <a href="/" class="rw-guidelines-exit-link">exit</a>
     <form action="#search">
       <input type="text" placeholder="Search">
     </form>

From f4439f6a173025cb772345efff53f310d502b5d9 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 11 Mar 2022 05:05:48 +0000
Subject: [PATCH 579/720] [RW-421] Improve filter tips styling

---
 .../common_design_subtheme.libraries.yml      |  8 ++++
 .../rw-filter-tips/rw-filter-tips.css         | 28 +++++++++++
 .../components/rw-form/rw-form--widget.css    |  5 +-
 .../components/rw-token/rw-token.css          |  4 +-
 .../content-edit/filter-tips.html.twig        | 48 +++++++++++++++++++
 5 files changed, 89 insertions(+), 4 deletions(-)
 create mode 100644 html/themes/custom/common_design_subtheme/components/rw-filter-tips/rw-filter-tips.css
 create mode 100644 html/themes/custom/common_design_subtheme/templates/content-edit/filter-tips.html.twig

diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
index 11d330b71..0c2d0a22c 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.libraries.yml
@@ -127,6 +127,13 @@ rw-external-links:
   dependencies:
     - common_design_subtheme/rw-icons
 
+rw-filter-tips:
+  css:
+    theme:
+      components/rw-filter-tips/rw-filter-tips.css: {}
+  dependencies:
+    - common_design_subtheme/rw-icons
+
 rw-form:
   css:
     theme:
@@ -282,6 +289,7 @@ rw-revisions:
       components/rw-revisions/rw-revisions.css: {}
   dependencies:
    - common_design_subtheme/rw-icons
+   - common_design_subtheme/rw-moderation-status
    - common_design_subtheme/rw-loading
    - common_design_subtheme/rw-user-posting-right
 
diff --git a/html/themes/custom/common_design_subtheme/components/rw-filter-tips/rw-filter-tips.css b/html/themes/custom/common_design_subtheme/components/rw-filter-tips/rw-filter-tips.css
new file mode 100644
index 000000000..371da3429
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/components/rw-filter-tips/rw-filter-tips.css
@@ -0,0 +1,28 @@
+:root {
+  --cd-flow-space: 12px;
+}
+
+.rw-filter-tips__category > summary {
+  list-style-type: none;
+  cursor: pointer;
+}
+.rw-filter-tips__category > summary * {
+  display: inline;
+}
+
+/* Use custom icon */
+.rw-filter-tips__category > summary::-webkit-details-marker {
+  display: none;
+}
+.rw-filter-tips__category > summary::before {
+  display: inline-block;
+  overflow: hidden;
+  width: 12px;
+  height: 12px;
+  margin-right: 8px;
+  content: "";
+  background: var(--rw-icons--common--arrow-right--12--dark-blue);
+}
+.rw-filter-tips__category[open] > summary::before {
+  background: var(--rw-icons--toggle--down--12--dark-blue);
+}
diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
index ad8289692..c60d21e8b 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
@@ -233,6 +233,7 @@ form .ief-form .fieldset-wrapper {
 .rw-file-widget summary {
   display: flex;
   align-items: baseline;
+  list-style-type: none;
   cursor: pointer;
 }
 .rw-file-widget summary > span {
@@ -249,7 +250,7 @@ form .ief-form .fieldset-wrapper {
   height: 12px;
   margin-right: 6px;
   content: "";
-  background: var(--rw-icons--toggle--down--12--dark-blue);
+  background: var(--rw-icons--common--arrow-right--12--dark-blue);
 }
 .rw-file-widget details[open] > summary {
   margin-bottom: 8px;
@@ -257,7 +258,7 @@ form .ief-form .fieldset-wrapper {
   border-bottom: 1px solid var(--cd-reliefweb-brand-grey--light);
 }
 .rw-file-widget details[open] > summary::before {
-  background: var(--rw-icons--toggle--up--12--dark-blue);
+  background: var(--rw-icons--toggle--down--12--dark-blue);
 }
 
 /* Warning when re-ordered. */
diff --git a/html/themes/custom/common_design_subtheme/components/rw-token/rw-token.css b/html/themes/custom/common_design_subtheme/components/rw-token/rw-token.css
index 0b29c1d49..55d6beb5e 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-token/rw-token.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-token/rw-token.css
@@ -30,10 +30,10 @@
   height: 12px;
   margin-right: 4px;
   content: "";
-  background: var(--rw-icons--toggle--down--12--dark-blue);
+  background: var(--rw-icons--common--arrow-right--12--dark-blue);
 }
 .rw-token-help[open] > summary::before {
-  background: var(--rw-icons--toggle--up--12--dark-blue);
+  background: var(--rw-icons--toggle--down--12--dark-blue);
 }
 .rw-token-help summary strong {
   font-size: 16px;
diff --git a/html/themes/custom/common_design_subtheme/templates/content-edit/filter-tips.html.twig b/html/themes/custom/common_design_subtheme/templates/content-edit/filter-tips.html.twig
new file mode 100644
index 000000000..5af7ba93d
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/templates/content-edit/filter-tips.html.twig
@@ -0,0 +1,48 @@
+{#
+/**
+ * @file
+ * Theme override for a set of filter tips.
+ *
+ * Available variables:
+ * - tips: Descriptions and a CSS ID in the form of 'module-name/filter-id'
+ *   (only used when 'long' is TRUE) for each filter in one or more text
+ *   formats.
+ * - long: A flag indicating whether the passed-in filter tips contain extended
+ *   explanations, i.e. intended to be output on the path 'filter/tips'
+ *   (TRUE), or are in a short format, i.e. suitable to be displayed below a
+ *   form element. Defaults to FALSE.
+ * - multiple: A flag indicating there is more than one filter tip.
+ *
+ * @see template_preprocess_filter_tips()
+ */
+#}
+{{ attach_library('common_design_subtheme/rw-filter-tips') }}
+
+<div class="rw-page-content rw-filter-tips [ cd-flow ]">
+{% if multiple %}
+  <h2>{{ 'Text Formats'|t }}</h2>
+{% endif %}
+
+{% if tips|length %}
+  {% for name, tip in tips %}
+
+    {% if multiple %}
+      <details{{ attributes.addClass('rw-filter-tips__category') }}>
+      <summary><h3 class="rw-filter-tips__category__label">{{ tip.name }}</h3></summary>
+    {% endif %}
+
+    {% if tip.list|length %}
+      <ul class="[ cd-flow ]">
+      {% for item in tip.list %}
+        <li{{ tip.attributes }}>{{ item.tip }}</li>
+      {% endfor %}
+      </ul>
+    {% endif %}
+
+    {% if multiple %}
+      </details>
+    {% endif %}
+
+  {% endfor %}
+{% endif %}
+</div>

From 50d2f358cfb7f822d1ab1fc39f7f0f4b2e1ff11b Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 11 Mar 2022 05:06:27 +0000
Subject: [PATCH 580/720] [RW-422] Show guideline parent in revision history

---
 composer.patches.json                                          | 3 +++
 .../custom/reliefweb_revisions/src/Services/EntityHistory.php  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/composer.patches.json b/composer.patches.json
index 37d0ed7df..e9eb5a036 100644
--- a/composer.patches.json
+++ b/composer.patches.json
@@ -3,6 +3,9 @@
         "drupal/core" : {
             "https://www.drupal.org/project/drupal/issues/3047110": "patches/core--drupal--3047110-taxonomy-term-moderation-class.patch"
         },
+        "drupal/guidelines": {
+            "https://www.drupal.org/project/guidelines/issues/3268995": "https://git.drupalcode.org/project/guidelines/-/merge_requests/2.diff"
+        },
         "drupal/inline_entity_form": {
             "https://www.drupal.org/project/inline_entity_form/issues/3226253": "https://git.drupalcode.org/project/inline_entity_form/-/merge_requests/33.diff"
         },
diff --git a/html/modules/custom/reliefweb_revisions/src/Services/EntityHistory.php b/html/modules/custom/reliefweb_revisions/src/Services/EntityHistory.php
index 310188e12..599837454 100644
--- a/html/modules/custom/reliefweb_revisions/src/Services/EntityHistory.php
+++ b/html/modules/custom/reliefweb_revisions/src/Services/EntityHistory.php
@@ -1363,6 +1363,7 @@ protected function getRevisionDiff(EntityRevisionedInterface $revision, ?EntityR
     $allowed = [
       $this->getEntityTypeLabelField($revision->getEntityTypeId()) => TRUE,
       'description' => TRUE,
+      'parent' => TRUE,
     ];
 
     $diff = [];

From c8170a1628bd58c606f926136d2ef7ca067deb8f Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 15 Mar 2022 01:57:43 +0000
Subject: [PATCH 581/720] [RW-423] Add authorization header to download of
 trello images

---
 .../reliefweb_guidelines/drush.services.yml   |   2 +-
 .../Commands/ReliefWebGuidelinesCommands.php  | 195 +++++++++++++++++-
 2 files changed, 185 insertions(+), 12 deletions(-)

diff --git a/html/modules/custom/reliefweb_guidelines/drush.services.yml b/html/modules/custom/reliefweb_guidelines/drush.services.yml
index aeb29a023..b1dde068f 100644
--- a/html/modules/custom/reliefweb_guidelines/drush.services.yml
+++ b/html/modules/custom/reliefweb_guidelines/drush.services.yml
@@ -1,6 +1,6 @@
 services:
   reliefweb_guidelines.commands:
     class: \Drupal\reliefweb_guidelines\Commands\ReliefWebGuidelinesCommands
-    arguments: ['@account_switcher', '@config.factory', '@entity_field.manager', '@entity_type.manager', '@file_system', '@http_client']
+    arguments: ['@account_switcher', '@config.factory', '@entity_field.manager', '@entity_type.manager', '@file.repository', '@file_system', '@http_client', '@messenger', '@stream_wrapper_manager']
     tags:
       - { name: drush.command }
diff --git a/html/modules/custom/reliefweb_guidelines/src/Commands/ReliefWebGuidelinesCommands.php b/html/modules/custom/reliefweb_guidelines/src/Commands/ReliefWebGuidelinesCommands.php
index aae32e416..f3eb55dda 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Commands/ReliefWebGuidelinesCommands.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Commands/ReliefWebGuidelinesCommands.php
@@ -5,13 +5,19 @@
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Entity\EntityFieldManagerInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\File\Exception\FileException;
+use Drupal\Core\File\Exception\InvalidStreamWrapperException;
 use Drupal\Core\File\FileSystemInterface;
+use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\Core\Session\AccountSwitcherInterface;
+use Drupal\Core\StreamWrapper\StreamWrapperManagerInterface;
 use Drupal\Core\Url;
+use Drupal\file\FileRepositoryInterface;
 use Drupal\guidelines\Entity\Guideline;
 use Drush\Commands\DrushCommands;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\ClientException;
+use GuzzleHttp\Exception\TransferException;
 use Symfony\Component\Uid\Uuid;
 
 /**
@@ -28,6 +34,13 @@ class ReliefWebGuidelinesCommands extends DrushCommands {
    */
   protected $accountSwitcher;
 
+  /**
+   * The config factory.
+   *
+   * @var \Drupal\Core\Config\ConfigFactoryInterface
+   */
+  protected $configFactory;
+
   /**
    * The entity field manager service.
    *
@@ -42,6 +55,13 @@ class ReliefWebGuidelinesCommands extends DrushCommands {
    */
   protected $entityTypeManager;
 
+  /**
+   * The file repository.
+   *
+   * @var \Drupal\file\FileRepositoryInterface
+   */
+  protected $fileRepository;
+
   /**
    * The file system service.
    *
@@ -57,11 +77,18 @@ class ReliefWebGuidelinesCommands extends DrushCommands {
   protected $httpClient;
 
   /**
-   * ReliefWeb trello config.
+   * The messenger service.
    *
-   * @var \Drupal\Core\Config\ImmutableConfig
+   * @var \Drupal\Core\Messenger\MessengerInterface
    */
-  protected $trelloConfig;
+  protected $messenger;
+
+  /**
+   * The stream wrapper manager.
+   *
+   * @var \Drupal\Core\StreamWrapper\StreamWrapperManagerInterface
+   */
+  protected $streamWrapperManager;
 
   /**
    * {@inheritdoc}
@@ -71,15 +98,57 @@ public function __construct(
     ConfigFactoryInterface $config_factory,
     EntityFieldManagerInterface $entity_field_manager,
     EntityTypeManagerInterface $entity_type_manager,
+    FileRepositoryInterface $file_repository,
     FileSystemInterface $file_system,
-    ClientInterface $http_client
+    ClientInterface $http_client,
+    MessengerInterface $messenger,
+    StreamWrapperManagerInterface $stream_wrapper_manager,
   ) {
     $this->accountSwitcher = $account_switcher;
+    $this->configFactory = $config_factory;
     $this->entityFieldManager = $entity_field_manager;
     $this->entityTypeManager = $entity_type_manager;
+    $this->fileRepository = $file_repository;
     $this->fileSystem = $file_system;
     $this->httpClient = $http_client;
-    $this->trelloConfig = $config_factory->get('reliefweb_guidelines.settings');
+    $this->messenger = $messenger;
+    $this->streamWrapperManager = $stream_wrapper_manager;
+  }
+
+  /**
+   * Get the trello board ID.
+   *
+   * @return string
+   *   Trello key.
+   */
+  public function getTrelloBoardId() {
+    return $this->configFactory
+      ->get('reliefweb_guidelines.settings')
+      ->get('trello_board_id');
+  }
+
+  /**
+   * Get the trello key.
+   *
+   * @return string
+   *   Trello key.
+   */
+  public function getTrelloKey() {
+    return $this->configFactory
+      ->get('reliefweb_guidelines.settings')
+      ->get('trello_key');
+  }
+
+  /**
+   * Get the trello token.
+   *
+   * @return string
+   *   Trello key.
+   */
+  public function getTrelloToken() {
+    return $this->configFactory
+      ->get('reliefweb_guidelines.settings')
+      ->get('trello_token');
   }
 
   /**
@@ -95,9 +164,9 @@ public function __construct(
    * @validate-module-enabled reliefweb_guidelines,reliefweb_utility
    */
   public function migrateFromTrello() {
-    $key = $this->trelloConfig->get('trello_key');
-    $token = $this->trelloConfig->get('trello_token');
-    $board_id = $this->trelloConfig->get('trello_board_id');
+    $key = $this->getTrelloKey();
+    $token = $this->getTrelloToken();
+    $board_id = $this->getTrelloBoardId();
 
     if (empty($key) || empty($token) || empty($board_id)) {
       $this->logger->error('Missing Trello key, token or board id.');
@@ -343,8 +412,15 @@ protected function fetchImage($url) {
     $this->fileSystem->prepareDirectory($destination, FileSystemInterface::CREATE_DIRECTORY);
 
     try {
+      $options = [];
+      if (strpos($url, 'https://trello.com') === 0) {
+        $key = $this->getTrelloKey();
+        $token = $this->getTrelloToken();
+        $options['headers']['Authorization'] = "OAuth oauth_consumer_key=\"{$key}\", oauth_token=\"{$token}\"";
+      }
+
       /** @var \Drupal\file\FileInterface $file */
-      $file = system_retrieve_file($url, $destination, TRUE, FileSystemInterface::EXISTS_REPLACE);
+      $file = $this->retrieveFile($url, $destination, TRUE, FileSystemInterface::EXISTS_REPLACE, $options);
       if (!$file) {
         $this->logger->error($url . ' not fetched');
         return NULL;
@@ -358,6 +434,103 @@ protected function fetchImage($url) {
     return $file;
   }
 
+  /**
+   * Attempts to get a file using Guzzle HTTP client and to store it locally.
+   *
+   * This replaces `system_retrieve_file()`, adding an Authorization header
+   * for Trello images.
+   *
+   * @param string $url
+   *   The URL of the file to grab.
+   * @param string $destination
+   *   Stream wrapper URI specifying where the file should be placed. If a
+   *   directory path is provided, the file is saved into that directory under
+   *   its original name. If the path contains a filename as well, that one will
+   *   be used instead.
+   *   If this value is omitted, the site's default files scheme will be used,
+   *   usually "public://".
+   * @param bool $managed
+   *   If this is set to TRUE, the file API hooks will be invoked and the file
+   *   is registered in the database.
+   * @param int $replace
+   *   Replace behavior when the destination file already exists:
+   *   - FileSystemInterface::EXISTS_REPLACE: Replace the existing file.
+   *   - FileSystemInterface::EXISTS_RENAME: Append _{incrementing number} until
+   *     the filename is unique.
+   *   - FileSystemInterface::EXISTS_ERROR: Do nothing and return FALSE.
+   * @param array $options
+   *   Request ptions to pass to the HTTP client.
+   *
+   * @return mixed
+   *   One of these possibilities:
+   *   - If it succeeds and $managed is FALSE, the location where the file was
+   *     saved.
+   *   - If it succeeds and $managed is TRUE, a \Drupal\file\FileInterface
+   *     object which describes the file.
+   *   - If it fails, FALSE.
+   *
+   * @see system_retrieve_file()
+   */
+  protected function retrieveFile($url, $destination, $managed = FALSE, $replace = FileSystemInterface::EXISTS_RENAME, array $options = []) {
+    $replace = FileSystemInterface::EXISTS_REPLACE;
+
+    $parsed_url = parse_url($url);
+
+    if (!isset($parsed_url['path'])) {
+      return FALSE;
+    }
+
+    if (!isset($destination)) {
+      $path = $this->fileSystem
+        ->basename($parsed_url['path']);
+      $path = $this->configFactory
+        ->get('system.file')
+        ->get('default_scheme') . '://' . $path;
+      $path = $this->streamWrapperManager
+        ->normalizeUri($path);
+    }
+    elseif (is_dir($this->fileSystem->realpath($destination))) {
+      // Prevent URIs with triple slashes when glueing parts together.
+      $path = str_replace('///', '//', "{$destination}/") .
+        $this->fileSystem->basename($parsed_url['path']);
+    }
+    else {
+      $path = $destination;
+    }
+
+    try {
+      $data = (string) $this->httpClient
+        ->get($url, $options)
+        ->getBody();
+
+      if ($managed) {
+        $local = $this->fileRepository->writeData($data, $path, $replace);
+      }
+      else {
+        $local = $this->fileSystem->saveData($data, $path, $replace);
+      }
+    }
+    catch (TransferException $exception) {
+      $this->messenger->addError(strtr('Failed to fetch file due to error "%error"', [
+        '%error' => $exception->getMessage(),
+      ]));
+      return FALSE;
+    }
+    catch (FileException | InvalidStreamWrapperException $exception) {
+      $this->messenger->addError(strtr('Failed to save file due to error "%error"', [
+        '%error' => $exception->getMessage(),
+      ]));
+      return FALSE;
+    }
+    if (!$local) {
+      $this->messenger->addError(strtr('@remote could not be saved to @path.', [
+        '@remote' => $url,
+        '@path' => $path,
+      ]));
+    }
+    return $local;
+  }
+
   /**
    * Extract possible shortlinks.
    *
@@ -496,8 +669,8 @@ protected function getCardAttachments($card_id) {
    */
   protected function fetchData($url, array $parameters = []) {
     $parameters += [
-      'key' => $this->trelloConfig->get('trello_key'),
-      'token' => $this->trelloConfig->get('trello_token'),
+      'key' => $this->getTrelloKey(),
+      'token' => $this->getTrelloToken(),
     ];
 
     $url = Url::fromUri($url, [

From 7edf1de1272be73aa2de5ec87701c832b8bfee3b Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 15 Mar 2022 06:51:45 +0000
Subject: [PATCH 582/720] [RW-189] Add custom GTM dimensions

---
 config/core.extension.yml                     |   1 +
 config/google_tag.container.default.yml       |  51 +++
 config/google_tag.settings.yml                |   7 +-
 .../custom/reliefweb_analytics/README.md      |   4 +
 .../reliefweb_analytics.info.yml              |   5 +
 .../reliefweb_analytics.module                | 303 ++++++++++++++++++
 6 files changed, 367 insertions(+), 4 deletions(-)
 create mode 100644 config/google_tag.container.default.yml
 create mode 100644 html/modules/custom/reliefweb_analytics/README.md
 create mode 100644 html/modules/custom/reliefweb_analytics/reliefweb_analytics.info.yml
 create mode 100644 html/modules/custom/reliefweb_analytics/reliefweb_analytics.module

diff --git a/config/core.extension.yml b/config/core.extension.yml
index 0e2244ec1..234e2c48d 100644
--- a/config/core.extension.yml
+++ b/config/core.extension.yml
@@ -52,6 +52,7 @@ module:
   path_alias: 0
   redirect: 0
   redis: 0
+  reliefweb_analytics: 0
   reliefweb_api: 0
   reliefweb_bookmarks: 0
   reliefweb_contact: 0
diff --git a/config/google_tag.container.default.yml b/config/google_tag.container.default.yml
new file mode 100644
index 000000000..b4261cb0b
--- /dev/null
+++ b/config/google_tag.container.default.yml
@@ -0,0 +1,51 @@
+uuid: 5ce87ecd-59b8-40ee-b45c-ecb290e7d5d6
+langcode: en
+status: true
+dependencies:
+  module:
+    - node
+    - taxonomy
+id: default
+label: Default
+weight: 0
+container_id: GTM-xxxxxx
+data_layer: dataLayer
+include_classes: false
+whitelist_classes: |-
+  google
+  nonGooglePixels
+  nonGoogleScripts
+  nonGoogleIframes
+blacklist_classes: |-
+  customScripts
+  customPixels
+include_environment: false
+environment_id: ''
+environment_token: ''
+path_toggle: 'exclude listed'
+path_list: |-
+  /admin*
+  /batch*
+  /user/*/edit*
+  /user/*/cancel*
+  moderation/*
+role_toggle: 'exclude listed'
+role_list:
+  administrator: administrator
+status_toggle: 'exclude listed'
+status_list: |-
+  403
+  404
+conditions:
+  'entity_bundle:node':
+    id: 'entity_bundle:node'
+    negate: false
+    context_mapping:
+      node: '@node.node_route_context:node'
+    bundles: {  }
+  'entity_bundle:taxonomy_term':
+    id: 'entity_bundle:taxonomy_term'
+    negate: false
+    context_mapping:
+      taxonomy_term: '@taxonomy_term.taxonomy_term_route_context:taxonomy_term'
+    bundles: {  }
diff --git a/config/google_tag.settings.yml b/config/google_tag.settings.yml
index 87516bc20..70b540269 100644
--- a/config/google_tag.settings.yml
+++ b/config/google_tag.settings.yml
@@ -25,13 +25,12 @@ _default_container:
   path_list: |-
     /admin*
     /batch*
-    /node/add*
-    /node/*/edit
-    /node/*/delete
     /user/*/edit*
     /user/*/cancel*
+    moderation/*
   role_toggle: 'exclude listed'
-  role_list: {  }
+  role_list:
+    administrator: administrator
   status_toggle: 'exclude listed'
   status_list: |-
     403
diff --git a/html/modules/custom/reliefweb_analytics/README.md b/html/modules/custom/reliefweb_analytics/README.md
new file mode 100644
index 000000000..bd5fe89ae
--- /dev/null
+++ b/html/modules/custom/reliefweb_analytics/README.md
@@ -0,0 +1,4 @@
+ReliefWeb - Analytics module
+============================
+
+This module provides analytics customizations.
diff --git a/html/modules/custom/reliefweb_analytics/reliefweb_analytics.info.yml b/html/modules/custom/reliefweb_analytics/reliefweb_analytics.info.yml
new file mode 100644
index 000000000..341bbb9e9
--- /dev/null
+++ b/html/modules/custom/reliefweb_analytics/reliefweb_analytics.info.yml
@@ -0,0 +1,5 @@
+type: module
+name: ReliefWeb Analytics
+description: 'Handles ReliefWeb analytics.'
+package: reliefweb
+core_version_requirement: ^9
diff --git a/html/modules/custom/reliefweb_analytics/reliefweb_analytics.module b/html/modules/custom/reliefweb_analytics/reliefweb_analytics.module
new file mode 100644
index 000000000..ea581b4c5
--- /dev/null
+++ b/html/modules/custom/reliefweb_analytics/reliefweb_analytics.module
@@ -0,0 +1,303 @@
+<?php
+
+/**
+ * @file
+ * ReliefWeb Analytics module file.
+ */
+
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Entity\FieldableEntityInterface;
+use Drupal\Component\Serialization\Json;
+use Drupal\Component\Render\FormattableMarkup;
+use Drupal\reliefweb_utility\Helpers\DateHelper;
+use Drupal\reliefweb_utility\Helpers\EntityHelper;
+
+/**
+ * Add datalayer dimensions for google tag manager.
+ *
+ * Note: the google_tag module store snippets on files for caching even when
+ * instructed to add the snippets inline. As a result we cannot easily add
+ * custom dimensions per entity so we inject them ourselves here.
+ *
+ * @todo if some dataLayer snippet is added via the UI or whatever, then this
+ * may need some refactoring to avoid overriding the dataLayer.
+ */
+function reliefweb_analytics_page_attachments(array &$attachments) {
+  $container = \Drupal::entityTypeManager()
+    ?->getStorage('google_tag_container')
+    ?->load('default');
+
+  // Check if we should add the custom dimensions.
+  if (!isset($container) || !$container->insertSnippet()) {
+    return;
+  }
+
+  $dimensions = [];
+  $dimensions += reliefweb_analytics_get_entity_dimensions();
+  $dimensions += reliefweb_analytics_get_user_dimensions();
+
+  $datalayer = array_filter($dimensions);
+  if (!empty($datalayer)) {
+    // Sort the dimensions.
+    ksort($datalayer, SORT_NATURAL);
+
+    // Add the datalayer javascript.
+    $datalayer_json = Json::encode($datalayer);
+    if (!empty($datalayer_json)) {
+      $variable = $container->variableClean('data_layer');
+      $content = $variable . ' = [' . $datalayer_json . '];';
+
+      $attachments['#attached']['html_head'][] = [
+        [
+          '#type' => 'html_tag',
+          // @see \Drupal\google_tag\Entity\ContainerManager::getScriptAttachments()
+          // Try to insert that just before the google tag script.
+          '#weight' => 8,
+          '#tag' => 'script',
+          '#value' => new FormattableMarkup($content, []),
+          '#attributes' => [
+            'type' => 'text/javascript',
+          ],
+        ],
+        'reliefweb_datalayer',
+      ];
+    }
+  }
+}
+
+/**
+ * Get the dimensions for the route entity if defined.
+ *
+ * @return array
+ *   Dimensions for the entity.
+ */
+function reliefweb_analytics_get_entity_dimensions() {
+  // Get the entity for the current request if any.
+  $entity = EntityHelper::getEntityFromRoute();
+  if (!isset($entity)) {
+    return [];
+  }
+
+  // We only handle dimensions on nodes and terms.
+  $entity_type_id = $entity->getEntityTypeId();
+  if ($entity_type_id !== 'node' && $entity_type_id !== 'taxonomy_term') {
+    return [];
+  }
+
+  $cache = \Drupal::cache();
+  $cache_id = 'reliefweb_analytics:entity:' . $entity->uuid();
+
+  // Try to load the computed dimensions from the cache.
+  $cache_object = $cache->get($cache_id);
+  if (!empty($cache_object->data)) {
+    return $cache_object->data;
+  }
+
+  // Use the untranslated entity for consistent dimensions.
+  $entity = $entity->getUntranslated();
+
+  // Cache metadata accumulator.
+  $cache_metadata = CacheableMetadata::createFromObject($entity);
+
+  // Set the dimensions for the entity.
+  switch ($entity->bundle()) {
+    // Nodes.
+    case 'report':
+      $dimensions = [
+        'dimension1' => 'Report',
+        'dimension2' => reliefweb_analytics_get_terms($entity, 'field_content_format', $cache_metadata),
+        'dimension3' => reliefweb_analytics_get_terms($entity, 'field_ocha_product', $cache_metadata),
+        'dimension4' => reliefweb_analytics_get_terms($entity, 'field_language', $cache_metadata),
+        'dimension5' => reliefweb_analytics_get_terms($entity, 'field_primary_country', $cache_metadata),
+        'dimension6' => reliefweb_analytics_get_terms($entity, 'field_country', $cache_metadata),
+        'dimension7' => reliefweb_analytics_get_terms($entity, 'field_source', $cache_metadata),
+        'dimension8' => reliefweb_analytics_get_terms($entity, 'field_theme', $cache_metadata),
+        'dimension9' => reliefweb_analytics_get_terms($entity, 'field_disaster', $cache_metadata),
+        'dimension10' => reliefweb_analytics_get_terms($entity, 'field_disaster_type', $cache_metadata),
+        // Disable vulnerable group field (#kUklB1e4).
+        /*'dimension11' => reliefweb_analytics_get_terms($entity, 'field_vulnerable_groups'),*/
+        'dimension13' => reliefweb_analytics_format_date($entity, 'created'),
+        'dimension20' => (string) $entity->getModerationStatusLabel(),
+      ];
+      break;
+
+    case 'job':
+      $dimensions = [
+        'dimension1' => 'Job',
+        'dimension4' => reliefweb_analytics_get_terms($entity, 'field_language', $cache_metadata),
+        'dimension6' => reliefweb_analytics_get_terms($entity, 'field_country', $cache_metadata),
+        'dimension7' => reliefweb_analytics_get_terms($entity, 'field_source', $cache_metadata),
+        'dimension8' => reliefweb_analytics_get_terms($entity, 'field_theme', $cache_metadata),
+        'dimension13' => reliefweb_analytics_format_date($entity, 'created'),
+        'dimension15' => reliefweb_analytics_get_terms($entity, 'field_job_type', $cache_metadata),
+        'dimension16' => reliefweb_analytics_get_terms($entity, 'field_job_experience', $cache_metadata),
+        'dimension17' => reliefweb_analytics_get_terms($entity, 'field_career_categories', $cache_metadata),
+        'dimension20' => (string) $entity->getModerationStatusLabel(),
+      ];
+      break;
+
+    case 'training':
+      $dimensions = [
+        'dimension1' => 'Training',
+        'dimension4' => reliefweb_analytics_get_terms($entity, 'field_language', $cache_metadata),
+        'dimension6' => reliefweb_analytics_get_terms($entity, 'field_country', $cache_metadata),
+        'dimension7' => reliefweb_analytics_get_terms($entity, 'field_source', $cache_metadata),
+        'dimension8' => reliefweb_analytics_get_terms($entity, 'field_theme', $cache_metadata),
+        'dimension13' => reliefweb_analytics_format_date($entity, 'created'),
+        'dimension14' => (string) $entity->field_cost->value,
+        'dimension17' => reliefweb_analytics_get_terms($entity, 'field_career_categories', $cache_metadata),
+        'dimension18' => reliefweb_analytics_get_terms($entity, 'field_training_type', $cache_metadata),
+        'dimension19' => reliefweb_analytics_get_terms($entity, 'field_training_format', $cache_metadata),
+        'dimension20' => (string) $entity->getModerationStatusLabel(),
+      ];
+      break;
+
+    case 'topics':
+      $dimensions = [
+        'dimension1' => 'Topic',
+        'dimension20' => (string) $entity->getModerationStatusLabel(),
+      ];
+      break;
+
+    case 'blog_post':
+      $dimensions = [
+        'dimension1' => 'Blog post',
+        'dimension20' => (string) $entity->getModerationStatusLabel(),
+      ];
+      break;
+
+    case 'book':
+      $dimensions = [
+        'dimension1' => 'Book page',
+        'dimension20' => (string) $entity->getModerationStatusLabel(),
+      ];
+      break;
+
+    // Taxonomy terms.
+    case 'country':
+      $dimensions = [
+        'dimension1' => 'Country',
+        'dimension6' => (string) $entity->label(),
+        'dimension20' => (string) $entity->getModerationStatusLabel(),
+      ];
+      break;
+
+    case 'disaster':
+      $dimensions = [
+        'dimension1' => 'Disaster',
+        'dimension5' => reliefweb_analytics_get_terms($entity, 'field_primary_country', $cache_metadata),
+        'dimension6' => reliefweb_analytics_get_terms($entity, 'field_country', $cache_metadata),
+        'dimension9' => (string) $entity->label(),
+        'dimension10' => reliefweb_analytics_get_terms($entity, 'field_disaster_type', $cache_metadata),
+        'dimension13' => reliefweb_analytics_format_date($entity, 'field_disaster_date'),
+        'dimension20' => (string) $entity->getModerationStatusLabel(),
+      ];
+      break;
+
+    case 'source':
+      $dimensions = [
+        'dimension1' => 'Organization',
+        'dimension6' => reliefweb_analytics_get_terms($entity, 'field_country', $cache_metadata),
+        'dimension7' => (string) $entity->label(),
+        'dimension20' => (string) $entity->getModerationStatusLabel(),
+      ];
+      break;
+  }
+
+  $dimensions = array_filter($dimensions);
+
+  // Cache the dimensions permanently until the entity or its dependencies are
+  // changed.
+  $cache->set($cache_id, $dimensions, Cache::PERMANENT, $cache_metadata->getCacheTags());
+
+  return $dimensions;
+}
+
+/**
+ * Get the dimensions for the current user.
+ *
+ * @return array
+ *   Dimensions for the user.
+ */
+function reliefweb_analytics_get_user_dimensions() {
+  $user = \Drupal::currentUser();
+
+  $cache = \Drupal::cache();
+  $cache_id = 'reliefweb_analytics:user' . $user->id();
+
+  // Try to load the computed dimensions from the cache.
+  $cache_object = \Drupal::cache()->get($cache_id);
+  if (!empty($cache_object->data)) {
+    return $cache_object->data;
+  }
+
+  // Retrieve the roles for the current user account.
+  $roles = [];
+  if (!$user->isAuthenticated()) {
+    $roles[] = 'anonymous user';
+  }
+  else {
+    $roles[] = 'authenticated user';
+
+    $role_ids = $user->getRoles(TRUE);
+    if (!empty($role_ids)) {
+      $role_entities = \Drupal::entityTypeManager()
+        ->getStorage('user_role')
+        ->loadMultiple($role_ids);
+      foreach ($role_entities as $role_entity) {
+        $roles[] = (string) $role_entity->label();
+      }
+    }
+  }
+
+  $dimensions = ['dimension12' => implode(', ', $roles)];
+
+  // Cache the dimensions permanently until the user is changed.
+  $cache->set($cache_id, $dimensions, Cache::PERMANENT, ['user:' . $user->id()]);
+
+  return $dimensions;
+}
+
+/**
+ * Get the term labels from an entity reference field.
+ *
+ * @param \Drupal\Core\Entity\FieldableEntityInterface $entity
+ *   Entity.
+ * @param string $field
+ *   Field.
+ * @param \Drupal\Core\Cache\CacheableMetadata $cache_metadata
+ *   The accumulated cache metadata.
+ *
+ * @return string
+ *   Comma separated list of term names.
+ */
+function reliefweb_analytics_get_terms(FieldableEntityInterface $entity, $field, CacheableMetadata $cache_metadata) {
+  $terms = [];
+  if ($entity->hasField($field) && !$entity->get($field)->isEmpty()) {
+    foreach ($entity->get($field)->referencedEntities() as $term) {
+      $terms[] = (string) $term->getUntranslated()->label();
+      $cache_metadata->addCacheTags($term->getCacheTags());
+    }
+  }
+  return implode(', ', $terms);
+}
+
+/**
+ * Format a date field to use as custom dimension.
+ *
+ * @param \Drupal\Core\Entity\FieldableEntityInterface $entity
+ *   Entity.
+ * @param string $field
+ *   Field.
+ *
+ * @return string
+ *   Formatted date.
+ */
+function reliefweb_analytics_format_date(FieldableEntityInterface $entity, $field) {
+  if ($entity->hasField($field) && !$entity->get($field)->isEmpty()) {
+    $date = $entity->get($field)->value;
+    return DateHelper::format($date, 'custom', 'Y-m-d');
+  }
+  return '';
+}

From 4b368c04862cf3564b336588d0488297950b4e5a Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 17 Mar 2022 06:12:30 +0000
Subject: [PATCH 583/720] [RW-431] Replace source logo field with media field

---
 ...orm_display.media.image_source.default.yml | 30 +++++++++++++
 ...splay.media.image_source.media_library.yml | 31 +++++++++++++
 ...m_display.taxonomy_term.source.default.yml | 12 +++--
 ...xonomy_term.source.user_posting_rights.yml |  1 +
 ...iew_display.media.image_source.default.yml | 34 ++++++++++++++
 ...splay.media.image_source.media_library.yml | 35 +++++++++++++++
 ...w_display.taxonomy_term.source.default.yml |  1 +
 ...d.media.image_source.field_media_image.yml | 45 +++++++++++++++++++
 ....field.taxonomy_term.source.field_logo.yml | 33 +++++---------
 ...field.storage.taxonomy_term.field_logo.yml | 20 +++------
 ...ge.content_settings.media.image_source.yml | 11 +++++
 config/media.type.image_source.yml            | 13 ++++++
 config/media.type.image_topic.yml             |  2 +-
 13 files changed, 224 insertions(+), 44 deletions(-)
 create mode 100644 config/core.entity_form_display.media.image_source.default.yml
 create mode 100644 config/core.entity_form_display.media.image_source.media_library.yml
 create mode 100644 config/core.entity_view_display.media.image_source.default.yml
 create mode 100644 config/core.entity_view_display.media.image_source.media_library.yml
 create mode 100644 config/field.field.media.image_source.field_media_image.yml
 create mode 100644 config/language.content_settings.media.image_source.yml
 create mode 100644 config/media.type.image_source.yml

diff --git a/config/core.entity_form_display.media.image_source.default.yml b/config/core.entity_form_display.media.image_source.default.yml
new file mode 100644
index 000000000..d2b26a0da
--- /dev/null
+++ b/config/core.entity_form_display.media.image_source.default.yml
@@ -0,0 +1,30 @@
+uuid: 10df83d2-775b-4d34-89e0-b7b7b9749d2b
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.media.image_source.field_media_image
+    - image.style.thumbnail
+    - media.type.image_source
+  module:
+    - svg_image
+id: media.image_source.default
+targetEntityType: media
+bundle: image_source
+mode: default
+content:
+  field_media_image:
+    type: image_image
+    weight: 0
+    region: content
+    settings:
+      progress_indicator: throbber
+      preview_image_style: thumbnail
+    third_party_settings: {  }
+hidden:
+  created: true
+  langcode: true
+  name: true
+  path: true
+  status: true
+  uid: true
diff --git a/config/core.entity_form_display.media.image_source.media_library.yml b/config/core.entity_form_display.media.image_source.media_library.yml
new file mode 100644
index 000000000..4ab76b6d9
--- /dev/null
+++ b/config/core.entity_form_display.media.image_source.media_library.yml
@@ -0,0 +1,31 @@
+uuid: 64c9a35c-4c11-487f-ac24-25099a304072
+langcode: en
+status: true
+dependencies:
+  config:
+    - core.entity_form_mode.media.media_library
+    - field.field.media.image_source.field_media_image
+    - image.style.thumbnail
+    - media.type.image_source
+  module:
+    - svg_image
+id: media.image_source.media_library
+targetEntityType: media
+bundle: image_source
+mode: media_library
+content:
+  field_media_image:
+    type: image_image
+    weight: 0
+    region: content
+    settings:
+      progress_indicator: throbber
+      preview_image_style: thumbnail
+    third_party_settings: {  }
+hidden:
+  created: true
+  langcode: true
+  name: true
+  path: true
+  status: true
+  uid: true
diff --git a/config/core.entity_form_display.taxonomy_term.source.default.yml b/config/core.entity_form_display.taxonomy_term.source.default.yml
index b3ed35330..4c120622b 100644
--- a/config/core.entity_form_display.taxonomy_term.source.default.yml
+++ b/config/core.entity_form_display.taxonomy_term.source.default.yml
@@ -21,14 +21,13 @@ dependencies:
     - field.field.taxonomy_term.source.field_shortname
     - field.field.taxonomy_term.source.field_spanish_name
     - field.field.taxonomy_term.source.field_user_posting_rights
-    - image.style.thumbnail
     - taxonomy.vocabulary.source
   module:
     - allowed_formats
     - link
+    - media_library
     - path
     - reliefweb_fields
-    - svg_image
     - text
 id: taxonomy_term.source.default
 targetEntityType: taxonomy_term
@@ -138,7 +137,7 @@ content:
     third_party_settings: {  }
   field_homepage:
     type: link_default
-    weight: 9
+    weight: 8
     region: content
     settings:
       placeholder_url: ''
@@ -159,12 +158,11 @@ content:
       placeholder_title: ''
     third_party_settings: {  }
   field_logo:
-    type: image_image
-    weight: 8
+    type: media_library_widget
+    weight: 9
     region: content
     settings:
-      progress_indicator: throbber
-      preview_image_style: thumbnail
+      media_types: {  }
     third_party_settings: {  }
   field_longname:
     type: string_textfield
diff --git a/config/core.entity_form_display.taxonomy_term.source.user_posting_rights.yml b/config/core.entity_form_display.taxonomy_term.source.user_posting_rights.yml
index aa60131da..e64440d6e 100644
--- a/config/core.entity_form_display.taxonomy_term.source.user_posting_rights.yml
+++ b/config/core.entity_form_display.taxonomy_term.source.user_posting_rights.yml
@@ -13,6 +13,7 @@ dependencies:
     - field.field.taxonomy_term.source.field_disclaimer
     - field.field.taxonomy_term.source.field_fts_id
     - field.field.taxonomy_term.source.field_homepage
+    - field.field.taxonomy_term.source.field_job_import_feed
     - field.field.taxonomy_term.source.field_job_import_feed_url
     - field.field.taxonomy_term.source.field_links
     - field.field.taxonomy_term.source.field_logo
diff --git a/config/core.entity_view_display.media.image_source.default.yml b/config/core.entity_view_display.media.image_source.default.yml
new file mode 100644
index 000000000..e903606a8
--- /dev/null
+++ b/config/core.entity_view_display.media.image_source.default.yml
@@ -0,0 +1,34 @@
+uuid: 264261d3-136c-4b8f-be23-f97ee1bd8bc9
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.media.image_source.field_media_image
+    - image.style.thumbnail
+    - media.type.image_source
+  module:
+    - svg_image
+id: media.image_source.default
+targetEntityType: media
+bundle: image_source
+mode: default
+content:
+  field_media_image:
+    type: image
+    label: hidden
+    settings:
+      image_link: ''
+      image_style: thumbnail
+      svg_attributes:
+        width: null
+        height: null
+      svg_render_as_image: true
+    third_party_settings: {  }
+    weight: 0
+    region: content
+hidden:
+  created: true
+  langcode: true
+  name: true
+  thumbnail: true
+  uid: true
diff --git a/config/core.entity_view_display.media.image_source.media_library.yml b/config/core.entity_view_display.media.image_source.media_library.yml
new file mode 100644
index 000000000..22d6da61b
--- /dev/null
+++ b/config/core.entity_view_display.media.image_source.media_library.yml
@@ -0,0 +1,35 @@
+uuid: 1b2ef976-411f-4ad5-8cc6-c3b8f11a662f
+langcode: en
+status: true
+dependencies:
+  config:
+    - core.entity_view_mode.media.media_library
+    - field.field.media.image_source.field_media_image
+    - image.style.thumbnail
+    - media.type.image_source
+  module:
+    - svg_image
+id: media.image_source.media_library
+targetEntityType: media
+bundle: image_source
+mode: media_library
+content:
+  thumbnail:
+    type: image
+    label: hidden
+    settings:
+      image_link: ''
+      image_style: thumbnail
+      svg_attributes:
+        width: null
+        height: null
+      svg_render_as_image: true
+    third_party_settings: {  }
+    weight: 0
+    region: content
+hidden:
+  created: true
+  field_media_image: true
+  langcode: true
+  name: true
+  uid: true
diff --git a/config/core.entity_view_display.taxonomy_term.source.default.yml b/config/core.entity_view_display.taxonomy_term.source.default.yml
index c702ab421..7d4525bed 100644
--- a/config/core.entity_view_display.taxonomy_term.source.default.yml
+++ b/config/core.entity_view_display.taxonomy_term.source.default.yml
@@ -12,6 +12,7 @@ dependencies:
     - field.field.taxonomy_term.source.field_disclaimer
     - field.field.taxonomy_term.source.field_fts_id
     - field.field.taxonomy_term.source.field_homepage
+    - field.field.taxonomy_term.source.field_job_import_feed
     - field.field.taxonomy_term.source.field_job_import_feed_url
     - field.field.taxonomy_term.source.field_links
     - field.field.taxonomy_term.source.field_logo
diff --git a/config/field.field.media.image_source.field_media_image.yml b/config/field.field.media.image_source.field_media_image.yml
new file mode 100644
index 000000000..9f628e658
--- /dev/null
+++ b/config/field.field.media.image_source.field_media_image.yml
@@ -0,0 +1,45 @@
+uuid: 37c08c80-852b-4428-aee5-8202eaac045c
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.media.field_media_image
+    - media.type.image_source
+  module:
+    - content_translation
+    - image
+third_party_settings:
+  content_translation:
+    translation_sync:
+      file: '0'
+      alt: '0'
+      title: '0'
+id: media.image_source.field_media_image
+field_name: field_media_image
+entity_type: media
+bundle: image_source
+label: Image
+description: ''
+required: true
+translatable: true
+default_value: {  }
+default_value_callback: ''
+settings:
+  handler: 'default:file'
+  handler_settings: {  }
+  file_directory: images/sources
+  file_extensions: 'png gif jpg jpeg svg'
+  max_filesize: ''
+  max_resolution: ''
+  min_resolution: 64x64
+  alt_field: false
+  alt_field_required: true
+  title_field: false
+  title_field_required: false
+  default_image:
+    uuid: ''
+    alt: ''
+    title: ''
+    width: null
+    height: null
+field_type: image
diff --git a/config/field.field.taxonomy_term.source.field_logo.yml b/config/field.field.taxonomy_term.source.field_logo.yml
index 5b68a406f..f67b7174e 100644
--- a/config/field.field.taxonomy_term.source.field_logo.yml
+++ b/config/field.field.taxonomy_term.source.field_logo.yml
@@ -1,12 +1,11 @@
-uuid: 259797d2-54e1-480d-953c-bff5c6f2a9f9
+uuid: e9fb3bf4-fe5b-4c67-99aa-9318bad36424
 langcode: en
 status: true
 dependencies:
   config:
     - field.storage.taxonomy_term.field_logo
+    - media.type.image_source
     - taxonomy.vocabulary.source
-  module:
-    - image
 id: taxonomy_term.source.field_logo
 field_name: field_logo
 entity_type: taxonomy_term
@@ -18,21 +17,13 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings:
-  handler: 'default:file'
-  handler_settings: {  }
-  file_directory: organization-logos
-  file_extensions: 'png gif jpg jpeg'
-  max_filesize: ''
-  max_resolution: ''
-  min_resolution: ''
-  alt_field: false
-  alt_field_required: true
-  title_field: false
-  title_field_required: false
-  default_image:
-    uuid: ''
-    alt: ''
-    title: ''
-    width: null
-    height: null
-field_type: image
+  handler: 'default:media'
+  handler_settings:
+    target_bundles:
+      image_source: image_source
+    sort:
+      field: mid
+      direction: DESC
+    auto_create: true
+    auto_create_bundle: ''
+field_type: entity_reference
diff --git a/config/field.storage.taxonomy_term.field_logo.yml b/config/field.storage.taxonomy_term.field_logo.yml
index 204a480c0..76440b700 100644
--- a/config/field.storage.taxonomy_term.field_logo.yml
+++ b/config/field.storage.taxonomy_term.field_logo.yml
@@ -1,27 +1,17 @@
-uuid: fc5ba416-3d06-46a4-8d64-fedeb600bb42
+uuid: 3142fb51-5e01-41b9-b248-57731007596d
 langcode: en
 status: true
 dependencies:
   module:
-    - file
-    - image
+    - media
     - taxonomy
 id: taxonomy_term.field_logo
 field_name: field_logo
 entity_type: taxonomy_term
-type: image
+type: entity_reference
 settings:
-  target_type: file
-  display_field: false
-  display_default: false
-  uri_scheme: public
-  default_image:
-    uuid: ''
-    alt: ''
-    title: ''
-    width: null
-    height: null
-module: image
+  target_type: media
+module: core
 locked: false
 cardinality: 1
 translatable: true
diff --git a/config/language.content_settings.media.image_source.yml b/config/language.content_settings.media.image_source.yml
new file mode 100644
index 000000000..926515023
--- /dev/null
+++ b/config/language.content_settings.media.image_source.yml
@@ -0,0 +1,11 @@
+uuid: b0e82b20-9228-40f7-bb61-72304676d5fa
+langcode: en
+status: true
+dependencies:
+  config:
+    - media.type.image_source
+id: media.image_source
+target_entity_type_id: media
+target_bundle: image_source
+default_langcode: site_default
+language_alterable: false
diff --git a/config/media.type.image_source.yml b/config/media.type.image_source.yml
new file mode 100644
index 000000000..52f5f7abf
--- /dev/null
+++ b/config/media.type.image_source.yml
@@ -0,0 +1,13 @@
+uuid: 4e99e742-5fca-4b0f-9d89-d542545655aa
+langcode: en
+status: true
+dependencies: {  }
+id: image_source
+label: 'Image - Source'
+description: 'Logo images for sources.'
+source: image
+queue_thumbnail_downloads: false
+new_revision: true
+source_configuration:
+  source_field: field_media_image
+field_map: {  }
diff --git a/config/media.type.image_topic.yml b/config/media.type.image_topic.yml
index 4a1f3c605..fd8b76224 100644
--- a/config/media.type.image_topic.yml
+++ b/config/media.type.image_topic.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 id: image_topic
-label: 'Image - Topics'
+label: 'Image - Topic'
 description: 'Icon images for topics.'
 source: image
 queue_thumbnail_downloads: false

From ecddf0cb7096ffad3d6997c617dd4dbb74852989 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 17 Mar 2022 06:16:28 +0000
Subject: [PATCH 584/720] [RW-425] Add source logo migration

---
 ...igration.reliefweb_media__image_source.yml | 26 +++++++++++++++++++
 ...ration.reliefweb_taxonomy_term__source.yml |  9 +++++--
 ...liefweb_taxonomy_term_revision__source.yml |  9 +++++--
 ...igration.reliefweb_media__image_source.yml | 16 ++++++++++++
 ...ration.reliefweb_taxonomy_term__source.yml | 15 ++++-------
 ...liefweb_taxonomy_term_revision__source.yml | 15 ++++-------
 .../src/Plugin/migrate/source/Image.php       |  4 +++
 7 files changed, 70 insertions(+), 24 deletions(-)
 create mode 100644 config/migrate_plus.migration.reliefweb_media__image_source.yml
 create mode 100644 html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_media__image_source.yml

diff --git a/config/migrate_plus.migration.reliefweb_media__image_source.yml b/config/migrate_plus.migration.reliefweb_media__image_source.yml
new file mode 100644
index 000000000..e9edd28db
--- /dev/null
+++ b/config/migrate_plus.migration.reliefweb_media__image_source.yml
@@ -0,0 +1,26 @@
+uuid: fec4c4b9-f074-445a-8258-82cb4ffecdc9
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - reliefweb_migrate
+_core:
+  default_config_hash: 8N5xQ3oGDuiWe7AJOzD8DJuhvi80qM0ldEhzyGidPRY
+id: reliefweb_media__image_source
+class: null
+field_plugin_method: null
+cck_plugin_method: null
+migration_tags: null
+migration_group: reliefweb_media
+label: 'Migrate ReliefWeb image media for sources.'
+source:
+  field: field_term_image
+  entity_type: taxonomy_term
+  bundle: source
+process: null
+destination:
+  default_bundle: image_source
+migration_dependencies:
+  required:
+    - reliefweb_image
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term__source.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
index 346945d20..7b008a783 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
@@ -1,9 +1,9 @@
-uuid: e8ebad49-7b78-415d-be50-5831fbde57c6
+uuid: 16843a36-faa0-4277-9576-6da5f02c5ea2
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: hzBiWDw0PdtLdr8LLeKgeSsoTj3jkSA2FAqHEKmo_do
+  default_config_hash: sg4cJgEIiEdl--ULZX9f-ftMGxDM_jqjUpk8d_Jq6nU
 id: reliefweb_taxonomy_term__source
 class: null
 field_plugin_method: null
@@ -67,6 +67,11 @@ process:
       plugin: sub_process
       process:
         uri: value
+  field_logo:
+    plugin: sub_process
+    source: field_term_image
+    process:
+      target_id: fid
   field_longname/value:
     plugin: skip_on_empty
     method: process
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
index dbce58187..1d08f3e06 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
@@ -1,9 +1,9 @@
-uuid: 028e903a-df2b-4b1d-afa2-ddffda3abcea
+uuid: c25d13c4-74d5-45b7-9bf8-0e3ceb12cdb7
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: o1xB-M9-1wTw0Nti_A7qxkdCHidV95AEaWCmaoViT-c
+  default_config_hash: lgy_oEXgSZeQhzg5AhSOXmIpvOx9Yx7UJtZxFwFbee8
 id: reliefweb_taxonomy_term_revision__source
 class: null
 field_plugin_method: null
@@ -67,6 +67,11 @@ process:
       plugin: sub_process
       process:
         uri: value
+  field_logo:
+    plugin: sub_process
+    source: field_term_image
+    process:
+      target_id: fid
   field_longname/value:
     plugin: skip_on_empty
     method: process
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_media__image_source.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_media__image_source.yml
new file mode 100644
index 000000000..28aec0f5f
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_media__image_source.yml
@@ -0,0 +1,16 @@
+id: reliefweb_media__image_source
+label: Migrate ReliefWeb image media for sources.
+migration_group: reliefweb_media
+dependencies:
+  enforced:
+    module:
+      - reliefweb_migrate
+source:
+  field: field_term_image
+  entity_type: taxonomy_term
+  bundle: source
+destination:
+  default_bundle: image_source
+migration_dependencies:
+  required:
+    - reliefweb_image
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term__source.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
index 4f866d0db..b7a8a02d4 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
@@ -64,16 +64,11 @@ process:
       plugin: sub_process
       process:
         uri: value
-  # @todo review after figuring out the file directory.
-  # field_logo:
-  #   plugin: sub_process
-  #   source: field_term_image
-  #   process:
-  #     target_id: fid
-  #     alt: alt
-  #     title: title
-  #     width: width
-  #     height: height
+  field_logo:
+    plugin: sub_process
+    source: field_term_image
+    process:
+      target_id: fid
   field_longname/value:
     plugin: skip_on_empty
     method: process
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
index 2c41e9546..3383f3625 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
@@ -64,16 +64,11 @@ process:
       plugin: sub_process
       process:
         uri: value
-  # @todo review after figuring out the file directory.
-  # field_logo:
-  #   plugin: sub_process
-  #   source: field_term_image
-  #   process:
-  #     target_id: fid
-  #     alt: alt
-  #     title: title
-  #     width: width
-  #     height: height
+  field_logo:
+    plugin: sub_process
+    source: field_term_image
+    process:
+      target_id: fid
   field_longname/value:
     plugin: skip_on_empty
     method: process
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Image.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Image.php
index ff2b840df..bc2ec43a5 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Image.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Image.php
@@ -43,6 +43,7 @@ class Image extends EntityBase {
     'blog_post' => 'images/blog-posts',
     'report' => 'images/reports',
     'topics' => 'images/topics',
+    'source' => 'images/sources',
   ];
 
   /**
@@ -77,6 +78,9 @@ public function query() {
         'node' => [
           'topics',
         ],
+        'taxonomy_term' => [
+          'source',
+        ],
       ],
     ];
 

From 9f89d2da4e4cfd935f70986f6d8cc75e2982c02d Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 17 Mar 2022 06:21:35 +0000
Subject: [PATCH 585/720] [RW-404] Port metatags

---
 config/core.extension.yml                     |   4 +
 .../Plugin/Field/FieldType/ReliefWebFile.php  |  16 +
 html/modules/custom/reliefweb_meta/README.md  |  11 +
 .../custom/reliefweb_meta/images/default.png  | Bin 0 -> 47950 bytes
 .../images/disaster-type/AC.png               | Bin 0 -> 8663 bytes
 .../images/disaster-type/AV.png               | Bin 0 -> 10505 bytes
 .../images/disaster-type/CW.png               | Bin 0 -> 10434 bytes
 .../images/disaster-type/DR.png               | Bin 0 -> 10651 bytes
 .../images/disaster-type/EC.png               | Bin 0 -> 10127 bytes
 .../images/disaster-type/EP.png               | Bin 0 -> 12222 bytes
 .../images/disaster-type/EQ.png               | Bin 0 -> 7920 bytes
 .../images/disaster-type/FF.png               | Bin 0 -> 9951 bytes
 .../images/disaster-type/FL.png               | Bin 0 -> 8847 bytes
 .../images/disaster-type/FR.png               | Bin 0 -> 12074 bytes
 .../images/disaster-type/HT.png               | Bin 0 -> 10945 bytes
 .../images/disaster-type/IN.png               | Bin 0 -> 12173 bytes
 .../images/disaster-type/LS.png               | Bin 0 -> 9509 bytes
 .../images/disaster-type/MS.png               | Bin 0 -> 9509 bytes
 .../images/disaster-type/SS.png               | Bin 0 -> 10775 bytes
 .../images/disaster-type/ST.png               | Bin 0 -> 6954 bytes
 .../images/disaster-type/TC.png               | Bin 0 -> 10127 bytes
 .../images/disaster-type/TS.png               | Bin 0 -> 13432 bytes
 .../images/disaster-type/VO.png               | Bin 0 -> 9296 bytes
 .../images/disaster-type/WF.png               | Bin 0 -> 12074 bytes
 .../reliefweb_meta/reliefweb_meta.info.yml    |   5 +
 .../reliefweb_meta/reliefweb_meta.module      | 855 ++++++++++++++++++
 26 files changed, 891 insertions(+)
 create mode 100644 html/modules/custom/reliefweb_meta/README.md
 create mode 100644 html/modules/custom/reliefweb_meta/images/default.png
 create mode 100644 html/modules/custom/reliefweb_meta/images/disaster-type/AC.png
 create mode 100644 html/modules/custom/reliefweb_meta/images/disaster-type/AV.png
 create mode 100644 html/modules/custom/reliefweb_meta/images/disaster-type/CW.png
 create mode 100644 html/modules/custom/reliefweb_meta/images/disaster-type/DR.png
 create mode 100644 html/modules/custom/reliefweb_meta/images/disaster-type/EC.png
 create mode 100644 html/modules/custom/reliefweb_meta/images/disaster-type/EP.png
 create mode 100644 html/modules/custom/reliefweb_meta/images/disaster-type/EQ.png
 create mode 100644 html/modules/custom/reliefweb_meta/images/disaster-type/FF.png
 create mode 100644 html/modules/custom/reliefweb_meta/images/disaster-type/FL.png
 create mode 100644 html/modules/custom/reliefweb_meta/images/disaster-type/FR.png
 create mode 100644 html/modules/custom/reliefweb_meta/images/disaster-type/HT.png
 create mode 100644 html/modules/custom/reliefweb_meta/images/disaster-type/IN.png
 create mode 100644 html/modules/custom/reliefweb_meta/images/disaster-type/LS.png
 create mode 100644 html/modules/custom/reliefweb_meta/images/disaster-type/MS.png
 create mode 100644 html/modules/custom/reliefweb_meta/images/disaster-type/SS.png
 create mode 100644 html/modules/custom/reliefweb_meta/images/disaster-type/ST.png
 create mode 100644 html/modules/custom/reliefweb_meta/images/disaster-type/TC.png
 create mode 100644 html/modules/custom/reliefweb_meta/images/disaster-type/TS.png
 create mode 100644 html/modules/custom/reliefweb_meta/images/disaster-type/VO.png
 create mode 100644 html/modules/custom/reliefweb_meta/images/disaster-type/WF.png
 create mode 100644 html/modules/custom/reliefweb_meta/reliefweb_meta.info.yml
 create mode 100644 html/modules/custom/reliefweb_meta/reliefweb_meta.module

diff --git a/config/core.extension.yml b/config/core.extension.yml
index 234e2c48d..a0666eb97 100644
--- a/config/core.extension.yml
+++ b/config/core.extension.yml
@@ -41,6 +41,9 @@ module:
   menu_link_content: 0
   menu_ui: 0
   metatag: 0
+  metatag_facebook: 0
+  metatag_open_graph: 0
+  metatag_twitter_cards: 0
   migrate: 0
   migrate_plus: 0
   migrate_tools: 0
@@ -66,6 +69,7 @@ module:
   reliefweb_homepage: 0
   reliefweb_import: 0
   reliefweb_key_figures: 0
+  reliefweb_meta: 0
   reliefweb_migrate: 0
   reliefweb_moderation: 0
   reliefweb_revisions: 0
diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
index c52def3f1..c201a4059 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
@@ -863,6 +863,22 @@ public function getFileUrl() {
     return NULL;
   }
 
+  /**
+   * Check if the file is private.
+   *
+   * @return bool
+   *   TRUE if teh file is private.
+   */
+  public function isPrivate() {
+    $file = $this->loadFile();
+    if (empty($file)) {
+      return TRUE;
+    }
+
+    $scheme = StreamWrapperManager::getScheme($file->getFileUri());
+    return $scheme === FALSE || $scheme === 'private';
+  }
+
   /**
    * Create a managed file for the preview.
    *
diff --git a/html/modules/custom/reliefweb_meta/README.md b/html/modules/custom/reliefweb_meta/README.md
new file mode 100644
index 000000000..1f6b3e1eb
--- /dev/null
+++ b/html/modules/custom/reliefweb_meta/README.md
@@ -0,0 +1,11 @@
+ReliefWeb - Meta module
+=======================
+
+This module provides metatag customizations.
+
+TODO
+----
+
+The code in reliefweb_meta.module partially handles translations. The logic to
+build the description is tied to English and would need some rework to handle
+translations properly.
diff --git a/html/modules/custom/reliefweb_meta/images/default.png b/html/modules/custom/reliefweb_meta/images/default.png
new file mode 100644
index 0000000000000000000000000000000000000000..8016a2b8f20fc86e504ceedd13219ee9c529fcea
GIT binary patch
literal 47950
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

literal 0
HcmV?d00001

diff --git a/html/modules/custom/reliefweb_meta/images/disaster-type/AC.png b/html/modules/custom/reliefweb_meta/images/disaster-type/AC.png
new file mode 100644
index 0000000000000000000000000000000000000000..f31a16330c5aea7c2ee698dd4a3757b5f19e91b9
GIT binary patch
literal 8663
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

literal 0
HcmV?d00001

diff --git a/html/modules/custom/reliefweb_meta/images/disaster-type/AV.png b/html/modules/custom/reliefweb_meta/images/disaster-type/AV.png
new file mode 100644
index 0000000000000000000000000000000000000000..cec0a151550baef7aeb131c24db081de7cfdd1c0
GIT binary patch
literal 10505
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
QY8xTCT85f+H=NM_1Atm!6951J

literal 0
HcmV?d00001

diff --git a/html/modules/custom/reliefweb_meta/images/disaster-type/CW.png b/html/modules/custom/reliefweb_meta/images/disaster-type/CW.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b4e2cd6677e836b27630a07cfb407207ec1a6b7
GIT binary patch
literal 10434
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

literal 0
HcmV?d00001

diff --git a/html/modules/custom/reliefweb_meta/images/disaster-type/DR.png b/html/modules/custom/reliefweb_meta/images/disaster-type/DR.png
new file mode 100644
index 0000000000000000000000000000000000000000..51366dda33b8d7bf144aa0beb40fb21bd0b451bd
GIT binary patch
literal 10651
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

literal 0
HcmV?d00001

diff --git a/html/modules/custom/reliefweb_meta/images/disaster-type/EC.png b/html/modules/custom/reliefweb_meta/images/disaster-type/EC.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ca0418c340f800c84823acdf7ecbaf35dcce5d8
GIT binary patch
literal 10127
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

literal 0
HcmV?d00001

diff --git a/html/modules/custom/reliefweb_meta/images/disaster-type/EP.png b/html/modules/custom/reliefweb_meta/images/disaster-type/EP.png
new file mode 100644
index 0000000000000000000000000000000000000000..af7c6e6263a72e4eedfe9a3bc917c72966c092f3
GIT binary patch
literal 12222
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

literal 0
HcmV?d00001

diff --git a/html/modules/custom/reliefweb_meta/images/disaster-type/EQ.png b/html/modules/custom/reliefweb_meta/images/disaster-type/EQ.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee2b772272962be3d9931af3f05036bb85a5cd73
GIT binary patch
literal 7920
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

literal 0
HcmV?d00001

diff --git a/html/modules/custom/reliefweb_meta/images/disaster-type/FF.png b/html/modules/custom/reliefweb_meta/images/disaster-type/FF.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9d8387efa3bc5534bf10003261202e9794f41fc
GIT binary patch
literal 9951
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

literal 0
HcmV?d00001

diff --git a/html/modules/custom/reliefweb_meta/images/disaster-type/FL.png b/html/modules/custom/reliefweb_meta/images/disaster-type/FL.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd35c6535990f27ccdd4fe17405fc1d54bbd4a2c
GIT binary patch
literal 8847
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
TUZcPpCZK!zMz_m#pGE#J(*&qT

literal 0
HcmV?d00001

diff --git a/html/modules/custom/reliefweb_meta/images/disaster-type/FR.png b/html/modules/custom/reliefweb_meta/images/disaster-type/FR.png
new file mode 100644
index 0000000000000000000000000000000000000000..fec1e9a47ce32a0be01146ada464771a7dd8951f
GIT binary patch
literal 12074
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
IV*BF%1L5p>#{d8T

literal 0
HcmV?d00001

diff --git a/html/modules/custom/reliefweb_meta/images/disaster-type/HT.png b/html/modules/custom/reliefweb_meta/images/disaster-type/HT.png
new file mode 100644
index 0000000000000000000000000000000000000000..b5285d4c7a6cd719af3a757777fadfceecf65736
GIT binary patch
literal 10945
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
S6yQ!O=)paMyJdH5!~YvmRGLr#

literal 0
HcmV?d00001

diff --git a/html/modules/custom/reliefweb_meta/images/disaster-type/IN.png b/html/modules/custom/reliefweb_meta/images/disaster-type/IN.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd355dbc8e85814be5a407b90e93a8fa905fd47f
GIT binary patch
literal 12173
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
W!>4)dnP7iC@K9Y>ty0B0{Qm$24hC8P

literal 0
HcmV?d00001

diff --git a/html/modules/custom/reliefweb_meta/images/disaster-type/LS.png b/html/modules/custom/reliefweb_meta/images/disaster-type/LS.png
new file mode 100644
index 0000000000000000000000000000000000000000..c826cd64bad3002999ecace8d1ea9975dd9ff142
GIT binary patch
literal 9509
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
R;JYUf;)cofDjf&({{W_uQH1~i

literal 0
HcmV?d00001

diff --git a/html/modules/custom/reliefweb_meta/images/disaster-type/MS.png b/html/modules/custom/reliefweb_meta/images/disaster-type/MS.png
new file mode 100644
index 0000000000000000000000000000000000000000..c826cd64bad3002999ecace8d1ea9975dd9ff142
GIT binary patch
literal 9509
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
R;JYUf;)cofDjf&({{W_uQH1~i

literal 0
HcmV?d00001

diff --git a/html/modules/custom/reliefweb_meta/images/disaster-type/SS.png b/html/modules/custom/reliefweb_meta/images/disaster-type/SS.png
new file mode 100644
index 0000000000000000000000000000000000000000..aeeebd6150a03d827f5d0adc16a6a4f11d828a64
GIT binary patch
literal 10775
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

literal 0
HcmV?d00001

diff --git a/html/modules/custom/reliefweb_meta/images/disaster-type/ST.png b/html/modules/custom/reliefweb_meta/images/disaster-type/ST.png
new file mode 100644
index 0000000000000000000000000000000000000000..20cae99fa050df35d93b5205172ee8b50393a706
GIT binary patch
literal 6954
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

literal 0
HcmV?d00001

diff --git a/html/modules/custom/reliefweb_meta/images/disaster-type/TC.png b/html/modules/custom/reliefweb_meta/images/disaster-type/TC.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ca0418c340f800c84823acdf7ecbaf35dcce5d8
GIT binary patch
literal 10127
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

literal 0
HcmV?d00001

diff --git a/html/modules/custom/reliefweb_meta/images/disaster-type/TS.png b/html/modules/custom/reliefweb_meta/images/disaster-type/TS.png
new file mode 100644
index 0000000000000000000000000000000000000000..a25bc4a5e4f6dc2c8a54a192ff21ff35daa98c69
GIT binary patch
literal 13432
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

literal 0
HcmV?d00001

diff --git a/html/modules/custom/reliefweb_meta/images/disaster-type/VO.png b/html/modules/custom/reliefweb_meta/images/disaster-type/VO.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfc06e41015cbbce28e7ab4b872f9033b39ae013
GIT binary patch
literal 9296
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

literal 0
HcmV?d00001

diff --git a/html/modules/custom/reliefweb_meta/images/disaster-type/WF.png b/html/modules/custom/reliefweb_meta/images/disaster-type/WF.png
new file mode 100644
index 0000000000000000000000000000000000000000..fec1e9a47ce32a0be01146ada464771a7dd8951f
GIT binary patch
literal 12074
zcmYMabzIcX6F+_&ASsQ2w9*|)+z}^8ihwjnOPq8ajf9j)DpGGeI0U4-Qw8Zdq)$RX
z<d70LN)Uc8{C>XQ-yiq5*?DcuK6hqkc6Q_Sbv161-zEovKsU8C9~yu_1b7e#+)a7|
z;0UmD7XyD}UYh2<Akh2i>mPwN?TRo6#0AoN_`oRe-Ol2cAM5PA%y;+dJ!KTRrV*?S
zJoF6aL+m6(YWbjqeCY{szR=4lkcf$GE%+tlmkQYOZD+&SmxSI~JxZ3daC0qEd0LXJ
z)_sL@e9y*s9-)4QbA1arcf(a%=t06_ERDy{`oW}TwxK(ie6C3+?};1!q$?NM%fG~;
zf4eB<gu;V}2j0NqRK7@D(WuDH@5=_0a$A!63G}2aX$&kkm|rjmA6oS&d{I6ZyR3)(
zB!axnpU)rd8VkBWM2?Ul2NoL4M^s2ZvhQ15+`5vDNMuosOMINun?Tde$^Q4o#}Pyt
zwXiaA9T$e%(0luQGI#Cgw}!MIV}MXL7MGN%0-^x}vr5v~0B^c0*+@#DLrjA?8-#3E
zeq%qJbs#YV>cF=PKFQ0ynz?GoVf&$mR#m5(Q~0UB6Zj|L%<W)egYW>oPL(a^b(p2v
zc*Q9zgNh6#MGk1#to_WHL*9_OgW)D*cjNFC$Qgt2CFZNHuC|=z-MtbGm&v7aHq2M;
zUS&RRC%TNK@{asMhSaoxlI`A${J7$L(GH5I!=;u0U{Y~+=-@n0z6L@HhnXQfC2Ojt
zZ9i$4G*e-5U+`Wy?OC=}Fxgk1IDE$=xe?Wi_9BTV)MmiA+};ZpQc)*Aq%N%@A3keU
zy+g+-yZj{(!lQy#1xqpij~-_Kn);{ZjIVE!n-<Kjo-y%%Xae}I#Cx6oQCZ1cs=IVJ
zi8qP=qk)0;e?UCC;`fovuVHbt3=;o`j?aKnR@8VOK29v|`9uVvEcpb`yQ-v2eUo-_
zKxY*><lPE#%IvZH7(1?gk^Q%0vU@p)lXfuRTLdsmQtk`$&Bn_hKqoBE1Tlh)5WGlo
z&TPlKEvt?juoNN)evdC%aCRsVLJ32wrU<e9lOI3A48ijx=Y*Fyn4F7YEA4EU_2R-x
zF!?0jBP|)cF6}PWy-E8>TpTPe>>hWt@2r1sP=^exzhNQYe$r`QDEha}tY5j!Mtyvg
zC4dS$<evL21b1`_d}loPrA1Ge_Qf9AJjN%^Bi*0J#fGhsoShzrdF@;eOgir{a5RDn
zz?DQuo~}_m86HDLij*@@(|CVe#IC38J0--XG0dKfSh$euo6IK!vnSIuOLrn~ruaL%
zn#m<+K-o$T?mjtREisl$C1<Dlt~s?N=fX(EgISSyybg4-J~dP0#T-c$@}EpXIZd}`
zm4#<m!YuP#lq7O4s?v(Y-qma_jhy}1J{~I};uxh!hMb#dFt_}M_0!+j|Bny~NX<Tn
z^)qUUjbSH62F6xeX#{ZgPrBcvuz1$mbLbI$R-(HW0&?TV*d?^EZw`-!zliK;xG&;X
zyiUdXrP4~dWGrn$%rV5y)yzyUhAPLov3ULA7P|~RuBNZS{9Z;0@1{bR>?eBo?(b+`
z7xS98H*;xlHDBl&-5S<55gB!#mm3yVLi$DzZ57yoFEr-wGuR)^+X8xG_C7=U(L9$y
zevc`9C+KT%oF>{(@zGQrLXdTu0=_#nM%Vb>Y)E~Y2r^ywuu?9g?#X@802il)4w1ge
z(*Iz^+8HH`<yJ%f#^-8iUHGmM0xL46Ldt2p(d%Nd$8<RV!*GY`MOz7`bOLH;-H>+5
zp=wM7G0v7raD6mY=Ebq>S`wQ9ovwLUsjd7?Eg4RVEThRRX{0_j+zT|`T?=e0a%0dN
zM#1lOcW4*ycgC%jVg#2O%sa@rFJ_@ujn~Q&@5AsIZFsN!Gwr-u@~U&IA>`2%DIh0d
zq;Bo1hgas3-TUFw?1($Sm%@L#9jcEyeE2Om+)j{{*C5|eh@`qEnb1-o16C~OAGOBf
z|GGdEzRS?-;kCVz32ZB$i3=FOsHbx`lNEsh-al(Kq-+0NOWi*3gn<#FR>R7sQIo)?
zMuT%0_wZsH6!T$tFpQ!zd*3H1;#fcmMpg8pK3WGe$$x#+KJXeU8c=s1&}wg!_FwPB
z6uy}6<yk)VDOBM{P+8|cg6}yzMyK(%f1XIYt}F~xrl+<(n}lklg!xBMv_8pCyX*es
z&rfM}e<FxEfT4Ohir`)U_-zN(VU(L(U<|F?rx-U<WZn1gjOwc(rn>xfT`{(fZf5NG
zJM%q<2Qj(_Y#l0Kw(lwjL=Y|C-{kRL5fp=yKKy=E*4)JYukQwdQ4YN(?NO$hy#Qp<
zJkG6YJS5er0wgV|B8-sIuP*#*@I9VK=(Kl%Vn;;*u@9{vP!t1Di=onAD*s5=#|T#l
z$i()nGmR}$SE>O!m^cH~n(*N#8<XR=AJgS06G9r~Ki8@X_1Ag<Lm&Ykw3Fy7<<Ftq
zBOxRjpk6es`=DWoC7m2q>uhR3p695}i(yGJfyPV(BaGm?i7Mr&7tWp1<cyH01jIX6
zJp-XUcXe(IOOy$e*VSS#DIhD~xm6n2rvqtKPJ4`t!T)^D(zDn*7#1D3#%BA3;wlJZ
zOA1NL#rmidDSVf56P{)Gdh#?o?m-ELCE5haI2nwf0i%|j8x7?v18(H6kI^(>OS5O7
zQTq9l!j=A~>RTvlGGuVUG}ZD%aIq<T7q3;$e)-`@x7rAYS1D(g`5Iiz1V)WHH};so
z_wXviD5YnOJx<qTjBarQ)(!#RLu#WZSt|YK5@w*NuRg_(;5#+Y$^b}_N-;fr$4der
zxiRwpnLydpwotmyS|^Ds{pH>Pb@lUo0ibaJrW#N3eQV}iK6(@9)9>;o-@(ZD>6EiW
zd?D_);CpO3!>A~ooL)836+KgG$jM=-%o(n(PMi@E_mv|$tfg7*B@E$ND;l^v^gw*9
zaY;Tp0~#{n68HI8XFU@m<oqjDv|Y>WTmlS%fbU2MR0bTsUmw#2M8B5?n8V=uhP)8c
zf4ap$g1j=o{|+W-rop^{b-=RCK;qSKAa%D1eAn$-$M<;})7-<UaMP*^uODxrl8kT)
z8|qm-INgS&pkx^0Zl%BGs~M<;b8Eecg4RyjFSa*do0i6}gMp=6xd!?5@g~qh4WJzn
zMEJw#sxj%x`Va+-+`2D>p{rnhET93)O#$Dl(9b_Kx;w%h#4i)F3izpIVBXj9Mir^U
z+CSs{23V%TtIA`4!fZn(;yQ0m*>@Ac8p9~hsu+2PjeAS&XcdiecJkl<KuQ7}Bg)q2
zro%WENff;EVf4NGENV84oy&J)-}=K-_%34tf2pX;M=Jf)c>4KYMJm-fGVE`A6|E#A
ztp)i@AH04yU?M4cLf&g~t^w_S@S0;4i>y2uD#2_ygqR9sy4wl!VuaUt?w7ovpBE}z
zx26T!7z1rs7=x_<d5qS+G}ZV$$v5pjuF@CfuQOJOv8LWK%-7``FjhgEa(R$#0&UZP
zZt~Zy<-WCpU%T5;6sw5mnLue2D2Dhk6iy+gw(-}@b!!3FvB>)skHxddJ1u3q*#cJ|
zZgpA;;lbv<R0=&<JeUmM{RI$ncq&44cP-uxzDGRaBR;N^MK~^(G)_+bUPXKW@L<t2
zmlb~@An5sZEP!ksLaT@;h;l?e4|HO9h-T{k&-XiM<^$8i;ZD%ZJ3@^bnNAuZyp)+Q
z726ONuTp}MMvTg1Xk90z`7zQ?0LcxI#p}7UfNWJ}Il1zT!5`lFQsKX}Ze|<gZw&L?
zLR068X4BzV06!}XRLZsNLr`W<_>3ps-}nTocs!m;uBe<OK@vQpWM5_VqXQV>>8QMf
z1kmk!mGOiqh6wJUpAHYvh&vo;FY9wZ&<(%c-x;CLS`l1T@>kEc*_c18E<6~+;=hz)
z4sGwSNo3Gho+y-H=n;3=Qc3B5&=srb<yqxKFa+M>)kX8WVMVIgyTClF_mt8!-)4lo
zX9EgDE28lR`NfYyC^TOq4Brz4zW~%Ty~i}-p;aG(A%4O~Pe&niy`a{Y%kIS6y{*TB
z?!AiMHL&r}q;a9^!pnFsn3GQGqnG50qI@|Z`TY^?moU9(fE#<w%?JVOL=#Fmy|BDv
zgmadlr5Z>l^NH8bPZ@bAho<2hNYaT>QcBZ~pbN}M(m|&T09>wX?(lOSzHS0ysRtep
zh4A}Xq$F?qh+1h&F&e-`_2uY)sH0Ul;|A}-1{K!SxiBP70GHsJyRO7VzY_5(i%V95
z@lOpfw2R$~g-=E}!g%@>?5~T$S2oOC(Q#%)Ib5<J#y?)S?Wl}?@+h4%N02`U0dd=%
z=-(Rq9|b-I|J!U`ZStjs@OEb11XCl@ULbHMV$#VD7^!{oRHRS?zN`3ZcuI){N^&ao
zV0T2S>9PcK?s$jolPTZ8kxtA~+W&&jAL1llEqNRDgBr8dAwu}eQ$F&Vq54{Wa3=}i
zGaNtqM>LA9Nxw;UZVea-+X0Q&jfYSh;TG$4ZrVc6J5FFROZhD}=kK#@NYTp2L3@A=
zSn!2_w)>=-l1nkrr$GCtxsA@dLipX&4`emU<73IBc&abF%p3DpcR)SR=EO=?_^w8s
z4fNB*_Tdr%<DY$}Znp0N{28_EdNE-{!&4y0{o2GGFCqL|)(8QHeSGR}35MDs`!-Bm
z#2%VT{@1HZ3yd7EKZ1e(f-*`8@W9A~&aHccQuia4%=`QS94|!-32~W@ZY28od)#7%
z=K>gl;Ej7tilvwnU(peQ8{Twzt=pP0U3Y=O)a_WlB^%+|4<FOo2Ih7`>2T02nFLer
z=;0q%??LOWiQ~4p+?W9S0>X&>z#Drow6Z-`1Y1O3{OyVXqzFkGf7&D==s}S)0OIL!
zk{;L3_e9XMMBJNm`^h4NzxmFODwPNE!4s{rJYql=fe(}cNShu$DUeqE{K#z~{81<&
zk!B_We;fRl?7EL}Cuvtwys?Y~NHY&{L=S#G2<#N|4{vZ$6z^w0b}+DX0D9k^b90I(
z|LZC9nqVMd)G4C`W4r;9H!RW+!dC+-lv+ej|D&s{OQpG27)D#ROlK0~5e1H*GrAI~
zZu`f4Qnp0bbWGm)#}f%6F8z~j?T+sMwQ#E%wBC|9ek?R?nV-W*rl0GQw_|)GctPxU
z=sGdTC%}3uqo&aW*EdEmWV|lj)dmXyQNZ@g6k3YP99^3NiA&V|EV^e*@}UvLXsT)U
z1%t;iRS=RAU1Q_m$Bb>i*wA9e#+$}QxH8`e7h}VsS%Z8i2P0Z{nynfh8nYW{1agtH
zZj2>g1kho~BUUp7DuOZ?tco(N^UKEw0*#P-3>Nu%|D5l5IuoeGyw*5)kg;v;2|?g5
zr*-}q0V&KH!AYjDI7q*JIE%Jduu(<UpXw8zn$tt?NI;VBENUj3ye8M(<{Da>Ffd+I
z{zjJR*6?dVZB5l2)g`Yh+UltpZ}J*ne?B(W@n@jDrl^c`(yg_xD}L8kbI?5g*Q2JI
z(I)Tpj6lih&odm@uPMlz=jpj2*A>yi<_PVk>xyW5bJI=v>lw}Ma!3Cj2b{g?dG)b!
ze;z@OV~(hD=;cMwdR%G3GWv30SDdQHIqJL@2rXJJuH@WrF>yyzb4Szf5xe1s0cOo+
zuhBXjfW)r7yx4B(m2x}wj~>|ENyk6ZW1B7aC|D_{;~PG1)z#C)8pPo!pOI@12opED
zG>%9^?7cp7lcL~WsOkVI42ikckt3(&-Tayn(7!+w5Vl?n8>rPDuT(Kb^#oG`=j!Ul
z>MGi+ZDHwUyMhWS{v23Jy|3{`&63+9Ps_%aaHr!D&M3H5-}a!2E@N99RmF*uQqDrf
zb4QZ>yysikZuq=|-mNW6@#v~Zbd6aMK?`b}50!ZMI7iK*GOxM=qyvN`#Z%QPVvKFI
zzGg=>{h!(ox&t8<>1sE4ZLVinkVnlTyWA(1So7q-IGE~Mi%kA5`DMjbuWj!5XMP0w
z;K@_dGQ|O#r6K7`xUe{EacK;ZX5H+Gl1cEFZ3VOews=`P{uPs7WSyTgPqp06itB2r
z+oY_}grvQx#Mt{?4wmZw9>vm6{aJO8F`HP5LX?_p3Yy}isp(F~uGvo~S<JlO94NjH
zMibg}&ilWB+qgjpg^B(s0p3a5k7{|LcXFanD#88)M#?W)@FvYA#-sFh=n;)<C`*#6
zrLEc<mUK&Wzo$|$APma7NP>XhqvW-NG5D_B<63RKT9p$_M74E)lJy&!{@=@ip5GIG
z)CrXWCWVUjgg}u+u0YbnGfZpqQGm-ePPj`<dKHUaT=kow3I`!%T+Jt06ldGl`-}HZ
z`Lb0l49bAr05h2{Y?a{NH@hUR$>09wdV~1gdw%Bj#;5#wFA!6H4r@ICPw~bJDW;Pz
zj`+I-<ZV6&&aZT>0UFg9_HM8ZkMh5Chvph4gFy&y+Wl_GQSu+>^o?Bsb!HI_j<4rQ
zz5hbT;NO$HalW1Bq3uA2_IMH2``62z?rvRbRt4mSnDvUCiX|u2rTt@eUmCgir*|vu
zSjB%#Agh{ko6=zwy{_Et!z7e31@LQ^q3P|3^D?g_g#oo}Y)i5qQ+tJIhAN}rNg3`1
zM8TG2$KQr1^t+}`ocCVsBVCRxMp`~683US9YD~A0b256iY2@)XkyRM8h?^=I_?M+I
ztbHQo@f(&0L_LqDOE6Z0Yd<Y4S@nuliY2#h+*gmOTGVxSVUe||ZFoBx2x(+d*t&5O
zFNeAU_B?@a#zGssDcl~eTL}t{@|?kB-!P1AIsaih;_U~GbH@2(cVwCyZAi+bpZ&af
z3zt#$Bp-@k4BZg&2%u<WMv{F?1r+w(e+qA#8n<d!8%un|2#i@p&SNQ&fFy%{V?g$U
z*P33V(je_~oo6a6pzL<K;Hu_Smz+!b5T!r)H+{x7e`sSMCJ7r~<TmAyO1Z6gjn_!2
zi&5dLN~;t{S2H1Bmiih~)$1+D<;nC+Re#-mk@QVPia1i_a(C&2N{e=m;hCDL_a`FT
z_c3eMP5gignwKqNkIWuf^r&p={#jb?+#_F1(!S|*-*YFpqUG(*Nk=%voK|)A>2;pd
zG;A(Lj=*+B@q^b6-Tmnx5<umn$Qq1nznT(Y5HTK7Y(?#}F~6pSAI+D*Jm=>S=n%{k
zh(){qKp-R?w<Epu2%STzLA+%4ex?)X+uivilgOsKkEIP`o9F!73aj@{nx)Fp#dS|w
z6u^sPUJPS1Rf@hstc*CvjTR*#WI6?}?<*|m-H<vlWPC^oyeR9c?YG6yxbg*cvVBLR
z6kzHSE=ra%jCgph)x1qI@C&POnPqGv;V7zm=uYHKNEPzKuuNCFz8<v-NM20SePv=D
zaWQ|>!(q~CLJSdNex!yry26#2;p$Xm4>RfJZ;IVCh3_$x)o&!g;&vLa^tMd$<QXRD
z{v+fDfZfvejZ7LKKT&d6HB%U1oNp1L>%6Per~St2hrknl7OXKkN8+I~(5&!CHy<*H
zDIi?L`jX?Z9$uTTdbm7+^9@5$+Wk$d>jl&HVG0nq>plw%r;b+bZ}64=4q_s|=YfWv
zyz9QGn$D#rY0=Lr7}rv6QaQPqZ6FuOt4igSFQMW1>vJSWb8sW$U0$!gprww0x2ujL
zGf`}YfFTI>`Y8}aQ#yAVW<}K-qYa^z$KYq3hN*UhR_!R2XN{S?AzEZq9_^gh9z-zG
zBm~F`2o5}85yq6Jn}kFHg)b73fK3oIV26Kp@&=GJE>f2Q+s6;x@=jYo(x-bBjJPTF
z@=h>NKrh2)J@|d$JAV7tY4x4ocF(W9tIvmNYud^H@*2~h<VctNX>0Dv0I6A5v}<!(
zd3Hb*9KQF%rFvvh9?)eKKiw*8=&eTU{myX1b3ZP<bB8@8#x@wgMnLV3_9Axt)AJps
zND(sR%LWVQa{R~8TLVVTkxKu3Vp=*AmpgnXR66gm5|9<iPs{o|j%`#q8O>N|*fFlh
z2K|EUYJlYD1)~CP;+ce%BO9!GWrRZuj&wix4}C`vKL3|ayI$0`rM_dKimY+IJr&YD
zQ|kyMs$XQuC6nCBPgj?tLLNZ^XoSPhd66Yv%%}%HKYT|)I80px!NWi9R7;L}v(V=+
zq#*1;9J;0bI(|(E59CPfT5o52y}2FtJDZz{UouS=dmF$->Z_bq((~T&MEd!G-kGLz
z-^i{b&e(@@OX*R)<H_!JgP&*agxI6|qozeo?~-6Yuni+#vc2nfvv#$=#x7pADPY~q
zd-+AP7!S)_)+iYDPSGs*VVu*<hqTC~c@fND_WcbcUs#5l_QPK?PKVTa%Hh^$cH0wI
zp6kS#8tp$r*GO2Yfb@a;`QNX^Ja$)RrXy};7)1dsl$H)&EnWB5j8g-Ee08OKvAFk}
zBHu}^d2He>+>f72|M}jqb%zLA<V*-hdi<4-pL8h>;2U_|(zrEY3RaBvsy(3B><QU;
zC;c`MlhR|MIjwC{O@VJLQb-(;-$;C*@zSW$p%KQ<L}g>=MditDCv4s+hA|xqWX_KF
zN-ULpkW5tRa1`)wUB{I9A7FD6`-tS}{OF|5bBY=NXs`ARcs!1_cLRnLh}1PP+9*^>
z*L5L+%-7sy8?1?9BLm>2;^AUE@s^@1{DGw{=lRh-a(N4<M>1>YFuSEo|3WgGOT#6j
zKBQGe`B3-uOaD6yNwQH4z2iSovT+YXhj-Uuruk{)u47s#A(T-?CC1br6-nFCsFO6+
zJB|zSWFR}uScLBu{&?W0t8TPeXzM=wcgmt?V0%_qX8Tb0PM70JCg5QxcKrLCvTw_~
zh}he^rLbI@<yW)4r6R1?N!m8+Q@_*YaB7dvSsBaP6*0VPx?jI_Po@vg+d~Wy)L%)3
zBB&%j?18O@QMGc9leT-uYbNKI6EdJ$`t$naD89Y}tC+A=cUvM)QNsd;{d-N#OZw`+
zd3(Z<0u*<H^e6PWSno={k{J%a7dEDOdw5D9Y1D~%LQffckWQ;G_b~Rwyj!f~J2GUS
zEj`OCM&)l^HBt@roK`+J{FU<_D{Ko`+1Ing9vASsQjQdIzhWv!=J~}s7_ddP0cVKD
z8eS2?bFE<%cd1!P(zrsDq+oKsTtv*TlCLb7OfB!?DmlWMc*;hDBI#&D(SX?Rpj%}{
z+6VzKin~O=1f}{Chk_M*mid-#1RBS3VK#Gqv32=~V}v7h^NcoVO22OAz>4*R=uUIp
zQ#O-e#o}eYflq-LR(cK9MT-3Mo-XnTS%r&%6;q$o(h=m=i2Y-u!I3))cagg2$@~0e
zpQVj9@ecqpon*VOQ>B;)Vil~9>KVfZ@llI0S<&K<gCqWP6F~4htf-m^d=2{T^`i5B
z8M5sTW^<_B%o_xKb&|-Ni&Q~RGSY{Bm)K>8>=*b`vj+m`D7B{6d<@*{2-uV}Va0J;
zsU<sXvn8)_teQ2$ciFbaxJA6)1yavHi!C5UCKuI3crZWO0OoE#r+K5zzJMk9>y5TS
z9X9PORgG0TnG=S%KRg)uSbr#TSg|)>$+^{6;L$YNem}R(&q_WTwxJJ?!cZGSNSp~5
z-`qW(&JFTt*Ty~QXx2%#x8XFxv8iOKenftn%Ykjsz+Yg*Pnbi_R}MGE?XV(B?Z|DM
zKLDIpE!qa~Zd7sBZ6n(_P9fxR5hH1jS9NW@KW9`wOqL+ZN`YB9?lX{xoX(^Sr$q8s
z)g}aZ%L=0r`_>^_koqWbma6qJB_m1+krOtkVSar%iR-wX*-T-5!JZJ(-6;3&h#lLm
zV(uYtk1=k0NR_y6Wohj?bNOMB>h6R;f@Ikkr#t$T)sAY-hq`Vwlk$oVm;Ct$3kRQs
z*a;V_qSNU?U1R&>@T@ZD=AMCu#rahWe{qsFZ{&=3hgjj~&H>1BU5Gqp6p3J;mjD0D
zNd@)EWuUL$tsPLF^OY)y94I{>_sxCld$aMyM!4;VY9MECy@M&2m?}E^o7B{r2_bLx
zL=Y#FlQSMxLK%U9F!(~6$hla3-i<aPlt#dqQe4BAkgsx(l&)d7$T2=40?o9LGz|;F
zMUof|6Ghm63pomZ#OjT4ZmYxWg@c`g1$$EGapS<Q8sG?|FWC#^y<5v>c9$=KYZwB9
zb@|b@4g4gz;<JtK(x5@#l)3{J8eGMiG|2h?()MD+g`<i?+9njpnSGXshE@&pGs+60
zKcO<_XR1d1&Ec9kAq_rTb-}!tyB42JM!GIjWlo+Q%{bvdz?#Qutxp<lKm*Ysjn=Nx
z!G`GSw+BW&vf%?!|BvxF9At}ZCka-V(0~@}x+)96d=|?6+LrIdJ#|NGl;I)rQj7=R
ztt%({+?H<Py8aTt;DDQGf-Rqlf<Vl@0GAo(J@Kb!hywJ9nPbLX;Lr`N!TOO51d77`
zHwb129n{=UBZh!}*tzm~-bAk9K&jD{Ya4cP<ef(z>-?Zkskx)8R^aEZ@p|6YfseQ;
zcBk7Ea(aP=UjstX{fhQ`z=0GL>(%Uhb=(P7G$@)~E5?e09J)K<DJZGHS(vP3701T^
zCdmPH{H+_Q1el*$*9}lq$V--s3M*keddE7&xn8dP?`_!7LV@wTe8>qI()}bj&<uuM
zC^(vv4<UwZ{jY#i!T@P58}8_Dz9}VNKp-m2^;>{+CV|&+*9!rU`<B%SoiA3QF2lS0
zpC*2D!oL5ny&p~-vvb=tDFKj?XG{^^h4PQHX!49%YBN70E0WKap=j5C@M5(yXth&t
zX~{f96YbhQ`+yka?Bh9Ow^y+U#WXIKuRK!+w5mQdr1@J<Bx5kfzxsuiY%1T0(;3y!
zoGPK!x6V*(@c%7Gffbv;Zc>I#zVvHcqWihXA^5xpwR3YEkWB+7PMi)Z>{T@HimE@#
zg3bDi=MBoH-a2tOqZ*ruB2?TJKlfiJ)?Qs90IVQmXGbZdS=mn~hQnyHx4q&o81{4_
z%@HbOm_m*}bNhOkw_M!;ll(BMq6R#h5Wlsj<n-%vawR58s56k`PU?-5r}N2UU&X+k
zz*KpI))%9BT9}6Ykr^E9xS2wx@n9r#_R&T!G;rsvPD}`I`#5;t=muchw(~&9s|$Xv
zl+zHN9S0yCQwwFz45_iCmQ+odF}@Z?&5-?5%R<!pFA-=vB{FSo$WO}s7Kebui@-fp
z%W*HjhEf3RSHSf-+is_ipA^gPlT5~7{UWB(fBTHEX>s<vGy0o+)idm_gv8GAd-hK0
z1w$)S+=F!MhH_x7C`S}ctH$c<Qee%|m6qb}QiMG(Pq2?N+cl}5S5R&#VAdu)GiuTw
z^@4ysF@5W2mc4=OW`PPdc2_NDI*h=UYq!zo=*{a+qTqM2SJ#kw{bJU@nRfK+TK&A!
zx#Lrct?T-?9``C?xXh3W%TC9&|HWFSz!^i8bfvB-pqwtPtIJVk6kq_UkKfz^2JNqP
zJlV&Tgz+;+LwW)+<lsLmOG2jA*>kSfu<*KOTD?1xG^BT7%q)9em#y<UxN@uq#274*
zVO>F=PK4am&SEMDPH~EuHTmkMDA6>>`xwy^qwL*w$YE#>H?RmIon||9GR6=j*V3bm
zvUKNEN;V#h@uu3L<IT1eYoST5=^*AB6>6o5UW1~Z*G3y^z)>_fZ@ml1#4DX)Zk6tI
zS!V51ohL|tQx2B7Ra!YV9{Z;^wgMAH#@P!wTI&An)ZJkgrNl%6sEOYuZ@n1%vBP4}
zM6gZ3<rL<Bg6@fK@4&N|Tz_w@e7|0_%rTC=8p4n!CimaJ6cUZ{NzyGRwkb*5y{q54
z0_SwzYXc?OC}P_3!HQT<htb;R1g78&GB(}+&$*t&IC$bexp|VnJ4>viLlkeHHn;&P
zgEhIW96+}|mx{a9Of)*W^ae}+WP2|ujHgka175)t5nTaS9H04PU_+~l`{JGkuQ~d}
z9Mo^(Tb#^!O~u^RPIE)vTh7|=^+@{1EX4+|eb0D`(#wevcl+H4@!X5?oqex)A~~#n
zKNzh+bs{kPv2m%?s)OXx>fBGjjE+TSs84EZ&h5i9D$jg4m5tz%K+Zr#n)W~4hTiwr
z?7a<K#yivrXTwqq|JndnCK%@H0cniSJ6rD9?+r$MHJKGO#&L(G-G5MJxf3hR)M!KW
zi$-}1Vz}O>xAXV05N3_JTnPA7Y9I^Tmm~M3!`65j-;WyPFujGxT(*p#p97QcZ7qu-
z2OcLd?)(jv3ChHZXIY{(q@e?hmF#+X0FVNP7jCSw;<KtFB|msraNchsZ)y!4hwC~P
z+}oG_8@@F6-m3T>t%teP7G}0qrZaFycJcZ}fj#h|;G$Q{i!(8YNfbCvY!zaC!V5($
znvOr8jPc0(Fe&%!MF;J_87nL#R5bCJ`H)$;=(QH5&kuyN=bwK{_J*K>WhIZuJ8vHO
zi~RKfjK_zgoONIVDveDDV5%2z9wZ5Na1TBc1JW2DjuT+ktB4teyaUJA56p?$W<u_V
z(f|5!C(J}tPuS+5@>oM_+$Y=xP)`?k<CUFInTd36^X`t@?&XR(J7vDkt;z?f)lu3g
z2eQL5hje*!;$XLsi>?DOFWoO5jV#mklZE4ffwJ|>fmmtdi7<Y$?hYX>Pp*0`57841
z)8pXkSZ&k<&{W|Eq$9^MhU0Qc`s|~yxPDo)Acv{u{OSkEB#G*wYQfyXrUW-a#nTzf
zg7%h^cKzajN6=5^=7uR1ai>1+t;+w+t5peYc<0R3W5tR7zRHudv(9W^7^fa=Q=tye
z^TKZciaR3cj_)gVp8g|$g3#V&1fE{_xo|dw>*mDF?;(Z4K3p>VoF4Ru$3o^!aVbD>
zf%@{>2LSInohs*)SpXzVp=UcbRStgFNnBIji?6_$j{mGp>Zfs0c<-%E;k0$RFJH}n
z9ygVYTWLX4otAyV890B=6wj7ErwIqFVO!>ft>wP-p;ngZ=5X-g8}i7fV8si?+^WCu
zV*imtz@=(ljy(NJqbwZGEM7fR(GcI*o0u<Nuhbdbyq|LdxM`yD)i?JxvSup>M2iwA
z@!v~~yP77kp5L32)^p?%I-jJQik9Dfa`NPBVM{Sbf8RojpUd*e)fdqh3Ag#}!@XC(
zC8bMDhrFEEFMQvJ$?PR*(K6^rr2koAUTqY*r%dLny$ora%Q!Cxl)gf&6T3LLb>8V4
z3R=x8qW;XtiTfN&TM@jNT;S4^DcCgoZCdOKko@;!Mpk`eTHI${pNckWZp)l|rWtdu
zT{8<%Ghw2qAF@#2a}5pAQ1aJ)9`-fiW{0=4U$TC&bge#oXsjV-N{?IF)0aI&`7QN3
zdi2do)AbLsF3Qe4Lp0<~-)k^2Mw4jVJ?Lnzeaf^=mhd3VolsDw<lyD{FR)_hbLNIM
z!7HmEf=j+RdY*y#iE6-ftlXK(hhWqh^|kFM-s&Ba$F#kY2f`1=s9xFRHfc3Ra)==8
zm3Mx$vevK0F@6lR$=>cuE;9o@O-FLD{ph~jU321<#qR%o>3-DD)qIg?#TfK`NU4k(
z&ow2#aL&9voiu&4;=TM_dPW|0WXD1D$8@H|x6ogGr(JHwdb$E@-)qe8o`6qJ=VvP^
zYyA0*6t7t_`TCrBcTcC#LR{A?gz>7VXiPHtj4rb4Vaa4||IlAm%2Odu$bMHaqn@%+
z{3N5@Wi%{YrDU?8y+1;{GdRWg)IOp;6ZfBljVij@PFDT~VE+hC`vHW!tJ0XZXV3Ya
z%XUz)p7AcYnIf_)QXfG?ExDlFCr#3Iv0+q}I@j6u@(N<{XMC47_RdH%4bFnpkIskn
zN+_lB&vE22FRtBXxnCw|OR`0^q9rQHN;5(tJQfxntIw|*kYe|-R}a4C@GuLwa@&KI
z5GJZ;?cw@GE;H^Xa27J{M-hLLh&}^QNREblLPwwF68+)GQ2DEr^YI=mY&YiYGBKa?
z(@$woXRY%{q!EtfC1(TBhy*4ZeMU?4Co&oWD~>*UP4tHrXyo4Xk?7Ou68Yg8i|QV5
zGrtf`6DGWxNx(ez?aa+*J(yE3X6f~5WT@d6aYBhi+3pUg5Iz|&$@7&9y(b?TU?-RI
zd5=9TXLn05&|AvrkJyMCww1^8r{xlRx#XSv$KfPqb|=jorI-*p<r=1pMuN}@B?|HA
zpm3t#l<NzSmWrL{wI6vt9WM0`U8K2AbBdls>g1@=tDKrLeiZq%jLqJbo-GImKZiMe
zB21S|dkzCXx8)lqV3as>C+fqH+*1CI0E#g#dG3hr&_E$P?Y!76fkbypjY1X9Cl}wZ
zCi(8cesZh^wn}imCRZfzw)|^Fy3%m$O5m`e6#ZK};d!VKo=C)9#l91gnsy?SpcO~1
zC<&Y(t7b1gVyg*LJC--<wbtCV<6wHJw-iz(M2{ajxAH$LCBA9`I^kKbycN=Bgp1Gl
zcW=tdIsv-tf~d6_MWh8RMI%cw^h}=UCiut7zi?1NOOkP`gx))H#k;^|GrP)Zz|JfI
z^T-x}^N!EP12lq9H_O%HH*g4`K+6Wy_Igw(+yyHdmieLi%MNtN@QI}}kyNEaz?%mO
zG@K;4P)IxiCLZm=E*DYO!3FM=@ZOqp-I|FM#rmz!HhG99z{G)fuJ2-Ku&hUpJF{T3
z362seAa9>%V$JOe?zHvJZ0*ba4O@tM?i7{fGcQ<W`>1`S6WCf{>(<|PDgjuuzsQ6_
zop<Yic`~*pr7bng3UgtErQL6dKdo`?QElC|PYwUgF{_F;6{@nz%f3mi=8UM8oq0Q}
zg*F8OtFTv(7A}p?8zaCS@sB1h51eMS(DvD^KSrhQb<yBL>HBA^AHRzdS?GJUASZ7_
ziZuCR>*;ovLaQx-v6X8B3PvRX0i=-0w$qoM(_MSDu(eKG_Q<h%B50y^YCV1A*ccI%
z5}=qO$CjSfj3?Hritnz%eIATi6G2F%g*hOOGY}109GmEk5R1mEpDx`?OHJP-DSVQ7
zF`GIIXs25}iy3t_^QsDl`L*1X*Le~#55aS}F%K~N#g5YMzL$N1NgE$#a~gOS`0BIA
zJJf%ReJ%?@Kk({kY0{lQp~A{BG!gJ%Y<Q{4XoumKOw*Jo)LtKqnh-JGsZMN6YxQ@#
zK)Jk=BtrsMTUZ<OKk80cUc_EvQW`i?*I<?M%oKjWvn`XH^ikRn^_CR*hSB06WyK@M
zybsyTunPahqlHc*UKt~emNTctIUocVzKJ4if=M<p=QQ0U+`7rYQ$35@zTvc2i?;)g
z_h}Ht;SzkhyF?JRc#>X)8yzzWTMMGZErd@5VqwK*dSxd}Gi|0@N;g`B-n}P7meKYv
z*^r*Dijtg?*sn~fpbabe3BvQ$@+zBRE}ujgLL;f3xJ}q7kOie}e?6#STiOYqQHiT2
zg1FI^pC%Ncl_$$Mb-qEa@XQO69mdNwk+3*LQR4$9$?xJuhZ;c@ZOVP1tCEA*zhp?<
zfB_~?l=!b+_hmvq=F(NLMVZV4mkf)G{Br-mP7uc#rOe<(GwObE(vJ?K+_kNgrBp?$
zs$`U1Xo%-t?BrgaX!M71w^*GGn(Flgo_#E@;%4NIzM_7wzI^Ui-*^vr{0`Dm(|uT_
IV*BF%1L5p>#{d8T

literal 0
HcmV?d00001

diff --git a/html/modules/custom/reliefweb_meta/reliefweb_meta.info.yml b/html/modules/custom/reliefweb_meta/reliefweb_meta.info.yml
new file mode 100644
index 000000000..a45b1dde8
--- /dev/null
+++ b/html/modules/custom/reliefweb_meta/reliefweb_meta.info.yml
@@ -0,0 +1,5 @@
+type: module
+name: ReliefWeb Meta
+description: 'Handles meta data.'
+package: reliefweb
+core_version_requirement: ^9
diff --git a/html/modules/custom/reliefweb_meta/reliefweb_meta.module b/html/modules/custom/reliefweb_meta/reliefweb_meta.module
new file mode 100644
index 000000000..d646f4cc0
--- /dev/null
+++ b/html/modules/custom/reliefweb_meta/reliefweb_meta.module
@@ -0,0 +1,855 @@
+<?php
+
+/**
+ * @file
+ * ReliefWeb Meta module file.
+ */
+
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\Core\Entity\FieldableEntityInterface;
+use Drupal\Core\Field\EntityReferenceFieldItemListInterface;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Url;
+use Drupal\image\Entity\ImageStyle;
+use Drupal\node\NodeInterface;
+use Drupal\taxonomy\TermInterface;
+use Drupal\reliefweb_utility\Helpers\DateHelper;
+use Drupal\reliefweb_utility\Helpers\LocalizationHelper;
+use Drupal\reliefweb_utility\Helpers\MediaHelper;
+
+/**
+ * Implements hook_metatag_route_entity().
+ */
+function reliefweb_meta_metatag_route_entity(RouteMatchInterface $route_match) {
+  switch ($route_match->getRouteName()) {
+    case 'entity.node.canonical':
+      return $route_match->getParameter('node');
+
+    case 'entity.taxonomy_term.canonical':
+      return $route_match->getParameter('taxonomy_term');
+  }
+  return NULL;
+}
+
+/**
+ * Implements hook_metatags_alter().
+ */
+function reliefweb_meta_metatags_alter(array &$metatags, array &$context) {
+  $data = [
+    'type' => 'article',
+    'shortlink' => Url::fromUserInput(\Drupal::request()->getRequestUri(), [
+      'absolute' => TRUE,
+      'path_processing' => FALSE,
+    ])->toString(),
+    'image' => reliefweb_meta_get_image_url(),
+  ];
+
+  switch (\Drupal::routeMatch()->getRouteName()) {
+    case 'entity.node.canonical':
+      $data = reliefweb_meta_get_node_metatags($context['entity']);
+      break;
+
+    case 'entity.taxonomy_term.canonical':
+      $data = reliefweb_meta_get_term_metatags($context['entity']);
+      break;
+
+    case 'reliefweb_homepage.homepage.page':
+      $data['type'] = 'website';
+      $data['description'] = \Drupal::config('system.site')->get('slogan') ?? '';
+      // Change the metatags's title directly to avoid adding the "| Reliefweb"
+      // suffix in reliefweb_meta_update_metatags().
+      $metatags['title'] = t('@site_name - Informing humanitarians worldwide', [
+        '@site_name' => \Drupal::config('system.site')->get('name') ?? 'ReliefWeb',
+      ]);
+
+      break;
+
+    case 'reliefweb_rivers.blog_post.river':
+      $data['title'] = t('Blog');
+      $data['description'] = t("A look at the ideas and projects we're working on as we strive to grow and improve ReliefWeb.");
+      break;
+
+    case 'reliefweb_rivers.country.river':
+      $data['title'] = t('Countries');
+      $data['description'] = t('ReliefWeb country pages provide a comprehensive overview of the humanitarian situation and feature situation reports, news and press releases, assessments, evaluations, infographics, maps and more.');
+      break;
+
+    case 'reliefweb_rivers.disaster.river':
+      $data['title'] = t('Disasters');
+      $data['description'] = t('ReliefWeb disaster pages provide an overview of the situation and situation reports, news and press releases, assessments, evaluations, infographics and maps. Browse our list of natural disasters with humanitarian impact from 1981 until today.');
+      break;
+
+    case 'reliefweb_rivers.job.river':
+      $data['title'] = t('Jobs');
+      $data['description'] = t('Your gateway for humanitarian and development jobs. Search and/or drill down with filters to narrow down the listings.');
+      break;
+
+    case 'reliefweb_rivers.report.river':
+      $metatags['title'] = t('Updates');
+      $data['description'] = t('Your gateway to all content to date. Search and/or drill down with filters to narrow down the content.');
+      break;
+
+    case 'reliefweb_rivers.source.river':
+      $data['title'] = t('Organizations');
+      $data['description'] = t('A list of organizations that are actively providing ReliefWeb with content (reports, jobs and training).');
+      break;
+
+    case 'reliefweb_rivers.topic.river':
+      $data['title'] = t('Topics');
+      $data['description'] = t('Curated pages dedicated to humanitarian themes and specific humanitarian crises.');
+      break;
+
+    case 'reliefweb_rivers.training.river':
+      $data['title'] = t('Training');
+      $data['description'] = t('Your gateway for humanitarian training opportunities. Search and/or drill down with filters to narrow down the listings.');
+      break;
+
+    default:
+      // Not so great to re-use the same description but normally all the
+      // main and meaningful pages are covered above or are nodes or terms.
+      $data['description'] = \Drupal::config('system.site')->get('slogan') ?? '';
+  }
+
+  reliefweb_meta_update_metatags($metatags, $data);
+}
+
+/**
+ * Get the metatags for node.
+ *
+ * @param \Drupal\node\NodeInterface $node
+ *   Node.
+ *
+ * @return array
+ *   Node metatags.
+ */
+function reliefweb_meta_get_node_metatags(NodeInterface $node) {
+  $cache = \Drupal::cache();
+  $cache_id = 'reliefweb_meta:entity:' . $node->uuid();
+  $cache_metadata = CacheableMetadata::createFromObject($node);
+
+  // Try to get the data from the cache.
+  $cache_object = $cache->get($cache_id);
+  if (!empty($cache_object->data)) {
+    return $cache_object->data;
+  }
+
+  // Defaults.
+  $type = 'article';
+  $title = $node->label();
+  $shortlink = reliefweb_meta_get_entity_shortlink($node);
+  $image = reliefweb_meta_get_image_url();
+  $origin = '';
+  $description = '';
+
+  // Get the taxonomy terms associated with the node.
+  $terms = reliefweb_meta_get_entity_terms($node, $cache_metadata);
+
+  // Get the metatags based on the node bundle.
+  switch ($node->bundle()) {
+    case 'blog_post':
+      $type = 'blog';
+      $image = reliefweb_meta_get_entity_image_url($node, 'field_attached_images');
+      $description = t('Blog post by @author', [
+        '@author' => $node->field_author->value ?? $node->getOwner()->label(),
+      ]);
+      break;
+
+    case 'book':
+      // Some special node book pages.
+      switch (\Drupal::request()->getRequestUri()) {
+        case 'about':
+          $description = t("Learn about ReliefWeb's history and mandate.");
+          break;
+
+        case 'help':
+          $description = t('Links to help you with your request.');
+          break;
+
+        case 'help/api':
+          $description = t('How to use ReliefWeb content in external sites and apps.');
+          break;
+
+        case 'location-maps':
+          $description = t('A list of maps produced by OCHA/ReliefWeb and free for use by the humanitarian community.');
+          break;
+
+        case 'rss':
+          $description = t('ReliefWeb RSS feeds you can subscribe to.');
+          break;
+
+        case 'share':
+          $description = t('Share your information on ReliefWeb.');
+          break;
+
+        case 'terms-conditions':
+          $description = t('ReliefWeb terms of service.');
+          break;
+
+        default:
+          // We assume the other book pages belong to the Help section.
+          $description = t('Help - @title', ['@title' => $node->label()]);
+      }
+      break;
+
+    case 'job':
+      // Description in the form:
+      //
+      // "Category Type in Country about Theme, requiring Years of experience,
+      // from Source; closing on Date"
+      //
+      // Category.
+      $description = reliefweb_meta_description_term($node, $terms, 'career_categories');
+      // Job type.
+      $description .= reliefweb_meta_description_term($node, $terms, 'job_type', ' ');
+      // Country.
+      $description .= reliefweb_meta_description_term_list($node, $terms, ['country' => 1], 'in');
+      // Theme.
+      $description .= reliefweb_meta_description_term_list($node, $terms, ['theme' => 3], 'about');
+      // Experience.
+      $description .= reliefweb_meta_description_term($node, $terms, 'job_experience', ', requiring ', ' of experience,');
+      // Source.
+      $description .= reliefweb_meta_description_term_list($node, $terms, ['source' => 1], 'from');
+      // Closing date.
+      $description .= reliefweb_meta_description_date($node, 'job_closing_date', '; closing on ');
+      break;
+
+    case 'report':
+      // Add the primary country to the title.
+      $title .= reliefweb_meta_description_term($node, $terms, 'primary_country', ' - ');
+
+      // Description in the form:
+      //
+      // "Language Type on Country about Tags; published on Date by Sources"
+      //
+      // Note: for countries we don't use 'reliefweb_meta_description_term_list'
+      // to ensure the primary country is the first in the list.
+      //
+      // Language.
+      $description = reliefweb_meta_description_term($node, $terms, 'language');
+      // Content format.
+      $description .= reliefweb_meta_description_term($node, $terms, 'content_format', ' ');
+      // Countries.
+      if (!$node->field_primary_country->isEmpty()) {
+        $description .= reliefweb_meta_description_term($node, $terms, 'primary_country', ' on ');
+        $countries = count($node->field_country->filterEmptyItems());
+        if ($countries === 2) {
+          $description .= ' and 1 other country';
+        }
+        elseif ($countries > 3) {
+          $description .= strtr(' and @count other countries', [
+            '@count' => $countries - 1,
+          ]);
+        }
+      }
+      else {
+        reliefweb_meta_description_term_list($node, $terms, ['country' => 1], 'on', '1 other country', '@count other countries');
+      }
+      // Tags.
+      $tags = [
+        'theme' => 2,
+        // Disable vulnerable group field (#kUklB1e4).
+        /*'vulnerable_groups' => 2,*/
+        'disaster_type' => 2,
+      ];
+      $description .= reliefweb_meta_description_term_list($node, $terms, $tags, 'about', 'more');
+      // Date.
+      $description .= reliefweb_meta_description_date($node, 'original_publication_date', '; published on ');
+      // Sources.
+      $description .= reliefweb_meta_description_term_list($node, $terms, ['source' => 2], 'by', '1 other organization', '@count other organizations');
+
+      // Origin.
+      $origin_notes = $node->field_origin_notes->value;
+      if (!empty($origin_notes) && filter_var($origin_notes, FILTER_VALIDATE_URL)) {
+        $origin = $origin_notes;
+      }
+
+      // Image.
+      $image = reliefweb_meta_report_image($node);
+      break;
+
+    // @todo we could use the topic icon but the quality is not always good.
+    case 'topic':
+      $title .= ' | Topics';
+      $description = t('Find humanitarian analysis, evaluations and guidelines on @title', [
+        '@title' => $node->label(),
+      ]);
+      break;
+
+    case 'training':
+      $start = $node->field_training_date->value;
+      $end = $node->field_training_date->end_value;
+      $ongoing = empty($start);
+      $online = $node->field_training_format->value === 'online';
+
+      // Description with different forms (3 examples):
+      //
+      // - "Type from Source in Category about Theme held in Country; from Start
+      // to End; registration until Date"
+      // - "Online Type from Source in Category about Theme; on Date;
+      // registration until Date"
+      // - "Ongoing online Type from Source in Category about Theme; ongoing
+      // course"
+      //
+      // Ongoing.
+      if ($ongoing) {
+        $description = 'Ongoing ';
+      }
+      // Format.
+      if ($online) {
+        $description .= $ongoing ? 'online ' : 'Online ';
+      }
+      // Type.
+      $description .= reliefweb_meta_description_term($node, $terms, 'training_type');
+      // Source.
+      $description .= reliefweb_meta_description_term_list($node, $terms, ['source' => 1], 'from');
+      // Category.
+      $description .= reliefweb_meta_description_term_list($node, $terms, ['career_categories' => 1], 'in');
+      // Theme.
+      $description .= reliefweb_meta_description_term_list($node, $terms, ['theme' => 3], 'about');
+      // Country.
+      if (!$online) {
+        $description .= reliefweb_meta_description_term_list($node, $terms, ['country' => 1], 'held in');
+      }
+      // Date.
+      if (!$ongoing) {
+        $start = DateHelper::format($start, 'custom', 'j M Y');
+        $end = DateHelper::format($end, 'custom', 'j M Y');
+        if (!empty($start)) {
+          if (!empty($end)) {
+            $description .= '; from ' . $start;
+            $description .= ' to ' . $end;
+          }
+          else {
+            $description .= '; on ' . $start;
+          }
+        }
+      }
+      else {
+        $description .= '; ongoing course';
+      }
+      // Registration date.
+      $description .= reliefweb_meta_description_date($node, 'registration_deadline', '; registration until ');
+      break;
+
+  }
+
+  $metatags = array_filter([
+    'type' => $type,
+    'shortlink' => $shortlink,
+    'title' => $title,
+    'description' => $description,
+    'image' => $image,
+    'origin' => $origin,
+  ]);
+
+  // Cache the metatags permanently until the entity or its dependencies are
+  // changed.
+  $cache->set($cache_id, $metatags, Cache::PERMANENT, $cache_metadata->getCacheTags());
+
+  return $metatags;
+}
+
+/**
+ * Get the metatags for term.
+ *
+ * @param \Drupal\taxonomy_term\TermInterface $term
+ *   Term.
+ *
+ * @return array
+ *   Term metatags.
+ */
+function reliefweb_meta_get_term_metatags(TermInterface $term) {
+  // Defaults.
+  $type = 'article';
+  $title = $term->label();
+  $shortlink = reliefweb_meta_get_entity_shortlink($term);
+  $image = reliefweb_meta_get_image_url();
+  $origin = '';
+  $description = '';
+
+  // Get the metatags based on the term bundle.
+  switch ($term->bundle()) {
+    case 'country':
+      $description = t('Humanitarian situation reports, response plans, news, analyses, evaluations, assessments, maps, infographics and more on @name', [
+        '@name' => $term->label(),
+      ]);
+
+      // Image.
+      if (!empty($term->field_iso3->value)) {
+        $image = reliefweb_meta_get_country_location_map_url($term->field_iso3->value);
+      }
+      break;
+
+    case 'disaster':
+      $description = t('Humanitarian situation reports, response plans, news, analyses, evaluations, assessments, maps, infographics and more on @name', [
+        '@name' => $term->label(),
+      ]);
+      break;
+
+    case 'source':
+      $description = t('Humanitarian content from @name', [
+        '@name' => $term->label(),
+      ]);
+
+      // Image.
+      $image = reliefweb_meta_get_entity_image_url($term, 'field_logo', '');
+      break;
+  }
+
+  $metatags = array_filter([
+    'type' => $type,
+    'shortlink' => $shortlink,
+    'title' => $title,
+    'description' => $description,
+    'image' => $image,
+    'origin' => $origin,
+  ]);
+
+  // Cache the metatags permanently until the entity or its dependencies are
+  // changed.
+  $cache->set($cache_id, $metatags, Cache::PERMANENT, $cache_metadata->getCacheTags());
+
+  return $metatags;
+}
+
+/**
+ * Update metatags for the current route with the given data.
+ *
+ * @param array $metatags
+ *   Metatags.
+ * @param array $data
+ *   Associative array with the base metatags (as strings):
+ *   - type: content type, either website (front page), article or blog
+ *   - title: page title
+ *   - description: short text describing the content
+ *   - canonical: canonical url
+ *   - shortlink: short url (ex: non-aliased node url)
+ *   - image: image url (ex: report's front cover)
+ *   - origin: url of the origin of the content (ex: report's origin).
+ */
+function reliefweb_meta_update_metatags(array &$metatags, array $data) {
+  $state = \Drupal::state();
+  $site_name = reliefweb_meta_get_site_name();
+  $canonical_url = $data['canonical'] ?? $metatags['canonical_url'] ?? '';
+
+  // Consolidated metatags list.
+  $twitter_card = 'summary';
+  // Use large images for twitter cards if the image uses the large style.
+  if (!empty($data['image']) && strpos($data['image'], '/large/') > 0) {
+    $twitter_card = 'summary_large_image';
+  }
+
+  $list = [
+    // Base metatags.
+    'title' => !empty($data['title']) ? t('@title | @site_name', [
+      '@title' => $data['title'],
+      '@site_name' => $site_name,
+    ]) : $metatags['title'] ?? '',
+    'description' => $data['description'] ?? '',
+    'canonical_url' => $canonical_url,
+    'shortlink' => $data['shortlink'] ?? '',
+    // Google news.
+    'image_src' => $data['image'] ?? '',
+    'original_source' => $data['origin'] ?? '',
+    // Facebook.
+    'fb_app_id' => $state->get('facebook_app_id', ''),
+    'og_description' => $data['description'] ?? '',
+    'og_image' => $data['image'] ?? '',
+    'og_site_name' => $site_name,
+    'og_title' => $data['title'] ?? $metatags['title'] ?? '',
+    'og_type' => $data['type'] ?? 'article',
+    'og_url' => $canonical_url,
+    // Twitter.
+    'twitter_cards_type' => $twitter_card,
+    'twitter_cards_site' => '@reliefweb',
+  ];
+
+  foreach ($list as $key => $value) {
+    if (!empty($value)) {
+      $metatags[$key] = $value;
+    }
+  }
+}
+
+/**
+ * Get the taxonomy terms for the entity.
+ *
+ * @param \Drupal\Core\Entity\FieldableEntityInterface $entity
+ *   Entity.
+ * @param \Drupal\Core\Cache\CacheableMetadata $cache_metadata
+ *   Cache metadata.
+ *
+ * @return array
+ *   Associative array with the term ids as keys and the names and shortnames
+ *   as values.
+ */
+function reliefweb_meta_get_entity_terms(FieldableEntityInterface $entity, CacheableMetadata $cache_metadata) {
+  $terms = [];
+  foreach ($entity as $field) {
+    if ($field instanceof EntityReferenceFieldItemListInterface && $field->getSetting('target_type') === 'taxonomy_term') {
+      foreach ($field->referencedEntities() as $term) {
+        $shortname = $term->label();
+        if ($term->hasField('field_shortname')) {
+          $shortname = $term->field_shortname->value ?? $shortname;
+        }
+
+        $terms[$term->id()] = [
+          'id' => $term->id(),
+          'name' => $term->label(),
+          'shortname' => $shortname,
+        ];
+
+        $cache_metadata->addCacheTags($term->getCacheTags());
+      }
+    }
+  }
+
+  return $terms;
+}
+
+/**
+ * Get the absolute URL of an image from a field of the given entity.
+ *
+ * @param \Drupal\Core\Entity\FieldableEntityInterface $entity
+ *   Entity.
+ * @param string $field
+ *   Media field of the entity.
+ * @param string $style
+ *   Image style to use for the image URL.
+ *
+ * @return string
+ *   Image URL.
+ */
+function reliefweb_meta_get_entity_image_url(FieldableEntityInterface $entity, $field, $style = 'large') {
+  if (!$entity->hasField($field) || $entity->get($field)->isEmpty()) {
+    return '';
+  }
+
+  $image = MediaHelper::getImage($entity->get($field));
+  if (empty($image['uri'])) {
+    return '';
+  }
+
+  return reliefweb_meta_get_styled_image_url($image['uri'], $style);
+}
+
+/**
+ * Get the styled image URL for the given image URI.
+ *
+ * @param string $uri
+ *   Image URI.
+ * @param string $style
+ *   Image style.
+ *
+ * @return string
+ *   Image URL.
+ */
+function reliefweb_meta_get_styled_image_url($uri, $style = 'large') {
+  if (empty($uri)) {
+    return '';
+  }
+
+  if (!empty($style)) {
+    $image_style = ImageStyle::load('large');
+    if (!empty($image_style)) {
+      return $image_style->buildUrl($uri);
+    }
+  }
+
+  try {
+    return \Drupal::service('file_url_generator')
+      ->generateAbsoluteString($uri);
+  }
+  catch (\Exception $exception) {
+    return '';
+  }
+}
+
+/**
+ * Get the description component for the given term field.
+ *
+ * Return the name of the first term in the field.
+ *
+ * @param \Drupal\Core\Entity\FieldableEntityInterface $entity
+ *   Entity.
+ * @param array $terms
+ *   Entity's terms.
+ * @param string $field
+ *   Term field.
+ * @param string $prefix
+ *   Prefix to prepend to the term name.
+ * @param string $suffix
+ *   Suffix to append to the term name.
+ * @param bool $shortname
+ *   Whether to use the term shortname or the term name.
+ *
+ * @return string
+ *   Term name (with prefix if provided).
+ */
+function reliefweb_meta_description_term(FieldableEntityInterface $entity, array $terms, $field, $prefix = '', $suffix = '', $shortname = FALSE) {
+  $field = 'field_' . $field;
+  if (!$entity->hasField($field) || $entity->get($field)->isEmpty()) {
+    return '';
+  }
+
+  $id = $entity->get($field)->target_id;
+  if (empty($id) || !isset($terms[$id])) {
+    return '';
+  }
+
+  $term = $terms[$id];
+  $name = $term[$shortname ? 'shortname' : 'name'] ?? $term['name'];
+  return !empty($name) ? $prefix . $name . $suffix : '';
+}
+
+/**
+ * Get the description component for the given term fields.
+ *
+ * Return a formatted list of terms like "about term1, term2, term3 and more".
+ *
+ * @param \Drupal\Core\Entity\FieldableEntityInterface $entity
+ *   Entity.
+ * @param array $terms
+ *   Entity's terms.
+ * @param array $fields
+ *   Array with term field as key and number of terms to use as value.
+ * @param string $prefix
+ *   Prefix to the formatted list of terms.
+ * @param string $singular
+ *   More text in case of a single extra term.
+ * @param string $plural
+ *   More text in case of multiple extra terms.
+ *
+ * @return string
+ *   Formatted list of terms.
+ */
+function reliefweb_meta_description_term_list(FieldableEntityInterface $entity, array $terms, array $fields, $prefix = '', $singular = '', $plural = '') {
+  $list = [];
+  $more = 0;
+
+  // Retrieve and sort the terms for each field.
+  foreach ($fields as $field => $count) {
+    $field = 'field_' . $field;
+    if (!$entity->hasField($field) || $entity->get($field)->isEmpty()) {
+      continue;
+    }
+
+    // Retrieve and sort the terms.
+    $names = [];
+    foreach ($entity->get($field) as $item) {
+      if (isset($item->target_id) && !empty($terms[$item->target_id])) {
+        $term = $terms[$item->target_id];
+        // We use the shortname to keep the description short.
+        $names[$term['id']] = $term['shortname'] ?? $term['name'];
+      }
+    }
+    LocalizationHelper::collatedSort($names);
+
+    // Extract the subset of terms to use in the lis.
+    foreach (array_slice($names, 0, $count) as $name) {
+      $list[] = $name;
+    }
+    // Keep track of the number of items non used in the list.
+    $more += count($names) > 2 ? count($names) - 1 : 0;
+  }
+
+  if (!empty($list)) {
+    if ($more > 0 && !empty($singular)) {
+      if (!empty($plural) && $more > 1) {
+        $list[] = strtr($plural, '@count', $more);
+      }
+      else {
+        $list[] = strtr($singular, '@count', $more);
+      }
+    }
+
+    // Format the list of terms in the form "term1, term2, term3 and more".
+    $last = array_pop($list);
+    $text = !empty($list) ? implode(', ', $list) . ' and ' . $last : $last;
+
+    return !empty($prefix) ? ' ' . $prefix . ' ' . $text : ' ' . $text;
+  }
+  return '';
+}
+
+/**
+ * Get the description component for the given date field.
+ *
+ * @param \Drupal\Core\Entity\FieldableEntityInterface $entity
+ *   Entity.
+ * @param string $field
+ *   Date field.
+ * @param string $prefix
+ *   Prefix to prepend to the date.
+ * @param string $suffix
+ *   Suffix to append to the date.
+ *
+ * @return string
+ *   Formatted date (with prefix if provided).
+ */
+function reliefweb_meta_description_date(FieldableEntityInterface $entity, $field, $prefix = '', $suffix = '') {
+  $field = 'field_' . $field;
+  if (!$entity->hasField($field) || $entity->get($field)->isEmpty()) {
+    return '';
+  }
+
+  $date = DateHelper::format($entity->get($field)->value, 'custom', 'j M Y');
+  return !empty($date) ? $prefix . $date . $suffix : '';
+}
+
+/**
+ * Get metadata image for report pages.
+ *
+ * @param \Drupal\Core\Entity\FieldableEntityInterface $entity
+ *   Entity.
+ *
+ * @return string
+ *   Url of the report image.
+ */
+function reliefweb_meta_report_image(FieldableEntityInterface $entity) {
+  // Headline image.
+  $image = reliefweb_meta_get_entity_image_url($entity, 'field_headline_image');
+
+  // Report image.
+  if (empty($image)) {
+    $image = reliefweb_meta_get_entity_image_url($entity, 'field_image');
+  }
+
+  // PDF attachment cover.
+  if (empty($image)) {
+    $preview = $entity->field_file?->first()?->getPreview(FALSE);
+    if (!empty($preview)) {
+      $image = reliefweb_meta_get_styled_image_url($preview->getFileUri());
+    }
+  }
+
+  // Disaster icon.
+  if (empty($image)) {
+    $code = $entity->field_disaster_type?->entity?->field_disaster_type_code?->value;
+    if (!empty($code)) {
+      $image = reliefweb_meta_get_image_url('/disaster-type/' . $code . '.png');
+    }
+  }
+
+  // Default to RW logo for social media.
+  return $image ?: reliefweb_meta_get_image_url();
+}
+
+/**
+ * Get the site name.
+ *
+ * @return string
+ *   Site name.
+ */
+function reliefweb_meta_get_site_name() {
+  return \Drupal::config('system.site')->get('name') ?? 'ReliefWeb';
+}
+
+/**
+ * Get an entity shortlink.
+ *
+ * @param \Drupal\Core\Entity\EntityInterface $entity
+ *   Entity.
+ *
+ * @return string
+ *   Entity shortlink.
+ */
+function reliefweb_meta_get_entity_shortlink(EntityInterface $entity) {
+  return $entity->toUrl('canonical', [
+    'absolute' => TRUE,
+    'path_processing' => FALSE,
+  ])->toString();
+}
+
+/**
+ * Get the URL of an image.
+ *
+ * @param string $uri
+ *   Image URI. Leave empty to use the default metatag image.
+ * @param bool $relative
+ *   TRUE if the image URI is relative to the reliefweb_meta module.
+ *
+ * @return string
+ *   Default image URL.
+ */
+function reliefweb_meta_get_image_url($uri = '', $relative = TRUE) {
+  if ($relative) {
+    $module_path = \Drupal::service('extension.path.resolver')
+      ->getPath('module', 'reliefweb_meta');
+
+    if (empty($uri)) {
+      $uri = $module_path . '/images/default.png';
+    }
+    else {
+      $uri = $module_path . '/images/' . ltrim($uri, '/');
+    }
+  }
+
+  $path = \Drupal::service('file_system')
+    ->realpath($uri);
+
+  if ($path && file_exists($path)) {
+    return Url::fromUserInput('/' . $uri, [
+      'absolute' => TRUE,
+      'path_processing' => FALSE,
+    ])->toString();
+  }
+
+  return '';
+}
+
+/**
+ * Get the URL of the location map image for the given country ISO3 code.
+ *
+ * @param string $iso3
+ *   Country ISO3 code.
+ *
+ * @return string
+ *   URL of the map image.
+ */
+function reliefweb_meta_get_country_location_map_url($iso3) {
+  $filename = strtolower($iso3) . '_ocha_1000px.png';
+
+  // Get the location map nodes with the file for the country.
+  $nodes = \Drupal::entityTypeManager()
+    ->getStorage('node')
+    ->loadByProperties([
+      'type' => 'report',
+      // Location map.
+      'field_feature.target_id' => 10635,
+      'field_file.file_name' => $filename,
+    ]);
+
+  if (empty($nodes)) {
+    return '';
+  }
+
+  // Get the most recent node. That should be the one with the most recent
+  // location map for the country.
+  krsort($nodes);
+  $node = reset($nodes);
+
+  /** @var \Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile $item */
+  foreach ($node->field_file as $item) {
+    if ($item->getFileName() === $filename && !$item->isPrivate()) {
+      $url = $item->getFileUrl();
+      return !empty($url) ? $url->setOption('absolute', TRUE)->toString() : '';
+    }
+  }
+
+  return '';
+}
+
+/**
+ * Implements hook_page_attachments_alter().
+ */
+function reliefweb_meta_page_attachments_alter(array &$attachments) {
+  foreach ($attachments['#attached']['html_head'] ?? [] as $key => $attachment) {
+    // Remove Drupal generator meta tag.
+    if ($attachment[1] == 'system_meta_generator') {
+      unset($attachments['#attached']['html_head'][$key]);
+    }
+  }
+}

From 27cf3b2ac848ae92f4965165f92eafb48bac5396 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 17 Mar 2022 06:24:28 +0000
Subject: [PATCH 586/720] [RW-189] Fix issue with custom dimensions on topic
 pages

---
 .../custom/reliefweb_analytics/reliefweb_analytics.module     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_analytics/reliefweb_analytics.module b/html/modules/custom/reliefweb_analytics/reliefweb_analytics.module
index ea581b4c5..ebaa1c5e6 100644
--- a/html/modules/custom/reliefweb_analytics/reliefweb_analytics.module
+++ b/html/modules/custom/reliefweb_analytics/reliefweb_analytics.module
@@ -73,6 +73,8 @@ function reliefweb_analytics_page_attachments(array &$attachments) {
  *   Dimensions for the entity.
  */
 function reliefweb_analytics_get_entity_dimensions() {
+  $dimensions = [];
+
   // Get the entity for the current request if any.
   $entity = EntityHelper::getEntityFromRoute();
   if (!isset($entity)) {
@@ -153,7 +155,7 @@ function reliefweb_analytics_get_entity_dimensions() {
       ];
       break;
 
-    case 'topics':
+    case 'topic':
       $dimensions = [
         'dimension1' => 'Topic',
         'dimension20' => (string) $entity->getModerationStatusLabel(),

From e9e337fe9a91a476aa0f3737ecf4e243a883669d Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 17 Mar 2022 06:44:53 +0000
Subject: [PATCH 587/720] [RW-404] Save metatag module config

---
 config/metatag.settings.yml | 69 +++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 config/metatag.settings.yml

diff --git a/config/metatag.settings.yml b/config/metatag.settings.yml
new file mode 100644
index 000000000..46d5d7789
--- /dev/null
+++ b/config/metatag.settings.yml
@@ -0,0 +1,69 @@
+entity_type_groups:
+  node:
+    blog_post:
+      basic: basic
+      advanced: advanced
+      open_graph: open_graph
+      facebook: facebook
+      twitter_cards: twitter_cards
+    book:
+      basic: basic
+      advanced: advanced
+      open_graph: open_graph
+      facebook: facebook
+      twitter_cards: twitter_cards
+    job:
+      basic: basic
+      advanced: advanced
+      open_graph: open_graph
+      facebook: facebook
+      twitter_cards: twitter_cards
+    report:
+      basic: basic
+      advanced: advanced
+      open_graph: open_graph
+      facebook: facebook
+      twitter_cards: twitter_cards
+    topic:
+      basic: basic
+      advanced: advanced
+      open_graph: open_graph
+      facebook: facebook
+      twitter_cards: twitter_cards
+    training:
+      basic: basic
+      advanced: advanced
+      open_graph: open_graph
+      facebook: facebook
+      twitter_cards: twitter_cards
+  taxonomy_term:
+    country:
+      basic: basic
+      advanced: advanced
+      open_graph: open_graph
+      facebook: facebook
+      twitter_cards: twitter_cards
+    disaster:
+      basic: basic
+      advanced: advanced
+      open_graph: open_graph
+      facebook: facebook
+      twitter_cards: twitter_cards
+    source:
+      basic: basic
+      advanced: advanced
+      open_graph: open_graph
+      facebook: facebook
+      twitter_cards: twitter_cards
+tag_trim_method: beforeValue
+tag_trim_maxlength:
+  metatag_maxlength_title: null
+  metatag_maxlength_description: null
+  metatag_maxlength_abstract: null
+  metatag_maxlength_og_description: null
+  metatag_maxlength_og_site_name: null
+  metatag_maxlength_og_title: null
+  metatag_maxlength_twitter_cards_label2: null
+  metatag_maxlength_twitter_cards_label1: null
+  metatag_maxlength_twitter_cards_description: null
+  metatag_maxlength_twitter_cards_title: null

From fabca00bd28b51e80069b40caaadfecb33fe4f69 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 17 Mar 2022 07:34:12 +0000
Subject: [PATCH 588/720] [OPS-8163] Update Drupal core and dependencies

---
 composer.lock         | 389 +++++++++++++++++++++---------------------
 composer.patches.json |   3 -
 2 files changed, 199 insertions(+), 193 deletions(-)

diff --git a/composer.lock b/composer.lock
index 68d2b13c3..baa689f07 100644
--- a/composer.lock
+++ b/composer.lock
@@ -333,16 +333,16 @@
         },
         {
             "name": "composer/composer",
-            "version": "2.2.6",
+            "version": "2.2.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/composer.git",
-                "reference": "ce785a18c0fb472421e52d958bab339247cb0e82"
+                "reference": "07eccf080ad63d55d95a7c9133506db7d9029264"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/ce785a18c0fb472421e52d958bab339247cb0e82",
-                "reference": "ce785a18c0fb472421e52d958bab339247cb0e82",
+                "url": "https://api.github.com/repos/composer/composer/zipball/07eccf080ad63d55d95a7c9133506db7d9029264",
+                "reference": "07eccf080ad63d55d95a7c9133506db7d9029264",
                 "shasum": ""
             },
             "require": {
@@ -351,7 +351,7 @@
                 "composer/pcre": "^1.0",
                 "composer/semver": "^3.0",
                 "composer/spdx-licenses": "^1.2",
-                "composer/xdebug-handler": "^2.0",
+                "composer/xdebug-handler": "^2.0 || ^3.0",
                 "justinrainbow/json-schema": "^5.2.11",
                 "php": "^5.3.2 || ^7.0 || ^8.0",
                 "psr/log": "^1.0 || ^2.0",
@@ -412,7 +412,7 @@
             "support": {
                 "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/composer/issues",
-                "source": "https://github.com/composer/composer/tree/2.2.6"
+                "source": "https://github.com/composer/composer/tree/2.2.9"
             },
             "funding": [
                 {
@@ -428,7 +428,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-04T16:00:38+00:00"
+            "time": "2022-03-15T21:13:37+00:00"
         },
         {
             "name": "composer/installers",
@@ -1828,29 +1828,30 @@
         },
         {
             "name": "doctrine/instantiator",
-            "version": "1.4.0",
+            "version": "1.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b"
+                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b",
-                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc",
+                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^8.0",
+                "doctrine/coding-standard": "^9",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpbench/phpbench": "^0.13 || 1.0.0-alpha2",
-                "phpstan/phpstan": "^0.12",
-                "phpstan/phpstan-phpunit": "^0.12",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
+                "phpbench/phpbench": "^0.16 || ^1",
+                "phpstan/phpstan": "^1.4",
+                "phpstan/phpstan-phpunit": "^1",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "vimeo/psalm": "^4.22"
             },
             "type": "library",
             "autoload": {
@@ -1877,7 +1878,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/1.4.0"
+                "source": "https://github.com/doctrine/instantiator/tree/1.4.1"
             },
             "funding": [
                 {
@@ -1893,7 +1894,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-11-10T18:47:58+00:00"
+            "time": "2022-03-03T08:28:38+00:00"
         },
         {
             "name": "doctrine/lexer",
@@ -2440,16 +2441,16 @@
         },
         {
             "name": "drupal/core",
-            "version": "9.3.6",
+            "version": "9.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core.git",
-                "reference": "2c0c89a0f49fab56f8322721888cdfa28fe98c3a"
+                "reference": "e8e3b7e5b3353f7ebf24de9d39087df75bd66afe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core/zipball/2c0c89a0f49fab56f8322721888cdfa28fe98c3a",
-                "reference": "2c0c89a0f49fab56f8322721888cdfa28fe98c3a",
+                "url": "https://api.github.com/repos/drupal/core/zipball/e8e3b7e5b3353f7ebf24de9d39087df75bd66afe",
+                "reference": "e8e3b7e5b3353f7ebf24de9d39087df75bd66afe",
                 "shasum": ""
             },
             "require": {
@@ -2691,22 +2692,22 @@
             ],
             "description": "Drupal is an open source content management platform powering millions of websites and applications.",
             "support": {
-                "source": "https://github.com/drupal/core/tree/9.3.6"
+                "source": "https://github.com/drupal/core/tree/9.3.8"
             },
-            "time": "2022-02-15T20:26:28+00:00"
+            "time": "2022-03-16T15:34:53+00:00"
         },
         {
             "name": "drupal/core-composer-scaffold",
-            "version": "9.3.6",
+            "version": "9.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-composer-scaffold.git",
-                "reference": "d3e0b1d707125c5de0f54315906e65654c3608da"
+                "reference": "a9dd9def8891e1c388719474720b57d3fe929a2f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/d3e0b1d707125c5de0f54315906e65654c3608da",
-                "reference": "d3e0b1d707125c5de0f54315906e65654c3608da",
+                "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/a9dd9def8891e1c388719474720b57d3fe929a2f",
+                "reference": "a9dd9def8891e1c388719474720b57d3fe929a2f",
                 "shasum": ""
             },
             "require": {
@@ -2741,13 +2742,13 @@
                 "drupal"
             ],
             "support": {
-                "source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.6"
+                "source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.8"
             },
-            "time": "2021-11-19T09:52:23+00:00"
+            "time": "2022-02-24T17:40:56+00:00"
         },
         {
             "name": "drupal/core-dev",
-            "version": "9.3.6",
+            "version": "9.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-dev.git",
@@ -2791,22 +2792,22 @@
             ],
             "description": "require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.",
             "support": {
-                "source": "https://github.com/drupal/core-dev/tree/9.3.6"
+                "source": "https://github.com/drupal/core-dev/tree/9.3.8"
             },
             "time": "2021-11-30T05:41:29+00:00"
         },
         {
             "name": "drupal/core-recommended",
-            "version": "9.3.6",
+            "version": "9.3.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-recommended.git",
-                "reference": "1b24d3f87b55510f85d8495a63e141e601e32a88"
+                "reference": "98048032809157c723131ecc2394ff55421d5dc6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core-recommended/zipball/1b24d3f87b55510f85d8495a63e141e601e32a88",
-                "reference": "1b24d3f87b55510f85d8495a63e141e601e32a88",
+                "url": "https://api.github.com/repos/drupal/core-recommended/zipball/98048032809157c723131ecc2394ff55421d5dc6",
+                "reference": "98048032809157c723131ecc2394ff55421d5dc6",
                 "shasum": ""
             },
             "require": {
@@ -2815,7 +2816,7 @@
                 "doctrine/annotations": "1.13.2",
                 "doctrine/lexer": "1.2.1",
                 "doctrine/reflection": "1.2.2",
-                "drupal/core": "9.3.6",
+                "drupal/core": "9.3.8",
                 "egulias/email-validator": "3.1.2",
                 "guzzlehttp/guzzle": "6.5.5",
                 "guzzlehttp/promises": "1.5.1",
@@ -2877,9 +2878,9 @@
             ],
             "description": "Locked core dependencies; require this project INSTEAD OF drupal/core.",
             "support": {
-                "source": "https://github.com/drupal/core-recommended/tree/9.3.6"
+                "source": "https://github.com/drupal/core-recommended/tree/9.3.8"
             },
-            "time": "2022-02-15T20:26:28+00:00"
+            "time": "2022-03-16T15:34:53+00:00"
         },
         {
             "name": "drupal/ctools",
@@ -3027,17 +3028,17 @@
         },
         {
             "name": "drupal/geofield",
-            "version": "1.36.0",
+            "version": "1.38.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/geofield.git",
-                "reference": "8.x-1.36"
+                "reference": "8.x-1.38"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/geofield-8.x-1.36.zip",
-                "reference": "8.x-1.36",
-                "shasum": "4aa5f6b6f60f33506a7044f11d7ed68bd4e75009"
+                "url": "https://ftp.drupal.org/files/projects/geofield-8.x-1.38.zip",
+                "reference": "8.x-1.38",
+                "shasum": "a41ce66e4aab2c266a8e9f0addcac68a0b76f44b"
             },
             "require": {
                 "drupal/core": "^8.8 || ^9",
@@ -3046,8 +3047,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.36",
-                    "datestamp": "1641134825",
+                    "version": "8.x-1.38",
+                    "datestamp": "1646604411",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -3137,17 +3138,17 @@
         },
         {
             "name": "drupal/guidelines",
-            "version": "1.0.2",
+            "version": "1.0.3",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/guidelines.git",
-                "reference": "1.0.2"
+                "reference": "1.0.3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/guidelines-1.0.2.zip",
-                "reference": "1.0.2",
-                "shasum": "686ad25f09f144d774df014f0565c4ccfd61e93c"
+                "url": "https://ftp.drupal.org/files/projects/guidelines-1.0.3.zip",
+                "reference": "1.0.3",
+                "shasum": "04ac058c7d3b7a3b7cbab376354801599f048880"
             },
             "require": {
                 "drupal/core": "^9"
@@ -3155,8 +3156,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "1.0.2",
-                    "datestamp": "1643270618",
+                    "version": "1.0.3",
+                    "datestamp": "1646999982",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -3365,17 +3366,17 @@
         },
         {
             "name": "drupal/inline_entity_form",
-            "version": "1.0.0-rc9",
+            "version": "1.0.0-rc10",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/inline_entity_form.git",
-                "reference": "8.x-1.0-rc9"
+                "reference": "8.x-1.0-rc10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/inline_entity_form-8.x-1.0-rc9.zip",
-                "reference": "8.x-1.0-rc9",
-                "shasum": "78953103a9c6e4e44bc877820a35f39913ea4559"
+                "url": "https://ftp.drupal.org/files/projects/inline_entity_form-8.x-1.0-rc10.zip",
+                "reference": "8.x-1.0-rc10",
+                "shasum": "e10a90cee004e13b4c59991a312f805834a35750"
             },
             "require": {
                 "drupal/core": "^8.8 || ^9",
@@ -3387,8 +3388,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.0-rc9",
-                    "datestamp": "1618174486",
+                    "version": "8.x-1.0-rc10",
+                    "datestamp": "1646314907",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "RC releases are not covered by Drupal security advisories."
@@ -4015,31 +4016,33 @@
         },
         {
             "name": "drupal/social_api",
-            "version": "3.0.2",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/social_api.git",
-                "reference": "3.0.2"
+                "reference": "3.0.3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/social_api-3.0.2.zip",
-                "reference": "3.0.2",
-                "shasum": "66e3a62416c9fe9ad9ced204e8f243aaa264babf"
+                "url": "https://ftp.drupal.org/files/projects/social_api-3.0.3.zip",
+                "reference": "3.0.3",
+                "shasum": "33db9b3e33c04d53220fd2f218802bf66178a4c5"
             },
             "require": {
                 "drupal/core": "^8.8 || ^9.0",
+                "ext-openssl": "*",
                 "league/oauth2-client": "^2.0"
             },
             "require-dev": {
                 "drupal/coder": "^8.3",
-                "drupal/social_auth": "^3.0@dev"
+                "drupal/social_auth": "^3.0@dev",
+                "phpcompatibility/php-compatibility": "^9.3"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "3.0.2",
-                    "datestamp": "1629547558",
+                    "version": "3.0.3",
+                    "datestamp": "1646578799",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -4162,17 +4165,17 @@
         },
         {
             "name": "drupal/social_auth_hid",
-            "version": "3.0.0",
+            "version": "3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/social_auth_hid.git",
-                "reference": "8.x-3.0"
+                "reference": "8.x-3.1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/social_auth_hid-8.x-3.0.zip",
-                "reference": "8.x-3.0",
-                "shasum": "2d7f88dbdc3e5ec780735788901915facfeda10d"
+                "url": "https://ftp.drupal.org/files/projects/social_auth_hid-8.x-3.1.zip",
+                "reference": "8.x-3.1",
+                "shasum": "8461a73d2af95f025a7772000a78530b588bbdb8"
             },
             "require": {
                 "drupal/core": "^9 || ^10",
@@ -4182,8 +4185,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-3.0",
-                    "datestamp": "1641290573",
+                    "version": "8.x-3.1",
+                    "datestamp": "1646815796",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -4267,27 +4270,27 @@
         },
         {
             "name": "drupal/svg_image",
-            "version": "1.15.0",
+            "version": "1.16.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/svg_image.git",
-                "reference": "8.x-1.15"
+                "reference": "8.x-1.16"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/svg_image-8.x-1.15.zip",
-                "reference": "8.x-1.15",
-                "shasum": "368d0189bb3c59ea40cf52d83c8551b6358aa161"
+                "url": "https://ftp.drupal.org/files/projects/svg_image-8.x-1.16.zip",
+                "reference": "8.x-1.16",
+                "shasum": "e29b6fff49aacfaf81e58059b09551b45325f633"
             },
             "require": {
                 "drupal/core": "^8 || ^9",
-                "enshrined/svg-sanitize": ">=0.9 <1.0"
+                "enshrined/svg-sanitize": ">=0.15 <1.0"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.15",
-                    "datestamp": "1629259130",
+                    "version": "8.x-1.16",
+                    "datestamp": "1647314248",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -4569,16 +4572,16 @@
         },
         {
             "name": "drush/drush",
-            "version": "11.x-dev",
+            "version": "11.0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drush-ops/drush.git",
-                "reference": "c4817becc94e3d58ae5f21c29d338c3e035630b3"
+                "reference": "6991a3b8f6827d0bab13005402730fc50d130a50"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drush-ops/drush/zipball/c4817becc94e3d58ae5f21c29d338c3e035630b3",
-                "reference": "c4817becc94e3d58ae5f21c29d338c3e035630b3",
+                "url": "https://api.github.com/repos/drush-ops/drush/zipball/6991a3b8f6827d0bab13005402730fc50d130a50",
+                "reference": "6991a3b8f6827d0bab13005402730fc50d130a50",
                 "shasum": ""
             },
             "require": {
@@ -4621,7 +4624,6 @@
                 "vlucas/phpdotenv": "^2.4",
                 "yoast/phpunit-polyfills": "^0.2.0"
             },
-            "default-branch": true,
             "bin": [
                 "drush"
             ],
@@ -4704,7 +4706,7 @@
                 "irc": "irc://irc.freenode.org/drush",
                 "issues": "https://github.com/drush-ops/drush/issues",
                 "slack": "https://drupal.slack.com/messages/C62H9CWQM",
-                "source": "https://github.com/drush-ops/drush/tree/11.x"
+                "source": "https://github.com/drush-ops/drush/tree/11.0.7"
             },
             "funding": [
                 {
@@ -4712,7 +4714,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-24T12:32:15+00:00"
+            "time": "2022-03-09T19:32:53+00:00"
         },
         {
             "name": "easyrdf/easyrdf",
@@ -5839,16 +5841,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "2.2.2",
+            "version": "2.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "13d7751377732637814f0cda0e3f6d3243f9f769"
+                "reference": "47b015bc4e50fd4438c1ffef6139a1fb65d2ab71"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/13d7751377732637814f0cda0e3f6d3243f9f769",
-                "reference": "13d7751377732637814f0cda0e3f6d3243f9f769",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/47b015bc4e50fd4438c1ffef6139a1fb65d2ab71",
+                "reference": "47b015bc4e50fd4438c1ffef6139a1fb65d2ab71",
                 "shasum": ""
             },
             "require": {
@@ -5939,7 +5941,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-13T15:00:57+00:00"
+            "time": "2022-02-26T21:24:45+00:00"
         },
         {
             "name": "league/config",
@@ -6107,16 +6109,16 @@
         },
         {
             "name": "league/html-to-markdown",
-            "version": "5.0.2",
+            "version": "5.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/html-to-markdown.git",
-                "reference": "4d0394e120dc14b0d5c52fd1755fd48656da2ec9"
+                "reference": "e0fc8cf07bdabbcd3765341ecb50c34c271d64e1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/4d0394e120dc14b0d5c52fd1755fd48656da2ec9",
-                "reference": "4d0394e120dc14b0d5c52fd1755fd48656da2ec9",
+                "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/e0fc8cf07bdabbcd3765341ecb50c34c271d64e1",
+                "reference": "e0fc8cf07bdabbcd3765341ecb50c34c271d64e1",
                 "shasum": ""
             },
             "require": {
@@ -6126,11 +6128,11 @@
             },
             "require-dev": {
                 "mikehaertl/php-shellcommand": "^1.1.0",
-                "phpstan/phpstan": "^0.12.82",
+                "phpstan/phpstan": "^0.12.99",
                 "phpunit/phpunit": "^8.5 || ^9.2",
                 "scrutinizer/ocular": "^1.6",
                 "unleashedtech/php-coding-standard": "^2.7",
-                "vimeo/psalm": "^4.6"
+                "vimeo/psalm": "^4.22"
             },
             "bin": [
                 "bin/html-to-markdown"
@@ -6138,7 +6140,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.1-dev"
+                    "dev-master": "5.2-dev"
                 }
             },
             "autoload": {
@@ -6172,7 +6174,7 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/html-to-markdown/issues",
-                "source": "https://github.com/thephpleague/html-to-markdown/tree/5.0.2"
+                "source": "https://github.com/thephpleague/html-to-markdown/tree/5.1.0"
             },
             "funding": [
                 {
@@ -6192,7 +6194,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-06T05:38:26+00:00"
+            "time": "2022-03-02T17:24:08+00:00"
         },
         {
             "name": "league/oauth2-client",
@@ -6446,25 +6448,29 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.10.2",
+            "version": "1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220"
+                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/776f831124e9c62e1a2c601ecc52e776d8bb7220",
-                "reference": "776f831124e9c62e1a2c601ecc52e776d8bb7220",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614",
+                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1 || ^8.0"
             },
+            "conflict": {
+                "doctrine/collections": "<1.6.8",
+                "doctrine/common": "<2.13.3 || >=3,<3.2.2"
+            },
             "require-dev": {
-                "doctrine/collections": "^1.0",
-                "doctrine/common": "^2.6",
-                "phpunit/phpunit": "^7.1"
+                "doctrine/collections": "^1.6.8",
+                "doctrine/common": "^2.13.3 || ^3.2.2",
+                "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
             },
             "type": "library",
             "autoload": {
@@ -6489,7 +6495,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
             },
             "funding": [
                 {
@@ -6497,7 +6503,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-11-13T09:40:50+00:00"
+            "time": "2022-03-03T13:19:32+00:00"
         },
         {
             "name": "nette/schema",
@@ -7541,16 +7547,16 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.13",
+            "version": "9.2.15",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "deac8540cb7bd40b2b8cfa679b76202834fd04e8"
+                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/deac8540cb7bd40b2b8cfa679b76202834fd04e8",
-                "reference": "deac8540cb7bd40b2b8cfa679b76202834fd04e8",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
+                "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f",
                 "shasum": ""
             },
             "require": {
@@ -7606,7 +7612,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.13"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.15"
             },
             "funding": [
                 {
@@ -7614,7 +7620,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-23T17:02:38+00:00"
+            "time": "2022-03-07T09:28:20+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -7859,16 +7865,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.16",
+            "version": "9.5.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "5ff8c545a50226c569310a35f4fa89d79f1ddfdc"
+                "reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5ff8c545a50226c569310a35f4fa89d79f1ddfdc",
-                "reference": "5ff8c545a50226c569310a35f4fa89d79f1ddfdc",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/35ea4b7f3acabb26f4bb640f8c30866c401da807",
+                "reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807",
                 "shasum": ""
             },
             "require": {
@@ -7898,7 +7904,7 @@
                 "sebastian/global-state": "^5.0.1",
                 "sebastian/object-enumerator": "^4.0.3",
                 "sebastian/resource-operations": "^3.0.3",
-                "sebastian/type": "^2.3.4",
+                "sebastian/type": "^3.0",
                 "sebastian/version": "^3.0.2"
             },
             "require-dev": {
@@ -7946,7 +7952,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.16"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.19"
             },
             "funding": [
                 {
@@ -7958,7 +7964,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-02-23T17:10:58+00:00"
+            "time": "2022-03-15T09:57:31+00:00"
         },
         {
             "name": "psr/cache",
@@ -8267,16 +8273,16 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.11.1",
+            "version": "v0.11.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "570292577277f06f590635381a7f761a6cf4f026"
+                "reference": "7f7da640d68b9c9fec819caae7c744a213df6514"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/570292577277f06f590635381a7f761a6cf4f026",
-                "reference": "570292577277f06f590635381a7f761a6cf4f026",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/7f7da640d68b9c9fec819caae7c744a213df6514",
+                "reference": "7f7da640d68b9c9fec819caae7c744a213df6514",
                 "shasum": ""
             },
             "require": {
@@ -8287,6 +8293,9 @@
                 "symfony/console": "^6.0 || ^5.0 || ^4.0 || ^3.4",
                 "symfony/var-dumper": "^6.0 || ^5.0 || ^4.0 || ^3.4"
             },
+            "conflict": {
+                "symfony/console": "4.4.37 || 5.3.14 || 5.3.15 || 5.4.3 || 5.4.4 || 6.0.3 || 6.0.4"
+            },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.2",
                 "hoa/console": "3.17.05.02"
@@ -8336,9 +8345,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.11.1"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.11.2"
             },
-            "time": "2022-01-03T13:58:38+00:00"
+            "time": "2022-02-28T15:28:54+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -9446,28 +9455,28 @@
         },
         {
             "name": "sebastian/type",
-            "version": "2.3.4",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914"
+                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b8cd8a1c753c90bc1a0f5372170e3e489136f914",
-                "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
+                "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.3"
+                "phpunit/phpunit": "^9.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.3-dev"
+                    "dev-master": "3.0-dev"
                 }
             },
             "autoload": {
@@ -9490,7 +9499,7 @@
             "homepage": "https://github.com/sebastianbergmann/type",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/2.3.4"
+                "source": "https://github.com/sebastianbergmann/type/tree/3.0.0"
             },
             "funding": [
                 {
@@ -9498,7 +9507,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-06-15T12:49:02+00:00"
+            "time": "2022-03-15T09:54:48+00:00"
         },
         {
             "name": "sebastian/version",
@@ -9719,32 +9728,32 @@
         },
         {
             "name": "slevomat/coding-standard",
-            "version": "7.0.18",
+            "version": "7.0.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/slevomat/coding-standard.git",
-                "reference": "b81ac84f41a4797dc25c8ede1b0718e2a74be0fc"
+                "reference": "bef66a43815bbf9b5f49775e9ded3f7c6ba0cc37"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/b81ac84f41a4797dc25c8ede1b0718e2a74be0fc",
-                "reference": "b81ac84f41a4797dc25c8ede1b0718e2a74be0fc",
+                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/bef66a43815bbf9b5f49775e9ded3f7c6ba0cc37",
+                "reference": "bef66a43815bbf9b5f49775e9ded3f7c6ba0cc37",
                 "shasum": ""
             },
             "require": {
                 "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7",
                 "php": "^7.1 || ^8.0",
                 "phpstan/phpdoc-parser": "^1.0.0",
-                "squizlabs/php_codesniffer": "^3.6.1"
+                "squizlabs/php_codesniffer": "^3.6.2"
             },
             "require-dev": {
-                "phing/phing": "2.17.0",
-                "php-parallel-lint/php-parallel-lint": "1.3.1",
-                "phpstan/phpstan": "1.2.0",
+                "phing/phing": "2.17.2",
+                "php-parallel-lint/php-parallel-lint": "1.3.2",
+                "phpstan/phpstan": "1.4.6",
                 "phpstan/phpstan-deprecation-rules": "1.0.0",
                 "phpstan/phpstan-phpunit": "1.0.0",
                 "phpstan/phpstan-strict-rules": "1.1.0",
-                "phpunit/phpunit": "7.5.20|8.5.21|9.5.10"
+                "phpunit/phpunit": "7.5.20|8.5.21|9.5.16"
             },
             "type": "phpcodesniffer-standard",
             "extra": {
@@ -9764,7 +9773,7 @@
             "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.",
             "support": {
                 "issues": "https://github.com/slevomat/coding-standard/issues",
-                "source": "https://github.com/slevomat/coding-standard/tree/7.0.18"
+                "source": "https://github.com/slevomat/coding-standard/tree/7.0.19"
             },
             "funding": [
                 {
@@ -9776,7 +9785,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-07T17:19:06+00:00"
+            "time": "2022-03-01T18:01:41+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
@@ -10402,16 +10411,16 @@
         },
         {
             "name": "symfony/dom-crawler",
-            "version": "v4.4.37",
+            "version": "v4.4.39",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "60d36408a3a48500bcc6e30d9f831e51d04d7fa4"
+                "reference": "4e9215a8b533802ba84a3cc5bd3c43103e7a6dc3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/60d36408a3a48500bcc6e30d9f831e51d04d7fa4",
-                "reference": "60d36408a3a48500bcc6e30d9f831e51d04d7fa4",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/4e9215a8b533802ba84a3cc5bd3c43103e7a6dc3",
+                "reference": "4e9215a8b533802ba84a3cc5bd3c43103e7a6dc3",
                 "shasum": ""
             },
             "require": {
@@ -10456,7 +10465,7 @@
             "description": "Eases DOM navigation for HTML and XML documents",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dom-crawler/tree/v4.4.37"
+                "source": "https://github.com/symfony/dom-crawler/tree/v4.4.39"
             },
             "funding": [
                 {
@@ -10472,7 +10481,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:41:36+00:00"
+            "time": "2022-02-25T10:38:15+00:00"
         },
         {
             "name": "symfony/error-handler",
@@ -10707,16 +10716,16 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v4.4.37",
+            "version": "v4.4.39",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "c59f37705c3e513ae55b2735f128f4ce363c82ec"
+                "reference": "72a5b35fecaa670b13954e6eaf414acbe2a67b35"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/c59f37705c3e513ae55b2735f128f4ce363c82ec",
-                "reference": "c59f37705c3e513ae55b2735f128f4ce363c82ec",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/72a5b35fecaa670b13954e6eaf414acbe2a67b35",
+                "reference": "72a5b35fecaa670b13954e6eaf414acbe2a67b35",
                 "shasum": ""
             },
             "require": {
@@ -10750,7 +10759,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v4.4.37"
+                "source": "https://github.com/symfony/filesystem/tree/v4.4.39"
             },
             "funding": [
                 {
@@ -10766,7 +10775,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:41:36+00:00"
+            "time": "2022-02-25T10:38:15+00:00"
         },
         {
             "name": "symfony/finder",
@@ -11147,16 +11156,16 @@
         },
         {
             "name": "symfony/lock",
-            "version": "v4.4.37",
+            "version": "v4.4.38",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/lock.git",
-                "reference": "fac900d30b6f37a1867237f79a3d4dab8df4a450"
+                "reference": "46c56527b2e98cfdbc5b39a1566029cbe73c9e3f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/lock/zipball/fac900d30b6f37a1867237f79a3d4dab8df4a450",
-                "reference": "fac900d30b6f37a1867237f79a3d4dab8df4a450",
+                "url": "https://api.github.com/repos/symfony/lock/zipball/46c56527b2e98cfdbc5b39a1566029cbe73c9e3f",
+                "reference": "46c56527b2e98cfdbc5b39a1566029cbe73c9e3f",
                 "shasum": ""
             },
             "require": {
@@ -11205,7 +11214,7 @@
                 "semaphore"
             ],
             "support": {
-                "source": "https://github.com/symfony/lock/tree/v4.4.37"
+                "source": "https://github.com/symfony/lock/tree/v4.4.38"
             },
             "funding": [
                 {
@@ -11221,7 +11230,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:41:36+00:00"
+            "time": "2022-02-11T16:01:04+00:00"
         },
         {
             "name": "symfony/mime",
@@ -11550,7 +11559,7 @@
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.24.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
@@ -11611,7 +11620,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.25.0"
             },
             "funding": [
                 {
@@ -11882,7 +11891,7 @@
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.24.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
@@ -11938,7 +11947,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-php72/tree/v1.25.0"
             },
             "funding": [
                 {
@@ -11958,7 +11967,7 @@
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.24.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
@@ -12017,7 +12026,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php73/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-php73/tree/v1.25.0"
             },
             "funding": [
                 {
@@ -12120,7 +12129,7 @@
         },
         {
             "name": "symfony/polyfill-uuid",
-            "version": "v1.24.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-uuid.git",
@@ -12182,7 +12191,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.25.0"
             },
             "funding": [
                 {
@@ -12648,12 +12657,12 @@
             },
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\String\\": ""
-                },
                 "files": [
                     "Resources/functions.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Component\\String\\": ""
+                },
                 "exclude-from-classmap": [
                     "/Tests/"
                 ]
@@ -14325,17 +14334,17 @@
         },
         {
             "name": "drupal/devel",
-            "version": "4.1.3",
+            "version": "4.1.5",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/devel.git",
-                "reference": "4.1.3"
+                "reference": "4.1.5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/devel-4.1.3.zip",
-                "reference": "4.1.3",
-                "shasum": "f82261ca19a43379742e1df4c5a3795ef7a70441"
+                "url": "https://ftp.drupal.org/files/projects/devel-4.1.5.zip",
+                "reference": "4.1.5",
+                "shasum": "7d0b4397215f615a67ba80aab777e93918d497f9"
             },
             "require": {
                 "doctrine/common": "^2.7",
@@ -14354,8 +14363,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "4.1.3",
-                    "datestamp": "1639534069",
+                    "version": "4.1.5",
+                    "datestamp": "1646072825",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -14985,7 +14994,7 @@
         },
         {
             "name": "symfony/polyfill-php81",
-            "version": "v1.24.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php81.git",
@@ -15044,7 +15053,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.25.0"
             },
             "funding": [
                 {
@@ -15147,5 +15156,5 @@
         "php": ">=8.0"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.2.0"
 }
diff --git a/composer.patches.json b/composer.patches.json
index e9eb5a036..37d0ed7df 100644
--- a/composer.patches.json
+++ b/composer.patches.json
@@ -3,9 +3,6 @@
         "drupal/core" : {
             "https://www.drupal.org/project/drupal/issues/3047110": "patches/core--drupal--3047110-taxonomy-term-moderation-class.patch"
         },
-        "drupal/guidelines": {
-            "https://www.drupal.org/project/guidelines/issues/3268995": "https://git.drupalcode.org/project/guidelines/-/merge_requests/2.diff"
-        },
         "drupal/inline_entity_form": {
             "https://www.drupal.org/project/inline_entity_form/issues/3226253": "https://git.drupalcode.org/project/inline_entity_form/-/merge_requests/33.diff"
         },

From 636be54f921a1bfaa56cab1bf1f105249cb5ebd1 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 17 Mar 2022 14:37:43 +0100
Subject: [PATCH 589/720] RW-415 remove unused svg icons, regen sprite with
 remaining

---
 .../img/icons/add--white.svg                  |   1 -
 .../common_design_subtheme/img/icons/add.svg  |   1 -
 .../img/icons/arrow-left.svg                  |   1 -
 .../img/icons/arrow-right.svg                 |   1 -
 .../img/icons/cd-icons-sprite.svg             |   2 +-
 .../img/icons/copyurl.svg                     |   1 -
 .../img/icons/expand-left.svg                 |   1 -
 .../img/icons/expand-right.svg                |   1 -
 .../img/icons/external-link.svg               |   4 -
 .../img/icons/form-required.svg               |   1 -
 .../common_design_subtheme/img/icons/pdf.svg  |   1 -
 .../img/icons/sm-gh-def.svg                   |   1 -
 .../img/icons/sm-gh-full.svg                  |   1 -
 .../img/icons/sm-ig-def.svg                   |   1 -
 .../img/icons/sm-ig-full.svg                  |   1 -
 .../img/icons/sm-rss-def.svg                  |   1 -
 .../img/icons/sm-rss-full.svg                 |   1 -
 .../img/icons/sm-yt-def.svg                   |   1 -
 .../img/icons/sm-yt-full.svg                  |   1 -
 .../img/icons/social-links--facebook.svg      |   1 -
 .../img/icons/social-links--linkedin.svg      |   1 -
 .../img/icons/social-links--twitter.svg       |   1 -
 .../img/icons/sprite.symbol.html              | 540 +-----------------
 .../img/icons/user--white.svg                 |   1 -
 24 files changed, 7 insertions(+), 560 deletions(-)
 delete mode 100644 html/themes/custom/common_design_subtheme/img/icons/add--white.svg
 delete mode 100644 html/themes/custom/common_design_subtheme/img/icons/add.svg
 delete mode 100644 html/themes/custom/common_design_subtheme/img/icons/arrow-left.svg
 delete mode 100644 html/themes/custom/common_design_subtheme/img/icons/arrow-right.svg
 delete mode 100644 html/themes/custom/common_design_subtheme/img/icons/copyurl.svg
 delete mode 100644 html/themes/custom/common_design_subtheme/img/icons/expand-left.svg
 delete mode 100644 html/themes/custom/common_design_subtheme/img/icons/expand-right.svg
 delete mode 100644 html/themes/custom/common_design_subtheme/img/icons/external-link.svg
 delete mode 100644 html/themes/custom/common_design_subtheme/img/icons/form-required.svg
 delete mode 100644 html/themes/custom/common_design_subtheme/img/icons/pdf.svg
 delete mode 100644 html/themes/custom/common_design_subtheme/img/icons/sm-gh-def.svg
 delete mode 100644 html/themes/custom/common_design_subtheme/img/icons/sm-gh-full.svg
 delete mode 100644 html/themes/custom/common_design_subtheme/img/icons/sm-ig-def.svg
 delete mode 100644 html/themes/custom/common_design_subtheme/img/icons/sm-ig-full.svg
 delete mode 100644 html/themes/custom/common_design_subtheme/img/icons/sm-rss-def.svg
 delete mode 100644 html/themes/custom/common_design_subtheme/img/icons/sm-rss-full.svg
 delete mode 100644 html/themes/custom/common_design_subtheme/img/icons/sm-yt-def.svg
 delete mode 100644 html/themes/custom/common_design_subtheme/img/icons/sm-yt-full.svg
 delete mode 100644 html/themes/custom/common_design_subtheme/img/icons/social-links--facebook.svg
 delete mode 100644 html/themes/custom/common_design_subtheme/img/icons/social-links--linkedin.svg
 delete mode 100644 html/themes/custom/common_design_subtheme/img/icons/social-links--twitter.svg
 delete mode 100644 html/themes/custom/common_design_subtheme/img/icons/user--white.svg

diff --git a/html/themes/custom/common_design_subtheme/img/icons/add--white.svg b/html/themes/custom/common_design_subtheme/img/icons/add--white.svg
deleted file mode 100644
index d25962e92..000000000
--- a/html/themes/custom/common_design_subtheme/img/icons/add--white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path fill="#ffffff" d="M44,20H28V4a4,4,0,0,0-4-4h0a4,4,0,0,0-4,4V20H4a4,4,0,0,0,0,8H20V44a4,4,0,0,0,4,4h0a4,4,0,0,0,4-4V28H44a4,4,0,0,0,0-8Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/add.svg b/html/themes/custom/common_design_subtheme/img/icons/add.svg
deleted file mode 100644
index 049fcbb97..000000000
--- a/html/themes/custom/common_design_subtheme/img/icons/add.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M44,20H28V4a4,4,0,0,0-4-4h0a4,4,0,0,0-4,4V20H4a4,4,0,0,0,0,8H20V44a4,4,0,0,0,4,4h0a4,4,0,0,0,4-4V28H44a4,4,0,0,0,0-8Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/arrow-left.svg b/html/themes/custom/common_design_subtheme/img/icons/arrow-left.svg
deleted file mode 100644
index 445e2dddc..000000000
--- a/html/themes/custom/common_design_subtheme/img/icons/arrow-left.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M34,48a4,4,0,0,1-2.83-1.17l-20-20a4,4,0,0,1,0-5.66l20-20a4,4,0,0,1,5.66,5.66L19.66,24,36.83,41.17A4,4,0,0,1,34,48Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/arrow-right.svg b/html/themes/custom/common_design_subtheme/img/icons/arrow-right.svg
deleted file mode 100644
index 40d395b0d..000000000
--- a/html/themes/custom/common_design_subtheme/img/icons/arrow-right.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M14,48a4,4,0,0,1-2.83-6.83L28.34,24,11.17,6.83a4,4,0,0,1,5.66-5.66l20,20a4,4,0,0,1,0,5.66l-20,20A4,4,0,0,1,14,48Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/cd-icons-sprite.svg b/html/themes/custom/common_design_subtheme/img/icons/cd-icons-sprite.svg
index b39adb57b..66780a62f 100644
--- a/html/themes/custom/common_design_subtheme/img/icons/cd-icons-sprite.svg
+++ b/html/themes/custom/common_design_subtheme/img/icons/cd-icons-sprite.svg
@@ -1 +1 @@
-<svg class="cd-icons-sprite" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><symbol viewBox="0 0 42 42" id="cd-icon--about" xmlns="http://www.w3.org/2000/svg"><path d="M38 0H4a4 4 0 00-4 4v34a4 4 0 004 4h34a4 4 0 004-4V4a4 4 0 00-4-4zM24 35h-4a2 2 0 01-2-2V18h4a2 2 0 012 2zm-3-22a3 3 0 113-3 3 3 0 01-3 3z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--add" xmlns="http://www.w3.org/2000/svg"><path d="M44 20H28V4a4 4 0 00-4-4 4 4 0 00-4 4v16H4a4 4 0 000 8h16v16a4 4 0 004 4 4 4 0 004-4V28h16a4 4 0 000-8z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--add--white" xmlns="http://www.w3.org/2000/svg"><path fill="#fff" d="M44 20H28V4a4 4 0 00-4-4 4 4 0 00-4 4v16H4a4 4 0 000 8h16v16a4 4 0 004 4 4 4 0 004-4V28h16a4 4 0 000-8z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--admin" xmlns="http://www.w3.org/2000/svg"><path d="M45 21h-1.25a19.867 19.867 0 00-3.668-8.84l.889-.888a3 3 0 10-4.242-4.243l-.89.889A19.868 19.868 0 0027 4.25V3a3 3 0 00-6 0v1.25a19.868 19.868 0 00-8.84 3.668l-.888-.889a3 3 0 10-4.243 4.243l.889.889A19.867 19.867 0 004.25 21H3a3 3 0 000 6h1.25a19.867 19.867 0 003.668 8.84l-.889.888a3 3 0 004.242 4.243l.89-.889A19.868 19.868 0 0021 43.75V45a3 3 0 006 0v-1.25a19.868 19.868 0 008.84-3.668l.888.889a3 3 0 104.243-4.243l-.889-.889A19.867 19.867 0 0043.75 27H45a3 3 0 000-6zM24 38a14 14 0 1114-14 14.016 14.016 0 01-14 14z"/></symbol><symbol viewBox="0 0 47.996 41.01" id="cd-icon--alert" xmlns="http://www.w3.org/2000/svg"><path class="aecls-1" d="M47.668 37.41L27.118 1.8a3.604 3.604 0 00-6.24 0L.328 37.41a2.398 2.398 0 002.08 3.6h43.18a2.398 2.398 0 002.08-3.6zm-23.67-3.4a2 2 0 112-2 2.006 2.006 0 01-2 2zm2-9a2 2 0 01-4 0v-11a2 2 0 114 0z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--arrow-down" xmlns="http://www.w3.org/2000/svg"><path d="M48 14a4 4 0 01-1.17 2.83l-20 20a4 4 0 01-5.66 0l-20-20a4 4 0 015.66-5.66L24 28.34l17.17-17.17A4 4 0 0148 14z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--arrow-down--highlighted" xmlns="http://www.w3.org/2000/svg"><path fill="#EB5C6D" d="M48 14a4 4 0 01-1.17 2.83l-20 20a4 4 0 01-5.66 0l-20-20a4 4 0 015.66-5.66L24 28.34l17.17-17.17A4 4 0 0148 14z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--arrow-left" xmlns="http://www.w3.org/2000/svg"><path d="M34 48a4 4 0 01-2.83-1.17l-20-20a4 4 0 010-5.66l20-20a4 4 0 015.66 5.66L19.66 24l17.17 17.17A4 4 0 0134 48z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--arrow-right" xmlns="http://www.w3.org/2000/svg"><path d="M14 48a4 4 0 01-2.83-6.83L28.34 24 11.17 6.83a4 4 0 015.66-5.66l20 20a4 4 0 010 5.66l-20 20A4 4 0 0114 48z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--arrow-up" xmlns="http://www.w3.org/2000/svg"><path d="M0 34a4 4 0 011.17-2.83l20-20a4 4 0 015.66 0l20 20a4 4 0 11-5.66 5.66L24 19.66 6.83 36.83A4 4 0 010 34z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--arrow-up--highlighted" xmlns="http://www.w3.org/2000/svg"><path fill="#EB5C6D" d="M0 34a4 4 0 011.17-2.83l20-20a4 4 0 015.66 0l20 20a4 4 0 11-5.66 5.66L24 19.66 6.83 36.83A4 4 0 010 34z"/></symbol><symbol viewBox="0 0 0 0" id="cd-icon--cd-icons-sprite" xmlns="http://www.w3.org/2000/svg"/><symbol viewBox="0 0 14 14" id="cd-icon--copyurl" xmlns="http://www.w3.org/2000/svg"><path data-name="Path 533" d="M12.635 1.365a4.674 4.674 0 00-6.6 0L5.02 2.381a.718.718 0 001.015 1.015L7.05 2.38a3.232 3.232 0 114.571 4.571l-1.015 1.015a.718.718 0 101.015 1.015l1.015-1.015a4.673 4.673 0 00-.001-6.601zm-4.668 9.239L6.952 11.62a3.232 3.232 0 01-4.571-4.571l1.015-1.016a.718.718 0 10-1.015-1.015L1.365 6.033a4.668 4.668 0 006.6 6.6l1.015-1.016a.718.718 0 10-1.015-1.015zm.86-6.446L4.158 8.826a.718.718 0 101.015 1.016l4.669-4.668a.718.718 0 00-1.015-1.016z"/></symbol><symbol viewBox="0 0 64 64" id="cd-icon--creative-commons" xmlns="http://www.w3.org/2000/svg"><path d="M31.957.311c-8.682 0-16.322 3.213-22.226 9.203C3.653 15.678.354 23.666.354 32c0 8.422 3.212 16.236 9.29 22.313 6.078 6.078 13.978 9.377 22.313 9.377 8.334 0 16.409-3.299 22.66-9.463C60.521 48.41 63.646 40.683 63.646 32c0-8.595-3.125-16.408-9.116-22.399C48.453 3.523 40.639.311 31.957.311zm.086 5.73c7.12 0 13.458 2.691 18.406 7.641 4.862 4.861 7.466 11.286 7.466 18.318 0 7.119-2.518 13.371-7.379 18.146-5.123 5.035-11.721 7.727-18.493 7.727-6.858 0-13.283-2.691-18.232-7.641C8.862 45.283 6.084 38.772 6.084 32c0-6.858 2.778-13.369 7.727-18.406 4.862-4.948 11.113-7.553 18.232-7.553z"/><path id="ana" d="M31.635 26.734c-1.79-3.264-4.844-4.563-8.389-4.563-5.16 0-9.267 3.65-9.267 9.828 0 6.283 3.861 9.829 9.442 9.829 3.581 0 6.635-1.966 8.319-4.949l-3.931-2.001c-.878 2.105-2.212 2.738-3.896 2.738-2.914 0-4.248-2.422-4.248-5.617 0-3.193 1.124-5.616 4.248-5.616.842 0 2.527.456 3.51 2.563l4.212-2.212z"/><use xlink:href="#ana" transform="translate(18.281)"/></symbol><symbol viewBox="0 0 34 42" id="cd-icon--education" xmlns="http://www.w3.org/2000/svg"><path d="M33 0h-4v8l-3-1-3 1V0H0v42h33a.98.98 0 001-.95V.95A.98.98 0 0033 0zM6 38.5a.495.495 0 01-.5.5h-2a.495.495 0 01-.5-.5v-35a.495.495 0 01.5-.5h2a.495.495 0 01.5.5zM25.5 23h-13a1.5 1.5 0 010-3h13a1.5 1.5 0 010 3zm0-6h-13a1.5 1.5 0 010-3h13a1.5 1.5 0 010 3z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--expand-left" xmlns="http://www.w3.org/2000/svg"><path d="M44 48a3.989 3.989 0 01-2.828-1.171l-19-20a4 4 0 010-5.658l19-20a4 4 0 015.657 5.657L31 24l15.829 17.171A4 4 0 0144 48zm-18.17-1.171a4 4 0 000-5.658L10 24 25.829 6.828a4 4 0 00-5.657-5.657l-19 20a4 4 0 000 5.658l19 20a4 4 0 005.657 0z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--expand-right" xmlns="http://www.w3.org/2000/svg"><path d="M4 0A3.989 3.989 0 016.83 1.171l19 20a4 4 0 010 5.658l-19 20a4 4 0 01-5.657-5.657L17 24 1.172 6.829A4 4 0 014 0zm18.172 1.171a4 4 0 000 5.658L38 24 22.172 41.172a4 4 0 005.657 5.657l19-20a4 4 0 000-5.658l-19-20a4 4 0 00-5.657 0z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--external-link" xmlns="http://www.w3.org/2000/svg"><path d="M35 20.65V42H6V18h16.09l9-9H4.2A2.2 2.2 0 002 11.2v32.6A2.2 2.2 0 004.2 46h32.6a2.2 2.2 0 002.2-2.2V16.65zM12.5 12a1.5 1.5 0 11-1.5 1.5 1.5 1.5 0 011.5-1.5zm-5 0A1.5 1.5 0 116 13.5 1.5 1.5 0 017.5 12z"/><path d="M44 2H23a2 2 0 000 4h16L16.51 28.52a2.1 2.1 0 003 3L42 9v16a2 2 0 004 0V4a2 2 0 00-2-2z"/></symbol><symbol fill="#e32700" viewBox="0 0 16 16" id="cd-icon--form-error" xmlns="http://www.w3.org/2000/svg"><path d="M8.002 1a7 7 0 100 14 7 7 0 000-14zm4.025 9.284c.062.063.1.149.1.239a.34.34 0 01-.1.24l-1.262 1.262a.34.34 0 01-.48 0L8.002 9.742l-2.286 2.283a.34.34 0 01-.48 0l-1.261-1.262a.336.336 0 010-.478L6.258 8 3.975 5.716a.34.34 0 010-.48l1.262-1.262a.34.34 0 01.48 0l2.285 2.284 2.283-2.284a.34.34 0 01.48 0l1.262 1.262c.062.063.1.149.1.24a.345.345 0 01-.1.24L9.744 8l2.283 2.284z"/></symbol><symbol viewBox="0 0 16 16" id="cd-icon--form-required" xmlns="http://www.w3.org/2000/svg"><path fill="#E00" d="M0 7.562l1.114-3.438c2.565.906 4.43 1.688 5.59 2.35-.306-2.921-.467-4.93-.484-6.027h3.511c-.05 1.597-.234 3.6-.558 6.003 1.664-.838 3.566-1.613 5.714-2.325L16 7.562c-2.05.678-4.06 1.131-6.028 1.356.984.856 2.372 2.381 4.166 4.575l-2.906 2.059c-.935-1.274-2.041-3.009-3.316-5.206-1.194 2.275-2.244 4.013-3.147 5.206l-2.856-2.059c1.872-2.307 3.211-3.832 4.017-4.575A86.77 86.77 0 010 7.562"/></symbol><symbol viewBox="0 0 28 48" id="cd-icon--help" xmlns="http://www.w3.org/2000/svg"><circle class="aucls-1" cx="14" cy="44" r="4"/><path class="aucls-1" d="M28 14a14 14 0 00-28 0 4 4 0 008 0 6 6 0 116 6 4 4 0 00-4 4v9a4 4 0 008 0v-5.59A14.02 14.02 0 0028 14z"/></symbol><symbol viewBox="0 0 41.9 37" id="cd-icon--ocha-logo" xmlns="http://www.w3.org/2000/svg"><path class="avcls-1" d="M17.6 15.6a3.3 3.3 0 113.3 3.3v-.4a2.9 2.9 0 10-2.9-2.9 2.9 2.9 0 002.9 2.9v.4a3.33 3.33 0 01-3.3-3.3"/><path data-name="Shape" class="avcls-1" d="M15 15.6a6 6 0 116 6v-.4a5.6 5.6 0 10-5.6-5.6 5.59 5.59 0 005.6 5.6v.4a6 6 0 01-6-6"/><path data-name="Shape" class="avcls-1" d="M12.1 15.6a8.9 8.9 0 118.9 8.9V24a8.54 8.54 0 008.5-8.4 8.5 8.5 0 10-17 0A8.41 8.41 0 0021 24v.4a8.77 8.77 0 01-8.9-8.8"/><path data-name="Shape" class="avcls-1" d="M9.3 15.6A11.65 11.65 0 1121 27.2v-.4A11.2 11.2 0 109.8 15.6 11.18 11.18 0 0021 26.8v.4A11.63 11.63 0 019.3 15.6"/><path data-name="Shape" class="avcls-1" d="M6.3 15.6A14.7 14.7 0 1121 30.3v-.4A14.3 14.3 0 106.7 15.6 14.3 14.3 0 0021 29.9v.4A14.66 14.66 0 016.3 15.6"/><path class="avcls-1" d="M20.7 1.1h.4v11.4h-.4z"/><path data-name="Shape" class="avcls-1" d="M10.6 5.5l.3-.3 8 8-.3.3-8-8z"/><path data-name="Rectangle-path" class="avcls-1" d="M6.5 15.4h11.4v.4H6.5z"/><path data-name="Shape" class="avcls-1" d="M10.6 25.7l8-8 .3.3-8 8-.3-.3z"/><path data-name="Rectangle-path" class="avcls-1" d="M20.7 18.7h.4v11.4h-.4zM23.014 17.902l.283-.282 7.967 8.014-.284.282zM24.1 15.4h11.4v.4H24.1z"/><path data-name="Shape" class="avcls-1" d="M23 13.2l8.1-8 .2.3-8 8-.3-.3zM18.7 16.5c.1 0 .1.1.1.2h.1a2.51 2.51 0 00.4-.7.1.1 0 00.1-.1c0-.1-.2-.2-.2-.3-.1.2-.3 0-.4.1v.1h.1v.2a.37.37 0 00-.3-.1c.1 0 0 0 0 .1a.75.75 0 00-.5.1c-.1 0-.1 0-.2-.1-.1.1-.1.2-.2.2l-.1-.1c.1-.1.2-.1.2-.2v-.3c.1-.1.1-.2.2-.2s.3.1.4 0l.1.1v.1c-.1.1-.2.1-.2.2s0 .1.1.1.1-.1.2-.1h.4c.1 0 .1-.3 0-.4v-.2c0-.1.2-.1.2 0v.1s0 .1.1 0v-.2a.35.35 0 00.2.1h.2c.1 0 .1-.1 0-.2h-.1a.31.31 0 01-.2.1c-.1 0-.1-.1-.2-.1s-.2.1-.2 0-.1-.1-.1-.2l.1-.1a.37.37 0 00.3-.1.35.35 0 01.1-.2h.1a.37.37 0 00.3-.1c.1 0 .2-.1.3-.2s.1-.1.2-.1a.1.1 0 01.1-.1v-.5a.1.1 0 01.1-.1h-.1s-.1-.1 0-.1.2 0 .2-.1a.19.19 0 00-.1-.3c-.1-.1-.2 0-.3 0a.1.1 0 01-.1.1c-.1 0-.2-.1-.1-.2v-.1h-.1l-.3.3v.1c0 .1 0 .2-.1.2h-.1c0 .1.2.1.1.2s-.2.1-.4.2a2.72 2.72 0 01-.9 0h-.5c-.1 0-.1.1-.2.2v-.2c0-.1-.1 0-.1-.1-.2-.4-.7-.3-1.1-.3a.1.1 0 00-.1.1c-.1.1-.2 0-.3 0l-.1.1c-.1 0-.2-.1-.3 0s-.1.1-.2.1v.1h-.1c-.1 0-.3 0-.3.1s0 .3-.1.3a.6.6 0 00-.4.1c-.1 0-.1.1-.2.1a2.45 2.45 0 00-.4 1.2v.1c-.2.4-.3.6-.6 1.1-.1.2-.2.6 0 .7s0 .2-.2.2-.4 0-.4-.2-.2-.1-.3-.1h-.4c-.2 0-.2.3-.3.4s-.3.1-.3.2v.2a.1.1 0 00-.1.1v.1c0 .2-.1.3 0 .5v.1a.9.9 0 01-.1.5c-.1.2-.3.2-.5.2h-1c-.1 0-.1-.1-.2-.1a.31.31 0 01-.1-.2c-.1-.1-.3 0-.4.1.1 0 0 .1 0 .1s-.2.1-.3.2-.2-.2-.2-.3-.1-.1-.2-.1v.1h-.1c-.1.1.1.1.1.1v.1h-.1a.1.1 0 01-.1.1c-.1 0-.1.1-.1 0v-.2h-.1c0 .1 0 .1-.1.1v.1h.2a.37.37 0 01.1.3c0 .1 0 .2-.1.1s0-.2 0-.3h-.1c.1.2-.1.3.1.5s-.2.2-.1.2a.35.35 0 00.2.1v-.1s.1-.1.1 0v.1H8v.4c0 .1.2 0 .2.1s-.1.1 0 .2a.1.1 0 01.1.1v.1a.1.1 0 01.1.1c.1 0 .1 0 .1-.1s.1-.1.1-.2 0-.1-.1 0V21c0-.1-.1-.1-.1-.2s.1 0 .2-.1a.1.1 0 01.1.1v.1a.1.1 0 01.1.1c.1 0 .1.1.2.2h.3v-.1l.1.1a.37.37 0 00.1.3h.1l.1.1h.1a.1.1 0 01.1.1c.1 0 .2 0 .2.1s.1.2.2.4a29772.51 29772.51 0 01.2.2.37.37 0 00.3.1.35.35 0 01.2-.1h.1c.1.2.1.4.3.4s.1.1.2.2h.2a.1.1 0 00.1.1c.1.1.2.1.2.2v.1c.1 0 .2-.1.2 0s.2.1.2.2h.1v-.1c0-.1.1 0 .2-.1s.1-.2.1-.2.2.1.3.2h.1c.1.1.1.3.2.3s.2.1.4.2.2.1.3.1h.1c.1 0 .1 0 .2-.1s.3-.1.4-.2l.1-.1c.2-.1.5.1.7 0s.1 0 .2-.1.2-.3.1-.4-.2-.5-.3-.7l-.3-.3h-.1c-.1 0-.1-.1-.1-.2a.1.1 0 01-.1-.1v-.3c-.1 0-.2-.1-.4-.1a.1.1 0 01-.1-.1v-.1a.37.37 0 01.3-.1v-.3a.1.1 0 00-.1-.1c0-.1.1-.2 0-.3s-.2-.2-.2-.3a.1.1 0 01-.1-.1v-.5c0-.1-.1-.1 0-.2l.1-.1c.1 0 .1-.1.1-.2a.14.14 0 00-.2 0v-.3l-.1-.1v-.2s0-.1-.1 0v-.2c0-.1-.1-.2-.2-.1a.14.14 0 01-.2 0V18a.1.1 0 00.1-.1.14.14 0 000-.2c-.1-.1-.2-.2-.1-.3-.1 0-.3 0-.3-.2s0-.3-.1-.4v-.3a.1.1 0 01.1-.1c.2 0 .4 0 .4-.1s-.1-.3 0-.3.4 0 .6-.2c.1 0 .1-.1 0-.2a.35.35 0 00-.1-.2c-.1-.1-.2 0-.3-.2V15c0-.1.1-.1.2-.2s.3 0 .5.1l.1.1v.1c0 .2.1.4 0 .6s-.1.1-.1.2h.1c0 .1.1.3 0 .4s-.1 0-.3 0-.1 0-.1.1l.1.1c.4.1.5.1.9.2.1 0 .1.1.2.1h.3a.1.1 0 00.1.1c.1.1.1.3.2.3a.14.14 0 01.2 0c-.1.1 0 .2 0 .3s.2.1.3.2.2.1.2 0-.1-.2 0-.3c.1.2 0 .4.1.6.1.1.1.2.2.2s.1-.1.1-.2v-.1c0-.1 0-.1.1-.2s.1-.2.1-.3v-.1c0-.1.2-.2.3-.2V17c.1 0 0-.2.1-.2s.1-.1.1-.2.1-.1 0-.1c.5.1.5 0 .5 0"/><path data-name="Shape" class="avcls-1" d="M14.5 16.3h-.1v.1l.1.1v.3c0 .1.1.2.2.1s.2-.3.1-.4-.1-.1-.3-.2M14.3 17.2c.1.2.2.1.3.1v-.1c-.1-.1-.1-.1-.3 0 .1-.1 0-.1 0-.1v.1M14.6 17.6c0-.2-.1-.2-.2-.1s0 .3.1.4a.1.1 0 00.1.1c0 .1.1 0 .2 0s0-.1.1-.1c-.1-.1-.2-.3-.3-.3"/><path data-name="Shape" class="avcls-1" d="M14.3 16.8c0-.1-.1-.1 0 0-.1 0-.1 0-.1.1s0 .2.1.2a.1.1 0 00.1-.1c-.1-.1-.1-.1-.1-.2M14.7 17.4l.1-.1h.1v-.1c-.1 0-.1.1-.2.1s0 .1 0 .1M14.6 18.3c0 .1 0 .1.1.1h.1v-.1h-.2M14.8 19c0-.1.1-.1 0-.2h-.1a.35.35 0 00.1.2M8.5 21.5v.1h.2c-.1 0-.1-.2-.2-.1M9.1 22.2c-.1.1.1.2.2.2v-.2a.14.14 0 00-.2 0M9.4 22.6c0 .2.1.3.2.3.1-.2 0-.3-.2-.3M19.5 17.4a1.27 1.27 0 01.6-.1c.4 0 .4-.6.6-.9a.6.6 0 00-.1-.4c-.1-.2-.6 0-.7-.2s.3.1.3-.1 0-.1-.1-.2h-.2a2 2 0 00-.4.8 5.38 5.38 0 00-.9 1.2c0 .1 0 .1.1.2.3.1.6-.2.8-.3M21.3 16.4c-.1 0-.1 0-.2.1v.2h.1c0-.1 0-.1-.1-.1.2-.1.2-.2.2-.2M20 17.9c.1.2.5.1.5 0s-.3-.2-.4-.2.1.1-.1.2M20.5 19.2a.37.37 0 00.1-.3l-.3.3h.2M22.3 16.5v-.1h-.2c-.1 0-.1-.1-.1-.2s-.1-.2-.1-.3-.1.2-.1.2c.2.2.3.5.5.4M19.9 15.3c-.1-.1-.1 0 0 0-.1.1 0 .1 0 0M8.1 19.1A.1.1 0 008 19h-.1v.1a.14.14 0 00.2 0M8.8 19.1c.1 0 .2-.1.1-.2s-.3 0-.2.1c-.1.1 0 .2.1.1M20.2 12.1c0-.1.1-.1.1-.2h-.1c-.1 0-.1.1 0 .2M20.5 12s.1-.1 0-.1h-.1a.1.1 0 00.1.1M19.4 14.6c0 .1.2.3.3.2a.14.14 0 000-.2.19.19 0 00-.3 0M19.7 15.4v-.1h-.3a.1.1 0 00.1.1c0-.1.1 0 .2 0M19.4 15.6c-.1 0 0 .1 0 .2s.1 0 .2-.1.1-.2 0-.2-.2 0-.2.1M19.2 15.3c0 .1-.1.2 0 .3s.1 0 .1 0 0-.2.1-.2h-.1v-.1h-.1M26.8 22.4c.1 0 0-.1 0 0"/><path data-name="Shape" class="avcls-1" d="M21 18.5l-.1-.1c0-.1-.1.1-.2 0 .1.1 0 .1-.1.2a.1.1 0 00.1.1c0 .1-.1.1 0 .2l-.1.1s-.1.1 0 .1.2-.1.3-.1h.1c.1 0 .1-.1.2-.2H21s-.1 0 0-.3M21.6 20.4c0 .1.1.1 0 0 .1 0 .1-.1.1-.2h-.1v.2M21.7 20.2c.1 0 0-.1 0-.1h-.1a.1.1 0 00.1.1M22.3 20.5c-.1 0-.1-.1-.2 0H22v.1c.2-.1.2-.1.3-.1M23.3 20.4v-.1c-.1 0-.2.1-.3 0v.1h-.1c.2.1.3 0 .4 0M23.7 20c0 .2.2.1.2 0s0-.1-.2 0l.1-.1a.1.1 0 01-.1.1M28.5 16.8c0 .1.1.1.2.1a.37.37 0 00.3-.1.27.27 0 00-.3-.3c-.2.1-.2.2-.2.3M28.5 21.9h-.1c-.1.5-.6 1.2 0 1.5.2.2.5-.1.6-.3s0-1-.5-1.2M27 19.7c-.1 0-.1.2 0 .2a.1.1 0 00.1-.1v-.1H27M27.4 24.8v.2s.2-.1 0-.2M29.7 13.1h-.1v.2c-.2.4-.7.9-.4 1.4a1.38 1.38 0 00.3-.4 10.37 10.37 0 00.4-1s-.1-.2-.2-.2M28.8 14.9c0 .1 0 .1.1.1s.1-.1 0-.1 0-.1-.1 0M23.7 11.8c-.1-.2-.2 0-.3 0l-.1-.1h-.1c-.1 0 0 .2.1.2s.1-.1.1 0 0 .3.2.2.2-.1.3-.1.1-.1.1-.2.2-.1.3 0a.1.1 0 00.1.1c0 .1.1.1.2.1a.37.37 0 00.3-.1.19.19 0 000-.3h-.2c-.1 0-.1-.1-.2-.1-.4-.1-.6.2-.8.3M22.7 12h.3c0-.2-.2-.1-.3-.1.1-.1.1 0 0 .1"/><path data-name="Shape" class="avcls-1" d="M23.1 12.6c.1-.1.3-.2.4-.3v-.1c0-.1-.1-.1-.2-.2a.1.1 0 01-.1.1c-.1.1-.2.1-.2.2v.2c.1.3.1.2.1.1M21.6 11.6v.1c.1.1.1 0 0-.1M18 9.4a.6.6 0 00.4.1l.1-.1c-.1-.1-.2 0-.2-.1h-.1c-.1-.1-.2 0-.2.1M27.1 11c0 .1-.1 0-.2.1v.1c.1.1.2 0 .3 0s.1-.1.1 0v.1a.1.1 0 00-.1.1h-.3v.2c-.1.1-.4.2-.3.4a.75.75 0 00.5.1c0-.2.1-.2.2-.3a.1.1 0 00-.1-.1v-.1a.1.1 0 00.1-.1v-.1a.35.35 0 00.2-.1c0-.1-.1-.2-.1-.3a.1.1 0 01.1-.1v-.1h-.1s-.1 0 0 .1a.37.37 0 00-.3.1c0-.2.1 0 0 0M26.1 12c0 .1.1.1.2 0h-.2M27.5 11.8c-.1.1.1.1.2.1 0-.1-.1-.1-.2-.1M27.9 11.3c-.1 0-.1.1 0 0M25.6 7.3c.1.1.2.1.2.2v.4l.1.1v.2c0 .1.1.3.1.4a.1.1 0 01.1.1c0 .1 0 .1.1.2s.1 0 .2.1.2.3.3.4a.1.1 0 01.1.1v.1c.2 0 .5.1.4.4.1-.1.2-.1.2-.2s.1-.3 0-.4l-.2-.2V9a.1.1 0 00-.1-.1c0-.1-.1-.3.1-.3v-.1H27v-.1a.35.35 0 00-.4-.4c-.1-.1-.1-.1-.2-.1h-.2a2.09 2.09 0 01-.4-.6.19.19 0 00-.3 0c.1-.1.1-.1.1 0"/><path data-name="Shape" class="avcls-1" d="M24.7 7.6a.14.14 0 000 .2h.4a.1.1 0 00.1-.1c.1-.1.2 0 .4-.1 0 .1 0 .1.1.1s0-.2-.1-.2-.1-.2-.2-.3h-.1c0 .2-.1.1-.3.2v.1-.1h-.2a.35.35 0 01-.1.2M22.4 3.7c-.1-.2-.3-.4-.2-.7a1.39 1.39 0 00.9 0c.2-.1.5 0 .7-.1v-.2c-.3.1-.5-.2-.7-.1a3.18 3.18 0 01-.9.3c-.2.1-.9 0-.9.4.3 0 .7 0 .9.3 0 .1.1.1.2.1M23.4 5.2a.4.4 0 00.4.2c0-.1 0-.1-.1-.2h-.3M23.1 5.7c-.1 0 0 .1.1.2 0-.1.1-.3-.1-.2M22.9 5.4c.1-.1 0-.2-.1-.2v.1l.1.1M23.8 6.5a.31.31 0 00.1-.2h-.1a.14.14 0 000 .2M24.1 6.5v.1c.1.1.1 0 0-.1.1 0 0 .1 0 0M24 6.8l.1-.1c0-.1-.1-.1-.2 0s.1 0 .1.1M24.1 6.8c0 .1.1.2.2.1s.1-.1 0-.1zM24.6 7a.35.35 0 00-.1-.2s-.1.1 0 .1 0 .1.1.1M24.7 7.3h.1v-.2h-.2v.1l.1.1M24.5 7.5c.1-.1.1-.1 0-.2h-.1a.1.1 0 01-.1.1c.1.1.1.1.2.1M24.2 2.5c-.1-.1-.1-.1-.2-.1.1.1.1.2.2.1M27.6 5c.1.1.2 0 .2.1s.1.2.2.2.1 0 .1-.1 0-.4-.2-.4h-.5c-.1 0-.1.1-.1.2a.19.19 0 01.3 0"/><path data-name="Shape" class="avcls-1" d="M31.7 10.2c-.1-.1-.1-.3-.2-.4s-.2-.1-.3-.2v-.2l-.1-.1c-.1-.2-.1-.3-.3-.3 0-.2-.1-.2-.3-.3v-.1a.1.1 0 00-.1-.1h-.1c-.1-.1-.2-.2-.2-.3s-.2-.2-.3-.3l-.1-.1c-.1 0-.2 0-.2-.1s-.2-.3-.3-.4 0-.4-.1-.7c0-.1-.1-.1-.2-.1a.1.1 0 01-.1-.1c-.1-.1 0-.3-.1-.4s-.3-.3-.4-.5a.37.37 0 00-.3-.1h-.1l-.1-.1c-.1-.1-.2-.2-.3-.2s-.4 0-.6-.1-.4 0-.5.2-.3.2-.5.2 0 .1 0 .2-.2.2-.1.2h.2a.1.1 0 01.1.1c.1.1.2.2.2.3a.14.14 0 000 .2.37.37 0 01.1.3c0 .1.1 0 .1 0a.25.25 0 01.1.4v.3c.1.2.1.4.2.5l.1-.1c.1 0 .1-.1.2-.1.2-.2.4.2.5.3s0 .4.1.6a1.38 1.38 0 00.3.4.31.31 0 00.1.2l.1.1a.1.1 0 01.1-.1h.1c.2.2.2.6.5.6a.1.1 0 00.1.1c.1 0 .1-.1.2 0a.35.35 0 00.1.2h.3c.1 0 .1.1.2.2l.1.1c.2.2.3.5.5.7s.2.2.3.1v-.1a.22.22 0 00.2-.2l.3-.3c.1-.1.2-.1.3-.2.3 0 .2-.2.2-.2M27.5 10.3c0 .1.1.1.2.1s.1.2.2.2.1-.1.1-.2h.1c.1-.1 0-.3-.1-.4s-.1-.2-.3-.2-.1 0-.2.1 0 .2 0 .3v.1M28.2 10.7c-.1.2 0 .4 0 .6s-.2.1-.2.2a.14.14 0 000 .2c0 .1.2.1.3.2a1.17 1.17 0 01.6.6.37.37 0 01.1.3c.1.1.2.1.2.2s.1.1.1 0a.3.3 0 000-.4c-.1-.1-.1-.1-.1-.2a2.35 2.35 0 00-.2-.8l-.3-.3v-.1c0-.1.1-.1.1-.2s-.1-.2-.2-.3c-.2-.1-.3-.1-.4 0M29.7 12.1v-.2c0-.2-.2-.2-.3-.2h-.1v.2a2.93 2.93 0 01.3 1c0 .1.3 0 .3-.1v-.2c0-.1-.1-.1-.1-.2s-.1-.2-.1-.3M29.3 11.2c-.1.1 0 .2 0 .3.1 0 .1 0 .1-.1s0-.1-.1-.2M29.3 11c0-.1 0-.1-.1-.1s-.1.1-.2.1 0 .1.1.2c.2 0 .3-.1.2-.2M28.8 10.5c.1.1 0 .2.1.2s.2.1.3 0 0-.1-.1-.1v-.1H29c-.1-.1.1-.1 0-.2v-.1h-.1v.1c-.1.1-.2.2-.1.2M28.7 9.9c-.1 0-.2 0-.2-.1h-.1s-.1.1 0 .1a.1.1 0 01.1.1c0 .1.1 0 .1.1s.1.1.1 0V10s.1-.1 0-.1M21.6 14.5a.14.14 0 000-.2.1.1 0 00-.1.1c.1 0 .1 0 .1.1"/><path data-name="Shape" class="avcls-1" d="M29.4 13.2a.6.6 0 00-.4.1c-.2.1-.3.4-.4.6a.52.52 0 01-.4.2.1.1 0 01-.1-.1v-.2l.1-.1c.1-.1 0-.2 0-.3s-.3-.4-.5-.3-.3.3-.5.5c-.1-.1-.2-.2-.2-.3v-.1c.1 0 .2.2.2.1s0-.2-.1-.2-.1-.1-.2-.1-.1-.1-.2-.2 0-.3-.1-.3a.37.37 0 01-.3-.1h-.2v-.1c.1 0 .3 0 .2-.2s-.1-.1-.2-.1H26v.3a.37.37 0 01-.3.1h-.1c-.1 0-.2-.1-.3-.1s-.1.2-.2.2-.1 0-.2.1-.1.2 0 .3v.1a.1.1 0 01-.1-.1c0-.1-.1-.2-.1-.3s.1-.2.2-.3v-.2c-.1-.1-.1-.1-.2-.1s-.3.4-.5.3-.2-.2-.3-.2-.1-.1-.2 0a2.19 2.19 0 01-.5.3c-.1.1-.3.2-.3.4a.38.38 0 01-.6.1c-.1-.1-.2-.2-.3-.2s-.2.2-.3.2-.1 0-.2-.1v-.1l.6-.3c.1 0 .1-.1.1-.2V12a.68.68 0 00-.6.4.1.1 0 01-.1.1c-.2 0-.3.1-.5 0l-.1-.2c-.1.1-.1.2-.2.2l-.1.1c-.1.1.1.3 0 .4s-.2.1-.3.1v.2c0 .1.1 0 .1.1s.1.3.2.3.3 0 .5.1.2.1.3.2.1.1.1.2a.1.1 0 00.1.1h.2c.1 0 0 .1.1.2a.76.76 0 00.1.4s0 .2-.1.2a.1.1 0 00-.1.1v.3h.1c.1.1.1.2.2.3l.1.1a.1.1 0 00-.1.1.14.14 0 00.2 0c.1 0 .1-.1.2-.1a.1.1 0 00.1-.1.35.35 0 01.1.2c-.1.1-.3 0-.4.1s-.1 0-.2.1a.1.1 0 00.1.1c.2.1.1.4-.1.6v.2H22c-.2 0-.5-.1-.7 0s-.1.1-.1.2a.1.1 0 00-.1.1v.2c-.2.2-.2.5-.3.7a.1.1 0 00.1.1c.1 0 .1-.1.2-.1s.1.2.1.2.2.1.2 0a.37.37 0 01.1-.3c0-.1-.1-.2-.1-.3s0-.2.1-.2a.1.1 0 01.1.1v.4a.14.14 0 010 .2.1.1 0 01-.1.1v.2c-.1.1-.1.1-.1.2-.2 0-.4-.1-.3-.3-.1 0-.1 0-.2.1v.3c-.1.1-.1.2-.2.3v.1c-.1.1-.2.2-.3.2-.1.1-.2 0-.2.1s.1.2.1.3 0 .1-.1.2h-.4a.37.37 0 01-.1.3c-.1.1 0 .2.1.2s.1.2.2.2.1.1.2.1a.22.22 0 00.2-.2c0-.1.1 0 .2 0h.1a.14.14 0 000-.2l.4-.4c.1 0 .1-.1.2-.1s.1.1.2.1.1.1.2.1h.1c.1 0 .2.2.3.2a.37.37 0 00-.1-.3c-.1-.1-.2-.2-.3-.2v-.1c.1.1.1.1.2.1s.1.2.2.3.1.1.2.1a.37.37 0 00.3-.1c0-.1 0-.1-.1-.1s0-.1.1-.2 0-.2 0-.3v-.1c.1-.1 0-.2 0-.4 0 .1.1.1.2.1a.22.22 0 00.2-.2.19.19 0 01.3.1c0 .1 0 .2-.1.2a.76.76 0 00-.5.2l-.1.1c-.1.1-.1.1-.1.2l-.1.1a.1.1 0 01.1.1.37.37 0 00.3-.1v-.2c.1 0 .1-.1.2-.1s.3.2.2.3h-.1c-.1.1-.2.3-.3.3s-.5.1-.7.2-.1.2-.2.2-.2.1-.3 0c0 .1-.2 0-.3 0a.31.31 0 00-.1-.2h-.1v-.1h-.8a.1.1 0 00-.1.1l-.1.1a.37.37 0 01-.3.1.37.37 0 00-.3.1c-.2 0-.3.2-.4.3a.37.37 0 01-.3.1v.1c-.2 0-.3.3-.4.5v.2c-.1.1-.1.3-.3.4v.1c.1.2.3.3.5.5a.1.1 0 00.1.1c.1.1.1.2.2.4s.3.2.5.2a.35.35 0 01.2.1c.2 0 .5.1.7 0 .3.1.7 0 1 .1.1 0 .1.1.1.2s.2.3.3.4a.6.6 0 00.4.1.31.31 0 00.1.2c0 .1 0 .1.1.2s.1.1.1.2-.1.2-.1.4v.2a2.65 2.65 0 00.6.5s.1 0 0 .1c.1 0 .1.1.2.2s0 .1.1.2l.3.3a.6.6 0 00.4.1.1.1 0 01.1.1c.1 0 .3.1.4 0s.1-.2.2-.2a.6.6 0 01.4-.1.1.1 0 00.1-.1c0-.1.1-.1.1-.2s.2-.1.3-.1.3-.3.5-.4.4-.1.5-.2 0-.4 0-.6.1-.2.1-.3v-.5c0-.1-.1-.2-.1-.3s.1-.1.2-.1.1-.3.2-.4a.1.1 0 00.1-.1c.1 0 0-.1 0-.2a.1.1 0 01-.1-.1 1.21 1.21 0 00-.5-.5.1.1 0 01-.1-.1v-.1c-.1 0 0-.1-.1-.1h.1c.1-.1.1-.3.2-.4a.1.1 0 00.1-.1v-.3c-.1-.1 0-.3 0-.4a2.2 2.2 0 00-.1-.8c0-.1-.1-.1-.2-.1a.1.1 0 01-.1.1.31.31 0 01-.1.2c0 .1-.2.1-.2.2s0 .1-.1.2l-.1.1c.4-.3.3-.3.3-.2h-.3a14.24 14.24 0 00-1.6-.5h.3c.1 0 0-.1 0-.1s.2.1.3.2.5.1.7.2.3.2.5.2.3-.1.4-.1v-.1c.1-.1.2-.2.2-.3v-.3l.1-.1v-.4a.1.1 0 00.1-.1v-.3a.75.75 0 00-.1-.5c0-.1-.1-.1-.2-.1a.1.1 0 01-.1.1c-.1 0-.2 0-.2.1a.1.1 0 00-.1.1.52.52 0 01-.4.2c-.1 0-.2 0-.2-.1s.2-.2.4-.2l.1-.1a.22.22 0 01.2-.2h.2c.1 0 .1-.1.2-.1a.31.31 0 01.1-.2c0-.1.1-.1.2-.2s.1-.4.2-.6 0 .1.1.2a.19.19 0 00.3 0c.1-.1 0-.2.1-.2h.1c.1 0 .1.1.2.1a.35.35 0 01.2-.1h.3c.2-.1.6 0 .6-.2a.86.86 0 00-.6-.7c-.2-.1-.1-.4-.3-.6-.1 0 0-.1-.1-.2l-.1-.1-.1-.1v-.5c0-.1.1-.1.2-.1s.2-.1.2-.2v-.4l.1-.1c.2 0 .5.1.7-.1.1 0 .1-.1.1-.2a1 1 0 00.4-.8c-.1.1 0 .1 0-.1.1.1.1 0 0 0m-4.5 5.4c-.1.1-.1.1-.2 0s-.1-.1-.1-.2-.1 0-.1.1h-.2c0-.1-.1-.1-.1-.2s0-.2.1-.2.1 0 .1.1v.1c.1.1.1 0 .2 0h.3c0 .1.1.2 0 .3M15.6 36c1.3-1.9 5.2-3.9 9-3.9s8 2.2 9.6 1a8.38 8.38 0 01-5.1 1.4c-3.4 0-4.7-1.7-7-1.7s-4.8 1.9-5.9 3.5zM27.7 31.8a5.34 5.34 0 001.7-1.9 14.44 14.44 0 013.7-4.4s-1.7 5.5-3.5 5.7c0 0-.3.2.2.1s2.8-.9 3.6-1.1a8.58 8.58 0 003.3-1.1 1.48 1.48 0 01.8-.4s-2.2 3.7-6.2 3.7a17.1 17.1 0 01-3.6-.6"/><path data-name="Shape" class="avcls-1" d="M32.4 29.9a3.92 3.92 0 00.5-1.7 14.64 14.64 0 012.7-6.3s.3 4.3-1.9 7c0 0-.1.4.1.1a22.93 22.93 0 014.6-3.9s1.5-1.3 1.6-1.7c0-.1-1.2 6.1-7.6 6.5"/><path data-name="Shape" class="avcls-1" d="M36.1 25.8a5.62 5.62 0 00.2-1.3c0-.6-.3-2.6-.3-3.5a7.53 7.53 0 01.8-3.7 4.5 4.5 0 00.2 1.4 12.29 12.29 0 01.5 2.5 10.27 10.27 0 01-.4 2.5 2.13 2.13 0 00.6-.8 12.81 12.81 0 012.2-2.8 5.62 5.62 0 001.4-2.1 6.08 6.08 0 01-1.2 4.1c-1.5 2.1-2.1 1.8-2.9 2.6a11.41 11.41 0 01-1.1 1.1"/><path data-name="Shape" class="avcls-1" d="M38.4 20.9a3.87 3.87 0 00-.3-1.6 10.5 10.5 0 01-1.3-5.9s.2-.2.6 1 1 1.6 1.2 2.8a12 12 0 01.2 1.7s.1.2.1 0a9 9 0 01.8-3.2c.7-1.5 1.6-2.9 1.5-3.9 0 0 .4 0 .3 1.6.1 1.6-.3 4.4-3.1 7.5"/><path data-name="Shape" class="avcls-1" d="M39.2 16.1a12 12 0 00-.8-1.5c-.3-.4-2.7-3.7-2.9-5.3 0 0 .2-.1.4.3a12.94 12.94 0 001.5 1.7 5 5 0 011.5 2.8s.1.1-.1-2.1.7-3.7-.1-5.3c0 0 1.1.2 1.7 4.8a9.68 9.68 0 01-.9 3.6c.1-.1-.2 1-.3 1"/><path data-name="Shape" class="avcls-1" d="M38.3 11a9.94 9.94 0 00-1.6-1.3 9.58 9.58 0 01-3.3-4.3s.1-.2.8.7c.5.7 1.1.4 2.7 2.4 0 0 .2.5.3.4s-.1-.5-.1-.5-.1-1.2-.1-1.6a15.83 15.83 0 00-.9-3.1 5.82 5.82 0 012.5 4.7c-.1 0-.2 2.5-.3 2.6"/><path data-name="Shape" class="avcls-1" d="M36.5 7.3s.1-3-3.8-4.6c0 0 1.4 2.8 2.4 3.5a11.57 11.57 0 011.4 1.1M26.3 36c-1.3-1.9-5.2-3.9-9-3.9s-8 2.2-9.6 1a8.38 8.38 0 005.1 1.4c3.4 0 4.7-1.7 7-1.7s4.8 1.9 5.9 3.5zM14.2 31.8a5.34 5.34 0 01-1.7-1.9 14.44 14.44 0 00-3.7-4.4s1.7 5.5 3.5 5.7c0 0 .3.2-.2.1s-2.8-.9-3.6-1.1a8.58 8.58 0 01-3.3-1.1 1.24 1.24 0 00-.8-.4s2.2 3.7 6.2 3.7a17.1 17.1 0 003.6-.6"/><path data-name="Shape" class="avcls-1" d="M9.5 29.9a3.92 3.92 0 01-.5-1.7 14.64 14.64 0 00-2.7-6.3s-.3 4.3 1.9 7c0 0 .1.4-.1.1a22.93 22.93 0 00-4.6-3.9S2 23.8 1.9 23.4c0-.1 1.2 6.1 7.6 6.5"/><path data-name="Shape" class="avcls-1" d="M5.8 25.8a5.62 5.62 0 01-.2-1.3c0-.6.3-2.6.3-3.5a7.53 7.53 0 00-.8-3.7 4.5 4.5 0 01-.2 1.4 12.29 12.29 0 00-.5 2.5 10.27 10.27 0 00.4 2.5 2.13 2.13 0 01-.6-.8A12.81 12.81 0 002 20.1 5.62 5.62 0 01.6 18a6.08 6.08 0 001.2 4.1c1.5 2.1 2.1 1.8 2.9 2.6.1 0 1 1.1 1.1 1.1"/><path data-name="Shape" class="avcls-1" d="M3.5 20.9a6.93 6.93 0 01.3-1.6 10.5 10.5 0 001.3-5.9s-.2-.2-.6 1-1 1.6-1.2 2.8a8.18 8.18 0 00-.3 1.7s-.1.2-.1 0a9 9 0 00-.8-3.2C1.4 14.2.5 12.8.6 11.8c0 0-.4 0-.3 1.6a11 11 0 003.2 7.5"/><path data-name="Shape" class="avcls-1" d="M2.7 16.1a12 12 0 01.8-1.5c.3-.4 2.7-3.7 2.9-5.3 0 0-.2-.1-.4.3a12.94 12.94 0 01-1.5 1.7A5 5 0 003 14.1s-.1.1.1-2.1-.7-3.7.1-5.3c0 0-1.1.2-1.7 4.8a9.68 9.68 0 00.9 3.6c-.1-.1.2 1 .3 1"/><path data-name="Shape" class="avcls-1" d="M3.6 11a9.94 9.94 0 011.6-1.3 9.58 9.58 0 003.3-4.3s-.1-.2-.8.7c-.5.7-1.1.4-2.7 2.4 0 0-.2.5-.3.4s.1-.5.1-.5a13.88 13.88 0 00.3-1.7A15.83 15.83 0 016 3.6a5.82 5.82 0 00-2.5 4.7 12.21 12.21 0 00.1 2.7"/><path data-name="Shape" class="avcls-1" d="M5.4 7.3s-.1-3 3.8-4.6c0 0-1.4 2.8-2.4 3.5a11.57 11.57 0 00-1.4 1.1"/></symbol><symbol viewBox="0 0 19.25 14" id="cd-icon--pdf" xmlns="http://www.w3.org/2000/svg"><path data-name="Path 1010" d="M16.188.411V0l3.063 3.063H16.53a.342.342 0 01-.341-.341zm3.063 3.526v9.188a.875.875 0 01-.875.875H.876a.875.875 0 01-.875-.875V.875A.875.875 0 01.876 0h14.438v2.721a1.218 1.218 0 001.216 1.216zM7.439 6.562A1.314 1.314 0 006.127 5.25H4.815a.437.437 0 00-.437.438v4.375a.438.438 0 00.875 0v-1.75h.875a1.314 1.314 0 001.313-1.312zm3.938 0a1.314 1.314 0 00-1.312-1.312H8.75a.437.437 0 00-.437.438v4.375a.437.437 0 00.438.438h1.313a1.314 1.314 0 001.313-1.312zm3.938-.875a.437.437 0 00-.437-.437h-2.187a.437.437 0 00-.437.438v4.375a.438.438 0 00.875 0v-1.75H14a.438.438 0 000-.875h-.875V6.126h1.75a.437.437 0 00.438-.438zm-5.25.438H9.19v3.5h.875a.438.438 0 00.438-.437V6.563a.438.438 0 00-.44-.438zm-3.937 0h-.875v1.313h.875a.438.438 0 00.438-.437v-.437a.438.438 0 00-.441-.439z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--search" xmlns="http://www.w3.org/2000/svg"><path d="M46.829 41.172L38.4 32.744a21.018 21.018 0 10-5.657 5.657l8.427 8.427a4 4 0 005.658-5.656zM8 21a13 13 0 1122.325 9.046c-.05.045-.106.078-.154.126s-.08.104-.125.154A12.992 12.992 0 018 21z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--selected" xmlns="http://www.w3.org/2000/svg"><path d="M18.5 39.75a4 4 0 01-2.83-1.17l-12.5-12.5a4 4 0 015.66-5.66l9.67 9.67L39.17 9.42a4 4 0 015.66 5.66l-23.5 23.5a4 4 0 01-2.83 1.17z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--selected--highlighted" xmlns="http://www.w3.org/2000/svg"><path fill="#80CBFF" d="M18.5 39.75a4 4 0 01-2.83-1.17l-12.5-12.5a4 4 0 015.66-5.66l9.67 9.67L39.17 9.42a4 4 0 015.66 5.66l-23.5 23.5a4 4 0 01-2.83 1.17z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-fb-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><path d="M29.16 13h-3.52c-2.09 0-4.41.88-4.41 3.9v3.2h-2.41v3.84h2.49V35h4.57V23.87h3l.27-3.78h-3.34v-2.17c0-1.2 1.24-1.13 1.32-1.13h2V13z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-fb-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm4.9 21.87h-3V35h-4.59V23.94h-2.49V20.1h2.41v-3.2c0-3 2.32-3.9 4.41-3.9h3.52v3.79h-2c-.07 0-1.32-.07-1.32 1.13v2.17h3.37z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-gh-def" xmlns="http://www.w3.org/2000/svg"><path d="M14.46 26.8a.16.16 0 010-.26.71.71 0 01.66-.2 1.15 1.15 0 01.46.13 3 3 0 011 .89 6.7 6.7 0 00.89 1 2.45 2.45 0 003.23.2 2 2 0 01.43-.79 2 2 0 01.56-.46q.26-.13.92-.39a12.25 12.25 0 01-3.52-.76A6 6 0 0117 24.69a5.52 5.52 0 01-1.28-3.09 7.92 7.92 0 01.3-3.49 5.8 5.8 0 011.12-1.78 5.89 5.89 0 01.2-3.75A6.84 6.84 0 0121.1 14a14.42 14.42 0 016.85 0 12.37 12.37 0 011.42-.82 5.79 5.79 0 012.4-.56 7.1 7.1 0 01.36 1.71 5.66 5.66 0 01-.1 1.84 6.07 6.07 0 011.58 4.21 7.48 7.48 0 01-.72 3.49 5.56 5.56 0 01-2.57 2.3 9.15 9.15 0 01-3.29.72 4.36 4.36 0 011.35 1 2.9 2.9 0 01.56 1.55v2.07l.07 2a2.47 2.47 0 00.92.89.22.22 0 01.13.3q-.07.2-.53.2a2.19 2.19 0 01-1.78-.9 1.51 1.51 0 01-.2-.79v-3.12a1 1 0 00-.26-.76 1.28 1.28 0 00-.53-.3v4.15a2.6 2.6 0 00.24 1.45 1.55 1.55 0 01.33.66s0 .08-.1.1a1.27 1.27 0 01-.56-.1 1.63 1.63 0 01-1.18-.89 3.4 3.4 0 01-.33-1.48v-4.08h-.86v4.08a3.62 3.62 0 01-.3 1.51 1.85 1.85 0 01-1.71 1q-.2-.07-.2-.13a5.58 5.58 0 00.39-.66 3.05 3.05 0 00.16-.53 3.82 3.82 0 00.1-.92V29a1.07 1.07 0 00-.49.3 1 1 0 00-.23.76v3.16a1.51 1.51 0 01-.2.79 2.08 2.08 0 01-1.78.79q-.46 0-.53-.2a.18.18 0 010-.23 2 2 0 01.3-.23 2 2 0 00.26-.2 1.2 1.2 0 00.39-.53 2.5 2.5 0 00.1-1.38 6.64 6.64 0 010-1.45 3.8 3.8 0 01-3.47-.58A6.43 6.43 0 0116 28.51a6.64 6.64 0 00-1.58-1.71z"/><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-gh-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm8.89 21.84a5.56 5.56 0 01-2.57 2.3 9.15 9.15 0 01-3.29.72 4.36 4.36 0 011.35 1 2.9 2.9 0 01.56 1.55v2.07l.07 2a2.47 2.47 0 00.92.89.22.22 0 01.13.3q-.07.2-.53.2a2.19 2.19 0 01-1.78-.87 1.51 1.51 0 01-.2-.79v-3.12a1 1 0 00-.26-.76 1.28 1.28 0 00-.53-.3v4.15a2.6 2.6 0 00.24 1.45 1.55 1.55 0 01.33.66s0 .08-.1.1a1.27 1.27 0 01-.56-.1 1.63 1.63 0 01-1.18-.89 3.4 3.4 0 01-.33-1.48v-4.08h-.86v4.08a3.62 3.62 0 01-.3 1.51 1.85 1.85 0 01-1.71 1q-.2-.07-.2-.13a5.56 5.56 0 00.39-.66 3 3 0 00.16-.53 3.82 3.82 0 00.1-.92V29a1.07 1.07 0 00-.49.3 1 1 0 00-.23.76v3.16a1.51 1.51 0 01-.2.79 2.08 2.08 0 01-1.78.79q-.46 0-.53-.2a.18.18 0 010-.23 2 2 0 01.3-.23 2 2 0 00.26-.2 1.2 1.2 0 00.39-.53 2.5 2.5 0 00.1-1.38 6.64 6.64 0 010-1.45 3.8 3.8 0 01-3.47-.58A6.43 6.43 0 0116 28.51a6.64 6.64 0 00-1.58-1.71.16.16 0 010-.26.71.71 0 01.66-.2 1.14 1.14 0 01.46.13 3 3 0 011 .89 6.69 6.69 0 00.89 1 2.45 2.45 0 003.23.2 2.12 2.12 0 011-1.25q.26-.13.92-.4a12.25 12.25 0 01-3.52-.76A6 6 0 0117 24.69a5.52 5.52 0 01-1.28-3.09 7.92 7.92 0 01.3-3.49 5.79 5.79 0 011.12-1.78 5.89 5.89 0 01.2-3.75A6.83 6.83 0 0121.1 14a14.42 14.42 0 016.85 0 12.37 12.37 0 011.42-.82 5.79 5.79 0 012.4-.56 7.1 7.1 0 01.36 1.71 5.66 5.66 0 01-.1 1.84 6.06 6.06 0 011.58 4.21 7.48 7.48 0 01-.72 3.46z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-ig-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm0 41a19 19 0 1119-19 19 19 0 01-19 19z"/><path d="M24 18.09A5.91 5.91 0 1029.91 24 5.9 5.9 0 0024 18.09zm0 9.74A3.83 3.83 0 1127.83 24 3.83 3.83 0 0124 27.83z"/><circle cx="30.14" cy="17.86" r="1.38"/><path d="M34.9 16.47a5.88 5.88 0 00-3.36-3.36 8.43 8.43 0 00-2.79-.53c-1.23-.06-1.62-.07-4.74-.07s-3.52 0-4.74.07a8.44 8.44 0 00-2.79.53 5.88 5.88 0 00-3.36 3.36 8.44 8.44 0 00-.53 2.79c-.06 1.23-.07 1.62-.07 4.74s0 3.52.07 4.74a8.44 8.44 0 00.53 2.79 5.88 5.88 0 003.36 3.36 8.44 8.44 0 002.79.53c1.23.06 1.62.07 4.74.07s3.52 0 4.74-.07a8.44 8.44 0 002.79-.53 5.88 5.88 0 003.36-3.36 8.41 8.41 0 00.53-2.79c.06-1.23.07-1.62.07-4.74s0-3.52-.07-4.74a8.44 8.44 0 00-.53-2.79zm-1.54 12.18a6.38 6.38 0 01-.4 2.14A3.81 3.81 0 0130.78 33a6.35 6.35 0 01-2.14.4c-1.21.06-1.58.07-4.65.07s-3.43 0-4.65-.07a6.35 6.35 0 01-2.14-.4 3.81 3.81 0 01-2.2-2.22 6.35 6.35 0 01-.4-2.14c-.06-1.21-.07-1.58-.07-4.65s0-3.43.07-4.65a6.38 6.38 0 01.4-2.14 3.81 3.81 0 012.22-2.2 6.35 6.35 0 012.14-.4c1.21-.06 1.58-.07 4.65-.07s3.43 0 4.65.07a6.38 6.38 0 012.14.4 3.81 3.81 0 012.2 2.22 6.35 6.35 0 01.4 2.14c.06 1.21.07 1.58.07 4.65s-.05 3.42-.11 4.64z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-ig-full" xmlns="http://www.w3.org/2000/svg"><circle cx="24" cy="24" r="3.83"/><path d="M33 17.22A3.81 3.81 0 0030.78 15a6.38 6.38 0 00-2.14-.4c-1.21-.05-1.58-.07-4.65-.07s-3.43 0-4.65.07a6.35 6.35 0 00-2.14.4 3.81 3.81 0 00-2.2 2.22 6.38 6.38 0 00-.4 2.14c-.05 1.21-.07 1.58-.07 4.65s0 3.44.07 4.65a6.36 6.36 0 00.4 2.14 3.81 3.81 0 002.22 2.2 6.35 6.35 0 002.14.4c1.21.06 1.58.07 4.65.07s3.44 0 4.65-.07a6.35 6.35 0 002.14-.4 3.81 3.81 0 002.2-2.22 6.38 6.38 0 00.4-2.14c.06-1.21.07-1.58.07-4.65s0-3.43-.07-4.65a6.35 6.35 0 00-.4-2.12zm-9 12.69A5.91 5.91 0 1129.91 24 5.9 5.9 0 0124 29.91zm6.14-10.66a1.38 1.38 0 111.38-1.38 1.38 1.38 0 01-1.38 1.37z"/><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm11.43 26.74a8.41 8.41 0 01-.53 2.79 5.88 5.88 0 01-3.36 3.36 8.44 8.44 0 01-2.79.53c-1.23.06-1.62.07-4.74.07s-3.51 0-4.74-.07a8.44 8.44 0 01-2.79-.53 5.88 5.88 0 01-3.36-3.36 8.44 8.44 0 01-.53-2.79c-.06-1.23-.07-1.62-.07-4.74s0-3.52.07-4.74a8.44 8.44 0 01.53-2.79 5.88 5.88 0 013.36-3.36 8.44 8.44 0 012.79-.53c1.23-.06 1.62-.07 4.74-.07s3.51 0 4.74.07a8.43 8.43 0 012.79.53 5.88 5.88 0 013.36 3.36 8.44 8.44 0 01.53 2.79c.06 1.23.07 1.62.07 4.74s-.01 3.51-.07 4.74z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-ln-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><ellipse cx="16.07" cy="14.58" rx="2.56" ry="2.58"/><path d="M13.92 19h4.33v14h-4.33zM29.4 18.57a4.88 4.88 0 00-4.22 2.31V19H21v14h4.16v-7.35c0-2 .91-3.14 2.64-3.14s2.36 1.13 2.36 3.14V33h4.31v-8.86c.02-3.75-2.1-5.57-5.07-5.57z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-ln-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm-5.74 31h-4.34V19h4.33zm-2.19-15.83a2.58 2.58 0 112.56-2.58 2.57 2.57 0 01-2.56 2.58zM34.49 33h-4.31v-7.35c0-2-.77-3.14-2.36-3.14s-2.64 1.17-2.64 3.14V33H21V19h4.16v1.89a4.88 4.88 0 014.22-2.31c3 0 5.09 1.81 5.09 5.56z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-rss-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><path d="M20.7 31.18a2.85 2.85 0 11-2.85-2.81 2.84 2.84 0 012.85 2.81zM37 34a22 22 0 00-22-22v5a17.49 17.49 0 0114.92 8.2 16.65 16.65 0 012.49 8.8H37zm-7.78 0A14 14 0 0024 23.13 14.27 14.27 0 0015 20v4.2a9.94 9.94 0 018.67 5 9.79 9.79 0 011.25 4.8h4.3z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-rss-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm-6.15 32a2.81 2.81 0 112.85-2.81A2.84 2.84 0 0117.85 34zm11.37 0h-4.3a9.79 9.79 0 00-1.25-4.78 9.94 9.94 0 00-8.67-5V20a14.27 14.27 0 019 3.15A14 14 0 0129.22 34zM37 34h-4.59a16.65 16.65 0 00-2.49-8.72A17.49 17.49 0 0015 17.06V12a22 22 0 0122 22z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-tt-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><path d="M36 16.56a9.83 9.83 0 01-2.83.78 4.94 4.94 0 002.16-2.72 9.84 9.84 0 01-3.13 1.19 4.93 4.93 0 00-8.52 3.37 5 5 0 00.13 1.12 14 14 0 01-10.15-5.14 4.93 4.93 0 001.52 6.57 4.9 4.9 0 01-2.18-.62v.06A4.93 4.93 0 0016.91 26a4.9 4.9 0 01-1.3.17 5 5 0 01-.93-.09 4.93 4.93 0 004.6 3.42 9.91 9.91 0 01-7.29 2 14 14 0 0021.57-11.76v-.64A10 10 0 0036 16.56z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-tt-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm9.54 17.11v.64A14 14 0 0112 31.54a9.92 9.92 0 007.29-2 4.93 4.93 0 01-4.6-3.42 5 5 0 00.93.09 4.9 4.9 0 001.3-.17A4.93 4.93 0 0113 21.17v-.06a4.9 4.9 0 002.23.62 4.93 4.93 0 01-1.52-6.57 14 14 0 0010.15 5.14 5 5 0 01-.13-1.12 4.93 4.93 0 018.52-3.37 9.83 9.83 0 003.13-1.19 4.94 4.94 0 01-2.16 2.72 9.83 9.83 0 002.78-.78 10 10 0 01-2.46 2.55z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-yt-def" xmlns="http://www.w3.org/2000/svg"><path d="M32.58 16.83c-1.72-.45-8.59-.45-8.59-.45s-6.75 0-8.46.42a3 3 0 00-2.11 2A26.77 26.77 0 0013 24a26.77 26.77 0 00.42 5.24 3 3 0 002.11 2c1.72.46 8.46.42 8.46.42s6.75 0 8.46-.42a3 3 0 002.08-2A27.91 27.91 0 0035 24a28.42 28.42 0 00-.47-5.24 2.74 2.74 0 00-1.95-1.93zM21.26 27.38v-6.76L26.74 24z"/><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm0 41a19 19 0 1119-19 19 19 0 01-19 19z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-yt-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm10.54 27.24a3 3 0 01-2.08 2c-1.72.45-8.46.42-8.46.42s-6.75 0-8.46-.42a3 3 0 01-2.11-2A26.77 26.77 0 0113 24a26.77 26.77 0 01.42-5.24 3 3 0 012.11-2c1.72-.45 8.46-.42 8.46-.42s6.87 0 8.59.45a2.74 2.74 0 011.94 1.93A28.42 28.42 0 0135 24a27.91 27.91 0 01-.46 5.24z"/><path d="M21.25 27.38l5.5-3.38-5.5-3.38v6.76z"/></symbol><symbol viewBox="0 0 14 14" id="cd-icon--social-links--facebook" xmlns="http://www.w3.org/2000/svg"><path data-name="svgexport-14" d="M13.411 0H.589A.589.589 0 000 .589v12.822A.586.586 0 00.589 14h6.853V8.746H5.688V6.558h1.754V4.8a2.5 2.5 0 012.756-2.7 15.8 15.8 0 011.621.081v1.901h-1.105c-.884 0-1.091.42-1.091 1.032v1.444h2.188l-.442 2.188H9.623l.037 5.246h3.758A.589.589 0 0014 13.4V.589a.589.589 0 00-.589-.582"/></symbol><symbol viewBox="0 0 14 14" id="cd-icon--social-links--linkedin" xmlns="http://www.w3.org/2000/svg"><path data-name="Path 530" d="M12.968 0H1.032A1.007 1.007 0 000 1.032v12.01A.993.993 0 001.032 14h11.936A1.007 1.007 0 0014 12.968V1.032A1.007 1.007 0 0012.968 0zM4.274 11.716H2.137V5.379h2.137zM3.168 4.495a1.066 1.066 0 01-1.179-1.106 1.1 1.1 0 011.179-1.105 1.066 1.066 0 011.179 1.105c.074.664-.442 1.106-1.179 1.106zm8.695 7.221H9.726v-3.39c0-.884-.295-1.474-1.105-1.474a1.162 1.162 0 00-1.105.737 1.254 1.254 0 00-.074.516v3.537H5.305V5.305h2.137v.884a2.132 2.132 0 011.916-1.032c1.4 0 2.432.884 2.432 2.874v3.684z"/></symbol><symbol viewBox="0 0 17.219 14" id="cd-icon--social-links--twitter" xmlns="http://www.w3.org/2000/svg"><path data-name="svgexport-12" d="M14.531 1.141A3.492 3.492 0 0011.95 0a3.539 3.539 0 00-3.539 3.539 7.247 7.247 0 00.063.82A10.078 10.078 0 011.211.633a3.984 3.984 0 00-.508 1.766A3.634 3.634 0 002.281 5.36a3.359 3.359 0 01-1.578-.445v.062a3.555 3.555 0 002.836 3.469 7.632 7.632 0 01-.945.125l-.633-.063a3.547 3.547 0 003.281 2.461A7.469 7.469 0 01.82 12.484L0 12.42A10.086 10.086 0 005.422 14 9.966 9.966 0 0015.45 3.961c.016-.187 0-.336 0-.508a6.781 6.781 0 001.769-1.833 6.552 6.552 0 01-2.031.563A3.414 3.414 0 0016.711.222a7.051 7.051 0 01-2.211.883z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--user" xmlns="http://www.w3.org/2000/svg"><path d="M23 24h2a16 16 0 0116 16v4H7v-4a16 16 0 0116-16z"/><rect x="15" y="4" width="18" height="18" rx="9" ry="9"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--user--white" xmlns="http://www.w3.org/2000/svg"><path fill="#fff" d="M23 24h2a16 16 0 0116 16v4H7v-4a16 16 0 0116-16z"/><rect fill="#fff" x="15" y="4" width="18" height="18" rx="9" ry="9"/></symbol></svg>
\ No newline at end of file
+<svg class="cd-icons-sprite" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><symbol viewBox="0 0 42 42" id="cd-icon--about" xmlns="http://www.w3.org/2000/svg"><path d="M38 0H4a4 4 0 00-4 4v34a4 4 0 004 4h34a4 4 0 004-4V4a4 4 0 00-4-4zM24 35h-4a2 2 0 01-2-2V18h4a2 2 0 012 2zm-3-22a3 3 0 113-3 3 3 0 01-3 3z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--admin" xmlns="http://www.w3.org/2000/svg"><path d="M45 21h-1.25a19.867 19.867 0 00-3.668-8.84l.889-.888a3 3 0 10-4.242-4.243l-.89.889A19.868 19.868 0 0027 4.25V3a3 3 0 00-6 0v1.25a19.868 19.868 0 00-8.84 3.668l-.888-.889a3 3 0 10-4.243 4.243l.889.889A19.867 19.867 0 004.25 21H3a3 3 0 000 6h1.25a19.867 19.867 0 003.668 8.84l-.889.888a3 3 0 004.242 4.243l.89-.889A19.868 19.868 0 0021 43.75V45a3 3 0 006 0v-1.25a19.868 19.868 0 008.84-3.668l.888.889a3 3 0 104.243-4.243l-.889-.889A19.867 19.867 0 0043.75 27H45a3 3 0 000-6zM24 38a14 14 0 1114-14 14.016 14.016 0 01-14 14z"/></symbol><symbol viewBox="0 0 47.996 41.01" id="cd-icon--alert" xmlns="http://www.w3.org/2000/svg"><path class="ccls-1" d="M47.668 37.41L27.118 1.8a3.604 3.604 0 00-6.24 0L.328 37.41a2.398 2.398 0 002.08 3.6h43.18a2.398 2.398 0 002.08-3.6zm-23.67-3.4a2 2 0 112-2 2.006 2.006 0 01-2 2zm2-9a2 2 0 01-4 0v-11a2 2 0 114 0z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--arrow-down" xmlns="http://www.w3.org/2000/svg"><path d="M48 14a4 4 0 01-1.17 2.83l-20 20a4 4 0 01-5.66 0l-20-20a4 4 0 015.66-5.66L24 28.34l17.17-17.17A4 4 0 0148 14z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--arrow-down--highlighted" xmlns="http://www.w3.org/2000/svg"><path fill="#EB5C6D" d="M48 14a4 4 0 01-1.17 2.83l-20 20a4 4 0 01-5.66 0l-20-20a4 4 0 015.66-5.66L24 28.34l17.17-17.17A4 4 0 0148 14z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--arrow-up" xmlns="http://www.w3.org/2000/svg"><path d="M0 34a4 4 0 011.17-2.83l20-20a4 4 0 015.66 0l20 20a4 4 0 11-5.66 5.66L24 19.66 6.83 36.83A4 4 0 010 34z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--arrow-up--highlighted" xmlns="http://www.w3.org/2000/svg"><path fill="#EB5C6D" d="M0 34a4 4 0 011.17-2.83l20-20a4 4 0 015.66 0l20 20a4 4 0 11-5.66 5.66L24 19.66 6.83 36.83A4 4 0 010 34z"/></symbol><symbol class="hcd-icons-sprite" viewBox="0 0 0 0" id="cd-icon--cd-icons-sprite" xmlns="http://www.w3.org/2000/svg"/><symbol viewBox="0 0 64 64" id="cd-icon--creative-commons" xmlns="http://www.w3.org/2000/svg"><path d="M31.957.311c-8.682 0-16.322 3.213-22.226 9.203C3.653 15.678.354 23.666.354 32c0 8.422 3.212 16.236 9.29 22.313 6.078 6.078 13.978 9.377 22.313 9.377 8.334 0 16.409-3.299 22.66-9.463C60.521 48.41 63.646 40.683 63.646 32c0-8.595-3.125-16.408-9.116-22.399C48.453 3.523 40.639.311 31.957.311zm.086 5.73c7.12 0 13.458 2.691 18.406 7.641 4.862 4.861 7.466 11.286 7.466 18.318 0 7.119-2.518 13.371-7.379 18.146-5.123 5.035-11.721 7.727-18.493 7.727-6.858 0-13.283-2.691-18.232-7.641C8.862 45.283 6.084 38.772 6.084 32c0-6.858 2.778-13.369 7.727-18.406 4.862-4.948 11.113-7.553 18.232-7.553z"/><path id="ia" d="M31.635 26.734c-1.79-3.264-4.844-4.563-8.389-4.563-5.16 0-9.267 3.65-9.267 9.828 0 6.283 3.861 9.829 9.442 9.829 3.581 0 6.635-1.966 8.319-4.949l-3.931-2.001c-.878 2.105-2.212 2.738-3.896 2.738-2.914 0-4.248-2.422-4.248-5.617 0-3.193 1.124-5.616 4.248-5.616.842 0 2.527.456 3.51 2.563l4.212-2.212z"/><use xlink:href="#ia" transform="translate(18.281)"/></symbol><symbol viewBox="0 0 34 42" id="cd-icon--education" xmlns="http://www.w3.org/2000/svg"><path d="M33 0h-4v8l-3-1-3 1V0H0v42h33a.98.98 0 001-.95V.95A.98.98 0 0033 0zM6 38.5a.495.495 0 01-.5.5h-2a.495.495 0 01-.5-.5v-35a.495.495 0 01.5-.5h2a.495.495 0 01.5.5zM25.5 23h-13a1.5 1.5 0 010-3h13a1.5 1.5 0 010 3zm0-6h-13a1.5 1.5 0 010-3h13a1.5 1.5 0 010 3z"/></symbol><symbol fill="#e32700" viewBox="0 0 16 16" id="cd-icon--form-error" xmlns="http://www.w3.org/2000/svg"><path d="M8.002 1a7 7 0 100 14 7 7 0 000-14zm4.025 9.284c.062.063.1.149.1.239a.34.34 0 01-.1.24l-1.262 1.262a.34.34 0 01-.48 0L8.002 9.742l-2.286 2.283a.34.34 0 01-.48 0l-1.261-1.262a.336.336 0 010-.478L6.258 8 3.975 5.716a.34.34 0 010-.48l1.262-1.262a.34.34 0 01.48 0l2.285 2.284 2.283-2.284a.34.34 0 01.48 0l1.262 1.262c.062.063.1.149.1.24a.345.345 0 01-.1.24L9.744 8l2.283 2.284z"/></symbol><symbol viewBox="0 0 28 48" id="cd-icon--help" xmlns="http://www.w3.org/2000/svg"><circle class="lcls-1" cx="14" cy="44" r="4"/><path class="lcls-1" d="M28 14a14 14 0 00-28 0 4 4 0 008 0 6 6 0 116 6 4 4 0 00-4 4v9a4 4 0 008 0v-5.59A14.02 14.02 0 0028 14z"/></symbol><symbol viewBox="0 0 41.9 37" id="cd-icon--ocha-logo" xmlns="http://www.w3.org/2000/svg"><path class="mcls-1" d="M17.6 15.6a3.3 3.3 0 113.3 3.3v-.4a2.9 2.9 0 10-2.9-2.9 2.9 2.9 0 002.9 2.9v.4a3.33 3.33 0 01-3.3-3.3"/><path data-name="Shape" class="mcls-1" d="M15 15.6a6 6 0 116 6v-.4a5.6 5.6 0 10-5.6-5.6 5.59 5.59 0 005.6 5.6v.4a6 6 0 01-6-6"/><path data-name="Shape" class="mcls-1" d="M12.1 15.6a8.9 8.9 0 118.9 8.9V24a8.54 8.54 0 008.5-8.4 8.5 8.5 0 10-17 0A8.41 8.41 0 0021 24v.4a8.77 8.77 0 01-8.9-8.8"/><path data-name="Shape" class="mcls-1" d="M9.3 15.6A11.65 11.65 0 1121 27.2v-.4A11.2 11.2 0 109.8 15.6 11.18 11.18 0 0021 26.8v.4A11.63 11.63 0 019.3 15.6"/><path data-name="Shape" class="mcls-1" d="M6.3 15.6A14.7 14.7 0 1121 30.3v-.4A14.3 14.3 0 106.7 15.6 14.3 14.3 0 0021 29.9v.4A14.66 14.66 0 016.3 15.6"/><path class="mcls-1" d="M20.7 1.1h.4v11.4h-.4z"/><path data-name="Shape" class="mcls-1" d="M10.6 5.5l.3-.3 8 8-.3.3-8-8z"/><path data-name="Rectangle-path" class="mcls-1" d="M6.5 15.4h11.4v.4H6.5z"/><path data-name="Shape" class="mcls-1" d="M10.6 25.7l8-8 .3.3-8 8-.3-.3z"/><path data-name="Rectangle-path" class="mcls-1" d="M20.7 18.7h.4v11.4h-.4zM23.014 17.902l.283-.282 7.967 8.014-.284.282zM24.1 15.4h11.4v.4H24.1z"/><path data-name="Shape" class="mcls-1" d="M23 13.2l8.1-8 .2.3-8 8-.3-.3zM18.7 16.5c.1 0 .1.1.1.2h.1a2.51 2.51 0 00.4-.7.1.1 0 00.1-.1c0-.1-.2-.2-.2-.3-.1.2-.3 0-.4.1v.1h.1v.2a.37.37 0 00-.3-.1c.1 0 0 0 0 .1a.75.75 0 00-.5.1c-.1 0-.1 0-.2-.1-.1.1-.1.2-.2.2l-.1-.1c.1-.1.2-.1.2-.2v-.3c.1-.1.1-.2.2-.2s.3.1.4 0l.1.1v.1c-.1.1-.2.1-.2.2s0 .1.1.1.1-.1.2-.1h.4c.1 0 .1-.3 0-.4v-.2c0-.1.2-.1.2 0v.1s0 .1.1 0v-.2a.35.35 0 00.2.1h.2c.1 0 .1-.1 0-.2h-.1a.31.31 0 01-.2.1c-.1 0-.1-.1-.2-.1s-.2.1-.2 0-.1-.1-.1-.2l.1-.1a.37.37 0 00.3-.1.35.35 0 01.1-.2h.1a.37.37 0 00.3-.1c.1 0 .2-.1.3-.2s.1-.1.2-.1a.1.1 0 01.1-.1v-.5a.1.1 0 01.1-.1h-.1s-.1-.1 0-.1.2 0 .2-.1a.19.19 0 00-.1-.3c-.1-.1-.2 0-.3 0a.1.1 0 01-.1.1c-.1 0-.2-.1-.1-.2v-.1h-.1l-.3.3v.1c0 .1 0 .2-.1.2h-.1c0 .1.2.1.1.2s-.2.1-.4.2a2.72 2.72 0 01-.9 0h-.5c-.1 0-.1.1-.2.2v-.2c0-.1-.1 0-.1-.1-.2-.4-.7-.3-1.1-.3a.1.1 0 00-.1.1c-.1.1-.2 0-.3 0l-.1.1c-.1 0-.2-.1-.3 0s-.1.1-.2.1v.1h-.1c-.1 0-.3 0-.3.1s0 .3-.1.3a.6.6 0 00-.4.1c-.1 0-.1.1-.2.1a2.45 2.45 0 00-.4 1.2v.1c-.2.4-.3.6-.6 1.1-.1.2-.2.6 0 .7s0 .2-.2.2-.4 0-.4-.2-.2-.1-.3-.1h-.4c-.2 0-.2.3-.3.4s-.3.1-.3.2v.2a.1.1 0 00-.1.1v.1c0 .2-.1.3 0 .5v.1a.9.9 0 01-.1.5c-.1.2-.3.2-.5.2h-1c-.1 0-.1-.1-.2-.1a.31.31 0 01-.1-.2c-.1-.1-.3 0-.4.1.1 0 0 .1 0 .1s-.2.1-.3.2-.2-.2-.2-.3-.1-.1-.2-.1v.1h-.1c-.1.1.1.1.1.1v.1h-.1a.1.1 0 01-.1.1c-.1 0-.1.1-.1 0v-.2h-.1c0 .1 0 .1-.1.1v.1h.2a.37.37 0 01.1.3c0 .1 0 .2-.1.1s0-.2 0-.3h-.1c.1.2-.1.3.1.5s-.2.2-.1.2a.35.35 0 00.2.1v-.1s.1-.1.1 0v.1H8v.4c0 .1.2 0 .2.1s-.1.1 0 .2a.1.1 0 01.1.1v.1a.1.1 0 01.1.1c.1 0 .1 0 .1-.1s.1-.1.1-.2 0-.1-.1 0V21c0-.1-.1-.1-.1-.2s.1 0 .2-.1a.1.1 0 01.1.1v.1a.1.1 0 01.1.1c.1 0 .1.1.2.2h.3v-.1l.1.1a.37.37 0 00.1.3h.1l.1.1h.1a.1.1 0 01.1.1c.1 0 .2 0 .2.1s.1.2.2.4a29772.51 29772.51 0 01.2.2.37.37 0 00.3.1.35.35 0 01.2-.1h.1c.1.2.1.4.3.4s.1.1.2.2h.2a.1.1 0 00.1.1c.1.1.2.1.2.2v.1c.1 0 .2-.1.2 0s.2.1.2.2h.1v-.1c0-.1.1 0 .2-.1s.1-.2.1-.2.2.1.3.2h.1c.1.1.1.3.2.3s.2.1.4.2.2.1.3.1h.1c.1 0 .1 0 .2-.1s.3-.1.4-.2l.1-.1c.2-.1.5.1.7 0s.1 0 .2-.1.2-.3.1-.4-.2-.5-.3-.7l-.3-.3h-.1c-.1 0-.1-.1-.1-.2a.1.1 0 01-.1-.1v-.3c-.1 0-.2-.1-.4-.1a.1.1 0 01-.1-.1v-.1a.37.37 0 01.3-.1v-.3a.1.1 0 00-.1-.1c0-.1.1-.2 0-.3s-.2-.2-.2-.3a.1.1 0 01-.1-.1v-.5c0-.1-.1-.1 0-.2l.1-.1c.1 0 .1-.1.1-.2a.14.14 0 00-.2 0v-.3l-.1-.1v-.2s0-.1-.1 0v-.2c0-.1-.1-.2-.2-.1a.14.14 0 01-.2 0V18a.1.1 0 00.1-.1.14.14 0 000-.2c-.1-.1-.2-.2-.1-.3-.1 0-.3 0-.3-.2s0-.3-.1-.4v-.3a.1.1 0 01.1-.1c.2 0 .4 0 .4-.1s-.1-.3 0-.3.4 0 .6-.2c.1 0 .1-.1 0-.2a.35.35 0 00-.1-.2c-.1-.1-.2 0-.3-.2V15c0-.1.1-.1.2-.2s.3 0 .5.1l.1.1v.1c0 .2.1.4 0 .6s-.1.1-.1.2h.1c0 .1.1.3 0 .4s-.1 0-.3 0-.1 0-.1.1l.1.1c.4.1.5.1.9.2.1 0 .1.1.2.1h.3a.1.1 0 00.1.1c.1.1.1.3.2.3a.14.14 0 01.2 0c-.1.1 0 .2 0 .3s.2.1.3.2.2.1.2 0-.1-.2 0-.3c.1.2 0 .4.1.6.1.1.1.2.2.2s.1-.1.1-.2v-.1c0-.1 0-.1.1-.2s.1-.2.1-.3v-.1c0-.1.2-.2.3-.2V17c.1 0 0-.2.1-.2s.1-.1.1-.2.1-.1 0-.1c.5.1.5 0 .5 0"/><path data-name="Shape" class="mcls-1" d="M14.5 16.3h-.1v.1l.1.1v.3c0 .1.1.2.2.1s.2-.3.1-.4-.1-.1-.3-.2M14.3 17.2c.1.2.2.1.3.1v-.1c-.1-.1-.1-.1-.3 0 .1-.1 0-.1 0-.1v.1M14.6 17.6c0-.2-.1-.2-.2-.1s0 .3.1.4a.1.1 0 00.1.1c0 .1.1 0 .2 0s0-.1.1-.1c-.1-.1-.2-.3-.3-.3"/><path data-name="Shape" class="mcls-1" d="M14.3 16.8c0-.1-.1-.1 0 0-.1 0-.1 0-.1.1s0 .2.1.2a.1.1 0 00.1-.1c-.1-.1-.1-.1-.1-.2M14.7 17.4l.1-.1h.1v-.1c-.1 0-.1.1-.2.1s0 .1 0 .1M14.6 18.3c0 .1 0 .1.1.1h.1v-.1h-.2M14.8 19c0-.1.1-.1 0-.2h-.1a.35.35 0 00.1.2M8.5 21.5v.1h.2c-.1 0-.1-.2-.2-.1M9.1 22.2c-.1.1.1.2.2.2v-.2a.14.14 0 00-.2 0M9.4 22.6c0 .2.1.3.2.3.1-.2 0-.3-.2-.3M19.5 17.4a1.27 1.27 0 01.6-.1c.4 0 .4-.6.6-.9a.6.6 0 00-.1-.4c-.1-.2-.6 0-.7-.2s.3.1.3-.1 0-.1-.1-.2h-.2a2 2 0 00-.4.8 5.38 5.38 0 00-.9 1.2c0 .1 0 .1.1.2.3.1.6-.2.8-.3M21.3 16.4c-.1 0-.1 0-.2.1v.2h.1c0-.1 0-.1-.1-.1.2-.1.2-.2.2-.2M20 17.9c.1.2.5.1.5 0s-.3-.2-.4-.2.1.1-.1.2M20.5 19.2a.37.37 0 00.1-.3l-.3.3h.2M22.3 16.5v-.1h-.2c-.1 0-.1-.1-.1-.2s-.1-.2-.1-.3-.1.2-.1.2c.2.2.3.5.5.4M19.9 15.3c-.1-.1-.1 0 0 0-.1.1 0 .1 0 0M8.1 19.1A.1.1 0 008 19h-.1v.1a.14.14 0 00.2 0M8.8 19.1c.1 0 .2-.1.1-.2s-.3 0-.2.1c-.1.1 0 .2.1.1M20.2 12.1c0-.1.1-.1.1-.2h-.1c-.1 0-.1.1 0 .2M20.5 12s.1-.1 0-.1h-.1a.1.1 0 00.1.1M19.4 14.6c0 .1.2.3.3.2a.14.14 0 000-.2.19.19 0 00-.3 0M19.7 15.4v-.1h-.3a.1.1 0 00.1.1c0-.1.1 0 .2 0M19.4 15.6c-.1 0 0 .1 0 .2s.1 0 .2-.1.1-.2 0-.2-.2 0-.2.1M19.2 15.3c0 .1-.1.2 0 .3s.1 0 .1 0 0-.2.1-.2h-.1v-.1h-.1M26.8 22.4c.1 0 0-.1 0 0"/><path data-name="Shape" class="mcls-1" d="M21 18.5l-.1-.1c0-.1-.1.1-.2 0 .1.1 0 .1-.1.2a.1.1 0 00.1.1c0 .1-.1.1 0 .2l-.1.1s-.1.1 0 .1.2-.1.3-.1h.1c.1 0 .1-.1.2-.2H21s-.1 0 0-.3M21.6 20.4c0 .1.1.1 0 0 .1 0 .1-.1.1-.2h-.1v.2M21.7 20.2c.1 0 0-.1 0-.1h-.1a.1.1 0 00.1.1M22.3 20.5c-.1 0-.1-.1-.2 0H22v.1c.2-.1.2-.1.3-.1M23.3 20.4v-.1c-.1 0-.2.1-.3 0v.1h-.1c.2.1.3 0 .4 0M23.7 20c0 .2.2.1.2 0s0-.1-.2 0l.1-.1a.1.1 0 01-.1.1M28.5 16.8c0 .1.1.1.2.1a.37.37 0 00.3-.1.27.27 0 00-.3-.3c-.2.1-.2.2-.2.3M28.5 21.9h-.1c-.1.5-.6 1.2 0 1.5.2.2.5-.1.6-.3s0-1-.5-1.2M27 19.7c-.1 0-.1.2 0 .2a.1.1 0 00.1-.1v-.1H27M27.4 24.8v.2s.2-.1 0-.2M29.7 13.1h-.1v.2c-.2.4-.7.9-.4 1.4a1.38 1.38 0 00.3-.4 10.37 10.37 0 00.4-1s-.1-.2-.2-.2M28.8 14.9c0 .1 0 .1.1.1s.1-.1 0-.1 0-.1-.1 0M23.7 11.8c-.1-.2-.2 0-.3 0l-.1-.1h-.1c-.1 0 0 .2.1.2s.1-.1.1 0 0 .3.2.2.2-.1.3-.1.1-.1.1-.2.2-.1.3 0a.1.1 0 00.1.1c0 .1.1.1.2.1a.37.37 0 00.3-.1.19.19 0 000-.3h-.2c-.1 0-.1-.1-.2-.1-.4-.1-.6.2-.8.3M22.7 12h.3c0-.2-.2-.1-.3-.1.1-.1.1 0 0 .1"/><path data-name="Shape" class="mcls-1" d="M23.1 12.6c.1-.1.3-.2.4-.3v-.1c0-.1-.1-.1-.2-.2a.1.1 0 01-.1.1c-.1.1-.2.1-.2.2v.2c.1.3.1.2.1.1M21.6 11.6v.1c.1.1.1 0 0-.1M18 9.4a.6.6 0 00.4.1l.1-.1c-.1-.1-.2 0-.2-.1h-.1c-.1-.1-.2 0-.2.1M27.1 11c0 .1-.1 0-.2.1v.1c.1.1.2 0 .3 0s.1-.1.1 0v.1a.1.1 0 00-.1.1h-.3v.2c-.1.1-.4.2-.3.4a.75.75 0 00.5.1c0-.2.1-.2.2-.3a.1.1 0 00-.1-.1v-.1a.1.1 0 00.1-.1v-.1a.35.35 0 00.2-.1c0-.1-.1-.2-.1-.3a.1.1 0 01.1-.1v-.1h-.1s-.1 0 0 .1a.37.37 0 00-.3.1c0-.2.1 0 0 0M26.1 12c0 .1.1.1.2 0h-.2M27.5 11.8c-.1.1.1.1.2.1 0-.1-.1-.1-.2-.1M27.9 11.3c-.1 0-.1.1 0 0M25.6 7.3c.1.1.2.1.2.2v.4l.1.1v.2c0 .1.1.3.1.4a.1.1 0 01.1.1c0 .1 0 .1.1.2s.1 0 .2.1.2.3.3.4a.1.1 0 01.1.1v.1c.2 0 .5.1.4.4.1-.1.2-.1.2-.2s.1-.3 0-.4l-.2-.2V9a.1.1 0 00-.1-.1c0-.1-.1-.3.1-.3v-.1H27v-.1a.35.35 0 00-.4-.4c-.1-.1-.1-.1-.2-.1h-.2a2.09 2.09 0 01-.4-.6.19.19 0 00-.3 0c.1-.1.1-.1.1 0"/><path data-name="Shape" class="mcls-1" d="M24.7 7.6a.14.14 0 000 .2h.4a.1.1 0 00.1-.1c.1-.1.2 0 .4-.1 0 .1 0 .1.1.1s0-.2-.1-.2-.1-.2-.2-.3h-.1c0 .2-.1.1-.3.2v.1-.1h-.2a.35.35 0 01-.1.2M22.4 3.7c-.1-.2-.3-.4-.2-.7a1.39 1.39 0 00.9 0c.2-.1.5 0 .7-.1v-.2c-.3.1-.5-.2-.7-.1a3.18 3.18 0 01-.9.3c-.2.1-.9 0-.9.4.3 0 .7 0 .9.3 0 .1.1.1.2.1M23.4 5.2a.4.4 0 00.4.2c0-.1 0-.1-.1-.2h-.3M23.1 5.7c-.1 0 0 .1.1.2 0-.1.1-.3-.1-.2M22.9 5.4c.1-.1 0-.2-.1-.2v.1l.1.1M23.8 6.5a.31.31 0 00.1-.2h-.1a.14.14 0 000 .2M24.1 6.5v.1c.1.1.1 0 0-.1.1 0 0 .1 0 0M24 6.8l.1-.1c0-.1-.1-.1-.2 0s.1 0 .1.1M24.1 6.8c0 .1.1.2.2.1s.1-.1 0-.1zM24.6 7a.35.35 0 00-.1-.2s-.1.1 0 .1 0 .1.1.1M24.7 7.3h.1v-.2h-.2v.1l.1.1M24.5 7.5c.1-.1.1-.1 0-.2h-.1a.1.1 0 01-.1.1c.1.1.1.1.2.1M24.2 2.5c-.1-.1-.1-.1-.2-.1.1.1.1.2.2.1M27.6 5c.1.1.2 0 .2.1s.1.2.2.2.1 0 .1-.1 0-.4-.2-.4h-.5c-.1 0-.1.1-.1.2a.19.19 0 01.3 0"/><path data-name="Shape" class="mcls-1" d="M31.7 10.2c-.1-.1-.1-.3-.2-.4s-.2-.1-.3-.2v-.2l-.1-.1c-.1-.2-.1-.3-.3-.3 0-.2-.1-.2-.3-.3v-.1a.1.1 0 00-.1-.1h-.1c-.1-.1-.2-.2-.2-.3s-.2-.2-.3-.3l-.1-.1c-.1 0-.2 0-.2-.1s-.2-.3-.3-.4 0-.4-.1-.7c0-.1-.1-.1-.2-.1a.1.1 0 01-.1-.1c-.1-.1 0-.3-.1-.4s-.3-.3-.4-.5a.37.37 0 00-.3-.1h-.1l-.1-.1c-.1-.1-.2-.2-.3-.2s-.4 0-.6-.1-.4 0-.5.2-.3.2-.5.2 0 .1 0 .2-.2.2-.1.2h.2a.1.1 0 01.1.1c.1.1.2.2.2.3a.14.14 0 000 .2.37.37 0 01.1.3c0 .1.1 0 .1 0a.25.25 0 01.1.4v.3c.1.2.1.4.2.5l.1-.1c.1 0 .1-.1.2-.1.2-.2.4.2.5.3s0 .4.1.6a1.38 1.38 0 00.3.4.31.31 0 00.1.2l.1.1a.1.1 0 01.1-.1h.1c.2.2.2.6.5.6a.1.1 0 00.1.1c.1 0 .1-.1.2 0a.35.35 0 00.1.2h.3c.1 0 .1.1.2.2l.1.1c.2.2.3.5.5.7s.2.2.3.1v-.1a.22.22 0 00.2-.2l.3-.3c.1-.1.2-.1.3-.2.3 0 .2-.2.2-.2M27.5 10.3c0 .1.1.1.2.1s.1.2.2.2.1-.1.1-.2h.1c.1-.1 0-.3-.1-.4s-.1-.2-.3-.2-.1 0-.2.1 0 .2 0 .3v.1M28.2 10.7c-.1.2 0 .4 0 .6s-.2.1-.2.2a.14.14 0 000 .2c0 .1.2.1.3.2a1.17 1.17 0 01.6.6.37.37 0 01.1.3c.1.1.2.1.2.2s.1.1.1 0a.3.3 0 000-.4c-.1-.1-.1-.1-.1-.2a2.35 2.35 0 00-.2-.8l-.3-.3v-.1c0-.1.1-.1.1-.2s-.1-.2-.2-.3c-.2-.1-.3-.1-.4 0M29.7 12.1v-.2c0-.2-.2-.2-.3-.2h-.1v.2a2.93 2.93 0 01.3 1c0 .1.3 0 .3-.1v-.2c0-.1-.1-.1-.1-.2s-.1-.2-.1-.3M29.3 11.2c-.1.1 0 .2 0 .3.1 0 .1 0 .1-.1s0-.1-.1-.2M29.3 11c0-.1 0-.1-.1-.1s-.1.1-.2.1 0 .1.1.2c.2 0 .3-.1.2-.2M28.8 10.5c.1.1 0 .2.1.2s.2.1.3 0 0-.1-.1-.1v-.1H29c-.1-.1.1-.1 0-.2v-.1h-.1v.1c-.1.1-.2.2-.1.2M28.7 9.9c-.1 0-.2 0-.2-.1h-.1s-.1.1 0 .1a.1.1 0 01.1.1c0 .1.1 0 .1.1s.1.1.1 0V10s.1-.1 0-.1M21.6 14.5a.14.14 0 000-.2.1.1 0 00-.1.1c.1 0 .1 0 .1.1"/><path data-name="Shape" class="mcls-1" d="M29.4 13.2a.6.6 0 00-.4.1c-.2.1-.3.4-.4.6a.52.52 0 01-.4.2.1.1 0 01-.1-.1v-.2l.1-.1c.1-.1 0-.2 0-.3s-.3-.4-.5-.3-.3.3-.5.5c-.1-.1-.2-.2-.2-.3v-.1c.1 0 .2.2.2.1s0-.2-.1-.2-.1-.1-.2-.1-.1-.1-.2-.2 0-.3-.1-.3a.37.37 0 01-.3-.1h-.2v-.1c.1 0 .3 0 .2-.2s-.1-.1-.2-.1H26v.3a.37.37 0 01-.3.1h-.1c-.1 0-.2-.1-.3-.1s-.1.2-.2.2-.1 0-.2.1-.1.2 0 .3v.1a.1.1 0 01-.1-.1c0-.1-.1-.2-.1-.3s.1-.2.2-.3v-.2c-.1-.1-.1-.1-.2-.1s-.3.4-.5.3-.2-.2-.3-.2-.1-.1-.2 0a2.19 2.19 0 01-.5.3c-.1.1-.3.2-.3.4a.38.38 0 01-.6.1c-.1-.1-.2-.2-.3-.2s-.2.2-.3.2-.1 0-.2-.1v-.1l.6-.3c.1 0 .1-.1.1-.2V12a.68.68 0 00-.6.4.1.1 0 01-.1.1c-.2 0-.3.1-.5 0l-.1-.2c-.1.1-.1.2-.2.2l-.1.1c-.1.1.1.3 0 .4s-.2.1-.3.1v.2c0 .1.1 0 .1.1s.1.3.2.3.3 0 .5.1.2.1.3.2.1.1.1.2a.1.1 0 00.1.1h.2c.1 0 0 .1.1.2a.76.76 0 00.1.4s0 .2-.1.2a.1.1 0 00-.1.1v.3h.1c.1.1.1.2.2.3l.1.1a.1.1 0 00-.1.1.14.14 0 00.2 0c.1 0 .1-.1.2-.1a.1.1 0 00.1-.1.35.35 0 01.1.2c-.1.1-.3 0-.4.1s-.1 0-.2.1a.1.1 0 00.1.1c.2.1.1.4-.1.6v.2H22c-.2 0-.5-.1-.7 0s-.1.1-.1.2a.1.1 0 00-.1.1v.2c-.2.2-.2.5-.3.7a.1.1 0 00.1.1c.1 0 .1-.1.2-.1s.1.2.1.2.2.1.2 0a.37.37 0 01.1-.3c0-.1-.1-.2-.1-.3s0-.2.1-.2a.1.1 0 01.1.1v.4a.14.14 0 010 .2.1.1 0 01-.1.1v.2c-.1.1-.1.1-.1.2-.2 0-.4-.1-.3-.3-.1 0-.1 0-.2.1v.3c-.1.1-.1.2-.2.3v.1c-.1.1-.2.2-.3.2-.1.1-.2 0-.2.1s.1.2.1.3 0 .1-.1.2h-.4a.37.37 0 01-.1.3c-.1.1 0 .2.1.2s.1.2.2.2.1.1.2.1a.22.22 0 00.2-.2c0-.1.1 0 .2 0h.1a.14.14 0 000-.2l.4-.4c.1 0 .1-.1.2-.1s.1.1.2.1.1.1.2.1h.1c.1 0 .2.2.3.2a.37.37 0 00-.1-.3c-.1-.1-.2-.2-.3-.2v-.1c.1.1.1.1.2.1s.1.2.2.3.1.1.2.1a.37.37 0 00.3-.1c0-.1 0-.1-.1-.1s0-.1.1-.2 0-.2 0-.3v-.1c.1-.1 0-.2 0-.4 0 .1.1.1.2.1a.22.22 0 00.2-.2.19.19 0 01.3.1c0 .1 0 .2-.1.2a.76.76 0 00-.5.2l-.1.1c-.1.1-.1.1-.1.2l-.1.1a.1.1 0 01.1.1.37.37 0 00.3-.1v-.2c.1 0 .1-.1.2-.1s.3.2.2.3h-.1c-.1.1-.2.3-.3.3s-.5.1-.7.2-.1.2-.2.2-.2.1-.3 0c0 .1-.2 0-.3 0a.31.31 0 00-.1-.2h-.1v-.1h-.8a.1.1 0 00-.1.1l-.1.1a.37.37 0 01-.3.1.37.37 0 00-.3.1c-.2 0-.3.2-.4.3a.37.37 0 01-.3.1v.1c-.2 0-.3.3-.4.5v.2c-.1.1-.1.3-.3.4v.1c.1.2.3.3.5.5a.1.1 0 00.1.1c.1.1.1.2.2.4s.3.2.5.2a.35.35 0 01.2.1c.2 0 .5.1.7 0 .3.1.7 0 1 .1.1 0 .1.1.1.2s.2.3.3.4a.6.6 0 00.4.1.31.31 0 00.1.2c0 .1 0 .1.1.2s.1.1.1.2-.1.2-.1.4v.2a2.65 2.65 0 00.6.5s.1 0 0 .1c.1 0 .1.1.2.2s0 .1.1.2l.3.3a.6.6 0 00.4.1.1.1 0 01.1.1c.1 0 .3.1.4 0s.1-.2.2-.2a.6.6 0 01.4-.1.1.1 0 00.1-.1c0-.1.1-.1.1-.2s.2-.1.3-.1.3-.3.5-.4.4-.1.5-.2 0-.4 0-.6.1-.2.1-.3v-.5c0-.1-.1-.2-.1-.3s.1-.1.2-.1.1-.3.2-.4a.1.1 0 00.1-.1c.1 0 0-.1 0-.2a.1.1 0 01-.1-.1 1.21 1.21 0 00-.5-.5.1.1 0 01-.1-.1v-.1c-.1 0 0-.1-.1-.1h.1c.1-.1.1-.3.2-.4a.1.1 0 00.1-.1v-.3c-.1-.1 0-.3 0-.4a2.2 2.2 0 00-.1-.8c0-.1-.1-.1-.2-.1a.1.1 0 01-.1.1.31.31 0 01-.1.2c0 .1-.2.1-.2.2s0 .1-.1.2l-.1.1c.4-.3.3-.3.3-.2h-.3a14.24 14.24 0 00-1.6-.5h.3c.1 0 0-.1 0-.1s.2.1.3.2.5.1.7.2.3.2.5.2.3-.1.4-.1v-.1c.1-.1.2-.2.2-.3v-.3l.1-.1v-.4a.1.1 0 00.1-.1v-.3a.75.75 0 00-.1-.5c0-.1-.1-.1-.2-.1a.1.1 0 01-.1.1c-.1 0-.2 0-.2.1a.1.1 0 00-.1.1.52.52 0 01-.4.2c-.1 0-.2 0-.2-.1s.2-.2.4-.2l.1-.1a.22.22 0 01.2-.2h.2c.1 0 .1-.1.2-.1a.31.31 0 01.1-.2c0-.1.1-.1.2-.2s.1-.4.2-.6 0 .1.1.2a.19.19 0 00.3 0c.1-.1 0-.2.1-.2h.1c.1 0 .1.1.2.1a.35.35 0 01.2-.1h.3c.2-.1.6 0 .6-.2a.86.86 0 00-.6-.7c-.2-.1-.1-.4-.3-.6-.1 0 0-.1-.1-.2l-.1-.1-.1-.1v-.5c0-.1.1-.1.2-.1s.2-.1.2-.2v-.4l.1-.1c.2 0 .5.1.7-.1.1 0 .1-.1.1-.2a1 1 0 00.4-.8c-.1.1 0 .1 0-.1.1.1.1 0 0 0m-4.5 5.4c-.1.1-.1.1-.2 0s-.1-.1-.1-.2-.1 0-.1.1h-.2c0-.1-.1-.1-.1-.2s0-.2.1-.2.1 0 .1.1v.1c.1.1.1 0 .2 0h.3c0 .1.1.2 0 .3M15.6 36c1.3-1.9 5.2-3.9 9-3.9s8 2.2 9.6 1a8.38 8.38 0 01-5.1 1.4c-3.4 0-4.7-1.7-7-1.7s-4.8 1.9-5.9 3.5zM27.7 31.8a5.34 5.34 0 001.7-1.9 14.44 14.44 0 013.7-4.4s-1.7 5.5-3.5 5.7c0 0-.3.2.2.1s2.8-.9 3.6-1.1a8.58 8.58 0 003.3-1.1 1.48 1.48 0 01.8-.4s-2.2 3.7-6.2 3.7a17.1 17.1 0 01-3.6-.6"/><path data-name="Shape" class="mcls-1" d="M32.4 29.9a3.92 3.92 0 00.5-1.7 14.64 14.64 0 012.7-6.3s.3 4.3-1.9 7c0 0-.1.4.1.1a22.93 22.93 0 014.6-3.9s1.5-1.3 1.6-1.7c0-.1-1.2 6.1-7.6 6.5"/><path data-name="Shape" class="mcls-1" d="M36.1 25.8a5.62 5.62 0 00.2-1.3c0-.6-.3-2.6-.3-3.5a7.53 7.53 0 01.8-3.7 4.5 4.5 0 00.2 1.4 12.29 12.29 0 01.5 2.5 10.27 10.27 0 01-.4 2.5 2.13 2.13 0 00.6-.8 12.81 12.81 0 012.2-2.8 5.62 5.62 0 001.4-2.1 6.08 6.08 0 01-1.2 4.1c-1.5 2.1-2.1 1.8-2.9 2.6a11.41 11.41 0 01-1.1 1.1"/><path data-name="Shape" class="mcls-1" d="M38.4 20.9a3.87 3.87 0 00-.3-1.6 10.5 10.5 0 01-1.3-5.9s.2-.2.6 1 1 1.6 1.2 2.8a12 12 0 01.2 1.7s.1.2.1 0a9 9 0 01.8-3.2c.7-1.5 1.6-2.9 1.5-3.9 0 0 .4 0 .3 1.6.1 1.6-.3 4.4-3.1 7.5"/><path data-name="Shape" class="mcls-1" d="M39.2 16.1a12 12 0 00-.8-1.5c-.3-.4-2.7-3.7-2.9-5.3 0 0 .2-.1.4.3a12.94 12.94 0 001.5 1.7 5 5 0 011.5 2.8s.1.1-.1-2.1.7-3.7-.1-5.3c0 0 1.1.2 1.7 4.8a9.68 9.68 0 01-.9 3.6c.1-.1-.2 1-.3 1"/><path data-name="Shape" class="mcls-1" d="M38.3 11a9.94 9.94 0 00-1.6-1.3 9.58 9.58 0 01-3.3-4.3s.1-.2.8.7c.5.7 1.1.4 2.7 2.4 0 0 .2.5.3.4s-.1-.5-.1-.5-.1-1.2-.1-1.6a15.83 15.83 0 00-.9-3.1 5.82 5.82 0 012.5 4.7c-.1 0-.2 2.5-.3 2.6"/><path data-name="Shape" class="mcls-1" d="M36.5 7.3s.1-3-3.8-4.6c0 0 1.4 2.8 2.4 3.5a11.57 11.57 0 011.4 1.1M26.3 36c-1.3-1.9-5.2-3.9-9-3.9s-8 2.2-9.6 1a8.38 8.38 0 005.1 1.4c3.4 0 4.7-1.7 7-1.7s4.8 1.9 5.9 3.5zM14.2 31.8a5.34 5.34 0 01-1.7-1.9 14.44 14.44 0 00-3.7-4.4s1.7 5.5 3.5 5.7c0 0 .3.2-.2.1s-2.8-.9-3.6-1.1a8.58 8.58 0 01-3.3-1.1 1.24 1.24 0 00-.8-.4s2.2 3.7 6.2 3.7a17.1 17.1 0 003.6-.6"/><path data-name="Shape" class="mcls-1" d="M9.5 29.9a3.92 3.92 0 01-.5-1.7 14.64 14.64 0 00-2.7-6.3s-.3 4.3 1.9 7c0 0 .1.4-.1.1a22.93 22.93 0 00-4.6-3.9S2 23.8 1.9 23.4c0-.1 1.2 6.1 7.6 6.5"/><path data-name="Shape" class="mcls-1" d="M5.8 25.8a5.62 5.62 0 01-.2-1.3c0-.6.3-2.6.3-3.5a7.53 7.53 0 00-.8-3.7 4.5 4.5 0 01-.2 1.4 12.29 12.29 0 00-.5 2.5 10.27 10.27 0 00.4 2.5 2.13 2.13 0 01-.6-.8A12.81 12.81 0 002 20.1 5.62 5.62 0 01.6 18a6.08 6.08 0 001.2 4.1c1.5 2.1 2.1 1.8 2.9 2.6.1 0 1 1.1 1.1 1.1"/><path data-name="Shape" class="mcls-1" d="M3.5 20.9a6.93 6.93 0 01.3-1.6 10.5 10.5 0 001.3-5.9s-.2-.2-.6 1-1 1.6-1.2 2.8a8.18 8.18 0 00-.3 1.7s-.1.2-.1 0a9 9 0 00-.8-3.2C1.4 14.2.5 12.8.6 11.8c0 0-.4 0-.3 1.6a11 11 0 003.2 7.5"/><path data-name="Shape" class="mcls-1" d="M2.7 16.1a12 12 0 01.8-1.5c.3-.4 2.7-3.7 2.9-5.3 0 0-.2-.1-.4.3a12.94 12.94 0 01-1.5 1.7A5 5 0 003 14.1s-.1.1.1-2.1-.7-3.7.1-5.3c0 0-1.1.2-1.7 4.8a9.68 9.68 0 00.9 3.6c-.1-.1.2 1 .3 1"/><path data-name="Shape" class="mcls-1" d="M3.6 11a9.94 9.94 0 011.6-1.3 9.58 9.58 0 003.3-4.3s-.1-.2-.8.7c-.5.7-1.1.4-2.7 2.4 0 0-.2.5-.3.4s.1-.5.1-.5a13.88 13.88 0 00.3-1.7A15.83 15.83 0 016 3.6a5.82 5.82 0 00-2.5 4.7 12.21 12.21 0 00.1 2.7"/><path data-name="Shape" class="mcls-1" d="M5.4 7.3s-.1-3 3.8-4.6c0 0-1.4 2.8-2.4 3.5a11.57 11.57 0 00-1.4 1.1"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--search" xmlns="http://www.w3.org/2000/svg"><path d="M46.829 41.172L38.4 32.744a21.018 21.018 0 10-5.657 5.657l8.427 8.427a4 4 0 005.658-5.656zM8 21a13 13 0 1122.325 9.046c-.05.045-.106.078-.154.126s-.08.104-.125.154A12.992 12.992 0 018 21z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--selected" xmlns="http://www.w3.org/2000/svg"><path d="M18.5 39.75a4 4 0 01-2.83-1.17l-12.5-12.5a4 4 0 015.66-5.66l9.67 9.67L39.17 9.42a4 4 0 015.66 5.66l-23.5 23.5a4 4 0 01-2.83 1.17z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--selected--highlighted" xmlns="http://www.w3.org/2000/svg"><path fill="#80CBFF" d="M18.5 39.75a4 4 0 01-2.83-1.17l-12.5-12.5a4 4 0 015.66-5.66l9.67 9.67L39.17 9.42a4 4 0 015.66 5.66l-23.5 23.5a4 4 0 01-2.83 1.17z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-fb-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><path d="M29.16 13h-3.52c-2.09 0-4.41.88-4.41 3.9v3.2h-2.41v3.84h2.49V35h4.57V23.87h3l.27-3.78h-3.34v-2.17c0-1.2 1.24-1.13 1.32-1.13h2V13z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-fb-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm4.9 21.87h-3V35h-4.59V23.94h-2.49V20.1h2.41v-3.2c0-3 2.32-3.9 4.41-3.9h3.52v3.79h-2c-.07 0-1.32-.07-1.32 1.13v2.17h3.37z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-ln-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><ellipse cx="16.07" cy="14.58" rx="2.56" ry="2.58"/><path d="M13.92 19h4.33v14h-4.33zM29.4 18.57a4.88 4.88 0 00-4.22 2.31V19H21v14h4.16v-7.35c0-2 .91-3.14 2.64-3.14s2.36 1.13 2.36 3.14V33h4.31v-8.86c.02-3.75-2.1-5.57-5.07-5.57z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-ln-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm-5.74 31h-4.34V19h4.33zm-2.19-15.83a2.58 2.58 0 112.56-2.58 2.57 2.57 0 01-2.56 2.58zM34.49 33h-4.31v-7.35c0-2-.77-3.14-2.36-3.14s-2.64 1.17-2.64 3.14V33H21V19h4.16v1.89a4.88 4.88 0 014.22-2.31c3 0 5.09 1.81 5.09 5.56z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-tt-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><path d="M36 16.56a9.83 9.83 0 01-2.83.78 4.94 4.94 0 002.16-2.72 9.84 9.84 0 01-3.13 1.19 4.93 4.93 0 00-8.52 3.37 5 5 0 00.13 1.12 14 14 0 01-10.15-5.14 4.93 4.93 0 001.52 6.57 4.9 4.9 0 01-2.18-.62v.06A4.93 4.93 0 0016.91 26a4.9 4.9 0 01-1.3.17 5 5 0 01-.93-.09 4.93 4.93 0 004.6 3.42 9.91 9.91 0 01-7.29 2 14 14 0 0021.57-11.76v-.64A10 10 0 0036 16.56z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-tt-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm9.54 17.11v.64A14 14 0 0112 31.54a9.92 9.92 0 007.29-2 4.93 4.93 0 01-4.6-3.42 5 5 0 00.93.09 4.9 4.9 0 001.3-.17A4.93 4.93 0 0113 21.17v-.06a4.9 4.9 0 002.23.62 4.93 4.93 0 01-1.52-6.57 14 14 0 0010.15 5.14 5 5 0 01-.13-1.12 4.93 4.93 0 018.52-3.37 9.83 9.83 0 003.13-1.19 4.94 4.94 0 01-2.16 2.72 9.83 9.83 0 002.78-.78 10 10 0 01-2.46 2.55z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--user" xmlns="http://www.w3.org/2000/svg"><path d="M23 24h2a16 16 0 0116 16v4H7v-4a16 16 0 0116-16z"/><rect x="15" y="4" width="18" height="18" rx="9" ry="9"/></symbol></svg>
\ No newline at end of file
diff --git a/html/themes/custom/common_design_subtheme/img/icons/copyurl.svg b/html/themes/custom/common_design_subtheme/img/icons/copyurl.svg
deleted file mode 100644
index 6c115b4c5..000000000
--- a/html/themes/custom/common_design_subtheme/img/icons/copyurl.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg data-name="Component 10 – 110" xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path data-name="Path 533" d="M12.635 1.365a4.674 4.674 0 00-6.6 0L5.02 2.381a.718.718 0 001.015 1.015L7.05 2.38a3.232 3.232 0 114.571 4.571l-1.015 1.015a.718.718 0 101.015 1.015l1.015-1.015a4.673 4.673 0 00-.001-6.601zm-4.668 9.239L6.952 11.62a3.232 3.232 0 01-4.571-4.571l1.015-1.016a.718.718 0 10-1.015-1.015L1.365 6.033a4.668 4.668 0 006.6 6.6l1.015-1.016a.718.718 0 10-1.015-1.015zm.86-6.446L4.158 8.826a.718.718 0 101.015 1.016l4.669-4.668a.718.718 0 00-1.015-1.016z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/expand-left.svg b/html/themes/custom/common_design_subtheme/img/icons/expand-left.svg
deleted file mode 100644
index 143213203..000000000
--- a/html/themes/custom/common_design_subtheme/img/icons/expand-left.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M44 48a3.989 3.989 0 0 1-2.828-1.171l-19-20a4 4 0 0 1 0-5.658l19-20a4 4 0 0 1 5.657 5.657L31 24l15.829 17.171A4 4 0 0 1 44 48zM25.83 46.829a4 4 0 0 0 0-5.658L10 24 25.829 6.828a4 4 0 0 0-5.657-5.657l-19 20a4 4 0 0 0 0 5.658l19 20a4 4 0 0 0 5.657 0z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/expand-right.svg b/html/themes/custom/common_design_subtheme/img/icons/expand-right.svg
deleted file mode 100644
index d71574e96..000000000
--- a/html/themes/custom/common_design_subtheme/img/icons/expand-right.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48.00024 48"><path d="M4.00012,0A3.98883,3.98883,0,0,1,6.82874,1.17139l19,20a4.0006,4.0006,0,0,1,0,5.65722l-19,20.00025a4.00027,4.00027,0,0,1-5.65723-5.65723L17.00024,24,1.17151,6.82861A4,4,0,0,1,4.00012,0ZM22.17151,1.17139a4.0006,4.0006,0,0,0,0,5.65722L38.00024,24,22.17151,41.17163a4.00027,4.00027,0,0,0,5.65723,5.65723l19-20.00025a4.0006,4.0006,0,0,0,0-5.65722l-19-20a4.0009,4.0009,0,0,0-5.65723,0Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/external-link.svg b/html/themes/custom/common_design_subtheme/img/icons/external-link.svg
deleted file mode 100644
index 8b36e0b10..000000000
--- a/html/themes/custom/common_design_subtheme/img/icons/external-link.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48">
-  <path d="M35,20.65V42H6V18H22.09l9-9H4.2A2.2,2.2,0,0,0,2,11.2V43.8A2.2,2.2,0,0,0,4.2,46H36.8A2.2,2.2,0,0,0,39,43.8V16.65ZM12.5,12A1.5,1.5,0,1,1,11,13.5,1.5,1.5,0,0,1,12.5,12Zm-5,0A1.5,1.5,0,1,1,6,13.5,1.5,1.5,0,0,1,7.5,12Z"/>
-  <path d="M44,2H23a2,2,0,0,0,0,4H39L16.51,28.52a2.1,2.1,0,0,0,3,3L42,9V25a2,2,0,0,0,4,0V4A2,2,0,0,0,44,2Z"/>
-</svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/form-required.svg b/html/themes/custom/common_design_subtheme/img/icons/form-required.svg
deleted file mode 100644
index f7882d6df..000000000
--- a/html/themes/custom/common_design_subtheme/img/icons/form-required.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#EE0000"  d="M0,7.562l1.114-3.438c2.565,0.906,4.43,1.688,5.59,2.35C6.398,3.553,6.237,1.544,6.22,0.447h3.511 c-0.05,1.597-0.234,3.6-0.558,6.003c1.664-0.838,3.566-1.613,5.714-2.325L16,7.562c-2.05,0.678-4.06,1.131-6.028,1.356 c0.984,0.856,2.372,2.381,4.166,4.575l-2.906,2.059c-0.935-1.274-2.041-3.009-3.316-5.206c-1.194,2.275-2.244,4.013-3.147,5.206 l-2.856-2.059c1.872-2.307,3.211-3.832,4.017-4.575C3.849,8.516,1.872,8.062,0,7.562"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/pdf.svg b/html/themes/custom/common_design_subtheme/img/icons/pdf.svg
deleted file mode 100644
index 938291c05..000000000
--- a/html/themes/custom/common_design_subtheme/img/icons/pdf.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="19.25" height="14"><path data-name="Path 1010" d="M16.188.411V0l3.063 3.063H16.53a.342.342 0 01-.341-.341zm3.063 3.526v9.188a.875.875 0 01-.875.875H.876a.875.875 0 01-.875-.875V.875A.875.875 0 01.876 0h14.438v2.721a1.218 1.218 0 001.216 1.216zM7.439 6.562A1.314 1.314 0 006.127 5.25H4.815a.437.437 0 00-.437.438v4.375a.438.438 0 00.875 0v-1.75h.875a1.314 1.314 0 001.313-1.312zm3.938 0a1.314 1.314 0 00-1.312-1.312H8.75a.437.437 0 00-.437.438v4.375a.437.437 0 00.438.438h1.313a1.314 1.314 0 001.313-1.312zm3.938-.875a.437.437 0 00-.437-.437h-2.187a.437.437 0 00-.437.438v4.375a.438.438 0 00.875 0v-1.75H14a.438.438 0 000-.875h-.875V6.126h1.75a.437.437 0 00.438-.438zm-5.25.438H9.19v3.5h.875a.438.438 0 00.438-.437V6.563a.438.438 0 00-.44-.438zm-3.937 0h-.875v1.313h.875a.438.438 0 00.438-.437v-.437a.438.438 0 00-.441-.439z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sm-gh-def.svg b/html/themes/custom/common_design_subtheme/img/icons/sm-gh-def.svg
deleted file mode 100644
index 4e253b6f9..000000000
--- a/html/themes/custom/common_design_subtheme/img/icons/sm-gh-def.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M14.46,26.8a.16.16,0,0,1,0-.26.71.71,0,0,1,.66-.2,1.15,1.15,0,0,1,.46.13,3,3,0,0,1,1,.89,6.7,6.7,0,0,0,.89,1,2.45,2.45,0,0,0,3.23.2,2,2,0,0,1,.43-.79,2,2,0,0,1,.56-.46q.26-.13.92-.39a12.25,12.25,0,0,1-3.52-.76A6,6,0,0,1,17,24.69a5.52,5.52,0,0,1-1.28-3.09,7.92,7.92,0,0,1,.3-3.49,5.8,5.8,0,0,1,1.12-1.78,5.89,5.89,0,0,1,.2-3.75A6.84,6.84,0,0,1,21.1,14,14.42,14.42,0,0,1,27.95,14a12.37,12.37,0,0,1,1.42-.82,5.79,5.79,0,0,1,2.4-.56,7.1,7.1,0,0,1,.36,1.71,5.66,5.66,0,0,1-.1,1.84,6.07,6.07,0,0,1,1.58,4.21,7.48,7.48,0,0,1-.72,3.49,5.56,5.56,0,0,1-2.57,2.3,9.15,9.15,0,0,1-3.29.72,4.36,4.36,0,0,1,1.35,1,2.9,2.9,0,0,1,.56,1.55v2.07l.07,2a2.47,2.47,0,0,0,.92.89.22.22,0,0,1,.13.3q-.07.2-.53.2A2.19,2.19,0,0,1,27.75,34a1.51,1.51,0,0,1-.2-.79V30.09a1,1,0,0,0-.26-.76,1.28,1.28,0,0,0-.53-.3v4.15A2.6,2.6,0,0,0,27,34.63a1.55,1.55,0,0,1,.33.66s0,.08-.1.1a1.27,1.27,0,0,1-.56-.1,1.63,1.63,0,0,1-1.18-.89,3.4,3.4,0,0,1-.33-1.48V28.84h-.86v4.08A3.62,3.62,0,0,1,24,34.43a1.85,1.85,0,0,1-1.71,1q-.2-.07-.2-.13a5.58,5.58,0,0,0,.39-.66,3.05,3.05,0,0,0,.16-.53,3.82,3.82,0,0,0,.1-.92V29a1.07,1.07,0,0,0-.49.3,1,1,0,0,0-.23.76v3.16a1.51,1.51,0,0,1-.2.79,2.08,2.08,0,0,1-1.78.79q-.46,0-.53-.2a.18.18,0,0,1,0-.23,2,2,0,0,1,.3-.23,2,2,0,0,0,.26-.2,1.2,1.2,0,0,0,.39-.53,2.5,2.5,0,0,0,.1-1.38,6.64,6.64,0,0,1,0-1.45A3.8,3.8,0,0,1,17.09,30,6.43,6.43,0,0,1,16,28.51a6.64,6.64,0,0,0-1.58-1.71Z"/><path d="M24,5A19,19,0,1,1,5,24,19,19,0,0,1,24,5m0-3A22,22,0,1,0,46,24,22,22,0,0,0,24,2Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sm-gh-full.svg b/html/themes/custom/common_design_subtheme/img/icons/sm-gh-full.svg
deleted file mode 100644
index 6f2392053..000000000
--- a/html/themes/custom/common_design_subtheme/img/icons/sm-gh-full.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M24,2A22,22,0,1,0,46,24,22,22,0,0,0,24,2Zm8.89,21.84a5.56,5.56,0,0,1-2.57,2.3,9.15,9.15,0,0,1-3.29.72,4.36,4.36,0,0,1,1.35,1,2.9,2.9,0,0,1,.56,1.55v2.07l.07,2a2.47,2.47,0,0,0,.92.89.22.22,0,0,1,.13.3q-.07.2-.53.2A2.19,2.19,0,0,1,27.75,34a1.51,1.51,0,0,1-.2-.79V30.09a1,1,0,0,0-.26-.76,1.28,1.28,0,0,0-.53-.3v4.15A2.6,2.6,0,0,0,27,34.63a1.55,1.55,0,0,1,.33.66s0,.08-.1.1a1.27,1.27,0,0,1-.56-.1,1.63,1.63,0,0,1-1.18-.89,3.4,3.4,0,0,1-.33-1.48V28.84h-.86v4.08A3.62,3.62,0,0,1,24,34.43a1.85,1.85,0,0,1-1.71,1q-.2-.07-.2-.13a5.56,5.56,0,0,0,.39-.66,3,3,0,0,0,.16-.53,3.82,3.82,0,0,0,.1-.92V29a1.07,1.07,0,0,0-.49.3,1,1,0,0,0-.23.76v3.16a1.51,1.51,0,0,1-.2.79,2.08,2.08,0,0,1-1.78.79q-.46,0-.53-.2a.18.18,0,0,1,0-.23,2,2,0,0,1,.3-.23,2,2,0,0,0,.26-.2,1.2,1.2,0,0,0,.39-.53,2.5,2.5,0,0,0,.1-1.38,6.64,6.64,0,0,1,0-1.45A3.8,3.8,0,0,1,17.09,30,6.43,6.43,0,0,1,16,28.51a6.64,6.64,0,0,0-1.58-1.71.16.16,0,0,1,0-.26.71.71,0,0,1,.66-.2,1.14,1.14,0,0,1,.46.13,3,3,0,0,1,1,.89,6.69,6.69,0,0,0,.89,1,2.45,2.45,0,0,0,3.23.2,2.12,2.12,0,0,1,1-1.25q.26-.13.92-.4a12.25,12.25,0,0,1-3.52-.76A6,6,0,0,1,17,24.69a5.52,5.52,0,0,1-1.28-3.09,7.92,7.92,0,0,1,.3-3.49,5.79,5.79,0,0,1,1.12-1.78,5.89,5.89,0,0,1,.2-3.75A6.83,6.83,0,0,1,21.1,14,14.42,14.42,0,0,1,27.95,14a12.37,12.37,0,0,1,1.42-.82,5.79,5.79,0,0,1,2.4-.56,7.1,7.1,0,0,1,.36,1.71,5.66,5.66,0,0,1-.1,1.84,6.06,6.06,0,0,1,1.58,4.21A7.48,7.48,0,0,1,32.89,23.84Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sm-ig-def.svg b/html/themes/custom/common_design_subtheme/img/icons/sm-ig-def.svg
deleted file mode 100644
index 7599f6328..000000000
--- a/html/themes/custom/common_design_subtheme/img/icons/sm-ig-def.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M24,2A22,22,0,1,0,46,24,22,22,0,0,0,24,2Zm0,41A19,19,0,1,1,43,24,19,19,0,0,1,24,43Z"/><path d="M24,18.09A5.91,5.91,0,1,0,29.91,24,5.9,5.9,0,0,0,24,18.09Zm0,9.74A3.83,3.83,0,1,1,27.83,24,3.83,3.83,0,0,1,24,27.83Z"/><circle cx="30.14" cy="17.86" r="1.38"/><path d="M34.9,16.47a5.88,5.88,0,0,0-3.36-3.36,8.43,8.43,0,0,0-2.79-.53c-1.23-.06-1.62-.07-4.74-.07s-3.52,0-4.74.07a8.44,8.44,0,0,0-2.79.53,5.88,5.88,0,0,0-3.36,3.36,8.44,8.44,0,0,0-.53,2.79c-.06,1.23-.07,1.62-.07,4.74s0,3.52.07,4.74a8.44,8.44,0,0,0,.53,2.79,5.88,5.88,0,0,0,3.36,3.36,8.44,8.44,0,0,0,2.79.53c1.23.06,1.62.07,4.74.07s3.52,0,4.74-.07a8.44,8.44,0,0,0,2.79-.53,5.88,5.88,0,0,0,3.36-3.36,8.41,8.41,0,0,0,.53-2.79c.06-1.23.07-1.62.07-4.74s0-3.52-.07-4.74A8.44,8.44,0,0,0,34.9,16.47ZM33.36,28.65a6.38,6.38,0,0,1-.4,2.14A3.81,3.81,0,0,1,30.78,33a6.35,6.35,0,0,1-2.14.4c-1.21.06-1.58.07-4.65.07s-3.43,0-4.65-.07a6.35,6.35,0,0,1-2.14-.4A3.81,3.81,0,0,1,15,30.78a6.35,6.35,0,0,1-.4-2.14c-.06-1.21-.07-1.58-.07-4.65s0-3.43.07-4.65a6.38,6.38,0,0,1,.4-2.14A3.81,3.81,0,0,1,17.22,15a6.35,6.35,0,0,1,2.14-.4c1.21-.06,1.58-.07,4.65-.07s3.43,0,4.65.07a6.38,6.38,0,0,1,2.14.4A3.81,3.81,0,0,1,33,17.22a6.35,6.35,0,0,1,.4,2.14c.06,1.21.07,1.58.07,4.65S33.42,27.43,33.36,28.65Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sm-ig-full.svg b/html/themes/custom/common_design_subtheme/img/icons/sm-ig-full.svg
deleted file mode 100644
index 105b29f55..000000000
--- a/html/themes/custom/common_design_subtheme/img/icons/sm-ig-full.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><circle cx="24" cy="24" r="3.83"/><path d="M33,17.22A3.81,3.81,0,0,0,30.78,15a6.38,6.38,0,0,0-2.14-.4c-1.21-.05-1.58-.07-4.65-.07s-3.43,0-4.65.07a6.35,6.35,0,0,0-2.14.4A3.81,3.81,0,0,0,15,17.22a6.38,6.38,0,0,0-.4,2.14c-.05,1.21-.07,1.58-.07,4.65s0,3.44.07,4.65a6.36,6.36,0,0,0,.4,2.14A3.81,3.81,0,0,0,17.22,33a6.35,6.35,0,0,0,2.14.4c1.21.06,1.58.07,4.65.07s3.44,0,4.65-.07a6.35,6.35,0,0,0,2.14-.4A3.81,3.81,0,0,0,33,30.78a6.38,6.38,0,0,0,.4-2.14c.06-1.21.07-1.58.07-4.65s0-3.43-.07-4.65A6.35,6.35,0,0,0,33,17.22ZM24,29.91A5.91,5.91,0,1,1,29.91,24,5.9,5.9,0,0,1,24,29.91Zm6.14-10.66a1.38,1.38,0,1,1,1.38-1.38A1.38,1.38,0,0,1,30.14,19.24Z"/><path d="M24,2A22,22,0,1,0,46,24,22,22,0,0,0,24,2ZM35.43,28.74a8.41,8.41,0,0,1-.53,2.79,5.88,5.88,0,0,1-3.36,3.36,8.44,8.44,0,0,1-2.79.53c-1.23.06-1.62.07-4.74.07s-3.51,0-4.74-.07a8.44,8.44,0,0,1-2.79-.53,5.88,5.88,0,0,1-3.36-3.36,8.44,8.44,0,0,1-.53-2.79c-.06-1.23-.07-1.62-.07-4.74s0-3.52.07-4.74a8.44,8.44,0,0,1,.53-2.79,5.88,5.88,0,0,1,3.36-3.36,8.44,8.44,0,0,1,2.79-.53c1.23-.06,1.62-.07,4.74-.07s3.51,0,4.74.07a8.43,8.43,0,0,1,2.79.53,5.88,5.88,0,0,1,3.36,3.36,8.44,8.44,0,0,1,.53,2.79c.06,1.23.07,1.62.07,4.74S35.49,27.51,35.43,28.74Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sm-rss-def.svg b/html/themes/custom/common_design_subtheme/img/icons/sm-rss-def.svg
deleted file mode 100644
index e1e3042e7..000000000
--- a/html/themes/custom/common_design_subtheme/img/icons/sm-rss-def.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M24,5A19,19,0,1,1,5,24,19,19,0,0,1,24,5m0-3A22,22,0,1,0,46,24,22,22,0,0,0,24,2Z"/><path d="M20.7,31.18a2.85,2.85,0,1,1-2.85-2.81,2.84,2.84,0,0,1,2.85,2.81ZM37,34A22,22,0,0,0,15,12v5a17.49,17.49,0,0,1,14.92,8.2A16.65,16.65,0,0,1,32.41,34H37Zm-7.78,0A14,14,0,0,0,24,23.13,14.27,14.27,0,0,0,15,20V24.2a9.94,9.94,0,0,1,8.67,5A9.79,9.79,0,0,1,24.92,34h4.3Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sm-rss-full.svg b/html/themes/custom/common_design_subtheme/img/icons/sm-rss-full.svg
deleted file mode 100644
index e700c8ee5..000000000
--- a/html/themes/custom/common_design_subtheme/img/icons/sm-rss-full.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M24,2A22,22,0,1,0,46,24,22,22,0,0,0,24,2ZM17.85,34a2.81,2.81,0,1,1,2.85-2.81A2.84,2.84,0,0,1,17.85,34Zm11.37,0h-4.3a9.79,9.79,0,0,0-1.25-4.78,9.94,9.94,0,0,0-8.67-5V20a14.27,14.27,0,0,1,9,3.15A14,14,0,0,1,29.22,34ZM37,34H32.41a16.65,16.65,0,0,0-2.49-8.72A17.49,17.49,0,0,0,15,17.06V12A22,22,0,0,1,37,34h0Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sm-yt-def.svg b/html/themes/custom/common_design_subtheme/img/icons/sm-yt-def.svg
deleted file mode 100644
index 6fa17352d..000000000
--- a/html/themes/custom/common_design_subtheme/img/icons/sm-yt-def.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M32.58,16.83c-1.72-.45-8.59-.45-8.59-.45s-6.75,0-8.46.42a3,3,0,0,0-2.11,2A26.77,26.77,0,0,0,13,24a26.77,26.77,0,0,0,.42,5.24,3,3,0,0,0,2.11,2c1.72.46,8.46.42,8.46.42s6.75,0,8.46-.42a3,3,0,0,0,2.08-2A27.91,27.91,0,0,0,35,24a28.42,28.42,0,0,0-.47-5.24A2.74,2.74,0,0,0,32.58,16.83ZM21.26,27.38V20.62L26.74,24Z"/><path d="M24,2A22,22,0,1,0,46,24,22,22,0,0,0,24,2Zm0,41A19,19,0,1,1,43,24,19,19,0,0,1,24,43Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sm-yt-full.svg b/html/themes/custom/common_design_subtheme/img/icons/sm-yt-full.svg
deleted file mode 100644
index 98163ce16..000000000
--- a/html/themes/custom/common_design_subtheme/img/icons/sm-yt-full.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M24,2A22,22,0,1,0,46,24,22,22,0,0,0,24,2ZM34.54,29.24a3,3,0,0,1-2.08,2c-1.72.45-8.46.42-8.46.42s-6.75,0-8.46-.42a3,3,0,0,1-2.11-2A26.77,26.77,0,0,1,13,24a26.77,26.77,0,0,1,.42-5.24,3,3,0,0,1,2.11-2c1.72-.45,8.46-.42,8.46-.42s6.87,0,8.59.45a2.74,2.74,0,0,1,1.94,1.93A28.42,28.42,0,0,1,35,24,27.91,27.91,0,0,1,34.54,29.24Z"/><polygon points="21.25 27.38 26.75 24 21.25 20.62 21.25 27.38"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/social-links--facebook.svg b/html/themes/custom/common_design_subtheme/img/icons/social-links--facebook.svg
deleted file mode 100644
index 802b398e1..000000000
--- a/html/themes/custom/common_design_subtheme/img/icons/social-links--facebook.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path data-name="svgexport-14" d="M13.411 0H.589A.589.589 0 000 .589v12.822A.586.586 0 00.589 14h6.853V8.746H5.688V6.558h1.754V4.8a2.5 2.5 0 012.756-2.7 15.8 15.8 0 011.621.081v1.901h-1.105c-.884 0-1.091.42-1.091 1.032v1.444h2.188l-.442 2.188H9.623l.037 5.246h3.758A.589.589 0 0014 13.4V.589a.589.589 0 00-.589-.582"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/social-links--linkedin.svg b/html/themes/custom/common_design_subtheme/img/icons/social-links--linkedin.svg
deleted file mode 100644
index b1e83c82a..000000000
--- a/html/themes/custom/common_design_subtheme/img/icons/social-links--linkedin.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg data-name="Component 9 – 110" xmlns="http://www.w3.org/2000/svg" width="14" height="14"><path data-name="Path 530" d="M12.968 0H1.032A1.007 1.007 0 000 1.032v12.01A.993.993 0 001.032 14h11.936A1.007 1.007 0 0014 12.968V1.032A1.007 1.007 0 0012.968 0zM4.274 11.716H2.137V5.379h2.137zM3.168 4.495a1.066 1.066 0 01-1.179-1.106 1.1 1.1 0 011.179-1.105 1.066 1.066 0 011.179 1.105c.074.664-.442 1.106-1.179 1.106zm8.695 7.221H9.726v-3.39c0-.884-.295-1.474-1.105-1.474a1.162 1.162 0 00-1.105.737 1.254 1.254 0 00-.074.516v3.537H5.305V5.305h2.137v.884a2.132 2.132 0 011.916-1.032c1.4 0 2.432.884 2.432 2.874v3.684z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/social-links--twitter.svg b/html/themes/custom/common_design_subtheme/img/icons/social-links--twitter.svg
deleted file mode 100644
index 1f9057e52..000000000
--- a/html/themes/custom/common_design_subtheme/img/icons/social-links--twitter.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="17.219" height="14"><path data-name="svgexport-12" d="M14.531 1.141A3.492 3.492 0 0011.95 0a3.539 3.539 0 00-3.539 3.539 7.247 7.247 0 00.063.82A10.078 10.078 0 011.211.633a3.984 3.984 0 00-.508 1.766A3.634 3.634 0 002.281 5.36a3.359 3.359 0 01-1.578-.445v.062a3.555 3.555 0 002.836 3.469 7.632 7.632 0 01-.945.125l-.633-.063a3.547 3.547 0 003.281 2.461A7.469 7.469 0 01.82 12.484L0 12.42A10.086 10.086 0 005.422 14 9.966 9.966 0 0015.45 3.961c.016-.187 0-.336 0-.508a6.781 6.781 0 001.769-1.833 6.552 6.552 0 01-2.031.563A3.414 3.414 0 0016.711.222a7.051 7.051 0 01-2.211.883z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sprite.symbol.html b/html/themes/custom/common_design_subtheme/img/icons/sprite.symbol.html
index f51ba91c4..d680ff449 100644
--- a/html/themes/custom/common_design_subtheme/img/icons/sprite.symbol.html
+++ b/html/themes/custom/common_design_subtheme/img/icons/sprite.symbol.html
@@ -20,50 +20,28 @@
 
 <style type="text/css">
 	cd-icon--about-dims { width: 42px; height: 42px; }
-	cd-icon--add-dims { width: 48px; height: 48px; }
-	cd-icon--add--white-dims { width: 48px; height: 48px; }
 	cd-icon--admin-dims { width: 48px; height: 48px; }
 	cd-icon--alert-dims { width: 48px; height: 41.01px; }
 	cd-icon--arrow-down-dims { width: 48px; height: 48px; }
 	cd-icon--arrow-down--highlighted-dims { width: 48px; height: 48px; }
-	cd-icon--arrow-left-dims { width: 48px; height: 48px; }
-	cd-icon--arrow-right-dims { width: 48px; height: 48px; }
 	cd-icon--arrow-up-dims { width: 48px; height: 48px; }
 	cd-icon--arrow-up--highlighted-dims { width: 48px; height: 48px; }
 	cd-icon--cd-icons-sprite-dims { width: 0px; height: 0px; }
-	cd-icon--copyurl-dims { width: 14px; height: 14px; }
 	cd-icon--creative-commons-dims { width: 64px; height: 64px; }
 	cd-icon--education-dims { width: 34px; height: 42px; }
-	cd-icon--expand-left-dims { width: 48px; height: 48px; }
-	cd-icon--expand-right-dims { width: 48px; height: 48px; }
-	cd-icon--external-link-dims { width: 48px; height: 48px; }
 	cd-icon--form-error-dims { width: 16px; height: 16px; }
-	cd-icon--form-required-dims { width: 16px; height: 16px; }
 	cd-icon--help-dims { width: 28px; height: 48px; }
 	cd-icon--ocha-logo-dims { width: 41.9px; height: 37px; }
-	cd-icon--pdf-dims { width: 19.25px; height: 14px; }
 	cd-icon--search-dims { width: 48px; height: 48px; }
 	cd-icon--selected-dims { width: 48px; height: 48px; }
 	cd-icon--selected--highlighted-dims { width: 48px; height: 48px; }
 	cd-icon--sm-fb-def-dims { width: 48px; height: 48px; }
 	cd-icon--sm-fb-full-dims { width: 48px; height: 48px; }
-	cd-icon--sm-gh-def-dims { width: 48px; height: 48px; }
-	cd-icon--sm-gh-full-dims { width: 48px; height: 48px; }
-	cd-icon--sm-ig-def-dims { width: 48px; height: 48px; }
-	cd-icon--sm-ig-full-dims { width: 48px; height: 48px; }
 	cd-icon--sm-ln-def-dims { width: 48px; height: 48px; }
 	cd-icon--sm-ln-full-dims { width: 48px; height: 48px; }
-	cd-icon--sm-rss-def-dims { width: 48px; height: 48px; }
-	cd-icon--sm-rss-full-dims { width: 48px; height: 48px; }
 	cd-icon--sm-tt-def-dims { width: 48px; height: 48px; }
 	cd-icon--sm-tt-full-dims { width: 48px; height: 48px; }
-	cd-icon--sm-yt-def-dims { width: 48px; height: 48px; }
-	cd-icon--sm-yt-full-dims { width: 48px; height: 48px; }
-	cd-icon--social-links--facebook-dims { width: 14px; height: 14px; }
-	cd-icon--social-links--linkedin-dims { width: 14px; height: 14px; }
-	cd-icon--social-links--twitter-dims { width: 17.219px; height: 14px; }
 	cd-icon--user-dims { width: 48px; height: 48px; }
-	cd-icon--user--white-dims { width: 48px; height: 48px; }
 </style>
 <!--
 ====================================================================================================
@@ -87,50 +65,28 @@
 
 <svg width="0" height="0" style="position:absolute">
 		<symbol viewBox="0 0 42 42" id="cd-icon--about" xmlns="http://www.w3.org/2000/svg"><path d="M38 0H4a4 4 0 00-4 4v34a4 4 0 004 4h34a4 4 0 004-4V4a4 4 0 00-4-4zM24 35h-4a2 2 0 01-2-2V18h4a2 2 0 012 2zm-3-22a3 3 0 113-3 3 3 0 01-3 3z"/></symbol>
-		<symbol viewBox="0 0 48 48" id="cd-icon--add" xmlns="http://www.w3.org/2000/svg"><path d="M44 20H28V4a4 4 0 00-4-4 4 4 0 00-4 4v16H4a4 4 0 000 8h16v16a4 4 0 004 4 4 4 0 004-4V28h16a4 4 0 000-8z"/></symbol>
-		<symbol viewBox="0 0 48 48" id="cd-icon--add--white" xmlns="http://www.w3.org/2000/svg"><path fill="#fff" d="M44 20H28V4a4 4 0 00-4-4 4 4 0 00-4 4v16H4a4 4 0 000 8h16v16a4 4 0 004 4 4 4 0 004-4V28h16a4 4 0 000-8z"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--admin" xmlns="http://www.w3.org/2000/svg"><path d="M45 21h-1.25a19.867 19.867 0 00-3.668-8.84l.889-.888a3 3 0 10-4.242-4.243l-.89.889A19.868 19.868 0 0027 4.25V3a3 3 0 00-6 0v1.25a19.868 19.868 0 00-8.84 3.668l-.888-.889a3 3 0 10-4.243 4.243l.889.889A19.867 19.867 0 004.25 21H3a3 3 0 000 6h1.25a19.867 19.867 0 003.668 8.84l-.889.888a3 3 0 004.242 4.243l.89-.889A19.868 19.868 0 0021 43.75V45a3 3 0 006 0v-1.25a19.868 19.868 0 008.84-3.668l.888.889a3 3 0 104.243-4.243l-.889-.889A19.867 19.867 0 0043.75 27H45a3 3 0 000-6zM24 38a14 14 0 1114-14 14.016 14.016 0 01-14 14z"/></symbol>
-		<symbol viewBox="0 0 47.996 41.01" id="cd-icon--alert" xmlns="http://www.w3.org/2000/svg"><path class="aecls-1" d="M47.668 37.41L27.118 1.8a3.604 3.604 0 00-6.24 0L.328 37.41a2.398 2.398 0 002.08 3.6h43.18a2.398 2.398 0 002.08-3.6zm-23.67-3.4a2 2 0 112-2 2.006 2.006 0 01-2 2zm2-9a2 2 0 01-4 0v-11a2 2 0 114 0z"/></symbol>
+		<symbol viewBox="0 0 47.996 41.01" id="cd-icon--alert" xmlns="http://www.w3.org/2000/svg"><path class="ccls-1" d="M47.668 37.41L27.118 1.8a3.604 3.604 0 00-6.24 0L.328 37.41a2.398 2.398 0 002.08 3.6h43.18a2.398 2.398 0 002.08-3.6zm-23.67-3.4a2 2 0 112-2 2.006 2.006 0 01-2 2zm2-9a2 2 0 01-4 0v-11a2 2 0 114 0z"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--arrow-down" xmlns="http://www.w3.org/2000/svg"><path d="M48 14a4 4 0 01-1.17 2.83l-20 20a4 4 0 01-5.66 0l-20-20a4 4 0 015.66-5.66L24 28.34l17.17-17.17A4 4 0 0148 14z"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--arrow-down--highlighted" xmlns="http://www.w3.org/2000/svg"><path fill="#EB5C6D" d="M48 14a4 4 0 01-1.17 2.83l-20 20a4 4 0 01-5.66 0l-20-20a4 4 0 015.66-5.66L24 28.34l17.17-17.17A4 4 0 0148 14z"/></symbol>
-		<symbol viewBox="0 0 48 48" id="cd-icon--arrow-left" xmlns="http://www.w3.org/2000/svg"><path d="M34 48a4 4 0 01-2.83-1.17l-20-20a4 4 0 010-5.66l20-20a4 4 0 015.66 5.66L19.66 24l17.17 17.17A4 4 0 0134 48z"/></symbol>
-		<symbol viewBox="0 0 48 48" id="cd-icon--arrow-right" xmlns="http://www.w3.org/2000/svg"><path d="M14 48a4 4 0 01-2.83-6.83L28.34 24 11.17 6.83a4 4 0 015.66-5.66l20 20a4 4 0 010 5.66l-20 20A4 4 0 0114 48z"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--arrow-up" xmlns="http://www.w3.org/2000/svg"><path d="M0 34a4 4 0 011.17-2.83l20-20a4 4 0 015.66 0l20 20a4 4 0 11-5.66 5.66L24 19.66 6.83 36.83A4 4 0 010 34z"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--arrow-up--highlighted" xmlns="http://www.w3.org/2000/svg"><path fill="#EB5C6D" d="M0 34a4 4 0 011.17-2.83l20-20a4 4 0 015.66 0l20 20a4 4 0 11-5.66 5.66L24 19.66 6.83 36.83A4 4 0 010 34z"/></symbol>
-		<symbol viewBox="0 0 0 0" id="cd-icon--cd-icons-sprite" xmlns="http://www.w3.org/2000/svg"/>
-		<symbol viewBox="0 0 14 14" id="cd-icon--copyurl" xmlns="http://www.w3.org/2000/svg"><path data-name="Path 533" d="M12.635 1.365a4.674 4.674 0 00-6.6 0L5.02 2.381a.718.718 0 001.015 1.015L7.05 2.38a3.232 3.232 0 114.571 4.571l-1.015 1.015a.718.718 0 101.015 1.015l1.015-1.015a4.673 4.673 0 00-.001-6.601zm-4.668 9.239L6.952 11.62a3.232 3.232 0 01-4.571-4.571l1.015-1.016a.718.718 0 10-1.015-1.015L1.365 6.033a4.668 4.668 0 006.6 6.6l1.015-1.016a.718.718 0 10-1.015-1.015zm.86-6.446L4.158 8.826a.718.718 0 101.015 1.016l4.669-4.668a.718.718 0 00-1.015-1.016z"/></symbol>
-		<symbol viewBox="0 0 64 64" id="cd-icon--creative-commons" xmlns="http://www.w3.org/2000/svg"><path d="M31.957.311c-8.682 0-16.322 3.213-22.226 9.203C3.653 15.678.354 23.666.354 32c0 8.422 3.212 16.236 9.29 22.313 6.078 6.078 13.978 9.377 22.313 9.377 8.334 0 16.409-3.299 22.66-9.463C60.521 48.41 63.646 40.683 63.646 32c0-8.595-3.125-16.408-9.116-22.399C48.453 3.523 40.639.311 31.957.311zm.086 5.73c7.12 0 13.458 2.691 18.406 7.641 4.862 4.861 7.466 11.286 7.466 18.318 0 7.119-2.518 13.371-7.379 18.146-5.123 5.035-11.721 7.727-18.493 7.727-6.858 0-13.283-2.691-18.232-7.641C8.862 45.283 6.084 38.772 6.084 32c0-6.858 2.778-13.369 7.727-18.406 4.862-4.948 11.113-7.553 18.232-7.553z"/><path id="ana" d="M31.635 26.734c-1.79-3.264-4.844-4.563-8.389-4.563-5.16 0-9.267 3.65-9.267 9.828 0 6.283 3.861 9.829 9.442 9.829 3.581 0 6.635-1.966 8.319-4.949l-3.931-2.001c-.878 2.105-2.212 2.738-3.896 2.738-2.914 0-4.248-2.422-4.248-5.617 0-3.193 1.124-5.616 4.248-5.616.842 0 2.527.456 3.51 2.563l4.212-2.212z"/><use xlink:href="#ana" transform="translate(18.281)"/></symbol>
+		<symbol class="hcd-icons-sprite" viewBox="0 0 0 0" id="cd-icon--cd-icons-sprite" xmlns="http://www.w3.org/2000/svg"/>
+		<symbol viewBox="0 0 64 64" id="cd-icon--creative-commons" xmlns="http://www.w3.org/2000/svg"><path d="M31.957.311c-8.682 0-16.322 3.213-22.226 9.203C3.653 15.678.354 23.666.354 32c0 8.422 3.212 16.236 9.29 22.313 6.078 6.078 13.978 9.377 22.313 9.377 8.334 0 16.409-3.299 22.66-9.463C60.521 48.41 63.646 40.683 63.646 32c0-8.595-3.125-16.408-9.116-22.399C48.453 3.523 40.639.311 31.957.311zm.086 5.73c7.12 0 13.458 2.691 18.406 7.641 4.862 4.861 7.466 11.286 7.466 18.318 0 7.119-2.518 13.371-7.379 18.146-5.123 5.035-11.721 7.727-18.493 7.727-6.858 0-13.283-2.691-18.232-7.641C8.862 45.283 6.084 38.772 6.084 32c0-6.858 2.778-13.369 7.727-18.406 4.862-4.948 11.113-7.553 18.232-7.553z"/><path id="ia" d="M31.635 26.734c-1.79-3.264-4.844-4.563-8.389-4.563-5.16 0-9.267 3.65-9.267 9.828 0 6.283 3.861 9.829 9.442 9.829 3.581 0 6.635-1.966 8.319-4.949l-3.931-2.001c-.878 2.105-2.212 2.738-3.896 2.738-2.914 0-4.248-2.422-4.248-5.617 0-3.193 1.124-5.616 4.248-5.616.842 0 2.527.456 3.51 2.563l4.212-2.212z"/><use xlink:href="#ia" transform="translate(18.281)"/></symbol>
 		<symbol viewBox="0 0 34 42" id="cd-icon--education" xmlns="http://www.w3.org/2000/svg"><path d="M33 0h-4v8l-3-1-3 1V0H0v42h33a.98.98 0 001-.95V.95A.98.98 0 0033 0zM6 38.5a.495.495 0 01-.5.5h-2a.495.495 0 01-.5-.5v-35a.495.495 0 01.5-.5h2a.495.495 0 01.5.5zM25.5 23h-13a1.5 1.5 0 010-3h13a1.5 1.5 0 010 3zm0-6h-13a1.5 1.5 0 010-3h13a1.5 1.5 0 010 3z"/></symbol>
-		<symbol viewBox="0 0 48 48" id="cd-icon--expand-left" xmlns="http://www.w3.org/2000/svg"><path d="M44 48a3.989 3.989 0 01-2.828-1.171l-19-20a4 4 0 010-5.658l19-20a4 4 0 015.657 5.657L31 24l15.829 17.171A4 4 0 0144 48zm-18.17-1.171a4 4 0 000-5.658L10 24 25.829 6.828a4 4 0 00-5.657-5.657l-19 20a4 4 0 000 5.658l19 20a4 4 0 005.657 0z"/></symbol>
-		<symbol viewBox="0 0 48 48" id="cd-icon--expand-right" xmlns="http://www.w3.org/2000/svg"><path d="M4 0A3.989 3.989 0 016.83 1.171l19 20a4 4 0 010 5.658l-19 20a4 4 0 01-5.657-5.657L17 24 1.172 6.829A4 4 0 014 0zm18.172 1.171a4 4 0 000 5.658L38 24 22.172 41.172a4 4 0 005.657 5.657l19-20a4 4 0 000-5.658l-19-20a4 4 0 00-5.657 0z"/></symbol>
-		<symbol viewBox="0 0 48 48" id="cd-icon--external-link" xmlns="http://www.w3.org/2000/svg"><path d="M35 20.65V42H6V18h16.09l9-9H4.2A2.2 2.2 0 002 11.2v32.6A2.2 2.2 0 004.2 46h32.6a2.2 2.2 0 002.2-2.2V16.65zM12.5 12a1.5 1.5 0 11-1.5 1.5 1.5 1.5 0 011.5-1.5zm-5 0A1.5 1.5 0 116 13.5 1.5 1.5 0 017.5 12z"/><path d="M44 2H23a2 2 0 000 4h16L16.51 28.52a2.1 2.1 0 003 3L42 9v16a2 2 0 004 0V4a2 2 0 00-2-2z"/></symbol>
 		<symbol fill="#e32700" viewBox="0 0 16 16" id="cd-icon--form-error" xmlns="http://www.w3.org/2000/svg"><path d="M8.002 1a7 7 0 100 14 7 7 0 000-14zm4.025 9.284c.062.063.1.149.1.239a.34.34 0 01-.1.24l-1.262 1.262a.34.34 0 01-.48 0L8.002 9.742l-2.286 2.283a.34.34 0 01-.48 0l-1.261-1.262a.336.336 0 010-.478L6.258 8 3.975 5.716a.34.34 0 010-.48l1.262-1.262a.34.34 0 01.48 0l2.285 2.284 2.283-2.284a.34.34 0 01.48 0l1.262 1.262c.062.063.1.149.1.24a.345.345 0 01-.1.24L9.744 8l2.283 2.284z"/></symbol>
-		<symbol viewBox="0 0 16 16" id="cd-icon--form-required" xmlns="http://www.w3.org/2000/svg"><path fill="#E00" d="M0 7.562l1.114-3.438c2.565.906 4.43 1.688 5.59 2.35-.306-2.921-.467-4.93-.484-6.027h3.511c-.05 1.597-.234 3.6-.558 6.003 1.664-.838 3.566-1.613 5.714-2.325L16 7.562c-2.05.678-4.06 1.131-6.028 1.356.984.856 2.372 2.381 4.166 4.575l-2.906 2.059c-.935-1.274-2.041-3.009-3.316-5.206-1.194 2.275-2.244 4.013-3.147 5.206l-2.856-2.059c1.872-2.307 3.211-3.832 4.017-4.575A86.77 86.77 0 010 7.562"/></symbol>
-		<symbol viewBox="0 0 28 48" id="cd-icon--help" xmlns="http://www.w3.org/2000/svg"><circle class="aucls-1" cx="14" cy="44" r="4"/><path class="aucls-1" d="M28 14a14 14 0 00-28 0 4 4 0 008 0 6 6 0 116 6 4 4 0 00-4 4v9a4 4 0 008 0v-5.59A14.02 14.02 0 0028 14z"/></symbol>
-		<symbol viewBox="0 0 41.9 37" id="cd-icon--ocha-logo" xmlns="http://www.w3.org/2000/svg"><path class="avcls-1" d="M17.6 15.6a3.3 3.3 0 113.3 3.3v-.4a2.9 2.9 0 10-2.9-2.9 2.9 2.9 0 002.9 2.9v.4a3.33 3.33 0 01-3.3-3.3"/><path data-name="Shape" class="avcls-1" d="M15 15.6a6 6 0 116 6v-.4a5.6 5.6 0 10-5.6-5.6 5.59 5.59 0 005.6 5.6v.4a6 6 0 01-6-6"/><path data-name="Shape" class="avcls-1" d="M12.1 15.6a8.9 8.9 0 118.9 8.9V24a8.54 8.54 0 008.5-8.4 8.5 8.5 0 10-17 0A8.41 8.41 0 0021 24v.4a8.77 8.77 0 01-8.9-8.8"/><path data-name="Shape" class="avcls-1" d="M9.3 15.6A11.65 11.65 0 1121 27.2v-.4A11.2 11.2 0 109.8 15.6 11.18 11.18 0 0021 26.8v.4A11.63 11.63 0 019.3 15.6"/><path data-name="Shape" class="avcls-1" d="M6.3 15.6A14.7 14.7 0 1121 30.3v-.4A14.3 14.3 0 106.7 15.6 14.3 14.3 0 0021 29.9v.4A14.66 14.66 0 016.3 15.6"/><path class="avcls-1" d="M20.7 1.1h.4v11.4h-.4z"/><path data-name="Shape" class="avcls-1" d="M10.6 5.5l.3-.3 8 8-.3.3-8-8z"/><path data-name="Rectangle-path" class="avcls-1" d="M6.5 15.4h11.4v.4H6.5z"/><path data-name="Shape" class="avcls-1" d="M10.6 25.7l8-8 .3.3-8 8-.3-.3z"/><path data-name="Rectangle-path" class="avcls-1" d="M20.7 18.7h.4v11.4h-.4zM23.014 17.902l.283-.282 7.967 8.014-.284.282zM24.1 15.4h11.4v.4H24.1z"/><path data-name="Shape" class="avcls-1" d="M23 13.2l8.1-8 .2.3-8 8-.3-.3zM18.7 16.5c.1 0 .1.1.1.2h.1a2.51 2.51 0 00.4-.7.1.1 0 00.1-.1c0-.1-.2-.2-.2-.3-.1.2-.3 0-.4.1v.1h.1v.2a.37.37 0 00-.3-.1c.1 0 0 0 0 .1a.75.75 0 00-.5.1c-.1 0-.1 0-.2-.1-.1.1-.1.2-.2.2l-.1-.1c.1-.1.2-.1.2-.2v-.3c.1-.1.1-.2.2-.2s.3.1.4 0l.1.1v.1c-.1.1-.2.1-.2.2s0 .1.1.1.1-.1.2-.1h.4c.1 0 .1-.3 0-.4v-.2c0-.1.2-.1.2 0v.1s0 .1.1 0v-.2a.35.35 0 00.2.1h.2c.1 0 .1-.1 0-.2h-.1a.31.31 0 01-.2.1c-.1 0-.1-.1-.2-.1s-.2.1-.2 0-.1-.1-.1-.2l.1-.1a.37.37 0 00.3-.1.35.35 0 01.1-.2h.1a.37.37 0 00.3-.1c.1 0 .2-.1.3-.2s.1-.1.2-.1a.1.1 0 01.1-.1v-.5a.1.1 0 01.1-.1h-.1s-.1-.1 0-.1.2 0 .2-.1a.19.19 0 00-.1-.3c-.1-.1-.2 0-.3 0a.1.1 0 01-.1.1c-.1 0-.2-.1-.1-.2v-.1h-.1l-.3.3v.1c0 .1 0 .2-.1.2h-.1c0 .1.2.1.1.2s-.2.1-.4.2a2.72 2.72 0 01-.9 0h-.5c-.1 0-.1.1-.2.2v-.2c0-.1-.1 0-.1-.1-.2-.4-.7-.3-1.1-.3a.1.1 0 00-.1.1c-.1.1-.2 0-.3 0l-.1.1c-.1 0-.2-.1-.3 0s-.1.1-.2.1v.1h-.1c-.1 0-.3 0-.3.1s0 .3-.1.3a.6.6 0 00-.4.1c-.1 0-.1.1-.2.1a2.45 2.45 0 00-.4 1.2v.1c-.2.4-.3.6-.6 1.1-.1.2-.2.6 0 .7s0 .2-.2.2-.4 0-.4-.2-.2-.1-.3-.1h-.4c-.2 0-.2.3-.3.4s-.3.1-.3.2v.2a.1.1 0 00-.1.1v.1c0 .2-.1.3 0 .5v.1a.9.9 0 01-.1.5c-.1.2-.3.2-.5.2h-1c-.1 0-.1-.1-.2-.1a.31.31 0 01-.1-.2c-.1-.1-.3 0-.4.1.1 0 0 .1 0 .1s-.2.1-.3.2-.2-.2-.2-.3-.1-.1-.2-.1v.1h-.1c-.1.1.1.1.1.1v.1h-.1a.1.1 0 01-.1.1c-.1 0-.1.1-.1 0v-.2h-.1c0 .1 0 .1-.1.1v.1h.2a.37.37 0 01.1.3c0 .1 0 .2-.1.1s0-.2 0-.3h-.1c.1.2-.1.3.1.5s-.2.2-.1.2a.35.35 0 00.2.1v-.1s.1-.1.1 0v.1H8v.4c0 .1.2 0 .2.1s-.1.1 0 .2a.1.1 0 01.1.1v.1a.1.1 0 01.1.1c.1 0 .1 0 .1-.1s.1-.1.1-.2 0-.1-.1 0V21c0-.1-.1-.1-.1-.2s.1 0 .2-.1a.1.1 0 01.1.1v.1a.1.1 0 01.1.1c.1 0 .1.1.2.2h.3v-.1l.1.1a.37.37 0 00.1.3h.1l.1.1h.1a.1.1 0 01.1.1c.1 0 .2 0 .2.1s.1.2.2.4a29772.51 29772.51 0 01.2.2.37.37 0 00.3.1.35.35 0 01.2-.1h.1c.1.2.1.4.3.4s.1.1.2.2h.2a.1.1 0 00.1.1c.1.1.2.1.2.2v.1c.1 0 .2-.1.2 0s.2.1.2.2h.1v-.1c0-.1.1 0 .2-.1s.1-.2.1-.2.2.1.3.2h.1c.1.1.1.3.2.3s.2.1.4.2.2.1.3.1h.1c.1 0 .1 0 .2-.1s.3-.1.4-.2l.1-.1c.2-.1.5.1.7 0s.1 0 .2-.1.2-.3.1-.4-.2-.5-.3-.7l-.3-.3h-.1c-.1 0-.1-.1-.1-.2a.1.1 0 01-.1-.1v-.3c-.1 0-.2-.1-.4-.1a.1.1 0 01-.1-.1v-.1a.37.37 0 01.3-.1v-.3a.1.1 0 00-.1-.1c0-.1.1-.2 0-.3s-.2-.2-.2-.3a.1.1 0 01-.1-.1v-.5c0-.1-.1-.1 0-.2l.1-.1c.1 0 .1-.1.1-.2a.14.14 0 00-.2 0v-.3l-.1-.1v-.2s0-.1-.1 0v-.2c0-.1-.1-.2-.2-.1a.14.14 0 01-.2 0V18a.1.1 0 00.1-.1.14.14 0 000-.2c-.1-.1-.2-.2-.1-.3-.1 0-.3 0-.3-.2s0-.3-.1-.4v-.3a.1.1 0 01.1-.1c.2 0 .4 0 .4-.1s-.1-.3 0-.3.4 0 .6-.2c.1 0 .1-.1 0-.2a.35.35 0 00-.1-.2c-.1-.1-.2 0-.3-.2V15c0-.1.1-.1.2-.2s.3 0 .5.1l.1.1v.1c0 .2.1.4 0 .6s-.1.1-.1.2h.1c0 .1.1.3 0 .4s-.1 0-.3 0-.1 0-.1.1l.1.1c.4.1.5.1.9.2.1 0 .1.1.2.1h.3a.1.1 0 00.1.1c.1.1.1.3.2.3a.14.14 0 01.2 0c-.1.1 0 .2 0 .3s.2.1.3.2.2.1.2 0-.1-.2 0-.3c.1.2 0 .4.1.6.1.1.1.2.2.2s.1-.1.1-.2v-.1c0-.1 0-.1.1-.2s.1-.2.1-.3v-.1c0-.1.2-.2.3-.2V17c.1 0 0-.2.1-.2s.1-.1.1-.2.1-.1 0-.1c.5.1.5 0 .5 0"/><path data-name="Shape" class="avcls-1" d="M14.5 16.3h-.1v.1l.1.1v.3c0 .1.1.2.2.1s.2-.3.1-.4-.1-.1-.3-.2M14.3 17.2c.1.2.2.1.3.1v-.1c-.1-.1-.1-.1-.3 0 .1-.1 0-.1 0-.1v.1M14.6 17.6c0-.2-.1-.2-.2-.1s0 .3.1.4a.1.1 0 00.1.1c0 .1.1 0 .2 0s0-.1.1-.1c-.1-.1-.2-.3-.3-.3"/><path data-name="Shape" class="avcls-1" d="M14.3 16.8c0-.1-.1-.1 0 0-.1 0-.1 0-.1.1s0 .2.1.2a.1.1 0 00.1-.1c-.1-.1-.1-.1-.1-.2M14.7 17.4l.1-.1h.1v-.1c-.1 0-.1.1-.2.1s0 .1 0 .1M14.6 18.3c0 .1 0 .1.1.1h.1v-.1h-.2M14.8 19c0-.1.1-.1 0-.2h-.1a.35.35 0 00.1.2M8.5 21.5v.1h.2c-.1 0-.1-.2-.2-.1M9.1 22.2c-.1.1.1.2.2.2v-.2a.14.14 0 00-.2 0M9.4 22.6c0 .2.1.3.2.3.1-.2 0-.3-.2-.3M19.5 17.4a1.27 1.27 0 01.6-.1c.4 0 .4-.6.6-.9a.6.6 0 00-.1-.4c-.1-.2-.6 0-.7-.2s.3.1.3-.1 0-.1-.1-.2h-.2a2 2 0 00-.4.8 5.38 5.38 0 00-.9 1.2c0 .1 0 .1.1.2.3.1.6-.2.8-.3M21.3 16.4c-.1 0-.1 0-.2.1v.2h.1c0-.1 0-.1-.1-.1.2-.1.2-.2.2-.2M20 17.9c.1.2.5.1.5 0s-.3-.2-.4-.2.1.1-.1.2M20.5 19.2a.37.37 0 00.1-.3l-.3.3h.2M22.3 16.5v-.1h-.2c-.1 0-.1-.1-.1-.2s-.1-.2-.1-.3-.1.2-.1.2c.2.2.3.5.5.4M19.9 15.3c-.1-.1-.1 0 0 0-.1.1 0 .1 0 0M8.1 19.1A.1.1 0 008 19h-.1v.1a.14.14 0 00.2 0M8.8 19.1c.1 0 .2-.1.1-.2s-.3 0-.2.1c-.1.1 0 .2.1.1M20.2 12.1c0-.1.1-.1.1-.2h-.1c-.1 0-.1.1 0 .2M20.5 12s.1-.1 0-.1h-.1a.1.1 0 00.1.1M19.4 14.6c0 .1.2.3.3.2a.14.14 0 000-.2.19.19 0 00-.3 0M19.7 15.4v-.1h-.3a.1.1 0 00.1.1c0-.1.1 0 .2 0M19.4 15.6c-.1 0 0 .1 0 .2s.1 0 .2-.1.1-.2 0-.2-.2 0-.2.1M19.2 15.3c0 .1-.1.2 0 .3s.1 0 .1 0 0-.2.1-.2h-.1v-.1h-.1M26.8 22.4c.1 0 0-.1 0 0"/><path data-name="Shape" class="avcls-1" d="M21 18.5l-.1-.1c0-.1-.1.1-.2 0 .1.1 0 .1-.1.2a.1.1 0 00.1.1c0 .1-.1.1 0 .2l-.1.1s-.1.1 0 .1.2-.1.3-.1h.1c.1 0 .1-.1.2-.2H21s-.1 0 0-.3M21.6 20.4c0 .1.1.1 0 0 .1 0 .1-.1.1-.2h-.1v.2M21.7 20.2c.1 0 0-.1 0-.1h-.1a.1.1 0 00.1.1M22.3 20.5c-.1 0-.1-.1-.2 0H22v.1c.2-.1.2-.1.3-.1M23.3 20.4v-.1c-.1 0-.2.1-.3 0v.1h-.1c.2.1.3 0 .4 0M23.7 20c0 .2.2.1.2 0s0-.1-.2 0l.1-.1a.1.1 0 01-.1.1M28.5 16.8c0 .1.1.1.2.1a.37.37 0 00.3-.1.27.27 0 00-.3-.3c-.2.1-.2.2-.2.3M28.5 21.9h-.1c-.1.5-.6 1.2 0 1.5.2.2.5-.1.6-.3s0-1-.5-1.2M27 19.7c-.1 0-.1.2 0 .2a.1.1 0 00.1-.1v-.1H27M27.4 24.8v.2s.2-.1 0-.2M29.7 13.1h-.1v.2c-.2.4-.7.9-.4 1.4a1.38 1.38 0 00.3-.4 10.37 10.37 0 00.4-1s-.1-.2-.2-.2M28.8 14.9c0 .1 0 .1.1.1s.1-.1 0-.1 0-.1-.1 0M23.7 11.8c-.1-.2-.2 0-.3 0l-.1-.1h-.1c-.1 0 0 .2.1.2s.1-.1.1 0 0 .3.2.2.2-.1.3-.1.1-.1.1-.2.2-.1.3 0a.1.1 0 00.1.1c0 .1.1.1.2.1a.37.37 0 00.3-.1.19.19 0 000-.3h-.2c-.1 0-.1-.1-.2-.1-.4-.1-.6.2-.8.3M22.7 12h.3c0-.2-.2-.1-.3-.1.1-.1.1 0 0 .1"/><path data-name="Shape" class="avcls-1" d="M23.1 12.6c.1-.1.3-.2.4-.3v-.1c0-.1-.1-.1-.2-.2a.1.1 0 01-.1.1c-.1.1-.2.1-.2.2v.2c.1.3.1.2.1.1M21.6 11.6v.1c.1.1.1 0 0-.1M18 9.4a.6.6 0 00.4.1l.1-.1c-.1-.1-.2 0-.2-.1h-.1c-.1-.1-.2 0-.2.1M27.1 11c0 .1-.1 0-.2.1v.1c.1.1.2 0 .3 0s.1-.1.1 0v.1a.1.1 0 00-.1.1h-.3v.2c-.1.1-.4.2-.3.4a.75.75 0 00.5.1c0-.2.1-.2.2-.3a.1.1 0 00-.1-.1v-.1a.1.1 0 00.1-.1v-.1a.35.35 0 00.2-.1c0-.1-.1-.2-.1-.3a.1.1 0 01.1-.1v-.1h-.1s-.1 0 0 .1a.37.37 0 00-.3.1c0-.2.1 0 0 0M26.1 12c0 .1.1.1.2 0h-.2M27.5 11.8c-.1.1.1.1.2.1 0-.1-.1-.1-.2-.1M27.9 11.3c-.1 0-.1.1 0 0M25.6 7.3c.1.1.2.1.2.2v.4l.1.1v.2c0 .1.1.3.1.4a.1.1 0 01.1.1c0 .1 0 .1.1.2s.1 0 .2.1.2.3.3.4a.1.1 0 01.1.1v.1c.2 0 .5.1.4.4.1-.1.2-.1.2-.2s.1-.3 0-.4l-.2-.2V9a.1.1 0 00-.1-.1c0-.1-.1-.3.1-.3v-.1H27v-.1a.35.35 0 00-.4-.4c-.1-.1-.1-.1-.2-.1h-.2a2.09 2.09 0 01-.4-.6.19.19 0 00-.3 0c.1-.1.1-.1.1 0"/><path data-name="Shape" class="avcls-1" d="M24.7 7.6a.14.14 0 000 .2h.4a.1.1 0 00.1-.1c.1-.1.2 0 .4-.1 0 .1 0 .1.1.1s0-.2-.1-.2-.1-.2-.2-.3h-.1c0 .2-.1.1-.3.2v.1-.1h-.2a.35.35 0 01-.1.2M22.4 3.7c-.1-.2-.3-.4-.2-.7a1.39 1.39 0 00.9 0c.2-.1.5 0 .7-.1v-.2c-.3.1-.5-.2-.7-.1a3.18 3.18 0 01-.9.3c-.2.1-.9 0-.9.4.3 0 .7 0 .9.3 0 .1.1.1.2.1M23.4 5.2a.4.4 0 00.4.2c0-.1 0-.1-.1-.2h-.3M23.1 5.7c-.1 0 0 .1.1.2 0-.1.1-.3-.1-.2M22.9 5.4c.1-.1 0-.2-.1-.2v.1l.1.1M23.8 6.5a.31.31 0 00.1-.2h-.1a.14.14 0 000 .2M24.1 6.5v.1c.1.1.1 0 0-.1.1 0 0 .1 0 0M24 6.8l.1-.1c0-.1-.1-.1-.2 0s.1 0 .1.1M24.1 6.8c0 .1.1.2.2.1s.1-.1 0-.1zM24.6 7a.35.35 0 00-.1-.2s-.1.1 0 .1 0 .1.1.1M24.7 7.3h.1v-.2h-.2v.1l.1.1M24.5 7.5c.1-.1.1-.1 0-.2h-.1a.1.1 0 01-.1.1c.1.1.1.1.2.1M24.2 2.5c-.1-.1-.1-.1-.2-.1.1.1.1.2.2.1M27.6 5c.1.1.2 0 .2.1s.1.2.2.2.1 0 .1-.1 0-.4-.2-.4h-.5c-.1 0-.1.1-.1.2a.19.19 0 01.3 0"/><path data-name="Shape" class="avcls-1" d="M31.7 10.2c-.1-.1-.1-.3-.2-.4s-.2-.1-.3-.2v-.2l-.1-.1c-.1-.2-.1-.3-.3-.3 0-.2-.1-.2-.3-.3v-.1a.1.1 0 00-.1-.1h-.1c-.1-.1-.2-.2-.2-.3s-.2-.2-.3-.3l-.1-.1c-.1 0-.2 0-.2-.1s-.2-.3-.3-.4 0-.4-.1-.7c0-.1-.1-.1-.2-.1a.1.1 0 01-.1-.1c-.1-.1 0-.3-.1-.4s-.3-.3-.4-.5a.37.37 0 00-.3-.1h-.1l-.1-.1c-.1-.1-.2-.2-.3-.2s-.4 0-.6-.1-.4 0-.5.2-.3.2-.5.2 0 .1 0 .2-.2.2-.1.2h.2a.1.1 0 01.1.1c.1.1.2.2.2.3a.14.14 0 000 .2.37.37 0 01.1.3c0 .1.1 0 .1 0a.25.25 0 01.1.4v.3c.1.2.1.4.2.5l.1-.1c.1 0 .1-.1.2-.1.2-.2.4.2.5.3s0 .4.1.6a1.38 1.38 0 00.3.4.31.31 0 00.1.2l.1.1a.1.1 0 01.1-.1h.1c.2.2.2.6.5.6a.1.1 0 00.1.1c.1 0 .1-.1.2 0a.35.35 0 00.1.2h.3c.1 0 .1.1.2.2l.1.1c.2.2.3.5.5.7s.2.2.3.1v-.1a.22.22 0 00.2-.2l.3-.3c.1-.1.2-.1.3-.2.3 0 .2-.2.2-.2M27.5 10.3c0 .1.1.1.2.1s.1.2.2.2.1-.1.1-.2h.1c.1-.1 0-.3-.1-.4s-.1-.2-.3-.2-.1 0-.2.1 0 .2 0 .3v.1M28.2 10.7c-.1.2 0 .4 0 .6s-.2.1-.2.2a.14.14 0 000 .2c0 .1.2.1.3.2a1.17 1.17 0 01.6.6.37.37 0 01.1.3c.1.1.2.1.2.2s.1.1.1 0a.3.3 0 000-.4c-.1-.1-.1-.1-.1-.2a2.35 2.35 0 00-.2-.8l-.3-.3v-.1c0-.1.1-.1.1-.2s-.1-.2-.2-.3c-.2-.1-.3-.1-.4 0M29.7 12.1v-.2c0-.2-.2-.2-.3-.2h-.1v.2a2.93 2.93 0 01.3 1c0 .1.3 0 .3-.1v-.2c0-.1-.1-.1-.1-.2s-.1-.2-.1-.3M29.3 11.2c-.1.1 0 .2 0 .3.1 0 .1 0 .1-.1s0-.1-.1-.2M29.3 11c0-.1 0-.1-.1-.1s-.1.1-.2.1 0 .1.1.2c.2 0 .3-.1.2-.2M28.8 10.5c.1.1 0 .2.1.2s.2.1.3 0 0-.1-.1-.1v-.1H29c-.1-.1.1-.1 0-.2v-.1h-.1v.1c-.1.1-.2.2-.1.2M28.7 9.9c-.1 0-.2 0-.2-.1h-.1s-.1.1 0 .1a.1.1 0 01.1.1c0 .1.1 0 .1.1s.1.1.1 0V10s.1-.1 0-.1M21.6 14.5a.14.14 0 000-.2.1.1 0 00-.1.1c.1 0 .1 0 .1.1"/><path data-name="Shape" class="avcls-1" d="M29.4 13.2a.6.6 0 00-.4.1c-.2.1-.3.4-.4.6a.52.52 0 01-.4.2.1.1 0 01-.1-.1v-.2l.1-.1c.1-.1 0-.2 0-.3s-.3-.4-.5-.3-.3.3-.5.5c-.1-.1-.2-.2-.2-.3v-.1c.1 0 .2.2.2.1s0-.2-.1-.2-.1-.1-.2-.1-.1-.1-.2-.2 0-.3-.1-.3a.37.37 0 01-.3-.1h-.2v-.1c.1 0 .3 0 .2-.2s-.1-.1-.2-.1H26v.3a.37.37 0 01-.3.1h-.1c-.1 0-.2-.1-.3-.1s-.1.2-.2.2-.1 0-.2.1-.1.2 0 .3v.1a.1.1 0 01-.1-.1c0-.1-.1-.2-.1-.3s.1-.2.2-.3v-.2c-.1-.1-.1-.1-.2-.1s-.3.4-.5.3-.2-.2-.3-.2-.1-.1-.2 0a2.19 2.19 0 01-.5.3c-.1.1-.3.2-.3.4a.38.38 0 01-.6.1c-.1-.1-.2-.2-.3-.2s-.2.2-.3.2-.1 0-.2-.1v-.1l.6-.3c.1 0 .1-.1.1-.2V12a.68.68 0 00-.6.4.1.1 0 01-.1.1c-.2 0-.3.1-.5 0l-.1-.2c-.1.1-.1.2-.2.2l-.1.1c-.1.1.1.3 0 .4s-.2.1-.3.1v.2c0 .1.1 0 .1.1s.1.3.2.3.3 0 .5.1.2.1.3.2.1.1.1.2a.1.1 0 00.1.1h.2c.1 0 0 .1.1.2a.76.76 0 00.1.4s0 .2-.1.2a.1.1 0 00-.1.1v.3h.1c.1.1.1.2.2.3l.1.1a.1.1 0 00-.1.1.14.14 0 00.2 0c.1 0 .1-.1.2-.1a.1.1 0 00.1-.1.35.35 0 01.1.2c-.1.1-.3 0-.4.1s-.1 0-.2.1a.1.1 0 00.1.1c.2.1.1.4-.1.6v.2H22c-.2 0-.5-.1-.7 0s-.1.1-.1.2a.1.1 0 00-.1.1v.2c-.2.2-.2.5-.3.7a.1.1 0 00.1.1c.1 0 .1-.1.2-.1s.1.2.1.2.2.1.2 0a.37.37 0 01.1-.3c0-.1-.1-.2-.1-.3s0-.2.1-.2a.1.1 0 01.1.1v.4a.14.14 0 010 .2.1.1 0 01-.1.1v.2c-.1.1-.1.1-.1.2-.2 0-.4-.1-.3-.3-.1 0-.1 0-.2.1v.3c-.1.1-.1.2-.2.3v.1c-.1.1-.2.2-.3.2-.1.1-.2 0-.2.1s.1.2.1.3 0 .1-.1.2h-.4a.37.37 0 01-.1.3c-.1.1 0 .2.1.2s.1.2.2.2.1.1.2.1a.22.22 0 00.2-.2c0-.1.1 0 .2 0h.1a.14.14 0 000-.2l.4-.4c.1 0 .1-.1.2-.1s.1.1.2.1.1.1.2.1h.1c.1 0 .2.2.3.2a.37.37 0 00-.1-.3c-.1-.1-.2-.2-.3-.2v-.1c.1.1.1.1.2.1s.1.2.2.3.1.1.2.1a.37.37 0 00.3-.1c0-.1 0-.1-.1-.1s0-.1.1-.2 0-.2 0-.3v-.1c.1-.1 0-.2 0-.4 0 .1.1.1.2.1a.22.22 0 00.2-.2.19.19 0 01.3.1c0 .1 0 .2-.1.2a.76.76 0 00-.5.2l-.1.1c-.1.1-.1.1-.1.2l-.1.1a.1.1 0 01.1.1.37.37 0 00.3-.1v-.2c.1 0 .1-.1.2-.1s.3.2.2.3h-.1c-.1.1-.2.3-.3.3s-.5.1-.7.2-.1.2-.2.2-.2.1-.3 0c0 .1-.2 0-.3 0a.31.31 0 00-.1-.2h-.1v-.1h-.8a.1.1 0 00-.1.1l-.1.1a.37.37 0 01-.3.1.37.37 0 00-.3.1c-.2 0-.3.2-.4.3a.37.37 0 01-.3.1v.1c-.2 0-.3.3-.4.5v.2c-.1.1-.1.3-.3.4v.1c.1.2.3.3.5.5a.1.1 0 00.1.1c.1.1.1.2.2.4s.3.2.5.2a.35.35 0 01.2.1c.2 0 .5.1.7 0 .3.1.7 0 1 .1.1 0 .1.1.1.2s.2.3.3.4a.6.6 0 00.4.1.31.31 0 00.1.2c0 .1 0 .1.1.2s.1.1.1.2-.1.2-.1.4v.2a2.65 2.65 0 00.6.5s.1 0 0 .1c.1 0 .1.1.2.2s0 .1.1.2l.3.3a.6.6 0 00.4.1.1.1 0 01.1.1c.1 0 .3.1.4 0s.1-.2.2-.2a.6.6 0 01.4-.1.1.1 0 00.1-.1c0-.1.1-.1.1-.2s.2-.1.3-.1.3-.3.5-.4.4-.1.5-.2 0-.4 0-.6.1-.2.1-.3v-.5c0-.1-.1-.2-.1-.3s.1-.1.2-.1.1-.3.2-.4a.1.1 0 00.1-.1c.1 0 0-.1 0-.2a.1.1 0 01-.1-.1 1.21 1.21 0 00-.5-.5.1.1 0 01-.1-.1v-.1c-.1 0 0-.1-.1-.1h.1c.1-.1.1-.3.2-.4a.1.1 0 00.1-.1v-.3c-.1-.1 0-.3 0-.4a2.2 2.2 0 00-.1-.8c0-.1-.1-.1-.2-.1a.1.1 0 01-.1.1.31.31 0 01-.1.2c0 .1-.2.1-.2.2s0 .1-.1.2l-.1.1c.4-.3.3-.3.3-.2h-.3a14.24 14.24 0 00-1.6-.5h.3c.1 0 0-.1 0-.1s.2.1.3.2.5.1.7.2.3.2.5.2.3-.1.4-.1v-.1c.1-.1.2-.2.2-.3v-.3l.1-.1v-.4a.1.1 0 00.1-.1v-.3a.75.75 0 00-.1-.5c0-.1-.1-.1-.2-.1a.1.1 0 01-.1.1c-.1 0-.2 0-.2.1a.1.1 0 00-.1.1.52.52 0 01-.4.2c-.1 0-.2 0-.2-.1s.2-.2.4-.2l.1-.1a.22.22 0 01.2-.2h.2c.1 0 .1-.1.2-.1a.31.31 0 01.1-.2c0-.1.1-.1.2-.2s.1-.4.2-.6 0 .1.1.2a.19.19 0 00.3 0c.1-.1 0-.2.1-.2h.1c.1 0 .1.1.2.1a.35.35 0 01.2-.1h.3c.2-.1.6 0 .6-.2a.86.86 0 00-.6-.7c-.2-.1-.1-.4-.3-.6-.1 0 0-.1-.1-.2l-.1-.1-.1-.1v-.5c0-.1.1-.1.2-.1s.2-.1.2-.2v-.4l.1-.1c.2 0 .5.1.7-.1.1 0 .1-.1.1-.2a1 1 0 00.4-.8c-.1.1 0 .1 0-.1.1.1.1 0 0 0m-4.5 5.4c-.1.1-.1.1-.2 0s-.1-.1-.1-.2-.1 0-.1.1h-.2c0-.1-.1-.1-.1-.2s0-.2.1-.2.1 0 .1.1v.1c.1.1.1 0 .2 0h.3c0 .1.1.2 0 .3M15.6 36c1.3-1.9 5.2-3.9 9-3.9s8 2.2 9.6 1a8.38 8.38 0 01-5.1 1.4c-3.4 0-4.7-1.7-7-1.7s-4.8 1.9-5.9 3.5zM27.7 31.8a5.34 5.34 0 001.7-1.9 14.44 14.44 0 013.7-4.4s-1.7 5.5-3.5 5.7c0 0-.3.2.2.1s2.8-.9 3.6-1.1a8.58 8.58 0 003.3-1.1 1.48 1.48 0 01.8-.4s-2.2 3.7-6.2 3.7a17.1 17.1 0 01-3.6-.6"/><path data-name="Shape" class="avcls-1" d="M32.4 29.9a3.92 3.92 0 00.5-1.7 14.64 14.64 0 012.7-6.3s.3 4.3-1.9 7c0 0-.1.4.1.1a22.93 22.93 0 014.6-3.9s1.5-1.3 1.6-1.7c0-.1-1.2 6.1-7.6 6.5"/><path data-name="Shape" class="avcls-1" d="M36.1 25.8a5.62 5.62 0 00.2-1.3c0-.6-.3-2.6-.3-3.5a7.53 7.53 0 01.8-3.7 4.5 4.5 0 00.2 1.4 12.29 12.29 0 01.5 2.5 10.27 10.27 0 01-.4 2.5 2.13 2.13 0 00.6-.8 12.81 12.81 0 012.2-2.8 5.62 5.62 0 001.4-2.1 6.08 6.08 0 01-1.2 4.1c-1.5 2.1-2.1 1.8-2.9 2.6a11.41 11.41 0 01-1.1 1.1"/><path data-name="Shape" class="avcls-1" d="M38.4 20.9a3.87 3.87 0 00-.3-1.6 10.5 10.5 0 01-1.3-5.9s.2-.2.6 1 1 1.6 1.2 2.8a12 12 0 01.2 1.7s.1.2.1 0a9 9 0 01.8-3.2c.7-1.5 1.6-2.9 1.5-3.9 0 0 .4 0 .3 1.6.1 1.6-.3 4.4-3.1 7.5"/><path data-name="Shape" class="avcls-1" d="M39.2 16.1a12 12 0 00-.8-1.5c-.3-.4-2.7-3.7-2.9-5.3 0 0 .2-.1.4.3a12.94 12.94 0 001.5 1.7 5 5 0 011.5 2.8s.1.1-.1-2.1.7-3.7-.1-5.3c0 0 1.1.2 1.7 4.8a9.68 9.68 0 01-.9 3.6c.1-.1-.2 1-.3 1"/><path data-name="Shape" class="avcls-1" d="M38.3 11a9.94 9.94 0 00-1.6-1.3 9.58 9.58 0 01-3.3-4.3s.1-.2.8.7c.5.7 1.1.4 2.7 2.4 0 0 .2.5.3.4s-.1-.5-.1-.5-.1-1.2-.1-1.6a15.83 15.83 0 00-.9-3.1 5.82 5.82 0 012.5 4.7c-.1 0-.2 2.5-.3 2.6"/><path data-name="Shape" class="avcls-1" d="M36.5 7.3s.1-3-3.8-4.6c0 0 1.4 2.8 2.4 3.5a11.57 11.57 0 011.4 1.1M26.3 36c-1.3-1.9-5.2-3.9-9-3.9s-8 2.2-9.6 1a8.38 8.38 0 005.1 1.4c3.4 0 4.7-1.7 7-1.7s4.8 1.9 5.9 3.5zM14.2 31.8a5.34 5.34 0 01-1.7-1.9 14.44 14.44 0 00-3.7-4.4s1.7 5.5 3.5 5.7c0 0 .3.2-.2.1s-2.8-.9-3.6-1.1a8.58 8.58 0 01-3.3-1.1 1.24 1.24 0 00-.8-.4s2.2 3.7 6.2 3.7a17.1 17.1 0 003.6-.6"/><path data-name="Shape" class="avcls-1" d="M9.5 29.9a3.92 3.92 0 01-.5-1.7 14.64 14.64 0 00-2.7-6.3s-.3 4.3 1.9 7c0 0 .1.4-.1.1a22.93 22.93 0 00-4.6-3.9S2 23.8 1.9 23.4c0-.1 1.2 6.1 7.6 6.5"/><path data-name="Shape" class="avcls-1" d="M5.8 25.8a5.62 5.62 0 01-.2-1.3c0-.6.3-2.6.3-3.5a7.53 7.53 0 00-.8-3.7 4.5 4.5 0 01-.2 1.4 12.29 12.29 0 00-.5 2.5 10.27 10.27 0 00.4 2.5 2.13 2.13 0 01-.6-.8A12.81 12.81 0 002 20.1 5.62 5.62 0 01.6 18a6.08 6.08 0 001.2 4.1c1.5 2.1 2.1 1.8 2.9 2.6.1 0 1 1.1 1.1 1.1"/><path data-name="Shape" class="avcls-1" d="M3.5 20.9a6.93 6.93 0 01.3-1.6 10.5 10.5 0 001.3-5.9s-.2-.2-.6 1-1 1.6-1.2 2.8a8.18 8.18 0 00-.3 1.7s-.1.2-.1 0a9 9 0 00-.8-3.2C1.4 14.2.5 12.8.6 11.8c0 0-.4 0-.3 1.6a11 11 0 003.2 7.5"/><path data-name="Shape" class="avcls-1" d="M2.7 16.1a12 12 0 01.8-1.5c.3-.4 2.7-3.7 2.9-5.3 0 0-.2-.1-.4.3a12.94 12.94 0 01-1.5 1.7A5 5 0 003 14.1s-.1.1.1-2.1-.7-3.7.1-5.3c0 0-1.1.2-1.7 4.8a9.68 9.68 0 00.9 3.6c-.1-.1.2 1 .3 1"/><path data-name="Shape" class="avcls-1" d="M3.6 11a9.94 9.94 0 011.6-1.3 9.58 9.58 0 003.3-4.3s-.1-.2-.8.7c-.5.7-1.1.4-2.7 2.4 0 0-.2.5-.3.4s.1-.5.1-.5a13.88 13.88 0 00.3-1.7A15.83 15.83 0 016 3.6a5.82 5.82 0 00-2.5 4.7 12.21 12.21 0 00.1 2.7"/><path data-name="Shape" class="avcls-1" d="M5.4 7.3s-.1-3 3.8-4.6c0 0-1.4 2.8-2.4 3.5a11.57 11.57 0 00-1.4 1.1"/></symbol>
-		<symbol viewBox="0 0 19.25 14" id="cd-icon--pdf" xmlns="http://www.w3.org/2000/svg"><path data-name="Path 1010" d="M16.188.411V0l3.063 3.063H16.53a.342.342 0 01-.341-.341zm3.063 3.526v9.188a.875.875 0 01-.875.875H.876a.875.875 0 01-.875-.875V.875A.875.875 0 01.876 0h14.438v2.721a1.218 1.218 0 001.216 1.216zM7.439 6.562A1.314 1.314 0 006.127 5.25H4.815a.437.437 0 00-.437.438v4.375a.438.438 0 00.875 0v-1.75h.875a1.314 1.314 0 001.313-1.312zm3.938 0a1.314 1.314 0 00-1.312-1.312H8.75a.437.437 0 00-.437.438v4.375a.437.437 0 00.438.438h1.313a1.314 1.314 0 001.313-1.312zm3.938-.875a.437.437 0 00-.437-.437h-2.187a.437.437 0 00-.437.438v4.375a.438.438 0 00.875 0v-1.75H14a.438.438 0 000-.875h-.875V6.126h1.75a.437.437 0 00.438-.438zm-5.25.438H9.19v3.5h.875a.438.438 0 00.438-.437V6.563a.438.438 0 00-.44-.438zm-3.937 0h-.875v1.313h.875a.438.438 0 00.438-.437v-.437a.438.438 0 00-.441-.439z"/></symbol>
+		<symbol viewBox="0 0 28 48" id="cd-icon--help" xmlns="http://www.w3.org/2000/svg"><circle class="lcls-1" cx="14" cy="44" r="4"/><path class="lcls-1" d="M28 14a14 14 0 00-28 0 4 4 0 008 0 6 6 0 116 6 4 4 0 00-4 4v9a4 4 0 008 0v-5.59A14.02 14.02 0 0028 14z"/></symbol>
+		<symbol viewBox="0 0 41.9 37" id="cd-icon--ocha-logo" xmlns="http://www.w3.org/2000/svg"><path class="mcls-1" d="M17.6 15.6a3.3 3.3 0 113.3 3.3v-.4a2.9 2.9 0 10-2.9-2.9 2.9 2.9 0 002.9 2.9v.4a3.33 3.33 0 01-3.3-3.3"/><path data-name="Shape" class="mcls-1" d="M15 15.6a6 6 0 116 6v-.4a5.6 5.6 0 10-5.6-5.6 5.59 5.59 0 005.6 5.6v.4a6 6 0 01-6-6"/><path data-name="Shape" class="mcls-1" d="M12.1 15.6a8.9 8.9 0 118.9 8.9V24a8.54 8.54 0 008.5-8.4 8.5 8.5 0 10-17 0A8.41 8.41 0 0021 24v.4a8.77 8.77 0 01-8.9-8.8"/><path data-name="Shape" class="mcls-1" d="M9.3 15.6A11.65 11.65 0 1121 27.2v-.4A11.2 11.2 0 109.8 15.6 11.18 11.18 0 0021 26.8v.4A11.63 11.63 0 019.3 15.6"/><path data-name="Shape" class="mcls-1" d="M6.3 15.6A14.7 14.7 0 1121 30.3v-.4A14.3 14.3 0 106.7 15.6 14.3 14.3 0 0021 29.9v.4A14.66 14.66 0 016.3 15.6"/><path class="mcls-1" d="M20.7 1.1h.4v11.4h-.4z"/><path data-name="Shape" class="mcls-1" d="M10.6 5.5l.3-.3 8 8-.3.3-8-8z"/><path data-name="Rectangle-path" class="mcls-1" d="M6.5 15.4h11.4v.4H6.5z"/><path data-name="Shape" class="mcls-1" d="M10.6 25.7l8-8 .3.3-8 8-.3-.3z"/><path data-name="Rectangle-path" class="mcls-1" d="M20.7 18.7h.4v11.4h-.4zM23.014 17.902l.283-.282 7.967 8.014-.284.282zM24.1 15.4h11.4v.4H24.1z"/><path data-name="Shape" class="mcls-1" d="M23 13.2l8.1-8 .2.3-8 8-.3-.3zM18.7 16.5c.1 0 .1.1.1.2h.1a2.51 2.51 0 00.4-.7.1.1 0 00.1-.1c0-.1-.2-.2-.2-.3-.1.2-.3 0-.4.1v.1h.1v.2a.37.37 0 00-.3-.1c.1 0 0 0 0 .1a.75.75 0 00-.5.1c-.1 0-.1 0-.2-.1-.1.1-.1.2-.2.2l-.1-.1c.1-.1.2-.1.2-.2v-.3c.1-.1.1-.2.2-.2s.3.1.4 0l.1.1v.1c-.1.1-.2.1-.2.2s0 .1.1.1.1-.1.2-.1h.4c.1 0 .1-.3 0-.4v-.2c0-.1.2-.1.2 0v.1s0 .1.1 0v-.2a.35.35 0 00.2.1h.2c.1 0 .1-.1 0-.2h-.1a.31.31 0 01-.2.1c-.1 0-.1-.1-.2-.1s-.2.1-.2 0-.1-.1-.1-.2l.1-.1a.37.37 0 00.3-.1.35.35 0 01.1-.2h.1a.37.37 0 00.3-.1c.1 0 .2-.1.3-.2s.1-.1.2-.1a.1.1 0 01.1-.1v-.5a.1.1 0 01.1-.1h-.1s-.1-.1 0-.1.2 0 .2-.1a.19.19 0 00-.1-.3c-.1-.1-.2 0-.3 0a.1.1 0 01-.1.1c-.1 0-.2-.1-.1-.2v-.1h-.1l-.3.3v.1c0 .1 0 .2-.1.2h-.1c0 .1.2.1.1.2s-.2.1-.4.2a2.72 2.72 0 01-.9 0h-.5c-.1 0-.1.1-.2.2v-.2c0-.1-.1 0-.1-.1-.2-.4-.7-.3-1.1-.3a.1.1 0 00-.1.1c-.1.1-.2 0-.3 0l-.1.1c-.1 0-.2-.1-.3 0s-.1.1-.2.1v.1h-.1c-.1 0-.3 0-.3.1s0 .3-.1.3a.6.6 0 00-.4.1c-.1 0-.1.1-.2.1a2.45 2.45 0 00-.4 1.2v.1c-.2.4-.3.6-.6 1.1-.1.2-.2.6 0 .7s0 .2-.2.2-.4 0-.4-.2-.2-.1-.3-.1h-.4c-.2 0-.2.3-.3.4s-.3.1-.3.2v.2a.1.1 0 00-.1.1v.1c0 .2-.1.3 0 .5v.1a.9.9 0 01-.1.5c-.1.2-.3.2-.5.2h-1c-.1 0-.1-.1-.2-.1a.31.31 0 01-.1-.2c-.1-.1-.3 0-.4.1.1 0 0 .1 0 .1s-.2.1-.3.2-.2-.2-.2-.3-.1-.1-.2-.1v.1h-.1c-.1.1.1.1.1.1v.1h-.1a.1.1 0 01-.1.1c-.1 0-.1.1-.1 0v-.2h-.1c0 .1 0 .1-.1.1v.1h.2a.37.37 0 01.1.3c0 .1 0 .2-.1.1s0-.2 0-.3h-.1c.1.2-.1.3.1.5s-.2.2-.1.2a.35.35 0 00.2.1v-.1s.1-.1.1 0v.1H8v.4c0 .1.2 0 .2.1s-.1.1 0 .2a.1.1 0 01.1.1v.1a.1.1 0 01.1.1c.1 0 .1 0 .1-.1s.1-.1.1-.2 0-.1-.1 0V21c0-.1-.1-.1-.1-.2s.1 0 .2-.1a.1.1 0 01.1.1v.1a.1.1 0 01.1.1c.1 0 .1.1.2.2h.3v-.1l.1.1a.37.37 0 00.1.3h.1l.1.1h.1a.1.1 0 01.1.1c.1 0 .2 0 .2.1s.1.2.2.4a29772.51 29772.51 0 01.2.2.37.37 0 00.3.1.35.35 0 01.2-.1h.1c.1.2.1.4.3.4s.1.1.2.2h.2a.1.1 0 00.1.1c.1.1.2.1.2.2v.1c.1 0 .2-.1.2 0s.2.1.2.2h.1v-.1c0-.1.1 0 .2-.1s.1-.2.1-.2.2.1.3.2h.1c.1.1.1.3.2.3s.2.1.4.2.2.1.3.1h.1c.1 0 .1 0 .2-.1s.3-.1.4-.2l.1-.1c.2-.1.5.1.7 0s.1 0 .2-.1.2-.3.1-.4-.2-.5-.3-.7l-.3-.3h-.1c-.1 0-.1-.1-.1-.2a.1.1 0 01-.1-.1v-.3c-.1 0-.2-.1-.4-.1a.1.1 0 01-.1-.1v-.1a.37.37 0 01.3-.1v-.3a.1.1 0 00-.1-.1c0-.1.1-.2 0-.3s-.2-.2-.2-.3a.1.1 0 01-.1-.1v-.5c0-.1-.1-.1 0-.2l.1-.1c.1 0 .1-.1.1-.2a.14.14 0 00-.2 0v-.3l-.1-.1v-.2s0-.1-.1 0v-.2c0-.1-.1-.2-.2-.1a.14.14 0 01-.2 0V18a.1.1 0 00.1-.1.14.14 0 000-.2c-.1-.1-.2-.2-.1-.3-.1 0-.3 0-.3-.2s0-.3-.1-.4v-.3a.1.1 0 01.1-.1c.2 0 .4 0 .4-.1s-.1-.3 0-.3.4 0 .6-.2c.1 0 .1-.1 0-.2a.35.35 0 00-.1-.2c-.1-.1-.2 0-.3-.2V15c0-.1.1-.1.2-.2s.3 0 .5.1l.1.1v.1c0 .2.1.4 0 .6s-.1.1-.1.2h.1c0 .1.1.3 0 .4s-.1 0-.3 0-.1 0-.1.1l.1.1c.4.1.5.1.9.2.1 0 .1.1.2.1h.3a.1.1 0 00.1.1c.1.1.1.3.2.3a.14.14 0 01.2 0c-.1.1 0 .2 0 .3s.2.1.3.2.2.1.2 0-.1-.2 0-.3c.1.2 0 .4.1.6.1.1.1.2.2.2s.1-.1.1-.2v-.1c0-.1 0-.1.1-.2s.1-.2.1-.3v-.1c0-.1.2-.2.3-.2V17c.1 0 0-.2.1-.2s.1-.1.1-.2.1-.1 0-.1c.5.1.5 0 .5 0"/><path data-name="Shape" class="mcls-1" d="M14.5 16.3h-.1v.1l.1.1v.3c0 .1.1.2.2.1s.2-.3.1-.4-.1-.1-.3-.2M14.3 17.2c.1.2.2.1.3.1v-.1c-.1-.1-.1-.1-.3 0 .1-.1 0-.1 0-.1v.1M14.6 17.6c0-.2-.1-.2-.2-.1s0 .3.1.4a.1.1 0 00.1.1c0 .1.1 0 .2 0s0-.1.1-.1c-.1-.1-.2-.3-.3-.3"/><path data-name="Shape" class="mcls-1" d="M14.3 16.8c0-.1-.1-.1 0 0-.1 0-.1 0-.1.1s0 .2.1.2a.1.1 0 00.1-.1c-.1-.1-.1-.1-.1-.2M14.7 17.4l.1-.1h.1v-.1c-.1 0-.1.1-.2.1s0 .1 0 .1M14.6 18.3c0 .1 0 .1.1.1h.1v-.1h-.2M14.8 19c0-.1.1-.1 0-.2h-.1a.35.35 0 00.1.2M8.5 21.5v.1h.2c-.1 0-.1-.2-.2-.1M9.1 22.2c-.1.1.1.2.2.2v-.2a.14.14 0 00-.2 0M9.4 22.6c0 .2.1.3.2.3.1-.2 0-.3-.2-.3M19.5 17.4a1.27 1.27 0 01.6-.1c.4 0 .4-.6.6-.9a.6.6 0 00-.1-.4c-.1-.2-.6 0-.7-.2s.3.1.3-.1 0-.1-.1-.2h-.2a2 2 0 00-.4.8 5.38 5.38 0 00-.9 1.2c0 .1 0 .1.1.2.3.1.6-.2.8-.3M21.3 16.4c-.1 0-.1 0-.2.1v.2h.1c0-.1 0-.1-.1-.1.2-.1.2-.2.2-.2M20 17.9c.1.2.5.1.5 0s-.3-.2-.4-.2.1.1-.1.2M20.5 19.2a.37.37 0 00.1-.3l-.3.3h.2M22.3 16.5v-.1h-.2c-.1 0-.1-.1-.1-.2s-.1-.2-.1-.3-.1.2-.1.2c.2.2.3.5.5.4M19.9 15.3c-.1-.1-.1 0 0 0-.1.1 0 .1 0 0M8.1 19.1A.1.1 0 008 19h-.1v.1a.14.14 0 00.2 0M8.8 19.1c.1 0 .2-.1.1-.2s-.3 0-.2.1c-.1.1 0 .2.1.1M20.2 12.1c0-.1.1-.1.1-.2h-.1c-.1 0-.1.1 0 .2M20.5 12s.1-.1 0-.1h-.1a.1.1 0 00.1.1M19.4 14.6c0 .1.2.3.3.2a.14.14 0 000-.2.19.19 0 00-.3 0M19.7 15.4v-.1h-.3a.1.1 0 00.1.1c0-.1.1 0 .2 0M19.4 15.6c-.1 0 0 .1 0 .2s.1 0 .2-.1.1-.2 0-.2-.2 0-.2.1M19.2 15.3c0 .1-.1.2 0 .3s.1 0 .1 0 0-.2.1-.2h-.1v-.1h-.1M26.8 22.4c.1 0 0-.1 0 0"/><path data-name="Shape" class="mcls-1" d="M21 18.5l-.1-.1c0-.1-.1.1-.2 0 .1.1 0 .1-.1.2a.1.1 0 00.1.1c0 .1-.1.1 0 .2l-.1.1s-.1.1 0 .1.2-.1.3-.1h.1c.1 0 .1-.1.2-.2H21s-.1 0 0-.3M21.6 20.4c0 .1.1.1 0 0 .1 0 .1-.1.1-.2h-.1v.2M21.7 20.2c.1 0 0-.1 0-.1h-.1a.1.1 0 00.1.1M22.3 20.5c-.1 0-.1-.1-.2 0H22v.1c.2-.1.2-.1.3-.1M23.3 20.4v-.1c-.1 0-.2.1-.3 0v.1h-.1c.2.1.3 0 .4 0M23.7 20c0 .2.2.1.2 0s0-.1-.2 0l.1-.1a.1.1 0 01-.1.1M28.5 16.8c0 .1.1.1.2.1a.37.37 0 00.3-.1.27.27 0 00-.3-.3c-.2.1-.2.2-.2.3M28.5 21.9h-.1c-.1.5-.6 1.2 0 1.5.2.2.5-.1.6-.3s0-1-.5-1.2M27 19.7c-.1 0-.1.2 0 .2a.1.1 0 00.1-.1v-.1H27M27.4 24.8v.2s.2-.1 0-.2M29.7 13.1h-.1v.2c-.2.4-.7.9-.4 1.4a1.38 1.38 0 00.3-.4 10.37 10.37 0 00.4-1s-.1-.2-.2-.2M28.8 14.9c0 .1 0 .1.1.1s.1-.1 0-.1 0-.1-.1 0M23.7 11.8c-.1-.2-.2 0-.3 0l-.1-.1h-.1c-.1 0 0 .2.1.2s.1-.1.1 0 0 .3.2.2.2-.1.3-.1.1-.1.1-.2.2-.1.3 0a.1.1 0 00.1.1c0 .1.1.1.2.1a.37.37 0 00.3-.1.19.19 0 000-.3h-.2c-.1 0-.1-.1-.2-.1-.4-.1-.6.2-.8.3M22.7 12h.3c0-.2-.2-.1-.3-.1.1-.1.1 0 0 .1"/><path data-name="Shape" class="mcls-1" d="M23.1 12.6c.1-.1.3-.2.4-.3v-.1c0-.1-.1-.1-.2-.2a.1.1 0 01-.1.1c-.1.1-.2.1-.2.2v.2c.1.3.1.2.1.1M21.6 11.6v.1c.1.1.1 0 0-.1M18 9.4a.6.6 0 00.4.1l.1-.1c-.1-.1-.2 0-.2-.1h-.1c-.1-.1-.2 0-.2.1M27.1 11c0 .1-.1 0-.2.1v.1c.1.1.2 0 .3 0s.1-.1.1 0v.1a.1.1 0 00-.1.1h-.3v.2c-.1.1-.4.2-.3.4a.75.75 0 00.5.1c0-.2.1-.2.2-.3a.1.1 0 00-.1-.1v-.1a.1.1 0 00.1-.1v-.1a.35.35 0 00.2-.1c0-.1-.1-.2-.1-.3a.1.1 0 01.1-.1v-.1h-.1s-.1 0 0 .1a.37.37 0 00-.3.1c0-.2.1 0 0 0M26.1 12c0 .1.1.1.2 0h-.2M27.5 11.8c-.1.1.1.1.2.1 0-.1-.1-.1-.2-.1M27.9 11.3c-.1 0-.1.1 0 0M25.6 7.3c.1.1.2.1.2.2v.4l.1.1v.2c0 .1.1.3.1.4a.1.1 0 01.1.1c0 .1 0 .1.1.2s.1 0 .2.1.2.3.3.4a.1.1 0 01.1.1v.1c.2 0 .5.1.4.4.1-.1.2-.1.2-.2s.1-.3 0-.4l-.2-.2V9a.1.1 0 00-.1-.1c0-.1-.1-.3.1-.3v-.1H27v-.1a.35.35 0 00-.4-.4c-.1-.1-.1-.1-.2-.1h-.2a2.09 2.09 0 01-.4-.6.19.19 0 00-.3 0c.1-.1.1-.1.1 0"/><path data-name="Shape" class="mcls-1" d="M24.7 7.6a.14.14 0 000 .2h.4a.1.1 0 00.1-.1c.1-.1.2 0 .4-.1 0 .1 0 .1.1.1s0-.2-.1-.2-.1-.2-.2-.3h-.1c0 .2-.1.1-.3.2v.1-.1h-.2a.35.35 0 01-.1.2M22.4 3.7c-.1-.2-.3-.4-.2-.7a1.39 1.39 0 00.9 0c.2-.1.5 0 .7-.1v-.2c-.3.1-.5-.2-.7-.1a3.18 3.18 0 01-.9.3c-.2.1-.9 0-.9.4.3 0 .7 0 .9.3 0 .1.1.1.2.1M23.4 5.2a.4.4 0 00.4.2c0-.1 0-.1-.1-.2h-.3M23.1 5.7c-.1 0 0 .1.1.2 0-.1.1-.3-.1-.2M22.9 5.4c.1-.1 0-.2-.1-.2v.1l.1.1M23.8 6.5a.31.31 0 00.1-.2h-.1a.14.14 0 000 .2M24.1 6.5v.1c.1.1.1 0 0-.1.1 0 0 .1 0 0M24 6.8l.1-.1c0-.1-.1-.1-.2 0s.1 0 .1.1M24.1 6.8c0 .1.1.2.2.1s.1-.1 0-.1zM24.6 7a.35.35 0 00-.1-.2s-.1.1 0 .1 0 .1.1.1M24.7 7.3h.1v-.2h-.2v.1l.1.1M24.5 7.5c.1-.1.1-.1 0-.2h-.1a.1.1 0 01-.1.1c.1.1.1.1.2.1M24.2 2.5c-.1-.1-.1-.1-.2-.1.1.1.1.2.2.1M27.6 5c.1.1.2 0 .2.1s.1.2.2.2.1 0 .1-.1 0-.4-.2-.4h-.5c-.1 0-.1.1-.1.2a.19.19 0 01.3 0"/><path data-name="Shape" class="mcls-1" d="M31.7 10.2c-.1-.1-.1-.3-.2-.4s-.2-.1-.3-.2v-.2l-.1-.1c-.1-.2-.1-.3-.3-.3 0-.2-.1-.2-.3-.3v-.1a.1.1 0 00-.1-.1h-.1c-.1-.1-.2-.2-.2-.3s-.2-.2-.3-.3l-.1-.1c-.1 0-.2 0-.2-.1s-.2-.3-.3-.4 0-.4-.1-.7c0-.1-.1-.1-.2-.1a.1.1 0 01-.1-.1c-.1-.1 0-.3-.1-.4s-.3-.3-.4-.5a.37.37 0 00-.3-.1h-.1l-.1-.1c-.1-.1-.2-.2-.3-.2s-.4 0-.6-.1-.4 0-.5.2-.3.2-.5.2 0 .1 0 .2-.2.2-.1.2h.2a.1.1 0 01.1.1c.1.1.2.2.2.3a.14.14 0 000 .2.37.37 0 01.1.3c0 .1.1 0 .1 0a.25.25 0 01.1.4v.3c.1.2.1.4.2.5l.1-.1c.1 0 .1-.1.2-.1.2-.2.4.2.5.3s0 .4.1.6a1.38 1.38 0 00.3.4.31.31 0 00.1.2l.1.1a.1.1 0 01.1-.1h.1c.2.2.2.6.5.6a.1.1 0 00.1.1c.1 0 .1-.1.2 0a.35.35 0 00.1.2h.3c.1 0 .1.1.2.2l.1.1c.2.2.3.5.5.7s.2.2.3.1v-.1a.22.22 0 00.2-.2l.3-.3c.1-.1.2-.1.3-.2.3 0 .2-.2.2-.2M27.5 10.3c0 .1.1.1.2.1s.1.2.2.2.1-.1.1-.2h.1c.1-.1 0-.3-.1-.4s-.1-.2-.3-.2-.1 0-.2.1 0 .2 0 .3v.1M28.2 10.7c-.1.2 0 .4 0 .6s-.2.1-.2.2a.14.14 0 000 .2c0 .1.2.1.3.2a1.17 1.17 0 01.6.6.37.37 0 01.1.3c.1.1.2.1.2.2s.1.1.1 0a.3.3 0 000-.4c-.1-.1-.1-.1-.1-.2a2.35 2.35 0 00-.2-.8l-.3-.3v-.1c0-.1.1-.1.1-.2s-.1-.2-.2-.3c-.2-.1-.3-.1-.4 0M29.7 12.1v-.2c0-.2-.2-.2-.3-.2h-.1v.2a2.93 2.93 0 01.3 1c0 .1.3 0 .3-.1v-.2c0-.1-.1-.1-.1-.2s-.1-.2-.1-.3M29.3 11.2c-.1.1 0 .2 0 .3.1 0 .1 0 .1-.1s0-.1-.1-.2M29.3 11c0-.1 0-.1-.1-.1s-.1.1-.2.1 0 .1.1.2c.2 0 .3-.1.2-.2M28.8 10.5c.1.1 0 .2.1.2s.2.1.3 0 0-.1-.1-.1v-.1H29c-.1-.1.1-.1 0-.2v-.1h-.1v.1c-.1.1-.2.2-.1.2M28.7 9.9c-.1 0-.2 0-.2-.1h-.1s-.1.1 0 .1a.1.1 0 01.1.1c0 .1.1 0 .1.1s.1.1.1 0V10s.1-.1 0-.1M21.6 14.5a.14.14 0 000-.2.1.1 0 00-.1.1c.1 0 .1 0 .1.1"/><path data-name="Shape" class="mcls-1" d="M29.4 13.2a.6.6 0 00-.4.1c-.2.1-.3.4-.4.6a.52.52 0 01-.4.2.1.1 0 01-.1-.1v-.2l.1-.1c.1-.1 0-.2 0-.3s-.3-.4-.5-.3-.3.3-.5.5c-.1-.1-.2-.2-.2-.3v-.1c.1 0 .2.2.2.1s0-.2-.1-.2-.1-.1-.2-.1-.1-.1-.2-.2 0-.3-.1-.3a.37.37 0 01-.3-.1h-.2v-.1c.1 0 .3 0 .2-.2s-.1-.1-.2-.1H26v.3a.37.37 0 01-.3.1h-.1c-.1 0-.2-.1-.3-.1s-.1.2-.2.2-.1 0-.2.1-.1.2 0 .3v.1a.1.1 0 01-.1-.1c0-.1-.1-.2-.1-.3s.1-.2.2-.3v-.2c-.1-.1-.1-.1-.2-.1s-.3.4-.5.3-.2-.2-.3-.2-.1-.1-.2 0a2.19 2.19 0 01-.5.3c-.1.1-.3.2-.3.4a.38.38 0 01-.6.1c-.1-.1-.2-.2-.3-.2s-.2.2-.3.2-.1 0-.2-.1v-.1l.6-.3c.1 0 .1-.1.1-.2V12a.68.68 0 00-.6.4.1.1 0 01-.1.1c-.2 0-.3.1-.5 0l-.1-.2c-.1.1-.1.2-.2.2l-.1.1c-.1.1.1.3 0 .4s-.2.1-.3.1v.2c0 .1.1 0 .1.1s.1.3.2.3.3 0 .5.1.2.1.3.2.1.1.1.2a.1.1 0 00.1.1h.2c.1 0 0 .1.1.2a.76.76 0 00.1.4s0 .2-.1.2a.1.1 0 00-.1.1v.3h.1c.1.1.1.2.2.3l.1.1a.1.1 0 00-.1.1.14.14 0 00.2 0c.1 0 .1-.1.2-.1a.1.1 0 00.1-.1.35.35 0 01.1.2c-.1.1-.3 0-.4.1s-.1 0-.2.1a.1.1 0 00.1.1c.2.1.1.4-.1.6v.2H22c-.2 0-.5-.1-.7 0s-.1.1-.1.2a.1.1 0 00-.1.1v.2c-.2.2-.2.5-.3.7a.1.1 0 00.1.1c.1 0 .1-.1.2-.1s.1.2.1.2.2.1.2 0a.37.37 0 01.1-.3c0-.1-.1-.2-.1-.3s0-.2.1-.2a.1.1 0 01.1.1v.4a.14.14 0 010 .2.1.1 0 01-.1.1v.2c-.1.1-.1.1-.1.2-.2 0-.4-.1-.3-.3-.1 0-.1 0-.2.1v.3c-.1.1-.1.2-.2.3v.1c-.1.1-.2.2-.3.2-.1.1-.2 0-.2.1s.1.2.1.3 0 .1-.1.2h-.4a.37.37 0 01-.1.3c-.1.1 0 .2.1.2s.1.2.2.2.1.1.2.1a.22.22 0 00.2-.2c0-.1.1 0 .2 0h.1a.14.14 0 000-.2l.4-.4c.1 0 .1-.1.2-.1s.1.1.2.1.1.1.2.1h.1c.1 0 .2.2.3.2a.37.37 0 00-.1-.3c-.1-.1-.2-.2-.3-.2v-.1c.1.1.1.1.2.1s.1.2.2.3.1.1.2.1a.37.37 0 00.3-.1c0-.1 0-.1-.1-.1s0-.1.1-.2 0-.2 0-.3v-.1c.1-.1 0-.2 0-.4 0 .1.1.1.2.1a.22.22 0 00.2-.2.19.19 0 01.3.1c0 .1 0 .2-.1.2a.76.76 0 00-.5.2l-.1.1c-.1.1-.1.1-.1.2l-.1.1a.1.1 0 01.1.1.37.37 0 00.3-.1v-.2c.1 0 .1-.1.2-.1s.3.2.2.3h-.1c-.1.1-.2.3-.3.3s-.5.1-.7.2-.1.2-.2.2-.2.1-.3 0c0 .1-.2 0-.3 0a.31.31 0 00-.1-.2h-.1v-.1h-.8a.1.1 0 00-.1.1l-.1.1a.37.37 0 01-.3.1.37.37 0 00-.3.1c-.2 0-.3.2-.4.3a.37.37 0 01-.3.1v.1c-.2 0-.3.3-.4.5v.2c-.1.1-.1.3-.3.4v.1c.1.2.3.3.5.5a.1.1 0 00.1.1c.1.1.1.2.2.4s.3.2.5.2a.35.35 0 01.2.1c.2 0 .5.1.7 0 .3.1.7 0 1 .1.1 0 .1.1.1.2s.2.3.3.4a.6.6 0 00.4.1.31.31 0 00.1.2c0 .1 0 .1.1.2s.1.1.1.2-.1.2-.1.4v.2a2.65 2.65 0 00.6.5s.1 0 0 .1c.1 0 .1.1.2.2s0 .1.1.2l.3.3a.6.6 0 00.4.1.1.1 0 01.1.1c.1 0 .3.1.4 0s.1-.2.2-.2a.6.6 0 01.4-.1.1.1 0 00.1-.1c0-.1.1-.1.1-.2s.2-.1.3-.1.3-.3.5-.4.4-.1.5-.2 0-.4 0-.6.1-.2.1-.3v-.5c0-.1-.1-.2-.1-.3s.1-.1.2-.1.1-.3.2-.4a.1.1 0 00.1-.1c.1 0 0-.1 0-.2a.1.1 0 01-.1-.1 1.21 1.21 0 00-.5-.5.1.1 0 01-.1-.1v-.1c-.1 0 0-.1-.1-.1h.1c.1-.1.1-.3.2-.4a.1.1 0 00.1-.1v-.3c-.1-.1 0-.3 0-.4a2.2 2.2 0 00-.1-.8c0-.1-.1-.1-.2-.1a.1.1 0 01-.1.1.31.31 0 01-.1.2c0 .1-.2.1-.2.2s0 .1-.1.2l-.1.1c.4-.3.3-.3.3-.2h-.3a14.24 14.24 0 00-1.6-.5h.3c.1 0 0-.1 0-.1s.2.1.3.2.5.1.7.2.3.2.5.2.3-.1.4-.1v-.1c.1-.1.2-.2.2-.3v-.3l.1-.1v-.4a.1.1 0 00.1-.1v-.3a.75.75 0 00-.1-.5c0-.1-.1-.1-.2-.1a.1.1 0 01-.1.1c-.1 0-.2 0-.2.1a.1.1 0 00-.1.1.52.52 0 01-.4.2c-.1 0-.2 0-.2-.1s.2-.2.4-.2l.1-.1a.22.22 0 01.2-.2h.2c.1 0 .1-.1.2-.1a.31.31 0 01.1-.2c0-.1.1-.1.2-.2s.1-.4.2-.6 0 .1.1.2a.19.19 0 00.3 0c.1-.1 0-.2.1-.2h.1c.1 0 .1.1.2.1a.35.35 0 01.2-.1h.3c.2-.1.6 0 .6-.2a.86.86 0 00-.6-.7c-.2-.1-.1-.4-.3-.6-.1 0 0-.1-.1-.2l-.1-.1-.1-.1v-.5c0-.1.1-.1.2-.1s.2-.1.2-.2v-.4l.1-.1c.2 0 .5.1.7-.1.1 0 .1-.1.1-.2a1 1 0 00.4-.8c-.1.1 0 .1 0-.1.1.1.1 0 0 0m-4.5 5.4c-.1.1-.1.1-.2 0s-.1-.1-.1-.2-.1 0-.1.1h-.2c0-.1-.1-.1-.1-.2s0-.2.1-.2.1 0 .1.1v.1c.1.1.1 0 .2 0h.3c0 .1.1.2 0 .3M15.6 36c1.3-1.9 5.2-3.9 9-3.9s8 2.2 9.6 1a8.38 8.38 0 01-5.1 1.4c-3.4 0-4.7-1.7-7-1.7s-4.8 1.9-5.9 3.5zM27.7 31.8a5.34 5.34 0 001.7-1.9 14.44 14.44 0 013.7-4.4s-1.7 5.5-3.5 5.7c0 0-.3.2.2.1s2.8-.9 3.6-1.1a8.58 8.58 0 003.3-1.1 1.48 1.48 0 01.8-.4s-2.2 3.7-6.2 3.7a17.1 17.1 0 01-3.6-.6"/><path data-name="Shape" class="mcls-1" d="M32.4 29.9a3.92 3.92 0 00.5-1.7 14.64 14.64 0 012.7-6.3s.3 4.3-1.9 7c0 0-.1.4.1.1a22.93 22.93 0 014.6-3.9s1.5-1.3 1.6-1.7c0-.1-1.2 6.1-7.6 6.5"/><path data-name="Shape" class="mcls-1" d="M36.1 25.8a5.62 5.62 0 00.2-1.3c0-.6-.3-2.6-.3-3.5a7.53 7.53 0 01.8-3.7 4.5 4.5 0 00.2 1.4 12.29 12.29 0 01.5 2.5 10.27 10.27 0 01-.4 2.5 2.13 2.13 0 00.6-.8 12.81 12.81 0 012.2-2.8 5.62 5.62 0 001.4-2.1 6.08 6.08 0 01-1.2 4.1c-1.5 2.1-2.1 1.8-2.9 2.6a11.41 11.41 0 01-1.1 1.1"/><path data-name="Shape" class="mcls-1" d="M38.4 20.9a3.87 3.87 0 00-.3-1.6 10.5 10.5 0 01-1.3-5.9s.2-.2.6 1 1 1.6 1.2 2.8a12 12 0 01.2 1.7s.1.2.1 0a9 9 0 01.8-3.2c.7-1.5 1.6-2.9 1.5-3.9 0 0 .4 0 .3 1.6.1 1.6-.3 4.4-3.1 7.5"/><path data-name="Shape" class="mcls-1" d="M39.2 16.1a12 12 0 00-.8-1.5c-.3-.4-2.7-3.7-2.9-5.3 0 0 .2-.1.4.3a12.94 12.94 0 001.5 1.7 5 5 0 011.5 2.8s.1.1-.1-2.1.7-3.7-.1-5.3c0 0 1.1.2 1.7 4.8a9.68 9.68 0 01-.9 3.6c.1-.1-.2 1-.3 1"/><path data-name="Shape" class="mcls-1" d="M38.3 11a9.94 9.94 0 00-1.6-1.3 9.58 9.58 0 01-3.3-4.3s.1-.2.8.7c.5.7 1.1.4 2.7 2.4 0 0 .2.5.3.4s-.1-.5-.1-.5-.1-1.2-.1-1.6a15.83 15.83 0 00-.9-3.1 5.82 5.82 0 012.5 4.7c-.1 0-.2 2.5-.3 2.6"/><path data-name="Shape" class="mcls-1" d="M36.5 7.3s.1-3-3.8-4.6c0 0 1.4 2.8 2.4 3.5a11.57 11.57 0 011.4 1.1M26.3 36c-1.3-1.9-5.2-3.9-9-3.9s-8 2.2-9.6 1a8.38 8.38 0 005.1 1.4c3.4 0 4.7-1.7 7-1.7s4.8 1.9 5.9 3.5zM14.2 31.8a5.34 5.34 0 01-1.7-1.9 14.44 14.44 0 00-3.7-4.4s1.7 5.5 3.5 5.7c0 0 .3.2-.2.1s-2.8-.9-3.6-1.1a8.58 8.58 0 01-3.3-1.1 1.24 1.24 0 00-.8-.4s2.2 3.7 6.2 3.7a17.1 17.1 0 003.6-.6"/><path data-name="Shape" class="mcls-1" d="M9.5 29.9a3.92 3.92 0 01-.5-1.7 14.64 14.64 0 00-2.7-6.3s-.3 4.3 1.9 7c0 0 .1.4-.1.1a22.93 22.93 0 00-4.6-3.9S2 23.8 1.9 23.4c0-.1 1.2 6.1 7.6 6.5"/><path data-name="Shape" class="mcls-1" d="M5.8 25.8a5.62 5.62 0 01-.2-1.3c0-.6.3-2.6.3-3.5a7.53 7.53 0 00-.8-3.7 4.5 4.5 0 01-.2 1.4 12.29 12.29 0 00-.5 2.5 10.27 10.27 0 00.4 2.5 2.13 2.13 0 01-.6-.8A12.81 12.81 0 002 20.1 5.62 5.62 0 01.6 18a6.08 6.08 0 001.2 4.1c1.5 2.1 2.1 1.8 2.9 2.6.1 0 1 1.1 1.1 1.1"/><path data-name="Shape" class="mcls-1" d="M3.5 20.9a6.93 6.93 0 01.3-1.6 10.5 10.5 0 001.3-5.9s-.2-.2-.6 1-1 1.6-1.2 2.8a8.18 8.18 0 00-.3 1.7s-.1.2-.1 0a9 9 0 00-.8-3.2C1.4 14.2.5 12.8.6 11.8c0 0-.4 0-.3 1.6a11 11 0 003.2 7.5"/><path data-name="Shape" class="mcls-1" d="M2.7 16.1a12 12 0 01.8-1.5c.3-.4 2.7-3.7 2.9-5.3 0 0-.2-.1-.4.3a12.94 12.94 0 01-1.5 1.7A5 5 0 003 14.1s-.1.1.1-2.1-.7-3.7.1-5.3c0 0-1.1.2-1.7 4.8a9.68 9.68 0 00.9 3.6c-.1-.1.2 1 .3 1"/><path data-name="Shape" class="mcls-1" d="M3.6 11a9.94 9.94 0 011.6-1.3 9.58 9.58 0 003.3-4.3s-.1-.2-.8.7c-.5.7-1.1.4-2.7 2.4 0 0-.2.5-.3.4s.1-.5.1-.5a13.88 13.88 0 00.3-1.7A15.83 15.83 0 016 3.6a5.82 5.82 0 00-2.5 4.7 12.21 12.21 0 00.1 2.7"/><path data-name="Shape" class="mcls-1" d="M5.4 7.3s-.1-3 3.8-4.6c0 0-1.4 2.8-2.4 3.5a11.57 11.57 0 00-1.4 1.1"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--search" xmlns="http://www.w3.org/2000/svg"><path d="M46.829 41.172L38.4 32.744a21.018 21.018 0 10-5.657 5.657l8.427 8.427a4 4 0 005.658-5.656zM8 21a13 13 0 1122.325 9.046c-.05.045-.106.078-.154.126s-.08.104-.125.154A12.992 12.992 0 018 21z"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--selected" xmlns="http://www.w3.org/2000/svg"><path d="M18.5 39.75a4 4 0 01-2.83-1.17l-12.5-12.5a4 4 0 015.66-5.66l9.67 9.67L39.17 9.42a4 4 0 015.66 5.66l-23.5 23.5a4 4 0 01-2.83 1.17z"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--selected--highlighted" xmlns="http://www.w3.org/2000/svg"><path fill="#80CBFF" d="M18.5 39.75a4 4 0 01-2.83-1.17l-12.5-12.5a4 4 0 015.66-5.66l9.67 9.67L39.17 9.42a4 4 0 015.66 5.66l-23.5 23.5a4 4 0 01-2.83 1.17z"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--sm-fb-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><path d="M29.16 13h-3.52c-2.09 0-4.41.88-4.41 3.9v3.2h-2.41v3.84h2.49V35h4.57V23.87h3l.27-3.78h-3.34v-2.17c0-1.2 1.24-1.13 1.32-1.13h2V13z"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--sm-fb-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm4.9 21.87h-3V35h-4.59V23.94h-2.49V20.1h2.41v-3.2c0-3 2.32-3.9 4.41-3.9h3.52v3.79h-2c-.07 0-1.32-.07-1.32 1.13v2.17h3.37z"/></symbol>
-		<symbol viewBox="0 0 48 48" id="cd-icon--sm-gh-def" xmlns="http://www.w3.org/2000/svg"><path d="M14.46 26.8a.16.16 0 010-.26.71.71 0 01.66-.2 1.15 1.15 0 01.46.13 3 3 0 011 .89 6.7 6.7 0 00.89 1 2.45 2.45 0 003.23.2 2 2 0 01.43-.79 2 2 0 01.56-.46q.26-.13.92-.39a12.25 12.25 0 01-3.52-.76A6 6 0 0117 24.69a5.52 5.52 0 01-1.28-3.09 7.92 7.92 0 01.3-3.49 5.8 5.8 0 011.12-1.78 5.89 5.89 0 01.2-3.75A6.84 6.84 0 0121.1 14a14.42 14.42 0 016.85 0 12.37 12.37 0 011.42-.82 5.79 5.79 0 012.4-.56 7.1 7.1 0 01.36 1.71 5.66 5.66 0 01-.1 1.84 6.07 6.07 0 011.58 4.21 7.48 7.48 0 01-.72 3.49 5.56 5.56 0 01-2.57 2.3 9.15 9.15 0 01-3.29.72 4.36 4.36 0 011.35 1 2.9 2.9 0 01.56 1.55v2.07l.07 2a2.47 2.47 0 00.92.89.22.22 0 01.13.3q-.07.2-.53.2a2.19 2.19 0 01-1.78-.9 1.51 1.51 0 01-.2-.79v-3.12a1 1 0 00-.26-.76 1.28 1.28 0 00-.53-.3v4.15a2.6 2.6 0 00.24 1.45 1.55 1.55 0 01.33.66s0 .08-.1.1a1.27 1.27 0 01-.56-.1 1.63 1.63 0 01-1.18-.89 3.4 3.4 0 01-.33-1.48v-4.08h-.86v4.08a3.62 3.62 0 01-.3 1.51 1.85 1.85 0 01-1.71 1q-.2-.07-.2-.13a5.58 5.58 0 00.39-.66 3.05 3.05 0 00.16-.53 3.82 3.82 0 00.1-.92V29a1.07 1.07 0 00-.49.3 1 1 0 00-.23.76v3.16a1.51 1.51 0 01-.2.79 2.08 2.08 0 01-1.78.79q-.46 0-.53-.2a.18.18 0 010-.23 2 2 0 01.3-.23 2 2 0 00.26-.2 1.2 1.2 0 00.39-.53 2.5 2.5 0 00.1-1.38 6.64 6.64 0 010-1.45 3.8 3.8 0 01-3.47-.58A6.43 6.43 0 0116 28.51a6.64 6.64 0 00-1.58-1.71z"/><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/></symbol>
-		<symbol viewBox="0 0 48 48" id="cd-icon--sm-gh-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm8.89 21.84a5.56 5.56 0 01-2.57 2.3 9.15 9.15 0 01-3.29.72 4.36 4.36 0 011.35 1 2.9 2.9 0 01.56 1.55v2.07l.07 2a2.47 2.47 0 00.92.89.22.22 0 01.13.3q-.07.2-.53.2a2.19 2.19 0 01-1.78-.87 1.51 1.51 0 01-.2-.79v-3.12a1 1 0 00-.26-.76 1.28 1.28 0 00-.53-.3v4.15a2.6 2.6 0 00.24 1.45 1.55 1.55 0 01.33.66s0 .08-.1.1a1.27 1.27 0 01-.56-.1 1.63 1.63 0 01-1.18-.89 3.4 3.4 0 01-.33-1.48v-4.08h-.86v4.08a3.62 3.62 0 01-.3 1.51 1.85 1.85 0 01-1.71 1q-.2-.07-.2-.13a5.56 5.56 0 00.39-.66 3 3 0 00.16-.53 3.82 3.82 0 00.1-.92V29a1.07 1.07 0 00-.49.3 1 1 0 00-.23.76v3.16a1.51 1.51 0 01-.2.79 2.08 2.08 0 01-1.78.79q-.46 0-.53-.2a.18.18 0 010-.23 2 2 0 01.3-.23 2 2 0 00.26-.2 1.2 1.2 0 00.39-.53 2.5 2.5 0 00.1-1.38 6.64 6.64 0 010-1.45 3.8 3.8 0 01-3.47-.58A6.43 6.43 0 0116 28.51a6.64 6.64 0 00-1.58-1.71.16.16 0 010-.26.71.71 0 01.66-.2 1.14 1.14 0 01.46.13 3 3 0 011 .89 6.69 6.69 0 00.89 1 2.45 2.45 0 003.23.2 2.12 2.12 0 011-1.25q.26-.13.92-.4a12.25 12.25 0 01-3.52-.76A6 6 0 0117 24.69a5.52 5.52 0 01-1.28-3.09 7.92 7.92 0 01.3-3.49 5.79 5.79 0 011.12-1.78 5.89 5.89 0 01.2-3.75A6.83 6.83 0 0121.1 14a14.42 14.42 0 016.85 0 12.37 12.37 0 011.42-.82 5.79 5.79 0 012.4-.56 7.1 7.1 0 01.36 1.71 5.66 5.66 0 01-.1 1.84 6.06 6.06 0 011.58 4.21 7.48 7.48 0 01-.72 3.46z"/></symbol>
-		<symbol viewBox="0 0 48 48" id="cd-icon--sm-ig-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm0 41a19 19 0 1119-19 19 19 0 01-19 19z"/><path d="M24 18.09A5.91 5.91 0 1029.91 24 5.9 5.9 0 0024 18.09zm0 9.74A3.83 3.83 0 1127.83 24 3.83 3.83 0 0124 27.83z"/><circle cx="30.14" cy="17.86" r="1.38"/><path d="M34.9 16.47a5.88 5.88 0 00-3.36-3.36 8.43 8.43 0 00-2.79-.53c-1.23-.06-1.62-.07-4.74-.07s-3.52 0-4.74.07a8.44 8.44 0 00-2.79.53 5.88 5.88 0 00-3.36 3.36 8.44 8.44 0 00-.53 2.79c-.06 1.23-.07 1.62-.07 4.74s0 3.52.07 4.74a8.44 8.44 0 00.53 2.79 5.88 5.88 0 003.36 3.36 8.44 8.44 0 002.79.53c1.23.06 1.62.07 4.74.07s3.52 0 4.74-.07a8.44 8.44 0 002.79-.53 5.88 5.88 0 003.36-3.36 8.41 8.41 0 00.53-2.79c.06-1.23.07-1.62.07-4.74s0-3.52-.07-4.74a8.44 8.44 0 00-.53-2.79zm-1.54 12.18a6.38 6.38 0 01-.4 2.14A3.81 3.81 0 0130.78 33a6.35 6.35 0 01-2.14.4c-1.21.06-1.58.07-4.65.07s-3.43 0-4.65-.07a6.35 6.35 0 01-2.14-.4 3.81 3.81 0 01-2.2-2.22 6.35 6.35 0 01-.4-2.14c-.06-1.21-.07-1.58-.07-4.65s0-3.43.07-4.65a6.38 6.38 0 01.4-2.14 3.81 3.81 0 012.22-2.2 6.35 6.35 0 012.14-.4c1.21-.06 1.58-.07 4.65-.07s3.43 0 4.65.07a6.38 6.38 0 012.14.4 3.81 3.81 0 012.2 2.22 6.35 6.35 0 01.4 2.14c.06 1.21.07 1.58.07 4.65s-.05 3.42-.11 4.64z"/></symbol>
-		<symbol viewBox="0 0 48 48" id="cd-icon--sm-ig-full" xmlns="http://www.w3.org/2000/svg"><circle cx="24" cy="24" r="3.83"/><path d="M33 17.22A3.81 3.81 0 0030.78 15a6.38 6.38 0 00-2.14-.4c-1.21-.05-1.58-.07-4.65-.07s-3.43 0-4.65.07a6.35 6.35 0 00-2.14.4 3.81 3.81 0 00-2.2 2.22 6.38 6.38 0 00-.4 2.14c-.05 1.21-.07 1.58-.07 4.65s0 3.44.07 4.65a6.36 6.36 0 00.4 2.14 3.81 3.81 0 002.22 2.2 6.35 6.35 0 002.14.4c1.21.06 1.58.07 4.65.07s3.44 0 4.65-.07a6.35 6.35 0 002.14-.4 3.81 3.81 0 002.2-2.22 6.38 6.38 0 00.4-2.14c.06-1.21.07-1.58.07-4.65s0-3.43-.07-4.65a6.35 6.35 0 00-.4-2.12zm-9 12.69A5.91 5.91 0 1129.91 24 5.9 5.9 0 0124 29.91zm6.14-10.66a1.38 1.38 0 111.38-1.38 1.38 1.38 0 01-1.38 1.37z"/><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm11.43 26.74a8.41 8.41 0 01-.53 2.79 5.88 5.88 0 01-3.36 3.36 8.44 8.44 0 01-2.79.53c-1.23.06-1.62.07-4.74.07s-3.51 0-4.74-.07a8.44 8.44 0 01-2.79-.53 5.88 5.88 0 01-3.36-3.36 8.44 8.44 0 01-.53-2.79c-.06-1.23-.07-1.62-.07-4.74s0-3.52.07-4.74a8.44 8.44 0 01.53-2.79 5.88 5.88 0 013.36-3.36 8.44 8.44 0 012.79-.53c1.23-.06 1.62-.07 4.74-.07s3.51 0 4.74.07a8.43 8.43 0 012.79.53 5.88 5.88 0 013.36 3.36 8.44 8.44 0 01.53 2.79c.06 1.23.07 1.62.07 4.74s-.01 3.51-.07 4.74z"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--sm-ln-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><ellipse cx="16.07" cy="14.58" rx="2.56" ry="2.58"/><path d="M13.92 19h4.33v14h-4.33zM29.4 18.57a4.88 4.88 0 00-4.22 2.31V19H21v14h4.16v-7.35c0-2 .91-3.14 2.64-3.14s2.36 1.13 2.36 3.14V33h4.31v-8.86c.02-3.75-2.1-5.57-5.07-5.57z"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--sm-ln-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm-5.74 31h-4.34V19h4.33zm-2.19-15.83a2.58 2.58 0 112.56-2.58 2.57 2.57 0 01-2.56 2.58zM34.49 33h-4.31v-7.35c0-2-.77-3.14-2.36-3.14s-2.64 1.17-2.64 3.14V33H21V19h4.16v1.89a4.88 4.88 0 014.22-2.31c3 0 5.09 1.81 5.09 5.56z"/></symbol>
-		<symbol viewBox="0 0 48 48" id="cd-icon--sm-rss-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><path d="M20.7 31.18a2.85 2.85 0 11-2.85-2.81 2.84 2.84 0 012.85 2.81zM37 34a22 22 0 00-22-22v5a17.49 17.49 0 0114.92 8.2 16.65 16.65 0 012.49 8.8H37zm-7.78 0A14 14 0 0024 23.13 14.27 14.27 0 0015 20v4.2a9.94 9.94 0 018.67 5 9.79 9.79 0 011.25 4.8h4.3z"/></symbol>
-		<symbol viewBox="0 0 48 48" id="cd-icon--sm-rss-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm-6.15 32a2.81 2.81 0 112.85-2.81A2.84 2.84 0 0117.85 34zm11.37 0h-4.3a9.79 9.79 0 00-1.25-4.78 9.94 9.94 0 00-8.67-5V20a14.27 14.27 0 019 3.15A14 14 0 0129.22 34zM37 34h-4.59a16.65 16.65 0 00-2.49-8.72A17.49 17.49 0 0015 17.06V12a22 22 0 0122 22z"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--sm-tt-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><path d="M36 16.56a9.83 9.83 0 01-2.83.78 4.94 4.94 0 002.16-2.72 9.84 9.84 0 01-3.13 1.19 4.93 4.93 0 00-8.52 3.37 5 5 0 00.13 1.12 14 14 0 01-10.15-5.14 4.93 4.93 0 001.52 6.57 4.9 4.9 0 01-2.18-.62v.06A4.93 4.93 0 0016.91 26a4.9 4.9 0 01-1.3.17 5 5 0 01-.93-.09 4.93 4.93 0 004.6 3.42 9.91 9.91 0 01-7.29 2 14 14 0 0021.57-11.76v-.64A10 10 0 0036 16.56z"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--sm-tt-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm9.54 17.11v.64A14 14 0 0112 31.54a9.92 9.92 0 007.29-2 4.93 4.93 0 01-4.6-3.42 5 5 0 00.93.09 4.9 4.9 0 001.3-.17A4.93 4.93 0 0113 21.17v-.06a4.9 4.9 0 002.23.62 4.93 4.93 0 01-1.52-6.57 14 14 0 0010.15 5.14 5 5 0 01-.13-1.12 4.93 4.93 0 018.52-3.37 9.83 9.83 0 003.13-1.19 4.94 4.94 0 01-2.16 2.72 9.83 9.83 0 002.78-.78 10 10 0 01-2.46 2.55z"/></symbol>
-		<symbol viewBox="0 0 48 48" id="cd-icon--sm-yt-def" xmlns="http://www.w3.org/2000/svg"><path d="M32.58 16.83c-1.72-.45-8.59-.45-8.59-.45s-6.75 0-8.46.42a3 3 0 00-2.11 2A26.77 26.77 0 0013 24a26.77 26.77 0 00.42 5.24 3 3 0 002.11 2c1.72.46 8.46.42 8.46.42s6.75 0 8.46-.42a3 3 0 002.08-2A27.91 27.91 0 0035 24a28.42 28.42 0 00-.47-5.24 2.74 2.74 0 00-1.95-1.93zM21.26 27.38v-6.76L26.74 24z"/><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm0 41a19 19 0 1119-19 19 19 0 01-19 19z"/></symbol>
-		<symbol viewBox="0 0 48 48" id="cd-icon--sm-yt-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm10.54 27.24a3 3 0 01-2.08 2c-1.72.45-8.46.42-8.46.42s-6.75 0-8.46-.42a3 3 0 01-2.11-2A26.77 26.77 0 0113 24a26.77 26.77 0 01.42-5.24 3 3 0 012.11-2c1.72-.45 8.46-.42 8.46-.42s6.87 0 8.59.45a2.74 2.74 0 011.94 1.93A28.42 28.42 0 0135 24a27.91 27.91 0 01-.46 5.24z"/><path d="M21.25 27.38l5.5-3.38-5.5-3.38v6.76z"/></symbol>
-		<symbol viewBox="0 0 14 14" id="cd-icon--social-links--facebook" xmlns="http://www.w3.org/2000/svg"><path data-name="svgexport-14" d="M13.411 0H.589A.589.589 0 000 .589v12.822A.586.586 0 00.589 14h6.853V8.746H5.688V6.558h1.754V4.8a2.5 2.5 0 012.756-2.7 15.8 15.8 0 011.621.081v1.901h-1.105c-.884 0-1.091.42-1.091 1.032v1.444h2.188l-.442 2.188H9.623l.037 5.246h3.758A.589.589 0 0014 13.4V.589a.589.589 0 00-.589-.582"/></symbol>
-		<symbol viewBox="0 0 14 14" id="cd-icon--social-links--linkedin" xmlns="http://www.w3.org/2000/svg"><path data-name="Path 530" d="M12.968 0H1.032A1.007 1.007 0 000 1.032v12.01A.993.993 0 001.032 14h11.936A1.007 1.007 0 0014 12.968V1.032A1.007 1.007 0 0012.968 0zM4.274 11.716H2.137V5.379h2.137zM3.168 4.495a1.066 1.066 0 01-1.179-1.106 1.1 1.1 0 011.179-1.105 1.066 1.066 0 011.179 1.105c.074.664-.442 1.106-1.179 1.106zm8.695 7.221H9.726v-3.39c0-.884-.295-1.474-1.105-1.474a1.162 1.162 0 00-1.105.737 1.254 1.254 0 00-.074.516v3.537H5.305V5.305h2.137v.884a2.132 2.132 0 011.916-1.032c1.4 0 2.432.884 2.432 2.874v3.684z"/></symbol>
-		<symbol viewBox="0 0 17.219 14" id="cd-icon--social-links--twitter" xmlns="http://www.w3.org/2000/svg"><path data-name="svgexport-12" d="M14.531 1.141A3.492 3.492 0 0011.95 0a3.539 3.539 0 00-3.539 3.539 7.247 7.247 0 00.063.82A10.078 10.078 0 011.211.633a3.984 3.984 0 00-.508 1.766A3.634 3.634 0 002.281 5.36a3.359 3.359 0 01-1.578-.445v.062a3.555 3.555 0 002.836 3.469 7.632 7.632 0 01-.945.125l-.633-.063a3.547 3.547 0 003.281 2.461A7.469 7.469 0 01.82 12.484L0 12.42A10.086 10.086 0 005.422 14 9.966 9.966 0 0015.45 3.961c.016-.187 0-.336 0-.508a6.781 6.781 0 001.769-1.833 6.552 6.552 0 01-2.031.563A3.414 3.414 0 0016.711.222a7.051 7.051 0 01-2.211.883z"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--user" xmlns="http://www.w3.org/2000/svg"><path d="M23 24h2a16 16 0 0116 16v4H7v-4a16 16 0 0116-16z"/><rect x="15" y="4" width="18" height="18" rx="9" ry="9"/></symbol>
-		<symbol viewBox="0 0 48 48" id="cd-icon--user--white" xmlns="http://www.w3.org/2000/svg"><path fill="#fff" d="M23 24h2a16 16 0 0116 16v4H7v-4a16 16 0 0116-16z"/><rect fill="#fff" x="15" y="4" width="18" height="18" rx="9" ry="9"/></symbol>
 </svg>
 
 <!--
@@ -171,28 +127,6 @@ <h3>A) Inline SVG with embedded sprite</h3>
 					</div>
 					<h2>cd-icon--about</h2>
 				</li>
-				<li title="cd-icon--add">
-					<div class="icon-box">
-
-						<!-- cd-icon--add -->
-						<svg class="cd-icon--add-dims">
-							<use xlink:href="#cd-icon--add"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--add</h2>
-				</li>
-				<li title="cd-icon--add--white">
-					<div class="icon-box">
-
-						<!-- cd-icon--add--white -->
-						<svg class="cd-icon--add--white-dims">
-							<use xlink:href="#cd-icon--add--white"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--add--white</h2>
-				</li>
 				<li title="cd-icon--admin">
 					<div class="icon-box">
 
@@ -237,28 +171,6 @@ <h2>cd-icon--arrow-down</h2>
 					</div>
 					<h2>cd-icon--arrow-down--highlighted</h2>
 				</li>
-				<li title="cd-icon--arrow-left">
-					<div class="icon-box">
-
-						<!-- cd-icon--arrow-left -->
-						<svg class="cd-icon--arrow-left-dims">
-							<use xlink:href="#cd-icon--arrow-left"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--arrow-left</h2>
-				</li>
-				<li title="cd-icon--arrow-right">
-					<div class="icon-box">
-
-						<!-- cd-icon--arrow-right -->
-						<svg class="cd-icon--arrow-right-dims">
-							<use xlink:href="#cd-icon--arrow-right"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--arrow-right</h2>
-				</li>
 				<li title="cd-icon--arrow-up">
 					<div class="icon-box">
 
@@ -292,17 +204,6 @@ <h2>cd-icon--arrow-up--highlighted</h2>
 					</div>
 					<h2>cd-icon--cd-icons-sprite</h2>
 				</li>
-				<li title="cd-icon--copyurl">
-					<div class="icon-box">
-
-						<!-- cd-icon--copyurl -->
-						<svg class="cd-icon--copyurl-dims">
-							<use xlink:href="#cd-icon--copyurl"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--copyurl</h2>
-				</li>
 				<li title="cd-icon--creative-commons">
 					<div class="icon-box">
 
@@ -325,39 +226,6 @@ <h2>cd-icon--creative-commons</h2>
 					</div>
 					<h2>cd-icon--education</h2>
 				</li>
-				<li title="cd-icon--expand-left">
-					<div class="icon-box">
-
-						<!-- cd-icon--expand-left -->
-						<svg class="cd-icon--expand-left-dims">
-							<use xlink:href="#cd-icon--expand-left"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--expand-left</h2>
-				</li>
-				<li title="cd-icon--expand-right">
-					<div class="icon-box">
-
-						<!-- cd-icon--expand-right -->
-						<svg class="cd-icon--expand-right-dims">
-							<use xlink:href="#cd-icon--expand-right"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--expand-right</h2>
-				</li>
-				<li title="cd-icon--external-link">
-					<div class="icon-box">
-
-						<!-- cd-icon--external-link -->
-						<svg class="cd-icon--external-link-dims">
-							<use xlink:href="#cd-icon--external-link"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--external-link</h2>
-				</li>
 				<li title="cd-icon--form-error">
 					<div class="icon-box">
 
@@ -369,17 +237,6 @@ <h2>cd-icon--external-link</h2>
 					</div>
 					<h2>cd-icon--form-error</h2>
 				</li>
-				<li title="cd-icon--form-required">
-					<div class="icon-box">
-
-						<!-- cd-icon--form-required -->
-						<svg class="cd-icon--form-required-dims">
-							<use xlink:href="#cd-icon--form-required"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--form-required</h2>
-				</li>
 				<li title="cd-icon--help">
 					<div class="icon-box">
 
@@ -402,17 +259,6 @@ <h2>cd-icon--help</h2>
 					</div>
 					<h2>cd-icon--ocha-logo</h2>
 				</li>
-				<li title="cd-icon--pdf">
-					<div class="icon-box">
-
-						<!-- cd-icon--pdf -->
-						<svg class="cd-icon--pdf-dims">
-							<use xlink:href="#cd-icon--pdf"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--pdf</h2>
-				</li>
 				<li title="cd-icon--search">
 					<div class="icon-box">
 
@@ -468,50 +314,6 @@ <h2>cd-icon--sm-fb-def</h2>
 					</div>
 					<h2>cd-icon--sm-fb-full</h2>
 				</li>
-				<li title="cd-icon--sm-gh-def">
-					<div class="icon-box">
-
-						<!-- cd-icon--sm-gh-def -->
-						<svg class="cd-icon--sm-gh-def-dims">
-							<use xlink:href="#cd-icon--sm-gh-def"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--sm-gh-def</h2>
-				</li>
-				<li title="cd-icon--sm-gh-full">
-					<div class="icon-box">
-
-						<!-- cd-icon--sm-gh-full -->
-						<svg class="cd-icon--sm-gh-full-dims">
-							<use xlink:href="#cd-icon--sm-gh-full"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--sm-gh-full</h2>
-				</li>
-				<li title="cd-icon--sm-ig-def">
-					<div class="icon-box">
-
-						<!-- cd-icon--sm-ig-def -->
-						<svg class="cd-icon--sm-ig-def-dims">
-							<use xlink:href="#cd-icon--sm-ig-def"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--sm-ig-def</h2>
-				</li>
-				<li title="cd-icon--sm-ig-full">
-					<div class="icon-box">
-
-						<!-- cd-icon--sm-ig-full -->
-						<svg class="cd-icon--sm-ig-full-dims">
-							<use xlink:href="#cd-icon--sm-ig-full"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--sm-ig-full</h2>
-				</li>
 				<li title="cd-icon--sm-ln-def">
 					<div class="icon-box">
 
@@ -534,28 +336,6 @@ <h2>cd-icon--sm-ln-def</h2>
 					</div>
 					<h2>cd-icon--sm-ln-full</h2>
 				</li>
-				<li title="cd-icon--sm-rss-def">
-					<div class="icon-box">
-
-						<!-- cd-icon--sm-rss-def -->
-						<svg class="cd-icon--sm-rss-def-dims">
-							<use xlink:href="#cd-icon--sm-rss-def"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--sm-rss-def</h2>
-				</li>
-				<li title="cd-icon--sm-rss-full">
-					<div class="icon-box">
-
-						<!-- cd-icon--sm-rss-full -->
-						<svg class="cd-icon--sm-rss-full-dims">
-							<use xlink:href="#cd-icon--sm-rss-full"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--sm-rss-full</h2>
-				</li>
 				<li title="cd-icon--sm-tt-def">
 					<div class="icon-box">
 
@@ -578,61 +358,6 @@ <h2>cd-icon--sm-tt-def</h2>
 					</div>
 					<h2>cd-icon--sm-tt-full</h2>
 				</li>
-				<li title="cd-icon--sm-yt-def">
-					<div class="icon-box">
-
-						<!-- cd-icon--sm-yt-def -->
-						<svg class="cd-icon--sm-yt-def-dims">
-							<use xlink:href="#cd-icon--sm-yt-def"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--sm-yt-def</h2>
-				</li>
-				<li title="cd-icon--sm-yt-full">
-					<div class="icon-box">
-
-						<!-- cd-icon--sm-yt-full -->
-						<svg class="cd-icon--sm-yt-full-dims">
-							<use xlink:href="#cd-icon--sm-yt-full"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--sm-yt-full</h2>
-				</li>
-				<li title="cd-icon--social-links--facebook">
-					<div class="icon-box">
-
-						<!-- cd-icon--social-links--facebook -->
-						<svg class="cd-icon--social-links--facebook-dims">
-							<use xlink:href="#cd-icon--social-links--facebook"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--social-links--facebook</h2>
-				</li>
-				<li title="cd-icon--social-links--linkedin">
-					<div class="icon-box">
-
-						<!-- cd-icon--social-links--linkedin -->
-						<svg class="cd-icon--social-links--linkedin-dims">
-							<use xlink:href="#cd-icon--social-links--linkedin"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--social-links--linkedin</h2>
-				</li>
-				<li title="cd-icon--social-links--twitter">
-					<div class="icon-box">
-
-						<!-- cd-icon--social-links--twitter -->
-						<svg class="cd-icon--social-links--twitter-dims">
-							<use xlink:href="#cd-icon--social-links--twitter"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--social-links--twitter</h2>
-				</li>
 				<li title="cd-icon--user">
 					<div class="icon-box">
 
@@ -644,17 +369,6 @@ <h2>cd-icon--social-links--twitter</h2>
 					</div>
 					<h2>cd-icon--user</h2>
 				</li>
-				<li title="cd-icon--user--white">
-					<div class="icon-box">
-
-						<!-- cd-icon--user--white -->
-						<svg class="cd-icon--user--white-dims">
-							<use xlink:href="#cd-icon--user--white"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--user--white</h2>
-				</li>
 			</ul>
 
 <!--
@@ -687,28 +401,6 @@ <h3>B) Inline SVG with external sprite (IE 9-11 with polyfill only)</h3>
 					</div>
 					<h2>cd-icon--about</h2>
 				</li>
-				<li title="cd-icon--add">
-					<div class="icon-box">
-
-						<!-- cd-icon--add -->
-						<svg class="cd-icon--add-dims">
-							<use xlink:href="cd-icons-sprite.svg#cd-icon--add"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--add</h2>
-				</li>
-				<li title="cd-icon--add--white">
-					<div class="icon-box">
-
-						<!-- cd-icon--add--white -->
-						<svg class="cd-icon--add--white-dims">
-							<use xlink:href="cd-icons-sprite.svg#cd-icon--add--white"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--add--white</h2>
-				</li>
 				<li title="cd-icon--admin">
 					<div class="icon-box">
 
@@ -753,28 +445,6 @@ <h2>cd-icon--arrow-down</h2>
 					</div>
 					<h2>cd-icon--arrow-down--highlighted</h2>
 				</li>
-				<li title="cd-icon--arrow-left">
-					<div class="icon-box">
-
-						<!-- cd-icon--arrow-left -->
-						<svg class="cd-icon--arrow-left-dims">
-							<use xlink:href="cd-icons-sprite.svg#cd-icon--arrow-left"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--arrow-left</h2>
-				</li>
-				<li title="cd-icon--arrow-right">
-					<div class="icon-box">
-
-						<!-- cd-icon--arrow-right -->
-						<svg class="cd-icon--arrow-right-dims">
-							<use xlink:href="cd-icons-sprite.svg#cd-icon--arrow-right"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--arrow-right</h2>
-				</li>
 				<li title="cd-icon--arrow-up">
 					<div class="icon-box">
 
@@ -808,17 +478,6 @@ <h2>cd-icon--arrow-up--highlighted</h2>
 					</div>
 					<h2>cd-icon--cd-icons-sprite</h2>
 				</li>
-				<li title="cd-icon--copyurl">
-					<div class="icon-box">
-
-						<!-- cd-icon--copyurl -->
-						<svg class="cd-icon--copyurl-dims">
-							<use xlink:href="cd-icons-sprite.svg#cd-icon--copyurl"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--copyurl</h2>
-				</li>
 				<li title="cd-icon--creative-commons">
 					<div class="icon-box">
 
@@ -841,39 +500,6 @@ <h2>cd-icon--creative-commons</h2>
 					</div>
 					<h2>cd-icon--education</h2>
 				</li>
-				<li title="cd-icon--expand-left">
-					<div class="icon-box">
-
-						<!-- cd-icon--expand-left -->
-						<svg class="cd-icon--expand-left-dims">
-							<use xlink:href="cd-icons-sprite.svg#cd-icon--expand-left"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--expand-left</h2>
-				</li>
-				<li title="cd-icon--expand-right">
-					<div class="icon-box">
-
-						<!-- cd-icon--expand-right -->
-						<svg class="cd-icon--expand-right-dims">
-							<use xlink:href="cd-icons-sprite.svg#cd-icon--expand-right"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--expand-right</h2>
-				</li>
-				<li title="cd-icon--external-link">
-					<div class="icon-box">
-
-						<!-- cd-icon--external-link -->
-						<svg class="cd-icon--external-link-dims">
-							<use xlink:href="cd-icons-sprite.svg#cd-icon--external-link"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--external-link</h2>
-				</li>
 				<li title="cd-icon--form-error">
 					<div class="icon-box">
 
@@ -885,17 +511,6 @@ <h2>cd-icon--external-link</h2>
 					</div>
 					<h2>cd-icon--form-error</h2>
 				</li>
-				<li title="cd-icon--form-required">
-					<div class="icon-box">
-
-						<!-- cd-icon--form-required -->
-						<svg class="cd-icon--form-required-dims">
-							<use xlink:href="cd-icons-sprite.svg#cd-icon--form-required"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--form-required</h2>
-				</li>
 				<li title="cd-icon--help">
 					<div class="icon-box">
 
@@ -918,17 +533,6 @@ <h2>cd-icon--help</h2>
 					</div>
 					<h2>cd-icon--ocha-logo</h2>
 				</li>
-				<li title="cd-icon--pdf">
-					<div class="icon-box">
-
-						<!-- cd-icon--pdf -->
-						<svg class="cd-icon--pdf-dims">
-							<use xlink:href="cd-icons-sprite.svg#cd-icon--pdf"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--pdf</h2>
-				</li>
 				<li title="cd-icon--search">
 					<div class="icon-box">
 
@@ -984,50 +588,6 @@ <h2>cd-icon--sm-fb-def</h2>
 					</div>
 					<h2>cd-icon--sm-fb-full</h2>
 				</li>
-				<li title="cd-icon--sm-gh-def">
-					<div class="icon-box">
-
-						<!-- cd-icon--sm-gh-def -->
-						<svg class="cd-icon--sm-gh-def-dims">
-							<use xlink:href="cd-icons-sprite.svg#cd-icon--sm-gh-def"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--sm-gh-def</h2>
-				</li>
-				<li title="cd-icon--sm-gh-full">
-					<div class="icon-box">
-
-						<!-- cd-icon--sm-gh-full -->
-						<svg class="cd-icon--sm-gh-full-dims">
-							<use xlink:href="cd-icons-sprite.svg#cd-icon--sm-gh-full"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--sm-gh-full</h2>
-				</li>
-				<li title="cd-icon--sm-ig-def">
-					<div class="icon-box">
-
-						<!-- cd-icon--sm-ig-def -->
-						<svg class="cd-icon--sm-ig-def-dims">
-							<use xlink:href="cd-icons-sprite.svg#cd-icon--sm-ig-def"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--sm-ig-def</h2>
-				</li>
-				<li title="cd-icon--sm-ig-full">
-					<div class="icon-box">
-
-						<!-- cd-icon--sm-ig-full -->
-						<svg class="cd-icon--sm-ig-full-dims">
-							<use xlink:href="cd-icons-sprite.svg#cd-icon--sm-ig-full"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--sm-ig-full</h2>
-				</li>
 				<li title="cd-icon--sm-ln-def">
 					<div class="icon-box">
 
@@ -1050,28 +610,6 @@ <h2>cd-icon--sm-ln-def</h2>
 					</div>
 					<h2>cd-icon--sm-ln-full</h2>
 				</li>
-				<li title="cd-icon--sm-rss-def">
-					<div class="icon-box">
-
-						<!-- cd-icon--sm-rss-def -->
-						<svg class="cd-icon--sm-rss-def-dims">
-							<use xlink:href="cd-icons-sprite.svg#cd-icon--sm-rss-def"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--sm-rss-def</h2>
-				</li>
-				<li title="cd-icon--sm-rss-full">
-					<div class="icon-box">
-
-						<!-- cd-icon--sm-rss-full -->
-						<svg class="cd-icon--sm-rss-full-dims">
-							<use xlink:href="cd-icons-sprite.svg#cd-icon--sm-rss-full"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--sm-rss-full</h2>
-				</li>
 				<li title="cd-icon--sm-tt-def">
 					<div class="icon-box">
 
@@ -1094,61 +632,6 @@ <h2>cd-icon--sm-tt-def</h2>
 					</div>
 					<h2>cd-icon--sm-tt-full</h2>
 				</li>
-				<li title="cd-icon--sm-yt-def">
-					<div class="icon-box">
-
-						<!-- cd-icon--sm-yt-def -->
-						<svg class="cd-icon--sm-yt-def-dims">
-							<use xlink:href="cd-icons-sprite.svg#cd-icon--sm-yt-def"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--sm-yt-def</h2>
-				</li>
-				<li title="cd-icon--sm-yt-full">
-					<div class="icon-box">
-
-						<!-- cd-icon--sm-yt-full -->
-						<svg class="cd-icon--sm-yt-full-dims">
-							<use xlink:href="cd-icons-sprite.svg#cd-icon--sm-yt-full"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--sm-yt-full</h2>
-				</li>
-				<li title="cd-icon--social-links--facebook">
-					<div class="icon-box">
-
-						<!-- cd-icon--social-links--facebook -->
-						<svg class="cd-icon--social-links--facebook-dims">
-							<use xlink:href="cd-icons-sprite.svg#cd-icon--social-links--facebook"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--social-links--facebook</h2>
-				</li>
-				<li title="cd-icon--social-links--linkedin">
-					<div class="icon-box">
-
-						<!-- cd-icon--social-links--linkedin -->
-						<svg class="cd-icon--social-links--linkedin-dims">
-							<use xlink:href="cd-icons-sprite.svg#cd-icon--social-links--linkedin"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--social-links--linkedin</h2>
-				</li>
-				<li title="cd-icon--social-links--twitter">
-					<div class="icon-box">
-
-						<!-- cd-icon--social-links--twitter -->
-						<svg class="cd-icon--social-links--twitter-dims">
-							<use xlink:href="cd-icons-sprite.svg#cd-icon--social-links--twitter"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--social-links--twitter</h2>
-				</li>
 				<li title="cd-icon--user">
 					<div class="icon-box">
 
@@ -1160,17 +643,6 @@ <h2>cd-icon--social-links--twitter</h2>
 					</div>
 					<h2>cd-icon--user</h2>
 				</li>
-				<li title="cd-icon--user--white">
-					<div class="icon-box">
-
-						<!-- cd-icon--user--white -->
-						<svg class="cd-icon--user--white-dims">
-							<use xlink:href="cd-icons-sprite.svg#cd-icon--user--white"></use>
-						</svg>
-
-					</div>
-					<h2>cd-icon--user--white</h2>
-				</li>
 			</ul>
 
 <!--
@@ -1179,7 +651,7 @@ <h2>cd-icon--user--white</h2>
 
 		</section>
 		<footer>
-			<p>Generated at Wed, 09 Mar 2022 09:08:17 GMT by <a href="https://github.com/svg-sprite/svg-sprite" target="_blank" rel="noopener noreferrer">svg-sprite</a>.</p>
+			<p>Generated at Thu, 17 Mar 2022 13:34:26 GMT by <a href="https://github.com/svg-sprite/svg-sprite" target="_blank" rel="noopener noreferrer">svg-sprite</a>.</p>
 		</footer>
 	</body>
 </html>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/user--white.svg b/html/themes/custom/common_design_subtheme/img/icons/user--white.svg
deleted file mode 100644
index 967ec00a6..000000000
--- a/html/themes/custom/common_design_subtheme/img/icons/user--white.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path fill="#ffffff" d="M23,24h2A16,16,0,0,1,41,40v4a0,0,0,0,1,0,0H7a0,0,0,0,1,0,0V40A16,16,0,0,1,23,24Z"/><rect fill="#ffffff" x="15" y="4" width="18" height="18" rx="9" ry="9"/></svg>

From 23f34660460c3e9178e1a82a937d147bac8f6067 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 18 Mar 2022 00:49:13 +0000
Subject: [PATCH 590/720] [RW-426] Migrate source job import feeds

---
 ...ration.reliefweb_taxonomy_term__source.yml | 20 ++++++++++++++++--
 ...liefweb_taxonomy_term_revision__source.yml | 20 ++++++++++++++++--
 ...ration.reliefweb_taxonomy_term__source.yml | 21 ++++++++++++++-----
 ...liefweb_taxonomy_term_revision__source.yml | 21 ++++++++++++++-----
 4 files changed, 68 insertions(+), 14 deletions(-)

diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term__source.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
index 7b008a783..0613be82c 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
@@ -1,9 +1,9 @@
-uuid: 16843a36-faa0-4277-9576-6da5f02c5ea2
+uuid: fc1608c3-575a-4780-8b98-f849bdd45627
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: sg4cJgEIiEdl--ULZX9f-ftMGxDM_jqjUpk8d_Jq6nU
+  default_config_hash: CJq7iT0P8quBeQX-5h9bFhRkScMsoZrf7YxTvKkZKFs
 id: reliefweb_taxonomy_term__source
 class: null
 field_plugin_method: null
@@ -58,6 +58,22 @@ process:
     plugin: skip_on_empty
     method: process
     source: field_homepage/0/url
+  field_job_import_feed:
+    -
+      plugin: skip_on_empty
+      method: process
+      source: field_link
+    -
+      plugin: sub_process
+      process:
+        feed_url: url
+        uid: title
+        base_url:
+          -
+            plugin: unserialize
+            source: attributes
+            index:
+              - title
   field_links:
     -
       plugin: skip_on_empty
diff --git a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
index 1d08f3e06..f978a1d3c 100644
--- a/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
+++ b/config/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
@@ -1,9 +1,9 @@
-uuid: c25d13c4-74d5-45b7-9bf8-0e3ceb12cdb7
+uuid: 49e586bd-f47f-417c-81fa-f3801be80443
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: lgy_oEXgSZeQhzg5AhSOXmIpvOx9Yx7UJtZxFwFbee8
+  default_config_hash: tIE_7kSQ72E32fCxsTsoi3i8kSApXtTs4LeB99wgG2k
 id: reliefweb_taxonomy_term_revision__source
 class: null
 field_plugin_method: null
@@ -58,6 +58,22 @@ process:
     plugin: skip_on_empty
     method: process
     source: field_homepage/0/url
+  field_job_import_feed:
+    -
+      plugin: skip_on_empty
+      method: process
+      source: field_link
+    -
+      plugin: sub_process
+      process:
+        feed_url: url
+        uid: title
+        base_url:
+          -
+            plugin: unserialize
+            source: attributes
+            index:
+              - title
   field_links:
     -
       plugin: skip_on_empty
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term__source.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
index b7a8a02d4..e0938b0df 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term__source.yml
@@ -50,11 +50,22 @@ process:
     plugin: skip_on_empty
     method: process
     source: field_homepage/0/url
-  # @todo review once the custom field has been added for import URL.
-  # field_job_import_feed_url/uri
-  #   plugin: skip_on_empty
-  #   method: process
-  #   source: field_link/0/url
+  field_job_import_feed:
+    -
+      plugin: skip_on_empty
+      method: process
+      source: field_link
+    -
+      plugin: sub_process
+      process:
+        feed_url: url
+        uid: title
+        base_url:
+          -
+            plugin: unserialize
+            source: attributes
+            index:
+              - title
   field_links:
     -
       plugin: skip_on_empty
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
index 3383f3625..8de90c144 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_taxonomy_term_revision__source.yml
@@ -50,11 +50,22 @@ process:
     plugin: skip_on_empty
     method: process
     source: field_homepage/0/url
-  # @todo review once the custom field has been added for import URL.
-  # field_job_import_feed_url/uri
-  #   plugin: skip_on_empty
-  #   method: process
-  #   source: field_link/0/url
+  field_job_import_feed:
+    -
+      plugin: skip_on_empty
+      method: process
+      source: field_link
+    -
+      plugin: sub_process
+      process:
+        feed_url: url
+        uid: title
+        base_url:
+          -
+            plugin: unserialize
+            source: attributes
+            index:
+              - title
   field_links:
     -
       plugin: skip_on_empty

From 51340f7046ce9dd0d090e3e65778fa3b81f5fa9a Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 18 Mar 2022 00:54:26 +0000
Subject: [PATCH 591/720] [RW-426] Remove unused job import feed url from
 sources

---
 ...m_display.taxonomy_term.source.default.yml |  2 --
 ...xonomy_term.source.user_posting_rights.yml |  2 --
 ...w_display.taxonomy_term.source.default.yml |  2 --
 ..._term.source.field_job_import_feed_url.yml | 23 -------------------
 ...axonomy_term.field_job_import_feed_url.yml | 19 ---------------
 5 files changed, 48 deletions(-)
 delete mode 100644 config/field.field.taxonomy_term.source.field_job_import_feed_url.yml
 delete mode 100644 config/field.storage.taxonomy_term.field_job_import_feed_url.yml

diff --git a/config/core.entity_form_display.taxonomy_term.source.default.yml b/config/core.entity_form_display.taxonomy_term.source.default.yml
index 4c120622b..8d65ea962 100644
--- a/config/core.entity_form_display.taxonomy_term.source.default.yml
+++ b/config/core.entity_form_display.taxonomy_term.source.default.yml
@@ -13,7 +13,6 @@ dependencies:
     - field.field.taxonomy_term.source.field_fts_id
     - field.field.taxonomy_term.source.field_homepage
     - field.field.taxonomy_term.source.field_job_import_feed
-    - field.field.taxonomy_term.source.field_job_import_feed_url
     - field.field.taxonomy_term.source.field_links
     - field.field.taxonomy_term.source.field_logo
     - field.field.taxonomy_term.source.field_longname
@@ -209,7 +208,6 @@ content:
     settings: {  }
     third_party_settings: {  }
 hidden:
-  field_job_import_feed_url: true
   field_user_posting_rights: true
   langcode: true
   status: true
diff --git a/config/core.entity_form_display.taxonomy_term.source.user_posting_rights.yml b/config/core.entity_form_display.taxonomy_term.source.user_posting_rights.yml
index e64440d6e..b8d134deb 100644
--- a/config/core.entity_form_display.taxonomy_term.source.user_posting_rights.yml
+++ b/config/core.entity_form_display.taxonomy_term.source.user_posting_rights.yml
@@ -14,7 +14,6 @@ dependencies:
     - field.field.taxonomy_term.source.field_fts_id
     - field.field.taxonomy_term.source.field_homepage
     - field.field.taxonomy_term.source.field_job_import_feed
-    - field.field.taxonomy_term.source.field_job_import_feed_url
     - field.field.taxonomy_term.source.field_links
     - field.field.taxonomy_term.source.field_logo
     - field.field.taxonomy_term.source.field_longname
@@ -48,7 +47,6 @@ hidden:
   field_fts_id: true
   field_homepage: true
   field_job_import_feed: true
-  field_job_import_feed_url: true
   field_links: true
   field_logo: true
   field_longname: true
diff --git a/config/core.entity_view_display.taxonomy_term.source.default.yml b/config/core.entity_view_display.taxonomy_term.source.default.yml
index 7d4525bed..1005a1cf7 100644
--- a/config/core.entity_view_display.taxonomy_term.source.default.yml
+++ b/config/core.entity_view_display.taxonomy_term.source.default.yml
@@ -13,7 +13,6 @@ dependencies:
     - field.field.taxonomy_term.source.field_fts_id
     - field.field.taxonomy_term.source.field_homepage
     - field.field.taxonomy_term.source.field_job_import_feed
-    - field.field.taxonomy_term.source.field_job_import_feed_url
     - field.field.taxonomy_term.source.field_links
     - field.field.taxonomy_term.source.field_logo
     - field.field.taxonomy_term.source.field_longname
@@ -87,7 +86,6 @@ hidden:
   field_disclaimer: true
   field_fts_id: true
   field_job_import_feed: true
-  field_job_import_feed_url: true
   field_logo: true
   field_longname: true
   field_shortname: true
diff --git a/config/field.field.taxonomy_term.source.field_job_import_feed_url.yml b/config/field.field.taxonomy_term.source.field_job_import_feed_url.yml
deleted file mode 100644
index ae9e1f62f..000000000
--- a/config/field.field.taxonomy_term.source.field_job_import_feed_url.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: e036796c-7dc2-42db-8645-8d8db1f5d8c4
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_job_import_feed_url
-    - taxonomy.vocabulary.source
-  module:
-    - link
-id: taxonomy_term.source.field_job_import_feed_url
-field_name: field_job_import_feed_url
-entity_type: taxonomy_term
-bundle: source
-label: 'Job import feed URL'
-description: 'For automatic job imports. Link URL is a feed url of an updated list of the organizations job offers.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  title: 2
-  link_type: 16
-field_type: link
diff --git a/config/field.storage.taxonomy_term.field_job_import_feed_url.yml b/config/field.storage.taxonomy_term.field_job_import_feed_url.yml
deleted file mode 100644
index c6c9d5f3a..000000000
--- a/config/field.storage.taxonomy_term.field_job_import_feed_url.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-uuid: 18cd59c6-9f83-427a-8a77-b779c33a75b6
-langcode: en
-status: true
-dependencies:
-  module:
-    - link
-    - taxonomy
-id: taxonomy_term.field_job_import_feed_url
-field_name: field_job_import_feed_url
-entity_type: taxonomy_term
-type: link
-settings: {  }
-module: link
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false

From 63a3f4bb35cb1107ce5721d26dc6dbd815503dd0 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 18 Mar 2022 06:54:57 +0000
Subject: [PATCH 592/720] [RW-165] Migrate variables

---
 ...ate_plus.migration.reliefweb_variables.yml | 67 ++++++++++++++++
 .../reliefweb_entities/src/Entity/Job.php     |  6 +-
 .../src/Entity/Training.php                   | 42 ++++++++++
 .../src/EntityFormAlterServiceBase.php        |  1 +
 .../src/Services/TrainingFormAlter.php        |  9 +--
 ...ate_plus.migration.reliefweb_variables.yml | 60 +++++++++++++++
 .../src/Plugin/migrate/source/Variable.php    | 76 +++++++++++++++++++
 .../src/Services/TopicRiver.php               |  1 +
 8 files changed, 254 insertions(+), 8 deletions(-)
 create mode 100644 config/migrate_plus.migration.reliefweb_variables.yml
 create mode 100644 html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_variables.yml
 create mode 100644 html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Variable.php

diff --git a/config/migrate_plus.migration.reliefweb_variables.yml b/config/migrate_plus.migration.reliefweb_variables.yml
new file mode 100644
index 000000000..3098fc233
--- /dev/null
+++ b/config/migrate_plus.migration.reliefweb_variables.yml
@@ -0,0 +1,67 @@
+uuid: 6f9125de-318a-4f4b-803a-cce364201b4d
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: mr6965RHO0WThWT9Bh-AN1yOC25Ruf6ZxDbpQ2dnpyQ
+id: reliefweb_variables
+class: null
+field_plugin_method: null
+cck_plugin_method: null
+migration_tags: null
+migration_group: reliefweb_extra
+label: 'Migrate ReliefWeb variables.'
+source:
+  plugin: reliefweb_variable
+  table_name: variable
+  variables:
+    reliefweb_remove_themes_jobs: reliefweb_job_irrelevant_themes
+    reliefweb_remove_themes_training: reliefweb_training_irrelevant_themes
+    reliefweb_opportunities_new_source_help: reliefweb_form_new_source_help_job
+    reliefweb_opportunities_new_source_reminder: reliefweb_form_new_source_reminder_job
+    reliefweb_opportunities_no_source_status: reliefweb_no_source_status_training
+    reliefweb_topics_community_topics_links: reliefweb_topics_community_topics
+    reliefweb_headline_selection: reliefweb_headline_selection
+    facebook_app_id: facebook_app_id
+    reliefweb_submit_email: reliefweb_submit_email
+    reliefweb_taxonomy_valid_glide_exceptions: reliefweb_valid_glide_exceptions
+    reliefweb_subscriptions_mail_batch_size: reliefweb_subscriptions_mail_batch_size
+    reliefweb_api_references: reliefweb_api_references
+    reliefweb_api_index_tag_blog_post: reliefweb_api_index_tag_blog_post
+    reliefweb_api_index_tag_book: reliefweb_api_index_tag_book
+    reliefweb_api_index_tag_career_categories: reliefweb_api_index_tag_career_categories
+    reliefweb_api_index_tag_content_format: reliefweb_api_index_tag_content_format
+    reliefweb_api_index_tag_country: reliefweb_api_index_tag_country
+    reliefweb_api_index_tag_disaster: reliefweb_api_index_tag_disaster
+    reliefweb_api_index_tag_disaster_type: reliefweb_api_index_tag_disaster_type
+    reliefweb_api_index_tag_faq: reliefweb_api_index_tag_faq
+    reliefweb_api_index_tag_faq_category: reliefweb_api_index_tag_faq_category
+    reliefweb_api_index_tag_feature: reliefweb_api_index_tag_feature
+    reliefweb_api_index_tag_job: reliefweb_api_index_tag_job
+    reliefweb_api_index_tag_job_experience: reliefweb_api_index_tag_job_experience
+    reliefweb_api_index_tag_job_type: reliefweb_api_index_tag_job_type
+    reliefweb_api_index_tag_language: reliefweb_api_index_tag_language
+    reliefweb_api_index_tag_ocha_product: reliefweb_api_index_tag_ocha_product
+    reliefweb_api_index_tag_organization_type: reliefweb_api_index_tag_organization_type
+    reliefweb_api_index_tag_report: reliefweb_api_index_tag_report
+    reliefweb_api_index_tag_source: reliefweb_api_index_tag_source
+    reliefweb_api_index_tag_theme: reliefweb_api_index_tag_theme
+    reliefweb_api_index_tag_training: reliefweb_api_index_tag_training
+    reliefweb_api_index_tag_training_format: reliefweb_api_index_tag_training_format
+    reliefweb_api_index_tag_training_type: reliefweb_api_index_tag_training_type
+    reliefweb_api_index_tag_vulnerable_groups: reliefweb_api_index_tag_vulnerable_groups
+  constants:
+    collection: state
+process:
+  collection: constants/collection
+  name: name
+  value: value
+destination:
+  plugin: table
+  table_name: key_value
+  id_fields:
+    collection:
+      type: string
+    name:
+      type: string
+migration_dependencies: null
diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Job.php b/html/modules/custom/reliefweb_entities/src/Entity/Job.php
index 7994167c3..8ef611421 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Job.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Job.php
@@ -168,7 +168,7 @@ public function hasExpired() {
   }
 
   /**
-   * Get the list of job categories for which themes are irrelevant.
+   * Get the list of countries that are irrelevant for jobs.
    *
    * @return array
    *   List of theme term ids.
@@ -181,13 +181,13 @@ public static function getJobIrrelevantCountries() {
   }
 
   /**
-   * Get the list of job categories for which themes are irrelevant.
+   * Get the list of themes that are irrelevant for jobs.
    *
    * @return array
    *   List of theme term ids.
    */
   public static function getJobIrrelevantThemes() {
-    // Irrelevant career categories (Trello #RfWgIdwA):
+    // Irrelevant themes (Trello #RfWgIdwA):
     // - Contributions (4589) (Collab #2327).
     // - Humanitarian Financing (4597) (Trello #OnXq5cCC).
     // - Logistics and Telecommunications (4598) (Trello #G3YgNUF6).
diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Training.php b/html/modules/custom/reliefweb_entities/src/Entity/Training.php
index 3d63ff39b..0d2554d52 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Training.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Training.php
@@ -147,4 +147,46 @@ public function hasExpired() {
     return empty($timestamp) || ($timestamp < gmmktime(0, 0, 0));
   }
 
+  /**
+   * Get the list of themes that are irrelevant for training ads.
+   *
+   * @return array
+   *   List of term ids.
+   */
+  public static function getTrainingIrrelevantThemes() {
+    // Irrelevant themes (Trello #RfWgIdwA):
+    // - Contributions (4589) (Collab #2327).
+    // - Logistics and Telecommunications (4598) (Trello #G3YgNUF6).
+    // - Camp Coordination and Camp Management (49458).
+    $default = [4589, 4598, 49458];
+    return \Drupal::state()->get('reliefweb_training_irrelevant_themes', $default);
+  }
+
+  /**
+   * Get the list of languages that are irrelevant for training ads.
+   *
+   * @return array
+   *   List of term ids.
+   */
+  public static function getTrainingIrrelevantLanguages() {
+    // Irrelevant languages (Collab #4452001), due to limited capacity.
+    // - Russian (10906) and Arabic (6876).
+    // - Other (31996).
+    $default = [6876, 10906, 31996];
+    return \Drupal::state()->get('reliefweb_training_irrelevant_languages', $default);
+  }
+
+  /**
+   * Get the list of training languages that are irrelevant for training ads.
+   *
+   * @return array
+   *   List of term ids.
+   */
+  public static function getTrainingIrrelevantTrainingLanguages() {
+    // Irrelevant languages (Collab #4452001), due to limited capacity.
+    // - Other (31996).
+    $default = [31996];
+    return \Drupal::state()->get('reliefweb_training_irrelevant_training_languages', $default);
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php b/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
index 1755ae020..52b0931fb 100644
--- a/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
+++ b/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
@@ -523,6 +523,7 @@ protected function addPotentialNewSourceFields(array &$form, FormStateInterface
       $form['field_source_reminder'] = [
         '#title' => Markup::create($new_source_reminder),
         '#type' => 'checkbox',
+        '#not_required' => FALSE,
         '#states' => [
           'visible' => [
             ':input[name="field_source_none"]' => ['checked' => TRUE],
diff --git a/html/modules/custom/reliefweb_entities/src/Services/TrainingFormAlter.php b/html/modules/custom/reliefweb_entities/src/Services/TrainingFormAlter.php
index c18e71bb0..f2f3cf055 100644
--- a/html/modules/custom/reliefweb_entities/src/Services/TrainingFormAlter.php
+++ b/html/modules/custom/reliefweb_entities/src/Services/TrainingFormAlter.php
@@ -5,6 +5,7 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
 use Drupal\reliefweb_entities\EntityFormAlterServiceBase;
+use Drupal\reliefweb_entities\Entity\Training;
 use Drupal\reliefweb_form\Helpers\FormHelper;
 use Drupal\reliefweb_utility\Helpers\DateHelper;
 use Drupal\reliefweb_utility\Helpers\UrlHelper;
@@ -57,11 +58,9 @@ protected function addBundleFormAlterations(array &$form, FormStateInterface $fo
     // - Remove Logistics and Telecommunications (Trello #G3YgNUF6).
     // - Remove Russian (10906) and Arabic (6876) (Collab #4452001).
     // - Remove Other (31996) language option.
-    FormHelper::removeOptions($form, 'field_theme', $this->state->get('reliefweb_remove_themes_training', []));
-    FormHelper::removeOptions($form, 'field_language', [
-      6876, 10906, 31996,
-    ]);
-    FormHelper::removeOptions($form, 'field_training_language', [31996]);
+    FormHelper::removeOptions($form, 'field_theme', Training::getTrainingIrrelevantThemes());
+    FormHelper::removeOptions($form, 'field_language', Training::getTrainingIrrelevantLanguages());
+    FormHelper::removeOptions($form, 'field_training_language', Training::getTrainingIrrelevantTrainingLanguages());
 
     // Re-order the course/event language. Ordering by tid does the trick.
     FormHelper::orderOptionsByValue($form, 'field_training_language');
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_variables.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_variables.yml
new file mode 100644
index 000000000..a5364c638
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_variables.yml
@@ -0,0 +1,60 @@
+id: reliefweb_variables
+label: Migrate ReliefWeb variables.
+migration_group: reliefweb_extra
+source:
+  plugin: reliefweb_variable
+  table_name: variable
+  variables:
+    # Job/training.
+    reliefweb_remove_themes_jobs: reliefweb_job_irrelevant_themes
+    reliefweb_remove_themes_training: reliefweb_training_irrelevant_themes
+    reliefweb_opportunities_new_source_help: reliefweb_form_new_source_help_job
+    reliefweb_opportunities_new_source_reminder: reliefweb_form_new_source_reminder_job
+    reliefweb_opportunities_no_source_status: reliefweb_no_source_status_job
+    reliefweb_opportunities_no_source_status: reliefweb_no_source_status_training
+    reliefweb_topics_community_topics_links: reliefweb_topics_community_topics
+    # Various.
+    reliefweb_headline_selection: reliefweb_headline_selection
+    facebook_app_id: facebook_app_id
+    reliefweb_submit_email: reliefweb_submit_email
+    reliefweb_taxonomy_valid_glide_exceptions: reliefweb_valid_glide_exceptions
+    reliefweb_subscriptions_mail_batch_size: reliefweb_subscriptions_mail_batch_size
+    # API.
+    reliefweb_api_references: reliefweb_api_references
+    reliefweb_api_index_tag_blog_post: reliefweb_api_index_tag_blog_post
+    reliefweb_api_index_tag_book: reliefweb_api_index_tag_book
+    reliefweb_api_index_tag_career_categories: reliefweb_api_index_tag_career_categories
+    reliefweb_api_index_tag_content_format: reliefweb_api_index_tag_content_format
+    reliefweb_api_index_tag_country: reliefweb_api_index_tag_country
+    reliefweb_api_index_tag_disaster: reliefweb_api_index_tag_disaster
+    reliefweb_api_index_tag_disaster_type: reliefweb_api_index_tag_disaster_type
+    reliefweb_api_index_tag_faq: reliefweb_api_index_tag_faq
+    reliefweb_api_index_tag_faq_category: reliefweb_api_index_tag_faq_category
+    reliefweb_api_index_tag_feature: reliefweb_api_index_tag_feature
+    reliefweb_api_index_tag_job: reliefweb_api_index_tag_job
+    reliefweb_api_index_tag_job_experience: reliefweb_api_index_tag_job_experience
+    reliefweb_api_index_tag_job_type: reliefweb_api_index_tag_job_type
+    reliefweb_api_index_tag_language: reliefweb_api_index_tag_language
+    reliefweb_api_index_tag_ocha_product: reliefweb_api_index_tag_ocha_product
+    reliefweb_api_index_tag_organization_type: reliefweb_api_index_tag_organization_type
+    reliefweb_api_index_tag_report: reliefweb_api_index_tag_report
+    reliefweb_api_index_tag_source: reliefweb_api_index_tag_source
+    reliefweb_api_index_tag_theme: reliefweb_api_index_tag_theme
+    reliefweb_api_index_tag_training: reliefweb_api_index_tag_training
+    reliefweb_api_index_tag_training_format: reliefweb_api_index_tag_training_format
+    reliefweb_api_index_tag_training_type: reliefweb_api_index_tag_training_type
+    reliefweb_api_index_tag_vulnerable_groups: reliefweb_api_index_tag_vulnerable_groups
+  constants:
+    collection: 'state'
+destination:
+  plugin: table
+  table_name: key_value
+  id_fields:
+    collection:
+      type: string
+    name:
+      type: string
+process:
+  collection: constants/collection
+  name: name
+  value: value
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Variable.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Variable.php
new file mode 100644
index 000000000..866c0eb2f
--- /dev/null
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Variable.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Drupal\reliefweb_migrate\Plugin\migrate\source;
+
+use Drupal\migrate\Plugin\migrate\source\SqlBase;
+use Drupal\migrate\Row;
+
+/**
+ * Migrate variables.
+ *
+ * @MigrateSource(
+ *   id = "reliefweb_variable",
+ * )
+ */
+class Variable extends SqlBase {
+
+  /**
+   * Variables to migrate.
+   *
+   * @var array
+   */
+  protected $variables;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function query() {
+    return $this->select('variable', 'v')
+      ->fields('v', ['name', 'value'])
+      ->condition('name', array_keys($this->getVariables()), 'IN');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function fields() {
+    return [
+      'name' => $this->t('Name'),
+      'value' => $this->t('Value'),
+    ];
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function prepareRow(Row $row) {
+    $variables = $this->getVariables();
+    $name = $row->getSourceProperty('name');
+    $row->setSourceProperty('name', $variables[$name]);
+
+    return parent::prepareRow($row);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getIds() {
+    $ids['name']['type'] = 'string';
+    return $ids;
+  }
+
+  /**
+   * Get the variables to migrate.
+   *
+   * @return array
+   *   Associative array with the the D7 variable names as keys and the D9 ones
+   *   as values.
+   */
+  protected function getVariables() {
+    if (!isset($this->variables)) {
+      $this->variables = (array) $this->configuration['variables'] ?? [];
+    }
+    return $this->variables;
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_rivers/src/Services/TopicRiver.php b/html/modules/custom/reliefweb_rivers/src/Services/TopicRiver.php
index 9a0bb6ced..a4ffb2fc3 100644
--- a/html/modules/custom/reliefweb_rivers/src/Services/TopicRiver.php
+++ b/html/modules/custom/reliefweb_rivers/src/Services/TopicRiver.php
@@ -172,6 +172,7 @@ public function getRiverContent() {
     // Get the community topics.
     $community_topics = [];
     foreach (reliefweb_topics_get_all_community_topics() as $data) {
+      $data = is_array($data) ? (object) $data : $data;
       if (!empty($data->title) && !empty($data->url)) {
         $community_topics[] = [
           'title' => $data->title,

From 52521199901554763b608a797fdad749249cf569 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 18 Mar 2022 06:57:13 +0000
Subject: [PATCH 593/720] [RW-432] Handle sorting options of entity reference
 fields

---
 .../EntityReferenceSelection/AnyTermSelection.php      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_entities/src/Plugin/EntityReferenceSelection/AnyTermSelection.php b/html/modules/custom/reliefweb_entities/src/Plugin/EntityReferenceSelection/AnyTermSelection.php
index de0227507..0039887bc 100644
--- a/html/modules/custom/reliefweb_entities/src/Plugin/EntityReferenceSelection/AnyTermSelection.php
+++ b/html/modules/custom/reliefweb_entities/src/Plugin/EntityReferenceSelection/AnyTermSelection.php
@@ -137,7 +137,9 @@ public static function create(ContainerInterface $container, array $configuratio
    * {@inheritdoc}
    */
   public function getReferenceableEntities($match = NULL, $match_operator = 'CONTAINS', $limit = 0) {
-    $entity_type_id = $this->getConfiguration()['target_type'];
+    $configuration = $this->getConfiguration();
+    $entity_type_id = $configuration['target_type'];
+    $sort = $configuration['sort'];
 
     $query = $this->buildEntityQuery($match, $match_operator);
     if ($limit > 0) {
@@ -174,6 +176,12 @@ public function getReferenceableEntities($match = NULL, $match_operator = 'CONTA
     $query->condition($table . '.' . $id_field, $ids, 'IN');
     $query->condition($table . '.' . $langcode_field, $langcodes, 'IN');
 
+    // Add the sort option.
+    $sortable_fields = [$id_field => TRUE, $label_field => TRUE];
+    if (isset($sortable_fields[$sort['field']])) {
+      $query->orderBy($sort['field'], $sort['direction']);
+    }
+
     $options = [];
     foreach ($query->execute() ?? [] as $record) {
       $id = (int) $record->id;

From dca824c74465b5657ea897d07164dbec4f59e8d2 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 23 Mar 2022 04:13:23 +0000
Subject: [PATCH 594/720] [RW-434] Fix php error on unsubscribe page

---
 .../custom/reliefweb_subscriptions/src/Form/UnsubscribeForm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_subscriptions/src/Form/UnsubscribeForm.php b/html/modules/custom/reliefweb_subscriptions/src/Form/UnsubscribeForm.php
index 75e8b6654..5b3d1b641 100644
--- a/html/modules/custom/reliefweb_subscriptions/src/Form/UnsubscribeForm.php
+++ b/html/modules/custom/reliefweb_subscriptions/src/Form/UnsubscribeForm.php
@@ -177,7 +177,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
     }
 
     // Show the user a message.
-    $this->messenger()->addMessage($this->t('You have successfully updated your subscriptions'), MessengerInterface::TYPE_STATUS);
+    $this->messenger()->addStatus($this->t('Subscriptions successfully updated.'));
 
     $form_state->setRedirect('<front>');
   }

From 4f693408e702379f7b7bc2fb6db527900339696a Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 23 Mar 2022 04:14:53 +0000
Subject: [PATCH 595/720] [RW-435] Fix missing cache variable on term pages

---
 .../custom/reliefweb_meta/reliefweb_meta.module        | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/html/modules/custom/reliefweb_meta/reliefweb_meta.module b/html/modules/custom/reliefweb_meta/reliefweb_meta.module
index d646f4cc0..520f97cb5 100644
--- a/html/modules/custom/reliefweb_meta/reliefweb_meta.module
+++ b/html/modules/custom/reliefweb_meta/reliefweb_meta.module
@@ -361,6 +361,16 @@ function reliefweb_meta_get_node_metatags(NodeInterface $node) {
  *   Term metatags.
  */
 function reliefweb_meta_get_term_metatags(TermInterface $term) {
+  $cache = \Drupal::cache();
+  $cache_id = 'reliefweb_meta:entity:' . $term->uuid();
+  $cache_metadata = CacheableMetadata::createFromObject($term);
+
+  // Try to get the data from the cache.
+  $cache_object = $cache->get($cache_id);
+  if (!empty($cache_object->data)) {
+    return $cache_object->data;
+  }
+
   // Defaults.
   $type = 'article';
   $title = $term->label();

From f015c2a2252ed1178f20f6c54d087580620440e5 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 23 Mar 2022 05:11:21 +0000
Subject: [PATCH 596/720] [RW-164] Add user email fields

---
 ....entity_form_display.user.user.default.yml | 27 +++++++++++++++----
 ....entity_view_display.user.user.default.yml |  4 +++
 config/field.field.user.user.field_email.yml  | 20 ++++++++++++++
 ....field.user.user.field_email_confirmed.yml | 24 +++++++++++++++++
 config/field.storage.user.field_email.yml     | 18 +++++++++++++
 ...eld.storage.user.field_email_confirmed.yml | 18 +++++++++++++
 6 files changed, 106 insertions(+), 5 deletions(-)
 create mode 100644 config/field.field.user.user.field_email.yml
 create mode 100644 config/field.field.user.user.field_email_confirmed.yml
 create mode 100644 config/field.storage.user.field_email.yml
 create mode 100644 config/field.storage.user.field_email_confirmed.yml

diff --git a/config/core.entity_form_display.user.user.default.yml b/config/core.entity_form_display.user.user.default.yml
index aa9ee5236..bb28a745b 100644
--- a/config/core.entity_form_display.user.user.default.yml
+++ b/config/core.entity_form_display.user.user.default.yml
@@ -3,6 +3,8 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.user.user.field_email
+    - field.field.user.user.field_email_confirmed
     - field.field.user.user.field_notes
   module:
     - user
@@ -12,30 +14,45 @@ bundle: user
 mode: default
 content:
   account:
-    weight: -10
+    weight: 0
     region: content
     settings: {  }
     third_party_settings: {  }
   contact:
-    weight: 5
+    weight: 4
     region: content
     settings: {  }
     third_party_settings: {  }
+  field_email:
+    type: email_default
+    weight: 1
+    region: content
+    settings:
+      placeholder: ''
+      size: 60
+    third_party_settings: {  }
+  field_email_confirmed:
+    type: boolean_checkbox
+    weight: 2
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
   field_notes:
     type: string_textarea
-    weight: 7
+    weight: 6
     region: content
     settings:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
   language:
-    weight: 0
+    weight: 3
     region: content
     settings: {  }
     third_party_settings: {  }
   timezone:
-    weight: 6
+    weight: 5
     region: content
     settings: {  }
     third_party_settings: {  }
diff --git a/config/core.entity_view_display.user.user.default.yml b/config/core.entity_view_display.user.user.default.yml
index 334eb80f7..25a4e11e3 100644
--- a/config/core.entity_view_display.user.user.default.yml
+++ b/config/core.entity_view_display.user.user.default.yml
@@ -3,6 +3,8 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.user.user.field_email
+    - field.field.user.user.field_email_confirmed
     - field.field.user.user.field_notes
   module:
     - user
@@ -12,6 +14,8 @@ bundle: user
 mode: default
 content: {  }
 hidden:
+  field_email: true
+  field_email_confirmed: true
   field_notes: true
   langcode: true
   member_for: true
diff --git a/config/field.field.user.user.field_email.yml b/config/field.field.user.user.field_email.yml
new file mode 100644
index 000000000..43eb2bc10
--- /dev/null
+++ b/config/field.field.user.user.field_email.yml
@@ -0,0 +1,20 @@
+uuid: ddc7f43e-760e-41da-b337-5d3bcf499c5a
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.user.field_email
+  module:
+    - user
+id: user.user.field_email
+field_name: field_email
+entity_type: user
+bundle: user
+label: Email
+description: 'Email address used for notifications and contact.'
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings: {  }
+field_type: email
diff --git a/config/field.field.user.user.field_email_confirmed.yml b/config/field.field.user.user.field_email_confirmed.yml
new file mode 100644
index 000000000..16da9a7f0
--- /dev/null
+++ b/config/field.field.user.user.field_email_confirmed.yml
@@ -0,0 +1,24 @@
+uuid: 148b9928-cbc2-4ccf-8f82-775c0f5d0dbc
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.user.field_email_confirmed
+  module:
+    - user
+id: user.user.field_email_confirmed
+field_name: field_email_confirmed
+entity_type: user
+bundle: user
+label: 'Email confirmed'
+description: 'Indicates wether or not the notification email address has been confirmed.'
+required: false
+translatable: false
+default_value:
+  -
+    value: 0
+default_value_callback: ''
+settings:
+  on_label: 'Yes'
+  off_label: 'No'
+field_type: boolean
diff --git a/config/field.storage.user.field_email.yml b/config/field.storage.user.field_email.yml
new file mode 100644
index 000000000..0d030ced6
--- /dev/null
+++ b/config/field.storage.user.field_email.yml
@@ -0,0 +1,18 @@
+uuid: 0ff35de8-90b0-4655-860f-e1ed88bf0e77
+langcode: en
+status: true
+dependencies:
+  module:
+    - user
+id: user.field_email
+field_name: field_email
+entity_type: user
+type: email
+settings: {  }
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/config/field.storage.user.field_email_confirmed.yml b/config/field.storage.user.field_email_confirmed.yml
new file mode 100644
index 000000000..76b2050be
--- /dev/null
+++ b/config/field.storage.user.field_email_confirmed.yml
@@ -0,0 +1,18 @@
+uuid: de993cd7-a191-4f83-a6fb-486461be1f5e
+langcode: en
+status: true
+dependencies:
+  module:
+    - user
+id: user.field_email_confirmed
+field_name: field_email_confirmed
+entity_type: user
+type: boolean
+settings: {  }
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: {  }
+persist_with_no_fields: false
+custom_storage: false

From fb705ef95f4a2355e731a49013393e4e635de998 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 23 Mar 2022 06:31:09 +0000
Subject: [PATCH 597/720] [RW-164] Add handling of the email fields

---
 html/modules/custom/reliefweb_users/README.md |  17 ++
 .../install/reliefweb_users.settings.yml      |   2 +
 .../config/schema/reliefweb_users.schema.yml  |   0
 .../reliefweb_users/reliefweb_users.module    | 214 ++++++++++++++++++
 .../reliefweb_users.routing.yml               |  24 ++
 .../src/Controller/UserController.php         |  17 +-
 .../UserEmailConfirmationController.php       | 153 +++++++++++++
 7 files changed, 425 insertions(+), 2 deletions(-)
 create mode 100644 html/modules/custom/reliefweb_users/README.md
 create mode 100644 html/modules/custom/reliefweb_users/config/install/reliefweb_users.settings.yml
 create mode 100644 html/modules/custom/reliefweb_users/config/schema/reliefweb_users.schema.yml
 create mode 100644 html/modules/custom/reliefweb_users/reliefweb_users.routing.yml
 create mode 100644 html/modules/custom/reliefweb_users/src/Controller/UserEmailConfirmationController.php

diff --git a/html/modules/custom/reliefweb_users/README.md b/html/modules/custom/reliefweb_users/README.md
new file mode 100644
index 000000000..4f8427be1
--- /dev/null
+++ b/html/modules/custom/reliefweb_users/README.md
@@ -0,0 +1,17 @@
+ReliefWeb - Users module
+========================
+
+This module provides customizations for user accounts.
+
+TODO
+----
+
+If it is decided to remove the `field_email` in favor of the `mail` property,
+the following code needs to be updated:
+
+- **reliefweb_users**: entity hooks, email confirmation controller etc.
+- **reliefweb_contact**: `hook_mail_alter()`
+- **reliefweb_subscriptions**: `ReliefwebSubscriptionsMailer::getSubscribers()`
+- **reliefweb_entities**: `EntityFormAlterServiceBase::addUserInformation()`
+- **reliefweb_fields**: ReliefWebUserPostingRights
+- **reliefweb_moderation**: `ModerationServiceBase::getUserAutocompleteSuggestions()`
diff --git a/html/modules/custom/reliefweb_users/config/install/reliefweb_users.settings.yml b/html/modules/custom/reliefweb_users/config/install/reliefweb_users.settings.yml
new file mode 100644
index 000000000..f872867bd
--- /dev/null
+++ b/html/modules/custom/reliefweb_users/config/install/reliefweb_users.settings.yml
@@ -0,0 +1,2 @@
+# Validity duration of an email confirmation link (in seconds).
+email_confirmation_timeout: 604800
diff --git a/html/modules/custom/reliefweb_users/config/schema/reliefweb_users.schema.yml b/html/modules/custom/reliefweb_users/config/schema/reliefweb_users.schema.yml
new file mode 100644
index 000000000..e69de29bb
diff --git a/html/modules/custom/reliefweb_users/reliefweb_users.module b/html/modules/custom/reliefweb_users/reliefweb_users.module
index a81b82648..39ec48969 100644
--- a/html/modules/custom/reliefweb_users/reliefweb_users.module
+++ b/html/modules/custom/reliefweb_users/reliefweb_users.module
@@ -5,8 +5,13 @@
  * Module file for reliefweb_users.
  */
 
+use Drupal\Component\Utility\Crypt;
+use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Site\Settings;
+use Drupal\Core\Url;
 use Drupal\user\RoleInterface;
+use Drupal\user\UserInterface;
 
 /**
  * Implements hook_theme().
@@ -53,6 +58,38 @@ function reliefweb_users_form_user_form_alter(array &$form, FormStateInterface $
   // Only people who can administrate other accounts can add notes.
   $form['field_notes']['#access'] = $user->hasPermission('administer users');
 
+  // Only people who can administrate other accounts can confirm an email.
+  if ($user->hasPermission('administer users')) {
+    $form['account']['mail']['#title'] = t('Original account email');
+    // Add a flag to bypass sending an email confirmation message when
+    // confirmed is checked.
+    $form_state->getFormObject()->getEntity()->_bypass_email_confirmation = TRUE;
+  }
+  else {
+    $form['account']['mail']['#access'] = FALSE;
+    $form['field_email_confirmed']['#access'] = FALSE;
+
+    if (isset($form['actions']['submit']['#submit'])) {
+      $form['actions']['submit']['#submit'][] = 'reliefweb_users_user_form_submit';
+    }
+    else {
+      $form['#submit'][] = 'reliefweb_users_user_form_submit';
+    }
+
+    if (empty($form_state->getFormObject()?->getEntity()?->field_email_confirmed?->value)) {
+      $form['field_email']['widget'][0]['value']['#title'] = t('@title <em>(not confirmed)</em>', [
+        '@title' => $form['field_email']['widget'][0]['value']['#title'],
+      ]);
+      $form['field_email']['widget'][0]['value']['#description'] = t('@description<br>A message with a link to confirm your email address will be sent when saving your account settings.', [
+        '@description' => $form['field_email']['widget'][0]['value']['#description'] ?? '',
+      ]);
+    }
+  }
+
+  // Add a validation callback to the email field to ensure it's already used
+  // by another account.
+  $form['field_email']['widget'][0]['value']['#element_validate'][] = 'reliefweb_users_validate_email';
+
   // Check if hte user is allowed to assign roles.
   if ($user->hasPermission('manage user roles') && !empty($form['account']['roles']['#options'])) {
     $form['account']['roles']['#access'] = TRUE;
@@ -79,3 +116,180 @@ function reliefweb_users_form_user_form_alter(array &$form, FormStateInterface $
     $form['account']['roles']['#access'] = FALSE;
   }
 }
+
+/**
+ * User form submit callback.
+ *
+ * @param array $form
+ *   Form.
+ * @param \Drupal\Core\Form\FormStateInterface $form_state
+ *   Form state.
+ */
+function reliefweb_users_user_form_submit(array $form, FormStateInterface $form_state) {
+  if (!empty($form_state->getFormObject()?->getEntity()?->_send_email_confirmation)) {
+    \Drupal::messenger()->addStatus(t('A message to confirm your email address has been sent.'));
+  }
+}
+
+/**
+ * Implements hook_form_user_form_alter().
+ */
+function reliefweb_users_validate_email(array &$element, FormStateInterface $form_state, array $form) {
+  $email = trim($form_state->getValue($element['#parents'], ''));
+
+  // Check if the email is already used by another account.
+  if (!empty($email)) {
+    $user_id = $form_state->getFormObject()?->getEntity()?->id();
+
+    $exists = \Drupal::database()
+      ->select('user__field_email', 't')
+      ->fields('t', ['field_email_value'])
+      ->condition('t.field_email_value', $email, '=')
+      ->condition('t.entity_id', $user_id, '<>')
+      ->range(0, 1)
+      ->execute()
+      ?->fetchField();
+
+    if (!empty($exists)) {
+      $form_state->setError($element, t('Email address already used by another account'));
+    }
+  }
+}
+
+/**
+ * Implements hook_ENTITY_TYPE_presave() for 'user'.
+ */
+function reliefweb_users_user_presave(EntityInterface $entity) {
+  // @todo remove when removing `reliefweb_migrate`.
+  if (!empty($entity->_is_migrating)) {
+    $entity->field_email->value = $entity->mail->value;
+    $entity->field_email_confirmed->value = 1;
+    return;
+  }
+
+  // Populate the email field for new accounts.
+  if ($entity->isNew()) {
+    $entity->field_email->value = $entity->mail->value;
+    $entity->field_email_confirmed->value = 1;
+  }
+  // Add a flag to send an email confirmation message.
+  elseif (empty($entity->_bypass_email_confirmation)) {
+    $previous_email = $entity->original?->field_email?->value ?? '';
+    $current_email = $entity->field_email?->value ?? '';
+    $confirmed = !empty($entity->field_email_confirmed?->value);
+
+    if (!empty($current_email)) {
+      if (($current_email !== $previous_email) || !$confirmed) {
+        $entity->field_email_confirmed->value = 0;
+        $entity->_send_email_confirmation = TRUE;
+      }
+    }
+    else {
+      $entity->field_email_confirmed->value = 0;
+    }
+  }
+}
+
+/**
+ * Implements hook_ENTITY_TYPE_update() for 'user'.
+ */
+function reliefweb_users_user_update(EntityInterface $entity) {
+  // @todo remove when removing `reliefweb_migrate`.
+  if (!empty($entity->_is_migrating)) {
+    return;
+  }
+  if (!empty($entity->_send_email_confirmation)) {
+    $langcode = \Drupal::languageManager()->getDefaultLanguage()->getId();
+    $email = $entity->field_email?->value ?? '';
+
+    // Send an email to ask for confirmation of the email address.
+    if (!empty($email)) {
+      \Drupal::service('plugin.manager.mail')->mail('reliefweb_users', 'email_confirmation', $email, $langcode, [
+        'user' => $entity,
+      ]);
+    }
+  }
+}
+
+/**
+ * Implements hook_mail().
+ */
+function reliefweb_users_mail($key, array &$message, array $params) {
+  if ($key === 'email_confirmation' && !empty($params['user'])) {
+    $user = $params['user'];
+
+    $link = reliefweb_users_get_email_confirmation_url($user);
+
+    $body = \Drupal::state()->get('reliefweb_users_email_confirmation_message', implode("\n\n", [
+      'Dear @user',
+      'You just added this email address to your profile on https://reliefweb.int.',
+      'Please confirm it by clicking or copying and pasting the following link into your browser:',
+      '@link',
+      'Kinds regards,',
+      'The ReliefWeb Team',
+    ]));
+
+    $message['subject'] = 'ReliefWeb - Email address confirmation';
+    $message['body'][] = strtr($body, [
+      '@user' => $user->label(),
+      '@link' => $link,
+    ]);
+  }
+}
+
+/**
+ * Generate an email confirmation URL for the given user.
+ *
+ * @param \Drupal\user\UserInterface $user
+ *   User entity.
+ *
+ * @return string
+ *   Email confirmation URL.
+ */
+function reliefweb_users_get_email_confirmation_url(UserInterface $user) {
+  $timestamp = \Drupal::time()->getRequestTime();
+  $hash = reliefweb_user_get_email_confirmation_hash($user, $timestamp);
+
+  return Url::fromRoute('user.email.confirmation', [
+    'uid' => $user->id(),
+    'timestamp' => $timestamp,
+    'hash' => $hash,
+  ], [
+    'absolute' => TRUE,
+  ])->toString();
+}
+
+/**
+ * Generate the hash for the email confirmation URL for the given user.
+ *
+ * @param \Drupal\user\UserInterface $user
+ *   User entity.
+ * @param int $timestamp
+ *   Timestamp.
+ *
+ * @return string
+ *   Email confirmation hash
+ */
+function reliefweb_user_get_email_confirmation_hash(UserInterface $user, $timestamp) {
+  $email = $user->field_email->value;
+  $confirmed = !empty($user->field_email_confirmed->value) ? '1' : '0';
+  $data = implode('/', [$user->id(), $timestamp, $email, $confirmed]);
+  return Crypt::hmacBase64($data, Settings::getHashSalt() . $email);
+}
+
+/**
+ * Get a user's email.
+ *
+ * @param \Drupal\user\UserInterface $user
+ *   User.
+ *
+ * @return string
+ *   The user's email.
+ */
+function reliefweb_users_get_email(UserInterface $user) {
+  if (!empty($user->field_email_confirmed->value)) {
+    $email = trim($user->field_email?->value ?? '');
+    return $email ?: $user->getEmail();
+  }
+  return $user->getEmail();
+}
diff --git a/html/modules/custom/reliefweb_users/reliefweb_users.routing.yml b/html/modules/custom/reliefweb_users/reliefweb_users.routing.yml
new file mode 100644
index 000000000..55fdd0330
--- /dev/null
+++ b/html/modules/custom/reliefweb_users/reliefweb_users.routing.yml
@@ -0,0 +1,24 @@
+user.email.confirmation:
+  path: '/user/email/confirmation/{uid}/{timestamp}/{hash}'
+  defaults:
+    _controller: '\Drupal\reliefweb_users\Controller\UserEmailConfirmationController::redirectConfirmation'
+    _title: 'Redirect to confirm user email'
+  requirements:
+    _access: 'TRUE'
+    user: \d+
+  options:
+    _maintenance_access: FALSE
+    no_cache: TRUE
+
+user.email.confirmation.process:
+  path: '/user/email/confirmation/{uid}'
+  defaults:
+    _controller: '\Drupal\reliefweb_users\Controller\UserEmailConfirmationController::processConfirmation'
+    _title: 'Confirm user email'
+  requirements:
+    _access: 'TRUE'
+    user: \d+
+  options:
+    _maintenance_access: FALSE
+    no_cache: TRUE
+
diff --git a/html/modules/custom/reliefweb_users/src/Controller/UserController.php b/html/modules/custom/reliefweb_users/src/Controller/UserController.php
index b7cdf9060..89e2ea272 100644
--- a/html/modules/custom/reliefweb_users/src/Controller/UserController.php
+++ b/html/modules/custom/reliefweb_users/src/Controller/UserController.php
@@ -160,7 +160,12 @@ protected function usersAdminList($storage, $query_parameters) {
       $query->condition('u.name', '%' . $this->database->escapeLike($filters['name']) . '%', 'LIKE');
     }
     if (!empty($filters['mail'])) {
-      $query->condition('u.mail', '%' . $this->database->escapeLike($filters['mail']) . '%', 'LIKE');
+      $query->leftJoin('user__field_email', 'fe', 'fe.entity_id = u.uid');
+      $query->fields('fe', ['field_email_value']);
+      $or_group = $query->orConditionGroup();
+      $or_group->condition('u.mail', '%' . $this->database->escapeLike($filters['mail']) . '%', 'LIKE');
+      $or_group->condition('fe.field_email_value', '%' . $this->database->escapeLike($filters['mail']) . '%', 'LIKE');
+      $query->condition($or_group);
     }
 
     // Content posted filter.
@@ -215,10 +220,18 @@ protected function usersAdminList($storage, $query_parameters) {
           $user_roles = array_intersect_key($roles, array_flip($users_roles[$user->uid]));
         }
 
+        $mail = Link::fromTextAndUrl($user->mail, URL::fromUserInput('/user/' . $user->uid));
+        if (!empty($user->field_email_value) && $user->field_email_value !== $user->mail) {
+          $mail = new FormattableMarkup('@mail<br>%other_mail', [
+            '@mail' => Link::fromTextAndUrl($user->field_email_value, URL::fromUserInput('/user/' . $user->uid))->toString(),
+            '%other_mail' => $mail->toString(),
+          ]);
+        }
+
         $rows[$user->uid] = [
           'uid' => $user->uid,
           'name' => Link::fromTextAndUrl($user->name, URL::fromUserInput('/user/' . $user->uid)),
-          'mail' => Link::fromTextAndUrl($user->mail, URL::fromUserInput('/user/' . $user->uid)),
+          'mail' => $mail,
           'status' => $statuses[empty($user->status) ? 'blocked' : 'active'],
           'role' => !empty($user_roles) ? new FormattableMarkup('<ol><li>' . implode('</li><li>', $user_roles) . '</li></ol>', []) : '',
           'sources' => isset($user->sources) ? new FormattableMarkup($user->sources, []) : '',
diff --git a/html/modules/custom/reliefweb_users/src/Controller/UserEmailConfirmationController.php b/html/modules/custom/reliefweb_users/src/Controller/UserEmailConfirmationController.php
new file mode 100644
index 000000000..79f969472
--- /dev/null
+++ b/html/modules/custom/reliefweb_users/src/Controller/UserEmailConfirmationController.php
@@ -0,0 +1,153 @@
+<?php
+
+namespace Drupal\reliefweb_users\Controller;
+
+use Drupal\Component\Datetime\TimeInterface;
+use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Controller\ControllerBase;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+
+/**
+ * Email confirmation controller.
+ */
+class UserEmailConfirmationController extends ControllerBase {
+
+  /**
+   * The config factory service.
+   *
+   * @var \Drupal\Core\Config\ConfigFactoryInterface
+   */
+  protected $configFactory;
+
+  /**
+   * The request stack.
+   *
+   * @var \Symfony\Component\HttpFoundation\RequestStack
+   */
+  protected $requestStack;
+
+  /**
+   * The time service.
+   *
+   * @var \Drupal\Component\Datetime\TimeInterface
+   */
+  protected $time;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(
+    ConfigFactoryInterface $config_factory,
+    RequestStack $request_stack,
+    TimeInterface $time
+  ) {
+    $this->configFactory = $config_factory;
+    $this->requestStack = $request_stack;
+    $this->time = $time;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('config.factory'),
+      $container->get('request_stack'),
+      $container->get('datetime.time')
+    );
+  }
+
+  /**
+   * Redirects to the user email confirmation page.
+   *
+   * In order to never disclose an email confirmation link via a referrer header
+   * this controller must always return a redirect response.
+   *
+   * @param int $uid
+   *   User ID of the user requesting reset.
+   * @param int $timestamp
+   *   The current timestamp.
+   * @param string $hash
+   *   Email confirmation link hash.
+   *
+   * @return \Symfony\Component\HttpFoundation\RedirectResponse
+   *   The redirect response.
+   */
+  public function redirectConfirmation($uid, $timestamp, $hash) {
+    $account = $this->currentUser();
+
+    // The link is not valid if it is not for the current logged in user.
+    if ($account->isAuthenticated() && $account->id() != $uid) {
+      $this->messenger()->addError($this->t("The one-time email confirmation link you clicked is invalid for the current logged in account."));
+      return $this->redirect('<front>');
+    }
+
+    $session = $this->requestStack->getCurrentRequest()->getSession();
+    $session->set('email_confirmation_hash', $hash);
+    $session->set('email_confirmation_timestamp', $timestamp);
+    return $this->redirect(
+      'user.email.confirmation.process',
+      ['uid' => $uid]
+    );
+  }
+
+  /**
+   * Confirm the user email.
+   *
+   * In order to never disclose an email confirmation link via a referrer header
+   * this controller must always return a redirect response.
+   *
+   * @param int $uid
+   *   User ID of the user requesting reset.
+   *
+   * @return \Symfony\Component\HttpFoundation\RedirectResponse
+   *   The redirect response.
+   */
+  public function processConfirmation($uid) {
+    $session = $this->requestStack->getCurrentRequest()->getSession();
+    $hash = $session->get('email_confirmation_hash');
+    $timestamp = $session->get('email_confirmation_timestamp');
+
+    // As soon as the session variables are used they are removed to prevent the
+    // hash and timestamp from being leaked unexpectedly.
+    $session->remove('email_confirmation_hash');
+    $session->remove('email_confirmation_timestamp');
+
+    if (empty($hash) || empty($timestamp)) {
+      throw new AccessDeniedHttpException();
+    }
+
+    /** @var \Drupal\user\UserInterface $user */
+    $user = $this->entityTypeManager()->getStorage('user')->load($uid);
+    if ($user === NULL || !$user->isActive()) {
+      // Blocked or invalid user ID, so deny access. The parameters will be in
+      // the watchdog's URL for the administrator to check.
+      throw new AccessDeniedHttpException();
+    }
+
+    $current = $this->time
+      ->getRequestTime();
+
+    $timeout = $this->configFactory
+      ->get('reliefweb_user.settings')
+      ->get('email_confirmation_timeout');
+
+    if (reliefweb_user_get_email_confirmation_hash($user, $timestamp) !== $hash) {
+      $this->messenger()->addError($this->t('Invalid email confirmation link.'));
+    }
+    elseif (!empty($timeout) && $current - $timestamp > $timeout) {
+      $this->messenger()->addError($this->t('The email confirmation link has expired. Please go to your account settings, check your email address and save to generate a new verification link.'));
+    }
+    else {
+      // Note: this seems to delete sessions for the user, forcing any person
+      // logged in with that account to be logged out.
+      $user->field_email_confirmed->value = 1;
+      $user->save();
+      $this->messenger()->addStatus($this->t('Email successfully confirmed.'));
+    }
+    return $this->redirect('<front>');
+  }
+
+}

From 201983754f7ae0813d6c5ce5442d8e9475db9102 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 23 Mar 2022 06:31:58 +0000
Subject: [PATCH 598/720] [RW-164] Update user form template and styling

---
 .../components/rw-form/rw-form.css            |  5 +++
 .../components/rw-user/rw-user.css            | 43 +++++++++++--------
 .../templates/form/user-edit-form.html.twig   |  6 ++-
 3 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 4c6c25d91..4af5c8b35 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -537,3 +537,8 @@ legend.form-required::after {
   display: inline-block;
   vertical-align: top;
 }
+
+/* Actions on classic forms without a sidebar. */
+form:not(.rw-entity-form-altered) .form-actions.form-item {
+  margin-top: var(--cd-flow-space, 2.5rem);
+}
diff --git a/html/themes/custom/common_design_subtheme/components/rw-user/rw-user.css b/html/themes/custom/common_design_subtheme/components/rw-user/rw-user.css
index 4c9c26532..6537c07cf 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-user/rw-user.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-user/rw-user.css
@@ -9,7 +9,7 @@
 }
 
 /**
- * Unsubscribe form.
+ * Subscription form.
  *
  * This doesn't really belong here but is related to the notifications.
  */
@@ -17,6 +17,22 @@
   display: block;
   margin-top: 8px;
 }
+.subscription-form [data-drupal-selector="edit-information"] p {
+  font-size: 16px;
+}
+.subscription-form [data-drupal-selector="edit-information"] .fieldset-wrapper em {
+  font-weight: bold;
+}
+.subscription-form .form-item-country-updates label {
+  margin: 0 0 24px 0;
+  letter-spacing: 0.5px;
+  font-size: 20px;
+  font-weight: bold;
+  line-height: 1.3;
+}
+.subscription-form .form-actions.form-item {
+  margin-top: 24px;
+}
 
 /**
  * User dashboard.
@@ -59,26 +75,17 @@
   --cd-flow-space: 2rem;
 }
 
-.subscription-form fieldset:first-of-type,
-.user-form fieldset:first-of-type,
-.community-topics-form fieldset:first-of-type,
-.contact-message-form {
-  padding-top: 24px;
-}
 /* Nested fieldset */
 .user-form fieldset fieldset:first-of-type {
   padding-top: 0;
 }
 
-/* Personal contact form */
-.contact-message-form > .form-wrapper:not(.form-actions) {
-  position: relative;
-  width: 100%;
-  padding: 16px 0 32px;
-  border-bottom: 1px solid var(--cd-reliefweb-brand-grey--light);
-}
-
-/* Community topics actions */
-.community-topics-form .form-actions.form-item {
-  margin-top: 32px;
+.user-form.cd-form--user .cd-form__item.form-item-current-pass,
+.user-form.cd-form--user .cd-form__item.form-type-textfield,
+.user-form.cd-form--user .cd-form__item.form-type-email,
+.user-form.cd-form--user .cd-form__item.form-type-managed-file,
+.user-form.cd-form--user #password-policy-status,
+.user-form.cd-form--user details {
+  padding-bottom: 0;
+  border-bottom: none;
 }
diff --git a/html/themes/custom/common_design_subtheme/templates/form/user-edit-form.html.twig b/html/themes/custom/common_design_subtheme/templates/form/user-edit-form.html.twig
index ab280fea4..93800c5a6 100644
--- a/html/themes/custom/common_design_subtheme/templates/form/user-edit-form.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/form/user-edit-form.html.twig
@@ -26,6 +26,8 @@
   {{ form.account.pass }}
   {{ form.account.reset_pass }}
   {{ form.display_name }}
+  {{ form.field_email }}
+  {{ form.field_email_confirmed }}
 </fieldset>
 
 {% if form.account.status['#access'] != false %}
@@ -59,6 +61,8 @@
     'account',
     'field_notes',
     'actions',
-    'display_name'
+    'display_name',
+    'field_email',
+    'field_email_confirmed',
   ])
 }}

From 0123bd7e17a0664f69c6702d92dc94fccce9ba42 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 23 Mar 2022 06:32:41 +0000
Subject: [PATCH 599/720] [RW-164] Update reliefweb_contact module to use the
 user email fields

---
 .../custom/reliefweb_contact/reliefweb_contact.info.yml       | 2 ++
 .../modules/custom/reliefweb_contact/reliefweb_contact.module | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/html/modules/custom/reliefweb_contact/reliefweb_contact.info.yml b/html/modules/custom/reliefweb_contact/reliefweb_contact.info.yml
index 8f192acbe..b5386c67f 100644
--- a/html/modules/custom/reliefweb_contact/reliefweb_contact.info.yml
+++ b/html/modules/custom/reliefweb_contact/reliefweb_contact.info.yml
@@ -3,3 +3,5 @@ name: ReliefWeb Contact
 description: 'Contact users.'
 package: reliefweb
 core_version_requirement: ^9
+dependencies:
+  - drupal:reliefweb_users
diff --git a/html/modules/custom/reliefweb_contact/reliefweb_contact.module b/html/modules/custom/reliefweb_contact/reliefweb_contact.module
index 1e1f788b6..d6ee005f9 100644
--- a/html/modules/custom/reliefweb_contact/reliefweb_contact.module
+++ b/html/modules/custom/reliefweb_contact/reliefweb_contact.module
@@ -15,6 +15,10 @@ function reliefweb_contact_mail_alter(&$message) {
     return;
   }
 
+  // Use the email field if defined and confirmed, other we try with the default
+  // user email address.
+  $message['to'] = reliefweb_users_get_email($message['params']['recipient']);
+
   /** @var Drupal\contact\Entity\Message $contact_message */
   $contact_message = $message['params']['contact_message'];
   $sender = $contact_message->field_sender->value;

From 08981ea46b4d43064015cfb75bae9291c56a61dc Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 23 Mar 2022 06:33:15 +0000
Subject: [PATCH 600/720] [RW-164] Update reliefweb_entities module to use the
 user email fields

---
 .../custom/reliefweb_entities/reliefweb_entities.info.yml       | 1 +
 .../reliefweb_entities/src/EntityFormAlterServiceBase.php       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_entities/reliefweb_entities.info.yml b/html/modules/custom/reliefweb_entities/reliefweb_entities.info.yml
index 0d262a333..58f07ce56 100644
--- a/html/modules/custom/reliefweb_entities/reliefweb_entities.info.yml
+++ b/html/modules/custom/reliefweb_entities/reliefweb_entities.info.yml
@@ -7,4 +7,5 @@ dependencies:
   - drupal:reliefweb_moderation
   - drupal:reliefweb_revisions
   - drupal:reliefweb_form
+  - drupal:reliefweb_users
   - drupal:reliefweb_utility
diff --git a/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php b/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
index 52b0931fb..6922d34ad 100644
--- a/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
+++ b/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
@@ -736,7 +736,7 @@ protected function addUserInformation(array &$form, FormStateInterface $form_sta
     if (!empty($author) && !$author->isAnonymous()) {
       $build['#author'] = [
         'name' => $author->getDisplayName(),
-        'mail' => $author->getEmail(),
+        'mail' => reliefweb_users_get_email($author),
         'url' => $author->toUrl()->toString(),
       ];
 

From 24d7623409af6e02ed40ef5276d1c352d858d548 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 23 Mar 2022 06:33:36 +0000
Subject: [PATCH 601/720] [RW-164] Update reliefweb_fields module to use the
 user email fields

---
 .../reliefweb_fields.info.yml                 |  1 +
 .../ReliefWebUserPostingRights.php            | 21 +++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/html/modules/custom/reliefweb_fields/reliefweb_fields.info.yml b/html/modules/custom/reliefweb_fields/reliefweb_fields.info.yml
index ad61fe6bd..60b5532eb 100644
--- a/html/modules/custom/reliefweb_fields/reliefweb_fields.info.yml
+++ b/html/modules/custom/reliefweb_fields/reliefweb_fields.info.yml
@@ -5,6 +5,7 @@ package: reliefweb
 core_version_requirement: ^9
 dependencies:
   - drupal:reliefweb_form
+  - drupal:reliefweb_users
   - drupal:taxonomy
   - drupal:taxonomy_term_revision
   - drupal:taxonomy_term_preview
diff --git a/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebUserPostingRights.php b/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebUserPostingRights.php
index 02eddff2e..dd2e44610 100644
--- a/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebUserPostingRights.php
+++ b/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebUserPostingRights.php
@@ -101,10 +101,16 @@ public static function getFieldState(array $parents, $field_name, FormStateInter
 
       // Retrieve the user data.
       if (!empty($ids)) {
-        $users = \Drupal::database()
+        $query = \Drupal::database()
           ->select('users_field_data', 'u')
           ->fields('u', ['uid', 'name', 'mail', 'status'])
-          ->condition('u.uid', $ids, 'IN')
+          ->condition('u.uid', $ids, 'IN');
+        $query->leftJoin('user__field_email', 'fe', 'fe.entity_id = u.uid');
+        $query->fields('fe', ['field_email_value']);
+        $query->leftJoin('user__field_email_confirmed', 'fec', 'fec.entity_id = u.uid');
+        $query->fields('fec', ['field_email_confirmed_value']);
+
+        $users = $query
           ?->execute()
           ?->fetchAllAssoc('uid', \PDO::FETCH_ASSOC);
 
@@ -171,7 +177,14 @@ public static function normalizeData(array $data) {
     $data['notes'] = isset($data['notes']) ? trim($data['notes']) : '';
 
     $data['name'] = trim($data['name']);
-    $data['mail'] = trim($data['mail']);
+
+    if (!empty($data['field_email_confirmed_value']) && !empty($data['field_email_value'])) {
+      $data['mail'] = trim($data['field_email_value']);
+    }
+    else {
+      $data['mail'] = trim($data['mail']);
+    }
+
     $data['status'] = intval($data['status'], 10);
     // Blocked users are not allowed to post.
     if ($data['status'] === 0) {
@@ -307,7 +320,7 @@ public static function updateFields($op, UserInterface $user) {
 
     $uid = $user->id();
     $blocked = $user->isBlocked();
-    $email_changed = isset($user->original) && $user->getEmail() !== $user->original->getEmail();
+    $email_changed = isset($user->original) && reliefweb_users_get_email($user) !== reliefweb_users_get_email($user->original);
     $message = '';
     $date = date_format(date_create(), 'Y-m-d');
 

From a672fc3519f364fa650d72167cdc479d72cc7fa7 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 23 Mar 2022 06:33:56 +0000
Subject: [PATCH 602/720] [RW-164] Update reliefweb_moderation module to use
 the user email fields

---
 .../reliefweb_moderation.info.yml             |  1 +
 .../src/ModerationServiceBase.php             | 20 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_moderation/reliefweb_moderation.info.yml b/html/modules/custom/reliefweb_moderation/reliefweb_moderation.info.yml
index c8ac26a2e..fffe8cae7 100644
--- a/html/modules/custom/reliefweb_moderation/reliefweb_moderation.info.yml
+++ b/html/modules/custom/reliefweb_moderation/reliefweb_moderation.info.yml
@@ -6,4 +6,5 @@ core_version_requirement: ^9
 dependencies:
   - drupal:user
   - drupal:reliefweb_form
+  - drupal:reliefweb_users
   - drupal:reliefweb_utility
diff --git a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
index 69406eced..30b97f365 100644
--- a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
+++ b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
@@ -2076,6 +2076,18 @@ protected function getUserAutocompleteSuggestions($filter, $term, $conditions, a
     $entity_alias = $query->innerJoin($entity_table, $entity_table, "%alias.{$revision_id_field} = {$revision_alias}.{$revision_id_field}");
     $query->condition($entity_alias . '.' . $entity_bundle_field, $bundle, '=');
 
+    // Join the email field table for the job or training moderation backend as
+    // it can be relevant there. For other backends, the user is most likely
+    // a ReliefWeb editor so we can speed up the lookup by excluding this
+    // field.
+    if ($bundle === 'job' || $bundle === 'training') {
+      $email_table = $this->getFieldTableName('user', 'field_email');
+      $email_field = $this->getFieldColumnName('user', 'field_email', 'value');
+      $email_alias = $query->leftJoin($email_table, $email_table, "%alias.entity_id = {$alias}.{$id_field}");
+      $query->addField($email_alias, $email_field, 'email');
+      $fields[] = $email_table . '.' . $email_field;
+    }
+
     // Add conditions.
     $conditions = $this->buildFilterConditions($conditions, $fields);
     $query->where($conditions, $replacements);
@@ -2083,7 +2095,13 @@ protected function getUserAutocompleteSuggestions($filter, $term, $conditions, a
     // Sort by name.
     $query->orderBy($alias . '.name', 'ASC');
 
-    return $query->execute()?->fetchAll() ?? [];
+    $results = $query->execute()?->fetchAll() ?? [];
+    foreach ($results as $result) {
+      if (!empty($result->email) && $result->email !== $result->abbr) {
+        $result->abbr .= ', ' . $result->email;
+      }
+    }
+    return $results;
   }
 
   /**

From 33c0fd9baf28580536281262362d36add39d3fde Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 23 Mar 2022 06:34:23 +0000
Subject: [PATCH 603/720] [RW-164] Update reliefweb_subscriptions module to use
 the user email fields

---
 .../reliefweb_subscriptions.info.yml          |  1 +
 .../src/Controller/UnsubscribeController.php  |  6 +--
 .../src/Form/SubscriptionForm.php             | 40 ++++++++++++++++++-
 .../src/ReliefwebSubscriptionsMailer.php      |  7 +++-
 4 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/html/modules/custom/reliefweb_subscriptions/reliefweb_subscriptions.info.yml b/html/modules/custom/reliefweb_subscriptions/reliefweb_subscriptions.info.yml
index f5acc91c8..51552b03d 100644
--- a/html/modules/custom/reliefweb_subscriptions/reliefweb_subscriptions.info.yml
+++ b/html/modules/custom/reliefweb_subscriptions/reliefweb_subscriptions.info.yml
@@ -6,4 +6,5 @@ core_version_requirement: ^9
 dependencies:
   - drupal:reliefweb_api
   - drupal:reliefweb_form
+  - drupal:reliefweb_users
   - drupal:reliefweb_utility
diff --git a/html/modules/custom/reliefweb_subscriptions/src/Controller/UnsubscribeController.php b/html/modules/custom/reliefweb_subscriptions/src/Controller/UnsubscribeController.php
index f0674b02f..1f0531d7a 100644
--- a/html/modules/custom/reliefweb_subscriptions/src/Controller/UnsubscribeController.php
+++ b/html/modules/custom/reliefweb_subscriptions/src/Controller/UnsubscribeController.php
@@ -2,11 +2,6 @@
 
 namespace Drupal\reliefweb_subscriptions\Controller;
 
-/**
- * @file
- * Unsubscribe controller.
- */
-
 use Drupal\Core\Access\AccessResult;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Session\AccountInterface;
@@ -19,6 +14,7 @@
  * Unsubscribe controller.
  */
 class UnsubscribeController extends ControllerBase {
+
   /**
    * Account.
    *
diff --git a/html/modules/custom/reliefweb_subscriptions/src/Form/SubscriptionForm.php b/html/modules/custom/reliefweb_subscriptions/src/Form/SubscriptionForm.php
index 84e0cdec9..8c6eb5245 100644
--- a/html/modules/custom/reliefweb_subscriptions/src/Form/SubscriptionForm.php
+++ b/html/modules/custom/reliefweb_subscriptions/src/Form/SubscriptionForm.php
@@ -7,7 +7,6 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Session\AccountInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Core\Messenger\MessengerInterface;
 
 /**
  * Manage subscription for user.
@@ -81,6 +80,43 @@ public function buildForm(array $form, FormStateInterface $form_state, AccountIn
       '#value' => $user->id(),
     ];
 
+    $form['information'] = [
+      '#type' => 'fieldset',
+      '#title' => $this->t('Email information'),
+      '#not_required' => TRUE,
+    ];
+
+    $email = $user->field_email?->value ?? '';
+    if (empty($email)) {
+      $form['information']['email'] = [
+        '#type' => 'inline_template',
+        '#template' => "<p>{% trans %}Please set up an email address to receive the notifications, in your account settings: {{ link }}.{% endtrans %}</p>",
+        '#context' => [
+          'link' => $user->toLink('here', 'edit-form')->toString(),
+        ],
+      ];
+    }
+    elseif (empty($user->field_email_confirmed->value)) {
+      $form['information']['email'] = [
+        '#type' => 'inline_template',
+        '#template' => "<p>{% trans %}Your email address <em>{{ email }}</em> <strong>has not been verified</strong> so notifications will not be sent.</p><p>Please go to your account settings: {{ link }} and save to receive a new email verification link.{% endtrans %}</p>",
+        '#context' => [
+          'email' => $email,
+          'link' => $user->toLink('here', 'edit-form')->toString(),
+        ],
+      ];
+    }
+    else {
+      $form['information']['email'] = [
+        '#type' => 'inline_template',
+        '#template' => "<p>{% trans %}Notifications will be send to <em>{{ email }}</em>. You can change it in your account settings: {{ link }}.{% endtrans %}</p>",
+        '#context' => [
+          'email' => $email,
+          'link' => $user->toLink('here', 'edit-form')->toString(),
+        ],
+      ];
+    }
+
     $form['global'] = [
       '#type' => 'checkboxes',
       '#title' => $this->t('Global notifications'),
@@ -156,7 +192,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
     }
 
     // Show the user a message.
-    $this->messenger()->addMessage($this->t('You have successfully updated your subscriptions'), MessengerInterface::TYPE_STATUS);
+    $this->messenger()->addStatus($this->t('Subscriptions successfully updated.'));
   }
 
   /**
diff --git a/html/modules/custom/reliefweb_subscriptions/src/ReliefwebSubscriptionsMailer.php b/html/modules/custom/reliefweb_subscriptions/src/ReliefwebSubscriptionsMailer.php
index d3854c619..2cc816b32 100644
--- a/html/modules/custom/reliefweb_subscriptions/src/ReliefwebSubscriptionsMailer.php
+++ b/html/modules/custom/reliefweb_subscriptions/src/ReliefwebSubscriptionsMailer.php
@@ -1384,7 +1384,12 @@ protected function getSubscribers($sid) {
     $query->fields('s', ['uid']);
     $query->condition('s.sid', $sid, '=');
     $query->innerJoin('users_field_data', 'u', 'u.uid = s.uid');
-    $query->fields('u', ['name', 'mail']);
+    $query->fields('u', ['name']);
+    $query->innerJoin('user__field_email', 'fe', 'fe.entity_id = s.uid');
+    $query->addField('fe', 'field_email_value', 'mail');
+    $query->condition('fe.field_email_value', NULL, 'IS NOT NULL');
+    $query->innerJoin('user__field_email_confirmed', 'fec', 'fec.entity_id = s.uid');
+    $query->condition('fec.field_email_confirmed_value', 1, '=');
     $result = $query->execute();
     return !empty($result) ? $result->fetchAllAssoc('uid') : [];
   }

From 1c9528a486afcaf643f7bb74bc0023babb774eb4 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 23 Mar 2022 06:35:23 +0000
Subject: [PATCH 604/720] [RW-164] Save reliefweb_users settings config

---
 config/reliefweb_users.settings.yml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 config/reliefweb_users.settings.yml

diff --git a/config/reliefweb_users.settings.yml b/config/reliefweb_users.settings.yml
new file mode 100644
index 000000000..dbd7cc985
--- /dev/null
+++ b/config/reliefweb_users.settings.yml
@@ -0,0 +1 @@
+email_confirmation_timeout: 604800

From 51f4cc78b95118beca82705eed6555c338a5e8d6 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 23 Mar 2022 07:10:02 +0000
Subject: [PATCH 605/720] [RW-164] Add missing config schema for the
 reliefweb_users settings

---
 .../config/schema/reliefweb_users.schema.yml               | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/html/modules/custom/reliefweb_users/config/schema/reliefweb_users.schema.yml b/html/modules/custom/reliefweb_users/config/schema/reliefweb_users.schema.yml
index e69de29bb..06f704792 100644
--- a/html/modules/custom/reliefweb_users/config/schema/reliefweb_users.schema.yml
+++ b/html/modules/custom/reliefweb_users/config/schema/reliefweb_users.schema.yml
@@ -0,0 +1,7 @@
+reliefweb_users.settings:
+  type: config_object
+  label: 'Reliefweb Users settings'
+  mapping:
+    email_confirmation_timeout:
+      type: integer
+      label: 'Validity duration of an email confirmation link (in seconds)'

From 776bddc05f1e215b2225685efba0625bc775226b Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 23 Mar 2022 23:57:56 +0000
Subject: [PATCH 606/720] [RW-234] Catch guzzle exceptions when querying DSR

---
 html/modules/custom/reliefweb_dsr/src/Services/DSRClient.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/reliefweb_dsr/src/Services/DSRClient.php b/html/modules/custom/reliefweb_dsr/src/Services/DSRClient.php
index 80c209cd0..73b1090e2 100644
--- a/html/modules/custom/reliefweb_dsr/src/Services/DSRClient.php
+++ b/html/modules/custom/reliefweb_dsr/src/Services/DSRClient.php
@@ -10,7 +10,7 @@
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\StringTranslation\TranslationInterface;
 use GuzzleHttp\ClientInterface;
-use GuzzleHttp\Exception\ClientException;
+use GuzzleHttp\Exception\GuzzleException;
 
 /**
  * Digital Situation Report client service class.
@@ -194,7 +194,7 @@ public function getDigitalSitrep($iso3, $ongoing = FALSE) {
         'query' => $query,
       ]);
     }
-    catch (ClientException $exception) {
+    catch (GuzzleException $exception) {
       return [];
     }
 

From 282b77eda568e43c20ae68ec12fcbe55067bf12c Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 24 Mar 2022 00:03:35 +0000
Subject: [PATCH 607/720] [RW-255] Show datepicker in advanced search when
 pressing a key when input has focus

---
 .../custom/reliefweb_rivers/js/advanced-search.js     | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_rivers/js/advanced-search.js b/html/modules/custom/reliefweb_rivers/js/advanced-search.js
index ca321bc83..81c263fdd 100644
--- a/html/modules/custom/reliefweb_rivers/js/advanced-search.js
+++ b/html/modules/custom/reliefweb_rivers/js/advanced-search.js
@@ -398,7 +398,10 @@
   // Update the datepicker date based on the input value.
   function updateDatepicker(datepicker, value) {
     // Set the selected date from the value in the input field if valid.
-    if (value && value.match(/\d{4}[/-]\d{2}[/-]\d{2}/)) {
+    if (value && value.match(/^\d{4}([/-]\d{2}){0,2}$/)) {
+      value = value.length === 4 ? value + '-01-01' : value;
+      value = value.length === 7 ? value + '-01' : value;
+      value = value.replaceAll('-', '/');
       var date = datepicker.createDate(value + ' UTC');
       if (!date.invalid()) {
         var calendar = datepicker.calendars[0];
@@ -456,6 +459,12 @@
         element.focus();
       }
       else {
+        datepicker.show();
+      }
+    });
+    addEventListener(element, 'keyup', function (event) {
+      var key = event.which || event.keyCode;
+      if (key !== KeyCodes.ESC) {
         updateDatepicker(datepicker, element.value);
       }
     });

From 0379c52d1851e8dde5463489599a3f545b6cdcae Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 24 Mar 2022 00:06:43 +0000
Subject: [PATCH 608/720] [RW-436] Add cancel and select buttons for datepicker
 in advanced search

---
 .../reliefweb_rivers/js/advanced-search.js    | 29 +++++++++++++
 .../reliefweb_rivers/src/AdvancedSearch.php   |  1 +
 .../rw-advanced-search/rw-advanced-search.css | 41 +++++++++++++++++++
 3 files changed, 71 insertions(+)

diff --git a/html/modules/custom/reliefweb_rivers/js/advanced-search.js b/html/modules/custom/reliefweb_rivers/js/advanced-search.js
index 81c263fdd..8051616bc 100644
--- a/html/modules/custom/reliefweb_rivers/js/advanced-search.js
+++ b/html/modules/custom/reliefweb_rivers/js/advanced-search.js
@@ -427,6 +427,35 @@
     // Fix the position of the datepicker so that it's just after the input.
     parent.insertBefore(datepicker.container, element.nextSibling);
 
+    // Button to cancel or select the date.
+    var cancel = createButton({'data-cancel': ''}, advancedSearch.labels.cancel);
+    var select = createButton({'data-select': ''}, advancedSearch.labels.select);
+    var buttonContainer = createElement('div', {'class': advancedSearch.widgetClassPrefix + 'datepicker-button-container'});
+    buttonContainer.appendChild(cancel);
+    buttonContainer.appendChild(select);
+    datepicker.calendars[0].calendar.appendChild(buttonContainer);
+
+    // Cancel the filter addition, clear the widget and close the dialog.
+    addEventListener(cancel, 'click', function (event) {
+      datepicker.hide().clear();
+      element.focus();
+    });
+
+    // Add a filter, clear the widget and close the dialog.
+    addEventListener(select, 'click', function (event) {
+      var selection = datepicker.getSelection();
+      if (selection.length) {
+        var date = selection[0];
+        element.value = date.format('YYYY/MM/DD');
+        element.setAttribute('data-value', date.format('YYYYMMDD'));
+        element.focus();
+      }
+      else {
+        element.value = '';
+      }
+      datepicker.hide();
+    });
+
     // Update the date of the datepicker based on the value from the input.
     datepicker.on('opened', function (event) {
       updateDatepicker(datepicker, element.value);
diff --git a/html/modules/custom/reliefweb_rivers/src/AdvancedSearch.php b/html/modules/custom/reliefweb_rivers/src/AdvancedSearch.php
index f52698e67..d50d6bffa 100644
--- a/html/modules/custom/reliefweb_rivers/src/AdvancedSearch.php
+++ b/html/modules/custom/reliefweb_rivers/src/AdvancedSearch.php
@@ -231,6 +231,7 @@ protected function computeAdvancedSearchData() {
       'settings' => [
         'labels' => [
           'add' => $this->t('Add'),
+          'select' => $this->t('Select'),
           'apply' => $this->t('Apply filters'),
           'cancel' => $this->t('Cancel'),
           'clear' => $this->t('Clear all'),
diff --git a/html/themes/custom/common_design_subtheme/components/rw-advanced-search/rw-advanced-search.css b/html/themes/custom/common_design_subtheme/components/rw-advanced-search/rw-advanced-search.css
index a0085ee08..120029fe0 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-advanced-search/rw-advanced-search.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-advanced-search/rw-advanced-search.css
@@ -492,3 +492,44 @@
     font-weight: bold;
   }
 }
+
+/**
+ * Advanced sdearch - datepicker cancel/select buttons.
+ */
+.rw-advanced-search .rw-datepicker-button-container {
+  margin-top: 8px;
+  padding-top: 8px;
+  border-top: 1px solid var(--cd-reliefweb-brand-grey--light);
+}
+.rw-advanced-search .rw-datepicker-button-container button {
+  padding: 6px 14px;
+}
+.rw-advanced-search .rw-datepicker-button-container button[data-cancel] {
+  float: left;
+  width: 48%;
+  color: var(--cd-reliefweb-brand-blue--dark);
+  border: 1px solid var(--cd-reliefweb-brand-blue--dark);
+  background: transparent;
+  font-weight: normal;
+}
+.rw-advanced-search .rw-datepicker-button-container button[data-cancel]:hover,
+.rw-advanced-search .rw-datepicker-button-container button[data-cancel]:active,
+.rw-advanced-search .rw-datepicker-button-container button[data-cancel]:focus {
+  color: var(--cd-reliefweb-brand-red--dark);
+  border-color: var(--cd-reliefweb-brand-red--dark);
+  background: transparent;
+}
+.rw-advanced-search .rw-datepicker-button-container button[data-select] {
+  float: right;
+  width: 48%;
+  color: white;
+  border: 1px solid var(--cd-reliefweb-brand-blue--dark);
+  background: var(--cd-reliefweb-brand-blue--dark);
+}
+.rw-advanced-search .rw-datepicker-button-container button[data-select]:hover,
+.rw-advanced-search .rw-datepicker-button-container button[data-select]:active,
+.rw-advanced-search .rw-datepicker-button-container button[data-select]:focus {
+  color: white;
+  border: 1px solid var(--cd-reliefweb-brand-red--dark);
+  background: var(--cd-reliefweb-brand-red--dark);
+}

From 963e8f663e74ec54b37f820cce60371264854f0f Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 24 Mar 2022 01:45:13 +0000
Subject: [PATCH 609/720] [RW-424] Fix nginx 404 on /help/* paths

---
 docker/etc/nginx/apps/drupal/drupal.conf | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/docker/etc/nginx/apps/drupal/drupal.conf b/docker/etc/nginx/apps/drupal/drupal.conf
index 010ee1360..d775491f4 100644
--- a/docker/etc/nginx/apps/drupal/drupal.conf
+++ b/docker/etc/nginx/apps/drupal/drupal.conf
@@ -215,21 +215,6 @@ location / {
     #     }
     # }
 
-    ## Advanced Help module makes each module provided README available.
-    location ^~ /help/ {
-        location ~* ^/help/[^/]*/README\.txt$ {
-            ## Include the specific FastCGI configuration. This is for a
-            ## FCGI backend like php-cgi or php-fpm.
-            include apps/drupal/fastcgi_drupal.conf;
-            fastcgi_pass phpcgi;
-
-            ## If proxying to apache comment the two lines above and
-            ## uncomment the two lines below.
-            #proxy_pass http://phpapache/index.php?q=$uri;
-            #proxy_set_header Connection '';
-        }
-    }
-
     ## Replicate the Apache <FilesMatch> directive of Drupal standard
     ## .htaccess. Disable access to any code files. Return a 404 to curtail
     ## information disclosure. Hide also the text files.

From 08cac69328f2699288b5db42233d6b7773a3d293 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Mar 2022 16:37:19 +0000
Subject: [PATCH 610/720] Bump minimist in
 /html/themes/custom/common_design_subtheme

Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../common_design_subtheme/package-lock.json       | 14 +++++++-------
 .../custom/common_design_subtheme/package.json     |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/package-lock.json b/html/themes/custom/common_design_subtheme/package-lock.json
index e538e1703..a7866083a 100644
--- a/html/themes/custom/common_design_subtheme/package-lock.json
+++ b/html/themes/custom/common_design_subtheme/package-lock.json
@@ -31,7 +31,7 @@
         "jest": "^26.6.3",
         "jest-puppeteer": "^5.0.3",
         "json-schema": ">=0.4.0",
-        "minimist": "^1.2.5",
+        "minimist": "^1.2.6",
         "nth-check": ">=2.0.1",
         "puppeteer": "^9.1.1",
         "set-value": ">=4.0.1",
@@ -8011,9 +8011,9 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
     "node_modules/minimist-options": {
@@ -18452,9 +18452,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
       "dev": true
     },
     "minimist-options": {
diff --git a/html/themes/custom/common_design_subtheme/package.json b/html/themes/custom/common_design_subtheme/package.json
index 7240d0c89..48877512d 100644
--- a/html/themes/custom/common_design_subtheme/package.json
+++ b/html/themes/custom/common_design_subtheme/package.json
@@ -46,7 +46,7 @@
     "jest": "^26.6.3",
     "jest-puppeteer": "^5.0.3",
     "json-schema": ">=0.4.0",
-    "minimist": "^1.2.5",
+    "minimist": "^1.2.6",
     "nth-check": ">=2.0.1",
     "puppeteer": "^9.1.1",
     "set-value": ">=4.0.1",

From e128c086e74fccc1bc392b7905c41d7bb51c4574 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 30 Mar 2022 05:40:13 +0000
Subject: [PATCH 611/720] [RW-149] Fix country/disaster profile field and
 source user posting rights field logic to be compatible with previews

---
 .../reliefweb-links/reliefweb-links.css       |   2 +-
 .../reliefweb-links/reliefweb-links.js        |  20 +--
 .../reliefweb-user-posting-rights.js          |  22 +--
 .../Field/FieldWidget/ReliefWebLinks.php      | 135 ++++++++++--------
 .../FieldWidget/ReliefWebSectionLinks.php     |   2 +-
 .../ReliefWebUserPostingRights.php            |  90 ++++++++----
 .../components/rw-form/rw-form.css            |   1 -
 7 files changed, 164 insertions(+), 108 deletions(-)

diff --git a/html/modules/custom/reliefweb_fields/components/reliefweb-links/reliefweb-links.css b/html/modules/custom/reliefweb_fields/components/reliefweb-links/reliefweb-links.css
index e2fe5dc24..c07496eda 100644
--- a/html/modules/custom/reliefweb_fields/components/reliefweb-links/reliefweb-links.css
+++ b/html/modules/custom/reliefweb_fields/components/reliefweb-links/reliefweb-links.css
@@ -34,7 +34,7 @@
   width: 100%;
   margin-top: 4px;
 }
-.field--type-reliefweb-links fieldset[data-internal="true"] td img {
+.field--type-reliefweb-links fieldset [data-internal="true"] td img {
   display: inline-block;
   overflow: hidden;
   max-width: 35px;
diff --git a/html/modules/custom/reliefweb_fields/components/reliefweb-links/reliefweb-links.js b/html/modules/custom/reliefweb_fields/components/reliefweb-links/reliefweb-links.js
index 43786a499..1a5be6296 100644
--- a/html/modules/custom/reliefweb_fields/components/reliefweb-links/reliefweb-links.js
+++ b/html/modules/custom/reliefweb_fields/components/reliefweb-links/reliefweb-links.js
@@ -287,19 +287,23 @@
       var links = this.getFieldData();
       var settings = this.getFieldSettings();
 
-      var container = document.createElement('fieldset');
+      var container = document.createElement('div');
       container.setAttribute('data-internal', settings.internal);
 
-      // Link to the save button.
+      // Link to the save button after the legend.
       var link = document.createElement('a');
       link.setAttribute('href', '#edit-actions');
       link.appendChild(document.createTextNode(t('Jump to save button')));
 
-      var legend = document.createElement('legend');
-      legend.appendChild(document.createTextNode(settings.label));
+      var legend = this.field.querySelector('legend');
+      if (legend) {
+        legend.parentNode.insertBefore(link, legend.nextElementSibling);
+      }
+      else {
+        container.appendChild(link);
+      }
 
-      container.appendChild(legend);
-      container.appendChild(link);
+      // Creater the form content.
       container.appendChild(this.createNewLinkForm(settings));
       container.appendChild(this.createActiveList(links.active, settings));
 
@@ -308,10 +312,10 @@
       }
 
       // Add the form to the field.
-      this.field.appendChild(container);
+      this.data.parentNode.insertBefore(container, this.data.nextElementSibling);
 
       // Handle click events on the different buttons in the form.
-      this.field.addEventListener('click', this.handleEvents.bind(this));
+      container.addEventListener('click', this.handleEvents.bind(this));
 
       return container;
     },
diff --git a/html/modules/custom/reliefweb_fields/components/reliefweb-user-posting-rights/reliefweb-user-posting-rights.js b/html/modules/custom/reliefweb_fields/components/reliefweb-user-posting-rights/reliefweb-user-posting-rights.js
index 2e4d6e494..d6ca6b1e4 100644
--- a/html/modules/custom/reliefweb_fields/components/reliefweb-user-posting-rights/reliefweb-user-posting-rights.js
+++ b/html/modules/custom/reliefweb_fields/components/reliefweb-user-posting-rights/reliefweb-user-posting-rights.js
@@ -224,33 +224,37 @@
       var list = this.getFieldData();
       var settings = this.getFieldSettings();
 
-      var container = document.createElement('fieldset');
+      var container = document.createElement('div');
       container.setAttribute('data-field', settings.field);
       container.setAttribute('data-label', settings.label);
       container.setAttribute('data-settings-validate-url', settings.validateUrl);
 
-      // Link to the save button.
+      // Link to the save button after the legend.
       var link = document.createElement('a');
       link.setAttribute('href', '#actions');
       link.appendChild(document.createTextNode(t('jump to save button')));
 
-      var legend = document.createElement('legend');
-      legend.appendChild(document.createTextNode(settings.label));
+      var legend = this.field.querySelector('legend');
+      if (legend) {
+        legend.parentNode.insertBefore(link, legend.nextElementSibling);
+      }
+      else {
+        container.appendChild(link);
+      }
 
-      container.appendChild(legend);
-      container.appendChild(link);
+      // Creater the form content.
       container.appendChild(this.createFilters());
       container.appendChild(this.createNewEntryForm());
       container.appendChild(this.createList(list));
 
       // Add the form to the field.
-      this.field.appendChild(container);
+      this.data.parentNode.insertBefore(container, this.data.nextElementSibling);
 
       // Handle click events on the different buttons in the form.
-      this.field.addEventListener('click', this.handleClick.bind(this));
+      container.addEventListener('click', this.handleClick.bind(this));
 
       // Handle change events on the different select elements in the form.
-      this.field.addEventListener('change', this.handleChange.bind(this));
+      container.addEventListener('change', this.handleChange.bind(this));
 
       // Save the container.
       return container;
diff --git a/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebLinks.php b/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebLinks.php
index 0f822cfd7..d80f40c43 100644
--- a/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebLinks.php
+++ b/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebLinks.php
@@ -31,7 +31,8 @@ class ReliefWebLinks extends WidgetBase implements ContainerFactoryPluginInterfa
    * {@inheritdoc}
    */
   public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
-    return $this->formMultipleElements($items, $form, $form_state);
+    $element['#type'] = 'fieldset';
+    return $element + $this->formMultipleElements($items, $form, $form_state);
   }
 
   /**
@@ -97,50 +98,72 @@ protected function formMultipleElements(FieldItemListInterface $items, array &$f
    *   Field state.
    */
   public static function getFieldState(array $parents, $field_name, FormStateInterface &$form_state, array $items = [], array $settings = []) {
-    $initialize = FALSE;
     $field_state = static::getWidgetState($parents, $field_name, $form_state);
 
     if (!isset($field_state['data'])) {
-      $internal = !empty($settings['internal']);
-      $keep_archives = !empty($settings['keep_archives']);
-      $use_cover = !empty($settings['use_cover']);
-
-      $links = [
-        'active' => [],
-        'archives' => [],
-      ];
-
-      if (!empty($items)) {
-        // We reverse the links as they are displayed by newer first in the
-        // form while they are stored by oldest first so that the deltas
-        // seldom changes for existing links.
-        foreach (array_reverse($items) as $link) {
-          $active = !empty($link['active']);
-          // Ignore archive links if keep_archives is FALSE. This way changes to
-          // the settings are properly reflected.
-          if (!$active && !$keep_archives) {
-            continue;
-          }
+      $field_state = static::setFieldState($parents, $field_name, $form_state, $items, $settings);
+    }
+
+    return $field_state;
+  }
+
+  /**
+   * Set the field state.
+   *
+   * @param array $parents
+   *   Form element parents.
+   * @param string $field_name
+   *   Field name.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   Form state.
+   * @param array $items
+   *   Existing items to initialize the state with.
+   * @param array $settings
+   *   Field instance settings.
+   *
+   * @return array
+   *   Field state.
+   */
+  public static function setFieldState(array $parents, $field_name, FormStateInterface &$form_state, array $items = [], array $settings = []) {
+    $internal = !empty($settings['internal']);
+    $keep_archives = !empty($settings['keep_archives']);
+    $use_cover = !empty($settings['use_cover']);
+    $field_state = static::getWidgetState($parents, $field_name, $form_state);
+
+    // Generate the list of links and store the JSON serialized version which
+    // for use by the JS script.
+    $links = [
+      'active' => [],
+      'archives' => [],
+    ];
 
-          $links[$active ? 'active' : 'archives'][] = [
-            'url' => $link['url'],
-            'title' => $link['title'],
-            // Ensure the image is available only when the current settings are:
-            // non internal or use cover is selected. This way changes to the
-            // settings are properly reflected.
-            'image' => (!$internal || $use_cover) && !empty($link['image']) ? $link['image'] : '',
-            'active' => $active ? 1 : 0,
-          ];
+    if (!empty($items)) {
+      // We reverse the links as they are displayed by newer first in the
+      // form while they are stored by oldest first so that the deltas
+      // seldom change for existing links.
+      foreach (array_reverse($items) as $link) {
+        $active = !empty($link['active']);
+        // Ignore archive links if keep_archives is FALSE. This way changes to
+        // the settings are properly reflected.
+        if (!$active && !$keep_archives) {
+          continue;
         }
-      }
 
-      $field_state['data'] = json_encode($links);
-      $initialize = TRUE;
+        $links[$active ? 'active' : 'archives'][] = [
+          'url' => $link['url'],
+          'title' => $link['title'],
+          // Ensure the image is available only when the current settings are:
+          // non internal or use cover is selected. This way changes to the
+          // settings are properly reflected.
+          'image' => (!$internal || $use_cover) && !empty($link['image']) ? $link['image'] : '',
+          'active' => $active ? 1 : 0,
+        ];
+      }
     }
 
-    if ($initialize) {
-      static::setWidgetState($parents, $field_name, $form_state, $field_state);
-    }
+    $field_state['data'] = json_encode($links);
+
+    static::setWidgetState($parents, $field_name, $form_state, $field_state);
 
     return $field_state;
   }
@@ -149,8 +172,10 @@ public static function getFieldState(array $parents, $field_name, FormStateInter
    * {@inheritdoc}
    */
   public function massageFormValues(array $values, array $form, FormStateInterface $form_state) {
+    $settings = $this->fieldDefinition->getSettings();
+    $parents = $form['#parents'];
     $field_name = $this->fieldDefinition->getName();
-    $field_path = array_merge($form['#parents'], [$field_name, 'data']);
+    $field_path = array_merge($parents, [$field_name, 'data']);
 
     // Get the raw JSON data from the widget.
     $data = NestedArray::getValue($form_state->getUserInput(), $field_path);
@@ -160,7 +185,13 @@ public function massageFormValues(array $values, array $form, FormStateInterface
     $links = array_merge($links['active'] ?? [], $links['archives'] ?? []);
 
     // Reverse the links so that the most recent have a higher delta.
-    return array_reverse($links);
+    $links = array_reverse($links);
+
+    // Update the field state so that we modified values are the ones used when
+    // going back from the preview for example.
+    static::setFieldState($parents, $field_name, $form_state, $links, $settings);
+
+    return $links;
   }
 
   /**
@@ -376,29 +407,15 @@ public static function getReportSourceShortname($nid) {
    *
    * @return string
    *   Source shortname.
-   *
-   * @todo change logic once attachments are migrated.
    */
   public static function getReportPreviewPath($nid) {
-    $payload = [
-      'fields' => [
-        'include' => [
-          'file.preview.url',
-        ],
-      ],
-      'filter' => [
-        'field' => 'id',
-        'value' => (int) $nid,
-      ],
-      'limit' => 1,
-    ];
-
-    $data = \Drupal::service('reliefweb_api.client')
-      ->request('reports', $payload);
+    $query = \Drupal::database()->select('node__field_file', 'nf');
+    $query->innerJoin('file_managed', 'fm', 'fm.uuid = nf.field_file_preview_uuid');
+    $query->fields('fm', ['uri']);
+    $query->condition('nf.entity_id', $nid, '=');
+    $query->condition('nf.delta', 0, '=');
 
-    $url = $data['data']['file'][0]['preview']['url'] ?? '';
-
-    return preg_replace('#https?://[^/]+/sites/[^/]+/files/#', 'public://', $url);
+    return $query->execute()?->fetchField();
   }
 
   /**
diff --git a/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebSectionLinks.php b/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebSectionLinks.php
index 07ce5aaec..1edeb36b9 100644
--- a/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebSectionLinks.php
+++ b/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebSectionLinks.php
@@ -124,7 +124,7 @@ public static function setFieldState(array $parents, $field_name, FormStateInter
     $use_override = !empty($settings['use_override']);
     $field_state = static::getWidgetState($parents, $field_name, $form_state);
 
-    // Generate the links of links and store the JSON serialized version which
+    // Generate the list of links and store the JSON serialized version which
     // for use by the JS script.
     $links = [];
     if (!empty($items)) {
diff --git a/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebUserPostingRights.php b/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebUserPostingRights.php
index 02eddff2e..2aa35dc4d 100644
--- a/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebUserPostingRights.php
+++ b/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebUserPostingRights.php
@@ -30,7 +30,8 @@ class ReliefWebUserPostingRights extends WidgetBase implements ContainerFactoryP
    * {@inheritdoc}
    */
   public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
-    return $this->formMultipleElements($items, $form, $form_state);
+    $element['#type'] = 'fieldset';
+    return $element + $this->formMultipleElements($items, $form, $form_state);
   }
 
   /**
@@ -40,6 +41,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
    */
   protected function formMultipleElements(FieldItemListInterface $items, array &$form, FormStateInterface $form_state) {
     $field_name = $this->fieldDefinition->getName();
+    $settings = $this->fieldDefinition->getSettings();
     $parents = $form['#parents'];
 
     // Url of the link validation route for the field.
@@ -51,7 +53,7 @@ protected function formMultipleElements(FieldItemListInterface $items, array &$f
 
     // Retrieve (and initialize if needed) the field widget state with the
     // the json encoded field data.
-    $field_state = static::getFieldState($parents, $field_name, $form_state, $items->getValue());
+    $field_state = static::getFieldState($parents, $field_name, $form_state, $items->getValue(), $settings);
 
     // Store a json encoded version of the fields data.
     $elements['data'] = [
@@ -81,47 +83,71 @@ protected function formMultipleElements(FieldItemListInterface $items, array &$f
    *   Form state.
    * @param array $items
    *   Existing items to initialize the state with.
+   * @param array $settings
+   *   Field instance settings.
    *
    * @return array
    *   Field state.
    */
-  public static function getFieldState(array $parents, $field_name, FormStateInterface &$form_state, array $items = []) {
-    $initialize = FALSE;
+  public static function getFieldState(array $parents, $field_name, FormStateInterface &$form_state, array $items = [], array $settings = []) {
     $field_state = static::getWidgetState($parents, $field_name, $form_state);
 
     if (!isset($field_state['data'])) {
-      $data = [];
-      $items = array_filter($items);
+      $field_state = static::setFieldState($parents, $field_name, $form_state, $items, $settings);
+    }
 
-      // Extract the user ids.
-      $ids = [];
-      foreach ($items as $item) {
+    return $field_state;
+  }
+
+  /**
+   * Set the field state.
+   *
+   * @param array $parents
+   *   Form element parents.
+   * @param string $field_name
+   *   Field name.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   Form state.
+   * @param array $items
+   *   Existing items to initialize the state with.
+   * @param array $settings
+   *   Field instance settings.
+   *
+   * @return array
+   *   Field state.
+   */
+  public static function setFieldState(array $parents, $field_name, FormStateInterface &$form_state, array $items = [], array $settings = []) {
+    $field_state = static::getWidgetState($parents, $field_name, $form_state);
+
+    $data = [];
+
+    // Extract the user ids.
+    $ids = [];
+    foreach ($items as $item) {
+      if (!empty($item)) {
         $ids[] = $item['id'];
       }
+    }
 
-      // Retrieve the user data.
-      if (!empty($ids)) {
-        $users = \Drupal::database()
-          ->select('users_field_data', 'u')
-          ->fields('u', ['uid', 'name', 'mail', 'status'])
-          ->condition('u.uid', $ids, 'IN')
-          ?->execute()
-          ?->fetchAllAssoc('uid', \PDO::FETCH_ASSOC);
-
-        foreach ($items as $item) {
-          if (isset($users[$item['id']])) {
-            $data[] = static::normalizeData($item + $users[$item['id']]);
-          }
+    // Retrieve the user data.
+    if (!empty($ids)) {
+      $users = \Drupal::database()
+        ->select('users_field_data', 'u')
+        ->fields('u', ['uid', 'name', 'mail', 'status'])
+        ->condition('u.uid', $ids, 'IN')
+        ?->execute()
+        ?->fetchAllAssoc('uid', \PDO::FETCH_ASSOC);
+
+      foreach ($items as $item) {
+        if (isset($users[$item['id']])) {
+          $data[] = static::normalizeData($item + $users[$item['id']]);
         }
       }
-
-      $field_state['data'] = json_encode($data);
-      $initialize = TRUE;
     }
 
-    if ($initialize) {
-      static::setWidgetState($parents, $field_name, $form_state, $field_state);
-    }
+    $field_state['data'] = json_encode($data);
+
+    static::setWidgetState($parents, $field_name, $form_state, $field_state);
 
     return $field_state;
   }
@@ -130,8 +156,10 @@ public static function getFieldState(array $parents, $field_name, FormStateInter
    * {@inheritdoc}
    */
   public function massageFormValues(array $values, array $form, FormStateInterface $form_state) {
+    $settings = $this->fieldDefinition->getSettings();
+    $parents = $form['#parents'];
     $field_name = $this->fieldDefinition->getName();
-    $field_path = array_merge($form['#parents'], [$field_name, 'data']);
+    $field_path = array_merge($parents, [$field_name, 'data']);
 
     // Get the raw JSON data from the widget.
     $data = NestedArray::getValue($form_state->getUserInput(), $field_path);
@@ -150,6 +178,10 @@ public function massageFormValues(array $values, array $form, FormStateInterface
       ];
     }
 
+    // Update the field state so that we modified values are the ones used when
+    // going back from the preview for example.
+    static::setFieldState($parents, $field_name, $form_state, $values, $settings);
+
     return $values;
   }
 
diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
index 4c6c25d91..7a5133f6e 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form.css
@@ -274,7 +274,6 @@ form fieldset > legend + a[href="#edit-actions"],
 form fieldset > legend + a[href="#actions"] {
   position: absolute;
   right: 0;
-  margin-top: 4px;
   text-transform: lowercase;
   font-weight: bold;
   font-variant: small-caps;

From 0f1e87c5300d7b02f230992d1f56925075b626ce Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 30 Mar 2022 05:41:25 +0000
Subject: [PATCH 612/720] [RW-439] Fix revision user id for taxonomy terms

---
 .../reliefweb_entities.module                 | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/html/modules/custom/reliefweb_entities/reliefweb_entities.module b/html/modules/custom/reliefweb_entities/reliefweb_entities.module
index 89b0d8d02..6b4bed1e9 100644
--- a/html/modules/custom/reliefweb_entities/reliefweb_entities.module
+++ b/html/modules/custom/reliefweb_entities/reliefweb_entities.module
@@ -8,6 +8,7 @@
 use Drupal\Core\Entity\EntityFormInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Entity\RevisionLogInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\BubbleableMetadata;
 use Drupal\reliefweb_entities\BundleEntityInterface;
@@ -362,6 +363,45 @@ function reliefweb_entities_form_taxonomy_term_form_alter(array &$form, FormStat
   if (!empty($form['revision_log_message']['widget'][0]['value']['#default_value'])) {
     $form['revision_log_message']['widget'][0]['value']['#default_value'] = '';
   }
+
+  // Force revisions.
+  if (!isset($form['revision'])) {
+    $form['revision'] = [
+      '#type' => 'checkbox',
+      '#title' => t('Create new revision'),
+      '#access' => FALSE,
+    ];
+  }
+  $form['revision']['#default_value'] = TRUE;
+
+  // Add an entity builder callback that will ensure the proper revisio
+  // user id and timestamp are set.
+  $form['#entity_builders'][] = 'reliefweb_entities_term_form_entity_builder';
+}
+
+/**
+ * Form entity builder callback.
+ *
+ * We emulate the logic to set the revision user and timestamp from
+ * \Drupal\Core\Entity\ContentEntityForm::buildEntity() for taxonomy terms
+ * because there is no easy way to have the taxonomy term entity type
+ * `showRevisionUi()` method return TRUE...
+ *
+ * @param string $entity_type_id
+ *   Entity type ID.
+ * @param \Drupal\Core\Entity\EntityInterface $entity
+ *   Term entity.
+ * @param array $form
+ *   The term form.
+ * @param \Drupal\Core\Form\FormStateInterface $form_state
+ *   The form state.
+ */
+function reliefweb_entities_term_form_entity_builder($entity_type_id, EntityInterface $entity, array &$form, FormStateInterface $form_state) {
+  if ($entity instanceof RevisionLogInterface && !$form_state->isValueEmpty('revision')) {
+    // Set the current user as the revision user if a new revision is requested.
+    $entity->setRevisionUserId(\Drupal::currentUser()->id());
+    $entity->setRevisionCreationTime(\Drupal::time()->getRequestTime());
+  }
 }
 
 /**

From 9e15444bfd0957cd3feffeeee29e66f5306ee635 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 30 Mar 2022 05:53:15 +0000
Subject: [PATCH 613/720] [RW-437] Fix file indexing in API

---
 composer.lock | 12 ++++++------
 symfony.lock  |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/composer.lock b/composer.lock
index baa689f07..b8dd21e60 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8471,16 +8471,16 @@
         },
         {
             "name": "reliefweb/api-indexer",
-            "version": "v2.2.1",
+            "version": "v2.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/UN-OCHA/rwint-api-indexer.git",
-                "reference": "ba9313e6d384b2921a39600fe93ca7897dedb4f2"
+                "reference": "c900dd4dda207b84397f3387cb4f01facda37e16"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/UN-OCHA/rwint-api-indexer/zipball/ba9313e6d384b2921a39600fe93ca7897dedb4f2",
-                "reference": "ba9313e6d384b2921a39600fe93ca7897dedb4f2",
+                "url": "https://api.github.com/repos/UN-OCHA/rwint-api-indexer/zipball/c900dd4dda207b84397f3387cb4f01facda37e16",
+                "reference": "c900dd4dda207b84397f3387cb4f01facda37e16",
                 "shasum": ""
             },
             "require": {
@@ -8520,10 +8520,10 @@
                 "reliefweb"
             ],
             "support": {
-                "source": "https://github.com/UN-OCHA/rwint-api-indexer/tree/v2.2.1",
+                "source": "https://github.com/UN-OCHA/rwint-api-indexer/tree/v2.2.2",
                 "issues": "https://github.com/UN-OCHA/rwint-api-indexer/issues"
             },
-            "time": "2022-02-25T07:15:03+00:00"
+            "time": "2022-03-30T02:35:19+00:00"
         },
         {
             "name": "reliefweb/simple-autocomplete",
diff --git a/symfony.lock b/symfony.lock
index ac8f1d5fa..90c21215b 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -452,7 +452,7 @@
         "version": "v2.9.0"
     },
     "reliefweb/api-indexer": {
-        "version": "v2.2.0"
+        "version": "v2.2.2"
     },
     "reliefweb/simple-autocomplete": {
         "version": "v1.3.0"

From 35b9dd6673c6f5c1d9572593dfa6a732dd0407e5 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 31 Mar 2022 02:26:18 +0000
Subject: [PATCH 614/720] [RW-164] Use default email field instead of custom
 one

---
 ....entity_form_display.user.user.default.yml |  9 ----
 ....entity_view_display.user.user.default.yml |  2 -
 config/field.field.user.user.field_email.yml  | 20 --------
 config/field.storage.user.field_email.yml     | 18 -------
 config/social_auth.settings.yml               |  7 +--
 config/social_auth_hid.settings.yml           |  3 +-
 .../reliefweb_contact.info.yml                |  2 -
 .../reliefweb_contact.module                  |  4 --
 .../reliefweb_entities.info.yml               |  1 -
 .../src/EntityFormAlterServiceBase.php        |  2 +-
 .../reliefweb_fields.info.yml                 |  1 -
 .../ReliefWebUserPostingRights.php            | 24 +++------
 .../reliefweb_moderation.info.yml             |  1 -
 .../src/ModerationServiceBase.php             | 20 +-------
 .../reliefweb_subscriptions.info.yml          |  1 -
 .../src/Form/SubscriptionForm.php             | 13 +----
 .../src/ReliefwebSubscriptionsMailer.php      |  5 +-
 html/modules/custom/reliefweb_users/README.md | 13 -----
 .../reliefweb_users/reliefweb_users.module    | 51 +++++++------------
 .../src/Controller/UserController.php         | 17 +------
 .../templates/form/user-edit-form.html.twig   |  8 ++-
 21 files changed, 39 insertions(+), 183 deletions(-)
 delete mode 100644 config/field.field.user.user.field_email.yml
 delete mode 100644 config/field.storage.user.field_email.yml

diff --git a/config/core.entity_form_display.user.user.default.yml b/config/core.entity_form_display.user.user.default.yml
index bb28a745b..e7563b3c8 100644
--- a/config/core.entity_form_display.user.user.default.yml
+++ b/config/core.entity_form_display.user.user.default.yml
@@ -3,7 +3,6 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.user.user.field_email
     - field.field.user.user.field_email_confirmed
     - field.field.user.user.field_notes
   module:
@@ -23,14 +22,6 @@ content:
     region: content
     settings: {  }
     third_party_settings: {  }
-  field_email:
-    type: email_default
-    weight: 1
-    region: content
-    settings:
-      placeholder: ''
-      size: 60
-    third_party_settings: {  }
   field_email_confirmed:
     type: boolean_checkbox
     weight: 2
diff --git a/config/core.entity_view_display.user.user.default.yml b/config/core.entity_view_display.user.user.default.yml
index 25a4e11e3..a263d9d41 100644
--- a/config/core.entity_view_display.user.user.default.yml
+++ b/config/core.entity_view_display.user.user.default.yml
@@ -3,7 +3,6 @@ langcode: en
 status: true
 dependencies:
   config:
-    - field.field.user.user.field_email
     - field.field.user.user.field_email_confirmed
     - field.field.user.user.field_notes
   module:
@@ -14,7 +13,6 @@ bundle: user
 mode: default
 content: {  }
 hidden:
-  field_email: true
   field_email_confirmed: true
   field_notes: true
   langcode: true
diff --git a/config/field.field.user.user.field_email.yml b/config/field.field.user.user.field_email.yml
deleted file mode 100644
index 43eb2bc10..000000000
--- a/config/field.field.user.user.field_email.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: ddc7f43e-760e-41da-b337-5d3bcf499c5a
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.user.field_email
-  module:
-    - user
-id: user.user.field_email
-field_name: field_email
-entity_type: user
-bundle: user
-label: Email
-description: 'Email address used for notifications and contact.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: email
diff --git a/config/field.storage.user.field_email.yml b/config/field.storage.user.field_email.yml
deleted file mode 100644
index 0d030ced6..000000000
--- a/config/field.storage.user.field_email.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-uuid: 0ff35de8-90b0-4655-860f-e1ed88bf0e77
-langcode: en
-status: true
-dependencies:
-  module:
-    - user
-id: user.field_email
-field_name: field_email
-entity_type: user
-type: email
-settings: {  }
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/social_auth.settings.yml b/config/social_auth.settings.yml
index 0d2fcbb6b..964b76047 100644
--- a/config/social_auth.settings.yml
+++ b/config/social_auth.settings.yml
@@ -9,9 +9,10 @@ user_allowed: register
 redirect_user_form: false
 disable_admin_login: false
 disabled_roles:
-  administrator: '0'
-  beta: '0'
   editor: '0'
-  external_disaster_manager: '0'
   user_manager: '0'
   webmaster: '0'
+  administrator: '0'
+  external_disaster_manager: '0'
+  beta: '0'
+  job_importer: '0'
diff --git a/config/social_auth_hid.settings.yml b/config/social_auth_hid.settings.yml
index c6ba506da..8f4d94c9c 100644
--- a/config/social_auth_hid.settings.yml
+++ b/config/social_auth_hid.settings.yml
@@ -6,6 +6,7 @@ base_url: 'https://auth.humanitarian.id'
 auto_redirect: true
 disable_default: true
 disable_password_fields: true
-disable_email_field: true
+disable_email_field: false
 disable_user_field: true
 maintenance_access: false
+disable_user_create: 0
diff --git a/html/modules/custom/reliefweb_contact/reliefweb_contact.info.yml b/html/modules/custom/reliefweb_contact/reliefweb_contact.info.yml
index b5386c67f..8f192acbe 100644
--- a/html/modules/custom/reliefweb_contact/reliefweb_contact.info.yml
+++ b/html/modules/custom/reliefweb_contact/reliefweb_contact.info.yml
@@ -3,5 +3,3 @@ name: ReliefWeb Contact
 description: 'Contact users.'
 package: reliefweb
 core_version_requirement: ^9
-dependencies:
-  - drupal:reliefweb_users
diff --git a/html/modules/custom/reliefweb_contact/reliefweb_contact.module b/html/modules/custom/reliefweb_contact/reliefweb_contact.module
index d6ee005f9..1e1f788b6 100644
--- a/html/modules/custom/reliefweb_contact/reliefweb_contact.module
+++ b/html/modules/custom/reliefweb_contact/reliefweb_contact.module
@@ -15,10 +15,6 @@ function reliefweb_contact_mail_alter(&$message) {
     return;
   }
 
-  // Use the email field if defined and confirmed, other we try with the default
-  // user email address.
-  $message['to'] = reliefweb_users_get_email($message['params']['recipient']);
-
   /** @var Drupal\contact\Entity\Message $contact_message */
   $contact_message = $message['params']['contact_message'];
   $sender = $contact_message->field_sender->value;
diff --git a/html/modules/custom/reliefweb_entities/reliefweb_entities.info.yml b/html/modules/custom/reliefweb_entities/reliefweb_entities.info.yml
index 58f07ce56..0d262a333 100644
--- a/html/modules/custom/reliefweb_entities/reliefweb_entities.info.yml
+++ b/html/modules/custom/reliefweb_entities/reliefweb_entities.info.yml
@@ -7,5 +7,4 @@ dependencies:
   - drupal:reliefweb_moderation
   - drupal:reliefweb_revisions
   - drupal:reliefweb_form
-  - drupal:reliefweb_users
   - drupal:reliefweb_utility
diff --git a/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php b/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
index 6922d34ad..52b0931fb 100644
--- a/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
+++ b/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
@@ -736,7 +736,7 @@ protected function addUserInformation(array &$form, FormStateInterface $form_sta
     if (!empty($author) && !$author->isAnonymous()) {
       $build['#author'] = [
         'name' => $author->getDisplayName(),
-        'mail' => reliefweb_users_get_email($author),
+        'mail' => $author->getEmail(),
         'url' => $author->toUrl()->toString(),
       ];
 
diff --git a/html/modules/custom/reliefweb_fields/reliefweb_fields.info.yml b/html/modules/custom/reliefweb_fields/reliefweb_fields.info.yml
index 60b5532eb..ad61fe6bd 100644
--- a/html/modules/custom/reliefweb_fields/reliefweb_fields.info.yml
+++ b/html/modules/custom/reliefweb_fields/reliefweb_fields.info.yml
@@ -5,7 +5,6 @@ package: reliefweb
 core_version_requirement: ^9
 dependencies:
   - drupal:reliefweb_form
-  - drupal:reliefweb_users
   - drupal:taxonomy
   - drupal:taxonomy_term_revision
   - drupal:taxonomy_term_preview
diff --git a/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebUserPostingRights.php b/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebUserPostingRights.php
index ef818ffdf..8dd3d766b 100644
--- a/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebUserPostingRights.php
+++ b/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebUserPostingRights.php
@@ -131,18 +131,12 @@ public static function setFieldState(array $parents, $field_name, FormStateInter
 
     // Retrieve the user data.
     if (!empty($ids)) {
-      $query = \Drupal::database()
+      $users = \Drupal::database()
         ->select('users_field_data', 'u')
         ->fields('u', ['uid', 'name', 'mail', 'status'])
-        ->condition('u.uid', $ids, 'IN');
-      $query->leftJoin('user__field_email', 'fe', 'fe.entity_id = u.uid');
-      $query->fields('fe', ['field_email_value']);
-      $query->leftJoin('user__field_email_confirmed', 'fec', 'fec.entity_id = u.uid');
-      $query->fields('fec', ['field_email_confirmed_value']);
-
-      $users = $query
-        ?->execute()
-        ?->fetchAllAssoc('uid', \PDO::FETCH_ASSOC);
+        ->condition('u.uid', $ids, 'IN')
+        ->execute()
+        ?->fetchAllAssoc('uid', \PDO::FETCH_ASSOC) ?? [];
 
       foreach ($items as $item) {
         if (isset($users[$item['id']])) {
@@ -209,13 +203,7 @@ public static function normalizeData(array $data) {
     $data['notes'] = isset($data['notes']) ? trim($data['notes']) : '';
 
     $data['name'] = trim($data['name']);
-
-    if (!empty($data['field_email_confirmed_value']) && !empty($data['field_email_value'])) {
-      $data['mail'] = trim($data['field_email_value']);
-    }
-    else {
-      $data['mail'] = trim($data['mail']);
-    }
+    $data['mail'] = trim($data['mail']);
 
     $data['status'] = intval($data['status'], 10);
     // Blocked users are not allowed to post.
@@ -352,7 +340,7 @@ public static function updateFields($op, UserInterface $user) {
 
     $uid = $user->id();
     $blocked = $user->isBlocked();
-    $email_changed = isset($user->original) && reliefweb_users_get_email($user) !== reliefweb_users_get_email($user->original);
+    $email_changed = isset($user->original) && $user->getEmail() !== $user->original->getEmail();
     $message = '';
     $date = date_format(date_create(), 'Y-m-d');
 
diff --git a/html/modules/custom/reliefweb_moderation/reliefweb_moderation.info.yml b/html/modules/custom/reliefweb_moderation/reliefweb_moderation.info.yml
index fffe8cae7..c8ac26a2e 100644
--- a/html/modules/custom/reliefweb_moderation/reliefweb_moderation.info.yml
+++ b/html/modules/custom/reliefweb_moderation/reliefweb_moderation.info.yml
@@ -6,5 +6,4 @@ core_version_requirement: ^9
 dependencies:
   - drupal:user
   - drupal:reliefweb_form
-  - drupal:reliefweb_users
   - drupal:reliefweb_utility
diff --git a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
index 30b97f365..69406eced 100644
--- a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
+++ b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
@@ -2076,18 +2076,6 @@ protected function getUserAutocompleteSuggestions($filter, $term, $conditions, a
     $entity_alias = $query->innerJoin($entity_table, $entity_table, "%alias.{$revision_id_field} = {$revision_alias}.{$revision_id_field}");
     $query->condition($entity_alias . '.' . $entity_bundle_field, $bundle, '=');
 
-    // Join the email field table for the job or training moderation backend as
-    // it can be relevant there. For other backends, the user is most likely
-    // a ReliefWeb editor so we can speed up the lookup by excluding this
-    // field.
-    if ($bundle === 'job' || $bundle === 'training') {
-      $email_table = $this->getFieldTableName('user', 'field_email');
-      $email_field = $this->getFieldColumnName('user', 'field_email', 'value');
-      $email_alias = $query->leftJoin($email_table, $email_table, "%alias.entity_id = {$alias}.{$id_field}");
-      $query->addField($email_alias, $email_field, 'email');
-      $fields[] = $email_table . '.' . $email_field;
-    }
-
     // Add conditions.
     $conditions = $this->buildFilterConditions($conditions, $fields);
     $query->where($conditions, $replacements);
@@ -2095,13 +2083,7 @@ protected function getUserAutocompleteSuggestions($filter, $term, $conditions, a
     // Sort by name.
     $query->orderBy($alias . '.name', 'ASC');
 
-    $results = $query->execute()?->fetchAll() ?? [];
-    foreach ($results as $result) {
-      if (!empty($result->email) && $result->email !== $result->abbr) {
-        $result->abbr .= ', ' . $result->email;
-      }
-    }
-    return $results;
+    return $query->execute()?->fetchAll() ?? [];
   }
 
   /**
diff --git a/html/modules/custom/reliefweb_subscriptions/reliefweb_subscriptions.info.yml b/html/modules/custom/reliefweb_subscriptions/reliefweb_subscriptions.info.yml
index 51552b03d..f5acc91c8 100644
--- a/html/modules/custom/reliefweb_subscriptions/reliefweb_subscriptions.info.yml
+++ b/html/modules/custom/reliefweb_subscriptions/reliefweb_subscriptions.info.yml
@@ -6,5 +6,4 @@ core_version_requirement: ^9
 dependencies:
   - drupal:reliefweb_api
   - drupal:reliefweb_form
-  - drupal:reliefweb_users
   - drupal:reliefweb_utility
diff --git a/html/modules/custom/reliefweb_subscriptions/src/Form/SubscriptionForm.php b/html/modules/custom/reliefweb_subscriptions/src/Form/SubscriptionForm.php
index 8c6eb5245..718166ed3 100644
--- a/html/modules/custom/reliefweb_subscriptions/src/Form/SubscriptionForm.php
+++ b/html/modules/custom/reliefweb_subscriptions/src/Form/SubscriptionForm.php
@@ -86,17 +86,8 @@ public function buildForm(array $form, FormStateInterface $form_state, AccountIn
       '#not_required' => TRUE,
     ];
 
-    $email = $user->field_email?->value ?? '';
-    if (empty($email)) {
-      $form['information']['email'] = [
-        '#type' => 'inline_template',
-        '#template' => "<p>{% trans %}Please set up an email address to receive the notifications, in your account settings: {{ link }}.{% endtrans %}</p>",
-        '#context' => [
-          'link' => $user->toLink('here', 'edit-form')->toString(),
-        ],
-      ];
-    }
-    elseif (empty($user->field_email_confirmed->value)) {
+    $email = $user->getEmail();
+    if (empty($user->field_email_confirmed->value)) {
       $form['information']['email'] = [
         '#type' => 'inline_template',
         '#template' => "<p>{% trans %}Your email address <em>{{ email }}</em> <strong>has not been verified</strong> so notifications will not be sent.</p><p>Please go to your account settings: {{ link }} and save to receive a new email verification link.{% endtrans %}</p>",
diff --git a/html/modules/custom/reliefweb_subscriptions/src/ReliefwebSubscriptionsMailer.php b/html/modules/custom/reliefweb_subscriptions/src/ReliefwebSubscriptionsMailer.php
index 2cc816b32..25420990f 100644
--- a/html/modules/custom/reliefweb_subscriptions/src/ReliefwebSubscriptionsMailer.php
+++ b/html/modules/custom/reliefweb_subscriptions/src/ReliefwebSubscriptionsMailer.php
@@ -1384,10 +1384,7 @@ protected function getSubscribers($sid) {
     $query->fields('s', ['uid']);
     $query->condition('s.sid', $sid, '=');
     $query->innerJoin('users_field_data', 'u', 'u.uid = s.uid');
-    $query->fields('u', ['name']);
-    $query->innerJoin('user__field_email', 'fe', 'fe.entity_id = s.uid');
-    $query->addField('fe', 'field_email_value', 'mail');
-    $query->condition('fe.field_email_value', NULL, 'IS NOT NULL');
+    $query->fields('u', ['name', 'mail']);
     $query->innerJoin('user__field_email_confirmed', 'fec', 'fec.entity_id = s.uid');
     $query->condition('fec.field_email_confirmed_value', 1, '=');
     $result = $query->execute();
diff --git a/html/modules/custom/reliefweb_users/README.md b/html/modules/custom/reliefweb_users/README.md
index 4f8427be1..31b6b762c 100644
--- a/html/modules/custom/reliefweb_users/README.md
+++ b/html/modules/custom/reliefweb_users/README.md
@@ -2,16 +2,3 @@ ReliefWeb - Users module
 ========================
 
 This module provides customizations for user accounts.
-
-TODO
-----
-
-If it is decided to remove the `field_email` in favor of the `mail` property,
-the following code needs to be updated:
-
-- **reliefweb_users**: entity hooks, email confirmation controller etc.
-- **reliefweb_contact**: `hook_mail_alter()`
-- **reliefweb_subscriptions**: `ReliefwebSubscriptionsMailer::getSubscribers()`
-- **reliefweb_entities**: `EntityFormAlterServiceBase::addUserInformation()`
-- **reliefweb_fields**: ReliefWebUserPostingRights
-- **reliefweb_moderation**: `ModerationServiceBase::getUserAutocompleteSuggestions()`
diff --git a/html/modules/custom/reliefweb_users/reliefweb_users.module b/html/modules/custom/reliefweb_users/reliefweb_users.module
index 39ec48969..5358dee38 100644
--- a/html/modules/custom/reliefweb_users/reliefweb_users.module
+++ b/html/modules/custom/reliefweb_users/reliefweb_users.module
@@ -58,15 +58,16 @@ function reliefweb_users_form_user_form_alter(array &$form, FormStateInterface $
   // Only people who can administrate other accounts can add notes.
   $form['field_notes']['#access'] = $user->hasPermission('administer users');
 
+  $form['account']['mail']['#title'] = t('Email');
+  $form['account']['mail']['#description'] = t('Email address used for notifications and contact.');
+
   // Only people who can administrate other accounts can confirm an email.
   if ($user->hasPermission('administer users')) {
-    $form['account']['mail']['#title'] = t('Original account email');
     // Add a flag to bypass sending an email confirmation message when
     // confirmed is checked.
     $form_state->getFormObject()->getEntity()->_bypass_email_confirmation = TRUE;
   }
   else {
-    $form['account']['mail']['#access'] = FALSE;
     $form['field_email_confirmed']['#access'] = FALSE;
 
     if (isset($form['actions']['submit']['#submit'])) {
@@ -77,18 +78,18 @@ function reliefweb_users_form_user_form_alter(array &$form, FormStateInterface $
     }
 
     if (empty($form_state->getFormObject()?->getEntity()?->field_email_confirmed?->value)) {
-      $form['field_email']['widget'][0]['value']['#title'] = t('@title <em>(not confirmed)</em>', [
-        '@title' => $form['field_email']['widget'][0]['value']['#title'],
+      $form['account']['mail']['#title'] = t('@title <em>(not confirmed)</em>', [
+        '@title' => $form['account']['mail']['#title'],
       ]);
-      $form['field_email']['widget'][0]['value']['#description'] = t('@description<br>A message with a link to confirm your email address will be sent when saving your account settings.', [
-        '@description' => $form['field_email']['widget'][0]['value']['#description'] ?? '',
+      $form['account']['mail']['#description'] = t('@description<br>A message with a link to confirm your email address will be sent when saving your account settings.', [
+        '@description' => $form['account']['mail']['#description'] ?? '',
       ]);
     }
   }
 
   // Add a validation callback to the email field to ensure it's already used
   // by another account.
-  $form['field_email']['widget'][0]['value']['#element_validate'][] = 'reliefweb_users_validate_email';
+  $form['account']['mail']['#element_validate'][] = 'reliefweb_users_validate_email';
 
   // Check if hte user is allowed to assign roles.
   if ($user->hasPermission('manage user roles') && !empty($form['account']['roles']['#options'])) {
@@ -142,10 +143,10 @@ function reliefweb_users_validate_email(array &$element, FormStateInterface $for
     $user_id = $form_state->getFormObject()?->getEntity()?->id();
 
     $exists = \Drupal::database()
-      ->select('user__field_email', 't')
-      ->fields('t', ['field_email_value'])
-      ->condition('t.field_email_value', $email, '=')
-      ->condition('t.entity_id', $user_id, '<>')
+      ->select('users_field_data', 'u')
+      ->fields('u', ['mail'])
+      ->condition('u.mail', $email, '=')
+      ->condition('u.uid', $user_id, '<>')
       ->range(0, 1)
       ->execute()
       ?->fetchField();
@@ -162,20 +163,19 @@ function reliefweb_users_validate_email(array &$element, FormStateInterface $for
 function reliefweb_users_user_presave(EntityInterface $entity) {
   // @todo remove when removing `reliefweb_migrate`.
   if (!empty($entity->_is_migrating)) {
-    $entity->field_email->value = $entity->mail->value;
+    // Mark migrated accounts as having their email address confirmed already.
     $entity->field_email_confirmed->value = 1;
     return;
   }
 
   // Populate the email field for new accounts.
   if ($entity->isNew()) {
-    $entity->field_email->value = $entity->mail->value;
     $entity->field_email_confirmed->value = 1;
   }
   // Add a flag to send an email confirmation message.
   elseif (empty($entity->_bypass_email_confirmation)) {
-    $previous_email = $entity->original?->field_email?->value ?? '';
-    $current_email = $entity->field_email?->value ?? '';
+    $previous_email = $entity->original?->getEmail() ?? '';
+    $current_email = $entity?->getEmail() ?? '';
     $confirmed = !empty($entity->field_email_confirmed?->value);
 
     if (!empty($current_email)) {
@@ -200,7 +200,7 @@ function reliefweb_users_user_update(EntityInterface $entity) {
   }
   if (!empty($entity->_send_email_confirmation)) {
     $langcode = \Drupal::languageManager()->getDefaultLanguage()->getId();
-    $email = $entity->field_email?->value ?? '';
+    $email = $entity->getEmail();
 
     // Send an email to ask for confirmation of the email address.
     if (!empty($email)) {
@@ -271,25 +271,8 @@ function reliefweb_users_get_email_confirmation_url(UserInterface $user) {
  *   Email confirmation hash
  */
 function reliefweb_user_get_email_confirmation_hash(UserInterface $user, $timestamp) {
-  $email = $user->field_email->value;
+  $email = $user->getEmail();
   $confirmed = !empty($user->field_email_confirmed->value) ? '1' : '0';
   $data = implode('/', [$user->id(), $timestamp, $email, $confirmed]);
   return Crypt::hmacBase64($data, Settings::getHashSalt() . $email);
 }
-
-/**
- * Get a user's email.
- *
- * @param \Drupal\user\UserInterface $user
- *   User.
- *
- * @return string
- *   The user's email.
- */
-function reliefweb_users_get_email(UserInterface $user) {
-  if (!empty($user->field_email_confirmed->value)) {
-    $email = trim($user->field_email?->value ?? '');
-    return $email ?: $user->getEmail();
-  }
-  return $user->getEmail();
-}
diff --git a/html/modules/custom/reliefweb_users/src/Controller/UserController.php b/html/modules/custom/reliefweb_users/src/Controller/UserController.php
index 89e2ea272..b7cdf9060 100644
--- a/html/modules/custom/reliefweb_users/src/Controller/UserController.php
+++ b/html/modules/custom/reliefweb_users/src/Controller/UserController.php
@@ -160,12 +160,7 @@ protected function usersAdminList($storage, $query_parameters) {
       $query->condition('u.name', '%' . $this->database->escapeLike($filters['name']) . '%', 'LIKE');
     }
     if (!empty($filters['mail'])) {
-      $query->leftJoin('user__field_email', 'fe', 'fe.entity_id = u.uid');
-      $query->fields('fe', ['field_email_value']);
-      $or_group = $query->orConditionGroup();
-      $or_group->condition('u.mail', '%' . $this->database->escapeLike($filters['mail']) . '%', 'LIKE');
-      $or_group->condition('fe.field_email_value', '%' . $this->database->escapeLike($filters['mail']) . '%', 'LIKE');
-      $query->condition($or_group);
+      $query->condition('u.mail', '%' . $this->database->escapeLike($filters['mail']) . '%', 'LIKE');
     }
 
     // Content posted filter.
@@ -220,18 +215,10 @@ protected function usersAdminList($storage, $query_parameters) {
           $user_roles = array_intersect_key($roles, array_flip($users_roles[$user->uid]));
         }
 
-        $mail = Link::fromTextAndUrl($user->mail, URL::fromUserInput('/user/' . $user->uid));
-        if (!empty($user->field_email_value) && $user->field_email_value !== $user->mail) {
-          $mail = new FormattableMarkup('@mail<br>%other_mail', [
-            '@mail' => Link::fromTextAndUrl($user->field_email_value, URL::fromUserInput('/user/' . $user->uid))->toString(),
-            '%other_mail' => $mail->toString(),
-          ]);
-        }
-
         $rows[$user->uid] = [
           'uid' => $user->uid,
           'name' => Link::fromTextAndUrl($user->name, URL::fromUserInput('/user/' . $user->uid)),
-          'mail' => $mail,
+          'mail' => Link::fromTextAndUrl($user->mail, URL::fromUserInput('/user/' . $user->uid)),
           'status' => $statuses[empty($user->status) ? 'blocked' : 'active'],
           'role' => !empty($user_roles) ? new FormattableMarkup('<ol><li>' . implode('</li><li>', $user_roles) . '</li></ol>', []) : '',
           'sources' => isset($user->sources) ? new FormattableMarkup($user->sources, []) : '',
diff --git a/html/themes/custom/common_design_subtheme/templates/form/user-edit-form.html.twig b/html/themes/custom/common_design_subtheme/templates/form/user-edit-form.html.twig
index 93800c5a6..bdf35de00 100644
--- a/html/themes/custom/common_design_subtheme/templates/form/user-edit-form.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/form/user-edit-form.html.twig
@@ -21,13 +21,12 @@
 <fieldset id="account">
   <legend>{% trans %}Account information{% endtrans %}</legend>
   {{ form.account.name }}
-  {{ form.account.current_pass }}
+  {{ form.display_name }}
   {{ form.account.mail }}
+  {{ form.field_email_confirmed }}
+  {{ form.account.current_pass }}
   {{ form.account.pass }}
   {{ form.account.reset_pass }}
-  {{ form.display_name }}
-  {{ form.field_email }}
-  {{ form.field_email_confirmed }}
 </fieldset>
 
 {% if form.account.status['#access'] != false %}
@@ -62,7 +61,6 @@
     'field_notes',
     'actions',
     'display_name',
-    'field_email',
     'field_email_confirmed',
   ])
 }}

From c73d38c5073c3d754cff7c093612aff01843c351 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 6 Apr 2022 05:26:08 +0000
Subject: [PATCH 615/720] [RW-164] Ensure all the user tables are clean up when
 importing users

---
 .../src/Entity/AccumulatedUserStorage.php                  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedUserStorage.php b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedUserStorage.php
index 021c0e7df..38d888838 100644
--- a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedUserStorage.php
+++ b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedUserStorage.php
@@ -51,6 +51,13 @@ public function deleteAll() {
           ->condition($this->idKey, 2, '>')
           ->execute();
       }
+      if ($this->database->schema()->tableExists('users_data')) {
+        $this->database
+          ->delete('users_data')
+          ->condition($this->idKey, 2, '>')
+          ->execute();
+      }
+
       $this->deleteAllFromDedicatedTables();
     }
     catch (\Exception $exception) {

From a3f01fb8b81684fb4e6bf37d835d1a35b7bc8fbc Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 6 Apr 2022 05:26:41 +0000
Subject: [PATCH 616/720] [RW-164] Ensure the init email address is set when
 migrating

---
 .../reliefweb_migrate/src/Plugin/migrate/source/User.php     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php
index 43f967e7e..eb3058922 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php
@@ -157,6 +157,11 @@ public function prepareRow(Row $row) {
       ->condition('ur.uid', $uid);
     $row->setSourceProperty('roles', $query->execute()->fetchCol());
 
+    // Set the initial email address if not set.
+    if (empty($row->getSourceProperty('init'))) {
+      $row->setSourceProperty('init', $row->getSourceProperty('mail'));
+    }
+
     return parent::prepareRow($row);
   }
 

From 7856997156dc846b6c18a03c40042cc82bcc6e48 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 6 Apr 2022 05:27:44 +0000
Subject: [PATCH 617/720] [RW-164] Prevent asking for the password when
 changing the email address

---
 html/modules/custom/reliefweb_users/reliefweb_users.module | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/reliefweb_users/reliefweb_users.module b/html/modules/custom/reliefweb_users/reliefweb_users.module
index 5358dee38..ee61a6371 100644
--- a/html/modules/custom/reliefweb_users/reliefweb_users.module
+++ b/html/modules/custom/reliefweb_users/reliefweb_users.module
@@ -48,6 +48,9 @@ function reliefweb_users_menu_local_actions_alter(&$local_actions) {
 function reliefweb_users_form_user_form_alter(array &$form, FormStateInterface $form_state) {
   $user = \Drupal::currentUser();
 
+  // This will prevent asking for the password when changing the email address.
+  $form_state->set('user_pass_reset', TRUE);
+
   // Unncessary fields.
   $form['contact']['#access'] = FALSE;
   $form['details']['#access'] = FALSE;
@@ -78,7 +81,7 @@ function reliefweb_users_form_user_form_alter(array &$form, FormStateInterface $
     }
 
     if (empty($form_state->getFormObject()?->getEntity()?->field_email_confirmed?->value)) {
-      $form['account']['mail']['#title'] = t('@title <em>(not confirmed)</em>', [
+      $form['account']['mail']['#title'] = t('@title (not confirmed)', [
         '@title' => $form['account']['mail']['#title'],
       ]);
       $form['account']['mail']['#description'] = t('@description<br>A message with a link to confirm your email address will be sent when saving your account settings.', [
@@ -175,7 +178,7 @@ function reliefweb_users_user_presave(EntityInterface $entity) {
   // Add a flag to send an email confirmation message.
   elseif (empty($entity->_bypass_email_confirmation)) {
     $previous_email = $entity->original?->getEmail() ?? '';
-    $current_email = $entity?->getEmail() ?? '';
+    $current_email = $entity->getEmail() ?? '';
     $confirmed = !empty($entity->field_email_confirmed?->value);
 
     if (!empty($current_email)) {

From 3a3dd0ed629e82100f5dd49bf6a8adea7acaec10 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 6 Apr 2022 05:32:10 +0000
Subject: [PATCH 618/720] [RW-164] Do not send email when account is created

---
 config/user.settings.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/user.settings.yml b/config/user.settings.yml
index 842960a04..74b1b1e40 100644
--- a/config/user.settings.yml
+++ b/config/user.settings.yml
@@ -2,11 +2,11 @@ _core:
   default_config_hash: w314Zp7B4NbrlV4KeeZLNSmTTpdJiv-KwZO2E1fSSK0
 langcode: en
 anonymous: Anonymous
-verify_mail: true
+verify_mail: false
 notify:
   cancel_confirm: true
   password_reset: true
-  status_activated: true
+  status_activated: false
   status_blocked: false
   status_canceled: false
   register_admin_created: true

From ab8cd7ad7f971b5d31a5c73d9f07b12f7bcaa4cf Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 6 Apr 2022 05:33:56 +0000
Subject: [PATCH 619/720] [RW-449] Do not send update notifications

---
 config/update.settings.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/config/update.settings.yml b/config/update.settings.yml
index 61c8912e4..02f31c424 100644
--- a/config/update.settings.yml
+++ b/config/update.settings.yml
@@ -8,6 +8,5 @@ fetch:
   max_attempts: 2
   timeout: 30
 notification:
-  emails:
-    - admin@example.com
-  threshold: all
+  emails: {  }
+  threshold: security

From a1a049aea7d5f5b5368e0fe9d185b60f68fa99f2 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 6 Apr 2022 05:35:24 +0000
Subject: [PATCH 620/720] [RW-442] Fix issue with linked autocomplete widgets

---
 .../custom/reliefweb_form/js/widget.autocomplete.js        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/html/modules/custom/reliefweb_form/js/widget.autocomplete.js b/html/modules/custom/reliefweb_form/js/widget.autocomplete.js
index af8b623ed..671428915 100644
--- a/html/modules/custom/reliefweb_form/js/widget.autocomplete.js
+++ b/html/modules/custom/reliefweb_form/js/widget.autocomplete.js
@@ -606,9 +606,10 @@
         var multiple = element.hasAttribute('multiple');
         var id = element.id;
 
-        // Remove the id from the element, we'll add it to the input so that
-        // error links for example or clicking on the label for focus work.
-        element.removeAttribute('id');
+        // We will add the id to the input so that error links or clicking the
+        // label will focus the input element. We change the id on the element
+        // so we can still target it easily.
+        element.setAttribute('id', id + '--element');
 
         // Mark the select as being processed for autocomplete.
         element.classList.add('rw-autocomplete-select');

From e6e47839ca8bba78f61664a196a82e6745413efd Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 6 Apr 2022 06:02:39 +0000
Subject: [PATCH 621/720] [RW-450] Update drupal core and modules

---
 composer.lock         | 351 +++++++++++++++++++++---------------------
 composer.patches.json |   5 +-
 2 files changed, 175 insertions(+), 181 deletions(-)

diff --git a/composer.lock b/composer.lock
index b8dd21e60..ef109b0ff 100644
--- a/composer.lock
+++ b/composer.lock
@@ -64,31 +64,29 @@
         },
         {
             "name": "behat/mink",
-            "version": "v1.9.0",
+            "version": "v1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/minkphp/Mink.git",
-                "reference": "e35f4695de8800fc776af34ebf665ad58ebdd996"
+                "reference": "19e58905632e7cfdc5b2bafb9b950a3521af32c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/minkphp/Mink/zipball/e35f4695de8800fc776af34ebf665ad58ebdd996",
-                "reference": "e35f4695de8800fc776af34ebf665ad58ebdd996",
+                "url": "https://api.github.com/repos/minkphp/Mink/zipball/19e58905632e7cfdc5b2bafb9b950a3521af32c5",
+                "reference": "19e58905632e7cfdc5b2bafb9b950a3521af32c5",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.4",
-                "symfony/css-selector": "^2.7|^3.0|^4.0|^5.0"
+                "php": ">=7.2",
+                "symfony/css-selector": "^4.4 || ^5.0 || ^6.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5 || ^9.5",
-                "symfony/debug": "^2.7|^3.0|^4.0|^5.0",
-                "symfony/phpunit-bridge": "^3.4.38 || ^4.4 || ^5.0.5",
-                "yoast/phpunit-polyfills": "^1.0"
+                "phpunit/phpunit": "^8.5.22 || ^9.5.11",
+                "symfony/error-handler": "^4.4 || ^5.0 || ^6.0",
+                "symfony/phpunit-bridge": "^5.4 || ^6.0"
             },
             "suggest": {
-                "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)",
-                "behat/mink-goutte-driver": "fast headless driver for any app without JS emulation",
+                "behat/mink-browserkit-driver": "fast headless driver for any app without JS emulation",
                 "behat/mink-selenium2-driver": "slow, but JS-enabled driver for any app (requires Selenium2)",
                 "behat/mink-zombie-driver": "fast and JS-enabled headless driver for any app (requires node.js)",
                 "dmore/chrome-mink-driver": "fast and JS-enabled driver for any app (requires chromium or google chrome)"
@@ -124,31 +122,34 @@
             ],
             "support": {
                 "issues": "https://github.com/minkphp/Mink/issues",
-                "source": "https://github.com/minkphp/Mink/tree/v1.9.0"
+                "source": "https://github.com/minkphp/Mink/tree/v1.10.0"
             },
-            "time": "2021-10-11T11:58:47+00:00"
+            "time": "2022-03-28T14:22:43+00:00"
         },
         {
             "name": "behat/mink-selenium2-driver",
-            "version": "v1.5.0",
+            "version": "v1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/minkphp/MinkSelenium2Driver.git",
-                "reference": "0dee8cceed7e198bf130b4af0fab0ffab6dab47f"
+                "reference": "e5f8421654930da725499fb92983e6948c6f973e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/minkphp/MinkSelenium2Driver/zipball/0dee8cceed7e198bf130b4af0fab0ffab6dab47f",
-                "reference": "0dee8cceed7e198bf130b4af0fab0ffab6dab47f",
+                "url": "https://api.github.com/repos/minkphp/MinkSelenium2Driver/zipball/e5f8421654930da725499fb92983e6948c6f973e",
+                "reference": "e5f8421654930da725499fb92983e6948c6f973e",
                 "shasum": ""
             },
             "require": {
-                "behat/mink": "~1.7@dev",
-                "instaclick/php-webdriver": "~1.1",
-                "php": ">=5.4"
+                "behat/mink": "^1.9@dev",
+                "ext-json": "*",
+                "instaclick/php-webdriver": "^1.4",
+                "php": ">=7.2"
             },
             "require-dev": {
-                "mink/driver-testsuite": "dev-master"
+                "mink/driver-testsuite": "dev-master",
+                "phpunit/phpunit": "^8.5.22 || ^9.5.11",
+                "symfony/error-handler": "^4.4 || ^5.0"
             },
             "type": "mink-driver",
             "extra": {
@@ -189,29 +190,29 @@
             ],
             "support": {
                 "issues": "https://github.com/minkphp/MinkSelenium2Driver/issues",
-                "source": "https://github.com/minkphp/MinkSelenium2Driver/tree/v1.5.0"
+                "source": "https://github.com/minkphp/MinkSelenium2Driver/tree/v1.6.0"
             },
-            "time": "2021-10-12T16:01:47+00:00"
+            "time": "2022-03-28T14:55:17+00:00"
         },
         {
             "name": "chi-teck/drupal-code-generator",
-            "version": "2.5.1",
+            "version": "2.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Chi-teck/drupal-code-generator.git",
-                "reference": "cd3912e25e20bb12b6dce8d522793f3abd71ab8c"
+                "reference": "a49f29b0fe6b6c87fa7dc8979589ce8794c4d655"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Chi-teck/drupal-code-generator/zipball/cd3912e25e20bb12b6dce8d522793f3abd71ab8c",
-                "reference": "cd3912e25e20bb12b6dce8d522793f3abd71ab8c",
+                "url": "https://api.github.com/repos/Chi-teck/drupal-code-generator/zipball/a49f29b0fe6b6c87fa7dc8979589ce8794c4d655",
+                "reference": "a49f29b0fe6b6c87fa7dc8979589ce8794c4d655",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "php": ">=7.4",
-                "psr/log": "^1.1 || ^2.0",
-                "symfony/console": "^4.4.15 || ^5.1",
+                "psr/log": "^1.1 || ^2.0 || ^3.0",
+                "symfony/console": "^4.4.15 || ^5.1 || ^6.0",
                 "symfony/filesystem": "^4.4 || ^5.1 || ^6",
                 "symfony/polyfill-php80": "^1.23",
                 "symfony/string": "^5.1 || ^6",
@@ -223,12 +224,12 @@
             "require-dev": {
                 "chi-teck/drupal-coder-extension": "^1.2",
                 "drupal/coder": "^8.3.14",
-                "friendsoftwig/twigcs": "^5.0",
+                "friendsoftwig/twigcs": "dev-master",
                 "phpspec/prophecy-phpunit": "^2.0",
                 "phpunit/phpunit": "^9.4",
                 "squizlabs/php_codesniffer": "^3.5",
-                "symfony/var-dumper": "^5.2",
-                "symfony/yaml": "^5.2"
+                "symfony/var-dumper": "^5.2 || ^6.0",
+                "symfony/yaml": "^5.2 || ^6.0"
             },
             "bin": [
                 "bin/dcg"
@@ -251,9 +252,9 @@
             "description": "Drupal code generator",
             "support": {
                 "issues": "https://github.com/Chi-teck/drupal-code-generator/issues",
-                "source": "https://github.com/Chi-teck/drupal-code-generator/tree/2.5.1"
+                "source": "https://github.com/Chi-teck/drupal-code-generator/tree/2.5.3"
             },
-            "time": "2022-02-24T10:39:38+00:00"
+            "time": "2022-03-31T17:15:11+00:00"
         },
         {
             "name": "composer/ca-bundle",
@@ -333,16 +334,16 @@
         },
         {
             "name": "composer/composer",
-            "version": "2.2.9",
+            "version": "2.2.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/composer.git",
-                "reference": "07eccf080ad63d55d95a7c9133506db7d9029264"
+                "reference": "2f5bcf0480c13b4fa1ac490aa9344e4402507538"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/07eccf080ad63d55d95a7c9133506db7d9029264",
-                "reference": "07eccf080ad63d55d95a7c9133506db7d9029264",
+                "url": "https://api.github.com/repos/composer/composer/zipball/2f5bcf0480c13b4fa1ac490aa9344e4402507538",
+                "reference": "2f5bcf0480c13b4fa1ac490aa9344e4402507538",
                 "shasum": ""
             },
             "require": {
@@ -412,7 +413,7 @@
             "support": {
                 "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/composer/issues",
-                "source": "https://github.com/composer/composer/tree/2.2.9"
+                "source": "https://github.com/composer/composer/tree/2.2.11"
             },
             "funding": [
                 {
@@ -428,7 +429,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-15T21:13:37+00:00"
+            "time": "2022-04-01T20:00:52+00:00"
         },
         {
             "name": "composer/installers",
@@ -884,27 +885,27 @@
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "2.0.5",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a"
+                "reference": "ced299686f41dce890debac69273b47ffe98a40c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/9e36aeed4616366d2b690bdce11f71e9178c579a",
-                "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c",
+                "reference": "ced299686f41dce890debac69273b47ffe98a40c",
                 "shasum": ""
             },
             "require": {
-                "composer/pcre": "^1",
-                "php": "^5.3.2 || ^7.0 || ^8.0",
+                "composer/pcre": "^1 || ^2 || ^3",
+                "php": "^7.2.5 || ^8.0",
                 "psr/log": "^1 || ^2 || ^3"
             },
             "require-dev": {
                 "phpstan/phpstan": "^1.0",
                 "phpstan/phpstan-strict-rules": "^1.1",
-                "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0"
+                "symfony/phpunit-bridge": "^6.0"
             },
             "type": "library",
             "autoload": {
@@ -930,7 +931,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/2.0.5"
+                "source": "https://github.com/composer/xdebug-handler/tree/3.0.3"
             },
             "funding": [
                 {
@@ -946,26 +947,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-24T20:20:32+00:00"
+            "time": "2022-02-25T21:32:43+00:00"
         },
         {
             "name": "consolidation/annotated-command",
-            "version": "4.5.2",
+            "version": "4.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/annotated-command.git",
-                "reference": "24c1529436b4f4beec3d19aab71fd127817f47ef"
+                "reference": "93398c3166d9026ab93219ce23b2092b4d7b7904"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/24c1529436b4f4beec3d19aab71fd127817f47ef",
-                "reference": "24c1529436b4f4beec3d19aab71fd127817f47ef",
+                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/93398c3166d9026ab93219ce23b2092b4d7b7904",
+                "reference": "93398c3166d9026ab93219ce23b2092b4d7b7904",
                 "shasum": ""
             },
             "require": {
                 "consolidation/output-formatters": "^4.1.1",
                 "php": ">=7.1.3",
-                "psr/log": "^1|^2",
+                "psr/log": "^1|^2|^3",
                 "symfony/console": "^4.4.8|^5|^6",
                 "symfony/event-dispatcher": "^4.4.8|^5|^6",
                 "symfony/finder": "^4.4.8|^5|^6"
@@ -1000,9 +1001,9 @@
             "description": "Initialize Symfony Console commands from annotated command class methods.",
             "support": {
                 "issues": "https://github.com/consolidation/annotated-command/issues",
-                "source": "https://github.com/consolidation/annotated-command/tree/4.5.2"
+                "source": "https://github.com/consolidation/annotated-command/tree/4.5.4"
             },
-            "time": "2022-02-20T16:36:18+00:00"
+            "time": "2022-04-05T17:58:10+00:00"
         },
         {
             "name": "consolidation/config",
@@ -2163,17 +2164,17 @@
         },
         {
             "name": "drupal/allowed_formats",
-            "version": "1.4.0",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/allowed_formats.git",
-                "reference": "8.x-1.4"
+                "reference": "8.x-1.5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/allowed_formats-8.x-1.4.zip",
-                "reference": "8.x-1.4",
-                "shasum": "6c73fd69781e8a7c3ebc394ce74f981b6da50eae"
+                "url": "https://ftp.drupal.org/files/projects/allowed_formats-8.x-1.5.zip",
+                "reference": "8.x-1.5",
+                "shasum": "dbf61bee7aec87beaa2cf307c1d0d9d5b896328c"
             },
             "require": {
                 "drupal/core": "^8.8 || ^9"
@@ -2181,8 +2182,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.4",
-                    "datestamp": "1643490593",
+                    "version": "8.x-1.5",
+                    "datestamp": "1648060331",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -2441,16 +2442,16 @@
         },
         {
             "name": "drupal/core",
-            "version": "9.3.8",
+            "version": "9.3.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core.git",
-                "reference": "e8e3b7e5b3353f7ebf24de9d39087df75bd66afe"
+                "reference": "86b0c4496e20ae7f945e9a7f0404fafe191ab774"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core/zipball/e8e3b7e5b3353f7ebf24de9d39087df75bd66afe",
-                "reference": "e8e3b7e5b3353f7ebf24de9d39087df75bd66afe",
+                "url": "https://api.github.com/repos/drupal/core/zipball/86b0c4496e20ae7f945e9a7f0404fafe191ab774",
+                "reference": "86b0c4496e20ae7f945e9a7f0404fafe191ab774",
                 "shasum": ""
             },
             "require": {
@@ -2692,13 +2693,13 @@
             ],
             "description": "Drupal is an open source content management platform powering millions of websites and applications.",
             "support": {
-                "source": "https://github.com/drupal/core/tree/9.3.8"
+                "source": "https://github.com/drupal/core/tree/9.3.9"
             },
-            "time": "2022-03-16T15:34:53+00:00"
+            "time": "2022-03-21T21:21:58+00:00"
         },
         {
             "name": "drupal/core-composer-scaffold",
-            "version": "9.3.8",
+            "version": "9.3.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-composer-scaffold.git",
@@ -2742,13 +2743,13 @@
                 "drupal"
             ],
             "support": {
-                "source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.8"
+                "source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.9"
             },
             "time": "2022-02-24T17:40:56+00:00"
         },
         {
             "name": "drupal/core-dev",
-            "version": "9.3.8",
+            "version": "9.3.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-dev.git",
@@ -2792,22 +2793,22 @@
             ],
             "description": "require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.",
             "support": {
-                "source": "https://github.com/drupal/core-dev/tree/9.3.8"
+                "source": "https://github.com/drupal/core-dev/tree/9.3.9"
             },
             "time": "2021-11-30T05:41:29+00:00"
         },
         {
             "name": "drupal/core-recommended",
-            "version": "9.3.8",
+            "version": "9.3.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-recommended.git",
-                "reference": "98048032809157c723131ecc2394ff55421d5dc6"
+                "reference": "3ce3f2b6145de56178e006fb2ef94089d32cf411"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core-recommended/zipball/98048032809157c723131ecc2394ff55421d5dc6",
-                "reference": "98048032809157c723131ecc2394ff55421d5dc6",
+                "url": "https://api.github.com/repos/drupal/core-recommended/zipball/3ce3f2b6145de56178e006fb2ef94089d32cf411",
+                "reference": "3ce3f2b6145de56178e006fb2ef94089d32cf411",
                 "shasum": ""
             },
             "require": {
@@ -2816,11 +2817,11 @@
                 "doctrine/annotations": "1.13.2",
                 "doctrine/lexer": "1.2.1",
                 "doctrine/reflection": "1.2.2",
-                "drupal/core": "9.3.8",
+                "drupal/core": "9.3.9",
                 "egulias/email-validator": "3.1.2",
                 "guzzlehttp/guzzle": "6.5.5",
                 "guzzlehttp/promises": "1.5.1",
-                "guzzlehttp/psr7": "1.8.3",
+                "guzzlehttp/psr7": "1.8.5",
                 "laminas/laminas-diactoros": "2.8.0",
                 "laminas/laminas-escaper": "2.9.0",
                 "laminas/laminas-feed": "2.15.0",
@@ -2878,9 +2879,9 @@
             ],
             "description": "Locked core dependencies; require this project INSTEAD OF drupal/core.",
             "support": {
-                "source": "https://github.com/drupal/core-recommended/tree/9.3.8"
+                "source": "https://github.com/drupal/core-recommended/tree/9.3.9"
             },
-            "time": "2022-03-16T15:34:53+00:00"
+            "time": "2022-03-21T21:21:58+00:00"
         },
         {
             "name": "drupal/ctools",
@@ -3094,17 +3095,17 @@
         },
         {
             "name": "drupal/google_tag",
-            "version": "1.4.0",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/google_tag.git",
-                "reference": "8.x-1.4"
+                "reference": "8.x-1.5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/google_tag-8.x-1.4.zip",
-                "reference": "8.x-1.4",
-                "shasum": "1bdc6f93d1c79c27738320597f2185f5de37432f"
+                "url": "https://ftp.drupal.org/files/projects/google_tag-8.x-1.5.zip",
+                "reference": "8.x-1.5",
+                "shasum": "b2929a517cc86bb3e54dded127556f18236a8628"
             },
             "require": {
                 "drupal/core": "^8.8 || ^9"
@@ -3112,8 +3113,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.4",
-                    "datestamp": "1593179846",
+                    "version": "8.x-1.5",
+                    "datestamp": "1648569365",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -3366,17 +3367,17 @@
         },
         {
             "name": "drupal/inline_entity_form",
-            "version": "1.0.0-rc10",
+            "version": "1.0.0-rc11",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/inline_entity_form.git",
-                "reference": "8.x-1.0-rc10"
+                "reference": "8.x-1.0-rc11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/inline_entity_form-8.x-1.0-rc10.zip",
-                "reference": "8.x-1.0-rc10",
-                "shasum": "e10a90cee004e13b4c59991a312f805834a35750"
+                "url": "https://ftp.drupal.org/files/projects/inline_entity_form-8.x-1.0-rc11.zip",
+                "reference": "8.x-1.0-rc11",
+                "shasum": "67a92ec1482be19b2f2091ca9498f585e34072b9"
             },
             "require": {
                 "drupal/core": "^8.8 || ^9",
@@ -3388,8 +3389,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.0-rc10",
-                    "datestamp": "1646314907",
+                    "version": "8.x-1.0-rc11",
+                    "datestamp": "1648748863",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "RC releases are not covered by Drupal security advisories."
@@ -5301,16 +5302,16 @@
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.8.3",
+            "version": "1.8.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85"
+                "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/1afdd860a2566ed3c2b0b4a3de6e23434a79ec85",
-                "reference": "1afdd860a2566ed3c2b0b4a3de6e23434a79ec85",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/337e3ad8e5716c15f9657bd214d16cc5e69df268",
+                "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268",
                 "shasum": ""
             },
             "require": {
@@ -5391,7 +5392,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/1.8.3"
+                "source": "https://github.com/guzzle/psr7/tree/1.8.5"
             },
             "funding": [
                 {
@@ -5407,20 +5408,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-05T13:56:00+00:00"
+            "time": "2022-03-20T21:51:18+00:00"
         },
         {
             "name": "instaclick/php-webdriver",
-            "version": "1.4.10",
+            "version": "1.4.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/instaclick/php-webdriver.git",
-                "reference": "6bc1f44cf23031e68c326cd61e14ec32486f241b"
+                "reference": "608e8b20a9072f84cac4f2fddb4420893d69eb83"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/6bc1f44cf23031e68c326cd61e14ec32486f241b",
-                "reference": "6bc1f44cf23031e68c326cd61e14ec32486f241b",
+                "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/608e8b20a9072f84cac4f2fddb4420893d69eb83",
+                "reference": "608e8b20a9072f84cac4f2fddb4420893d69eb83",
                 "shasum": ""
             },
             "require": {
@@ -5468,9 +5469,9 @@
             ],
             "support": {
                 "issues": "https://github.com/instaclick/php-webdriver/issues",
-                "source": "https://github.com/instaclick/php-webdriver/tree/1.4.10"
+                "source": "https://github.com/instaclick/php-webdriver/tree/1.4.11"
             },
-            "time": "2021-10-14T03:25:34+00:00"
+            "time": "2022-03-30T01:28:33+00:00"
         },
         {
             "name": "justinrainbow/json-schema",
@@ -7381,16 +7382,16 @@
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.6.0",
+            "version": "1.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706"
+                "reference": "77a32518733312af16a44300404e945338981de3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706",
-                "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3",
+                "reference": "77a32518733312af16a44300404e945338981de3",
                 "shasum": ""
             },
             "require": {
@@ -7425,9 +7426,9 @@
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
             "support": {
                 "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.0"
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1"
             },
-            "time": "2022-01-04T19:58:01+00:00"
+            "time": "2022-03-15T21:29:03+00:00"
         },
         {
             "name": "phpspec/prophecy",
@@ -7498,35 +7499,30 @@
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "1.2.0",
+            "version": "1.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "dbc093d7af60eff5cd575d2ed761b15ed40bd08e"
+                "reference": "4cb3021a4e10ffe3d5f94a4c34cf4b3f6de2fa3d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/dbc093d7af60eff5cd575d2ed761b15ed40bd08e",
-                "reference": "dbc093d7af60eff5cd575d2ed761b15ed40bd08e",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/4cb3021a4e10ffe3d5f94a4c34cf4b3f6de2fa3d",
+                "reference": "4cb3021a4e10ffe3d5f94a4c34cf4b3f6de2fa3d",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1 || ^8.0"
+                "php": "^7.2 || ^8.0"
             },
             "require-dev": {
                 "php-parallel-lint/php-parallel-lint": "^1.2",
                 "phpstan/extension-installer": "^1.0",
-                "phpstan/phpstan": "^1.0",
+                "phpstan/phpstan": "^1.5",
                 "phpstan/phpstan-strict-rules": "^1.0",
                 "phpunit/phpunit": "^9.5",
                 "symfony/process": "^5.2"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "PHPStan\\PhpDocParser\\": [
@@ -7541,9 +7537,9 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.2.0"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.4.2"
             },
-            "time": "2021-09-16T20:46:02+00:00"
+            "time": "2022-03-30T13:33:37+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -7865,16 +7861,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.5.19",
+            "version": "9.5.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807"
+                "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/35ea4b7f3acabb26f4bb640f8c30866c401da807",
-                "reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba",
+                "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba",
                 "shasum": ""
             },
             "require": {
@@ -7952,7 +7948,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.19"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20"
             },
             "funding": [
                 {
@@ -7964,7 +7960,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-15T09:57:31+00:00"
+            "time": "2022-04-01T12:37:26+00:00"
         },
         {
             "name": "psr/cache",
@@ -8964,16 +8960,16 @@
         },
         {
             "name": "sebastian/environment",
-            "version": "5.1.3",
+            "version": "5.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "388b6ced16caa751030f6a69e588299fa09200ac"
+                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/388b6ced16caa751030f6a69e588299fa09200ac",
-                "reference": "388b6ced16caa751030f6a69e588299fa09200ac",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7",
+                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7",
                 "shasum": ""
             },
             "require": {
@@ -9015,7 +9011,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.3"
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
             },
             "funding": [
                 {
@@ -9023,7 +9019,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T05:52:38+00:00"
+            "time": "2022-04-03T09:37:03+00:00"
         },
         {
             "name": "sebastian/exporter",
@@ -9564,23 +9560,24 @@
         },
         {
             "name": "seld/jsonlint",
-            "version": "1.8.3",
+            "version": "1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/jsonlint.git",
-                "reference": "9ad6ce79c342fbd44df10ea95511a1b24dee5b57"
+                "reference": "4211420d25eba80712bff236a98960ef68b866b7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/9ad6ce79c342fbd44df10ea95511a1b24dee5b57",
-                "reference": "9ad6ce79c342fbd44df10ea95511a1b24dee5b57",
+                "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/4211420d25eba80712bff236a98960ef68b866b7",
+                "reference": "4211420d25eba80712bff236a98960ef68b866b7",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+                "phpstan/phpstan": "^1.5",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^8.5.13"
             },
             "bin": [
                 "bin/jsonlint"
@@ -9611,7 +9608,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/jsonlint/issues",
-                "source": "https://github.com/Seldaek/jsonlint/tree/1.8.3"
+                "source": "https://github.com/Seldaek/jsonlint/tree/1.9.0"
             },
             "funding": [
                 {
@@ -9623,7 +9620,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-11-11T09:19:24+00:00"
+            "time": "2022-04-01T13:37:23+00:00"
         },
         {
             "name": "seld/phar-utils",
@@ -9728,32 +9725,32 @@
         },
         {
             "name": "slevomat/coding-standard",
-            "version": "7.0.19",
+            "version": "7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/slevomat/coding-standard.git",
-                "reference": "bef66a43815bbf9b5f49775e9ded3f7c6ba0cc37"
+                "reference": "b521bd358b5f7a7d69e9637fd139e036d8adeb6f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/bef66a43815bbf9b5f49775e9ded3f7c6ba0cc37",
-                "reference": "bef66a43815bbf9b5f49775e9ded3f7c6ba0cc37",
+                "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/b521bd358b5f7a7d69e9637fd139e036d8adeb6f",
+                "reference": "b521bd358b5f7a7d69e9637fd139e036d8adeb6f",
                 "shasum": ""
             },
             "require": {
                 "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7",
-                "php": "^7.1 || ^8.0",
-                "phpstan/phpdoc-parser": "^1.0.0",
+                "php": "^7.2 || ^8.0",
+                "phpstan/phpdoc-parser": "^1.4.1",
                 "squizlabs/php_codesniffer": "^3.6.2"
             },
             "require-dev": {
                 "phing/phing": "2.17.2",
                 "php-parallel-lint/php-parallel-lint": "1.3.2",
-                "phpstan/phpstan": "1.4.6",
+                "phpstan/phpstan": "1.4.10|1.5.2",
                 "phpstan/phpstan-deprecation-rules": "1.0.0",
-                "phpstan/phpstan-phpunit": "1.0.0",
+                "phpstan/phpstan-phpunit": "1.0.0|1.1.0",
                 "phpstan/phpstan-strict-rules": "1.1.0",
-                "phpunit/phpunit": "7.5.20|8.5.21|9.5.16"
+                "phpunit/phpunit": "7.5.20|8.5.21|9.5.19"
             },
             "type": "phpcodesniffer-standard",
             "extra": {
@@ -9773,7 +9770,7 @@
             "description": "Slevomat Coding Standard for PHP_CodeSniffer complements Consistence Coding Standard by providing sniffs with additional checks.",
             "support": {
                 "issues": "https://github.com/slevomat/coding-standard/issues",
-                "source": "https://github.com/slevomat/coding-standard/tree/7.0.19"
+                "source": "https://github.com/slevomat/coding-standard/tree/7.1"
             },
             "funding": [
                 {
@@ -9785,7 +9782,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-01T18:01:41+00:00"
+            "time": "2022-03-29T12:44:16+00:00"
         },
         {
             "name": "squizlabs/php_codesniffer",
@@ -11156,16 +11153,16 @@
         },
         {
             "name": "symfony/lock",
-            "version": "v4.4.38",
+            "version": "v4.4.40",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/lock.git",
-                "reference": "46c56527b2e98cfdbc5b39a1566029cbe73c9e3f"
+                "reference": "ec23fb51d9b531f7fcd2279afe5b474e624c2445"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/lock/zipball/46c56527b2e98cfdbc5b39a1566029cbe73c9e3f",
-                "reference": "46c56527b2e98cfdbc5b39a1566029cbe73c9e3f",
+                "url": "https://api.github.com/repos/symfony/lock/zipball/ec23fb51d9b531f7fcd2279afe5b474e624c2445",
+                "reference": "ec23fb51d9b531f7fcd2279afe5b474e624c2445",
                 "shasum": ""
             },
             "require": {
@@ -11214,7 +11211,7 @@
                 "semaphore"
             ],
             "support": {
-                "source": "https://github.com/symfony/lock/tree/v4.4.38"
+                "source": "https://github.com/symfony/lock/tree/v4.4.40"
             },
             "funding": [
                 {
@@ -11230,7 +11227,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-11T16:01:04+00:00"
+            "time": "2022-03-22T11:09:53+00:00"
         },
         {
             "name": "symfony/mime",
@@ -11317,16 +11314,16 @@
         },
         {
             "name": "symfony/phpunit-bridge",
-            "version": "v5.4.3",
+            "version": "v5.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/phpunit-bridge.git",
-                "reference": "216b07b05644607c81afd89a208e52641c1ce6b8"
+                "reference": "31977d36f253607e1fc4e1fb54df18bd9f1e4348"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/216b07b05644607c81afd89a208e52641c1ce6b8",
-                "reference": "216b07b05644607c81afd89a208e52641c1ce6b8",
+                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/31977d36f253607e1fc4e1fb54df18bd9f1e4348",
+                "reference": "31977d36f253607e1fc4e1fb54df18bd9f1e4348",
                 "shasum": ""
             },
             "require": {
@@ -11380,7 +11377,7 @@
             "description": "Provides utilities for PHPUnit, especially user deprecation notices management",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/phpunit-bridge/tree/v5.4.3"
+                "source": "https://github.com/symfony/phpunit-bridge/tree/v5.4.7"
             },
             "funding": [
                 {
@@ -11396,7 +11393,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-26T16:28:35+00:00"
+            "time": "2022-03-06T11:25:32+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -14781,22 +14778,22 @@
         },
         {
             "name": "phpmd/phpmd",
-            "version": "2.11.1",
+            "version": "2.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpmd/phpmd.git",
-                "reference": "08b60a2eb7e14c23f46ff8865b510ae08b75d0fd"
+                "reference": "c0b678ba71902f539c27c14332aa0ddcf14388ec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/08b60a2eb7e14c23f46ff8865b510ae08b75d0fd",
-                "reference": "08b60a2eb7e14c23f46ff8865b510ae08b75d0fd",
+                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/c0b678ba71902f539c27c14332aa0ddcf14388ec",
+                "reference": "c0b678ba71902f539c27c14332aa0ddcf14388ec",
                 "shasum": ""
             },
             "require": {
-                "composer/xdebug-handler": "^1.0 || ^2.0",
+                "composer/xdebug-handler": "^1.0 || ^2.0 || ^3.0",
                 "ext-xml": "*",
-                "pdepend/pdepend": "^2.10.2",
+                "pdepend/pdepend": "^2.10.3",
                 "php": ">=5.3.9"
             },
             "require-dev": {
@@ -14852,7 +14849,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/phpmd",
                 "issues": "https://github.com/phpmd/phpmd/issues",
-                "source": "https://github.com/phpmd/phpmd/tree/2.11.1"
+                "source": "https://github.com/phpmd/phpmd/tree/2.12.0"
             },
             "funding": [
                 {
@@ -14860,7 +14857,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-12-17T11:25:43+00:00"
+            "time": "2022-03-24T13:33:01+00:00"
         },
         {
             "name": "phpspec/prophecy-phpunit",
diff --git a/composer.patches.json b/composer.patches.json
index 37d0ed7df..19db282b3 100644
--- a/composer.patches.json
+++ b/composer.patches.json
@@ -3,11 +3,8 @@
         "drupal/core" : {
             "https://www.drupal.org/project/drupal/issues/3047110": "patches/core--drupal--3047110-taxonomy-term-moderation-class.patch"
         },
-        "drupal/inline_entity_form": {
-            "https://www.drupal.org/project/inline_entity_form/issues/3226253": "https://git.drupalcode.org/project/inline_entity_form/-/merge_requests/33.diff"
-        },
         "drupal/migrate_tools" : {
-            "Invalid placeholder: https://www.drupal.org/project/migrate_tools/issues/3256236": "https://www.drupal.org/files/issues/2021-12-28/invalid_placeholder-3256236-3.patch"
+            "https://www.drupal.org/project/migrate_tools/issues/3256236": "https://www.drupal.org/files/issues/2021-12-28/invalid_placeholder-3256236-3.patch"
         },
         "drush/drush": {
             "https://humanitarian.atlassian.net/browse/OPS-8026": "patches/drush--timeout-override.patch"

From e1d49a5d71e33a622bfd9b1d7d6b7117f2bc5322 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Mon, 11 Apr 2022 13:12:31 +0200
Subject: [PATCH 622/720] RW-438 icons for telegram and instagram in footer

---
 .../cd/cd-footer/cd-social-menu.html.twig     | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/templates/cd/cd-footer/cd-social-menu.html.twig b/html/themes/custom/common_design_subtheme/templates/cd/cd-footer/cd-social-menu.html.twig
index f38eea476..440c308e5 100644
--- a/html/themes/custom/common_design_subtheme/templates/cd/cd-footer/cd-social-menu.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/cd/cd-footer/cd-social-menu.html.twig
@@ -38,6 +38,30 @@
     </svg>
   </a>
 
+  <a href="https://www.instagram.com/reliefweb1996/" class="cd-footer-social__link">
+    <span class="visually-hidden">Instagram</span>
+
+    <svg class="cd-icon cd-icon--instagram" aria-hidden="true" focusable="false" width="32" height="32">
+      <use xlink:href="#cd-icon--sm-ig-def"></use>
+    </svg>
+
+    <svg class="cd-icon cd-icon--instagram hover-style" aria-hidden="true" focusable="false" width="32" height="32">
+      <use xlink:href="#cd-icon--sm-ig-full"></use>
+    </svg>
+  </a>
+
+  <a href="https://t.me/+8QT4PI32MbY3MDdh" class="cd-footer-social__link">
+    <span class="visually-hidden">Telegram</span>
+
+    <svg class="cd-icon cd-icon--telegram" aria-hidden="true" focusable="false" width="32" height="32">
+      <use xlink:href="#cd-icon--sm-tg-def"></use>
+    </svg>
+
+    <svg class="cd-icon cd-icon--telegram hover-style" aria-hidden="true" focusable="false" width="32" height="32">
+      <use xlink:href="#cd-icon--sm-tg-full"></use>
+    </svg>
+  </a>
+
   {% endblock %}
 
 {% endembed %}

From 6757ff463cbe3a3f344d181758dd18d70d8d3b1f Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Mon, 11 Apr 2022 13:13:11 +0200
Subject: [PATCH 623/720] RW-438 add insta and telegram icons, generate sprite

---
 .../img/icons/cd-icons-sprite.svg             |   2 +-
 .../img/icons/sm-ig-def.svg                   |   1 +
 .../img/icons/sm-ig-full.svg                  |   1 +
 .../img/icons/sm-tg-def.svg                   |   1 +
 .../img/icons/sm-tg-full.svg                  |   1 +
 .../img/icons/sprite.symbol.html              | 108 +++++++++++++++++-
 6 files changed, 107 insertions(+), 7 deletions(-)
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/sm-ig-def.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/sm-ig-full.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/sm-tg-def.svg
 create mode 100644 html/themes/custom/common_design_subtheme/img/icons/sm-tg-full.svg

diff --git a/html/themes/custom/common_design_subtheme/img/icons/cd-icons-sprite.svg b/html/themes/custom/common_design_subtheme/img/icons/cd-icons-sprite.svg
index 66780a62f..9b4c6e168 100644
--- a/html/themes/custom/common_design_subtheme/img/icons/cd-icons-sprite.svg
+++ b/html/themes/custom/common_design_subtheme/img/icons/cd-icons-sprite.svg
@@ -1 +1 @@
-<svg class="cd-icons-sprite" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><symbol viewBox="0 0 42 42" id="cd-icon--about" xmlns="http://www.w3.org/2000/svg"><path d="M38 0H4a4 4 0 00-4 4v34a4 4 0 004 4h34a4 4 0 004-4V4a4 4 0 00-4-4zM24 35h-4a2 2 0 01-2-2V18h4a2 2 0 012 2zm-3-22a3 3 0 113-3 3 3 0 01-3 3z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--admin" xmlns="http://www.w3.org/2000/svg"><path d="M45 21h-1.25a19.867 19.867 0 00-3.668-8.84l.889-.888a3 3 0 10-4.242-4.243l-.89.889A19.868 19.868 0 0027 4.25V3a3 3 0 00-6 0v1.25a19.868 19.868 0 00-8.84 3.668l-.888-.889a3 3 0 10-4.243 4.243l.889.889A19.867 19.867 0 004.25 21H3a3 3 0 000 6h1.25a19.867 19.867 0 003.668 8.84l-.889.888a3 3 0 004.242 4.243l.89-.889A19.868 19.868 0 0021 43.75V45a3 3 0 006 0v-1.25a19.868 19.868 0 008.84-3.668l.888.889a3 3 0 104.243-4.243l-.889-.889A19.867 19.867 0 0043.75 27H45a3 3 0 000-6zM24 38a14 14 0 1114-14 14.016 14.016 0 01-14 14z"/></symbol><symbol viewBox="0 0 47.996 41.01" id="cd-icon--alert" xmlns="http://www.w3.org/2000/svg"><path class="ccls-1" d="M47.668 37.41L27.118 1.8a3.604 3.604 0 00-6.24 0L.328 37.41a2.398 2.398 0 002.08 3.6h43.18a2.398 2.398 0 002.08-3.6zm-23.67-3.4a2 2 0 112-2 2.006 2.006 0 01-2 2zm2-9a2 2 0 01-4 0v-11a2 2 0 114 0z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--arrow-down" xmlns="http://www.w3.org/2000/svg"><path d="M48 14a4 4 0 01-1.17 2.83l-20 20a4 4 0 01-5.66 0l-20-20a4 4 0 015.66-5.66L24 28.34l17.17-17.17A4 4 0 0148 14z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--arrow-down--highlighted" xmlns="http://www.w3.org/2000/svg"><path fill="#EB5C6D" d="M48 14a4 4 0 01-1.17 2.83l-20 20a4 4 0 01-5.66 0l-20-20a4 4 0 015.66-5.66L24 28.34l17.17-17.17A4 4 0 0148 14z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--arrow-up" xmlns="http://www.w3.org/2000/svg"><path d="M0 34a4 4 0 011.17-2.83l20-20a4 4 0 015.66 0l20 20a4 4 0 11-5.66 5.66L24 19.66 6.83 36.83A4 4 0 010 34z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--arrow-up--highlighted" xmlns="http://www.w3.org/2000/svg"><path fill="#EB5C6D" d="M0 34a4 4 0 011.17-2.83l20-20a4 4 0 015.66 0l20 20a4 4 0 11-5.66 5.66L24 19.66 6.83 36.83A4 4 0 010 34z"/></symbol><symbol class="hcd-icons-sprite" viewBox="0 0 0 0" id="cd-icon--cd-icons-sprite" xmlns="http://www.w3.org/2000/svg"/><symbol viewBox="0 0 64 64" id="cd-icon--creative-commons" xmlns="http://www.w3.org/2000/svg"><path d="M31.957.311c-8.682 0-16.322 3.213-22.226 9.203C3.653 15.678.354 23.666.354 32c0 8.422 3.212 16.236 9.29 22.313 6.078 6.078 13.978 9.377 22.313 9.377 8.334 0 16.409-3.299 22.66-9.463C60.521 48.41 63.646 40.683 63.646 32c0-8.595-3.125-16.408-9.116-22.399C48.453 3.523 40.639.311 31.957.311zm.086 5.73c7.12 0 13.458 2.691 18.406 7.641 4.862 4.861 7.466 11.286 7.466 18.318 0 7.119-2.518 13.371-7.379 18.146-5.123 5.035-11.721 7.727-18.493 7.727-6.858 0-13.283-2.691-18.232-7.641C8.862 45.283 6.084 38.772 6.084 32c0-6.858 2.778-13.369 7.727-18.406 4.862-4.948 11.113-7.553 18.232-7.553z"/><path id="ia" d="M31.635 26.734c-1.79-3.264-4.844-4.563-8.389-4.563-5.16 0-9.267 3.65-9.267 9.828 0 6.283 3.861 9.829 9.442 9.829 3.581 0 6.635-1.966 8.319-4.949l-3.931-2.001c-.878 2.105-2.212 2.738-3.896 2.738-2.914 0-4.248-2.422-4.248-5.617 0-3.193 1.124-5.616 4.248-5.616.842 0 2.527.456 3.51 2.563l4.212-2.212z"/><use xlink:href="#ia" transform="translate(18.281)"/></symbol><symbol viewBox="0 0 34 42" id="cd-icon--education" xmlns="http://www.w3.org/2000/svg"><path d="M33 0h-4v8l-3-1-3 1V0H0v42h33a.98.98 0 001-.95V.95A.98.98 0 0033 0zM6 38.5a.495.495 0 01-.5.5h-2a.495.495 0 01-.5-.5v-35a.495.495 0 01.5-.5h2a.495.495 0 01.5.5zM25.5 23h-13a1.5 1.5 0 010-3h13a1.5 1.5 0 010 3zm0-6h-13a1.5 1.5 0 010-3h13a1.5 1.5 0 010 3z"/></symbol><symbol fill="#e32700" viewBox="0 0 16 16" id="cd-icon--form-error" xmlns="http://www.w3.org/2000/svg"><path d="M8.002 1a7 7 0 100 14 7 7 0 000-14zm4.025 9.284c.062.063.1.149.1.239a.34.34 0 01-.1.24l-1.262 1.262a.34.34 0 01-.48 0L8.002 9.742l-2.286 2.283a.34.34 0 01-.48 0l-1.261-1.262a.336.336 0 010-.478L6.258 8 3.975 5.716a.34.34 0 010-.48l1.262-1.262a.34.34 0 01.48 0l2.285 2.284 2.283-2.284a.34.34 0 01.48 0l1.262 1.262c.062.063.1.149.1.24a.345.345 0 01-.1.24L9.744 8l2.283 2.284z"/></symbol><symbol viewBox="0 0 28 48" id="cd-icon--help" xmlns="http://www.w3.org/2000/svg"><circle class="lcls-1" cx="14" cy="44" r="4"/><path class="lcls-1" d="M28 14a14 14 0 00-28 0 4 4 0 008 0 6 6 0 116 6 4 4 0 00-4 4v9a4 4 0 008 0v-5.59A14.02 14.02 0 0028 14z"/></symbol><symbol viewBox="0 0 41.9 37" id="cd-icon--ocha-logo" xmlns="http://www.w3.org/2000/svg"><path class="mcls-1" d="M17.6 15.6a3.3 3.3 0 113.3 3.3v-.4a2.9 2.9 0 10-2.9-2.9 2.9 2.9 0 002.9 2.9v.4a3.33 3.33 0 01-3.3-3.3"/><path data-name="Shape" class="mcls-1" d="M15 15.6a6 6 0 116 6v-.4a5.6 5.6 0 10-5.6-5.6 5.59 5.59 0 005.6 5.6v.4a6 6 0 01-6-6"/><path data-name="Shape" class="mcls-1" d="M12.1 15.6a8.9 8.9 0 118.9 8.9V24a8.54 8.54 0 008.5-8.4 8.5 8.5 0 10-17 0A8.41 8.41 0 0021 24v.4a8.77 8.77 0 01-8.9-8.8"/><path data-name="Shape" class="mcls-1" d="M9.3 15.6A11.65 11.65 0 1121 27.2v-.4A11.2 11.2 0 109.8 15.6 11.18 11.18 0 0021 26.8v.4A11.63 11.63 0 019.3 15.6"/><path data-name="Shape" class="mcls-1" d="M6.3 15.6A14.7 14.7 0 1121 30.3v-.4A14.3 14.3 0 106.7 15.6 14.3 14.3 0 0021 29.9v.4A14.66 14.66 0 016.3 15.6"/><path class="mcls-1" d="M20.7 1.1h.4v11.4h-.4z"/><path data-name="Shape" class="mcls-1" d="M10.6 5.5l.3-.3 8 8-.3.3-8-8z"/><path data-name="Rectangle-path" class="mcls-1" d="M6.5 15.4h11.4v.4H6.5z"/><path data-name="Shape" class="mcls-1" d="M10.6 25.7l8-8 .3.3-8 8-.3-.3z"/><path data-name="Rectangle-path" class="mcls-1" d="M20.7 18.7h.4v11.4h-.4zM23.014 17.902l.283-.282 7.967 8.014-.284.282zM24.1 15.4h11.4v.4H24.1z"/><path data-name="Shape" class="mcls-1" d="M23 13.2l8.1-8 .2.3-8 8-.3-.3zM18.7 16.5c.1 0 .1.1.1.2h.1a2.51 2.51 0 00.4-.7.1.1 0 00.1-.1c0-.1-.2-.2-.2-.3-.1.2-.3 0-.4.1v.1h.1v.2a.37.37 0 00-.3-.1c.1 0 0 0 0 .1a.75.75 0 00-.5.1c-.1 0-.1 0-.2-.1-.1.1-.1.2-.2.2l-.1-.1c.1-.1.2-.1.2-.2v-.3c.1-.1.1-.2.2-.2s.3.1.4 0l.1.1v.1c-.1.1-.2.1-.2.2s0 .1.1.1.1-.1.2-.1h.4c.1 0 .1-.3 0-.4v-.2c0-.1.2-.1.2 0v.1s0 .1.1 0v-.2a.35.35 0 00.2.1h.2c.1 0 .1-.1 0-.2h-.1a.31.31 0 01-.2.1c-.1 0-.1-.1-.2-.1s-.2.1-.2 0-.1-.1-.1-.2l.1-.1a.37.37 0 00.3-.1.35.35 0 01.1-.2h.1a.37.37 0 00.3-.1c.1 0 .2-.1.3-.2s.1-.1.2-.1a.1.1 0 01.1-.1v-.5a.1.1 0 01.1-.1h-.1s-.1-.1 0-.1.2 0 .2-.1a.19.19 0 00-.1-.3c-.1-.1-.2 0-.3 0a.1.1 0 01-.1.1c-.1 0-.2-.1-.1-.2v-.1h-.1l-.3.3v.1c0 .1 0 .2-.1.2h-.1c0 .1.2.1.1.2s-.2.1-.4.2a2.72 2.72 0 01-.9 0h-.5c-.1 0-.1.1-.2.2v-.2c0-.1-.1 0-.1-.1-.2-.4-.7-.3-1.1-.3a.1.1 0 00-.1.1c-.1.1-.2 0-.3 0l-.1.1c-.1 0-.2-.1-.3 0s-.1.1-.2.1v.1h-.1c-.1 0-.3 0-.3.1s0 .3-.1.3a.6.6 0 00-.4.1c-.1 0-.1.1-.2.1a2.45 2.45 0 00-.4 1.2v.1c-.2.4-.3.6-.6 1.1-.1.2-.2.6 0 .7s0 .2-.2.2-.4 0-.4-.2-.2-.1-.3-.1h-.4c-.2 0-.2.3-.3.4s-.3.1-.3.2v.2a.1.1 0 00-.1.1v.1c0 .2-.1.3 0 .5v.1a.9.9 0 01-.1.5c-.1.2-.3.2-.5.2h-1c-.1 0-.1-.1-.2-.1a.31.31 0 01-.1-.2c-.1-.1-.3 0-.4.1.1 0 0 .1 0 .1s-.2.1-.3.2-.2-.2-.2-.3-.1-.1-.2-.1v.1h-.1c-.1.1.1.1.1.1v.1h-.1a.1.1 0 01-.1.1c-.1 0-.1.1-.1 0v-.2h-.1c0 .1 0 .1-.1.1v.1h.2a.37.37 0 01.1.3c0 .1 0 .2-.1.1s0-.2 0-.3h-.1c.1.2-.1.3.1.5s-.2.2-.1.2a.35.35 0 00.2.1v-.1s.1-.1.1 0v.1H8v.4c0 .1.2 0 .2.1s-.1.1 0 .2a.1.1 0 01.1.1v.1a.1.1 0 01.1.1c.1 0 .1 0 .1-.1s.1-.1.1-.2 0-.1-.1 0V21c0-.1-.1-.1-.1-.2s.1 0 .2-.1a.1.1 0 01.1.1v.1a.1.1 0 01.1.1c.1 0 .1.1.2.2h.3v-.1l.1.1a.37.37 0 00.1.3h.1l.1.1h.1a.1.1 0 01.1.1c.1 0 .2 0 .2.1s.1.2.2.4a29772.51 29772.51 0 01.2.2.37.37 0 00.3.1.35.35 0 01.2-.1h.1c.1.2.1.4.3.4s.1.1.2.2h.2a.1.1 0 00.1.1c.1.1.2.1.2.2v.1c.1 0 .2-.1.2 0s.2.1.2.2h.1v-.1c0-.1.1 0 .2-.1s.1-.2.1-.2.2.1.3.2h.1c.1.1.1.3.2.3s.2.1.4.2.2.1.3.1h.1c.1 0 .1 0 .2-.1s.3-.1.4-.2l.1-.1c.2-.1.5.1.7 0s.1 0 .2-.1.2-.3.1-.4-.2-.5-.3-.7l-.3-.3h-.1c-.1 0-.1-.1-.1-.2a.1.1 0 01-.1-.1v-.3c-.1 0-.2-.1-.4-.1a.1.1 0 01-.1-.1v-.1a.37.37 0 01.3-.1v-.3a.1.1 0 00-.1-.1c0-.1.1-.2 0-.3s-.2-.2-.2-.3a.1.1 0 01-.1-.1v-.5c0-.1-.1-.1 0-.2l.1-.1c.1 0 .1-.1.1-.2a.14.14 0 00-.2 0v-.3l-.1-.1v-.2s0-.1-.1 0v-.2c0-.1-.1-.2-.2-.1a.14.14 0 01-.2 0V18a.1.1 0 00.1-.1.14.14 0 000-.2c-.1-.1-.2-.2-.1-.3-.1 0-.3 0-.3-.2s0-.3-.1-.4v-.3a.1.1 0 01.1-.1c.2 0 .4 0 .4-.1s-.1-.3 0-.3.4 0 .6-.2c.1 0 .1-.1 0-.2a.35.35 0 00-.1-.2c-.1-.1-.2 0-.3-.2V15c0-.1.1-.1.2-.2s.3 0 .5.1l.1.1v.1c0 .2.1.4 0 .6s-.1.1-.1.2h.1c0 .1.1.3 0 .4s-.1 0-.3 0-.1 0-.1.1l.1.1c.4.1.5.1.9.2.1 0 .1.1.2.1h.3a.1.1 0 00.1.1c.1.1.1.3.2.3a.14.14 0 01.2 0c-.1.1 0 .2 0 .3s.2.1.3.2.2.1.2 0-.1-.2 0-.3c.1.2 0 .4.1.6.1.1.1.2.2.2s.1-.1.1-.2v-.1c0-.1 0-.1.1-.2s.1-.2.1-.3v-.1c0-.1.2-.2.3-.2V17c.1 0 0-.2.1-.2s.1-.1.1-.2.1-.1 0-.1c.5.1.5 0 .5 0"/><path data-name="Shape" class="mcls-1" d="M14.5 16.3h-.1v.1l.1.1v.3c0 .1.1.2.2.1s.2-.3.1-.4-.1-.1-.3-.2M14.3 17.2c.1.2.2.1.3.1v-.1c-.1-.1-.1-.1-.3 0 .1-.1 0-.1 0-.1v.1M14.6 17.6c0-.2-.1-.2-.2-.1s0 .3.1.4a.1.1 0 00.1.1c0 .1.1 0 .2 0s0-.1.1-.1c-.1-.1-.2-.3-.3-.3"/><path data-name="Shape" class="mcls-1" d="M14.3 16.8c0-.1-.1-.1 0 0-.1 0-.1 0-.1.1s0 .2.1.2a.1.1 0 00.1-.1c-.1-.1-.1-.1-.1-.2M14.7 17.4l.1-.1h.1v-.1c-.1 0-.1.1-.2.1s0 .1 0 .1M14.6 18.3c0 .1 0 .1.1.1h.1v-.1h-.2M14.8 19c0-.1.1-.1 0-.2h-.1a.35.35 0 00.1.2M8.5 21.5v.1h.2c-.1 0-.1-.2-.2-.1M9.1 22.2c-.1.1.1.2.2.2v-.2a.14.14 0 00-.2 0M9.4 22.6c0 .2.1.3.2.3.1-.2 0-.3-.2-.3M19.5 17.4a1.27 1.27 0 01.6-.1c.4 0 .4-.6.6-.9a.6.6 0 00-.1-.4c-.1-.2-.6 0-.7-.2s.3.1.3-.1 0-.1-.1-.2h-.2a2 2 0 00-.4.8 5.38 5.38 0 00-.9 1.2c0 .1 0 .1.1.2.3.1.6-.2.8-.3M21.3 16.4c-.1 0-.1 0-.2.1v.2h.1c0-.1 0-.1-.1-.1.2-.1.2-.2.2-.2M20 17.9c.1.2.5.1.5 0s-.3-.2-.4-.2.1.1-.1.2M20.5 19.2a.37.37 0 00.1-.3l-.3.3h.2M22.3 16.5v-.1h-.2c-.1 0-.1-.1-.1-.2s-.1-.2-.1-.3-.1.2-.1.2c.2.2.3.5.5.4M19.9 15.3c-.1-.1-.1 0 0 0-.1.1 0 .1 0 0M8.1 19.1A.1.1 0 008 19h-.1v.1a.14.14 0 00.2 0M8.8 19.1c.1 0 .2-.1.1-.2s-.3 0-.2.1c-.1.1 0 .2.1.1M20.2 12.1c0-.1.1-.1.1-.2h-.1c-.1 0-.1.1 0 .2M20.5 12s.1-.1 0-.1h-.1a.1.1 0 00.1.1M19.4 14.6c0 .1.2.3.3.2a.14.14 0 000-.2.19.19 0 00-.3 0M19.7 15.4v-.1h-.3a.1.1 0 00.1.1c0-.1.1 0 .2 0M19.4 15.6c-.1 0 0 .1 0 .2s.1 0 .2-.1.1-.2 0-.2-.2 0-.2.1M19.2 15.3c0 .1-.1.2 0 .3s.1 0 .1 0 0-.2.1-.2h-.1v-.1h-.1M26.8 22.4c.1 0 0-.1 0 0"/><path data-name="Shape" class="mcls-1" d="M21 18.5l-.1-.1c0-.1-.1.1-.2 0 .1.1 0 .1-.1.2a.1.1 0 00.1.1c0 .1-.1.1 0 .2l-.1.1s-.1.1 0 .1.2-.1.3-.1h.1c.1 0 .1-.1.2-.2H21s-.1 0 0-.3M21.6 20.4c0 .1.1.1 0 0 .1 0 .1-.1.1-.2h-.1v.2M21.7 20.2c.1 0 0-.1 0-.1h-.1a.1.1 0 00.1.1M22.3 20.5c-.1 0-.1-.1-.2 0H22v.1c.2-.1.2-.1.3-.1M23.3 20.4v-.1c-.1 0-.2.1-.3 0v.1h-.1c.2.1.3 0 .4 0M23.7 20c0 .2.2.1.2 0s0-.1-.2 0l.1-.1a.1.1 0 01-.1.1M28.5 16.8c0 .1.1.1.2.1a.37.37 0 00.3-.1.27.27 0 00-.3-.3c-.2.1-.2.2-.2.3M28.5 21.9h-.1c-.1.5-.6 1.2 0 1.5.2.2.5-.1.6-.3s0-1-.5-1.2M27 19.7c-.1 0-.1.2 0 .2a.1.1 0 00.1-.1v-.1H27M27.4 24.8v.2s.2-.1 0-.2M29.7 13.1h-.1v.2c-.2.4-.7.9-.4 1.4a1.38 1.38 0 00.3-.4 10.37 10.37 0 00.4-1s-.1-.2-.2-.2M28.8 14.9c0 .1 0 .1.1.1s.1-.1 0-.1 0-.1-.1 0M23.7 11.8c-.1-.2-.2 0-.3 0l-.1-.1h-.1c-.1 0 0 .2.1.2s.1-.1.1 0 0 .3.2.2.2-.1.3-.1.1-.1.1-.2.2-.1.3 0a.1.1 0 00.1.1c0 .1.1.1.2.1a.37.37 0 00.3-.1.19.19 0 000-.3h-.2c-.1 0-.1-.1-.2-.1-.4-.1-.6.2-.8.3M22.7 12h.3c0-.2-.2-.1-.3-.1.1-.1.1 0 0 .1"/><path data-name="Shape" class="mcls-1" d="M23.1 12.6c.1-.1.3-.2.4-.3v-.1c0-.1-.1-.1-.2-.2a.1.1 0 01-.1.1c-.1.1-.2.1-.2.2v.2c.1.3.1.2.1.1M21.6 11.6v.1c.1.1.1 0 0-.1M18 9.4a.6.6 0 00.4.1l.1-.1c-.1-.1-.2 0-.2-.1h-.1c-.1-.1-.2 0-.2.1M27.1 11c0 .1-.1 0-.2.1v.1c.1.1.2 0 .3 0s.1-.1.1 0v.1a.1.1 0 00-.1.1h-.3v.2c-.1.1-.4.2-.3.4a.75.75 0 00.5.1c0-.2.1-.2.2-.3a.1.1 0 00-.1-.1v-.1a.1.1 0 00.1-.1v-.1a.35.35 0 00.2-.1c0-.1-.1-.2-.1-.3a.1.1 0 01.1-.1v-.1h-.1s-.1 0 0 .1a.37.37 0 00-.3.1c0-.2.1 0 0 0M26.1 12c0 .1.1.1.2 0h-.2M27.5 11.8c-.1.1.1.1.2.1 0-.1-.1-.1-.2-.1M27.9 11.3c-.1 0-.1.1 0 0M25.6 7.3c.1.1.2.1.2.2v.4l.1.1v.2c0 .1.1.3.1.4a.1.1 0 01.1.1c0 .1 0 .1.1.2s.1 0 .2.1.2.3.3.4a.1.1 0 01.1.1v.1c.2 0 .5.1.4.4.1-.1.2-.1.2-.2s.1-.3 0-.4l-.2-.2V9a.1.1 0 00-.1-.1c0-.1-.1-.3.1-.3v-.1H27v-.1a.35.35 0 00-.4-.4c-.1-.1-.1-.1-.2-.1h-.2a2.09 2.09 0 01-.4-.6.19.19 0 00-.3 0c.1-.1.1-.1.1 0"/><path data-name="Shape" class="mcls-1" d="M24.7 7.6a.14.14 0 000 .2h.4a.1.1 0 00.1-.1c.1-.1.2 0 .4-.1 0 .1 0 .1.1.1s0-.2-.1-.2-.1-.2-.2-.3h-.1c0 .2-.1.1-.3.2v.1-.1h-.2a.35.35 0 01-.1.2M22.4 3.7c-.1-.2-.3-.4-.2-.7a1.39 1.39 0 00.9 0c.2-.1.5 0 .7-.1v-.2c-.3.1-.5-.2-.7-.1a3.18 3.18 0 01-.9.3c-.2.1-.9 0-.9.4.3 0 .7 0 .9.3 0 .1.1.1.2.1M23.4 5.2a.4.4 0 00.4.2c0-.1 0-.1-.1-.2h-.3M23.1 5.7c-.1 0 0 .1.1.2 0-.1.1-.3-.1-.2M22.9 5.4c.1-.1 0-.2-.1-.2v.1l.1.1M23.8 6.5a.31.31 0 00.1-.2h-.1a.14.14 0 000 .2M24.1 6.5v.1c.1.1.1 0 0-.1.1 0 0 .1 0 0M24 6.8l.1-.1c0-.1-.1-.1-.2 0s.1 0 .1.1M24.1 6.8c0 .1.1.2.2.1s.1-.1 0-.1zM24.6 7a.35.35 0 00-.1-.2s-.1.1 0 .1 0 .1.1.1M24.7 7.3h.1v-.2h-.2v.1l.1.1M24.5 7.5c.1-.1.1-.1 0-.2h-.1a.1.1 0 01-.1.1c.1.1.1.1.2.1M24.2 2.5c-.1-.1-.1-.1-.2-.1.1.1.1.2.2.1M27.6 5c.1.1.2 0 .2.1s.1.2.2.2.1 0 .1-.1 0-.4-.2-.4h-.5c-.1 0-.1.1-.1.2a.19.19 0 01.3 0"/><path data-name="Shape" class="mcls-1" d="M31.7 10.2c-.1-.1-.1-.3-.2-.4s-.2-.1-.3-.2v-.2l-.1-.1c-.1-.2-.1-.3-.3-.3 0-.2-.1-.2-.3-.3v-.1a.1.1 0 00-.1-.1h-.1c-.1-.1-.2-.2-.2-.3s-.2-.2-.3-.3l-.1-.1c-.1 0-.2 0-.2-.1s-.2-.3-.3-.4 0-.4-.1-.7c0-.1-.1-.1-.2-.1a.1.1 0 01-.1-.1c-.1-.1 0-.3-.1-.4s-.3-.3-.4-.5a.37.37 0 00-.3-.1h-.1l-.1-.1c-.1-.1-.2-.2-.3-.2s-.4 0-.6-.1-.4 0-.5.2-.3.2-.5.2 0 .1 0 .2-.2.2-.1.2h.2a.1.1 0 01.1.1c.1.1.2.2.2.3a.14.14 0 000 .2.37.37 0 01.1.3c0 .1.1 0 .1 0a.25.25 0 01.1.4v.3c.1.2.1.4.2.5l.1-.1c.1 0 .1-.1.2-.1.2-.2.4.2.5.3s0 .4.1.6a1.38 1.38 0 00.3.4.31.31 0 00.1.2l.1.1a.1.1 0 01.1-.1h.1c.2.2.2.6.5.6a.1.1 0 00.1.1c.1 0 .1-.1.2 0a.35.35 0 00.1.2h.3c.1 0 .1.1.2.2l.1.1c.2.2.3.5.5.7s.2.2.3.1v-.1a.22.22 0 00.2-.2l.3-.3c.1-.1.2-.1.3-.2.3 0 .2-.2.2-.2M27.5 10.3c0 .1.1.1.2.1s.1.2.2.2.1-.1.1-.2h.1c.1-.1 0-.3-.1-.4s-.1-.2-.3-.2-.1 0-.2.1 0 .2 0 .3v.1M28.2 10.7c-.1.2 0 .4 0 .6s-.2.1-.2.2a.14.14 0 000 .2c0 .1.2.1.3.2a1.17 1.17 0 01.6.6.37.37 0 01.1.3c.1.1.2.1.2.2s.1.1.1 0a.3.3 0 000-.4c-.1-.1-.1-.1-.1-.2a2.35 2.35 0 00-.2-.8l-.3-.3v-.1c0-.1.1-.1.1-.2s-.1-.2-.2-.3c-.2-.1-.3-.1-.4 0M29.7 12.1v-.2c0-.2-.2-.2-.3-.2h-.1v.2a2.93 2.93 0 01.3 1c0 .1.3 0 .3-.1v-.2c0-.1-.1-.1-.1-.2s-.1-.2-.1-.3M29.3 11.2c-.1.1 0 .2 0 .3.1 0 .1 0 .1-.1s0-.1-.1-.2M29.3 11c0-.1 0-.1-.1-.1s-.1.1-.2.1 0 .1.1.2c.2 0 .3-.1.2-.2M28.8 10.5c.1.1 0 .2.1.2s.2.1.3 0 0-.1-.1-.1v-.1H29c-.1-.1.1-.1 0-.2v-.1h-.1v.1c-.1.1-.2.2-.1.2M28.7 9.9c-.1 0-.2 0-.2-.1h-.1s-.1.1 0 .1a.1.1 0 01.1.1c0 .1.1 0 .1.1s.1.1.1 0V10s.1-.1 0-.1M21.6 14.5a.14.14 0 000-.2.1.1 0 00-.1.1c.1 0 .1 0 .1.1"/><path data-name="Shape" class="mcls-1" d="M29.4 13.2a.6.6 0 00-.4.1c-.2.1-.3.4-.4.6a.52.52 0 01-.4.2.1.1 0 01-.1-.1v-.2l.1-.1c.1-.1 0-.2 0-.3s-.3-.4-.5-.3-.3.3-.5.5c-.1-.1-.2-.2-.2-.3v-.1c.1 0 .2.2.2.1s0-.2-.1-.2-.1-.1-.2-.1-.1-.1-.2-.2 0-.3-.1-.3a.37.37 0 01-.3-.1h-.2v-.1c.1 0 .3 0 .2-.2s-.1-.1-.2-.1H26v.3a.37.37 0 01-.3.1h-.1c-.1 0-.2-.1-.3-.1s-.1.2-.2.2-.1 0-.2.1-.1.2 0 .3v.1a.1.1 0 01-.1-.1c0-.1-.1-.2-.1-.3s.1-.2.2-.3v-.2c-.1-.1-.1-.1-.2-.1s-.3.4-.5.3-.2-.2-.3-.2-.1-.1-.2 0a2.19 2.19 0 01-.5.3c-.1.1-.3.2-.3.4a.38.38 0 01-.6.1c-.1-.1-.2-.2-.3-.2s-.2.2-.3.2-.1 0-.2-.1v-.1l.6-.3c.1 0 .1-.1.1-.2V12a.68.68 0 00-.6.4.1.1 0 01-.1.1c-.2 0-.3.1-.5 0l-.1-.2c-.1.1-.1.2-.2.2l-.1.1c-.1.1.1.3 0 .4s-.2.1-.3.1v.2c0 .1.1 0 .1.1s.1.3.2.3.3 0 .5.1.2.1.3.2.1.1.1.2a.1.1 0 00.1.1h.2c.1 0 0 .1.1.2a.76.76 0 00.1.4s0 .2-.1.2a.1.1 0 00-.1.1v.3h.1c.1.1.1.2.2.3l.1.1a.1.1 0 00-.1.1.14.14 0 00.2 0c.1 0 .1-.1.2-.1a.1.1 0 00.1-.1.35.35 0 01.1.2c-.1.1-.3 0-.4.1s-.1 0-.2.1a.1.1 0 00.1.1c.2.1.1.4-.1.6v.2H22c-.2 0-.5-.1-.7 0s-.1.1-.1.2a.1.1 0 00-.1.1v.2c-.2.2-.2.5-.3.7a.1.1 0 00.1.1c.1 0 .1-.1.2-.1s.1.2.1.2.2.1.2 0a.37.37 0 01.1-.3c0-.1-.1-.2-.1-.3s0-.2.1-.2a.1.1 0 01.1.1v.4a.14.14 0 010 .2.1.1 0 01-.1.1v.2c-.1.1-.1.1-.1.2-.2 0-.4-.1-.3-.3-.1 0-.1 0-.2.1v.3c-.1.1-.1.2-.2.3v.1c-.1.1-.2.2-.3.2-.1.1-.2 0-.2.1s.1.2.1.3 0 .1-.1.2h-.4a.37.37 0 01-.1.3c-.1.1 0 .2.1.2s.1.2.2.2.1.1.2.1a.22.22 0 00.2-.2c0-.1.1 0 .2 0h.1a.14.14 0 000-.2l.4-.4c.1 0 .1-.1.2-.1s.1.1.2.1.1.1.2.1h.1c.1 0 .2.2.3.2a.37.37 0 00-.1-.3c-.1-.1-.2-.2-.3-.2v-.1c.1.1.1.1.2.1s.1.2.2.3.1.1.2.1a.37.37 0 00.3-.1c0-.1 0-.1-.1-.1s0-.1.1-.2 0-.2 0-.3v-.1c.1-.1 0-.2 0-.4 0 .1.1.1.2.1a.22.22 0 00.2-.2.19.19 0 01.3.1c0 .1 0 .2-.1.2a.76.76 0 00-.5.2l-.1.1c-.1.1-.1.1-.1.2l-.1.1a.1.1 0 01.1.1.37.37 0 00.3-.1v-.2c.1 0 .1-.1.2-.1s.3.2.2.3h-.1c-.1.1-.2.3-.3.3s-.5.1-.7.2-.1.2-.2.2-.2.1-.3 0c0 .1-.2 0-.3 0a.31.31 0 00-.1-.2h-.1v-.1h-.8a.1.1 0 00-.1.1l-.1.1a.37.37 0 01-.3.1.37.37 0 00-.3.1c-.2 0-.3.2-.4.3a.37.37 0 01-.3.1v.1c-.2 0-.3.3-.4.5v.2c-.1.1-.1.3-.3.4v.1c.1.2.3.3.5.5a.1.1 0 00.1.1c.1.1.1.2.2.4s.3.2.5.2a.35.35 0 01.2.1c.2 0 .5.1.7 0 .3.1.7 0 1 .1.1 0 .1.1.1.2s.2.3.3.4a.6.6 0 00.4.1.31.31 0 00.1.2c0 .1 0 .1.1.2s.1.1.1.2-.1.2-.1.4v.2a2.65 2.65 0 00.6.5s.1 0 0 .1c.1 0 .1.1.2.2s0 .1.1.2l.3.3a.6.6 0 00.4.1.1.1 0 01.1.1c.1 0 .3.1.4 0s.1-.2.2-.2a.6.6 0 01.4-.1.1.1 0 00.1-.1c0-.1.1-.1.1-.2s.2-.1.3-.1.3-.3.5-.4.4-.1.5-.2 0-.4 0-.6.1-.2.1-.3v-.5c0-.1-.1-.2-.1-.3s.1-.1.2-.1.1-.3.2-.4a.1.1 0 00.1-.1c.1 0 0-.1 0-.2a.1.1 0 01-.1-.1 1.21 1.21 0 00-.5-.5.1.1 0 01-.1-.1v-.1c-.1 0 0-.1-.1-.1h.1c.1-.1.1-.3.2-.4a.1.1 0 00.1-.1v-.3c-.1-.1 0-.3 0-.4a2.2 2.2 0 00-.1-.8c0-.1-.1-.1-.2-.1a.1.1 0 01-.1.1.31.31 0 01-.1.2c0 .1-.2.1-.2.2s0 .1-.1.2l-.1.1c.4-.3.3-.3.3-.2h-.3a14.24 14.24 0 00-1.6-.5h.3c.1 0 0-.1 0-.1s.2.1.3.2.5.1.7.2.3.2.5.2.3-.1.4-.1v-.1c.1-.1.2-.2.2-.3v-.3l.1-.1v-.4a.1.1 0 00.1-.1v-.3a.75.75 0 00-.1-.5c0-.1-.1-.1-.2-.1a.1.1 0 01-.1.1c-.1 0-.2 0-.2.1a.1.1 0 00-.1.1.52.52 0 01-.4.2c-.1 0-.2 0-.2-.1s.2-.2.4-.2l.1-.1a.22.22 0 01.2-.2h.2c.1 0 .1-.1.2-.1a.31.31 0 01.1-.2c0-.1.1-.1.2-.2s.1-.4.2-.6 0 .1.1.2a.19.19 0 00.3 0c.1-.1 0-.2.1-.2h.1c.1 0 .1.1.2.1a.35.35 0 01.2-.1h.3c.2-.1.6 0 .6-.2a.86.86 0 00-.6-.7c-.2-.1-.1-.4-.3-.6-.1 0 0-.1-.1-.2l-.1-.1-.1-.1v-.5c0-.1.1-.1.2-.1s.2-.1.2-.2v-.4l.1-.1c.2 0 .5.1.7-.1.1 0 .1-.1.1-.2a1 1 0 00.4-.8c-.1.1 0 .1 0-.1.1.1.1 0 0 0m-4.5 5.4c-.1.1-.1.1-.2 0s-.1-.1-.1-.2-.1 0-.1.1h-.2c0-.1-.1-.1-.1-.2s0-.2.1-.2.1 0 .1.1v.1c.1.1.1 0 .2 0h.3c0 .1.1.2 0 .3M15.6 36c1.3-1.9 5.2-3.9 9-3.9s8 2.2 9.6 1a8.38 8.38 0 01-5.1 1.4c-3.4 0-4.7-1.7-7-1.7s-4.8 1.9-5.9 3.5zM27.7 31.8a5.34 5.34 0 001.7-1.9 14.44 14.44 0 013.7-4.4s-1.7 5.5-3.5 5.7c0 0-.3.2.2.1s2.8-.9 3.6-1.1a8.58 8.58 0 003.3-1.1 1.48 1.48 0 01.8-.4s-2.2 3.7-6.2 3.7a17.1 17.1 0 01-3.6-.6"/><path data-name="Shape" class="mcls-1" d="M32.4 29.9a3.92 3.92 0 00.5-1.7 14.64 14.64 0 012.7-6.3s.3 4.3-1.9 7c0 0-.1.4.1.1a22.93 22.93 0 014.6-3.9s1.5-1.3 1.6-1.7c0-.1-1.2 6.1-7.6 6.5"/><path data-name="Shape" class="mcls-1" d="M36.1 25.8a5.62 5.62 0 00.2-1.3c0-.6-.3-2.6-.3-3.5a7.53 7.53 0 01.8-3.7 4.5 4.5 0 00.2 1.4 12.29 12.29 0 01.5 2.5 10.27 10.27 0 01-.4 2.5 2.13 2.13 0 00.6-.8 12.81 12.81 0 012.2-2.8 5.62 5.62 0 001.4-2.1 6.08 6.08 0 01-1.2 4.1c-1.5 2.1-2.1 1.8-2.9 2.6a11.41 11.41 0 01-1.1 1.1"/><path data-name="Shape" class="mcls-1" d="M38.4 20.9a3.87 3.87 0 00-.3-1.6 10.5 10.5 0 01-1.3-5.9s.2-.2.6 1 1 1.6 1.2 2.8a12 12 0 01.2 1.7s.1.2.1 0a9 9 0 01.8-3.2c.7-1.5 1.6-2.9 1.5-3.9 0 0 .4 0 .3 1.6.1 1.6-.3 4.4-3.1 7.5"/><path data-name="Shape" class="mcls-1" d="M39.2 16.1a12 12 0 00-.8-1.5c-.3-.4-2.7-3.7-2.9-5.3 0 0 .2-.1.4.3a12.94 12.94 0 001.5 1.7 5 5 0 011.5 2.8s.1.1-.1-2.1.7-3.7-.1-5.3c0 0 1.1.2 1.7 4.8a9.68 9.68 0 01-.9 3.6c.1-.1-.2 1-.3 1"/><path data-name="Shape" class="mcls-1" d="M38.3 11a9.94 9.94 0 00-1.6-1.3 9.58 9.58 0 01-3.3-4.3s.1-.2.8.7c.5.7 1.1.4 2.7 2.4 0 0 .2.5.3.4s-.1-.5-.1-.5-.1-1.2-.1-1.6a15.83 15.83 0 00-.9-3.1 5.82 5.82 0 012.5 4.7c-.1 0-.2 2.5-.3 2.6"/><path data-name="Shape" class="mcls-1" d="M36.5 7.3s.1-3-3.8-4.6c0 0 1.4 2.8 2.4 3.5a11.57 11.57 0 011.4 1.1M26.3 36c-1.3-1.9-5.2-3.9-9-3.9s-8 2.2-9.6 1a8.38 8.38 0 005.1 1.4c3.4 0 4.7-1.7 7-1.7s4.8 1.9 5.9 3.5zM14.2 31.8a5.34 5.34 0 01-1.7-1.9 14.44 14.44 0 00-3.7-4.4s1.7 5.5 3.5 5.7c0 0 .3.2-.2.1s-2.8-.9-3.6-1.1a8.58 8.58 0 01-3.3-1.1 1.24 1.24 0 00-.8-.4s2.2 3.7 6.2 3.7a17.1 17.1 0 003.6-.6"/><path data-name="Shape" class="mcls-1" d="M9.5 29.9a3.92 3.92 0 01-.5-1.7 14.64 14.64 0 00-2.7-6.3s-.3 4.3 1.9 7c0 0 .1.4-.1.1a22.93 22.93 0 00-4.6-3.9S2 23.8 1.9 23.4c0-.1 1.2 6.1 7.6 6.5"/><path data-name="Shape" class="mcls-1" d="M5.8 25.8a5.62 5.62 0 01-.2-1.3c0-.6.3-2.6.3-3.5a7.53 7.53 0 00-.8-3.7 4.5 4.5 0 01-.2 1.4 12.29 12.29 0 00-.5 2.5 10.27 10.27 0 00.4 2.5 2.13 2.13 0 01-.6-.8A12.81 12.81 0 002 20.1 5.62 5.62 0 01.6 18a6.08 6.08 0 001.2 4.1c1.5 2.1 2.1 1.8 2.9 2.6.1 0 1 1.1 1.1 1.1"/><path data-name="Shape" class="mcls-1" d="M3.5 20.9a6.93 6.93 0 01.3-1.6 10.5 10.5 0 001.3-5.9s-.2-.2-.6 1-1 1.6-1.2 2.8a8.18 8.18 0 00-.3 1.7s-.1.2-.1 0a9 9 0 00-.8-3.2C1.4 14.2.5 12.8.6 11.8c0 0-.4 0-.3 1.6a11 11 0 003.2 7.5"/><path data-name="Shape" class="mcls-1" d="M2.7 16.1a12 12 0 01.8-1.5c.3-.4 2.7-3.7 2.9-5.3 0 0-.2-.1-.4.3a12.94 12.94 0 01-1.5 1.7A5 5 0 003 14.1s-.1.1.1-2.1-.7-3.7.1-5.3c0 0-1.1.2-1.7 4.8a9.68 9.68 0 00.9 3.6c-.1-.1.2 1 .3 1"/><path data-name="Shape" class="mcls-1" d="M3.6 11a9.94 9.94 0 011.6-1.3 9.58 9.58 0 003.3-4.3s-.1-.2-.8.7c-.5.7-1.1.4-2.7 2.4 0 0-.2.5-.3.4s.1-.5.1-.5a13.88 13.88 0 00.3-1.7A15.83 15.83 0 016 3.6a5.82 5.82 0 00-2.5 4.7 12.21 12.21 0 00.1 2.7"/><path data-name="Shape" class="mcls-1" d="M5.4 7.3s-.1-3 3.8-4.6c0 0-1.4 2.8-2.4 3.5a11.57 11.57 0 00-1.4 1.1"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--search" xmlns="http://www.w3.org/2000/svg"><path d="M46.829 41.172L38.4 32.744a21.018 21.018 0 10-5.657 5.657l8.427 8.427a4 4 0 005.658-5.656zM8 21a13 13 0 1122.325 9.046c-.05.045-.106.078-.154.126s-.08.104-.125.154A12.992 12.992 0 018 21z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--selected" xmlns="http://www.w3.org/2000/svg"><path d="M18.5 39.75a4 4 0 01-2.83-1.17l-12.5-12.5a4 4 0 015.66-5.66l9.67 9.67L39.17 9.42a4 4 0 015.66 5.66l-23.5 23.5a4 4 0 01-2.83 1.17z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--selected--highlighted" xmlns="http://www.w3.org/2000/svg"><path fill="#80CBFF" d="M18.5 39.75a4 4 0 01-2.83-1.17l-12.5-12.5a4 4 0 015.66-5.66l9.67 9.67L39.17 9.42a4 4 0 015.66 5.66l-23.5 23.5a4 4 0 01-2.83 1.17z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-fb-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><path d="M29.16 13h-3.52c-2.09 0-4.41.88-4.41 3.9v3.2h-2.41v3.84h2.49V35h4.57V23.87h3l.27-3.78h-3.34v-2.17c0-1.2 1.24-1.13 1.32-1.13h2V13z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-fb-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm4.9 21.87h-3V35h-4.59V23.94h-2.49V20.1h2.41v-3.2c0-3 2.32-3.9 4.41-3.9h3.52v3.79h-2c-.07 0-1.32-.07-1.32 1.13v2.17h3.37z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-ln-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><ellipse cx="16.07" cy="14.58" rx="2.56" ry="2.58"/><path d="M13.92 19h4.33v14h-4.33zM29.4 18.57a4.88 4.88 0 00-4.22 2.31V19H21v14h4.16v-7.35c0-2 .91-3.14 2.64-3.14s2.36 1.13 2.36 3.14V33h4.31v-8.86c.02-3.75-2.1-5.57-5.07-5.57z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-ln-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm-5.74 31h-4.34V19h4.33zm-2.19-15.83a2.58 2.58 0 112.56-2.58 2.57 2.57 0 01-2.56 2.58zM34.49 33h-4.31v-7.35c0-2-.77-3.14-2.36-3.14s-2.64 1.17-2.64 3.14V33H21V19h4.16v1.89a4.88 4.88 0 014.22-2.31c3 0 5.09 1.81 5.09 5.56z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-tt-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><path d="M36 16.56a9.83 9.83 0 01-2.83.78 4.94 4.94 0 002.16-2.72 9.84 9.84 0 01-3.13 1.19 4.93 4.93 0 00-8.52 3.37 5 5 0 00.13 1.12 14 14 0 01-10.15-5.14 4.93 4.93 0 001.52 6.57 4.9 4.9 0 01-2.18-.62v.06A4.93 4.93 0 0016.91 26a4.9 4.9 0 01-1.3.17 5 5 0 01-.93-.09 4.93 4.93 0 004.6 3.42 9.91 9.91 0 01-7.29 2 14 14 0 0021.57-11.76v-.64A10 10 0 0036 16.56z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-tt-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm9.54 17.11v.64A14 14 0 0112 31.54a9.92 9.92 0 007.29-2 4.93 4.93 0 01-4.6-3.42 5 5 0 00.93.09 4.9 4.9 0 001.3-.17A4.93 4.93 0 0113 21.17v-.06a4.9 4.9 0 002.23.62 4.93 4.93 0 01-1.52-6.57 14 14 0 0010.15 5.14 5 5 0 01-.13-1.12 4.93 4.93 0 018.52-3.37 9.83 9.83 0 003.13-1.19 4.94 4.94 0 01-2.16 2.72 9.83 9.83 0 002.78-.78 10 10 0 01-2.46 2.55z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--user" xmlns="http://www.w3.org/2000/svg"><path d="M23 24h2a16 16 0 0116 16v4H7v-4a16 16 0 0116-16z"/><rect x="15" y="4" width="18" height="18" rx="9" ry="9"/></symbol></svg>
\ No newline at end of file
+<svg class="cd-icons-sprite" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><symbol viewBox="0 0 42 42" id="cd-icon--about" xmlns="http://www.w3.org/2000/svg"><path d="M38 0H4a4 4 0 00-4 4v34a4 4 0 004 4h34a4 4 0 004-4V4a4 4 0 00-4-4zM24 35h-4a2 2 0 01-2-2V18h4a2 2 0 012 2zm-3-22a3 3 0 113-3 3 3 0 01-3 3z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--admin" xmlns="http://www.w3.org/2000/svg"><path d="M45 21h-1.25a19.867 19.867 0 00-3.668-8.84l.889-.888a3 3 0 10-4.242-4.243l-.89.889A19.868 19.868 0 0027 4.25V3a3 3 0 00-6 0v1.25a19.868 19.868 0 00-8.84 3.668l-.888-.889a3 3 0 10-4.243 4.243l.889.889A19.867 19.867 0 004.25 21H3a3 3 0 000 6h1.25a19.867 19.867 0 003.668 8.84l-.889.888a3 3 0 004.242 4.243l.89-.889A19.868 19.868 0 0021 43.75V45a3 3 0 006 0v-1.25a19.868 19.868 0 008.84-3.668l.888.889a3 3 0 104.243-4.243l-.889-.889A19.867 19.867 0 0043.75 27H45a3 3 0 000-6zM24 38a14 14 0 1114-14 14.016 14.016 0 01-14 14z"/></symbol><symbol viewBox="0 0 47.996 41.01" id="cd-icon--alert" xmlns="http://www.w3.org/2000/svg"><path class="accls-1" d="M47.668 37.41L27.118 1.8a3.604 3.604 0 00-6.24 0L.328 37.41a2.398 2.398 0 002.08 3.6h43.18a2.398 2.398 0 002.08-3.6zm-23.67-3.4a2 2 0 112-2 2.006 2.006 0 01-2 2zm2-9a2 2 0 01-4 0v-11a2 2 0 114 0z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--arrow-down" xmlns="http://www.w3.org/2000/svg"><path d="M48 14a4 4 0 01-1.17 2.83l-20 20a4 4 0 01-5.66 0l-20-20a4 4 0 015.66-5.66L24 28.34l17.17-17.17A4 4 0 0148 14z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--arrow-down--highlighted" xmlns="http://www.w3.org/2000/svg"><path fill="#EB5C6D" d="M48 14a4 4 0 01-1.17 2.83l-20 20a4 4 0 01-5.66 0l-20-20a4 4 0 015.66-5.66L24 28.34l17.17-17.17A4 4 0 0148 14z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--arrow-up" xmlns="http://www.w3.org/2000/svg"><path d="M0 34a4 4 0 011.17-2.83l20-20a4 4 0 015.66 0l20 20a4 4 0 11-5.66 5.66L24 19.66 6.83 36.83A4 4 0 010 34z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--arrow-up--highlighted" xmlns="http://www.w3.org/2000/svg"><path fill="#EB5C6D" d="M0 34a4 4 0 011.17-2.83l20-20a4 4 0 015.66 0l20 20a4 4 0 11-5.66 5.66L24 19.66 6.83 36.83A4 4 0 010 34z"/></symbol><symbol class="ahcd-icons-sprite" viewBox="0 0 0 0" id="cd-icon--cd-icons-sprite" xmlns="http://www.w3.org/2000/svg"/><symbol viewBox="0 0 64 64" id="cd-icon--creative-commons" xmlns="http://www.w3.org/2000/svg"><path d="M31.957.311c-8.682 0-16.322 3.213-22.226 9.203C3.653 15.678.354 23.666.354 32c0 8.422 3.212 16.236 9.29 22.313 6.078 6.078 13.978 9.377 22.313 9.377 8.334 0 16.409-3.299 22.66-9.463C60.521 48.41 63.646 40.683 63.646 32c0-8.595-3.125-16.408-9.116-22.399C48.453 3.523 40.639.311 31.957.311zm.086 5.73c7.12 0 13.458 2.691 18.406 7.641 4.862 4.861 7.466 11.286 7.466 18.318 0 7.119-2.518 13.371-7.379 18.146-5.123 5.035-11.721 7.727-18.493 7.727-6.858 0-13.283-2.691-18.232-7.641C8.862 45.283 6.084 38.772 6.084 32c0-6.858 2.778-13.369 7.727-18.406 4.862-4.948 11.113-7.553 18.232-7.553z"/><path id="aia" d="M31.635 26.734c-1.79-3.264-4.844-4.563-8.389-4.563-5.16 0-9.267 3.65-9.267 9.828 0 6.283 3.861 9.829 9.442 9.829 3.581 0 6.635-1.966 8.319-4.949l-3.931-2.001c-.878 2.105-2.212 2.738-3.896 2.738-2.914 0-4.248-2.422-4.248-5.617 0-3.193 1.124-5.616 4.248-5.616.842 0 2.527.456 3.51 2.563l4.212-2.212z"/><use xlink:href="#aia" transform="translate(18.281)"/></symbol><symbol viewBox="0 0 34 42" id="cd-icon--education" xmlns="http://www.w3.org/2000/svg"><path d="M33 0h-4v8l-3-1-3 1V0H0v42h33a.98.98 0 001-.95V.95A.98.98 0 0033 0zM6 38.5a.495.495 0 01-.5.5h-2a.495.495 0 01-.5-.5v-35a.495.495 0 01.5-.5h2a.495.495 0 01.5.5zM25.5 23h-13a1.5 1.5 0 010-3h13a1.5 1.5 0 010 3zm0-6h-13a1.5 1.5 0 010-3h13a1.5 1.5 0 010 3z"/></symbol><symbol fill="#e32700" viewBox="0 0 16 16" id="cd-icon--form-error" xmlns="http://www.w3.org/2000/svg"><path d="M8.002 1a7 7 0 100 14 7 7 0 000-14zm4.025 9.284c.062.063.1.149.1.239a.34.34 0 01-.1.24l-1.262 1.262a.34.34 0 01-.48 0L8.002 9.742l-2.286 2.283a.34.34 0 01-.48 0l-1.261-1.262a.336.336 0 010-.478L6.258 8 3.975 5.716a.34.34 0 010-.48l1.262-1.262a.34.34 0 01.48 0l2.285 2.284 2.283-2.284a.34.34 0 01.48 0l1.262 1.262c.062.063.1.149.1.24a.345.345 0 01-.1.24L9.744 8l2.283 2.284z"/></symbol><symbol viewBox="0 0 28 48" id="cd-icon--help" xmlns="http://www.w3.org/2000/svg"><circle class="alcls-1" cx="14" cy="44" r="4"/><path class="alcls-1" d="M28 14a14 14 0 00-28 0 4 4 0 008 0 6 6 0 116 6 4 4 0 00-4 4v9a4 4 0 008 0v-5.59A14.02 14.02 0 0028 14z"/></symbol><symbol viewBox="0 0 41.9 37" id="cd-icon--ocha-logo" xmlns="http://www.w3.org/2000/svg"><path class="amcls-1" d="M17.6 15.6a3.3 3.3 0 113.3 3.3v-.4a2.9 2.9 0 10-2.9-2.9 2.9 2.9 0 002.9 2.9v.4a3.33 3.33 0 01-3.3-3.3"/><path data-name="Shape" class="amcls-1" d="M15 15.6a6 6 0 116 6v-.4a5.6 5.6 0 10-5.6-5.6 5.59 5.59 0 005.6 5.6v.4a6 6 0 01-6-6"/><path data-name="Shape" class="amcls-1" d="M12.1 15.6a8.9 8.9 0 118.9 8.9V24a8.54 8.54 0 008.5-8.4 8.5 8.5 0 10-17 0A8.41 8.41 0 0021 24v.4a8.77 8.77 0 01-8.9-8.8"/><path data-name="Shape" class="amcls-1" d="M9.3 15.6A11.65 11.65 0 1121 27.2v-.4A11.2 11.2 0 109.8 15.6 11.18 11.18 0 0021 26.8v.4A11.63 11.63 0 019.3 15.6"/><path data-name="Shape" class="amcls-1" d="M6.3 15.6A14.7 14.7 0 1121 30.3v-.4A14.3 14.3 0 106.7 15.6 14.3 14.3 0 0021 29.9v.4A14.66 14.66 0 016.3 15.6"/><path class="amcls-1" d="M20.7 1.1h.4v11.4h-.4z"/><path data-name="Shape" class="amcls-1" d="M10.6 5.5l.3-.3 8 8-.3.3-8-8z"/><path data-name="Rectangle-path" class="amcls-1" d="M6.5 15.4h11.4v.4H6.5z"/><path data-name="Shape" class="amcls-1" d="M10.6 25.7l8-8 .3.3-8 8-.3-.3z"/><path data-name="Rectangle-path" class="amcls-1" d="M20.7 18.7h.4v11.4h-.4zM23.014 17.902l.283-.282 7.967 8.014-.284.282zM24.1 15.4h11.4v.4H24.1z"/><path data-name="Shape" class="amcls-1" d="M23 13.2l8.1-8 .2.3-8 8-.3-.3zM18.7 16.5c.1 0 .1.1.1.2h.1a2.51 2.51 0 00.4-.7.1.1 0 00.1-.1c0-.1-.2-.2-.2-.3-.1.2-.3 0-.4.1v.1h.1v.2a.37.37 0 00-.3-.1c.1 0 0 0 0 .1a.75.75 0 00-.5.1c-.1 0-.1 0-.2-.1-.1.1-.1.2-.2.2l-.1-.1c.1-.1.2-.1.2-.2v-.3c.1-.1.1-.2.2-.2s.3.1.4 0l.1.1v.1c-.1.1-.2.1-.2.2s0 .1.1.1.1-.1.2-.1h.4c.1 0 .1-.3 0-.4v-.2c0-.1.2-.1.2 0v.1s0 .1.1 0v-.2a.35.35 0 00.2.1h.2c.1 0 .1-.1 0-.2h-.1a.31.31 0 01-.2.1c-.1 0-.1-.1-.2-.1s-.2.1-.2 0-.1-.1-.1-.2l.1-.1a.37.37 0 00.3-.1.35.35 0 01.1-.2h.1a.37.37 0 00.3-.1c.1 0 .2-.1.3-.2s.1-.1.2-.1a.1.1 0 01.1-.1v-.5a.1.1 0 01.1-.1h-.1s-.1-.1 0-.1.2 0 .2-.1a.19.19 0 00-.1-.3c-.1-.1-.2 0-.3 0a.1.1 0 01-.1.1c-.1 0-.2-.1-.1-.2v-.1h-.1l-.3.3v.1c0 .1 0 .2-.1.2h-.1c0 .1.2.1.1.2s-.2.1-.4.2a2.72 2.72 0 01-.9 0h-.5c-.1 0-.1.1-.2.2v-.2c0-.1-.1 0-.1-.1-.2-.4-.7-.3-1.1-.3a.1.1 0 00-.1.1c-.1.1-.2 0-.3 0l-.1.1c-.1 0-.2-.1-.3 0s-.1.1-.2.1v.1h-.1c-.1 0-.3 0-.3.1s0 .3-.1.3a.6.6 0 00-.4.1c-.1 0-.1.1-.2.1a2.45 2.45 0 00-.4 1.2v.1c-.2.4-.3.6-.6 1.1-.1.2-.2.6 0 .7s0 .2-.2.2-.4 0-.4-.2-.2-.1-.3-.1h-.4c-.2 0-.2.3-.3.4s-.3.1-.3.2v.2a.1.1 0 00-.1.1v.1c0 .2-.1.3 0 .5v.1a.9.9 0 01-.1.5c-.1.2-.3.2-.5.2h-1c-.1 0-.1-.1-.2-.1a.31.31 0 01-.1-.2c-.1-.1-.3 0-.4.1.1 0 0 .1 0 .1s-.2.1-.3.2-.2-.2-.2-.3-.1-.1-.2-.1v.1h-.1c-.1.1.1.1.1.1v.1h-.1a.1.1 0 01-.1.1c-.1 0-.1.1-.1 0v-.2h-.1c0 .1 0 .1-.1.1v.1h.2a.37.37 0 01.1.3c0 .1 0 .2-.1.1s0-.2 0-.3h-.1c.1.2-.1.3.1.5s-.2.2-.1.2a.35.35 0 00.2.1v-.1s.1-.1.1 0v.1H8v.4c0 .1.2 0 .2.1s-.1.1 0 .2a.1.1 0 01.1.1v.1a.1.1 0 01.1.1c.1 0 .1 0 .1-.1s.1-.1.1-.2 0-.1-.1 0V21c0-.1-.1-.1-.1-.2s.1 0 .2-.1a.1.1 0 01.1.1v.1a.1.1 0 01.1.1c.1 0 .1.1.2.2h.3v-.1l.1.1a.37.37 0 00.1.3h.1l.1.1h.1a.1.1 0 01.1.1c.1 0 .2 0 .2.1s.1.2.2.4a29772.51 29772.51 0 01.2.2.37.37 0 00.3.1.35.35 0 01.2-.1h.1c.1.2.1.4.3.4s.1.1.2.2h.2a.1.1 0 00.1.1c.1.1.2.1.2.2v.1c.1 0 .2-.1.2 0s.2.1.2.2h.1v-.1c0-.1.1 0 .2-.1s.1-.2.1-.2.2.1.3.2h.1c.1.1.1.3.2.3s.2.1.4.2.2.1.3.1h.1c.1 0 .1 0 .2-.1s.3-.1.4-.2l.1-.1c.2-.1.5.1.7 0s.1 0 .2-.1.2-.3.1-.4-.2-.5-.3-.7l-.3-.3h-.1c-.1 0-.1-.1-.1-.2a.1.1 0 01-.1-.1v-.3c-.1 0-.2-.1-.4-.1a.1.1 0 01-.1-.1v-.1a.37.37 0 01.3-.1v-.3a.1.1 0 00-.1-.1c0-.1.1-.2 0-.3s-.2-.2-.2-.3a.1.1 0 01-.1-.1v-.5c0-.1-.1-.1 0-.2l.1-.1c.1 0 .1-.1.1-.2a.14.14 0 00-.2 0v-.3l-.1-.1v-.2s0-.1-.1 0v-.2c0-.1-.1-.2-.2-.1a.14.14 0 01-.2 0V18a.1.1 0 00.1-.1.14.14 0 000-.2c-.1-.1-.2-.2-.1-.3-.1 0-.3 0-.3-.2s0-.3-.1-.4v-.3a.1.1 0 01.1-.1c.2 0 .4 0 .4-.1s-.1-.3 0-.3.4 0 .6-.2c.1 0 .1-.1 0-.2a.35.35 0 00-.1-.2c-.1-.1-.2 0-.3-.2V15c0-.1.1-.1.2-.2s.3 0 .5.1l.1.1v.1c0 .2.1.4 0 .6s-.1.1-.1.2h.1c0 .1.1.3 0 .4s-.1 0-.3 0-.1 0-.1.1l.1.1c.4.1.5.1.9.2.1 0 .1.1.2.1h.3a.1.1 0 00.1.1c.1.1.1.3.2.3a.14.14 0 01.2 0c-.1.1 0 .2 0 .3s.2.1.3.2.2.1.2 0-.1-.2 0-.3c.1.2 0 .4.1.6.1.1.1.2.2.2s.1-.1.1-.2v-.1c0-.1 0-.1.1-.2s.1-.2.1-.3v-.1c0-.1.2-.2.3-.2V17c.1 0 0-.2.1-.2s.1-.1.1-.2.1-.1 0-.1c.5.1.5 0 .5 0"/><path data-name="Shape" class="amcls-1" d="M14.5 16.3h-.1v.1l.1.1v.3c0 .1.1.2.2.1s.2-.3.1-.4-.1-.1-.3-.2M14.3 17.2c.1.2.2.1.3.1v-.1c-.1-.1-.1-.1-.3 0 .1-.1 0-.1 0-.1v.1M14.6 17.6c0-.2-.1-.2-.2-.1s0 .3.1.4a.1.1 0 00.1.1c0 .1.1 0 .2 0s0-.1.1-.1c-.1-.1-.2-.3-.3-.3"/><path data-name="Shape" class="amcls-1" d="M14.3 16.8c0-.1-.1-.1 0 0-.1 0-.1 0-.1.1s0 .2.1.2a.1.1 0 00.1-.1c-.1-.1-.1-.1-.1-.2M14.7 17.4l.1-.1h.1v-.1c-.1 0-.1.1-.2.1s0 .1 0 .1M14.6 18.3c0 .1 0 .1.1.1h.1v-.1h-.2M14.8 19c0-.1.1-.1 0-.2h-.1a.35.35 0 00.1.2M8.5 21.5v.1h.2c-.1 0-.1-.2-.2-.1M9.1 22.2c-.1.1.1.2.2.2v-.2a.14.14 0 00-.2 0M9.4 22.6c0 .2.1.3.2.3.1-.2 0-.3-.2-.3M19.5 17.4a1.27 1.27 0 01.6-.1c.4 0 .4-.6.6-.9a.6.6 0 00-.1-.4c-.1-.2-.6 0-.7-.2s.3.1.3-.1 0-.1-.1-.2h-.2a2 2 0 00-.4.8 5.38 5.38 0 00-.9 1.2c0 .1 0 .1.1.2.3.1.6-.2.8-.3M21.3 16.4c-.1 0-.1 0-.2.1v.2h.1c0-.1 0-.1-.1-.1.2-.1.2-.2.2-.2M20 17.9c.1.2.5.1.5 0s-.3-.2-.4-.2.1.1-.1.2M20.5 19.2a.37.37 0 00.1-.3l-.3.3h.2M22.3 16.5v-.1h-.2c-.1 0-.1-.1-.1-.2s-.1-.2-.1-.3-.1.2-.1.2c.2.2.3.5.5.4M19.9 15.3c-.1-.1-.1 0 0 0-.1.1 0 .1 0 0M8.1 19.1A.1.1 0 008 19h-.1v.1a.14.14 0 00.2 0M8.8 19.1c.1 0 .2-.1.1-.2s-.3 0-.2.1c-.1.1 0 .2.1.1M20.2 12.1c0-.1.1-.1.1-.2h-.1c-.1 0-.1.1 0 .2M20.5 12s.1-.1 0-.1h-.1a.1.1 0 00.1.1M19.4 14.6c0 .1.2.3.3.2a.14.14 0 000-.2.19.19 0 00-.3 0M19.7 15.4v-.1h-.3a.1.1 0 00.1.1c0-.1.1 0 .2 0M19.4 15.6c-.1 0 0 .1 0 .2s.1 0 .2-.1.1-.2 0-.2-.2 0-.2.1M19.2 15.3c0 .1-.1.2 0 .3s.1 0 .1 0 0-.2.1-.2h-.1v-.1h-.1M26.8 22.4c.1 0 0-.1 0 0"/><path data-name="Shape" class="amcls-1" d="M21 18.5l-.1-.1c0-.1-.1.1-.2 0 .1.1 0 .1-.1.2a.1.1 0 00.1.1c0 .1-.1.1 0 .2l-.1.1s-.1.1 0 .1.2-.1.3-.1h.1c.1 0 .1-.1.2-.2H21s-.1 0 0-.3M21.6 20.4c0 .1.1.1 0 0 .1 0 .1-.1.1-.2h-.1v.2M21.7 20.2c.1 0 0-.1 0-.1h-.1a.1.1 0 00.1.1M22.3 20.5c-.1 0-.1-.1-.2 0H22v.1c.2-.1.2-.1.3-.1M23.3 20.4v-.1c-.1 0-.2.1-.3 0v.1h-.1c.2.1.3 0 .4 0M23.7 20c0 .2.2.1.2 0s0-.1-.2 0l.1-.1a.1.1 0 01-.1.1M28.5 16.8c0 .1.1.1.2.1a.37.37 0 00.3-.1.27.27 0 00-.3-.3c-.2.1-.2.2-.2.3M28.5 21.9h-.1c-.1.5-.6 1.2 0 1.5.2.2.5-.1.6-.3s0-1-.5-1.2M27 19.7c-.1 0-.1.2 0 .2a.1.1 0 00.1-.1v-.1H27M27.4 24.8v.2s.2-.1 0-.2M29.7 13.1h-.1v.2c-.2.4-.7.9-.4 1.4a1.38 1.38 0 00.3-.4 10.37 10.37 0 00.4-1s-.1-.2-.2-.2M28.8 14.9c0 .1 0 .1.1.1s.1-.1 0-.1 0-.1-.1 0M23.7 11.8c-.1-.2-.2 0-.3 0l-.1-.1h-.1c-.1 0 0 .2.1.2s.1-.1.1 0 0 .3.2.2.2-.1.3-.1.1-.1.1-.2.2-.1.3 0a.1.1 0 00.1.1c0 .1.1.1.2.1a.37.37 0 00.3-.1.19.19 0 000-.3h-.2c-.1 0-.1-.1-.2-.1-.4-.1-.6.2-.8.3M22.7 12h.3c0-.2-.2-.1-.3-.1.1-.1.1 0 0 .1"/><path data-name="Shape" class="amcls-1" d="M23.1 12.6c.1-.1.3-.2.4-.3v-.1c0-.1-.1-.1-.2-.2a.1.1 0 01-.1.1c-.1.1-.2.1-.2.2v.2c.1.3.1.2.1.1M21.6 11.6v.1c.1.1.1 0 0-.1M18 9.4a.6.6 0 00.4.1l.1-.1c-.1-.1-.2 0-.2-.1h-.1c-.1-.1-.2 0-.2.1M27.1 11c0 .1-.1 0-.2.1v.1c.1.1.2 0 .3 0s.1-.1.1 0v.1a.1.1 0 00-.1.1h-.3v.2c-.1.1-.4.2-.3.4a.75.75 0 00.5.1c0-.2.1-.2.2-.3a.1.1 0 00-.1-.1v-.1a.1.1 0 00.1-.1v-.1a.35.35 0 00.2-.1c0-.1-.1-.2-.1-.3a.1.1 0 01.1-.1v-.1h-.1s-.1 0 0 .1a.37.37 0 00-.3.1c0-.2.1 0 0 0M26.1 12c0 .1.1.1.2 0h-.2M27.5 11.8c-.1.1.1.1.2.1 0-.1-.1-.1-.2-.1M27.9 11.3c-.1 0-.1.1 0 0M25.6 7.3c.1.1.2.1.2.2v.4l.1.1v.2c0 .1.1.3.1.4a.1.1 0 01.1.1c0 .1 0 .1.1.2s.1 0 .2.1.2.3.3.4a.1.1 0 01.1.1v.1c.2 0 .5.1.4.4.1-.1.2-.1.2-.2s.1-.3 0-.4l-.2-.2V9a.1.1 0 00-.1-.1c0-.1-.1-.3.1-.3v-.1H27v-.1a.35.35 0 00-.4-.4c-.1-.1-.1-.1-.2-.1h-.2a2.09 2.09 0 01-.4-.6.19.19 0 00-.3 0c.1-.1.1-.1.1 0"/><path data-name="Shape" class="amcls-1" d="M24.7 7.6a.14.14 0 000 .2h.4a.1.1 0 00.1-.1c.1-.1.2 0 .4-.1 0 .1 0 .1.1.1s0-.2-.1-.2-.1-.2-.2-.3h-.1c0 .2-.1.1-.3.2v.1-.1h-.2a.35.35 0 01-.1.2M22.4 3.7c-.1-.2-.3-.4-.2-.7a1.39 1.39 0 00.9 0c.2-.1.5 0 .7-.1v-.2c-.3.1-.5-.2-.7-.1a3.18 3.18 0 01-.9.3c-.2.1-.9 0-.9.4.3 0 .7 0 .9.3 0 .1.1.1.2.1M23.4 5.2a.4.4 0 00.4.2c0-.1 0-.1-.1-.2h-.3M23.1 5.7c-.1 0 0 .1.1.2 0-.1.1-.3-.1-.2M22.9 5.4c.1-.1 0-.2-.1-.2v.1l.1.1M23.8 6.5a.31.31 0 00.1-.2h-.1a.14.14 0 000 .2M24.1 6.5v.1c.1.1.1 0 0-.1.1 0 0 .1 0 0M24 6.8l.1-.1c0-.1-.1-.1-.2 0s.1 0 .1.1M24.1 6.8c0 .1.1.2.2.1s.1-.1 0-.1zM24.6 7a.35.35 0 00-.1-.2s-.1.1 0 .1 0 .1.1.1M24.7 7.3h.1v-.2h-.2v.1l.1.1M24.5 7.5c.1-.1.1-.1 0-.2h-.1a.1.1 0 01-.1.1c.1.1.1.1.2.1M24.2 2.5c-.1-.1-.1-.1-.2-.1.1.1.1.2.2.1M27.6 5c.1.1.2 0 .2.1s.1.2.2.2.1 0 .1-.1 0-.4-.2-.4h-.5c-.1 0-.1.1-.1.2a.19.19 0 01.3 0"/><path data-name="Shape" class="amcls-1" d="M31.7 10.2c-.1-.1-.1-.3-.2-.4s-.2-.1-.3-.2v-.2l-.1-.1c-.1-.2-.1-.3-.3-.3 0-.2-.1-.2-.3-.3v-.1a.1.1 0 00-.1-.1h-.1c-.1-.1-.2-.2-.2-.3s-.2-.2-.3-.3l-.1-.1c-.1 0-.2 0-.2-.1s-.2-.3-.3-.4 0-.4-.1-.7c0-.1-.1-.1-.2-.1a.1.1 0 01-.1-.1c-.1-.1 0-.3-.1-.4s-.3-.3-.4-.5a.37.37 0 00-.3-.1h-.1l-.1-.1c-.1-.1-.2-.2-.3-.2s-.4 0-.6-.1-.4 0-.5.2-.3.2-.5.2 0 .1 0 .2-.2.2-.1.2h.2a.1.1 0 01.1.1c.1.1.2.2.2.3a.14.14 0 000 .2.37.37 0 01.1.3c0 .1.1 0 .1 0a.25.25 0 01.1.4v.3c.1.2.1.4.2.5l.1-.1c.1 0 .1-.1.2-.1.2-.2.4.2.5.3s0 .4.1.6a1.38 1.38 0 00.3.4.31.31 0 00.1.2l.1.1a.1.1 0 01.1-.1h.1c.2.2.2.6.5.6a.1.1 0 00.1.1c.1 0 .1-.1.2 0a.35.35 0 00.1.2h.3c.1 0 .1.1.2.2l.1.1c.2.2.3.5.5.7s.2.2.3.1v-.1a.22.22 0 00.2-.2l.3-.3c.1-.1.2-.1.3-.2.3 0 .2-.2.2-.2M27.5 10.3c0 .1.1.1.2.1s.1.2.2.2.1-.1.1-.2h.1c.1-.1 0-.3-.1-.4s-.1-.2-.3-.2-.1 0-.2.1 0 .2 0 .3v.1M28.2 10.7c-.1.2 0 .4 0 .6s-.2.1-.2.2a.14.14 0 000 .2c0 .1.2.1.3.2a1.17 1.17 0 01.6.6.37.37 0 01.1.3c.1.1.2.1.2.2s.1.1.1 0a.3.3 0 000-.4c-.1-.1-.1-.1-.1-.2a2.35 2.35 0 00-.2-.8l-.3-.3v-.1c0-.1.1-.1.1-.2s-.1-.2-.2-.3c-.2-.1-.3-.1-.4 0M29.7 12.1v-.2c0-.2-.2-.2-.3-.2h-.1v.2a2.93 2.93 0 01.3 1c0 .1.3 0 .3-.1v-.2c0-.1-.1-.1-.1-.2s-.1-.2-.1-.3M29.3 11.2c-.1.1 0 .2 0 .3.1 0 .1 0 .1-.1s0-.1-.1-.2M29.3 11c0-.1 0-.1-.1-.1s-.1.1-.2.1 0 .1.1.2c.2 0 .3-.1.2-.2M28.8 10.5c.1.1 0 .2.1.2s.2.1.3 0 0-.1-.1-.1v-.1H29c-.1-.1.1-.1 0-.2v-.1h-.1v.1c-.1.1-.2.2-.1.2M28.7 9.9c-.1 0-.2 0-.2-.1h-.1s-.1.1 0 .1a.1.1 0 01.1.1c0 .1.1 0 .1.1s.1.1.1 0V10s.1-.1 0-.1M21.6 14.5a.14.14 0 000-.2.1.1 0 00-.1.1c.1 0 .1 0 .1.1"/><path data-name="Shape" class="amcls-1" d="M29.4 13.2a.6.6 0 00-.4.1c-.2.1-.3.4-.4.6a.52.52 0 01-.4.2.1.1 0 01-.1-.1v-.2l.1-.1c.1-.1 0-.2 0-.3s-.3-.4-.5-.3-.3.3-.5.5c-.1-.1-.2-.2-.2-.3v-.1c.1 0 .2.2.2.1s0-.2-.1-.2-.1-.1-.2-.1-.1-.1-.2-.2 0-.3-.1-.3a.37.37 0 01-.3-.1h-.2v-.1c.1 0 .3 0 .2-.2s-.1-.1-.2-.1H26v.3a.37.37 0 01-.3.1h-.1c-.1 0-.2-.1-.3-.1s-.1.2-.2.2-.1 0-.2.1-.1.2 0 .3v.1a.1.1 0 01-.1-.1c0-.1-.1-.2-.1-.3s.1-.2.2-.3v-.2c-.1-.1-.1-.1-.2-.1s-.3.4-.5.3-.2-.2-.3-.2-.1-.1-.2 0a2.19 2.19 0 01-.5.3c-.1.1-.3.2-.3.4a.38.38 0 01-.6.1c-.1-.1-.2-.2-.3-.2s-.2.2-.3.2-.1 0-.2-.1v-.1l.6-.3c.1 0 .1-.1.1-.2V12a.68.68 0 00-.6.4.1.1 0 01-.1.1c-.2 0-.3.1-.5 0l-.1-.2c-.1.1-.1.2-.2.2l-.1.1c-.1.1.1.3 0 .4s-.2.1-.3.1v.2c0 .1.1 0 .1.1s.1.3.2.3.3 0 .5.1.2.1.3.2.1.1.1.2a.1.1 0 00.1.1h.2c.1 0 0 .1.1.2a.76.76 0 00.1.4s0 .2-.1.2a.1.1 0 00-.1.1v.3h.1c.1.1.1.2.2.3l.1.1a.1.1 0 00-.1.1.14.14 0 00.2 0c.1 0 .1-.1.2-.1a.1.1 0 00.1-.1.35.35 0 01.1.2c-.1.1-.3 0-.4.1s-.1 0-.2.1a.1.1 0 00.1.1c.2.1.1.4-.1.6v.2H22c-.2 0-.5-.1-.7 0s-.1.1-.1.2a.1.1 0 00-.1.1v.2c-.2.2-.2.5-.3.7a.1.1 0 00.1.1c.1 0 .1-.1.2-.1s.1.2.1.2.2.1.2 0a.37.37 0 01.1-.3c0-.1-.1-.2-.1-.3s0-.2.1-.2a.1.1 0 01.1.1v.4a.14.14 0 010 .2.1.1 0 01-.1.1v.2c-.1.1-.1.1-.1.2-.2 0-.4-.1-.3-.3-.1 0-.1 0-.2.1v.3c-.1.1-.1.2-.2.3v.1c-.1.1-.2.2-.3.2-.1.1-.2 0-.2.1s.1.2.1.3 0 .1-.1.2h-.4a.37.37 0 01-.1.3c-.1.1 0 .2.1.2s.1.2.2.2.1.1.2.1a.22.22 0 00.2-.2c0-.1.1 0 .2 0h.1a.14.14 0 000-.2l.4-.4c.1 0 .1-.1.2-.1s.1.1.2.1.1.1.2.1h.1c.1 0 .2.2.3.2a.37.37 0 00-.1-.3c-.1-.1-.2-.2-.3-.2v-.1c.1.1.1.1.2.1s.1.2.2.3.1.1.2.1a.37.37 0 00.3-.1c0-.1 0-.1-.1-.1s0-.1.1-.2 0-.2 0-.3v-.1c.1-.1 0-.2 0-.4 0 .1.1.1.2.1a.22.22 0 00.2-.2.19.19 0 01.3.1c0 .1 0 .2-.1.2a.76.76 0 00-.5.2l-.1.1c-.1.1-.1.1-.1.2l-.1.1a.1.1 0 01.1.1.37.37 0 00.3-.1v-.2c.1 0 .1-.1.2-.1s.3.2.2.3h-.1c-.1.1-.2.3-.3.3s-.5.1-.7.2-.1.2-.2.2-.2.1-.3 0c0 .1-.2 0-.3 0a.31.31 0 00-.1-.2h-.1v-.1h-.8a.1.1 0 00-.1.1l-.1.1a.37.37 0 01-.3.1.37.37 0 00-.3.1c-.2 0-.3.2-.4.3a.37.37 0 01-.3.1v.1c-.2 0-.3.3-.4.5v.2c-.1.1-.1.3-.3.4v.1c.1.2.3.3.5.5a.1.1 0 00.1.1c.1.1.1.2.2.4s.3.2.5.2a.35.35 0 01.2.1c.2 0 .5.1.7 0 .3.1.7 0 1 .1.1 0 .1.1.1.2s.2.3.3.4a.6.6 0 00.4.1.31.31 0 00.1.2c0 .1 0 .1.1.2s.1.1.1.2-.1.2-.1.4v.2a2.65 2.65 0 00.6.5s.1 0 0 .1c.1 0 .1.1.2.2s0 .1.1.2l.3.3a.6.6 0 00.4.1.1.1 0 01.1.1c.1 0 .3.1.4 0s.1-.2.2-.2a.6.6 0 01.4-.1.1.1 0 00.1-.1c0-.1.1-.1.1-.2s.2-.1.3-.1.3-.3.5-.4.4-.1.5-.2 0-.4 0-.6.1-.2.1-.3v-.5c0-.1-.1-.2-.1-.3s.1-.1.2-.1.1-.3.2-.4a.1.1 0 00.1-.1c.1 0 0-.1 0-.2a.1.1 0 01-.1-.1 1.21 1.21 0 00-.5-.5.1.1 0 01-.1-.1v-.1c-.1 0 0-.1-.1-.1h.1c.1-.1.1-.3.2-.4a.1.1 0 00.1-.1v-.3c-.1-.1 0-.3 0-.4a2.2 2.2 0 00-.1-.8c0-.1-.1-.1-.2-.1a.1.1 0 01-.1.1.31.31 0 01-.1.2c0 .1-.2.1-.2.2s0 .1-.1.2l-.1.1c.4-.3.3-.3.3-.2h-.3a14.24 14.24 0 00-1.6-.5h.3c.1 0 0-.1 0-.1s.2.1.3.2.5.1.7.2.3.2.5.2.3-.1.4-.1v-.1c.1-.1.2-.2.2-.3v-.3l.1-.1v-.4a.1.1 0 00.1-.1v-.3a.75.75 0 00-.1-.5c0-.1-.1-.1-.2-.1a.1.1 0 01-.1.1c-.1 0-.2 0-.2.1a.1.1 0 00-.1.1.52.52 0 01-.4.2c-.1 0-.2 0-.2-.1s.2-.2.4-.2l.1-.1a.22.22 0 01.2-.2h.2c.1 0 .1-.1.2-.1a.31.31 0 01.1-.2c0-.1.1-.1.2-.2s.1-.4.2-.6 0 .1.1.2a.19.19 0 00.3 0c.1-.1 0-.2.1-.2h.1c.1 0 .1.1.2.1a.35.35 0 01.2-.1h.3c.2-.1.6 0 .6-.2a.86.86 0 00-.6-.7c-.2-.1-.1-.4-.3-.6-.1 0 0-.1-.1-.2l-.1-.1-.1-.1v-.5c0-.1.1-.1.2-.1s.2-.1.2-.2v-.4l.1-.1c.2 0 .5.1.7-.1.1 0 .1-.1.1-.2a1 1 0 00.4-.8c-.1.1 0 .1 0-.1.1.1.1 0 0 0m-4.5 5.4c-.1.1-.1.1-.2 0s-.1-.1-.1-.2-.1 0-.1.1h-.2c0-.1-.1-.1-.1-.2s0-.2.1-.2.1 0 .1.1v.1c.1.1.1 0 .2 0h.3c0 .1.1.2 0 .3M15.6 36c1.3-1.9 5.2-3.9 9-3.9s8 2.2 9.6 1a8.38 8.38 0 01-5.1 1.4c-3.4 0-4.7-1.7-7-1.7s-4.8 1.9-5.9 3.5zM27.7 31.8a5.34 5.34 0 001.7-1.9 14.44 14.44 0 013.7-4.4s-1.7 5.5-3.5 5.7c0 0-.3.2.2.1s2.8-.9 3.6-1.1a8.58 8.58 0 003.3-1.1 1.48 1.48 0 01.8-.4s-2.2 3.7-6.2 3.7a17.1 17.1 0 01-3.6-.6"/><path data-name="Shape" class="amcls-1" d="M32.4 29.9a3.92 3.92 0 00.5-1.7 14.64 14.64 0 012.7-6.3s.3 4.3-1.9 7c0 0-.1.4.1.1a22.93 22.93 0 014.6-3.9s1.5-1.3 1.6-1.7c0-.1-1.2 6.1-7.6 6.5"/><path data-name="Shape" class="amcls-1" d="M36.1 25.8a5.62 5.62 0 00.2-1.3c0-.6-.3-2.6-.3-3.5a7.53 7.53 0 01.8-3.7 4.5 4.5 0 00.2 1.4 12.29 12.29 0 01.5 2.5 10.27 10.27 0 01-.4 2.5 2.13 2.13 0 00.6-.8 12.81 12.81 0 012.2-2.8 5.62 5.62 0 001.4-2.1 6.08 6.08 0 01-1.2 4.1c-1.5 2.1-2.1 1.8-2.9 2.6a11.41 11.41 0 01-1.1 1.1"/><path data-name="Shape" class="amcls-1" d="M38.4 20.9a3.87 3.87 0 00-.3-1.6 10.5 10.5 0 01-1.3-5.9s.2-.2.6 1 1 1.6 1.2 2.8a12 12 0 01.2 1.7s.1.2.1 0a9 9 0 01.8-3.2c.7-1.5 1.6-2.9 1.5-3.9 0 0 .4 0 .3 1.6.1 1.6-.3 4.4-3.1 7.5"/><path data-name="Shape" class="amcls-1" d="M39.2 16.1a12 12 0 00-.8-1.5c-.3-.4-2.7-3.7-2.9-5.3 0 0 .2-.1.4.3a12.94 12.94 0 001.5 1.7 5 5 0 011.5 2.8s.1.1-.1-2.1.7-3.7-.1-5.3c0 0 1.1.2 1.7 4.8a9.68 9.68 0 01-.9 3.6c.1-.1-.2 1-.3 1"/><path data-name="Shape" class="amcls-1" d="M38.3 11a9.94 9.94 0 00-1.6-1.3 9.58 9.58 0 01-3.3-4.3s.1-.2.8.7c.5.7 1.1.4 2.7 2.4 0 0 .2.5.3.4s-.1-.5-.1-.5-.1-1.2-.1-1.6a15.83 15.83 0 00-.9-3.1 5.82 5.82 0 012.5 4.7c-.1 0-.2 2.5-.3 2.6"/><path data-name="Shape" class="amcls-1" d="M36.5 7.3s.1-3-3.8-4.6c0 0 1.4 2.8 2.4 3.5a11.57 11.57 0 011.4 1.1M26.3 36c-1.3-1.9-5.2-3.9-9-3.9s-8 2.2-9.6 1a8.38 8.38 0 005.1 1.4c3.4 0 4.7-1.7 7-1.7s4.8 1.9 5.9 3.5zM14.2 31.8a5.34 5.34 0 01-1.7-1.9 14.44 14.44 0 00-3.7-4.4s1.7 5.5 3.5 5.7c0 0 .3.2-.2.1s-2.8-.9-3.6-1.1a8.58 8.58 0 01-3.3-1.1 1.24 1.24 0 00-.8-.4s2.2 3.7 6.2 3.7a17.1 17.1 0 003.6-.6"/><path data-name="Shape" class="amcls-1" d="M9.5 29.9a3.92 3.92 0 01-.5-1.7 14.64 14.64 0 00-2.7-6.3s-.3 4.3 1.9 7c0 0 .1.4-.1.1a22.93 22.93 0 00-4.6-3.9S2 23.8 1.9 23.4c0-.1 1.2 6.1 7.6 6.5"/><path data-name="Shape" class="amcls-1" d="M5.8 25.8a5.62 5.62 0 01-.2-1.3c0-.6.3-2.6.3-3.5a7.53 7.53 0 00-.8-3.7 4.5 4.5 0 01-.2 1.4 12.29 12.29 0 00-.5 2.5 10.27 10.27 0 00.4 2.5 2.13 2.13 0 01-.6-.8A12.81 12.81 0 002 20.1 5.62 5.62 0 01.6 18a6.08 6.08 0 001.2 4.1c1.5 2.1 2.1 1.8 2.9 2.6.1 0 1 1.1 1.1 1.1"/><path data-name="Shape" class="amcls-1" d="M3.5 20.9a6.93 6.93 0 01.3-1.6 10.5 10.5 0 001.3-5.9s-.2-.2-.6 1-1 1.6-1.2 2.8a8.18 8.18 0 00-.3 1.7s-.1.2-.1 0a9 9 0 00-.8-3.2C1.4 14.2.5 12.8.6 11.8c0 0-.4 0-.3 1.6a11 11 0 003.2 7.5"/><path data-name="Shape" class="amcls-1" d="M2.7 16.1a12 12 0 01.8-1.5c.3-.4 2.7-3.7 2.9-5.3 0 0-.2-.1-.4.3a12.94 12.94 0 01-1.5 1.7A5 5 0 003 14.1s-.1.1.1-2.1-.7-3.7.1-5.3c0 0-1.1.2-1.7 4.8a9.68 9.68 0 00.9 3.6c-.1-.1.2 1 .3 1"/><path data-name="Shape" class="amcls-1" d="M3.6 11a9.94 9.94 0 011.6-1.3 9.58 9.58 0 003.3-4.3s-.1-.2-.8.7c-.5.7-1.1.4-2.7 2.4 0 0-.2.5-.3.4s.1-.5.1-.5a13.88 13.88 0 00.3-1.7A15.83 15.83 0 016 3.6a5.82 5.82 0 00-2.5 4.7 12.21 12.21 0 00.1 2.7"/><path data-name="Shape" class="amcls-1" d="M5.4 7.3s-.1-3 3.8-4.6c0 0-1.4 2.8-2.4 3.5a11.57 11.57 0 00-1.4 1.1"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--search" xmlns="http://www.w3.org/2000/svg"><path d="M46.829 41.172L38.4 32.744a21.018 21.018 0 10-5.657 5.657l8.427 8.427a4 4 0 005.658-5.656zM8 21a13 13 0 1122.325 9.046c-.05.045-.106.078-.154.126s-.08.104-.125.154A12.992 12.992 0 018 21z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--selected" xmlns="http://www.w3.org/2000/svg"><path d="M18.5 39.75a4 4 0 01-2.83-1.17l-12.5-12.5a4 4 0 015.66-5.66l9.67 9.67L39.17 9.42a4 4 0 015.66 5.66l-23.5 23.5a4 4 0 01-2.83 1.17z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--selected--highlighted" xmlns="http://www.w3.org/2000/svg"><path fill="#80CBFF" d="M18.5 39.75a4 4 0 01-2.83-1.17l-12.5-12.5a4 4 0 015.66-5.66l9.67 9.67L39.17 9.42a4 4 0 015.66 5.66l-23.5 23.5a4 4 0 01-2.83 1.17z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-fb-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><path d="M29.16 13h-3.52c-2.09 0-4.41.88-4.41 3.9v3.2h-2.41v3.84h2.49V35h4.57V23.87h3l.27-3.78h-3.34v-2.17c0-1.2 1.24-1.13 1.32-1.13h2V13z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-fb-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm4.9 21.87h-3V35h-4.59V23.94h-2.49V20.1h2.41v-3.2c0-3 2.32-3.9 4.41-3.9h3.52v3.79h-2c-.07 0-1.32-.07-1.32 1.13v2.17h3.37z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-ig-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm0 41a19 19 0 1119-19 19 19 0 01-19 19z"/><path d="M24 18.09A5.91 5.91 0 1029.91 24 5.9 5.9 0 0024 18.09zm0 9.74A3.83 3.83 0 1127.83 24 3.83 3.83 0 0124 27.83z"/><circle cx="30.14" cy="17.86" r="1.38"/><path d="M34.9 16.47a5.88 5.88 0 00-3.36-3.36 8.43 8.43 0 00-2.79-.53c-1.23-.06-1.62-.07-4.74-.07s-3.52 0-4.74.07a8.44 8.44 0 00-2.79.53 5.88 5.88 0 00-3.36 3.36 8.44 8.44 0 00-.53 2.79c-.06 1.23-.07 1.62-.07 4.74s0 3.52.07 4.74a8.44 8.44 0 00.53 2.79 5.88 5.88 0 003.36 3.36 8.44 8.44 0 002.79.53c1.23.06 1.62.07 4.74.07s3.52 0 4.74-.07a8.44 8.44 0 002.79-.53 5.88 5.88 0 003.36-3.36 8.41 8.41 0 00.53-2.79c.06-1.23.07-1.62.07-4.74s0-3.52-.07-4.74a8.44 8.44 0 00-.53-2.79zm-1.54 12.18a6.38 6.38 0 01-.4 2.14A3.81 3.81 0 0130.78 33a6.35 6.35 0 01-2.14.4c-1.21.06-1.58.07-4.65.07s-3.43 0-4.65-.07a6.35 6.35 0 01-2.14-.4 3.81 3.81 0 01-2.2-2.22 6.35 6.35 0 01-.4-2.14c-.06-1.21-.07-1.58-.07-4.65s0-3.43.07-4.65a6.38 6.38 0 01.4-2.14 3.81 3.81 0 012.22-2.2 6.35 6.35 0 012.14-.4c1.21-.06 1.58-.07 4.65-.07s3.43 0 4.65.07a6.38 6.38 0 012.14.4 3.81 3.81 0 012.2 2.22 6.35 6.35 0 01.4 2.14c.06 1.21.07 1.58.07 4.65s-.05 3.42-.11 4.64z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-ig-full" xmlns="http://www.w3.org/2000/svg"><circle cx="24" cy="24" r="3.83"/><path d="M33 17.22A3.81 3.81 0 0030.78 15a6.38 6.38 0 00-2.14-.4c-1.21-.05-1.58-.07-4.65-.07s-3.43 0-4.65.07a6.35 6.35 0 00-2.14.4 3.81 3.81 0 00-2.2 2.22 6.38 6.38 0 00-.4 2.14c-.05 1.21-.07 1.58-.07 4.65s0 3.44.07 4.65a6.36 6.36 0 00.4 2.14 3.81 3.81 0 002.22 2.2 6.35 6.35 0 002.14.4c1.21.06 1.58.07 4.65.07s3.44 0 4.65-.07a6.35 6.35 0 002.14-.4 3.81 3.81 0 002.2-2.22 6.38 6.38 0 00.4-2.14c.06-1.21.07-1.58.07-4.65s0-3.43-.07-4.65a6.35 6.35 0 00-.4-2.12zm-9 12.69A5.91 5.91 0 1129.91 24 5.9 5.9 0 0124 29.91zm6.14-10.66a1.38 1.38 0 111.38-1.38 1.38 1.38 0 01-1.38 1.37z"/><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm11.43 26.74a8.41 8.41 0 01-.53 2.79 5.88 5.88 0 01-3.36 3.36 8.44 8.44 0 01-2.79.53c-1.23.06-1.62.07-4.74.07s-3.51 0-4.74-.07a8.44 8.44 0 01-2.79-.53 5.88 5.88 0 01-3.36-3.36 8.44 8.44 0 01-.53-2.79c-.06-1.23-.07-1.62-.07-4.74s0-3.52.07-4.74a8.44 8.44 0 01.53-2.79 5.88 5.88 0 013.36-3.36 8.44 8.44 0 012.79-.53c1.23-.06 1.62-.07 4.74-.07s3.51 0 4.74.07a8.43 8.43 0 012.79.53 5.88 5.88 0 013.36 3.36 8.44 8.44 0 01.53 2.79c.06 1.23.07 1.62.07 4.74s-.01 3.51-.07 4.74z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-ln-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><ellipse cx="16.07" cy="14.58" rx="2.56" ry="2.58"/><path d="M13.92 19h4.33v14h-4.33zM29.4 18.57a4.88 4.88 0 00-4.22 2.31V19H21v14h4.16v-7.35c0-2 .91-3.14 2.64-3.14s2.36 1.13 2.36 3.14V33h4.31v-8.86c.02-3.75-2.1-5.57-5.07-5.57z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-ln-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm-5.74 31h-4.34V19h4.33zm-2.19-15.83a2.58 2.58 0 112.56-2.58 2.57 2.57 0 01-2.56 2.58zM34.49 33h-4.31v-7.35c0-2-.77-3.14-2.36-3.14s-2.64 1.17-2.64 3.14V33H21V19h4.16v1.89a4.88 4.88 0 014.22-2.31c3 0 5.09 1.81 5.09 5.56z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-tg-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><path d="M10.93 22.657c6.942-3.025 11.57-5.019 13.887-5.982 6.614-2.751 7.988-3.23 8.884-3.245.197-.003.637.045.923.277.24.195.307.46.338.645.032.185.072.608.04.937-.358 3.766-1.909 12.904-2.698 17.122-.334 1.785-.991 2.383-1.627 2.441-1.383.128-2.433-.914-3.773-1.792-2.096-1.373-3.28-2.229-5.315-3.57-2.35-1.549-.827-2.4.513-3.792.351-.365 6.444-5.907 6.562-6.41.015-.063.029-.297-.11-.42-.14-.124-.345-.082-.494-.048-.21.047-3.558 2.26-10.045 6.639-.95.653-1.81.97-2.582.954-.85-.018-2.486-.48-3.702-.876-1.491-.485-2.677-.741-2.574-1.565.054-.428.645-.867 1.772-1.315z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-tg-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2C4.399 2-5.413 25.696 8.445 39.555 22.304 53.413 46 43.6 46 24c0-12.15-9.85-22-22-22zm9.701 11.43c.197-.004.637.046.922.277.241.196.308.46.34.645.032.185.07.607.039.937-.358 3.766-1.908 12.904-2.697 17.121-.334 1.785-.993 2.383-1.63 2.442-1.382.127-2.431-.913-3.77-1.791-2.097-1.374-3.28-2.23-5.315-3.57-2.351-1.55-.828-2.402.512-3.794.35-.364 6.444-5.905 6.562-6.408.015-.063.028-.298-.111-.422-.14-.124-.344-.08-.492-.047-.21.048-3.559 2.26-10.045 6.639-.95.653-1.811.97-2.582.953-.85-.018-2.488-.48-3.704-.875-1.49-.485-2.675-.741-2.572-1.564.054-.43.644-.868 1.772-1.317 6.942-3.024 11.57-5.019 13.886-5.982 6.614-2.751 7.99-3.229 8.885-3.244z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-tt-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><path d="M36 16.56a9.83 9.83 0 01-2.83.78 4.94 4.94 0 002.16-2.72 9.84 9.84 0 01-3.13 1.19 4.93 4.93 0 00-8.52 3.37 5 5 0 00.13 1.12 14 14 0 01-10.15-5.14 4.93 4.93 0 001.52 6.57 4.9 4.9 0 01-2.18-.62v.06A4.93 4.93 0 0016.91 26a4.9 4.9 0 01-1.3.17 5 5 0 01-.93-.09 4.93 4.93 0 004.6 3.42 9.91 9.91 0 01-7.29 2 14 14 0 0021.57-11.76v-.64A10 10 0 0036 16.56z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--sm-tt-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm9.54 17.11v.64A14 14 0 0112 31.54a9.92 9.92 0 007.29-2 4.93 4.93 0 01-4.6-3.42 5 5 0 00.93.09 4.9 4.9 0 001.3-.17A4.93 4.93 0 0113 21.17v-.06a4.9 4.9 0 002.23.62 4.93 4.93 0 01-1.52-6.57 14 14 0 0010.15 5.14 5 5 0 01-.13-1.12 4.93 4.93 0 018.52-3.37 9.83 9.83 0 003.13-1.19 4.94 4.94 0 01-2.16 2.72 9.83 9.83 0 002.78-.78 10 10 0 01-2.46 2.55z"/></symbol><symbol viewBox="0 0 48 48" id="cd-icon--user" xmlns="http://www.w3.org/2000/svg"><path d="M23 24h2a16 16 0 0116 16v4H7v-4a16 16 0 0116-16z"/><rect x="15" y="4" width="18" height="18" rx="9" ry="9"/></symbol></svg>
\ No newline at end of file
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sm-ig-def.svg b/html/themes/custom/common_design_subtheme/img/icons/sm-ig-def.svg
new file mode 100644
index 000000000..7599f6328
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/sm-ig-def.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M24,2A22,22,0,1,0,46,24,22,22,0,0,0,24,2Zm0,41A19,19,0,1,1,43,24,19,19,0,0,1,24,43Z"/><path d="M24,18.09A5.91,5.91,0,1,0,29.91,24,5.9,5.9,0,0,0,24,18.09Zm0,9.74A3.83,3.83,0,1,1,27.83,24,3.83,3.83,0,0,1,24,27.83Z"/><circle cx="30.14" cy="17.86" r="1.38"/><path d="M34.9,16.47a5.88,5.88,0,0,0-3.36-3.36,8.43,8.43,0,0,0-2.79-.53c-1.23-.06-1.62-.07-4.74-.07s-3.52,0-4.74.07a8.44,8.44,0,0,0-2.79.53,5.88,5.88,0,0,0-3.36,3.36,8.44,8.44,0,0,0-.53,2.79c-.06,1.23-.07,1.62-.07,4.74s0,3.52.07,4.74a8.44,8.44,0,0,0,.53,2.79,5.88,5.88,0,0,0,3.36,3.36,8.44,8.44,0,0,0,2.79.53c1.23.06,1.62.07,4.74.07s3.52,0,4.74-.07a8.44,8.44,0,0,0,2.79-.53,5.88,5.88,0,0,0,3.36-3.36,8.41,8.41,0,0,0,.53-2.79c.06-1.23.07-1.62.07-4.74s0-3.52-.07-4.74A8.44,8.44,0,0,0,34.9,16.47ZM33.36,28.65a6.38,6.38,0,0,1-.4,2.14A3.81,3.81,0,0,1,30.78,33a6.35,6.35,0,0,1-2.14.4c-1.21.06-1.58.07-4.65.07s-3.43,0-4.65-.07a6.35,6.35,0,0,1-2.14-.4A3.81,3.81,0,0,1,15,30.78a6.35,6.35,0,0,1-.4-2.14c-.06-1.21-.07-1.58-.07-4.65s0-3.43.07-4.65a6.38,6.38,0,0,1,.4-2.14A3.81,3.81,0,0,1,17.22,15a6.35,6.35,0,0,1,2.14-.4c1.21-.06,1.58-.07,4.65-.07s3.43,0,4.65.07a6.38,6.38,0,0,1,2.14.4A3.81,3.81,0,0,1,33,17.22a6.35,6.35,0,0,1,.4,2.14c.06,1.21.07,1.58.07,4.65S33.42,27.43,33.36,28.65Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sm-ig-full.svg b/html/themes/custom/common_design_subtheme/img/icons/sm-ig-full.svg
new file mode 100644
index 000000000..105b29f55
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/sm-ig-full.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><circle cx="24" cy="24" r="3.83"/><path d="M33,17.22A3.81,3.81,0,0,0,30.78,15a6.38,6.38,0,0,0-2.14-.4c-1.21-.05-1.58-.07-4.65-.07s-3.43,0-4.65.07a6.35,6.35,0,0,0-2.14.4A3.81,3.81,0,0,0,15,17.22a6.38,6.38,0,0,0-.4,2.14c-.05,1.21-.07,1.58-.07,4.65s0,3.44.07,4.65a6.36,6.36,0,0,0,.4,2.14A3.81,3.81,0,0,0,17.22,33a6.35,6.35,0,0,0,2.14.4c1.21.06,1.58.07,4.65.07s3.44,0,4.65-.07a6.35,6.35,0,0,0,2.14-.4A3.81,3.81,0,0,0,33,30.78a6.38,6.38,0,0,0,.4-2.14c.06-1.21.07-1.58.07-4.65s0-3.43-.07-4.65A6.35,6.35,0,0,0,33,17.22ZM24,29.91A5.91,5.91,0,1,1,29.91,24,5.9,5.9,0,0,1,24,29.91Zm6.14-10.66a1.38,1.38,0,1,1,1.38-1.38A1.38,1.38,0,0,1,30.14,19.24Z"/><path d="M24,2A22,22,0,1,0,46,24,22,22,0,0,0,24,2ZM35.43,28.74a8.41,8.41,0,0,1-.53,2.79,5.88,5.88,0,0,1-3.36,3.36,8.44,8.44,0,0,1-2.79.53c-1.23.06-1.62.07-4.74.07s-3.51,0-4.74-.07a8.44,8.44,0,0,1-2.79-.53,5.88,5.88,0,0,1-3.36-3.36,8.44,8.44,0,0,1-.53-2.79c-.06-1.23-.07-1.62-.07-4.74s0-3.52.07-4.74a8.44,8.44,0,0,1,.53-2.79,5.88,5.88,0,0,1,3.36-3.36,8.44,8.44,0,0,1,2.79-.53c1.23-.06,1.62-.07,4.74-.07s3.51,0,4.74.07a8.43,8.43,0,0,1,2.79.53,5.88,5.88,0,0,1,3.36,3.36,8.44,8.44,0,0,1,.53,2.79c.06,1.23.07,1.62.07,4.74S35.49,27.51,35.43,28.74Z"/></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sm-tg-def.svg b/html/themes/custom/common_design_subtheme/img/icons/sm-tg-def.svg
new file mode 100644
index 000000000..ca0417834
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/sm-tg-def.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M24,5A19,19,0,1,1,5,24,19,19,0,0,1,24,5m0-3A22,22,0,1,0,46,24,22,22,0,0,0,24,2Z" /><path d="m 10.929069,22.656769 c 6.942436,-3.024711 11.571812,-5.018779 13.888128,-5.982221 6.613564,-2.750808 7.987805,-3.22865 8.883516,-3.244432 0.197009,-0.0035 0.63749,0.04538 0.92282,0.276877 0.240922,0.195492 0.307213,0.459579 0.338936,0.644926 0.03174,0.185353 0.07122,0.607584 0.03979,0.937503 -0.358389,3.765646 -1.909142,12.903885 -2.698075,17.121475 -0.333828,1.784622 -0.991145,2.382995 -1.627508,2.44155 -1.382957,0.127262 -2.433109,-0.91395 -3.77257,-1.791986 -2.095996,-1.373947 -3.280099,-2.229236 -5.314624,-3.569961 -2.351243,-1.549436 -0.827029,-2.401028 0.512938,-3.792779 0.35068,-0.364228 6.444016,-5.90659 6.561955,-6.409366 0.01475,-0.06288 0.02845,-0.297273 -0.110809,-0.421044 -0.139247,-0.123764 -0.344767,-0.08144 -0.493071,-0.04779 -0.210222,0.04773 -3.558599,2.260865 -10.045129,6.639456 -0.950423,0.652637 -1.81129,0.970624 -2.582596,0.953961 -0.850305,-0.0184 -2.485946,-0.480775 -3.701877,-0.876027 -1.491392,-0.484795 -2.6767173,-0.741105 -2.5735023,-1.56443 0.053783,-0.428844 0.644315,-0.867415 1.7716543,-1.315721 z" /></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sm-tg-full.svg b/html/themes/custom/common_design_subtheme/img/icons/sm-tg-full.svg
new file mode 100644
index 000000000..1c296fc7d
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/img/icons/sm-tg-full.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48"><path d="M 24 2 C 4.3987301 2 -5.4131983 25.696176 8.4453125 39.554688 C 22.303823 53.413199 46 43.60127 46 24 C 46 11.849736 36.150264 2 24 2 z M 33.701172 13.429688 C 33.898181 13.426187 34.337717 13.475534 34.623047 13.707031 C 34.863969 13.902523 34.931168 14.166215 34.962891 14.351562 C 34.994631 14.536915 35.033383 14.959143 35.001953 15.289062 C 34.643564 19.054709 33.09362 28.192566 32.304688 32.410156 C 31.970859 34.194778 31.312144 34.793008 30.675781 34.851562 C 29.292824 34.978825 28.243758 33.938583 26.904297 33.060547 C 24.808301 31.6866 23.624369 30.830959 21.589844 29.490234 C 19.238601 27.940798 20.761596 27.089017 22.101562 25.697266 C 22.452243 25.333038 28.546124 19.791839 28.664062 19.289062 C 28.678812 19.226183 28.691993 18.990958 28.552734 18.867188 C 28.413487 18.743423 28.208851 18.786663 28.060547 18.820312 C 27.850325 18.868043 24.502155 21.080393 18.015625 25.458984 C 17.065202 26.111621 16.2049 26.428772 15.433594 26.412109 C 14.583289 26.393709 12.9464 25.932361 11.730469 25.537109 C 10.239077 25.052314 9.0549881 24.795981 9.1582031 23.972656 C 9.2119861 23.543812 9.8023482 23.104556 10.929688 22.65625 C 17.872123 19.631539 22.50009 17.63727 24.816406 16.673828 C 31.42997 13.92302 32.805461 13.445469 33.701172 13.429688 z " /></svg>
diff --git a/html/themes/custom/common_design_subtheme/img/icons/sprite.symbol.html b/html/themes/custom/common_design_subtheme/img/icons/sprite.symbol.html
index d680ff449..f50aa4e9b 100644
--- a/html/themes/custom/common_design_subtheme/img/icons/sprite.symbol.html
+++ b/html/themes/custom/common_design_subtheme/img/icons/sprite.symbol.html
@@ -37,8 +37,12 @@
 	cd-icon--selected--highlighted-dims { width: 48px; height: 48px; }
 	cd-icon--sm-fb-def-dims { width: 48px; height: 48px; }
 	cd-icon--sm-fb-full-dims { width: 48px; height: 48px; }
+	cd-icon--sm-ig-def-dims { width: 48px; height: 48px; }
+	cd-icon--sm-ig-full-dims { width: 48px; height: 48px; }
 	cd-icon--sm-ln-def-dims { width: 48px; height: 48px; }
 	cd-icon--sm-ln-full-dims { width: 48px; height: 48px; }
+	cd-icon--sm-tg-def-dims { width: 48px; height: 48px; }
+	cd-icon--sm-tg-full-dims { width: 48px; height: 48px; }
 	cd-icon--sm-tt-def-dims { width: 48px; height: 48px; }
 	cd-icon--sm-tt-full-dims { width: 48px; height: 48px; }
 	cd-icon--user-dims { width: 48px; height: 48px; }
@@ -66,24 +70,28 @@
 <svg width="0" height="0" style="position:absolute">
 		<symbol viewBox="0 0 42 42" id="cd-icon--about" xmlns="http://www.w3.org/2000/svg"><path d="M38 0H4a4 4 0 00-4 4v34a4 4 0 004 4h34a4 4 0 004-4V4a4 4 0 00-4-4zM24 35h-4a2 2 0 01-2-2V18h4a2 2 0 012 2zm-3-22a3 3 0 113-3 3 3 0 01-3 3z"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--admin" xmlns="http://www.w3.org/2000/svg"><path d="M45 21h-1.25a19.867 19.867 0 00-3.668-8.84l.889-.888a3 3 0 10-4.242-4.243l-.89.889A19.868 19.868 0 0027 4.25V3a3 3 0 00-6 0v1.25a19.868 19.868 0 00-8.84 3.668l-.888-.889a3 3 0 10-4.243 4.243l.889.889A19.867 19.867 0 004.25 21H3a3 3 0 000 6h1.25a19.867 19.867 0 003.668 8.84l-.889.888a3 3 0 004.242 4.243l.89-.889A19.868 19.868 0 0021 43.75V45a3 3 0 006 0v-1.25a19.868 19.868 0 008.84-3.668l.888.889a3 3 0 104.243-4.243l-.889-.889A19.867 19.867 0 0043.75 27H45a3 3 0 000-6zM24 38a14 14 0 1114-14 14.016 14.016 0 01-14 14z"/></symbol>
-		<symbol viewBox="0 0 47.996 41.01" id="cd-icon--alert" xmlns="http://www.w3.org/2000/svg"><path class="ccls-1" d="M47.668 37.41L27.118 1.8a3.604 3.604 0 00-6.24 0L.328 37.41a2.398 2.398 0 002.08 3.6h43.18a2.398 2.398 0 002.08-3.6zm-23.67-3.4a2 2 0 112-2 2.006 2.006 0 01-2 2zm2-9a2 2 0 01-4 0v-11a2 2 0 114 0z"/></symbol>
+		<symbol viewBox="0 0 47.996 41.01" id="cd-icon--alert" xmlns="http://www.w3.org/2000/svg"><path class="accls-1" d="M47.668 37.41L27.118 1.8a3.604 3.604 0 00-6.24 0L.328 37.41a2.398 2.398 0 002.08 3.6h43.18a2.398 2.398 0 002.08-3.6zm-23.67-3.4a2 2 0 112-2 2.006 2.006 0 01-2 2zm2-9a2 2 0 01-4 0v-11a2 2 0 114 0z"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--arrow-down" xmlns="http://www.w3.org/2000/svg"><path d="M48 14a4 4 0 01-1.17 2.83l-20 20a4 4 0 01-5.66 0l-20-20a4 4 0 015.66-5.66L24 28.34l17.17-17.17A4 4 0 0148 14z"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--arrow-down--highlighted" xmlns="http://www.w3.org/2000/svg"><path fill="#EB5C6D" d="M48 14a4 4 0 01-1.17 2.83l-20 20a4 4 0 01-5.66 0l-20-20a4 4 0 015.66-5.66L24 28.34l17.17-17.17A4 4 0 0148 14z"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--arrow-up" xmlns="http://www.w3.org/2000/svg"><path d="M0 34a4 4 0 011.17-2.83l20-20a4 4 0 015.66 0l20 20a4 4 0 11-5.66 5.66L24 19.66 6.83 36.83A4 4 0 010 34z"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--arrow-up--highlighted" xmlns="http://www.w3.org/2000/svg"><path fill="#EB5C6D" d="M0 34a4 4 0 011.17-2.83l20-20a4 4 0 015.66 0l20 20a4 4 0 11-5.66 5.66L24 19.66 6.83 36.83A4 4 0 010 34z"/></symbol>
-		<symbol class="hcd-icons-sprite" viewBox="0 0 0 0" id="cd-icon--cd-icons-sprite" xmlns="http://www.w3.org/2000/svg"/>
-		<symbol viewBox="0 0 64 64" id="cd-icon--creative-commons" xmlns="http://www.w3.org/2000/svg"><path d="M31.957.311c-8.682 0-16.322 3.213-22.226 9.203C3.653 15.678.354 23.666.354 32c0 8.422 3.212 16.236 9.29 22.313 6.078 6.078 13.978 9.377 22.313 9.377 8.334 0 16.409-3.299 22.66-9.463C60.521 48.41 63.646 40.683 63.646 32c0-8.595-3.125-16.408-9.116-22.399C48.453 3.523 40.639.311 31.957.311zm.086 5.73c7.12 0 13.458 2.691 18.406 7.641 4.862 4.861 7.466 11.286 7.466 18.318 0 7.119-2.518 13.371-7.379 18.146-5.123 5.035-11.721 7.727-18.493 7.727-6.858 0-13.283-2.691-18.232-7.641C8.862 45.283 6.084 38.772 6.084 32c0-6.858 2.778-13.369 7.727-18.406 4.862-4.948 11.113-7.553 18.232-7.553z"/><path id="ia" d="M31.635 26.734c-1.79-3.264-4.844-4.563-8.389-4.563-5.16 0-9.267 3.65-9.267 9.828 0 6.283 3.861 9.829 9.442 9.829 3.581 0 6.635-1.966 8.319-4.949l-3.931-2.001c-.878 2.105-2.212 2.738-3.896 2.738-2.914 0-4.248-2.422-4.248-5.617 0-3.193 1.124-5.616 4.248-5.616.842 0 2.527.456 3.51 2.563l4.212-2.212z"/><use xlink:href="#ia" transform="translate(18.281)"/></symbol>
+		<symbol class="ahcd-icons-sprite" viewBox="0 0 0 0" id="cd-icon--cd-icons-sprite" xmlns="http://www.w3.org/2000/svg"/>
+		<symbol viewBox="0 0 64 64" id="cd-icon--creative-commons" xmlns="http://www.w3.org/2000/svg"><path d="M31.957.311c-8.682 0-16.322 3.213-22.226 9.203C3.653 15.678.354 23.666.354 32c0 8.422 3.212 16.236 9.29 22.313 6.078 6.078 13.978 9.377 22.313 9.377 8.334 0 16.409-3.299 22.66-9.463C60.521 48.41 63.646 40.683 63.646 32c0-8.595-3.125-16.408-9.116-22.399C48.453 3.523 40.639.311 31.957.311zm.086 5.73c7.12 0 13.458 2.691 18.406 7.641 4.862 4.861 7.466 11.286 7.466 18.318 0 7.119-2.518 13.371-7.379 18.146-5.123 5.035-11.721 7.727-18.493 7.727-6.858 0-13.283-2.691-18.232-7.641C8.862 45.283 6.084 38.772 6.084 32c0-6.858 2.778-13.369 7.727-18.406 4.862-4.948 11.113-7.553 18.232-7.553z"/><path id="aia" d="M31.635 26.734c-1.79-3.264-4.844-4.563-8.389-4.563-5.16 0-9.267 3.65-9.267 9.828 0 6.283 3.861 9.829 9.442 9.829 3.581 0 6.635-1.966 8.319-4.949l-3.931-2.001c-.878 2.105-2.212 2.738-3.896 2.738-2.914 0-4.248-2.422-4.248-5.617 0-3.193 1.124-5.616 4.248-5.616.842 0 2.527.456 3.51 2.563l4.212-2.212z"/><use xlink:href="#aia" transform="translate(18.281)"/></symbol>
 		<symbol viewBox="0 0 34 42" id="cd-icon--education" xmlns="http://www.w3.org/2000/svg"><path d="M33 0h-4v8l-3-1-3 1V0H0v42h33a.98.98 0 001-.95V.95A.98.98 0 0033 0zM6 38.5a.495.495 0 01-.5.5h-2a.495.495 0 01-.5-.5v-35a.495.495 0 01.5-.5h2a.495.495 0 01.5.5zM25.5 23h-13a1.5 1.5 0 010-3h13a1.5 1.5 0 010 3zm0-6h-13a1.5 1.5 0 010-3h13a1.5 1.5 0 010 3z"/></symbol>
 		<symbol fill="#e32700" viewBox="0 0 16 16" id="cd-icon--form-error" xmlns="http://www.w3.org/2000/svg"><path d="M8.002 1a7 7 0 100 14 7 7 0 000-14zm4.025 9.284c.062.063.1.149.1.239a.34.34 0 01-.1.24l-1.262 1.262a.34.34 0 01-.48 0L8.002 9.742l-2.286 2.283a.34.34 0 01-.48 0l-1.261-1.262a.336.336 0 010-.478L6.258 8 3.975 5.716a.34.34 0 010-.48l1.262-1.262a.34.34 0 01.48 0l2.285 2.284 2.283-2.284a.34.34 0 01.48 0l1.262 1.262c.062.063.1.149.1.24a.345.345 0 01-.1.24L9.744 8l2.283 2.284z"/></symbol>
-		<symbol viewBox="0 0 28 48" id="cd-icon--help" xmlns="http://www.w3.org/2000/svg"><circle class="lcls-1" cx="14" cy="44" r="4"/><path class="lcls-1" d="M28 14a14 14 0 00-28 0 4 4 0 008 0 6 6 0 116 6 4 4 0 00-4 4v9a4 4 0 008 0v-5.59A14.02 14.02 0 0028 14z"/></symbol>
-		<symbol viewBox="0 0 41.9 37" id="cd-icon--ocha-logo" xmlns="http://www.w3.org/2000/svg"><path class="mcls-1" d="M17.6 15.6a3.3 3.3 0 113.3 3.3v-.4a2.9 2.9 0 10-2.9-2.9 2.9 2.9 0 002.9 2.9v.4a3.33 3.33 0 01-3.3-3.3"/><path data-name="Shape" class="mcls-1" d="M15 15.6a6 6 0 116 6v-.4a5.6 5.6 0 10-5.6-5.6 5.59 5.59 0 005.6 5.6v.4a6 6 0 01-6-6"/><path data-name="Shape" class="mcls-1" d="M12.1 15.6a8.9 8.9 0 118.9 8.9V24a8.54 8.54 0 008.5-8.4 8.5 8.5 0 10-17 0A8.41 8.41 0 0021 24v.4a8.77 8.77 0 01-8.9-8.8"/><path data-name="Shape" class="mcls-1" d="M9.3 15.6A11.65 11.65 0 1121 27.2v-.4A11.2 11.2 0 109.8 15.6 11.18 11.18 0 0021 26.8v.4A11.63 11.63 0 019.3 15.6"/><path data-name="Shape" class="mcls-1" d="M6.3 15.6A14.7 14.7 0 1121 30.3v-.4A14.3 14.3 0 106.7 15.6 14.3 14.3 0 0021 29.9v.4A14.66 14.66 0 016.3 15.6"/><path class="mcls-1" d="M20.7 1.1h.4v11.4h-.4z"/><path data-name="Shape" class="mcls-1" d="M10.6 5.5l.3-.3 8 8-.3.3-8-8z"/><path data-name="Rectangle-path" class="mcls-1" d="M6.5 15.4h11.4v.4H6.5z"/><path data-name="Shape" class="mcls-1" d="M10.6 25.7l8-8 .3.3-8 8-.3-.3z"/><path data-name="Rectangle-path" class="mcls-1" d="M20.7 18.7h.4v11.4h-.4zM23.014 17.902l.283-.282 7.967 8.014-.284.282zM24.1 15.4h11.4v.4H24.1z"/><path data-name="Shape" class="mcls-1" d="M23 13.2l8.1-8 .2.3-8 8-.3-.3zM18.7 16.5c.1 0 .1.1.1.2h.1a2.51 2.51 0 00.4-.7.1.1 0 00.1-.1c0-.1-.2-.2-.2-.3-.1.2-.3 0-.4.1v.1h.1v.2a.37.37 0 00-.3-.1c.1 0 0 0 0 .1a.75.75 0 00-.5.1c-.1 0-.1 0-.2-.1-.1.1-.1.2-.2.2l-.1-.1c.1-.1.2-.1.2-.2v-.3c.1-.1.1-.2.2-.2s.3.1.4 0l.1.1v.1c-.1.1-.2.1-.2.2s0 .1.1.1.1-.1.2-.1h.4c.1 0 .1-.3 0-.4v-.2c0-.1.2-.1.2 0v.1s0 .1.1 0v-.2a.35.35 0 00.2.1h.2c.1 0 .1-.1 0-.2h-.1a.31.31 0 01-.2.1c-.1 0-.1-.1-.2-.1s-.2.1-.2 0-.1-.1-.1-.2l.1-.1a.37.37 0 00.3-.1.35.35 0 01.1-.2h.1a.37.37 0 00.3-.1c.1 0 .2-.1.3-.2s.1-.1.2-.1a.1.1 0 01.1-.1v-.5a.1.1 0 01.1-.1h-.1s-.1-.1 0-.1.2 0 .2-.1a.19.19 0 00-.1-.3c-.1-.1-.2 0-.3 0a.1.1 0 01-.1.1c-.1 0-.2-.1-.1-.2v-.1h-.1l-.3.3v.1c0 .1 0 .2-.1.2h-.1c0 .1.2.1.1.2s-.2.1-.4.2a2.72 2.72 0 01-.9 0h-.5c-.1 0-.1.1-.2.2v-.2c0-.1-.1 0-.1-.1-.2-.4-.7-.3-1.1-.3a.1.1 0 00-.1.1c-.1.1-.2 0-.3 0l-.1.1c-.1 0-.2-.1-.3 0s-.1.1-.2.1v.1h-.1c-.1 0-.3 0-.3.1s0 .3-.1.3a.6.6 0 00-.4.1c-.1 0-.1.1-.2.1a2.45 2.45 0 00-.4 1.2v.1c-.2.4-.3.6-.6 1.1-.1.2-.2.6 0 .7s0 .2-.2.2-.4 0-.4-.2-.2-.1-.3-.1h-.4c-.2 0-.2.3-.3.4s-.3.1-.3.2v.2a.1.1 0 00-.1.1v.1c0 .2-.1.3 0 .5v.1a.9.9 0 01-.1.5c-.1.2-.3.2-.5.2h-1c-.1 0-.1-.1-.2-.1a.31.31 0 01-.1-.2c-.1-.1-.3 0-.4.1.1 0 0 .1 0 .1s-.2.1-.3.2-.2-.2-.2-.3-.1-.1-.2-.1v.1h-.1c-.1.1.1.1.1.1v.1h-.1a.1.1 0 01-.1.1c-.1 0-.1.1-.1 0v-.2h-.1c0 .1 0 .1-.1.1v.1h.2a.37.37 0 01.1.3c0 .1 0 .2-.1.1s0-.2 0-.3h-.1c.1.2-.1.3.1.5s-.2.2-.1.2a.35.35 0 00.2.1v-.1s.1-.1.1 0v.1H8v.4c0 .1.2 0 .2.1s-.1.1 0 .2a.1.1 0 01.1.1v.1a.1.1 0 01.1.1c.1 0 .1 0 .1-.1s.1-.1.1-.2 0-.1-.1 0V21c0-.1-.1-.1-.1-.2s.1 0 .2-.1a.1.1 0 01.1.1v.1a.1.1 0 01.1.1c.1 0 .1.1.2.2h.3v-.1l.1.1a.37.37 0 00.1.3h.1l.1.1h.1a.1.1 0 01.1.1c.1 0 .2 0 .2.1s.1.2.2.4a29772.51 29772.51 0 01.2.2.37.37 0 00.3.1.35.35 0 01.2-.1h.1c.1.2.1.4.3.4s.1.1.2.2h.2a.1.1 0 00.1.1c.1.1.2.1.2.2v.1c.1 0 .2-.1.2 0s.2.1.2.2h.1v-.1c0-.1.1 0 .2-.1s.1-.2.1-.2.2.1.3.2h.1c.1.1.1.3.2.3s.2.1.4.2.2.1.3.1h.1c.1 0 .1 0 .2-.1s.3-.1.4-.2l.1-.1c.2-.1.5.1.7 0s.1 0 .2-.1.2-.3.1-.4-.2-.5-.3-.7l-.3-.3h-.1c-.1 0-.1-.1-.1-.2a.1.1 0 01-.1-.1v-.3c-.1 0-.2-.1-.4-.1a.1.1 0 01-.1-.1v-.1a.37.37 0 01.3-.1v-.3a.1.1 0 00-.1-.1c0-.1.1-.2 0-.3s-.2-.2-.2-.3a.1.1 0 01-.1-.1v-.5c0-.1-.1-.1 0-.2l.1-.1c.1 0 .1-.1.1-.2a.14.14 0 00-.2 0v-.3l-.1-.1v-.2s0-.1-.1 0v-.2c0-.1-.1-.2-.2-.1a.14.14 0 01-.2 0V18a.1.1 0 00.1-.1.14.14 0 000-.2c-.1-.1-.2-.2-.1-.3-.1 0-.3 0-.3-.2s0-.3-.1-.4v-.3a.1.1 0 01.1-.1c.2 0 .4 0 .4-.1s-.1-.3 0-.3.4 0 .6-.2c.1 0 .1-.1 0-.2a.35.35 0 00-.1-.2c-.1-.1-.2 0-.3-.2V15c0-.1.1-.1.2-.2s.3 0 .5.1l.1.1v.1c0 .2.1.4 0 .6s-.1.1-.1.2h.1c0 .1.1.3 0 .4s-.1 0-.3 0-.1 0-.1.1l.1.1c.4.1.5.1.9.2.1 0 .1.1.2.1h.3a.1.1 0 00.1.1c.1.1.1.3.2.3a.14.14 0 01.2 0c-.1.1 0 .2 0 .3s.2.1.3.2.2.1.2 0-.1-.2 0-.3c.1.2 0 .4.1.6.1.1.1.2.2.2s.1-.1.1-.2v-.1c0-.1 0-.1.1-.2s.1-.2.1-.3v-.1c0-.1.2-.2.3-.2V17c.1 0 0-.2.1-.2s.1-.1.1-.2.1-.1 0-.1c.5.1.5 0 .5 0"/><path data-name="Shape" class="mcls-1" d="M14.5 16.3h-.1v.1l.1.1v.3c0 .1.1.2.2.1s.2-.3.1-.4-.1-.1-.3-.2M14.3 17.2c.1.2.2.1.3.1v-.1c-.1-.1-.1-.1-.3 0 .1-.1 0-.1 0-.1v.1M14.6 17.6c0-.2-.1-.2-.2-.1s0 .3.1.4a.1.1 0 00.1.1c0 .1.1 0 .2 0s0-.1.1-.1c-.1-.1-.2-.3-.3-.3"/><path data-name="Shape" class="mcls-1" d="M14.3 16.8c0-.1-.1-.1 0 0-.1 0-.1 0-.1.1s0 .2.1.2a.1.1 0 00.1-.1c-.1-.1-.1-.1-.1-.2M14.7 17.4l.1-.1h.1v-.1c-.1 0-.1.1-.2.1s0 .1 0 .1M14.6 18.3c0 .1 0 .1.1.1h.1v-.1h-.2M14.8 19c0-.1.1-.1 0-.2h-.1a.35.35 0 00.1.2M8.5 21.5v.1h.2c-.1 0-.1-.2-.2-.1M9.1 22.2c-.1.1.1.2.2.2v-.2a.14.14 0 00-.2 0M9.4 22.6c0 .2.1.3.2.3.1-.2 0-.3-.2-.3M19.5 17.4a1.27 1.27 0 01.6-.1c.4 0 .4-.6.6-.9a.6.6 0 00-.1-.4c-.1-.2-.6 0-.7-.2s.3.1.3-.1 0-.1-.1-.2h-.2a2 2 0 00-.4.8 5.38 5.38 0 00-.9 1.2c0 .1 0 .1.1.2.3.1.6-.2.8-.3M21.3 16.4c-.1 0-.1 0-.2.1v.2h.1c0-.1 0-.1-.1-.1.2-.1.2-.2.2-.2M20 17.9c.1.2.5.1.5 0s-.3-.2-.4-.2.1.1-.1.2M20.5 19.2a.37.37 0 00.1-.3l-.3.3h.2M22.3 16.5v-.1h-.2c-.1 0-.1-.1-.1-.2s-.1-.2-.1-.3-.1.2-.1.2c.2.2.3.5.5.4M19.9 15.3c-.1-.1-.1 0 0 0-.1.1 0 .1 0 0M8.1 19.1A.1.1 0 008 19h-.1v.1a.14.14 0 00.2 0M8.8 19.1c.1 0 .2-.1.1-.2s-.3 0-.2.1c-.1.1 0 .2.1.1M20.2 12.1c0-.1.1-.1.1-.2h-.1c-.1 0-.1.1 0 .2M20.5 12s.1-.1 0-.1h-.1a.1.1 0 00.1.1M19.4 14.6c0 .1.2.3.3.2a.14.14 0 000-.2.19.19 0 00-.3 0M19.7 15.4v-.1h-.3a.1.1 0 00.1.1c0-.1.1 0 .2 0M19.4 15.6c-.1 0 0 .1 0 .2s.1 0 .2-.1.1-.2 0-.2-.2 0-.2.1M19.2 15.3c0 .1-.1.2 0 .3s.1 0 .1 0 0-.2.1-.2h-.1v-.1h-.1M26.8 22.4c.1 0 0-.1 0 0"/><path data-name="Shape" class="mcls-1" d="M21 18.5l-.1-.1c0-.1-.1.1-.2 0 .1.1 0 .1-.1.2a.1.1 0 00.1.1c0 .1-.1.1 0 .2l-.1.1s-.1.1 0 .1.2-.1.3-.1h.1c.1 0 .1-.1.2-.2H21s-.1 0 0-.3M21.6 20.4c0 .1.1.1 0 0 .1 0 .1-.1.1-.2h-.1v.2M21.7 20.2c.1 0 0-.1 0-.1h-.1a.1.1 0 00.1.1M22.3 20.5c-.1 0-.1-.1-.2 0H22v.1c.2-.1.2-.1.3-.1M23.3 20.4v-.1c-.1 0-.2.1-.3 0v.1h-.1c.2.1.3 0 .4 0M23.7 20c0 .2.2.1.2 0s0-.1-.2 0l.1-.1a.1.1 0 01-.1.1M28.5 16.8c0 .1.1.1.2.1a.37.37 0 00.3-.1.27.27 0 00-.3-.3c-.2.1-.2.2-.2.3M28.5 21.9h-.1c-.1.5-.6 1.2 0 1.5.2.2.5-.1.6-.3s0-1-.5-1.2M27 19.7c-.1 0-.1.2 0 .2a.1.1 0 00.1-.1v-.1H27M27.4 24.8v.2s.2-.1 0-.2M29.7 13.1h-.1v.2c-.2.4-.7.9-.4 1.4a1.38 1.38 0 00.3-.4 10.37 10.37 0 00.4-1s-.1-.2-.2-.2M28.8 14.9c0 .1 0 .1.1.1s.1-.1 0-.1 0-.1-.1 0M23.7 11.8c-.1-.2-.2 0-.3 0l-.1-.1h-.1c-.1 0 0 .2.1.2s.1-.1.1 0 0 .3.2.2.2-.1.3-.1.1-.1.1-.2.2-.1.3 0a.1.1 0 00.1.1c0 .1.1.1.2.1a.37.37 0 00.3-.1.19.19 0 000-.3h-.2c-.1 0-.1-.1-.2-.1-.4-.1-.6.2-.8.3M22.7 12h.3c0-.2-.2-.1-.3-.1.1-.1.1 0 0 .1"/><path data-name="Shape" class="mcls-1" d="M23.1 12.6c.1-.1.3-.2.4-.3v-.1c0-.1-.1-.1-.2-.2a.1.1 0 01-.1.1c-.1.1-.2.1-.2.2v.2c.1.3.1.2.1.1M21.6 11.6v.1c.1.1.1 0 0-.1M18 9.4a.6.6 0 00.4.1l.1-.1c-.1-.1-.2 0-.2-.1h-.1c-.1-.1-.2 0-.2.1M27.1 11c0 .1-.1 0-.2.1v.1c.1.1.2 0 .3 0s.1-.1.1 0v.1a.1.1 0 00-.1.1h-.3v.2c-.1.1-.4.2-.3.4a.75.75 0 00.5.1c0-.2.1-.2.2-.3a.1.1 0 00-.1-.1v-.1a.1.1 0 00.1-.1v-.1a.35.35 0 00.2-.1c0-.1-.1-.2-.1-.3a.1.1 0 01.1-.1v-.1h-.1s-.1 0 0 .1a.37.37 0 00-.3.1c0-.2.1 0 0 0M26.1 12c0 .1.1.1.2 0h-.2M27.5 11.8c-.1.1.1.1.2.1 0-.1-.1-.1-.2-.1M27.9 11.3c-.1 0-.1.1 0 0M25.6 7.3c.1.1.2.1.2.2v.4l.1.1v.2c0 .1.1.3.1.4a.1.1 0 01.1.1c0 .1 0 .1.1.2s.1 0 .2.1.2.3.3.4a.1.1 0 01.1.1v.1c.2 0 .5.1.4.4.1-.1.2-.1.2-.2s.1-.3 0-.4l-.2-.2V9a.1.1 0 00-.1-.1c0-.1-.1-.3.1-.3v-.1H27v-.1a.35.35 0 00-.4-.4c-.1-.1-.1-.1-.2-.1h-.2a2.09 2.09 0 01-.4-.6.19.19 0 00-.3 0c.1-.1.1-.1.1 0"/><path data-name="Shape" class="mcls-1" d="M24.7 7.6a.14.14 0 000 .2h.4a.1.1 0 00.1-.1c.1-.1.2 0 .4-.1 0 .1 0 .1.1.1s0-.2-.1-.2-.1-.2-.2-.3h-.1c0 .2-.1.1-.3.2v.1-.1h-.2a.35.35 0 01-.1.2M22.4 3.7c-.1-.2-.3-.4-.2-.7a1.39 1.39 0 00.9 0c.2-.1.5 0 .7-.1v-.2c-.3.1-.5-.2-.7-.1a3.18 3.18 0 01-.9.3c-.2.1-.9 0-.9.4.3 0 .7 0 .9.3 0 .1.1.1.2.1M23.4 5.2a.4.4 0 00.4.2c0-.1 0-.1-.1-.2h-.3M23.1 5.7c-.1 0 0 .1.1.2 0-.1.1-.3-.1-.2M22.9 5.4c.1-.1 0-.2-.1-.2v.1l.1.1M23.8 6.5a.31.31 0 00.1-.2h-.1a.14.14 0 000 .2M24.1 6.5v.1c.1.1.1 0 0-.1.1 0 0 .1 0 0M24 6.8l.1-.1c0-.1-.1-.1-.2 0s.1 0 .1.1M24.1 6.8c0 .1.1.2.2.1s.1-.1 0-.1zM24.6 7a.35.35 0 00-.1-.2s-.1.1 0 .1 0 .1.1.1M24.7 7.3h.1v-.2h-.2v.1l.1.1M24.5 7.5c.1-.1.1-.1 0-.2h-.1a.1.1 0 01-.1.1c.1.1.1.1.2.1M24.2 2.5c-.1-.1-.1-.1-.2-.1.1.1.1.2.2.1M27.6 5c.1.1.2 0 .2.1s.1.2.2.2.1 0 .1-.1 0-.4-.2-.4h-.5c-.1 0-.1.1-.1.2a.19.19 0 01.3 0"/><path data-name="Shape" class="mcls-1" d="M31.7 10.2c-.1-.1-.1-.3-.2-.4s-.2-.1-.3-.2v-.2l-.1-.1c-.1-.2-.1-.3-.3-.3 0-.2-.1-.2-.3-.3v-.1a.1.1 0 00-.1-.1h-.1c-.1-.1-.2-.2-.2-.3s-.2-.2-.3-.3l-.1-.1c-.1 0-.2 0-.2-.1s-.2-.3-.3-.4 0-.4-.1-.7c0-.1-.1-.1-.2-.1a.1.1 0 01-.1-.1c-.1-.1 0-.3-.1-.4s-.3-.3-.4-.5a.37.37 0 00-.3-.1h-.1l-.1-.1c-.1-.1-.2-.2-.3-.2s-.4 0-.6-.1-.4 0-.5.2-.3.2-.5.2 0 .1 0 .2-.2.2-.1.2h.2a.1.1 0 01.1.1c.1.1.2.2.2.3a.14.14 0 000 .2.37.37 0 01.1.3c0 .1.1 0 .1 0a.25.25 0 01.1.4v.3c.1.2.1.4.2.5l.1-.1c.1 0 .1-.1.2-.1.2-.2.4.2.5.3s0 .4.1.6a1.38 1.38 0 00.3.4.31.31 0 00.1.2l.1.1a.1.1 0 01.1-.1h.1c.2.2.2.6.5.6a.1.1 0 00.1.1c.1 0 .1-.1.2 0a.35.35 0 00.1.2h.3c.1 0 .1.1.2.2l.1.1c.2.2.3.5.5.7s.2.2.3.1v-.1a.22.22 0 00.2-.2l.3-.3c.1-.1.2-.1.3-.2.3 0 .2-.2.2-.2M27.5 10.3c0 .1.1.1.2.1s.1.2.2.2.1-.1.1-.2h.1c.1-.1 0-.3-.1-.4s-.1-.2-.3-.2-.1 0-.2.1 0 .2 0 .3v.1M28.2 10.7c-.1.2 0 .4 0 .6s-.2.1-.2.2a.14.14 0 000 .2c0 .1.2.1.3.2a1.17 1.17 0 01.6.6.37.37 0 01.1.3c.1.1.2.1.2.2s.1.1.1 0a.3.3 0 000-.4c-.1-.1-.1-.1-.1-.2a2.35 2.35 0 00-.2-.8l-.3-.3v-.1c0-.1.1-.1.1-.2s-.1-.2-.2-.3c-.2-.1-.3-.1-.4 0M29.7 12.1v-.2c0-.2-.2-.2-.3-.2h-.1v.2a2.93 2.93 0 01.3 1c0 .1.3 0 .3-.1v-.2c0-.1-.1-.1-.1-.2s-.1-.2-.1-.3M29.3 11.2c-.1.1 0 .2 0 .3.1 0 .1 0 .1-.1s0-.1-.1-.2M29.3 11c0-.1 0-.1-.1-.1s-.1.1-.2.1 0 .1.1.2c.2 0 .3-.1.2-.2M28.8 10.5c.1.1 0 .2.1.2s.2.1.3 0 0-.1-.1-.1v-.1H29c-.1-.1.1-.1 0-.2v-.1h-.1v.1c-.1.1-.2.2-.1.2M28.7 9.9c-.1 0-.2 0-.2-.1h-.1s-.1.1 0 .1a.1.1 0 01.1.1c0 .1.1 0 .1.1s.1.1.1 0V10s.1-.1 0-.1M21.6 14.5a.14.14 0 000-.2.1.1 0 00-.1.1c.1 0 .1 0 .1.1"/><path data-name="Shape" class="mcls-1" d="M29.4 13.2a.6.6 0 00-.4.1c-.2.1-.3.4-.4.6a.52.52 0 01-.4.2.1.1 0 01-.1-.1v-.2l.1-.1c.1-.1 0-.2 0-.3s-.3-.4-.5-.3-.3.3-.5.5c-.1-.1-.2-.2-.2-.3v-.1c.1 0 .2.2.2.1s0-.2-.1-.2-.1-.1-.2-.1-.1-.1-.2-.2 0-.3-.1-.3a.37.37 0 01-.3-.1h-.2v-.1c.1 0 .3 0 .2-.2s-.1-.1-.2-.1H26v.3a.37.37 0 01-.3.1h-.1c-.1 0-.2-.1-.3-.1s-.1.2-.2.2-.1 0-.2.1-.1.2 0 .3v.1a.1.1 0 01-.1-.1c0-.1-.1-.2-.1-.3s.1-.2.2-.3v-.2c-.1-.1-.1-.1-.2-.1s-.3.4-.5.3-.2-.2-.3-.2-.1-.1-.2 0a2.19 2.19 0 01-.5.3c-.1.1-.3.2-.3.4a.38.38 0 01-.6.1c-.1-.1-.2-.2-.3-.2s-.2.2-.3.2-.1 0-.2-.1v-.1l.6-.3c.1 0 .1-.1.1-.2V12a.68.68 0 00-.6.4.1.1 0 01-.1.1c-.2 0-.3.1-.5 0l-.1-.2c-.1.1-.1.2-.2.2l-.1.1c-.1.1.1.3 0 .4s-.2.1-.3.1v.2c0 .1.1 0 .1.1s.1.3.2.3.3 0 .5.1.2.1.3.2.1.1.1.2a.1.1 0 00.1.1h.2c.1 0 0 .1.1.2a.76.76 0 00.1.4s0 .2-.1.2a.1.1 0 00-.1.1v.3h.1c.1.1.1.2.2.3l.1.1a.1.1 0 00-.1.1.14.14 0 00.2 0c.1 0 .1-.1.2-.1a.1.1 0 00.1-.1.35.35 0 01.1.2c-.1.1-.3 0-.4.1s-.1 0-.2.1a.1.1 0 00.1.1c.2.1.1.4-.1.6v.2H22c-.2 0-.5-.1-.7 0s-.1.1-.1.2a.1.1 0 00-.1.1v.2c-.2.2-.2.5-.3.7a.1.1 0 00.1.1c.1 0 .1-.1.2-.1s.1.2.1.2.2.1.2 0a.37.37 0 01.1-.3c0-.1-.1-.2-.1-.3s0-.2.1-.2a.1.1 0 01.1.1v.4a.14.14 0 010 .2.1.1 0 01-.1.1v.2c-.1.1-.1.1-.1.2-.2 0-.4-.1-.3-.3-.1 0-.1 0-.2.1v.3c-.1.1-.1.2-.2.3v.1c-.1.1-.2.2-.3.2-.1.1-.2 0-.2.1s.1.2.1.3 0 .1-.1.2h-.4a.37.37 0 01-.1.3c-.1.1 0 .2.1.2s.1.2.2.2.1.1.2.1a.22.22 0 00.2-.2c0-.1.1 0 .2 0h.1a.14.14 0 000-.2l.4-.4c.1 0 .1-.1.2-.1s.1.1.2.1.1.1.2.1h.1c.1 0 .2.2.3.2a.37.37 0 00-.1-.3c-.1-.1-.2-.2-.3-.2v-.1c.1.1.1.1.2.1s.1.2.2.3.1.1.2.1a.37.37 0 00.3-.1c0-.1 0-.1-.1-.1s0-.1.1-.2 0-.2 0-.3v-.1c.1-.1 0-.2 0-.4 0 .1.1.1.2.1a.22.22 0 00.2-.2.19.19 0 01.3.1c0 .1 0 .2-.1.2a.76.76 0 00-.5.2l-.1.1c-.1.1-.1.1-.1.2l-.1.1a.1.1 0 01.1.1.37.37 0 00.3-.1v-.2c.1 0 .1-.1.2-.1s.3.2.2.3h-.1c-.1.1-.2.3-.3.3s-.5.1-.7.2-.1.2-.2.2-.2.1-.3 0c0 .1-.2 0-.3 0a.31.31 0 00-.1-.2h-.1v-.1h-.8a.1.1 0 00-.1.1l-.1.1a.37.37 0 01-.3.1.37.37 0 00-.3.1c-.2 0-.3.2-.4.3a.37.37 0 01-.3.1v.1c-.2 0-.3.3-.4.5v.2c-.1.1-.1.3-.3.4v.1c.1.2.3.3.5.5a.1.1 0 00.1.1c.1.1.1.2.2.4s.3.2.5.2a.35.35 0 01.2.1c.2 0 .5.1.7 0 .3.1.7 0 1 .1.1 0 .1.1.1.2s.2.3.3.4a.6.6 0 00.4.1.31.31 0 00.1.2c0 .1 0 .1.1.2s.1.1.1.2-.1.2-.1.4v.2a2.65 2.65 0 00.6.5s.1 0 0 .1c.1 0 .1.1.2.2s0 .1.1.2l.3.3a.6.6 0 00.4.1.1.1 0 01.1.1c.1 0 .3.1.4 0s.1-.2.2-.2a.6.6 0 01.4-.1.1.1 0 00.1-.1c0-.1.1-.1.1-.2s.2-.1.3-.1.3-.3.5-.4.4-.1.5-.2 0-.4 0-.6.1-.2.1-.3v-.5c0-.1-.1-.2-.1-.3s.1-.1.2-.1.1-.3.2-.4a.1.1 0 00.1-.1c.1 0 0-.1 0-.2a.1.1 0 01-.1-.1 1.21 1.21 0 00-.5-.5.1.1 0 01-.1-.1v-.1c-.1 0 0-.1-.1-.1h.1c.1-.1.1-.3.2-.4a.1.1 0 00.1-.1v-.3c-.1-.1 0-.3 0-.4a2.2 2.2 0 00-.1-.8c0-.1-.1-.1-.2-.1a.1.1 0 01-.1.1.31.31 0 01-.1.2c0 .1-.2.1-.2.2s0 .1-.1.2l-.1.1c.4-.3.3-.3.3-.2h-.3a14.24 14.24 0 00-1.6-.5h.3c.1 0 0-.1 0-.1s.2.1.3.2.5.1.7.2.3.2.5.2.3-.1.4-.1v-.1c.1-.1.2-.2.2-.3v-.3l.1-.1v-.4a.1.1 0 00.1-.1v-.3a.75.75 0 00-.1-.5c0-.1-.1-.1-.2-.1a.1.1 0 01-.1.1c-.1 0-.2 0-.2.1a.1.1 0 00-.1.1.52.52 0 01-.4.2c-.1 0-.2 0-.2-.1s.2-.2.4-.2l.1-.1a.22.22 0 01.2-.2h.2c.1 0 .1-.1.2-.1a.31.31 0 01.1-.2c0-.1.1-.1.2-.2s.1-.4.2-.6 0 .1.1.2a.19.19 0 00.3 0c.1-.1 0-.2.1-.2h.1c.1 0 .1.1.2.1a.35.35 0 01.2-.1h.3c.2-.1.6 0 .6-.2a.86.86 0 00-.6-.7c-.2-.1-.1-.4-.3-.6-.1 0 0-.1-.1-.2l-.1-.1-.1-.1v-.5c0-.1.1-.1.2-.1s.2-.1.2-.2v-.4l.1-.1c.2 0 .5.1.7-.1.1 0 .1-.1.1-.2a1 1 0 00.4-.8c-.1.1 0 .1 0-.1.1.1.1 0 0 0m-4.5 5.4c-.1.1-.1.1-.2 0s-.1-.1-.1-.2-.1 0-.1.1h-.2c0-.1-.1-.1-.1-.2s0-.2.1-.2.1 0 .1.1v.1c.1.1.1 0 .2 0h.3c0 .1.1.2 0 .3M15.6 36c1.3-1.9 5.2-3.9 9-3.9s8 2.2 9.6 1a8.38 8.38 0 01-5.1 1.4c-3.4 0-4.7-1.7-7-1.7s-4.8 1.9-5.9 3.5zM27.7 31.8a5.34 5.34 0 001.7-1.9 14.44 14.44 0 013.7-4.4s-1.7 5.5-3.5 5.7c0 0-.3.2.2.1s2.8-.9 3.6-1.1a8.58 8.58 0 003.3-1.1 1.48 1.48 0 01.8-.4s-2.2 3.7-6.2 3.7a17.1 17.1 0 01-3.6-.6"/><path data-name="Shape" class="mcls-1" d="M32.4 29.9a3.92 3.92 0 00.5-1.7 14.64 14.64 0 012.7-6.3s.3 4.3-1.9 7c0 0-.1.4.1.1a22.93 22.93 0 014.6-3.9s1.5-1.3 1.6-1.7c0-.1-1.2 6.1-7.6 6.5"/><path data-name="Shape" class="mcls-1" d="M36.1 25.8a5.62 5.62 0 00.2-1.3c0-.6-.3-2.6-.3-3.5a7.53 7.53 0 01.8-3.7 4.5 4.5 0 00.2 1.4 12.29 12.29 0 01.5 2.5 10.27 10.27 0 01-.4 2.5 2.13 2.13 0 00.6-.8 12.81 12.81 0 012.2-2.8 5.62 5.62 0 001.4-2.1 6.08 6.08 0 01-1.2 4.1c-1.5 2.1-2.1 1.8-2.9 2.6a11.41 11.41 0 01-1.1 1.1"/><path data-name="Shape" class="mcls-1" d="M38.4 20.9a3.87 3.87 0 00-.3-1.6 10.5 10.5 0 01-1.3-5.9s.2-.2.6 1 1 1.6 1.2 2.8a12 12 0 01.2 1.7s.1.2.1 0a9 9 0 01.8-3.2c.7-1.5 1.6-2.9 1.5-3.9 0 0 .4 0 .3 1.6.1 1.6-.3 4.4-3.1 7.5"/><path data-name="Shape" class="mcls-1" d="M39.2 16.1a12 12 0 00-.8-1.5c-.3-.4-2.7-3.7-2.9-5.3 0 0 .2-.1.4.3a12.94 12.94 0 001.5 1.7 5 5 0 011.5 2.8s.1.1-.1-2.1.7-3.7-.1-5.3c0 0 1.1.2 1.7 4.8a9.68 9.68 0 01-.9 3.6c.1-.1-.2 1-.3 1"/><path data-name="Shape" class="mcls-1" d="M38.3 11a9.94 9.94 0 00-1.6-1.3 9.58 9.58 0 01-3.3-4.3s.1-.2.8.7c.5.7 1.1.4 2.7 2.4 0 0 .2.5.3.4s-.1-.5-.1-.5-.1-1.2-.1-1.6a15.83 15.83 0 00-.9-3.1 5.82 5.82 0 012.5 4.7c-.1 0-.2 2.5-.3 2.6"/><path data-name="Shape" class="mcls-1" d="M36.5 7.3s.1-3-3.8-4.6c0 0 1.4 2.8 2.4 3.5a11.57 11.57 0 011.4 1.1M26.3 36c-1.3-1.9-5.2-3.9-9-3.9s-8 2.2-9.6 1a8.38 8.38 0 005.1 1.4c3.4 0 4.7-1.7 7-1.7s4.8 1.9 5.9 3.5zM14.2 31.8a5.34 5.34 0 01-1.7-1.9 14.44 14.44 0 00-3.7-4.4s1.7 5.5 3.5 5.7c0 0 .3.2-.2.1s-2.8-.9-3.6-1.1a8.58 8.58 0 01-3.3-1.1 1.24 1.24 0 00-.8-.4s2.2 3.7 6.2 3.7a17.1 17.1 0 003.6-.6"/><path data-name="Shape" class="mcls-1" d="M9.5 29.9a3.92 3.92 0 01-.5-1.7 14.64 14.64 0 00-2.7-6.3s-.3 4.3 1.9 7c0 0 .1.4-.1.1a22.93 22.93 0 00-4.6-3.9S2 23.8 1.9 23.4c0-.1 1.2 6.1 7.6 6.5"/><path data-name="Shape" class="mcls-1" d="M5.8 25.8a5.62 5.62 0 01-.2-1.3c0-.6.3-2.6.3-3.5a7.53 7.53 0 00-.8-3.7 4.5 4.5 0 01-.2 1.4 12.29 12.29 0 00-.5 2.5 10.27 10.27 0 00.4 2.5 2.13 2.13 0 01-.6-.8A12.81 12.81 0 002 20.1 5.62 5.62 0 01.6 18a6.08 6.08 0 001.2 4.1c1.5 2.1 2.1 1.8 2.9 2.6.1 0 1 1.1 1.1 1.1"/><path data-name="Shape" class="mcls-1" d="M3.5 20.9a6.93 6.93 0 01.3-1.6 10.5 10.5 0 001.3-5.9s-.2-.2-.6 1-1 1.6-1.2 2.8a8.18 8.18 0 00-.3 1.7s-.1.2-.1 0a9 9 0 00-.8-3.2C1.4 14.2.5 12.8.6 11.8c0 0-.4 0-.3 1.6a11 11 0 003.2 7.5"/><path data-name="Shape" class="mcls-1" d="M2.7 16.1a12 12 0 01.8-1.5c.3-.4 2.7-3.7 2.9-5.3 0 0-.2-.1-.4.3a12.94 12.94 0 01-1.5 1.7A5 5 0 003 14.1s-.1.1.1-2.1-.7-3.7.1-5.3c0 0-1.1.2-1.7 4.8a9.68 9.68 0 00.9 3.6c-.1-.1.2 1 .3 1"/><path data-name="Shape" class="mcls-1" d="M3.6 11a9.94 9.94 0 011.6-1.3 9.58 9.58 0 003.3-4.3s-.1-.2-.8.7c-.5.7-1.1.4-2.7 2.4 0 0-.2.5-.3.4s.1-.5.1-.5a13.88 13.88 0 00.3-1.7A15.83 15.83 0 016 3.6a5.82 5.82 0 00-2.5 4.7 12.21 12.21 0 00.1 2.7"/><path data-name="Shape" class="mcls-1" d="M5.4 7.3s-.1-3 3.8-4.6c0 0-1.4 2.8-2.4 3.5a11.57 11.57 0 00-1.4 1.1"/></symbol>
+		<symbol viewBox="0 0 28 48" id="cd-icon--help" xmlns="http://www.w3.org/2000/svg"><circle class="alcls-1" cx="14" cy="44" r="4"/><path class="alcls-1" d="M28 14a14 14 0 00-28 0 4 4 0 008 0 6 6 0 116 6 4 4 0 00-4 4v9a4 4 0 008 0v-5.59A14.02 14.02 0 0028 14z"/></symbol>
+		<symbol viewBox="0 0 41.9 37" id="cd-icon--ocha-logo" xmlns="http://www.w3.org/2000/svg"><path class="amcls-1" d="M17.6 15.6a3.3 3.3 0 113.3 3.3v-.4a2.9 2.9 0 10-2.9-2.9 2.9 2.9 0 002.9 2.9v.4a3.33 3.33 0 01-3.3-3.3"/><path data-name="Shape" class="amcls-1" d="M15 15.6a6 6 0 116 6v-.4a5.6 5.6 0 10-5.6-5.6 5.59 5.59 0 005.6 5.6v.4a6 6 0 01-6-6"/><path data-name="Shape" class="amcls-1" d="M12.1 15.6a8.9 8.9 0 118.9 8.9V24a8.54 8.54 0 008.5-8.4 8.5 8.5 0 10-17 0A8.41 8.41 0 0021 24v.4a8.77 8.77 0 01-8.9-8.8"/><path data-name="Shape" class="amcls-1" d="M9.3 15.6A11.65 11.65 0 1121 27.2v-.4A11.2 11.2 0 109.8 15.6 11.18 11.18 0 0021 26.8v.4A11.63 11.63 0 019.3 15.6"/><path data-name="Shape" class="amcls-1" d="M6.3 15.6A14.7 14.7 0 1121 30.3v-.4A14.3 14.3 0 106.7 15.6 14.3 14.3 0 0021 29.9v.4A14.66 14.66 0 016.3 15.6"/><path class="amcls-1" d="M20.7 1.1h.4v11.4h-.4z"/><path data-name="Shape" class="amcls-1" d="M10.6 5.5l.3-.3 8 8-.3.3-8-8z"/><path data-name="Rectangle-path" class="amcls-1" d="M6.5 15.4h11.4v.4H6.5z"/><path data-name="Shape" class="amcls-1" d="M10.6 25.7l8-8 .3.3-8 8-.3-.3z"/><path data-name="Rectangle-path" class="amcls-1" d="M20.7 18.7h.4v11.4h-.4zM23.014 17.902l.283-.282 7.967 8.014-.284.282zM24.1 15.4h11.4v.4H24.1z"/><path data-name="Shape" class="amcls-1" d="M23 13.2l8.1-8 .2.3-8 8-.3-.3zM18.7 16.5c.1 0 .1.1.1.2h.1a2.51 2.51 0 00.4-.7.1.1 0 00.1-.1c0-.1-.2-.2-.2-.3-.1.2-.3 0-.4.1v.1h.1v.2a.37.37 0 00-.3-.1c.1 0 0 0 0 .1a.75.75 0 00-.5.1c-.1 0-.1 0-.2-.1-.1.1-.1.2-.2.2l-.1-.1c.1-.1.2-.1.2-.2v-.3c.1-.1.1-.2.2-.2s.3.1.4 0l.1.1v.1c-.1.1-.2.1-.2.2s0 .1.1.1.1-.1.2-.1h.4c.1 0 .1-.3 0-.4v-.2c0-.1.2-.1.2 0v.1s0 .1.1 0v-.2a.35.35 0 00.2.1h.2c.1 0 .1-.1 0-.2h-.1a.31.31 0 01-.2.1c-.1 0-.1-.1-.2-.1s-.2.1-.2 0-.1-.1-.1-.2l.1-.1a.37.37 0 00.3-.1.35.35 0 01.1-.2h.1a.37.37 0 00.3-.1c.1 0 .2-.1.3-.2s.1-.1.2-.1a.1.1 0 01.1-.1v-.5a.1.1 0 01.1-.1h-.1s-.1-.1 0-.1.2 0 .2-.1a.19.19 0 00-.1-.3c-.1-.1-.2 0-.3 0a.1.1 0 01-.1.1c-.1 0-.2-.1-.1-.2v-.1h-.1l-.3.3v.1c0 .1 0 .2-.1.2h-.1c0 .1.2.1.1.2s-.2.1-.4.2a2.72 2.72 0 01-.9 0h-.5c-.1 0-.1.1-.2.2v-.2c0-.1-.1 0-.1-.1-.2-.4-.7-.3-1.1-.3a.1.1 0 00-.1.1c-.1.1-.2 0-.3 0l-.1.1c-.1 0-.2-.1-.3 0s-.1.1-.2.1v.1h-.1c-.1 0-.3 0-.3.1s0 .3-.1.3a.6.6 0 00-.4.1c-.1 0-.1.1-.2.1a2.45 2.45 0 00-.4 1.2v.1c-.2.4-.3.6-.6 1.1-.1.2-.2.6 0 .7s0 .2-.2.2-.4 0-.4-.2-.2-.1-.3-.1h-.4c-.2 0-.2.3-.3.4s-.3.1-.3.2v.2a.1.1 0 00-.1.1v.1c0 .2-.1.3 0 .5v.1a.9.9 0 01-.1.5c-.1.2-.3.2-.5.2h-1c-.1 0-.1-.1-.2-.1a.31.31 0 01-.1-.2c-.1-.1-.3 0-.4.1.1 0 0 .1 0 .1s-.2.1-.3.2-.2-.2-.2-.3-.1-.1-.2-.1v.1h-.1c-.1.1.1.1.1.1v.1h-.1a.1.1 0 01-.1.1c-.1 0-.1.1-.1 0v-.2h-.1c0 .1 0 .1-.1.1v.1h.2a.37.37 0 01.1.3c0 .1 0 .2-.1.1s0-.2 0-.3h-.1c.1.2-.1.3.1.5s-.2.2-.1.2a.35.35 0 00.2.1v-.1s.1-.1.1 0v.1H8v.4c0 .1.2 0 .2.1s-.1.1 0 .2a.1.1 0 01.1.1v.1a.1.1 0 01.1.1c.1 0 .1 0 .1-.1s.1-.1.1-.2 0-.1-.1 0V21c0-.1-.1-.1-.1-.2s.1 0 .2-.1a.1.1 0 01.1.1v.1a.1.1 0 01.1.1c.1 0 .1.1.2.2h.3v-.1l.1.1a.37.37 0 00.1.3h.1l.1.1h.1a.1.1 0 01.1.1c.1 0 .2 0 .2.1s.1.2.2.4a29772.51 29772.51 0 01.2.2.37.37 0 00.3.1.35.35 0 01.2-.1h.1c.1.2.1.4.3.4s.1.1.2.2h.2a.1.1 0 00.1.1c.1.1.2.1.2.2v.1c.1 0 .2-.1.2 0s.2.1.2.2h.1v-.1c0-.1.1 0 .2-.1s.1-.2.1-.2.2.1.3.2h.1c.1.1.1.3.2.3s.2.1.4.2.2.1.3.1h.1c.1 0 .1 0 .2-.1s.3-.1.4-.2l.1-.1c.2-.1.5.1.7 0s.1 0 .2-.1.2-.3.1-.4-.2-.5-.3-.7l-.3-.3h-.1c-.1 0-.1-.1-.1-.2a.1.1 0 01-.1-.1v-.3c-.1 0-.2-.1-.4-.1a.1.1 0 01-.1-.1v-.1a.37.37 0 01.3-.1v-.3a.1.1 0 00-.1-.1c0-.1.1-.2 0-.3s-.2-.2-.2-.3a.1.1 0 01-.1-.1v-.5c0-.1-.1-.1 0-.2l.1-.1c.1 0 .1-.1.1-.2a.14.14 0 00-.2 0v-.3l-.1-.1v-.2s0-.1-.1 0v-.2c0-.1-.1-.2-.2-.1a.14.14 0 01-.2 0V18a.1.1 0 00.1-.1.14.14 0 000-.2c-.1-.1-.2-.2-.1-.3-.1 0-.3 0-.3-.2s0-.3-.1-.4v-.3a.1.1 0 01.1-.1c.2 0 .4 0 .4-.1s-.1-.3 0-.3.4 0 .6-.2c.1 0 .1-.1 0-.2a.35.35 0 00-.1-.2c-.1-.1-.2 0-.3-.2V15c0-.1.1-.1.2-.2s.3 0 .5.1l.1.1v.1c0 .2.1.4 0 .6s-.1.1-.1.2h.1c0 .1.1.3 0 .4s-.1 0-.3 0-.1 0-.1.1l.1.1c.4.1.5.1.9.2.1 0 .1.1.2.1h.3a.1.1 0 00.1.1c.1.1.1.3.2.3a.14.14 0 01.2 0c-.1.1 0 .2 0 .3s.2.1.3.2.2.1.2 0-.1-.2 0-.3c.1.2 0 .4.1.6.1.1.1.2.2.2s.1-.1.1-.2v-.1c0-.1 0-.1.1-.2s.1-.2.1-.3v-.1c0-.1.2-.2.3-.2V17c.1 0 0-.2.1-.2s.1-.1.1-.2.1-.1 0-.1c.5.1.5 0 .5 0"/><path data-name="Shape" class="amcls-1" d="M14.5 16.3h-.1v.1l.1.1v.3c0 .1.1.2.2.1s.2-.3.1-.4-.1-.1-.3-.2M14.3 17.2c.1.2.2.1.3.1v-.1c-.1-.1-.1-.1-.3 0 .1-.1 0-.1 0-.1v.1M14.6 17.6c0-.2-.1-.2-.2-.1s0 .3.1.4a.1.1 0 00.1.1c0 .1.1 0 .2 0s0-.1.1-.1c-.1-.1-.2-.3-.3-.3"/><path data-name="Shape" class="amcls-1" d="M14.3 16.8c0-.1-.1-.1 0 0-.1 0-.1 0-.1.1s0 .2.1.2a.1.1 0 00.1-.1c-.1-.1-.1-.1-.1-.2M14.7 17.4l.1-.1h.1v-.1c-.1 0-.1.1-.2.1s0 .1 0 .1M14.6 18.3c0 .1 0 .1.1.1h.1v-.1h-.2M14.8 19c0-.1.1-.1 0-.2h-.1a.35.35 0 00.1.2M8.5 21.5v.1h.2c-.1 0-.1-.2-.2-.1M9.1 22.2c-.1.1.1.2.2.2v-.2a.14.14 0 00-.2 0M9.4 22.6c0 .2.1.3.2.3.1-.2 0-.3-.2-.3M19.5 17.4a1.27 1.27 0 01.6-.1c.4 0 .4-.6.6-.9a.6.6 0 00-.1-.4c-.1-.2-.6 0-.7-.2s.3.1.3-.1 0-.1-.1-.2h-.2a2 2 0 00-.4.8 5.38 5.38 0 00-.9 1.2c0 .1 0 .1.1.2.3.1.6-.2.8-.3M21.3 16.4c-.1 0-.1 0-.2.1v.2h.1c0-.1 0-.1-.1-.1.2-.1.2-.2.2-.2M20 17.9c.1.2.5.1.5 0s-.3-.2-.4-.2.1.1-.1.2M20.5 19.2a.37.37 0 00.1-.3l-.3.3h.2M22.3 16.5v-.1h-.2c-.1 0-.1-.1-.1-.2s-.1-.2-.1-.3-.1.2-.1.2c.2.2.3.5.5.4M19.9 15.3c-.1-.1-.1 0 0 0-.1.1 0 .1 0 0M8.1 19.1A.1.1 0 008 19h-.1v.1a.14.14 0 00.2 0M8.8 19.1c.1 0 .2-.1.1-.2s-.3 0-.2.1c-.1.1 0 .2.1.1M20.2 12.1c0-.1.1-.1.1-.2h-.1c-.1 0-.1.1 0 .2M20.5 12s.1-.1 0-.1h-.1a.1.1 0 00.1.1M19.4 14.6c0 .1.2.3.3.2a.14.14 0 000-.2.19.19 0 00-.3 0M19.7 15.4v-.1h-.3a.1.1 0 00.1.1c0-.1.1 0 .2 0M19.4 15.6c-.1 0 0 .1 0 .2s.1 0 .2-.1.1-.2 0-.2-.2 0-.2.1M19.2 15.3c0 .1-.1.2 0 .3s.1 0 .1 0 0-.2.1-.2h-.1v-.1h-.1M26.8 22.4c.1 0 0-.1 0 0"/><path data-name="Shape" class="amcls-1" d="M21 18.5l-.1-.1c0-.1-.1.1-.2 0 .1.1 0 .1-.1.2a.1.1 0 00.1.1c0 .1-.1.1 0 .2l-.1.1s-.1.1 0 .1.2-.1.3-.1h.1c.1 0 .1-.1.2-.2H21s-.1 0 0-.3M21.6 20.4c0 .1.1.1 0 0 .1 0 .1-.1.1-.2h-.1v.2M21.7 20.2c.1 0 0-.1 0-.1h-.1a.1.1 0 00.1.1M22.3 20.5c-.1 0-.1-.1-.2 0H22v.1c.2-.1.2-.1.3-.1M23.3 20.4v-.1c-.1 0-.2.1-.3 0v.1h-.1c.2.1.3 0 .4 0M23.7 20c0 .2.2.1.2 0s0-.1-.2 0l.1-.1a.1.1 0 01-.1.1M28.5 16.8c0 .1.1.1.2.1a.37.37 0 00.3-.1.27.27 0 00-.3-.3c-.2.1-.2.2-.2.3M28.5 21.9h-.1c-.1.5-.6 1.2 0 1.5.2.2.5-.1.6-.3s0-1-.5-1.2M27 19.7c-.1 0-.1.2 0 .2a.1.1 0 00.1-.1v-.1H27M27.4 24.8v.2s.2-.1 0-.2M29.7 13.1h-.1v.2c-.2.4-.7.9-.4 1.4a1.38 1.38 0 00.3-.4 10.37 10.37 0 00.4-1s-.1-.2-.2-.2M28.8 14.9c0 .1 0 .1.1.1s.1-.1 0-.1 0-.1-.1 0M23.7 11.8c-.1-.2-.2 0-.3 0l-.1-.1h-.1c-.1 0 0 .2.1.2s.1-.1.1 0 0 .3.2.2.2-.1.3-.1.1-.1.1-.2.2-.1.3 0a.1.1 0 00.1.1c0 .1.1.1.2.1a.37.37 0 00.3-.1.19.19 0 000-.3h-.2c-.1 0-.1-.1-.2-.1-.4-.1-.6.2-.8.3M22.7 12h.3c0-.2-.2-.1-.3-.1.1-.1.1 0 0 .1"/><path data-name="Shape" class="amcls-1" d="M23.1 12.6c.1-.1.3-.2.4-.3v-.1c0-.1-.1-.1-.2-.2a.1.1 0 01-.1.1c-.1.1-.2.1-.2.2v.2c.1.3.1.2.1.1M21.6 11.6v.1c.1.1.1 0 0-.1M18 9.4a.6.6 0 00.4.1l.1-.1c-.1-.1-.2 0-.2-.1h-.1c-.1-.1-.2 0-.2.1M27.1 11c0 .1-.1 0-.2.1v.1c.1.1.2 0 .3 0s.1-.1.1 0v.1a.1.1 0 00-.1.1h-.3v.2c-.1.1-.4.2-.3.4a.75.75 0 00.5.1c0-.2.1-.2.2-.3a.1.1 0 00-.1-.1v-.1a.1.1 0 00.1-.1v-.1a.35.35 0 00.2-.1c0-.1-.1-.2-.1-.3a.1.1 0 01.1-.1v-.1h-.1s-.1 0 0 .1a.37.37 0 00-.3.1c0-.2.1 0 0 0M26.1 12c0 .1.1.1.2 0h-.2M27.5 11.8c-.1.1.1.1.2.1 0-.1-.1-.1-.2-.1M27.9 11.3c-.1 0-.1.1 0 0M25.6 7.3c.1.1.2.1.2.2v.4l.1.1v.2c0 .1.1.3.1.4a.1.1 0 01.1.1c0 .1 0 .1.1.2s.1 0 .2.1.2.3.3.4a.1.1 0 01.1.1v.1c.2 0 .5.1.4.4.1-.1.2-.1.2-.2s.1-.3 0-.4l-.2-.2V9a.1.1 0 00-.1-.1c0-.1-.1-.3.1-.3v-.1H27v-.1a.35.35 0 00-.4-.4c-.1-.1-.1-.1-.2-.1h-.2a2.09 2.09 0 01-.4-.6.19.19 0 00-.3 0c.1-.1.1-.1.1 0"/><path data-name="Shape" class="amcls-1" d="M24.7 7.6a.14.14 0 000 .2h.4a.1.1 0 00.1-.1c.1-.1.2 0 .4-.1 0 .1 0 .1.1.1s0-.2-.1-.2-.1-.2-.2-.3h-.1c0 .2-.1.1-.3.2v.1-.1h-.2a.35.35 0 01-.1.2M22.4 3.7c-.1-.2-.3-.4-.2-.7a1.39 1.39 0 00.9 0c.2-.1.5 0 .7-.1v-.2c-.3.1-.5-.2-.7-.1a3.18 3.18 0 01-.9.3c-.2.1-.9 0-.9.4.3 0 .7 0 .9.3 0 .1.1.1.2.1M23.4 5.2a.4.4 0 00.4.2c0-.1 0-.1-.1-.2h-.3M23.1 5.7c-.1 0 0 .1.1.2 0-.1.1-.3-.1-.2M22.9 5.4c.1-.1 0-.2-.1-.2v.1l.1.1M23.8 6.5a.31.31 0 00.1-.2h-.1a.14.14 0 000 .2M24.1 6.5v.1c.1.1.1 0 0-.1.1 0 0 .1 0 0M24 6.8l.1-.1c0-.1-.1-.1-.2 0s.1 0 .1.1M24.1 6.8c0 .1.1.2.2.1s.1-.1 0-.1zM24.6 7a.35.35 0 00-.1-.2s-.1.1 0 .1 0 .1.1.1M24.7 7.3h.1v-.2h-.2v.1l.1.1M24.5 7.5c.1-.1.1-.1 0-.2h-.1a.1.1 0 01-.1.1c.1.1.1.1.2.1M24.2 2.5c-.1-.1-.1-.1-.2-.1.1.1.1.2.2.1M27.6 5c.1.1.2 0 .2.1s.1.2.2.2.1 0 .1-.1 0-.4-.2-.4h-.5c-.1 0-.1.1-.1.2a.19.19 0 01.3 0"/><path data-name="Shape" class="amcls-1" d="M31.7 10.2c-.1-.1-.1-.3-.2-.4s-.2-.1-.3-.2v-.2l-.1-.1c-.1-.2-.1-.3-.3-.3 0-.2-.1-.2-.3-.3v-.1a.1.1 0 00-.1-.1h-.1c-.1-.1-.2-.2-.2-.3s-.2-.2-.3-.3l-.1-.1c-.1 0-.2 0-.2-.1s-.2-.3-.3-.4 0-.4-.1-.7c0-.1-.1-.1-.2-.1a.1.1 0 01-.1-.1c-.1-.1 0-.3-.1-.4s-.3-.3-.4-.5a.37.37 0 00-.3-.1h-.1l-.1-.1c-.1-.1-.2-.2-.3-.2s-.4 0-.6-.1-.4 0-.5.2-.3.2-.5.2 0 .1 0 .2-.2.2-.1.2h.2a.1.1 0 01.1.1c.1.1.2.2.2.3a.14.14 0 000 .2.37.37 0 01.1.3c0 .1.1 0 .1 0a.25.25 0 01.1.4v.3c.1.2.1.4.2.5l.1-.1c.1 0 .1-.1.2-.1.2-.2.4.2.5.3s0 .4.1.6a1.38 1.38 0 00.3.4.31.31 0 00.1.2l.1.1a.1.1 0 01.1-.1h.1c.2.2.2.6.5.6a.1.1 0 00.1.1c.1 0 .1-.1.2 0a.35.35 0 00.1.2h.3c.1 0 .1.1.2.2l.1.1c.2.2.3.5.5.7s.2.2.3.1v-.1a.22.22 0 00.2-.2l.3-.3c.1-.1.2-.1.3-.2.3 0 .2-.2.2-.2M27.5 10.3c0 .1.1.1.2.1s.1.2.2.2.1-.1.1-.2h.1c.1-.1 0-.3-.1-.4s-.1-.2-.3-.2-.1 0-.2.1 0 .2 0 .3v.1M28.2 10.7c-.1.2 0 .4 0 .6s-.2.1-.2.2a.14.14 0 000 .2c0 .1.2.1.3.2a1.17 1.17 0 01.6.6.37.37 0 01.1.3c.1.1.2.1.2.2s.1.1.1 0a.3.3 0 000-.4c-.1-.1-.1-.1-.1-.2a2.35 2.35 0 00-.2-.8l-.3-.3v-.1c0-.1.1-.1.1-.2s-.1-.2-.2-.3c-.2-.1-.3-.1-.4 0M29.7 12.1v-.2c0-.2-.2-.2-.3-.2h-.1v.2a2.93 2.93 0 01.3 1c0 .1.3 0 .3-.1v-.2c0-.1-.1-.1-.1-.2s-.1-.2-.1-.3M29.3 11.2c-.1.1 0 .2 0 .3.1 0 .1 0 .1-.1s0-.1-.1-.2M29.3 11c0-.1 0-.1-.1-.1s-.1.1-.2.1 0 .1.1.2c.2 0 .3-.1.2-.2M28.8 10.5c.1.1 0 .2.1.2s.2.1.3 0 0-.1-.1-.1v-.1H29c-.1-.1.1-.1 0-.2v-.1h-.1v.1c-.1.1-.2.2-.1.2M28.7 9.9c-.1 0-.2 0-.2-.1h-.1s-.1.1 0 .1a.1.1 0 01.1.1c0 .1.1 0 .1.1s.1.1.1 0V10s.1-.1 0-.1M21.6 14.5a.14.14 0 000-.2.1.1 0 00-.1.1c.1 0 .1 0 .1.1"/><path data-name="Shape" class="amcls-1" d="M29.4 13.2a.6.6 0 00-.4.1c-.2.1-.3.4-.4.6a.52.52 0 01-.4.2.1.1 0 01-.1-.1v-.2l.1-.1c.1-.1 0-.2 0-.3s-.3-.4-.5-.3-.3.3-.5.5c-.1-.1-.2-.2-.2-.3v-.1c.1 0 .2.2.2.1s0-.2-.1-.2-.1-.1-.2-.1-.1-.1-.2-.2 0-.3-.1-.3a.37.37 0 01-.3-.1h-.2v-.1c.1 0 .3 0 .2-.2s-.1-.1-.2-.1H26v.3a.37.37 0 01-.3.1h-.1c-.1 0-.2-.1-.3-.1s-.1.2-.2.2-.1 0-.2.1-.1.2 0 .3v.1a.1.1 0 01-.1-.1c0-.1-.1-.2-.1-.3s.1-.2.2-.3v-.2c-.1-.1-.1-.1-.2-.1s-.3.4-.5.3-.2-.2-.3-.2-.1-.1-.2 0a2.19 2.19 0 01-.5.3c-.1.1-.3.2-.3.4a.38.38 0 01-.6.1c-.1-.1-.2-.2-.3-.2s-.2.2-.3.2-.1 0-.2-.1v-.1l.6-.3c.1 0 .1-.1.1-.2V12a.68.68 0 00-.6.4.1.1 0 01-.1.1c-.2 0-.3.1-.5 0l-.1-.2c-.1.1-.1.2-.2.2l-.1.1c-.1.1.1.3 0 .4s-.2.1-.3.1v.2c0 .1.1 0 .1.1s.1.3.2.3.3 0 .5.1.2.1.3.2.1.1.1.2a.1.1 0 00.1.1h.2c.1 0 0 .1.1.2a.76.76 0 00.1.4s0 .2-.1.2a.1.1 0 00-.1.1v.3h.1c.1.1.1.2.2.3l.1.1a.1.1 0 00-.1.1.14.14 0 00.2 0c.1 0 .1-.1.2-.1a.1.1 0 00.1-.1.35.35 0 01.1.2c-.1.1-.3 0-.4.1s-.1 0-.2.1a.1.1 0 00.1.1c.2.1.1.4-.1.6v.2H22c-.2 0-.5-.1-.7 0s-.1.1-.1.2a.1.1 0 00-.1.1v.2c-.2.2-.2.5-.3.7a.1.1 0 00.1.1c.1 0 .1-.1.2-.1s.1.2.1.2.2.1.2 0a.37.37 0 01.1-.3c0-.1-.1-.2-.1-.3s0-.2.1-.2a.1.1 0 01.1.1v.4a.14.14 0 010 .2.1.1 0 01-.1.1v.2c-.1.1-.1.1-.1.2-.2 0-.4-.1-.3-.3-.1 0-.1 0-.2.1v.3c-.1.1-.1.2-.2.3v.1c-.1.1-.2.2-.3.2-.1.1-.2 0-.2.1s.1.2.1.3 0 .1-.1.2h-.4a.37.37 0 01-.1.3c-.1.1 0 .2.1.2s.1.2.2.2.1.1.2.1a.22.22 0 00.2-.2c0-.1.1 0 .2 0h.1a.14.14 0 000-.2l.4-.4c.1 0 .1-.1.2-.1s.1.1.2.1.1.1.2.1h.1c.1 0 .2.2.3.2a.37.37 0 00-.1-.3c-.1-.1-.2-.2-.3-.2v-.1c.1.1.1.1.2.1s.1.2.2.3.1.1.2.1a.37.37 0 00.3-.1c0-.1 0-.1-.1-.1s0-.1.1-.2 0-.2 0-.3v-.1c.1-.1 0-.2 0-.4 0 .1.1.1.2.1a.22.22 0 00.2-.2.19.19 0 01.3.1c0 .1 0 .2-.1.2a.76.76 0 00-.5.2l-.1.1c-.1.1-.1.1-.1.2l-.1.1a.1.1 0 01.1.1.37.37 0 00.3-.1v-.2c.1 0 .1-.1.2-.1s.3.2.2.3h-.1c-.1.1-.2.3-.3.3s-.5.1-.7.2-.1.2-.2.2-.2.1-.3 0c0 .1-.2 0-.3 0a.31.31 0 00-.1-.2h-.1v-.1h-.8a.1.1 0 00-.1.1l-.1.1a.37.37 0 01-.3.1.37.37 0 00-.3.1c-.2 0-.3.2-.4.3a.37.37 0 01-.3.1v.1c-.2 0-.3.3-.4.5v.2c-.1.1-.1.3-.3.4v.1c.1.2.3.3.5.5a.1.1 0 00.1.1c.1.1.1.2.2.4s.3.2.5.2a.35.35 0 01.2.1c.2 0 .5.1.7 0 .3.1.7 0 1 .1.1 0 .1.1.1.2s.2.3.3.4a.6.6 0 00.4.1.31.31 0 00.1.2c0 .1 0 .1.1.2s.1.1.1.2-.1.2-.1.4v.2a2.65 2.65 0 00.6.5s.1 0 0 .1c.1 0 .1.1.2.2s0 .1.1.2l.3.3a.6.6 0 00.4.1.1.1 0 01.1.1c.1 0 .3.1.4 0s.1-.2.2-.2a.6.6 0 01.4-.1.1.1 0 00.1-.1c0-.1.1-.1.1-.2s.2-.1.3-.1.3-.3.5-.4.4-.1.5-.2 0-.4 0-.6.1-.2.1-.3v-.5c0-.1-.1-.2-.1-.3s.1-.1.2-.1.1-.3.2-.4a.1.1 0 00.1-.1c.1 0 0-.1 0-.2a.1.1 0 01-.1-.1 1.21 1.21 0 00-.5-.5.1.1 0 01-.1-.1v-.1c-.1 0 0-.1-.1-.1h.1c.1-.1.1-.3.2-.4a.1.1 0 00.1-.1v-.3c-.1-.1 0-.3 0-.4a2.2 2.2 0 00-.1-.8c0-.1-.1-.1-.2-.1a.1.1 0 01-.1.1.31.31 0 01-.1.2c0 .1-.2.1-.2.2s0 .1-.1.2l-.1.1c.4-.3.3-.3.3-.2h-.3a14.24 14.24 0 00-1.6-.5h.3c.1 0 0-.1 0-.1s.2.1.3.2.5.1.7.2.3.2.5.2.3-.1.4-.1v-.1c.1-.1.2-.2.2-.3v-.3l.1-.1v-.4a.1.1 0 00.1-.1v-.3a.75.75 0 00-.1-.5c0-.1-.1-.1-.2-.1a.1.1 0 01-.1.1c-.1 0-.2 0-.2.1a.1.1 0 00-.1.1.52.52 0 01-.4.2c-.1 0-.2 0-.2-.1s.2-.2.4-.2l.1-.1a.22.22 0 01.2-.2h.2c.1 0 .1-.1.2-.1a.31.31 0 01.1-.2c0-.1.1-.1.2-.2s.1-.4.2-.6 0 .1.1.2a.19.19 0 00.3 0c.1-.1 0-.2.1-.2h.1c.1 0 .1.1.2.1a.35.35 0 01.2-.1h.3c.2-.1.6 0 .6-.2a.86.86 0 00-.6-.7c-.2-.1-.1-.4-.3-.6-.1 0 0-.1-.1-.2l-.1-.1-.1-.1v-.5c0-.1.1-.1.2-.1s.2-.1.2-.2v-.4l.1-.1c.2 0 .5.1.7-.1.1 0 .1-.1.1-.2a1 1 0 00.4-.8c-.1.1 0 .1 0-.1.1.1.1 0 0 0m-4.5 5.4c-.1.1-.1.1-.2 0s-.1-.1-.1-.2-.1 0-.1.1h-.2c0-.1-.1-.1-.1-.2s0-.2.1-.2.1 0 .1.1v.1c.1.1.1 0 .2 0h.3c0 .1.1.2 0 .3M15.6 36c1.3-1.9 5.2-3.9 9-3.9s8 2.2 9.6 1a8.38 8.38 0 01-5.1 1.4c-3.4 0-4.7-1.7-7-1.7s-4.8 1.9-5.9 3.5zM27.7 31.8a5.34 5.34 0 001.7-1.9 14.44 14.44 0 013.7-4.4s-1.7 5.5-3.5 5.7c0 0-.3.2.2.1s2.8-.9 3.6-1.1a8.58 8.58 0 003.3-1.1 1.48 1.48 0 01.8-.4s-2.2 3.7-6.2 3.7a17.1 17.1 0 01-3.6-.6"/><path data-name="Shape" class="amcls-1" d="M32.4 29.9a3.92 3.92 0 00.5-1.7 14.64 14.64 0 012.7-6.3s.3 4.3-1.9 7c0 0-.1.4.1.1a22.93 22.93 0 014.6-3.9s1.5-1.3 1.6-1.7c0-.1-1.2 6.1-7.6 6.5"/><path data-name="Shape" class="amcls-1" d="M36.1 25.8a5.62 5.62 0 00.2-1.3c0-.6-.3-2.6-.3-3.5a7.53 7.53 0 01.8-3.7 4.5 4.5 0 00.2 1.4 12.29 12.29 0 01.5 2.5 10.27 10.27 0 01-.4 2.5 2.13 2.13 0 00.6-.8 12.81 12.81 0 012.2-2.8 5.62 5.62 0 001.4-2.1 6.08 6.08 0 01-1.2 4.1c-1.5 2.1-2.1 1.8-2.9 2.6a11.41 11.41 0 01-1.1 1.1"/><path data-name="Shape" class="amcls-1" d="M38.4 20.9a3.87 3.87 0 00-.3-1.6 10.5 10.5 0 01-1.3-5.9s.2-.2.6 1 1 1.6 1.2 2.8a12 12 0 01.2 1.7s.1.2.1 0a9 9 0 01.8-3.2c.7-1.5 1.6-2.9 1.5-3.9 0 0 .4 0 .3 1.6.1 1.6-.3 4.4-3.1 7.5"/><path data-name="Shape" class="amcls-1" d="M39.2 16.1a12 12 0 00-.8-1.5c-.3-.4-2.7-3.7-2.9-5.3 0 0 .2-.1.4.3a12.94 12.94 0 001.5 1.7 5 5 0 011.5 2.8s.1.1-.1-2.1.7-3.7-.1-5.3c0 0 1.1.2 1.7 4.8a9.68 9.68 0 01-.9 3.6c.1-.1-.2 1-.3 1"/><path data-name="Shape" class="amcls-1" d="M38.3 11a9.94 9.94 0 00-1.6-1.3 9.58 9.58 0 01-3.3-4.3s.1-.2.8.7c.5.7 1.1.4 2.7 2.4 0 0 .2.5.3.4s-.1-.5-.1-.5-.1-1.2-.1-1.6a15.83 15.83 0 00-.9-3.1 5.82 5.82 0 012.5 4.7c-.1 0-.2 2.5-.3 2.6"/><path data-name="Shape" class="amcls-1" d="M36.5 7.3s.1-3-3.8-4.6c0 0 1.4 2.8 2.4 3.5a11.57 11.57 0 011.4 1.1M26.3 36c-1.3-1.9-5.2-3.9-9-3.9s-8 2.2-9.6 1a8.38 8.38 0 005.1 1.4c3.4 0 4.7-1.7 7-1.7s4.8 1.9 5.9 3.5zM14.2 31.8a5.34 5.34 0 01-1.7-1.9 14.44 14.44 0 00-3.7-4.4s1.7 5.5 3.5 5.7c0 0 .3.2-.2.1s-2.8-.9-3.6-1.1a8.58 8.58 0 01-3.3-1.1 1.24 1.24 0 00-.8-.4s2.2 3.7 6.2 3.7a17.1 17.1 0 003.6-.6"/><path data-name="Shape" class="amcls-1" d="M9.5 29.9a3.92 3.92 0 01-.5-1.7 14.64 14.64 0 00-2.7-6.3s-.3 4.3 1.9 7c0 0 .1.4-.1.1a22.93 22.93 0 00-4.6-3.9S2 23.8 1.9 23.4c0-.1 1.2 6.1 7.6 6.5"/><path data-name="Shape" class="amcls-1" d="M5.8 25.8a5.62 5.62 0 01-.2-1.3c0-.6.3-2.6.3-3.5a7.53 7.53 0 00-.8-3.7 4.5 4.5 0 01-.2 1.4 12.29 12.29 0 00-.5 2.5 10.27 10.27 0 00.4 2.5 2.13 2.13 0 01-.6-.8A12.81 12.81 0 002 20.1 5.62 5.62 0 01.6 18a6.08 6.08 0 001.2 4.1c1.5 2.1 2.1 1.8 2.9 2.6.1 0 1 1.1 1.1 1.1"/><path data-name="Shape" class="amcls-1" d="M3.5 20.9a6.93 6.93 0 01.3-1.6 10.5 10.5 0 001.3-5.9s-.2-.2-.6 1-1 1.6-1.2 2.8a8.18 8.18 0 00-.3 1.7s-.1.2-.1 0a9 9 0 00-.8-3.2C1.4 14.2.5 12.8.6 11.8c0 0-.4 0-.3 1.6a11 11 0 003.2 7.5"/><path data-name="Shape" class="amcls-1" d="M2.7 16.1a12 12 0 01.8-1.5c.3-.4 2.7-3.7 2.9-5.3 0 0-.2-.1-.4.3a12.94 12.94 0 01-1.5 1.7A5 5 0 003 14.1s-.1.1.1-2.1-.7-3.7.1-5.3c0 0-1.1.2-1.7 4.8a9.68 9.68 0 00.9 3.6c-.1-.1.2 1 .3 1"/><path data-name="Shape" class="amcls-1" d="M3.6 11a9.94 9.94 0 011.6-1.3 9.58 9.58 0 003.3-4.3s-.1-.2-.8.7c-.5.7-1.1.4-2.7 2.4 0 0-.2.5-.3.4s.1-.5.1-.5a13.88 13.88 0 00.3-1.7A15.83 15.83 0 016 3.6a5.82 5.82 0 00-2.5 4.7 12.21 12.21 0 00.1 2.7"/><path data-name="Shape" class="amcls-1" d="M5.4 7.3s-.1-3 3.8-4.6c0 0-1.4 2.8-2.4 3.5a11.57 11.57 0 00-1.4 1.1"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--search" xmlns="http://www.w3.org/2000/svg"><path d="M46.829 41.172L38.4 32.744a21.018 21.018 0 10-5.657 5.657l8.427 8.427a4 4 0 005.658-5.656zM8 21a13 13 0 1122.325 9.046c-.05.045-.106.078-.154.126s-.08.104-.125.154A12.992 12.992 0 018 21z"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--selected" xmlns="http://www.w3.org/2000/svg"><path d="M18.5 39.75a4 4 0 01-2.83-1.17l-12.5-12.5a4 4 0 015.66-5.66l9.67 9.67L39.17 9.42a4 4 0 015.66 5.66l-23.5 23.5a4 4 0 01-2.83 1.17z"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--selected--highlighted" xmlns="http://www.w3.org/2000/svg"><path fill="#80CBFF" d="M18.5 39.75a4 4 0 01-2.83-1.17l-12.5-12.5a4 4 0 015.66-5.66l9.67 9.67L39.17 9.42a4 4 0 015.66 5.66l-23.5 23.5a4 4 0 01-2.83 1.17z"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--sm-fb-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><path d="M29.16 13h-3.52c-2.09 0-4.41.88-4.41 3.9v3.2h-2.41v3.84h2.49V35h4.57V23.87h3l.27-3.78h-3.34v-2.17c0-1.2 1.24-1.13 1.32-1.13h2V13z"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--sm-fb-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm4.9 21.87h-3V35h-4.59V23.94h-2.49V20.1h2.41v-3.2c0-3 2.32-3.9 4.41-3.9h3.52v3.79h-2c-.07 0-1.32-.07-1.32 1.13v2.17h3.37z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--sm-ig-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm0 41a19 19 0 1119-19 19 19 0 01-19 19z"/><path d="M24 18.09A5.91 5.91 0 1029.91 24 5.9 5.9 0 0024 18.09zm0 9.74A3.83 3.83 0 1127.83 24 3.83 3.83 0 0124 27.83z"/><circle cx="30.14" cy="17.86" r="1.38"/><path d="M34.9 16.47a5.88 5.88 0 00-3.36-3.36 8.43 8.43 0 00-2.79-.53c-1.23-.06-1.62-.07-4.74-.07s-3.52 0-4.74.07a8.44 8.44 0 00-2.79.53 5.88 5.88 0 00-3.36 3.36 8.44 8.44 0 00-.53 2.79c-.06 1.23-.07 1.62-.07 4.74s0 3.52.07 4.74a8.44 8.44 0 00.53 2.79 5.88 5.88 0 003.36 3.36 8.44 8.44 0 002.79.53c1.23.06 1.62.07 4.74.07s3.52 0 4.74-.07a8.44 8.44 0 002.79-.53 5.88 5.88 0 003.36-3.36 8.41 8.41 0 00.53-2.79c.06-1.23.07-1.62.07-4.74s0-3.52-.07-4.74a8.44 8.44 0 00-.53-2.79zm-1.54 12.18a6.38 6.38 0 01-.4 2.14A3.81 3.81 0 0130.78 33a6.35 6.35 0 01-2.14.4c-1.21.06-1.58.07-4.65.07s-3.43 0-4.65-.07a6.35 6.35 0 01-2.14-.4 3.81 3.81 0 01-2.2-2.22 6.35 6.35 0 01-.4-2.14c-.06-1.21-.07-1.58-.07-4.65s0-3.43.07-4.65a6.38 6.38 0 01.4-2.14 3.81 3.81 0 012.22-2.2 6.35 6.35 0 012.14-.4c1.21-.06 1.58-.07 4.65-.07s3.43 0 4.65.07a6.38 6.38 0 012.14.4 3.81 3.81 0 012.2 2.22 6.35 6.35 0 01.4 2.14c.06 1.21.07 1.58.07 4.65s-.05 3.42-.11 4.64z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--sm-ig-full" xmlns="http://www.w3.org/2000/svg"><circle cx="24" cy="24" r="3.83"/><path d="M33 17.22A3.81 3.81 0 0030.78 15a6.38 6.38 0 00-2.14-.4c-1.21-.05-1.58-.07-4.65-.07s-3.43 0-4.65.07a6.35 6.35 0 00-2.14.4 3.81 3.81 0 00-2.2 2.22 6.38 6.38 0 00-.4 2.14c-.05 1.21-.07 1.58-.07 4.65s0 3.44.07 4.65a6.36 6.36 0 00.4 2.14 3.81 3.81 0 002.22 2.2 6.35 6.35 0 002.14.4c1.21.06 1.58.07 4.65.07s3.44 0 4.65-.07a6.35 6.35 0 002.14-.4 3.81 3.81 0 002.2-2.22 6.38 6.38 0 00.4-2.14c.06-1.21.07-1.58.07-4.65s0-3.43-.07-4.65a6.35 6.35 0 00-.4-2.12zm-9 12.69A5.91 5.91 0 1129.91 24 5.9 5.9 0 0124 29.91zm6.14-10.66a1.38 1.38 0 111.38-1.38 1.38 1.38 0 01-1.38 1.37z"/><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm11.43 26.74a8.41 8.41 0 01-.53 2.79 5.88 5.88 0 01-3.36 3.36 8.44 8.44 0 01-2.79.53c-1.23.06-1.62.07-4.74.07s-3.51 0-4.74-.07a8.44 8.44 0 01-2.79-.53 5.88 5.88 0 01-3.36-3.36 8.44 8.44 0 01-.53-2.79c-.06-1.23-.07-1.62-.07-4.74s0-3.52.07-4.74a8.44 8.44 0 01.53-2.79 5.88 5.88 0 013.36-3.36 8.44 8.44 0 012.79-.53c1.23-.06 1.62-.07 4.74-.07s3.51 0 4.74.07a8.43 8.43 0 012.79.53 5.88 5.88 0 013.36 3.36 8.44 8.44 0 01.53 2.79c.06 1.23.07 1.62.07 4.74s-.01 3.51-.07 4.74z"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--sm-ln-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><ellipse cx="16.07" cy="14.58" rx="2.56" ry="2.58"/><path d="M13.92 19h4.33v14h-4.33zM29.4 18.57a4.88 4.88 0 00-4.22 2.31V19H21v14h4.16v-7.35c0-2 .91-3.14 2.64-3.14s2.36 1.13 2.36 3.14V33h4.31v-8.86c.02-3.75-2.1-5.57-5.07-5.57z"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--sm-ln-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm-5.74 31h-4.34V19h4.33zm-2.19-15.83a2.58 2.58 0 112.56-2.58 2.57 2.57 0 01-2.56 2.58zM34.49 33h-4.31v-7.35c0-2-.77-3.14-2.36-3.14s-2.64 1.17-2.64 3.14V33H21V19h4.16v1.89a4.88 4.88 0 014.22-2.31c3 0 5.09 1.81 5.09 5.56z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--sm-tg-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><path d="M10.93 22.657c6.942-3.025 11.57-5.019 13.887-5.982 6.614-2.751 7.988-3.23 8.884-3.245.197-.003.637.045.923.277.24.195.307.46.338.645.032.185.072.608.04.937-.358 3.766-1.909 12.904-2.698 17.122-.334 1.785-.991 2.383-1.627 2.441-1.383.128-2.433-.914-3.773-1.792-2.096-1.373-3.28-2.229-5.315-3.57-2.35-1.549-.827-2.4.513-3.792.351-.365 6.444-5.907 6.562-6.41.015-.063.029-.297-.11-.42-.14-.124-.345-.082-.494-.048-.21.047-3.558 2.26-10.045 6.639-.95.653-1.81.97-2.582.954-.85-.018-2.486-.48-3.702-.876-1.491-.485-2.677-.741-2.574-1.565.054-.428.645-.867 1.772-1.315z"/></symbol>
+		<symbol viewBox="0 0 48 48" id="cd-icon--sm-tg-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2C4.399 2-5.413 25.696 8.445 39.555 22.304 53.413 46 43.6 46 24c0-12.15-9.85-22-22-22zm9.701 11.43c.197-.004.637.046.922.277.241.196.308.46.34.645.032.185.07.607.039.937-.358 3.766-1.908 12.904-2.697 17.121-.334 1.785-.993 2.383-1.63 2.442-1.382.127-2.431-.913-3.77-1.791-2.097-1.374-3.28-2.23-5.315-3.57-2.351-1.55-.828-2.402.512-3.794.35-.364 6.444-5.905 6.562-6.408.015-.063.028-.298-.111-.422-.14-.124-.344-.08-.492-.047-.21.048-3.559 2.26-10.045 6.639-.95.653-1.811.97-2.582.953-.85-.018-2.488-.48-3.704-.875-1.49-.485-2.675-.741-2.572-1.564.054-.43.644-.868 1.772-1.317 6.942-3.024 11.57-5.019 13.886-5.982 6.614-2.751 7.99-3.229 8.885-3.244z"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--sm-tt-def" xmlns="http://www.w3.org/2000/svg"><path d="M24 5A19 19 0 115 24 19 19 0 0124 5m0-3a22 22 0 1022 22A22 22 0 0024 2z"/><path d="M36 16.56a9.83 9.83 0 01-2.83.78 4.94 4.94 0 002.16-2.72 9.84 9.84 0 01-3.13 1.19 4.93 4.93 0 00-8.52 3.37 5 5 0 00.13 1.12 14 14 0 01-10.15-5.14 4.93 4.93 0 001.52 6.57 4.9 4.9 0 01-2.18-.62v.06A4.93 4.93 0 0016.91 26a4.9 4.9 0 01-1.3.17 5 5 0 01-.93-.09 4.93 4.93 0 004.6 3.42 9.91 9.91 0 01-7.29 2 14 14 0 0021.57-11.76v-.64A10 10 0 0036 16.56z"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--sm-tt-full" xmlns="http://www.w3.org/2000/svg"><path d="M24 2a22 22 0 1022 22A22 22 0 0024 2zm9.54 17.11v.64A14 14 0 0112 31.54a9.92 9.92 0 007.29-2 4.93 4.93 0 01-4.6-3.42 5 5 0 00.93.09 4.9 4.9 0 001.3-.17A4.93 4.93 0 0113 21.17v-.06a4.9 4.9 0 002.23.62 4.93 4.93 0 01-1.52-6.57 14 14 0 0010.15 5.14 5 5 0 01-.13-1.12 4.93 4.93 0 018.52-3.37 9.83 9.83 0 003.13-1.19 4.94 4.94 0 01-2.16 2.72 9.83 9.83 0 002.78-.78 10 10 0 01-2.46 2.55z"/></symbol>
 		<symbol viewBox="0 0 48 48" id="cd-icon--user" xmlns="http://www.w3.org/2000/svg"><path d="M23 24h2a16 16 0 0116 16v4H7v-4a16 16 0 0116-16z"/><rect x="15" y="4" width="18" height="18" rx="9" ry="9"/></symbol>
@@ -314,6 +322,28 @@ <h2>cd-icon--sm-fb-def</h2>
 					</div>
 					<h2>cd-icon--sm-fb-full</h2>
 				</li>
+				<li title="cd-icon--sm-ig-def">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-ig-def -->
+						<svg class="cd-icon--sm-ig-def-dims">
+							<use xlink:href="#cd-icon--sm-ig-def"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-ig-def</h2>
+				</li>
+				<li title="cd-icon--sm-ig-full">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-ig-full -->
+						<svg class="cd-icon--sm-ig-full-dims">
+							<use xlink:href="#cd-icon--sm-ig-full"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-ig-full</h2>
+				</li>
 				<li title="cd-icon--sm-ln-def">
 					<div class="icon-box">
 
@@ -336,6 +366,28 @@ <h2>cd-icon--sm-ln-def</h2>
 					</div>
 					<h2>cd-icon--sm-ln-full</h2>
 				</li>
+				<li title="cd-icon--sm-tg-def">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-tg-def -->
+						<svg class="cd-icon--sm-tg-def-dims">
+							<use xlink:href="#cd-icon--sm-tg-def"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-tg-def</h2>
+				</li>
+				<li title="cd-icon--sm-tg-full">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-tg-full -->
+						<svg class="cd-icon--sm-tg-full-dims">
+							<use xlink:href="#cd-icon--sm-tg-full"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-tg-full</h2>
+				</li>
 				<li title="cd-icon--sm-tt-def">
 					<div class="icon-box">
 
@@ -588,6 +640,28 @@ <h2>cd-icon--sm-fb-def</h2>
 					</div>
 					<h2>cd-icon--sm-fb-full</h2>
 				</li>
+				<li title="cd-icon--sm-ig-def">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-ig-def -->
+						<svg class="cd-icon--sm-ig-def-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--sm-ig-def"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-ig-def</h2>
+				</li>
+				<li title="cd-icon--sm-ig-full">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-ig-full -->
+						<svg class="cd-icon--sm-ig-full-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--sm-ig-full"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-ig-full</h2>
+				</li>
 				<li title="cd-icon--sm-ln-def">
 					<div class="icon-box">
 
@@ -610,6 +684,28 @@ <h2>cd-icon--sm-ln-def</h2>
 					</div>
 					<h2>cd-icon--sm-ln-full</h2>
 				</li>
+				<li title="cd-icon--sm-tg-def">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-tg-def -->
+						<svg class="cd-icon--sm-tg-def-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--sm-tg-def"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-tg-def</h2>
+				</li>
+				<li title="cd-icon--sm-tg-full">
+					<div class="icon-box">
+
+						<!-- cd-icon--sm-tg-full -->
+						<svg class="cd-icon--sm-tg-full-dims">
+							<use xlink:href="cd-icons-sprite.svg#cd-icon--sm-tg-full"></use>
+						</svg>
+
+					</div>
+					<h2>cd-icon--sm-tg-full</h2>
+				</li>
 				<li title="cd-icon--sm-tt-def">
 					<div class="icon-box">
 
@@ -651,7 +747,7 @@ <h2>cd-icon--user</h2>
 
 		</section>
 		<footer>
-			<p>Generated at Thu, 17 Mar 2022 13:34:26 GMT by <a href="https://github.com/svg-sprite/svg-sprite" target="_blank" rel="noopener noreferrer">svg-sprite</a>.</p>
+			<p>Generated at Mon, 11 Apr 2022 09:07:08 GMT by <a href="https://github.com/svg-sprite/svg-sprite" target="_blank" rel="noopener noreferrer">svg-sprite</a>.</p>
 		</footer>
 	</body>
 </html>

From 5862e48247ecb322beea7dc6b18d3c641615a7e3 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 12 Apr 2022 09:13:05 +0200
Subject: [PATCH 624/720] RW-438 based on base theme update, remove svg icon
 sprite attach via preprocess in favour of template override

---
 .../common_design_subtheme.theme              | 16 -----
 .../templates/cd/cd-icons/cd-icons.html.twig  | 11 ++++
 .../templates/layout/html.html.twig           | 60 +++++++++++++++++++
 3 files changed, 71 insertions(+), 16 deletions(-)
 create mode 100644 html/themes/custom/common_design_subtheme/templates/cd/cd-icons/cd-icons.html.twig
 create mode 100644 html/themes/custom/common_design_subtheme/templates/layout/html.html.twig

diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.theme b/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
index a732a7191..884469b51 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
@@ -426,19 +426,3 @@ function common_design_subtheme_add_optional_mark_to_title($title) {
     '@title' => $title,
   ]);
 }
-
-/**
- * Implements hook_preprocess_html().
- */
-function common_design_subtheme_preprocess_html(&$vars) {
-  // SVG sprite
-  // Get the contents of the SVG sprite.
-  $icons = file_get_contents(\Drupal::service('extension.list.theme')->getPath('common_design_subtheme') . '/img/icons/cd-icons-sprite.svg');
-
-  // Add a new render array to page_bottom so the icons
-  // get added to the page.
-  $vars['page_bottom']['icons'] = [
-    '#type' => 'inline_template',
-    '#template' => '<span class="hidden">' . $icons . '</span>',
-  ];
-}
diff --git a/html/themes/custom/common_design_subtheme/templates/cd/cd-icons/cd-icons.html.twig b/html/themes/custom/common_design_subtheme/templates/cd/cd-icons/cd-icons.html.twig
new file mode 100644
index 000000000..fcb6e040d
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/templates/cd/cd-icons/cd-icons.html.twig
@@ -0,0 +1,11 @@
+{#
+
+/**
+ * @file
+ * Template to include SVG sprites used for the icons across the site.
+ */
+
+#}
+<div class="hidden">
+  {% include '@common_design_subtheme/../img/icons/cd-icons-sprite.svg' %}
+</div>
diff --git a/html/themes/custom/common_design_subtheme/templates/layout/html.html.twig b/html/themes/custom/common_design_subtheme/templates/layout/html.html.twig
new file mode 100644
index 000000000..9fc1b07e7
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/templates/layout/html.html.twig
@@ -0,0 +1,60 @@
+{#
+/**
+ * @file
+ * Theme override for the basic structure of a single Drupal page.
+ *
+ * Variables:
+ * - logged_in: A flag indicating if user is logged in.
+ * - root_path: The root path of the current page (e.g., node, admin, user).
+ * - node_type: The content type for the current node, if the page is a node.
+ * - head_title: List of text elements that make up the head_title variable.
+ *   May contain one or more of the following:
+ *   - title: The title of the page.
+ *   - name: The name of the site.
+ *   - slogan: The slogan of the site.
+ * - page_top: Initial rendered markup. This should be printed before 'page'.
+ * - page: The rendered page markup.
+ * - page_bottom: Closing rendered markup. This variable should be printed after
+ *   'page'.
+ * - db_offline: A flag indicating if the database is offline.
+ * - placeholder_token: The token for generating head, css, js and js-bottom
+ *   placeholders.
+ *
+ * @see template_preprocess_html()
+ */
+#}
+{%
+  set body_classes = [
+    logged_in ? 'user-logged-in',
+    not root_path ? 'path-frontpage' : 'path-' ~ root_path|clean_class,
+    node_type ? 'page-node-type-' ~ node_type|clean_class,
+    db_offline ? 'db-offline',
+  ]
+%}
+<!DOCTYPE html>
+<html{{ html_attributes.addClass('no-js') }}>
+  <head>
+    <head-placeholder token="{{ placeholder_token }}">
+    <title>{{ head_title|safe_join(' | ') }}</title>
+    <css-placeholder token="{{ placeholder_token }}">
+    <js-placeholder token="{{ placeholder_token }}">
+  </head>
+  <body{{ attributes.addClass(body_classes) }}>
+    {#
+      Keyboard navigation/accessibility link to main content section in
+      page.html.twig.
+    #}
+    <a href="#main-content" class="visually-hidden focusable skip-link">
+      {{ 'Skip to main content'|t }}
+    </a>
+    {{ page_top }}
+    {{ page }}
+    {{ page_bottom }}
+
+    {% block icons %}
+    {% include '@common_design_subtheme/cd/cd-icons/cd-icons.html.twig' %}
+    {% endblock %}
+
+    <js-bottom-placeholder token="{{ placeholder_token }}">
+  </body>
+</html>

From e2a341b792c840c3ade74209ca9d9f9c0aa029ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 15 Apr 2022 03:16:37 +0000
Subject: [PATCH 625/720] Bump async in
 /html/themes/custom/common_design_subtheme

Bumps [async](https://github.com/caolan/async) from 3.2.1 to 3.2.3.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/master/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v3.2.1...v3.2.3)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../common_design_subtheme/package-lock.json  | 41 +++----------------
 1 file changed, 6 insertions(+), 35 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/package-lock.json b/html/themes/custom/common_design_subtheme/package-lock.json
index a7866083a..2b599df21 100644
--- a/html/themes/custom/common_design_subtheme/package-lock.json
+++ b/html/themes/custom/common_design_subtheme/package-lock.json
@@ -2525,9 +2525,9 @@
       }
     },
     "node_modules/async": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.1.tgz",
-      "integrity": "sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
+      "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
       "dev": true
     },
     "node_modules/asynckit": {
@@ -11003,17 +11003,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/stylelint/node_modules/nanoid": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
-      "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
     "node_modules/stylelint/node_modules/postcss": {
       "version": "8.4.7",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.7.tgz",
@@ -11053,14 +11042,6 @@
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
       "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
     },
-    "node_modules/stylelint/node_modules/source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/stylelint/node_modules/string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -14197,9 +14178,9 @@
       "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="
     },
     "async": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.1.tgz",
-      "integrity": "sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
+      "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
       "dev": true
     },
     "asynckit": {
@@ -20602,11 +20583,6 @@
           "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
           "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="
         },
-        "nanoid": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
-          "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw=="
-        },
         "postcss": {
           "version": "8.4.7",
           "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.7.tgz",
@@ -20636,11 +20612,6 @@
           "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
           "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
         },
-        "source-map-js": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-          "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
-        },
         "string-width": {
           "version": "4.2.3",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",

From 8d3b6e123acc07dd1a494405f9f24b199a3871ce Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 15 Apr 2022 03:26:59 +0000
Subject: [PATCH 626/720] [RW-45] Add option to only migrate file previews

---
 .../Commands/ReliefWebDocstoreCommands.php    | 44 ++++++++++++++++---
 1 file changed, 37 insertions(+), 7 deletions(-)

diff --git a/html/modules/custom/reliefweb_docstore/src/Commands/ReliefWebDocstoreCommands.php b/html/modules/custom/reliefweb_docstore/src/Commands/ReliefWebDocstoreCommands.php
index 6ba097a65..eed7e2956 100644
--- a/html/modules/custom/reliefweb_docstore/src/Commands/ReliefWebDocstoreCommands.php
+++ b/html/modules/custom/reliefweb_docstore/src/Commands/ReliefWebDocstoreCommands.php
@@ -86,11 +86,13 @@ public function __construct(
    * @option batch_size Number of reports with attachments to process at once.
    * @option limit Maximum number of reports with non migrated files to process,
    * 0 means process everything.
+   * @option preview_only Only download the attachment previews.
    *
    * @default options [
    *   'base_url' => 'https://reliefweb.int',
    *   'batch_size' => 1000,
    *   'limit' => 0,
+   *   'preview_only' => 0,
    * ]
    *
    * @aliases rw-dma,rw-docstore-migrate-attachments
@@ -104,10 +106,12 @@ public function migrateAttachments($options = [
     'base_url' => 'https://reliefweb.int',
     'batch_size' => 1000,
     'limit' => 0,
+    'preview_only' => 0,
   ]) {
     $base_url = $options['base_url'];
     $batch_size = (int) $options['batch_size'];
     $limit = (int) $options['limit'];
+    $preview_only = !empty($options['preview_only']);
 
     if (preg_match('#^https?://[^/]+$#', $base_url) !== 1) {
       $this->logger()->error(dt('The base url must be in the form http(s)://example.test.'));
@@ -159,7 +163,7 @@ public function migrateAttachments($options = [
       if (!empty($ids)) {
         $last = min($ids);
         $count_ids += count($ids);
-        $count_files += $this->migrateFiles($ids, $base_url, $local);
+        $count_files += $this->migrateFiles($ids, $base_url, $local, $preview_only);
 
         static::clearEntityCache('node', $ids);
       }
@@ -189,11 +193,13 @@ public function migrateAttachments($options = [
    *   The base url of the site from which to retrieve the files.
    * @param bool $local
    *   Whether to store the files locally or in the docstore.
+   * @param bool $preview_only
+   *   If TRUE, then only retrieve the previews.
    *
    * @return int
    *   The number of migrated files.
    */
-  protected function migrateFiles(array $ids, $base_url, $local = FALSE) {
+  protected function migrateFiles(array $ids, $base_url, $local = FALSE, $preview_only = FALSE) {
     $query = Database::getConnection('default', 'rwint7')
       ->select('field_data_field_file', 'f')
       ->fields('f', ['entity_id', 'field_file_description'])
@@ -219,13 +225,14 @@ protected function migrateFiles(array $ids, $base_url, $local = FALSE) {
     }
 
     // Migrate the files.
-    // @todo we need to find a way to identify if the file has been replaced.
-    // Maybe we can generate the file_uuid based on the file ID.
-    if ($local) {
-      return $this->migrateLocalFiles($entities, $base_url);
+    if ($preview_only) {
+      return $this->migratePreviewFiles($entities);
+    }
+    elseif ($local) {
+      return $this->migrateLocalFiles($entities);
     }
     else {
-      return $this->migrateRemoteFiles($entities, $base_url);
+      return $this->migrateRemoteFiles($entities);
     }
   }
 
@@ -342,6 +349,29 @@ protected function migrateRemoteFiles(array $entities) {
     return $count;
   }
 
+  /**
+   * Migrate preview files to their local storage.
+   *
+   * @param array $entities
+   *   List of entities that have attachments, keyed by entity id and with the
+   *   list of files as values.
+   *
+   * @return int
+   *   The number of migrated files.
+   */
+  protected function migratePreviewFiles(array $entities) {
+    $count = 0;
+    foreach ($entities as $files) {
+      foreach ($files as $file) {
+        // Try to download the file preview.
+        if ($this->downloadFilePreview($file)) {
+          $count++;
+        }
+      }
+    }
+    return $count;
+  }
+
   /**
    * Download a file to its local location.
    *

From 5c6500ec30a83b35020a2aacd95658485b7c40ea Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 18 Apr 2022 00:51:42 +0000
Subject: [PATCH 627/720] [RW-455] Fix disaster type selection

---
 .../reliefweb_form/js/widget.autocomplete.js  | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/html/modules/custom/reliefweb_form/js/widget.autocomplete.js b/html/modules/custom/reliefweb_form/js/widget.autocomplete.js
index 671428915..40c1a82cb 100644
--- a/html/modules/custom/reliefweb_form/js/widget.autocomplete.js
+++ b/html/modules/custom/reliefweb_form/js/widget.autocomplete.js
@@ -253,13 +253,10 @@
       // This updates the options of the disaster type select field to match
       // the disaster types from the the selected disasters.
       function handleDisasterTypes(disasterSelection, disasterElement) {
-        // Retrieve the disaster type field.
-        var id = disasterElement.id.replace('disaster', 'disaster-type');
-        var disasterTypeElement = document.getElementById(id);
-
-        // Place holder to keep track of the disaster type selection container
-        // which is created later when the disaster type field is transformed
-        // into an autocomplete.
+        // Placeholders to keep track of the disaster type element and selection
+        // container which are updated/created later when the disaster type
+        // field is transformed into an autocomplete.
+        var disasterTypeElement = null;
         var disasterTypeSelection = null;
 
         // Update the disaster types.
@@ -276,6 +273,10 @@
         // selecting a disaster of type Flood, then unselecting it will result
         // in the removal of the Flood disaster type).
         var updateDisasterTypes = function (oldTypes, exclude) {
+          if (disasterTypeElement === null) {
+            disasterTypeElement = document.getElementById(disasterElement.id.replace('disaster', 'disaster-type'));
+          }
+
           // Nothing to do if we couldn't find the disaster type field.
           if (disasterTypeElement === null) {
             return;
@@ -307,7 +308,7 @@
           }
 
           if (disasterTypeSelection === null) {
-            disasterTypeSelection = document.getElementById(disasterTypeElement.id + '--selection');
+            disasterTypeSelection = document.getElementById(disasterTypeElement.id.replace('--element', '--selection'));
           }
           updateSelection(disasterTypeSelection, disasterTypeElement);
         };
@@ -350,7 +351,7 @@
           return null;
         }
 
-        // Set disater type handling.
+        // Set disaster type handling.
         var updateDisasterTypes = handleDisasterTypes(disasterSelection, disasterElement);
 
         // Function to handle the changes to the country field.

From e0e289facea7305722f8327e1db5e10bd7190c8c Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 19 Apr 2022 03:30:15 +0000
Subject: [PATCH 628/720] [RW-45] Add option to copy files from local directory

---
 .../Commands/ReliefWebDocstoreCommands.php    | 123 ++++++++++--------
 1 file changed, 68 insertions(+), 55 deletions(-)

diff --git a/html/modules/custom/reliefweb_docstore/src/Commands/ReliefWebDocstoreCommands.php b/html/modules/custom/reliefweb_docstore/src/Commands/ReliefWebDocstoreCommands.php
index eed7e2956..aae010adf 100644
--- a/html/modules/custom/reliefweb_docstore/src/Commands/ReliefWebDocstoreCommands.php
+++ b/html/modules/custom/reliefweb_docstore/src/Commands/ReliefWebDocstoreCommands.php
@@ -14,7 +14,6 @@
 use Drupal\reliefweb_utility\Helpers\UrlHelper;
 use Drupal\reliefweb_utility\Traits\EntityDatabaseInfoTrait;
 use Drush\Commands\DrushCommands;
-use GuzzleHttp\Psr7\Utils;
 
 /**
  * ReliefWeb migration Drush commandfile.
@@ -87,12 +86,15 @@ public function __construct(
    * @option limit Maximum number of reports with non migrated files to process,
    * 0 means process everything.
    * @option preview_only Only download the attachment previews.
+   * @option source_directory Local source directory with the ReliefWeb files.
+   * If empty, fetch the files remotely using the base URL.
    *
    * @default options [
    *   'base_url' => 'https://reliefweb.int',
    *   'batch_size' => 1000,
    *   'limit' => 0,
    *   'preview_only' => 0,
+   *   'source_directory' => '',
    * ]
    *
    * @aliases rw-dma,rw-docstore-migrate-attachments
@@ -107,11 +109,13 @@ public function migrateAttachments($options = [
     'batch_size' => 1000,
     'limit' => 0,
     'preview_only' => 0,
+    'source_directory' => '',
   ]) {
     $base_url = $options['base_url'];
     $batch_size = (int) $options['batch_size'];
     $limit = (int) $options['limit'];
     $preview_only = !empty($options['preview_only']);
+    $source_directory = rtrim($options['source_directory'], '/');
 
     if (preg_match('#^https?://[^/]+$#', $base_url) !== 1) {
       $this->logger()->error(dt('The base url must be in the form http(s)://example.test.'));
@@ -125,6 +129,18 @@ public function migrateAttachments($options = [
       $this->logger()->error(dt('The limit must be equal or superior to 0.'));
       return FALSE;
     }
+    if (!empty($source_directory) && !file_exists($source_directory)) {
+      $this->logger()->error(strtr('The source directory does not exist.'));
+      return FALSE;
+    }
+
+    // Get the storage mode: local or docstore.
+    $local = $this->docstoreConfig->get('local') === TRUE;
+
+    if (!empty($source_directory) && $local === FALSE) {
+      $this->logger()->error(strtr('The source directory option is only valid in local mode.'));
+      return FALSE;
+    }
 
     // Get the attachment field table.
     $table = $this->getFieldTableName('node', 'field_file');
@@ -145,8 +161,6 @@ public function migrateAttachments($options = [
     $count_ids = 0;
     $count_files = 0;
 
-    $local = $this->docstoreConfig->get('local') === TRUE;
-
     while ($last !== NULL) {
       $ids = $this->getDatabase()
         ->select($table, $table)
@@ -163,7 +177,7 @@ public function migrateAttachments($options = [
       if (!empty($ids)) {
         $last = min($ids);
         $count_ids += count($ids);
-        $count_files += $this->migrateFiles($ids, $base_url, $local, $preview_only);
+        $count_files += $this->migrateFiles($ids, $base_url, $local, $preview_only, $source_directory);
 
         static::clearEntityCache('node', $ids);
       }
@@ -195,11 +209,13 @@ public function migrateAttachments($options = [
    *   Whether to store the files locally or in the docstore.
    * @param bool $preview_only
    *   If TRUE, then only retrieve the previews.
+   * @param string $source_directory
+   *   The source directory with the ReliefWeb files.
    *
    * @return int
    *   The number of migrated files.
    */
-  protected function migrateFiles(array $ids, $base_url, $local = FALSE, $preview_only = FALSE) {
+  protected function migrateFiles(array $ids, $base_url, $local = FALSE, $preview_only = FALSE, $source_directory = '') {
     $query = Database::getConnection('default', 'rwint7')
       ->select('field_data_field_file', 'f')
       ->fields('f', ['entity_id', 'field_file_description'])
@@ -214,7 +230,7 @@ protected function migrateFiles(array $ids, $base_url, $local = FALSE, $preview_
     // Group the files per entity.
     $entities = [];
     foreach ($records as $record) {
-      $file = $this->prepareFileData($record, $base_url);
+      $file = $this->prepareFileData($record, $base_url, $source_directory);
       if (!empty($file)) {
         $entities[$record['entity_id']][] = $file;
       }
@@ -243,14 +259,22 @@ protected function migrateFiles(array $ids, $base_url, $local = FALSE, $preview_
    *   D7 file record.
    * @param string $base_url
    *   The base url of the site from which to retrieve the files.
+   * @param string $source_directory
+   *   The source directory with the ReliefWeb files.
    *
    * @return array
    *   D9 file data.
    */
-  protected function prepareFileData(array $record, $base_url) {
+  protected function prepareFileData(array $record, $base_url, $source_directory) {
     $uuid = LegacyHelper::generateAttachmentUuid($record['uri']);
     $file_uuid = LegacyHelper::generateAttachmentFileUuid($uuid, $record['fid']);
-    $url = LegacyHelper::getFileLegacyUrl($record['uri'], $base_url);
+
+    if (empty($source_directory)) {
+      $url = LegacyHelper::getFileLegacyUrl($record['uri'], $base_url);
+    }
+    else {
+      $url = $source_directory . '/resources/' . basename($record['uri']);
+    }
 
     $file = $this->getDatabase()
       ->select('file_managed', 'fm')
@@ -266,7 +290,8 @@ protected function prepareFileData(array $record, $base_url) {
       $file['file_uuid'] = $file_uuid;
       $file['url'] = $url;
       $file['private'] = strpos($file['uri'], 'private://') === 0;
-      $file['preview_url'] = $this->getPreviewUrl($record, $base_url);
+      $file['preview_url'] = $this->getPreviewUrl($record, $base_url, $source_directory);
+      $file['legacy_uri'] = $record['uri'];
     }
     else {
       $this->logger()->error(dt('No database entry found for file @uri.', [
@@ -283,16 +308,24 @@ protected function prepareFileData(array $record, $base_url) {
    *   D7 file record.
    * @param string $base_url
    *   The base url of the site from which to retrieve the files.
+   * @param string $source_directory
+   *   The source directory with the ReliefWeb files.
    *
    * @return string
    *   D7 preview URL.
    */
-  protected function getPreviewUrl(array $record, $base_url) {
+  protected function getPreviewUrl(array $record, $base_url, $source_directory) {
     if (preg_match('/\|\d+\|(0|90|-90)$/', $record['field_file_description']) === 1) {
       $filename = basename(urldecode($record['filename']), '.pdf');
       $filename = str_replace('%', '', $filename);
-      $filename = UrlHelper::encodePath($record['fid'] . '-' . $filename . '.png');
-      return $base_url . '/sites/reliefweb.int/files/resources-pdf-previews/' . $filename;
+      $filename = $record['fid'] . '-' . $filename . '.png';
+      if (empty($source_directory)) {
+        $filename = UrlHelper::encodePath($filename);
+        return $base_url . '/sites/reliefweb.int/files/resources-pdf-previews/' . $filename;
+      }
+      else {
+        return $source_directory . '/resources-pdf-previews/' . $filename;
+      }
     }
     return '';
   }
@@ -392,39 +425,26 @@ protected function downloadLocalFile(array $file) {
     // Try to download the file.
     $success = FALSE;
     if (ReliefWebFile::prepareDirectory($uri)) {
-      try {
-        $input = Utils::TryFopen($url, 'r');
-        $output = Utils::TryFopen($uri, 'w');
-        $success = stream_copy_to_stream($input, $output);
+      if (!copy($url, $uri)) {
+        $this->logger()->error(dt('Unable to download file @url to @uri.', [
+          '@url' => $url,
+          '@uri' => $uri,
+        ]));
       }
-      catch (\Exception $exception) {
-        $this->logger()->error(dt('Unable to download file @url to @uri: @message.', [
+      else {
+        $this->logger()->info(dt('Successfully downloaded file @url to @uri.', [
           '@url' => $url,
           '@uri' => $uri,
-          '@message' => $exception->getMessage(),
         ]));
-        return FALSE;
+        $success = TRUE;
       }
     }
     else {
       $this->logger()->error(dt('Unable to create directory for @uri.', [
         '@uri' => $uri,
       ]));
-      return FALSE;
     }
 
-    if (empty($success)) {
-      $this->logger()->error(dt('Unable to download file @url to @uri.', [
-        '@url' => $url,
-        '@uri' => $uri,
-      ]));
-    }
-    else {
-      $this->logger()->info(dt('Successfully downloaded file @url to @uri.', [
-        '@url' => $url,
-        '@uri' => $uri,
-      ]));
-    }
     return $success;
   }
 
@@ -433,6 +453,9 @@ protected function downloadLocalFile(array $file) {
    *
    * @param array $file
    *   Legacy file data.
+   *
+   * @return bool
+   *   TRUE if the file could be downloaded.
    */
   protected function downloadFilePreview(array $file) {
     if (!empty($file['preview_url'])) {
@@ -440,41 +463,31 @@ protected function downloadFilePreview(array $file) {
       $uri = preg_replace('#\.pdf$#i', '.png', $uri);
       $url = $file['preview_url'];
 
+      // Try to download the preview file.
+      $success = FALSE;
       if (ReliefWebFile::prepareDirectory($uri)) {
-        try {
-          $input = Utils::TryFopen($url, 'r');
-          $output = Utils::TryFopen($uri, 'w');
-          $success = stream_copy_to_stream($input, $output);
+        if (!copy($url, $uri)) {
+          $this->logger()->error(dt('Unable to download preview file @url to @uri.', [
+            '@url' => $url,
+            '@uri' => $uri,
+          ]));
         }
-        catch (\Exception $exception) {
-          $this->logger()->error(dt('Unable to download preview file @url to @uri: @message.', [
+        else {
+          $this->logger()->info(dt('Successfully downloaded preview file @url to @uri.', [
             '@url' => $url,
             '@uri' => $uri,
-            '@message' => $exception->getMessage(),
           ]));
-          return FALSE;
+          $success = TRUE;
         }
       }
       else {
         $this->logger()->error(dt('Unable to create preview directory for @uri.', [
           '@uri' => $uri,
         ]));
-        return FALSE;
-      }
-
-      if (empty($success)) {
-        $this->logger()->error(dt('Unable to download preview file @url to @uri.', [
-          '@url' => $url,
-          '@uri' => $uri,
-        ]));
-      }
-      else {
-        $this->logger()->info(dt('Successfully downloaded preview file @url to @uri.', [
-          '@url' => $url,
-          '@uri' => $uri,
-        ]));
       }
     }
+
+    return $success;
   }
 
   /**

From f1f935bcaa9d47340595f225d55f5584c476c9bc Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 19 Apr 2022 04:36:58 +0000
Subject: [PATCH 629/720] [RW-465] Use imagick as image toolkit

---
 config/imagemagick.settings.yml | 10 +++++-----
 config/system.image.yml         |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/imagemagick.settings.yml b/config/imagemagick.settings.yml
index 37333701a..1b80ab994 100644
--- a/config/imagemagick.settings.yml
+++ b/config/imagemagick.settings.yml
@@ -7,11 +7,6 @@ prepend: ''
 log_warnings: true
 debug: false
 locale: en_US.UTF-8
-advanced:
-  density: 0
-  colorspace: '0'
-  profile: ''
-  coalesce: false
 image_formats:
   PNG:
     mime_type: image/png
@@ -59,3 +54,8 @@ image_formats:
   ICO:
     mime_type: image/vnd.microsoft.icon
     enabled: false
+advanced:
+  density: 0
+  colorspace: '0'
+  profile: ''
+  coalesce: false
diff --git a/config/system.image.yml b/config/system.image.yml
index 2e18f7fc5..eb1a393b1 100644
--- a/config/system.image.yml
+++ b/config/system.image.yml
@@ -1,3 +1,3 @@
 _core:
   default_config_hash: durWHaKeBaq4d9Wpi4RqwADj1OufDepcnJuhVLmKN24
-toolkit: gd
+toolkit: imagemagick

From c71e872dba218ab269575b686a674fbfa50b2ea1 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 19 Apr 2022 04:38:10 +0000
Subject: [PATCH 630/720] [RW-45] Ensure file resources are closed after usage

---
 .../src/Controller/FileDownloadController.php       |  2 ++
 .../src/Services/DocstoreClient.php                 | 13 +++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php b/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php
index b5922a509..e56cc8722 100644
--- a/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php
+++ b/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php
@@ -312,6 +312,8 @@ protected function downloadRemoteFile($uuid, $filename) {
         $input = StreamWrapper::getResource($response->getBody());
         $output = fopen('php://output', 'wb');
         stream_copy_to_stream($input, $output);
+        @fclose($input);
+        @fclose($output);
       }, 200, $headers + $response->getHeaders());
     }
 
diff --git a/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php b/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php
index 43eaa9131..bc851fedc 100644
--- a/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php
+++ b/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php
@@ -129,9 +129,13 @@ public function updateFileContentFromFilePath($uuid, $path, $timeout = 300) {
       return new JsonResponse();
     }
 
-    return $this->request('POST', '/api/v1/files/' . $uuid . '/content', [
+    $response = $this->request('POST', '/api/v1/files/' . $uuid . '/content', [
       'body' => $resource,
     ], $timeout);
+
+    @fclose($resource);
+
+    return $response;
   }
 
   /**
@@ -174,7 +178,12 @@ public function downloadFileContentToFilePath($uuid, $path, $revision_id = 0, $t
       }
 
       $input = StreamWrapper::getResource($response->getBody());
-      return stream_copy_to_stream($input, $output) !== FALSE;
+      $result = stream_copy_to_stream($input, $output) !== FALSE;
+
+      @fclose($input);
+      @fclose($output);
+
+      return $result;
     }
     return FALSE;
   }

From 15969e953f1f2566749cad1d11bbf4f695b9e776 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 19 Apr 2022 04:39:03 +0000
Subject: [PATCH 631/720] [RW-466] Fix date used in moderation backend

---
 .../custom/reliefweb_moderation/src/ModerationServiceBase.php   | 2 ++
 .../components/rw-moderation/rw-moderation.css                  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
index 69406eced..4f4bf7524 100644
--- a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
+++ b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
@@ -2460,6 +2460,7 @@ protected function getEntityCreationDate(EntityModeratedInterface $entity) {
     switch ($entity_type_id) {
       case 'node':
         $date = $entity->getCreatedTime();
+        break;
 
       case 'taxonomy_term':
         // Consider the timestamp of the first revision as the creation date.
@@ -2479,6 +2480,7 @@ protected function getEntityCreationDate(EntityModeratedInterface $entity) {
         $query->range(0, 1);
 
         $date = $query->execute()?->fetchField();
+        break;
     }
 
     return empty($date) ? '1996-04-01T00:00:00+0000' : $date;
diff --git a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
index 131541b70..da4f10add 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-moderation/rw-moderation.css
@@ -166,6 +166,7 @@
 }
 .rw-moderation-list .rw-moderation-table__cell__bury {
   margin-top: 12px;
+  text-align: center;
   font-size: 15px;
 }
 .rw-moderation-list .rw-moderation-table .rw-moderation-table__cell__details,

From 4c04c81e69dfd4fa816d3b851c74477ec041e64e Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 19 Apr 2022 04:42:21 +0000
Subject: [PATCH 632/720] [RW-460] Fix order of entity form submit callbacks

---
 .../src/EntityFormAlterServiceBase.php        | 32 +++++++++++++++++--
 .../src/ModerationServiceBase.php             |  6 ++--
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php b/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
index 52b0931fb..12c9d8b66 100644
--- a/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
+++ b/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
@@ -540,7 +540,10 @@ protected function addPotentialNewSourceFields(array &$form, FormStateInterface
 
     // Add a submit handler to update the entity revision log message with the
     // new source information.
-    $form['#submit'][] = [$this, 'handlePotentialNewSourceSubmission'];
+    $this->addSubmitCallback($form, [
+      $this,
+      'handlePotentialNewSourceSubmission',
+    ]);
   }
 
   /**
@@ -938,7 +941,10 @@ protected function addDisableNotifications(array &$form, FormStateInterface $for
       '#title' => $this->t('Disable notifications'),
       '#default_value' => !empty($status) && $status !== 'draft',
     ];
-    $form['#submit'][] = [$this, 'setDisabledNotifications'];
+    $this->addSubmitCallback($form, [
+      $this,
+      'setDisabledNotifications',
+    ]);
   }
 
   /**
@@ -1000,6 +1006,28 @@ public function setDisabledNotifications(array $form, FormStateInterface $form_s
     }
   }
 
+  /**
+   * Add a form submit callback.
+   *
+   * @param array $form
+   *   Form.
+   * @param mixed $callback
+   *   Submit callback.
+   */
+  protected function addSubmitCallback(array &$form, $callback) {
+    // Add the callback.
+    $form['#submit'][] = $callback;
+
+    // Ensure the default form submission callback is run last as it's the one
+    // building the entity from the form_state.
+    $key = array_search('::submitForm', $form['#submit']);
+    if ($key !== FALSE) {
+      unset($form['#submit'][$key]);
+      $form['#submit'][] = '::submitForm';
+      $form['#submit'] = array_values($form['#submit']);
+    }
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
index 4f4bf7524..c96e649a2 100644
--- a/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
+++ b/html/modules/custom/reliefweb_moderation/src/ModerationServiceBase.php
@@ -420,12 +420,12 @@ public function alterEntityForm(array &$form, FormStateInterface $form_state) {
 
     // Ensure we call all the submit handlers.
     $submit_handlers = [];
-    if (!empty($submit['#submit'])) {
-      $submit_handlers = array_merge($submit_handlers, $submit['#submit']);
-    }
     if (!empty($form['#submit'])) {
       $submit_handlers = array_merge($submit_handlers, $form['#submit']);
     }
+    if (!empty($submit['#submit'])) {
+      $submit_handlers = array_merge($submit_handlers, $submit['#submit']);
+    }
 
     // Try to redirect to the entity page after submitting the form.
     $submit_handlers[] = [$this, 'redirectToEntityPage'];

From fd5b42b4ed278c90f570def189417e8e0f729903 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 19 Apr 2022 04:44:42 +0000
Subject: [PATCH 633/720] [RW-458] Prevent saving ongoing training as expired

---
 .../reliefweb_entities/src/Entity/Training.php      | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Training.php b/html/modules/custom/reliefweb_entities/src/Entity/Training.php
index 0d2554d52..762a69b1d 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Training.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Training.php
@@ -143,10 +143,23 @@ public function postSave(EntityStorageInterface $storage, $update = TRUE) {
    * {@inheritdoc}
    */
   public function hasExpired() {
+    if ($this->isOngoing()) {
+      return FALSE;
+    }
     $timestamp = DateHelper::getDateTimeStamp($this->field_registration_deadline->value);
     return empty($timestamp) || ($timestamp < gmmktime(0, 0, 0));
   }
 
+  /**
+   * Check if the training is an ongoing training (no dates).
+   *
+   * @return bool
+   *   TRUE if the training is ongoing.
+   */
+  public function isOngoing() {
+    return empty($this->field_registration_deadline->value) && empty($this->field_training_date->value);
+  }
+
   /**
    * Get the list of themes that are irrelevant for training ads.
    *

From 3bb13125df4a05c7fe2b64d2addcd026c914aa37 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 19 Apr 2022 04:52:32 +0000
Subject: [PATCH 634/720] [RW-456] Open entity clone form in a new tab

---
 .../reliefweb_entities/reliefweb_entities.module      | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/html/modules/custom/reliefweb_entities/reliefweb_entities.module b/html/modules/custom/reliefweb_entities/reliefweb_entities.module
index 6b4bed1e9..8ee3a970d 100644
--- a/html/modules/custom/reliefweb_entities/reliefweb_entities.module
+++ b/html/modules/custom/reliefweb_entities/reliefweb_entities.module
@@ -5,6 +5,7 @@
  * Entity management for ReliefWeb.
  */
 
+use Drupal\Core\Cache\RefinableCacheableDependencyInterface;
 use Drupal\Core\Entity\EntityFormInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
@@ -662,3 +663,13 @@ function reliefweb_moderation_cron() {
     }
   }
 }
+
+/**
+ * Implements hook_menu_local_tasks_alter().
+ */
+function reliefweb_entities_menu_local_tasks_alter(&$data, $route_name, RefinableCacheableDependencyInterface &$cacheability) {
+  // Open the clone entity form in a new tab.
+  if (isset($data['tabs'][0]['content_entity_clone.clone']['#link'])) {
+    $data['tabs'][0]['content_entity_clone.clone']['#link']['localized_options']['attributes']['target'] = '_blank';
+  }
+}

From 610f45ad9857943c24e45571286d946276caa2a4 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 20 Apr 2022 06:15:16 +0000
Subject: [PATCH 635/720] [RW-467] Only add optional mark before rendering form
 elements

---
 .../common_design_subtheme.theme              | 136 +----------
 .../src/FormElementOptional.php               | 219 ++++++++++++++++++
 2 files changed, 221 insertions(+), 134 deletions(-)
 create mode 100644 html/themes/custom/common_design_subtheme/src/FormElementOptional.php

diff --git a/html/themes/custom/common_design_subtheme/common_design_subtheme.theme b/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
index a732a7191..b8076150c 100644
--- a/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
+++ b/html/themes/custom/common_design_subtheme/common_design_subtheme.theme
@@ -5,13 +5,12 @@
  * Preprocess functions for the Common Design subtheme.
  */
 
-use Drupal\Component\Render\FormattableMarkup;
-use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Template\Attribute;
 use Drupal\Core\Url;
+use Drupal\common_design_subtheme\FormElementOptional;
 use Drupal\media\MediaInterface;
 
 /**
@@ -293,138 +292,7 @@ function common_design_subtheme_preprocess_inline_entity_form_entity_table(array
  * we use '#not_required' to flag optional elements.
  */
 function common_design_subtheme_reliefweb_form_mark_optional_alter(array &$element, array &$context) {
-  $types_to_skip = [
-    'button',
-    'hidden',
-    'link',
-    'submit',
-    'text_format',
-    'token',
-    'vertical_tabs',
-    'weight',
-  ];
-
-  $container_types = [
-    'container',
-    'details',
-    'fieldset',
-    'checkboxes',
-    'radios',
-  ];
-
-  // Skip if the field is not of a type we want to mark as optional.
-  if (!isset($element['#type']) || in_array($element['#type'], $types_to_skip)) {
-    return;
-  }
-
-  // Skip if the field is required.
-  if (!empty($element['#required']) || !empty($elment['widget']['#required'])) {
-    return;
-  }
-
-  // Skipped if already processed.
-  if (isset($element['#not_required'])) {
-    return;
-  }
-
-  // Process container elements.
-  if (in_array($element['#type'], $container_types)) {
-    common_design_subtheme_mark_children_as_optional($element);
-  }
-  // Process other elements.
-  else {
-    // Flag the element as optional.
-    $element['#not_required'] = TRUE;
-
-    $form = $context['form'];
-    $type = $element['#type'];
-
-    // Special handling of checkbox and radio elements. We need to check if
-    // they are part of a group of checkboxes or radios in which case we'll
-    // mark the grouping element as optional when processed by
-    // common_design_subtheme_mark_children_as_optional().
-    if ($type === 'checkbox' || $type === 'radio') {
-      if (isset($element['#array_parents'])) {
-        $parents = array_slice($element['#array_parents'], 0, -1);
-
-        while (!empty($parents)) {
-          $parent = NestedArray::getValue($form, $parents);
-
-          switch ($parent['#type'] ?? NULL) {
-            case 'checkboxes':
-            case 'radios':
-              return;
-          }
-
-          array_pop($parents);
-        }
-      }
-    }
-
-    if (isset($element['#title'])) {
-      $element['#title'] = common_design_subtheme_add_optional_mark_to_title($element['#title']);
-    }
-  }
-}
-
-/**
- * Mark an element and its children as optional.
- *
- * @param mixed $element
- *   Form element.
- */
-function common_design_subtheme_mark_children_as_optional(&$element) {
-  $types_to_skip = [
-    // Grouped checkboxes and radios.
-    'checkbox',
-    'radio',
-    // Same list as common_design_subtheme_reliefweb_form_mark_optional_alter().
-    'button',
-    'hidden',
-    'link',
-    'submit',
-    'text_format',
-    'token',
-    'vertical_tabs',
-    'weight',
-  ];
-
-  // Skip if the element is invalid or already processed or required.
-  if (!is_array($element) || isset($element['#not_required']) || !empty($element['#required'])) {
-    return;
-  }
-
-  // Skip if the field is not of a type we want to mark as optional.
-  if (isset($element['#type']) && in_array($element['#type'], $types_to_skip)) {
-    return;
-  }
-
-  $element['#not_required'] = TRUE;
-  if (!empty($element['#title'])) {
-    $element['#title'] = common_design_subtheme_add_optional_mark_to_title($element['#title']);
-  }
-  if (!empty($element['#field_title'])) {
-    $element['#field_title'] = common_design_subtheme_add_optional_mark_to_title($element['#field_title']);
-  }
-
-  foreach (Element::children($element) as $key) {
-    common_design_subtheme_mark_children_as_optional($element[$key]);
-  }
-}
-
-/**
- * Add the optional mark to a form element title.
- *
- * @param string|\Drupal\Component\Render\MarkupInterface $title
- *   Form element title.
- *
- * @return \Drupal\Component\Render\MarkupInterface
- *   Title with "optional" appended.
- */
-function common_design_subtheme_add_optional_mark_to_title($title) {
-  return new FormattableMarkup('@title <span class="form-optional"> - optional</span>', [
-    '@title' => $title,
-  ]);
+  FormElementOptional::markAsOptional($element, $context['form']);
 }
 
 /**
diff --git a/html/themes/custom/common_design_subtheme/src/FormElementOptional.php b/html/themes/custom/common_design_subtheme/src/FormElementOptional.php
new file mode 100644
index 000000000..e6ce2b4f8
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/src/FormElementOptional.php
@@ -0,0 +1,219 @@
+<?php
+
+namespace Drupal\common_design_subtheme;
+
+use Drupal\Component\Render\FormattableMarkup;
+use Drupal\Component\Utility\NestedArray;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Render\Element;
+use Drupal\Core\Security\TrustedCallbackInterface;
+
+/**
+ * Trusted callback to add the optional mark next to a form element title.
+ */
+class FormElementOptional implements TrustedCallbackInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function trustedCallbacks() {
+    return ['afterBuild', 'preRenderTitle', 'preRenderFieldTitle'];
+  }
+
+  /**
+   * After build callback: add a pre render callback to add the optional marl.
+   *
+   * @param array $element
+   *   Form element.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   Form state interface.
+   *
+   * @return array
+   *   Form element.
+   */
+  public static function afterBuild(array $element, FormStateInterface $form_state) {
+    if (!empty($element['#title'])) {
+      $element['#pre_render'][] = [static::class, 'preRenderTitle'];
+    }
+    if (!empty($element['#field_title'])) {
+      $element['#pre_render'][] = [static::class, 'preRenderFieldTitle'];
+    }
+    return $element;
+  }
+
+  /**
+   * Pre-render callback: add the optional mark to the form element title.
+   *
+   * @param array $element
+   *   Form element.
+   *
+   * @return array
+   *   Form element.
+   */
+  public static function preRenderTitle(array $element) {
+    if (!empty($element['#not_required']) && !empty($element['#title'])) {
+      $element['#title'] = static::addOptionalMark($element['#title']);
+    }
+    return $element;
+  }
+
+  /**
+   * Pre-render callback: add the optional mark to the form element field title.
+   *
+   * @param array $element
+   *   Form element.
+   *
+   * @return array
+   *   Form element.
+   */
+  public static function preRenderFieldTitle(array $element) {
+    if (!empty($element['#not_required']) && !empty($element['#field_title'])) {
+      $element['#field_title'] = static::addOptionalMark($element['#field_title']);
+    }
+    return $element;
+  }
+
+  /**
+   * Add the optional mark to a form element title.
+   *
+   * @param string|\Drupal\Component\Render\MarkupInterface $title
+   *   Form element title.
+   *
+   * @return \Drupal\Component\Render\MarkupInterface
+   *   Title with "optional" appended.
+   */
+  public static function addOptionalMark($title) {
+    return new FormattableMarkup('@title <span class="form-optional"> - optional</span>', [
+      '@title' => $title,
+    ]);
+  }
+
+  /**
+   * Mark an element and its children as optional.
+   *
+   * @param mixed $element
+   *   Form element.
+   */
+  public static function markChildrenAsOptional(&$element) {
+    $types_to_skip = [
+      // Grouped checkboxes and radios.
+      'checkbox',
+      'radio',
+      // Same list as ::markAsOptional().
+      'button',
+      'hidden',
+      'link',
+      'submit',
+      'text_format',
+      'token',
+      'vertical_tabs',
+      'weight',
+    ];
+
+    // Skip if the element is invalid or already processed or required.
+    if (!is_array($element) || isset($element['#not_required']) || !empty($element['#required'])) {
+      return;
+    }
+
+    // Skip if the field is not of a type we want to mark as optional.
+    if (isset($element['#type']) && in_array($element['#type'], $types_to_skip)) {
+      return;
+    }
+
+    $element['#not_required'] = TRUE;
+    if (!empty($element['#title']) || !empty($element['#field_title'])) {
+      $element['#after_build'][] = [static::class, 'afterBuild'];
+    }
+
+    foreach (Element::children($element) as $key) {
+      static::markChildrenAsOptional($element[$key]);
+    }
+  }
+
+  /**
+   * Implements hook_reliefweb_form_mark_optional_alter().
+   *
+   * Mark form elements as optional.
+   *
+   * Note: we cannot use '#optional' as it has a different meaning in Drupal 9
+   * so we use '#not_required' to flag optional elements.
+   *
+   * @param array $element
+   *   Form element.
+   * @param array $form
+   *   Full form.
+   */
+  public static function markAsOptional(array &$element, array $form) {
+    $types_to_skip = [
+      'button',
+      'hidden',
+      'link',
+      'submit',
+      'text_format',
+      'token',
+      'vertical_tabs',
+      'weight',
+    ];
+
+    $container_types = [
+      'container',
+      'details',
+      'fieldset',
+      'checkboxes',
+      'radios',
+    ];
+
+    // Skip if the field is not of a type we want to mark as optional.
+    if (!isset($element['#type']) || in_array($element['#type'], $types_to_skip)) {
+      return;
+    }
+
+    // Skip if the field is required.
+    if (!empty($element['#required']) || !empty($elment['widget']['#required'])) {
+      return;
+    }
+
+    // Skipped if already processed.
+    if (isset($element['#not_required'])) {
+      return;
+    }
+
+    // Process container elements.
+    if (in_array($element['#type'], $container_types)) {
+      static::markChildrenAsOptional($element);
+    }
+    // Process other elements.
+    else {
+      // Flag the element as optional.
+      $element['#not_required'] = TRUE;
+      $type = $element['#type'];
+
+      // Special handling of checkbox and radio elements. We need to check if
+      // they are part of a group of checkboxes or radios in which case we'll
+      // mark the grouping element as optional when processed by
+      // ::markChildrenAsOptional().
+      if ($type === 'checkbox' || $type === 'radio') {
+        if (isset($element['#array_parents'])) {
+          $parents = array_slice($element['#array_parents'], 0, -1);
+
+          while (!empty($parents)) {
+            $parent = NestedArray::getValue($form, $parents);
+
+            switch ($parent['#type'] ?? NULL) {
+              case 'checkboxes':
+              case 'radios':
+                return;
+            }
+
+            array_pop($parents);
+          }
+        }
+      }
+
+      if (isset($element['#title'])) {
+        $element['#after_build'][] = [static::class, 'afterBuild'];
+      }
+    }
+  }
+
+}

From 8535ac36598f11560d9d440bc8d275b33543367d Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 21 Apr 2022 04:55:56 +0000
Subject: [PATCH 636/720] [RW-457] Get list of references to index from indexer
 instead of variable

---
 .../reliefweb_api/src/Commands/ReliefWebApiCommands.php   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/html/modules/custom/reliefweb_api/src/Commands/ReliefWebApiCommands.php b/html/modules/custom/reliefweb_api/src/Commands/ReliefWebApiCommands.php
index d25c0e9dc..d67f6dee0 100644
--- a/html/modules/custom/reliefweb_api/src/Commands/ReliefWebApiCommands.php
+++ b/html/modules/custom/reliefweb_api/src/Commands/ReliefWebApiCommands.php
@@ -141,9 +141,11 @@ public function index($bundle = '', array $options = [
     // Index all the references at once when the special 'references' bundle
     // is passed to the command.
     if ($bundle === 'references') {
-      $references = explode(',', $this->state->get('reliefweb_api_references', ''));
-      foreach ($references as $reference) {
-        $this->index($reference, $options);
+      $excluded_bundles = ['country', 'disaster', 'source'];
+      foreach (Bundles::$bundles as $bundle => $info) {
+        if ($info['type'] === 'taxonomy_term' && !in_array($bundle, $excluded_bundles)) {
+          $this->index($bundle, $options);
+        }
       }
       return;
     }

From b5cbd753f98ecfaab607af2071d2e87c0f1b860c Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 21 Apr 2022 04:56:34 +0000
Subject: [PATCH 637/720] [RW-473] Fix caching of homepage blocks

---
 .../src/Controller/Homepage.php               | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/html/modules/custom/reliefweb_homepage/src/Controller/Homepage.php b/html/modules/custom/reliefweb_homepage/src/Controller/Homepage.php
index 0dd8ba996..9e6320dc3 100644
--- a/html/modules/custom/reliefweb_homepage/src/Controller/Homepage.php
+++ b/html/modules/custom/reliefweb_homepage/src/Controller/Homepage.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\reliefweb_homepage\Controller;
 
+use Drupal\Core\Cache\Cache;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Render\RendererInterface;
@@ -122,10 +123,15 @@ public function getPageContent() {
     // Parse the API results, building the page sections data.
     foreach ($results as $index => $result) {
       $query = $queries[$index];
+      $cache_tags = [
+        $query['entity_type'] . '_list:' . $query['bundle'],
+        'taxonomy_term_list',
+      ];
 
       // Generate the section.
       switch ($index) {
         case 'headlines':
+          $cache_tags[] = 'reliefweb:headlines';
         case 'disasters':
         case 'most_read':
         case 'blog':
@@ -149,6 +155,9 @@ public function getPageContent() {
             '#resource' => $query['resource'],
             '#entities' => $entities,
             '#more' => $query['more'] ?? NULL,
+            '#cache' => [
+              'tags' => $cache_tags,
+            ],
           ];
           break;
 
@@ -161,6 +170,9 @@ public function getPageContent() {
             $sections['opportunities'] = [
               '#theme' => 'reliefweb_homepage_opportunities',
               '#id' => 'opportunities',
+              '#cache' => [
+                'tags' => ['taxonomy_term_list'],
+              ],
             ];
           }
           $sections['opportunities']['#opportunities'][] = [
@@ -169,6 +181,7 @@ public function getPageContent() {
             'title' => $query['title'],
             'url' => $query['url'],
           ];
+          $sections['opportunities']['#cache']['tags'][] = 'node_list:' . $query['bundle'];
           break;
       }
     }
@@ -225,6 +238,7 @@ public function getHeadlinesApiPayload($limit = 8) {
     return [
       'resource' => 'reports',
       'bundle' => 'report',
+      'entity_type' => 'node',
       'payload' => $payload,
       'exclude' => ['posted', 'published', 'format'],
       'title' => $this->t('Latest Headlines'),
@@ -261,6 +275,7 @@ public function getMostReadApiPayload($limit = 2) {
     return [
       'resource' => 'reports',
       'bundle' => 'report',
+      'entity_type' => 'node',
       'payload' => $payload,
       'title' => $this->t('Latest Updates'),
       'callback' => [$this, 'parseMostReadApiData'],
@@ -292,6 +307,7 @@ public function getDisastersApiPayload($limit = 5) {
     return [
       'resource' => 'disasters',
       'bundle' => 'disaster',
+      'entity_type' => 'taxonomy_term',
       'payload' => $payload,
       'title' => $this->t('Recent Disasters'),
       'callback' => [$this, 'parseDisastersApiData'],
@@ -316,6 +332,7 @@ public function getBlogPostApiPayload() {
     return [
       'resource' => 'blog',
       'bundle' => 'blog_post',
+      'entity_type' => 'node',
       'payload' => $payload,
       'title' => $this->t('Latest Blog'),
       'callback' => [$this, 'parseBlogPostApiData'],
@@ -354,6 +371,7 @@ public function getOpportuntiesTotalApiPayload($bundle) {
     return [
       'resource' => $resource,
       'bundle' => $bundle,
+      'entity_type' => 'node',
       'payload' => $payload,
       'title' => $title,
       // Link to the job/training river for the entity.
@@ -444,6 +462,9 @@ public function retrieveHeadlines() {
           '#title' => $query['title'],
           '#resource' => $query['resource'],
           '#entities' => $entities,
+          '#cache' => [
+            'max-age' => 0,
+          ],
         ];
       }
     }
@@ -464,6 +485,7 @@ public function updateHeadlines() {
     if (!empty($data) && is_array($data)) {
       $selection = array_slice(array_filter($data, 'is_int'), 0, 8);
       $this->state->set('reliefweb_headline_selection', $selection);
+      Cache::invalidateTags(['reliefweb:headlines']);
       $success = TRUE;
     }
     return new Response('', $success ? 200 : 500);

From 8a37f9aa5eebb5bf864d38f6db4882439951453b Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 21 Apr 2022 05:29:30 +0000
Subject: [PATCH 638/720] [RW-475] Fix replicas option and add back count-only
 one

---
 .../reliefweb_api/src/Commands/ReliefWebApiCommands.php    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/html/modules/custom/reliefweb_api/src/Commands/ReliefWebApiCommands.php b/html/modules/custom/reliefweb_api/src/Commands/ReliefWebApiCommands.php
index d67f6dee0..406e594e8 100644
--- a/html/modules/custom/reliefweb_api/src/Commands/ReliefWebApiCommands.php
+++ b/html/modules/custom/reliefweb_api/src/Commands/ReliefWebApiCommands.php
@@ -95,7 +95,7 @@ public function __construct(
    * @option replicas Number of Elasticsearch replicas for the index,
    *   defaults to NULL which means use the reliefweb_api.settings.replicas
    *   default config value.
-   * @option replicas Number of Elasticsearch shards for the index,
+   * @option shards Number of Elasticsearch shards for the index,
    *   defaults to NULL which means use the reliefweb_api.settings.shards
    *   default config value.
    *
@@ -170,8 +170,9 @@ public function index($bundle = '', array $options = [
     $indexing_options['alias-only'] = !empty($options['alias-only']);
     // It looks like "simulate" is a reserved drush option so we need another
     // name for the option, thus "count-only"...
-    $indexing_options['replicas'] = $options['replicas'] ?? $indexing_options['replicas'];
-    $indexing_options['shards'] = $options['shards'] ?? $indexing_options['shards'];
+    $indexing_options['simulate'] = !empty($options['count-only']);
+    $indexing_options['replicas'] = (int) ($options['replicas'] ?? $indexing_options['replicas']);
+    $indexing_options['shards'] = (int) ($options['shards'] ?? $indexing_options['shards']);
     $indexing_options['simulate'] = !empty($options['count-only']);
     $indexing_options['log'] = 'echo';
 

From 6276d1351d3d5331b8e709a3cddc69f5fa4c7108 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 21 Apr 2022 05:45:28 +0000
Subject: [PATCH 639/720] [RW-474] Update API indexer to fix issue with
 disaster property for reports

---
 composer.lock | 14 +++++++-------
 symfony.lock  |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/composer.lock b/composer.lock
index ef109b0ff..0aca52ec5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b33c52f95904d69a6d064a667c727d0c",
+    "content-hash": "b57488f9c9996bbacf6a54bce6dacd43",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -8467,16 +8467,16 @@
         },
         {
             "name": "reliefweb/api-indexer",
-            "version": "v2.2.2",
+            "version": "v2.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/UN-OCHA/rwint-api-indexer.git",
-                "reference": "c900dd4dda207b84397f3387cb4f01facda37e16"
+                "reference": "1c9084bca9233ee98810fe013e2c86809f877b6c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/UN-OCHA/rwint-api-indexer/zipball/c900dd4dda207b84397f3387cb4f01facda37e16",
-                "reference": "c900dd4dda207b84397f3387cb4f01facda37e16",
+                "url": "https://api.github.com/repos/UN-OCHA/rwint-api-indexer/zipball/1c9084bca9233ee98810fe013e2c86809f877b6c",
+                "reference": "1c9084bca9233ee98810fe013e2c86809f877b6c",
                 "shasum": ""
             },
             "require": {
@@ -8516,10 +8516,10 @@
                 "reliefweb"
             ],
             "support": {
-                "source": "https://github.com/UN-OCHA/rwint-api-indexer/tree/v2.2.2",
+                "source": "https://github.com/UN-OCHA/rwint-api-indexer/tree/v2.2.3",
                 "issues": "https://github.com/UN-OCHA/rwint-api-indexer/issues"
             },
-            "time": "2022-03-30T02:35:19+00:00"
+            "time": "2022-04-21T05:33:38+00:00"
         },
         {
             "name": "reliefweb/simple-autocomplete",
diff --git a/symfony.lock b/symfony.lock
index 90c21215b..6c871d7b1 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -452,7 +452,7 @@
         "version": "v2.9.0"
     },
     "reliefweb/api-indexer": {
-        "version": "v2.2.2"
+        "version": "v2.2.3"
     },
     "reliefweb/simple-autocomplete": {
         "version": "v1.3.0"

From fc03a47ce5ddeddc0423df747c7fcd319a004763 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 21 Apr 2022 06:06:32 +0000
Subject: [PATCH 640/720] [RW-470] Change description of the field file to PDF
 only

---
 .../src/Services/ReportFormAlter.php                  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php b/html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php
index 48406d089..7e5b5e412 100644
--- a/html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php
+++ b/html/modules/custom/reliefweb_entities/src/Services/ReportFormAlter.php
@@ -82,6 +82,17 @@ protected function addBundleFormAlterations(array &$form, FormStateInterface $fo
     // Remove Complex Emergency (41764) option for disaster type field.
     FormHelper::removeOptions($form, 'field_disaster_type', [41764]);
 
+    // Change the description of the file field to indicate that only PDF files
+    // are accepted in terms of editorial guidance.
+    if (isset($form['field_file']['widget']['add_more']['files']['#description'])) {
+      $description = $form['field_file']['widget']['add_more']['files']['#description'];
+      $form['field_file']['widget']['add_more']['files']['#description'] = $this->t(
+        'PDF only. Max file size: %max_filesize.',
+        $description->getArguments(),
+        $description->getOptions()
+      );
+    }
+
     // Validate the attachments.
     $form['#validate'][] = [$this, 'validateAttachment'];
 

From fa67f2edf54d8b47bdb21271bda2e5f0caeed38b Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 21 Apr 2022 06:13:52 +0000
Subject: [PATCH 641/720] [RW-472] Fix styling of datepicker month/year

---
 .../components/rw-datepicker/rw-datepicker.css                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-datepicker/rw-datepicker.css b/html/themes/custom/common_design_subtheme/components/rw-datepicker/rw-datepicker.css
index 923cab1f6..0a492ed84 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-datepicker/rw-datepicker.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-datepicker/rw-datepicker.css
@@ -110,7 +110,7 @@
 /* Selected month and year. */
 .rw-datepicker-title-date {
   display: inline-block;
-  width: 158px;
+  width: 150px;
   padding: 0 4px;
   font-size: 16px;
   line-height: 16px;

From 5a568b7617c29403333930b1758f46d5f6e4e016 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Thu, 21 Apr 2022 16:20:38 +0200
Subject: [PATCH 642/720] RW-438 update base theme to v7

---
 composer.json |  2 +-
 composer.lock | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index b2cfb2a14..264cecd3b 100644
--- a/composer.json
+++ b/composer.json
@@ -90,7 +90,7 @@
         "reliefweb/simple-datepicker": "^v1.3.1",
         "symfony/flex": "^2.0",
         "symfony/uid": "^6.0",
-        "unocha/common_design": "^6.0.0",
+        "unocha/common_design": "^7.0.0",
         "webflo/drupal-finder": "^1.2.2"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
index ef109b0ff..64c1fe5b8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b33c52f95904d69a6d064a667c727d0c",
+    "content-hash": "882169504e343e1546a04196cb4ab975",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -13459,16 +13459,16 @@
         },
         {
             "name": "unocha/common_design",
-            "version": "v6.0.0",
+            "version": "v7.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/UN-OCHA/common_design.git",
-                "reference": "6d8222a5d87bfb6effbd22f41676512a021a6c53"
+                "reference": "c52fd2c5302fc0a832272a70e9062372ce8946a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/6d8222a5d87bfb6effbd22f41676512a021a6c53",
-                "reference": "6d8222a5d87bfb6effbd22f41676512a021a6c53",
+                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/c52fd2c5302fc0a832272a70e9062372ce8946a2",
+                "reference": "c52fd2c5302fc0a832272a70e9062372ce8946a2",
                 "shasum": ""
             },
             "require": {
@@ -13482,9 +13482,9 @@
             "description": "OCHA Common Design base theme for Drupal 8",
             "support": {
                 "issues": "https://github.com/UN-OCHA/common_design/issues",
-                "source": "https://github.com/UN-OCHA/common_design/tree/v6.0.0"
+                "source": "https://github.com/UN-OCHA/common_design/tree/v7.0.0"
             },
-            "time": "2022-03-09T10:50:04+00:00"
+            "time": "2022-04-21T13:23:47+00:00"
         },
         {
             "name": "webflo/drupal-finder",
@@ -15153,5 +15153,5 @@
         "php": ">=8.0"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.1.0"
 }

From c704f481a4e0254b08d22ac1339ac112f05a1a0f Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 22 Apr 2022 04:03:18 +0000
Subject: [PATCH 643/720] [RW-478] Prevent PHP warning when image file is
 missing

---
 .../src/Plugin/Field/FieldType/ReliefWebFile.php                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
index c201a4059..35bb964d3 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
@@ -529,7 +529,7 @@ public function renderPreview($style = 'small', $generate = FALSE) {
 
     // @todo store the dimensions or use something faster to get
     // the width and height?
-    $info = getimagesize($uri);
+    $info = @getimagesize($uri);
     if ($info === FALSE) {
       return [];
     }

From cd30824d819947933f705347fe22d8eaf9139d07 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 22 Apr 2022 04:08:59 +0000
Subject: [PATCH 644/720] [RW-476] Add revision information at bottom of
 country, disaster and source pages

---
 .../templates/content/taxonomy-term--country--full.html.twig    | 2 ++
 .../templates/content/taxonomy-term--disaster--full.html.twig   | 2 ++
 .../templates/content/taxonomy-term--source--full.html.twig     | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/templates/content/taxonomy-term--country--full.html.twig b/html/themes/custom/common_design_subtheme/templates/content/taxonomy-term--country--full.html.twig
index 37b932c30..3e52d2183 100644
--- a/html/themes/custom/common_design_subtheme/templates/content/taxonomy-term--country--full.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/content/taxonomy-term--country--full.html.twig
@@ -68,3 +68,5 @@
   {{ term.getPageContent() }}
 
 </article>
+
+{{ term.getHistory() }}
diff --git a/html/themes/custom/common_design_subtheme/templates/content/taxonomy-term--disaster--full.html.twig b/html/themes/custom/common_design_subtheme/templates/content/taxonomy-term--disaster--full.html.twig
index 406336c60..5b5200872 100644
--- a/html/themes/custom/common_design_subtheme/templates/content/taxonomy-term--disaster--full.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/content/taxonomy-term--disaster--full.html.twig
@@ -78,3 +78,5 @@
   {% endif %}
 
 </article>
+
+{{ term.getHistory() }}
diff --git a/html/themes/custom/common_design_subtheme/templates/content/taxonomy-term--source--full.html.twig b/html/themes/custom/common_design_subtheme/templates/content/taxonomy-term--source--full.html.twig
index f4de39c3c..e164dd8bd 100644
--- a/html/themes/custom/common_design_subtheme/templates/content/taxonomy-term--source--full.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/content/taxonomy-term--source--full.html.twig
@@ -48,3 +48,5 @@
   {{ term.getPageContent() }}
 
 </article>
+
+{{ term.getHistory() }}

From d157b94f537973a42e38b3f2ba8c7da4675c0bdd Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 22 Apr 2022 04:49:35 +0000
Subject: [PATCH 645/720] [RW-472] Set date of datepicker when opening it

---
 .../reliefweb_form/js/widget.datepicker.js    | 46 +++++++++++--------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/html/modules/custom/reliefweb_form/js/widget.datepicker.js b/html/modules/custom/reliefweb_form/js/widget.datepicker.js
index 503140beb..0ee9a7065 100644
--- a/html/modules/custom/reliefweb_form/js/widget.datepicker.js
+++ b/html/modules/custom/reliefweb_form/js/widget.datepicker.js
@@ -35,7 +35,10 @@
       // Update the datepicker date based on the input value.
       function updateDatepicker(datepicker, value) {
         // Set the selected date from the value in the input field if valid.
-        if (value) {
+        if (value && value.match(/^\d{4}([/-]\d{2}){0,2}$/)) {
+          value = value.length === 4 ? value + '-01-01' : value;
+          value = value.length === 7 ? value + '-01' : value;
+          value = value.replaceAll('-', '/');
           var date = datepicker.createDate(value + ' UTC');
           if (!date.invalid()) {
             var calendar = datepicker.calendars[0];
@@ -105,17 +108,14 @@
             }
           }
         })
-        .on('opened', function (event) {
-          // Set the selected date from the value in the input field if valid.
-          if (element.value) {
-            var date = datepicker.createDate(element.value + ' UTC');
-            if (!date.invalid()) {
-              var calendar = datepicker.calendars[0];
-              datepicker.setSelection([date], false).updateCalendar(calendar, date);
-            }
-          }
-        })
-        .on('select', function (event) {
+        .hide();
+
+        datepicker.on('opened', function (event) {
+          focusedElement = element;
+          updateDatepicker(datepicker, element.value);
+        });
+
+        datepicker.on('select', function (event) {
           if (event.data && event.data.length) {
             element.value = event.data[0].format(localizedFormat);
           }
@@ -124,8 +124,8 @@
           }
           datepicker.hide();
           triggerEvent(element, 'change');
-        })
-        .hide();
+        });
+
 
         // Ensure the datepicker is the next sibling of the input element.
         element.parentNode.insertBefore(datepicker.container, element.nextSibling);
@@ -144,10 +144,6 @@
             datepicker.hide().clear();
           }
           else {
-            // @todo use a timeout to let the user enter a proper date
-            // and maybe enforce a "neutral" format like YYYY/MM/DD so that
-            // it is less error prone for example to avoid issues with
-            // localized months etc.
             updateDatepicker(datepicker, element.value);
           }
         });
@@ -225,6 +221,10 @@
         // Store references to the datepickers.
         var datepickers = [];
 
+        // Store the reference to the element that was focused when the
+        // datepicker opened.
+        var focusedElement = null;
+
         // Handle click outside of datepickers to close them.
         body.addEventListener('click', function (event) {
           var target = event.target;
@@ -249,6 +249,16 @@
           }
         });
 
+        body.addEventListener('keyup', function (event) {
+          if (event.key === 'Esc' || event.key === 'Escape') {
+            collapseAll(datepickers);
+            if (focusedElement) {
+              focusedElement.focus();
+              focusedElement = null;
+            }
+          }
+        });
+
         // Add a datepicker widget to the elements.
         var elements = document.querySelectorAll('[data-with-datepicker]:not([data-with-datepicker-processed])');
         for (var i = 0, l = elements.length; i < l; i++) {

From d8b631cbaa3266509f5c86b9523d5142406d106e Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 22 Apr 2022 05:31:53 +0000
Subject: [PATCH 646/720] [RW-479] Restore inline_entity_form patch

---
 composer.lock         | 2 +-
 composer.patches.json | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.lock b/composer.lock
index 0aca52ec5..57c3f0051 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b57488f9c9996bbacf6a54bce6dacd43",
+    "content-hash": "b33c52f95904d69a6d064a667c727d0c",
     "packages": [
         {
             "name": "asm89/stack-cors",
diff --git a/composer.patches.json b/composer.patches.json
index 19db282b3..1e929ddd9 100644
--- a/composer.patches.json
+++ b/composer.patches.json
@@ -3,6 +3,9 @@
         "drupal/core" : {
             "https://www.drupal.org/project/drupal/issues/3047110": "patches/core--drupal--3047110-taxonomy-term-moderation-class.patch"
         },
+        "drupal/inline_entity_form": {
+            "https://www.drupal.org/project/inline_entity_form/issues/3226253": "https://git.drupalcode.org/project/inline_entity_form/-/merge_requests/33.diff"
+        },
         "drupal/migrate_tools" : {
             "https://www.drupal.org/project/migrate_tools/issues/3256236": "https://www.drupal.org/files/issues/2021-12-28/invalid_placeholder-3256236-3.patch"
         },

From 2c3dd7cbf9ba41bdbce31fe3922161456418107b Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 22 Apr 2022 05:48:42 +0000
Subject: [PATCH 647/720] [RW-477] Fix issue with display of error message on
 country/disaster profile forms

---
 .../components/reliefweb-links/reliefweb-links.js          | 7 +++++--
 .../reliefweb-section-links/reliefweb-section-links.js     | 4 +++-
 .../reliefweb-user-posting-rights.js                       | 7 +++++--
 .../src/Plugin/Field/FieldWidget/ReliefWebLinks.php        | 7 ++++++-
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/html/modules/custom/reliefweb_fields/components/reliefweb-links/reliefweb-links.js b/html/modules/custom/reliefweb_fields/components/reliefweb-links/reliefweb-links.js
index 1a5be6296..2848c45a5 100644
--- a/html/modules/custom/reliefweb_fields/components/reliefweb-links/reliefweb-links.js
+++ b/html/modules/custom/reliefweb_fields/components/reliefweb-links/reliefweb-links.js
@@ -399,7 +399,8 @@
       // Remove existing error messages in this container.
       var messages = field.querySelectorAll('[data-error-message]');
       for (var i = 0, l = messages.length; i < l; i++) {
-        field.removeChild(messages[i]);
+        var message = messages[i];
+        message.parentNode.removeChild(message);
       }
 
       // Remove existing highligted errors.
@@ -425,7 +426,9 @@
 
         // Add the message at the top of the fieldset.
         var sibling = field.querySelector('div[data-link-form]');
-        field.insertBefore(message, sibling);
+        if (sibling) {
+          sibling.parentNode.insertBefore(message, sibling);
+        }
 
         // Mark the element as erroneous.
         element.setAttribute('data-error', '');
diff --git a/html/modules/custom/reliefweb_fields/components/reliefweb-section-links/reliefweb-section-links.js b/html/modules/custom/reliefweb_fields/components/reliefweb-section-links/reliefweb-section-links.js
index c42790928..5a85a0d6a 100644
--- a/html/modules/custom/reliefweb_fields/components/reliefweb-section-links/reliefweb-section-links.js
+++ b/html/modules/custom/reliefweb_fields/components/reliefweb-section-links/reliefweb-section-links.js
@@ -356,7 +356,9 @@
 
         // Add the message at the top of the fieldset.
         var sibling = this.form.querySelector('div[data-link-form]');
-        this.form.insertBefore(message, sibling);
+        if (sibling) {
+          this.form.insertBefore(message, sibling);
+        }
 
         // Mark the element as erroneous.
         element.setAttribute('data-error', '');
diff --git a/html/modules/custom/reliefweb_fields/components/reliefweb-user-posting-rights/reliefweb-user-posting-rights.js b/html/modules/custom/reliefweb_fields/components/reliefweb-user-posting-rights/reliefweb-user-posting-rights.js
index d6ca6b1e4..68cd0c0b8 100644
--- a/html/modules/custom/reliefweb_fields/components/reliefweb-user-posting-rights/reliefweb-user-posting-rights.js
+++ b/html/modules/custom/reliefweb_fields/components/reliefweb-user-posting-rights/reliefweb-user-posting-rights.js
@@ -267,7 +267,8 @@
       // Remove existing error messages in this container.
       var messages = field.querySelectorAll('[data-error-message]');
       for (var i = 0, l = messages.length; i < l; i++) {
-        field.removeChild(messages[i]);
+        var message = messages[i];
+        message.parentNode.removeChild(message);
       }
 
       // Remove existing highligted errors.
@@ -293,7 +294,9 @@
 
         // Add the message at the top of the fieldset.
         var sibling = field.querySelector('div[data-new-form]');
-        field.insertBefore(message, sibling);
+        if (sibling) {
+          sibling.parentNode.insertBefore(message, sibling);
+        }
 
         // Mark the element as erroneous.
         element.setAttribute('data-error', '');
diff --git a/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebLinks.php b/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebLinks.php
index d80f40c43..3630237b4 100644
--- a/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebLinks.php
+++ b/html/modules/custom/reliefweb_fields/src/Plugin/Field/FieldWidget/ReliefWebLinks.php
@@ -266,7 +266,12 @@ public static function parseLinkData(array &$item, $internal, $use_cover, $gener
 
       // Only nodes are supported as internal links.
       if (empty($path)) {
-        $invalid = t('Invalid internal URL: it must be in the form "/node/123456" or "/reports/xxx" (it can start with https://reliefweb.int).');
+        if (preg_match('#^(https?://[^/]+)?/(node/\d+|report/[^/]+)#', $item['url']) === 1) {
+          $invalid = t('Invalid internal URL: the document was not found.');
+        }
+        else {
+          $invalid = t('Invalid internal URL: it must be in the form "/node/123456" or "/reports/xxx" (it can start with https://reliefweb.int).');
+        }
       }
       elseif (strpos($path, '/node/') === 0 && strlen($path) > 6) {
         $nid = intval(substr($path, 6), 10);

From efcff3b4599c6c48d1db9c8cd129c6fded5311ac Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 22 Apr 2022 07:12:53 +0000
Subject: [PATCH 648/720] [RW-448] Open guidelines in new tab

---
 .../templates/navigation/menu--help.html.twig | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/templates/navigation/menu--help.html.twig b/html/themes/custom/common_design_subtheme/templates/navigation/menu--help.html.twig
index b8d036743..f473ab129 100644
--- a/html/themes/custom/common_design_subtheme/templates/navigation/menu--help.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/navigation/menu--help.html.twig
@@ -60,20 +60,23 @@
           be replaced with a button to show the child menu.
         #}
         {% spaceless %}
-        <a href="{{ item.url }}" id="{{ id }}">
-          {# Add the user icon for the first menu item of the root element. #}
-          {% if menu_level == 0 and item.url|render == '/help' %}
+        {% if menu_level == 0 and item.url|render == '/help' %}
+          <a href="{{ item.url }}" id="{{ id }}">
             <svg class="cd-icon cd-icon--help" aria-hidden="true" focusable="false" width="16" height="16">
               <use xlink:href="#cd-icon--help"></use>
             </svg>
-          {% endif %}
-          {% if menu_level == 0 and item.url|render == '/guidelines' %}
+            <span>{{ title }}</span>
+          </a>
+        {% elseif menu_level == 0 and item.url|render == '/guidelines' %}
+          <a href="{{ item.url }}" id="{{ id }}" target="_blank">
             <svg class="cd-icon cd-icon--education" aria-hidden="true" focusable="false" width="16" height="16">
               <use xlink:href="#cd-icon--education"></use>
             </svg>
-          {% endif %}
-          <span>{{ title }}</span>
-        </a>
+            <span>{{ title }}</span>
+          </a>
+        {% else %}
+          <a href="{{ item.url }}" id="{{ id }}"><span>{{ title }}</span></a>
+        {% endif %}
         {% endspaceless %}
 
         {# If the menu item has children then we mark it as toggable and we'll

From a6b79d9fc5c74573edb1d42a9a472d3c73b19a28 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 22 Apr 2022 07:16:20 +0000
Subject: [PATCH 649/720] [RW-452] Show reference links at bottom of guidelines

---
 ....guideline.field_guideline.field_links.yml |  2 +-
 .../GuidelineSinglePageController.php         | 17 +++-
 .../field--guideline--field-links.html.twig   | 84 +++++++++++++++++++
 3 files changed, 101 insertions(+), 2 deletions(-)
 create mode 100644 html/themes/custom/common_design_subtheme/templates/field/field--guideline--field-links.html.twig

diff --git a/config/field.field.guideline.field_guideline.field_links.yml b/config/field.field.guideline.field_guideline.field_links.yml
index d6b2b34c4..bfe00f931 100644
--- a/config/field.field.guideline.field_guideline.field_links.yml
+++ b/config/field.field.guideline.field_guideline.field_links.yml
@@ -11,7 +11,7 @@ id: guideline.field_guideline.field_links
 field_name: field_links
 entity_type: guideline
 bundle: field_guideline
-label: Links
+label: References
 description: ''
 required: false
 translatable: false
diff --git a/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php b/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
index f2d73d5cc..821ad43b8 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
@@ -67,7 +67,22 @@ public function getPageContent() {
       elseif (!empty($guideline->getParentIds())) {
         $parent = $guideline->getParentIds()[0];
         $id = $guideline->field_short_link->value;
-        $description = check_markup($guideline->field_description->value, $guideline->field_description->format);
+        $description = $guideline->field_description->value;
+
+        // Add the references if any at the bottom of the description. This
+        // will be converted to an HTML list when rendering the description.
+        // This notably enables replacing internal reference links.
+        $references = [];
+        foreach ($guideline->field_links as $link) {
+          if (!empty($link->uri)) {
+            $references[] = $link->uri;
+          }
+        }
+        if (!empty($references)) {
+          $description .= "\n## References\n" . implode("\n- ", $references);
+        }
+
+        $description = check_markup($description, $guideline->field_description->format);
 
         $list[$parent]['children'][$id] = [
           'title' => $guideline->label(),
diff --git a/html/themes/custom/common_design_subtheme/templates/field/field--guideline--field-links.html.twig b/html/themes/custom/common_design_subtheme/templates/field/field--guideline--field-links.html.twig
new file mode 100644
index 000000000..613af0f48
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/templates/field/field--guideline--field-links.html.twig
@@ -0,0 +1,84 @@
+{#
+/**
+ * @file
+ * Theme override for a field.
+ *
+ * To override output, copy the "field.html.twig" from the templates directory
+ * to your theme's directory and customize it, just like customizing other
+ * Drupal templates such as page.html.twig or node.html.twig.
+ *
+ * Instead of overriding the theming for all fields, you can also just override
+ * theming for a subset of fields using
+ * @link themeable Theme hook suggestions. @endlink For example,
+ * here are some theme hook suggestions that can be used for a field_foo field
+ * on an article node type:
+ * - field--node--field-foo--article.html.twig
+ * - field--node--field-foo.html.twig
+ * - field--node--article.html.twig
+ * - field--field-foo.html.twig
+ * - field--text-with-summary.html.twig
+ * - field.html.twig
+ *
+ * Available variables:
+ * - attributes: HTML attributes for the containing element.
+ * - label_hidden: Whether to show the field label or not.
+ * - title_attributes: HTML attributes for the title.
+ * - label: The label for the field.
+ * - multiple: TRUE if a field can contain multiple items.
+ * - items: List of all the field items. Each item contains:
+ *   - attributes: List of HTML attributes for each item.
+ *   - content: The field item's content.
+ * - entity_type: The entity type to which the field belongs.
+ * - field_name: The name of the field.
+ * - field_type: The type of the field.
+ * - label_display: The display settings for the label.
+ *
+ *
+ * @see template_preprocess_field()
+ */
+#}
+{%
+  set classes = [
+    'field',
+    'field--name-' ~ field_name|clean_class,
+    'field--type-' ~ field_type|clean_class,
+    'field--label-' ~ label_display,
+    label_display == 'inline' ? 'clearfix',
+  ]
+%}
+{%
+  set title_classes = [
+    'field__label',
+    label_display == 'visually_hidden' ? 'visually-hidden',
+    'cd-block-title',
+  ]
+%}
+
+{% if label_hidden %}
+  {% if multiple %}
+    <div{{ attributes.addClass(classes, 'field__items') }}>
+      {% for item in items %}
+        <div{{ item.attributes.addClass('field__item') }}>{{ item.content }}</div>
+      {% endfor %}
+    </div>
+  {% else %}
+    {% for item in items %}
+      <div{{ attributes.addClass(classes, 'field__item') }}>{{ item.content }}</div>
+    {% endfor %}
+  {% endif %}
+{% else %}
+  <div{{ attributes.addClass(classes) }}>
+    <h2{{ title_attributes.addClass(title_classes) }}>{{ label }}</h2>
+    {% if multiple %}
+      <ul class="field__items">
+      {% for item in items %}
+        <li{{ item.attributes.addClass('field__item') }}>{{ item.content }}</li>
+      {% endfor %}
+      </ul>
+    {% else %}
+      {% for item in items %}
+        <div{{ item.attributes.addClass('field__item') }}>{{ item.content }}</div>
+      {% endfor %}
+    {% endif %}
+  </div>
+{% endif %}

From 025693cc75bc7b486a78ab196fe612c755136f98 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 22 Apr 2022 07:16:58 +0000
Subject: [PATCH 650/720] [RW-443] Fix caching of guidelines page

---
 .../src/Controller/GuidelineSinglePageController.php             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php b/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
index 821ad43b8..063686e6f 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
@@ -98,6 +98,7 @@ public function getPageContent() {
         return !empty($item['title']) && !empty($item['children']);
       }),
       '#cache' => [
+        'tags' => ['guideline_list'],
         'contexts' => ['user.permissions'],
       ],
       '#attached' => [

From c2532ae3d5da3f8bc4cf55f48d449c0ce6a54e9a Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 22 Apr 2022 07:18:05 +0000
Subject: [PATCH 651/720] [RW-447] Add link to guideline list on guideline page

---
 .../reliefweb_guidelines/src/Entity/Guideline.php      | 10 ++++++++++
 .../guideline--field-guideline--full.html.twig         |  7 ++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_guidelines/src/Entity/Guideline.php b/html/modules/custom/reliefweb_guidelines/src/Entity/Guideline.php
index 2061d817d..303299a63 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Entity/Guideline.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Entity/Guideline.php
@@ -108,4 +108,14 @@ public function getGuidelineList() {
     return !empty($parents) ? reset($parents) : NULL;
   }
 
+  /**
+   * Get the list, this guideline belongs to.
+   *
+   * @return \Drupal\Core\GeneratedLink|null
+   *   Link to the guideline list.
+   */
+  public function getGuidelineListLink() {
+    return $this->getGuidelineList()?->toLink()?->toString();
+  }
+
 }
diff --git a/html/themes/custom/common_design_subtheme/templates/rw-modules/guideline/guideline--field-guideline--full.html.twig b/html/themes/custom/common_design_subtheme/templates/rw-modules/guideline/guideline--field-guideline--full.html.twig
index 476d38ed7..4c9da6f7e 100644
--- a/html/themes/custom/common_design_subtheme/templates/rw-modules/guideline/guideline--field-guideline--full.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/rw-modules/guideline/guideline--field-guideline--full.html.twig
@@ -17,6 +17,11 @@
 #}
 <div class="rw-page-content">
 {% if content %}
-  {{- content -}}
+  {% set parent_link = elements['#guideline'].getGuidelineListLink() %}
+  {% if parent_link %}
+  <p>{% trans %}<strong>Guideline list:</strong> {{ parent_link }}{% endtrans %}</p>
+  {% endif %}
+  {{- content.field_description.0|render|sanitize_html(false, 1) -}}
+  {{- content|without(['field_description']) -}}
 {% endif %}
 </div>

From f95f6745d55506ec04ca0b2bd8192937558cd832 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 22 Apr 2022 07:20:19 +0000
Subject: [PATCH 652/720] [RW-480] Show guidelines on guideline list page

---
 .../src/Entity/GuidelineList.php              | 27 +++++++++++++++++++
 .../guideline--guideline-list--full.html.twig | 23 ++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 html/themes/custom/common_design_subtheme/templates/rw-modules/guideline/guideline--guideline-list--full.html.twig

diff --git a/html/modules/custom/reliefweb_guidelines/src/Entity/GuidelineList.php b/html/modules/custom/reliefweb_guidelines/src/Entity/GuidelineList.php
index 49bf41f1f..4c1b9fd10 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Entity/GuidelineList.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Entity/GuidelineList.php
@@ -51,4 +51,31 @@ public static function postDelete(EntityStorageInterface $storage, array $entiti
     parent::postDelete($storage, $entities);
   }
 
+  /**
+   * Get the list of guidelines under this list.
+   *
+   * @return array
+   *   Render array.
+   */
+  public function getGuidelineLinks() {
+    $children = $this->getChildren();
+    if (!empty($children)) {
+      $links = [];
+      foreach ($children as $child) {
+        $links[] = [
+          'title' => $child->label(),
+          'url' => $child->toUrl(),
+        ];
+      }
+      return [
+        '#theme' => 'links',
+        '#links' => $links,
+        '#cache' => [
+          'tags' => ['guideline_list'],
+        ],
+      ];
+    }
+    return [];
+  }
+
 }
diff --git a/html/themes/custom/common_design_subtheme/templates/rw-modules/guideline/guideline--guideline-list--full.html.twig b/html/themes/custom/common_design_subtheme/templates/rw-modules/guideline/guideline--guideline-list--full.html.twig
new file mode 100644
index 000000000..0bbd608f2
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/templates/rw-modules/guideline/guideline--guideline-list--full.html.twig
@@ -0,0 +1,23 @@
+{#
+/**
+ * @file guideline.html.twig
+ * Default theme implementation to present Guideline data.
+ *
+ * This template is used when viewing Guideline pages.
+ *
+ *
+ * Available variables:
+ * - content: A list of content items. Use 'content' to print all content, or
+ * - attributes: HTML attributes for the container element.
+ *
+ * @see template_preprocess_guideline()
+ *
+ * @ingroup themeable
+ */
+#}
+<div class="rw-page-content">
+{% if content %}
+  {{- content -}}
+  {{- elements['#guideline'].getGuidelineLinks() -}}
+{% endif %}
+</div>

From de4f2a340f0e64afd2a239d9bd0b20fba89960db Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 22 Apr 2022 07:21:24 +0000
Subject: [PATCH 653/720] [RW-481] Limit width of images on guidelines page

---
 .../components/reliefweb-guidelines/reliefweb-guidelines.css  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
index 9cdcdbb55..d8432474a 100644
--- a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
+++ b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
@@ -311,8 +311,10 @@ aside nav a.active + a {
 }
 
 .rw-guidelines-list article img {
+  display: block;
   box-sizing: border-box;
-  max-width: 100%;
+  max-width: 1000px;
+  margin: 10px 0;
   padding: 10px;
   border: 0;
   background-color: #fff;

From b9557406aa3ae19a1fb09ca1ac772372ff450c95 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 22 Apr 2022 08:51:28 +0000
Subject: [PATCH 654/720] [RW-445] Make exit link redirect to referrer on
 guidelines page

---
 .../components/reliefweb-guidelines/reliefweb-guidelines.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.js b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.js
index 08486a0aa..7ba097fdb 100644
--- a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.js
+++ b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.js
@@ -53,6 +53,12 @@
     // Set the active link when the page is loaded.
     setActiveLink(window.location.href);
 
+    // Change the exit link to go to the referrer.
+    var exitLink = document.querySelector('.rw-guidelines-exit-link');
+    if (exitLink && document.referrer) {
+      exitLink.setAttribute('href', document.referrer);
+    }
+
     // Ensure external links open in a new tab/window.
     var links = main.getElementsByTagName('a');
     for (var i = 0, l = links.length; i < l; i++) {

From 451e301cc85058ab0ad456323f2ee188ac960e20 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 22 Apr 2022 08:54:09 +0000
Subject: [PATCH 655/720] [RW-446] Change links on guidelime moderation page

---
 .../src/Entity/Guideline.php                  | 23 +++++++++++++++++++
 .../src/Services/GuidelineModeration.php      |  7 ++----
 ...guideline--field-guideline--full.html.twig |  2 ++
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/html/modules/custom/reliefweb_guidelines/src/Entity/Guideline.php b/html/modules/custom/reliefweb_guidelines/src/Entity/Guideline.php
index 303299a63..a7d076bd5 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Entity/Guideline.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Entity/Guideline.php
@@ -3,6 +3,9 @@
 namespace Drupal\reliefweb_guidelines\Entity;
 
 use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Link;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
+use Drupal\Core\Url;
 use Drupal\guidelines\Entity\Guideline as GuidelineBase;
 use Drupal\reliefweb_moderation\EntityModeratedInterface;
 use Drupal\reliefweb_moderation\EntityModeratedTrait;
@@ -47,6 +50,26 @@ public function getShortId() {
     return $this->id();
   }
 
+  /**
+   * Get the link to the guidelines page.
+   *
+   * @param \Drupal\Core\StringTranslation\TranslatableMarkup|string $title
+   *   Link title.
+   *
+   * @return \Drupal\Core\GeneratedLink|null
+   *   Link to the guidelines page.
+   */
+  public function getLinkToGuidelines($title = '') {
+    $title = $title ?: new TranslatableMarkup('View on guidelines page');
+    return Link::fromTextAndUrl($title, Url::fromUserInput('/guidelines', [
+      'fragment' => $this->getShortId(),
+      'attributes' => [
+        'target' => '_blank',
+        'rel' => 'noopener',
+      ],
+    ]))?->toString();
+  }
+
   /**
    * Generate a random unique short ID.
    *
diff --git a/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineModeration.php b/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineModeration.php
index 950565513..6642e0243 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineModeration.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Services/GuidelineModeration.php
@@ -3,9 +3,7 @@
 namespace Drupal\reliefweb_guidelines\Services;
 
 use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Link;
 use Drupal\Core\Session\AccountInterface;
-use Drupal\Core\Url;
 use Drupal\reliefweb_guidelines\Plugin\Field\FieldWidget\GuidelineFieldTargetSelectWidget;
 use Drupal\reliefweb_moderation\EntityModeratedInterface;
 use Drupal\reliefweb_moderation\ModerationServiceBase;
@@ -82,9 +80,7 @@ public function getRows(array $results) {
       $data = [];
 
       // Title.
-      $data['title'] = Link::fromTextAndUrl($entity->label(), Url::fromUserInput('/guidelines', [
-        'fragment' => $entity->getShortId(),
-      ]));
+      $data['title'] = $entity->toLink()?->toString();
 
       // Information.
       $info = [];
@@ -92,6 +88,7 @@ public function getRows(array $results) {
       if (!empty($list)) {
         $info['list'] = $list->toLink()->toString();
       }
+      $info['link'] = $entity->getLinkToGuidelines($this->t('<em>guidelines</em>'));
       $data['info'] = array_filter($info);
 
       $details = [];
diff --git a/html/themes/custom/common_design_subtheme/templates/rw-modules/guideline/guideline--field-guideline--full.html.twig b/html/themes/custom/common_design_subtheme/templates/rw-modules/guideline/guideline--field-guideline--full.html.twig
index 4c9da6f7e..bbf0ac6aa 100644
--- a/html/themes/custom/common_design_subtheme/templates/rw-modules/guideline/guideline--field-guideline--full.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/rw-modules/guideline/guideline--field-guideline--full.html.twig
@@ -17,10 +17,12 @@
 #}
 <div class="rw-page-content">
 {% if content %}
+  {{- elements['#guideline'].getLinkToGuidelines() -}}
   {% set parent_link = elements['#guideline'].getGuidelineListLink() %}
   {% if parent_link %}
   <p>{% trans %}<strong>Guideline list:</strong> {{ parent_link }}{% endtrans %}</p>
   {% endif %}
+  <hr>
   {{- content.field_description.0|render|sanitize_html(false, 1) -}}
   {{- content|without(['field_description']) -}}
 {% endif %}

From baa263d548c10fad346fbb994c5876e61894aef4 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 22 Apr 2022 08:58:05 +0000
Subject: [PATCH 656/720] [RW-444] Ensure the revision log message field is
 empty when editing content

---
 .../reliefweb_entities/src/EntityFormAlterServiceBase.php     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php b/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
index 12c9d8b66..e59758fc6 100644
--- a/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
+++ b/html/modules/custom/reliefweb_entities/src/EntityFormAlterServiceBase.php
@@ -221,9 +221,11 @@ protected function addRevisionFormAlterations(array &$form, FormStateInterface $
       $form['revision']['#access'] = FALSE;
     }
 
-    // Update the title of the revision log message field.
+    // Update the title of the revision log message field and make sure it's not
+    // populated with the previous message.
     if (isset($form[$revision_field]['widget'][0]['value'])) {
       $form[$revision_field]['widget'][0]['value']['#title'] = $this->t('New comment');
+      $form[$revision_field]['widget'][0]['value']['#default_value'] = '';
       $form[$revision_field]['#group'] = 'revision_information';
     }
   }

From e45b7e85b2b57ffa392527e6c39ac69e861cf9fa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Apr 2022 20:55:38 +0000
Subject: [PATCH 657/720] Bump composer/composer from 2.2.11 to 2.2.12

Bumps [composer/composer](https://github.com/composer/composer) from 2.2.11 to 2.2.12.
- [Release notes](https://github.com/composer/composer/releases)
- [Changelog](https://github.com/composer/composer/blob/main/CHANGELOG.md)
- [Commits](https://github.com/composer/composer/compare/2.2.11...2.2.12)

---
updated-dependencies:
- dependency-name: composer/composer
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 composer.lock | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/composer.lock b/composer.lock
index 57c3f0051..8d9a169c3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -334,16 +334,16 @@
         },
         {
             "name": "composer/composer",
-            "version": "2.2.11",
+            "version": "2.2.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/composer.git",
-                "reference": "2f5bcf0480c13b4fa1ac490aa9344e4402507538"
+                "reference": "ba61e768b410736efe61df01b61f1ec44f51474f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/2f5bcf0480c13b4fa1ac490aa9344e4402507538",
-                "reference": "2f5bcf0480c13b4fa1ac490aa9344e4402507538",
+                "url": "https://api.github.com/repos/composer/composer/zipball/ba61e768b410736efe61df01b61f1ec44f51474f",
+                "reference": "ba61e768b410736efe61df01b61f1ec44f51474f",
                 "shasum": ""
             },
             "require": {
@@ -413,7 +413,7 @@
             "support": {
                 "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/composer/issues",
-                "source": "https://github.com/composer/composer/tree/2.2.11"
+                "source": "https://github.com/composer/composer/tree/2.2.12"
             },
             "funding": [
                 {
@@ -429,7 +429,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-04-01T20:00:52+00:00"
+            "time": "2022-04-13T14:42:25+00:00"
         },
         {
             "name": "composer/installers",
@@ -5475,16 +5475,16 @@
         },
         {
             "name": "justinrainbow/json-schema",
-            "version": "5.2.11",
+            "version": "5.2.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/justinrainbow/json-schema.git",
-                "reference": "2ab6744b7296ded80f8cc4f9509abbff393399aa"
+                "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/2ab6744b7296ded80f8cc4f9509abbff393399aa",
-                "reference": "2ab6744b7296ded80f8cc4f9509abbff393399aa",
+                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/ad87d5a5ca981228e0e205c2bc7dfb8e24559b60",
+                "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60",
                 "shasum": ""
             },
             "require": {
@@ -5539,9 +5539,9 @@
             ],
             "support": {
                 "issues": "https://github.com/justinrainbow/json-schema/issues",
-                "source": "https://github.com/justinrainbow/json-schema/tree/5.2.11"
+                "source": "https://github.com/justinrainbow/json-schema/tree/5.2.12"
             },
-            "time": "2021-07-22T09:24:00+00:00"
+            "time": "2022-04-13T08:02:27+00:00"
         },
         {
             "name": "laminas/laminas-diactoros",
@@ -15153,5 +15153,5 @@
         "php": ">=8.0"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.2.0"
+    "plugin-api-version": "2.3.0"
 }

From 3e10c56bbb68534f69fc77531fbf33906e122a21 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 26 Apr 2022 03:56:54 +0000
Subject: [PATCH 658/720] [RW-438] Use subtheme html layout template

---
 .../templates/layout/html.html.twig           | 61 ++-----------------
 1 file changed, 4 insertions(+), 57 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/templates/layout/html.html.twig b/html/themes/custom/common_design_subtheme/templates/layout/html.html.twig
index 9fc1b07e7..d8648edb6 100644
--- a/html/themes/custom/common_design_subtheme/templates/layout/html.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/layout/html.html.twig
@@ -1,60 +1,7 @@
-{#
-/**
- * @file
- * Theme override for the basic structure of a single Drupal page.
- *
- * Variables:
- * - logged_in: A flag indicating if user is logged in.
- * - root_path: The root path of the current page (e.g., node, admin, user).
- * - node_type: The content type for the current node, if the page is a node.
- * - head_title: List of text elements that make up the head_title variable.
- *   May contain one or more of the following:
- *   - title: The title of the page.
- *   - name: The name of the site.
- *   - slogan: The slogan of the site.
- * - page_top: Initial rendered markup. This should be printed before 'page'.
- * - page: The rendered page markup.
- * - page_bottom: Closing rendered markup. This variable should be printed after
- *   'page'.
- * - db_offline: A flag indicating if the database is offline.
- * - placeholder_token: The token for generating head, css, js and js-bottom
- *   placeholders.
- *
- * @see template_preprocess_html()
- */
-#}
-{%
-  set body_classes = [
-    logged_in ? 'user-logged-in',
-    not root_path ? 'path-frontpage' : 'path-' ~ root_path|clean_class,
-    node_type ? 'page-node-type-' ~ node_type|clean_class,
-    db_offline ? 'db-offline',
-  ]
-%}
-<!DOCTYPE html>
-<html{{ html_attributes.addClass('no-js') }}>
-  <head>
-    <head-placeholder token="{{ placeholder_token }}">
-    <title>{{ head_title|safe_join(' | ') }}</title>
-    <css-placeholder token="{{ placeholder_token }}">
-    <js-placeholder token="{{ placeholder_token }}">
-  </head>
-  <body{{ attributes.addClass(body_classes) }}>
-    {#
-      Keyboard navigation/accessibility link to main content section in
-      page.html.twig.
-    #}
-    <a href="#main-content" class="visually-hidden focusable skip-link">
-      {{ 'Skip to main content'|t }}
-    </a>
-    {{ page_top }}
-    {{ page }}
-    {{ page_bottom }}
+{% embed '@common_design/layout/html.html.twig' %}
 
-    {% block icons %}
+  {% block icons %}
     {% include '@common_design_subtheme/cd/cd-icons/cd-icons.html.twig' %}
-    {% endblock %}
+  {% endblock %}
 
-    <js-bottom-placeholder token="{{ placeholder_token }}">
-  </body>
-</html>
+{% endembed %}

From 8b4fc76fcd57d79f2881a576ab92aa5fbae13f46 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 26 Apr 2022 04:08:56 +0000
Subject: [PATCH 659/720] [RW-469] Use the  for the admin menu headings

---
 .../components/rw-admin-menu/rw-admin-menu.css                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-admin-menu/rw-admin-menu.css b/html/themes/custom/common_design_subtheme/components/rw-admin-menu/rw-admin-menu.css
index 7c9cbcfe4..847602eaf 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-admin-menu/rw-admin-menu.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-admin-menu/rw-admin-menu.css
@@ -81,7 +81,7 @@
 .admin-menu h3 {
   margin: 0;
   padding: 0;
-  color: #cef0fd;
+  color: var(--brand-grey);
   font-size: 12px;
   font-weight: lighter;
 }

From fe59c6b8d541c7ebc8cc710b49648ed3e321989d Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 26 Apr 2022 05:08:25 +0000
Subject: [PATCH 660/720] [RW-485] convert /guideline/xxx to links

---
 config/filter.format.guideline.yml            | 87 ++++++++++++++++++-
 .../src/Plugin/Filter/GuidelineLinkFilter.php | 36 ++++++++
 2 files changed, 120 insertions(+), 3 deletions(-)
 create mode 100644 html/modules/custom/reliefweb_guidelines/src/Plugin/Filter/GuidelineLinkFilter.php

diff --git a/config/filter.format.guideline.yml b/config/filter.format.guideline.yml
index ecbb3096e..55c6bdafc 100644
--- a/config/filter.format.guideline.yml
+++ b/config/filter.format.guideline.yml
@@ -3,7 +3,10 @@ langcode: en
 status: true
 dependencies:
   module:
+    - editor
     - media
+    - reliefweb_fields
+    - reliefweb_guidelines
     - reliefweb_utility
 name: Guideline
 format: guideline
@@ -13,19 +16,97 @@ filters:
     id: reliefweb_token_filter
     provider: reliefweb_utility
     status: false
-    weight: 0
+    weight: -39
     settings:
       replace_empty: '0'
   filter_markdown:
     id: filter_markdown
     provider: reliefweb_utility
     status: true
-    weight: -20
+    weight: -49
     settings: {  }
   filter_url:
     id: filter_url
     provider: filter
     status: true
-    weight: 0
+    weight: -48
     settings:
       filter_url_length: 72
+  editor_file_reference:
+    id: editor_file_reference
+    provider: editor
+    status: false
+    weight: -45
+    settings: {  }
+  filter_html_image_secure:
+    id: filter_html_image_secure
+    provider: filter
+    status: false
+    weight: -38
+    settings: {  }
+  filter_html:
+    id: filter_html
+    provider: filter
+    status: false
+    weight: -47
+    settings:
+      allowed_html: '<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type=''1 A I''> <li> <dl> <dt> <dd> <h2 id=''jump-*''> <h3 id> <h4 id> <h5 id> <h6 id>'
+      filter_html_help: true
+      filter_html_nofollow: false
+  filter_autop:
+    id: filter_autop
+    provider: filter
+    status: false
+    weight: -43
+    settings: {  }
+  filter_align:
+    id: filter_align
+    provider: filter
+    status: false
+    weight: -44
+    settings: {  }
+  filter_caption:
+    id: filter_caption
+    provider: filter
+    status: false
+    weight: -42
+    settings: {  }
+  filter_htmlcorrector:
+    id: filter_htmlcorrector
+    provider: filter
+    status: false
+    weight: -37
+    settings: {  }
+  filter_html_escape:
+    id: filter_html_escape
+    provider: filter
+    status: false
+    weight: -46
+    settings: {  }
+  media_embed:
+    id: media_embed
+    provider: media
+    status: false
+    weight: -36
+    settings:
+      default_view_mode: default
+      allowed_view_modes: {  }
+      allowed_media_types: {  }
+  reliefweb_formatted_text:
+    id: reliefweb_formatted_text
+    provider: reliefweb_fields
+    status: false
+    weight: -41
+    settings: {  }
+  filter_guideline_link:
+    id: filter_guideline_link
+    provider: reliefweb_guidelines
+    status: true
+    weight: -50
+    settings: {  }
+  filter_iframe:
+    id: filter_iframe
+    provider: reliefweb_utility
+    status: false
+    weight: -40
+    settings: {  }
diff --git a/html/modules/custom/reliefweb_guidelines/src/Plugin/Filter/GuidelineLinkFilter.php b/html/modules/custom/reliefweb_guidelines/src/Plugin/Filter/GuidelineLinkFilter.php
new file mode 100644
index 000000000..6f1e6085d
--- /dev/null
+++ b/html/modules/custom/reliefweb_guidelines/src/Plugin/Filter/GuidelineLinkFilter.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Drupal\reliefweb_guidelines\Plugin\Filter;
+
+use Drupal\filter\FilterProcessResult;
+use Drupal\filter\Plugin\FilterBase;
+
+/**
+ * Provides a filter to convert guideline links.
+ *
+ * Note: this should be run before the markdown filter.
+ *
+ * @Filter(
+ *   id = "filter_guideline_link",
+ *   title = @Translation("Guideline Link Filter"),
+ *   description = @Translation("Convert guideline links"),
+ *   type = Drupal\filter\Plugin\FilterInterface::TYPE_MARKUP_LANGUAGE,
+ * )
+ */
+class GuidelineLinkFilter extends FilterBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function process($text, $langcode) {
+    // Convert links in the form `/guidelines/abcdefgh` to
+    // `[](/guidelines/abcdefgh)` so they can be converted to links by the
+    // markdown filter.
+    $text = preg_replace('#(^|\s)(/guideline/[0-9a-zA-Z]{8})([^0-9a-zA-Z]|$)#', '$1[$2]($2)$3', $text);
+
+    $result = new FilterProcessResult();
+    $result->setProcessedText($text);
+    return $result;
+  }
+
+}

From bf104531b34a1844faf1d8c9246f88670b1a272a Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 26 Apr 2022 05:09:11 +0000
Subject: [PATCH 661/720] [RW-486] Add edit link to guidelines and sanitize
 html

---
 .../reliefweb-guidelines.css                  |  6 ++++++
 .../GuidelineSinglePageController.php         | 21 ++++++++++++++++++-
 .../reliefweb-guidelines-list.html.twig       |  5 ++++-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
index d8432474a..ae28488d2 100644
--- a/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
+++ b/html/modules/custom/reliefweb_guidelines/components/reliefweb-guidelines/reliefweb-guidelines.css
@@ -839,6 +839,12 @@ aside nav a.active + a {
   background: url("./assets/external-link.svg") 0 0 no-repeat;
 }
 
+/* Footer with the link to edit the guideline. */
+.rw-guidelines-list article footer {
+  padding-top: 10px;
+  border-top: 1px solid #eee;
+}
+
 .rw-guidelines-exit-link {
   position: absolute;
   top: 18px;
diff --git a/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php b/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
index 063686e6f..90dd03c28 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
@@ -6,6 +6,7 @@
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Render\Markup;
+use Drupal\Core\Session\AccountProxyInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -13,6 +14,13 @@
  */
 class GuidelineSinglePageController extends ControllerBase {
 
+  /**
+   * The current user.
+   *
+   * @var \Drupal\Core\Session\AccountProxyInterface
+   */
+  protected $currentUser;
+
   /**
    * The entity type manager.
    *
@@ -23,10 +31,16 @@ class GuidelineSinglePageController extends ControllerBase {
   /**
    * Constructor.
    *
+   * @param \Drupal\Core\Session\AccountProxyInterface $current_user
+   *   The current user.
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The entity type manager service.
    */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager) {
+  public function __construct(
+    AccountProxyInterface $current_user,
+    EntityTypeManagerInterface $entity_type_manager
+  ) {
+    $this->currentUser = $current_user;
     $this->entityTypeManager = $entity_type_manager;
   }
 
@@ -35,6 +49,7 @@ public function __construct(EntityTypeManagerInterface $entity_type_manager) {
    */
   public static function create(ContainerInterface $container) {
     return new static(
+      $container->get('current_user'),
       $container->get('entity_type.manager')
     );
   }
@@ -88,6 +103,10 @@ public function getPageContent() {
           'title' => $guideline->label(),
           'description' => static::replaceLinks($description, 'blank-image'),
         ];
+
+        if ($this->currentUser->hasPermission('edit guideline entities')) {
+          $list[$parent]['children'][$id]['edit'] = $guideline->toUrl('edit-form')->toString();
+        }
       }
     }
 
diff --git a/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-list.html.twig b/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-list.html.twig
index b70bc9b89..f5fffc251 100644
--- a/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-list.html.twig
+++ b/html/modules/custom/reliefweb_guidelines/templates/reliefweb-guidelines-list.html.twig
@@ -40,7 +40,10 @@
         {% for shortid, child in guideline.children %}
           <article id="{{ shortid }}" class="rw-guidelines-item">
             <h2><span>{{ guideline.title }}</span> {{ child.title }}</h2>
-            <div>{{ child.description }}</div>
+            <div>{{ child.description|render|sanitize_html(false, 2, ['data-src']) }}</div>
+            {% if child.edit is not empty %}
+            <footer><a href="{{ child.edit }}">edit</a></footer>
+            {% endif %}
           </article>
         {% endfor %}
       {% endfor %}

From 4f74c9e605189bc2042d620e9b1b8213c4c95e2d Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 26 Apr 2022 13:33:11 +0200
Subject: [PATCH 662/720] RW-487 update base theme version

---
 composer.lock | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/composer.lock b/composer.lock
index 9aa66d52c..7c814a971 100644
--- a/composer.lock
+++ b/composer.lock
@@ -13459,16 +13459,16 @@
         },
         {
             "name": "unocha/common_design",
-            "version": "v7.0.0",
+            "version": "v7.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/UN-OCHA/common_design.git",
-                "reference": "c52fd2c5302fc0a832272a70e9062372ce8946a2"
+                "reference": "b6b3a4f5c9b6360fa02155535de689b55d5983c2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/c52fd2c5302fc0a832272a70e9062372ce8946a2",
-                "reference": "c52fd2c5302fc0a832272a70e9062372ce8946a2",
+                "url": "https://api.github.com/repos/UN-OCHA/common_design/zipball/b6b3a4f5c9b6360fa02155535de689b55d5983c2",
+                "reference": "b6b3a4f5c9b6360fa02155535de689b55d5983c2",
                 "shasum": ""
             },
             "require": {
@@ -13482,9 +13482,9 @@
             "description": "OCHA Common Design base theme for Drupal 8",
             "support": {
                 "issues": "https://github.com/UN-OCHA/common_design/issues",
-                "source": "https://github.com/UN-OCHA/common_design/tree/v7.0.0"
+                "source": "https://github.com/UN-OCHA/common_design/tree/v7.0.1"
             },
-            "time": "2022-04-21T13:23:47+00:00"
+            "time": "2022-04-26T07:53:53+00:00"
         },
         {
             "name": "webflo/drupal-finder",
@@ -15153,5 +15153,5 @@
         "php": ">=8.0"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.1.0"
 }

From ab7585daa2e800204c870efc6b7f038ff9298a94 Mon Sep 17 00:00:00 2001
From: left23 <lcdemc@gmail.com>
Date: Tue, 26 Apr 2022 13:50:08 +0200
Subject: [PATCH 663/720] RW-487 update help menu partial with changes from the
 base theme

---
 .../templates/navigation/menu--help.html.twig                 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/templates/navigation/menu--help.html.twig b/html/themes/custom/common_design_subtheme/templates/navigation/menu--help.html.twig
index f473ab129..e61843ad8 100644
--- a/html/themes/custom/common_design_subtheme/templates/navigation/menu--help.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/navigation/menu--help.html.twig
@@ -37,6 +37,8 @@
       ]
     %}
 
+    {% set parent_id = attributes.id ?? ('cd-help-menu-' ~ menu_level) %}
+
     <ul{{ attributes.addClass(menu_classes) }}>
 
     {% for item in items %}
@@ -50,7 +52,7 @@
       %}
 
       {% set title = item.title %}
-      {% set id = ('cd-help-menu-item-' ~ menu_level ~ '-' ~ loop.index)|clean_id %}
+      {% set id = (parent_id ~ '-item-' ~ loop.index)|clean_id %}
 
       <li{{ item.attributes.addClass(classes) }}>
 

From 3e5e522a52f2497ff44850e3fb8e7306660b9704 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 27 Apr 2022 00:15:23 +0000
Subject: [PATCH 664/720] [RW-487] Update composer plugin api version

---
 composer.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.lock b/composer.lock
index 7c814a971..3a698318a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -15153,5 +15153,5 @@
         "php": ">=8.0"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.3.0"
 }

From 740861aa38941c61fa67461dfb888ea2b220e9ab Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 27 Apr 2022 03:10:32 +0000
Subject: [PATCH 665/720] [RW-483] Fix issue with replaced file URL

---
 .../Plugin/Field/FieldWidget/ReliefWebFile.php  | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
index cde7e45e7..e398a60e8 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
@@ -310,13 +310,16 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
     // Check if the attachment was replaced.
     $original_item = $this->getOriginalFileItem($item);
     if (isset($original_item) && $original_item->getFileUuid() !== $item->getFileUuid()) {
-      $element['replaced_file'] = [
-        '#type' => 'link',
-        '#title' => $this->formatFileItemInformation($original_item),
-        // We add a timestamp to prevent caching by the browser so that
-        // it can display replaced files.
-        '#url' => $original_item->getFileUrl()->setOption('query', ['time' => microtime(TRUE)]),
-      ];
+      $replaced_file_url = $original_item->getFileUrl();
+      if (!empty($replaced_file_url)) {
+        $element['replaced_file'] = [
+          '#type' => 'link',
+          '#title' => $this->formatFileItemInformation($original_item),
+          // We add a timestamp to prevent caching by the browser so that
+          // it can display replaced files.
+          '#url' => $replaced_file_url->setOption('query', ['time' => microtime(TRUE)]),
+        ];
+      }
     }
 
     // Information fields.

From 7f6f5083cd0c8d23cf493118cfd962d545f156b6 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 27 Apr 2022 03:11:59 +0000
Subject: [PATCH 666/720] [RW-488] Return a 404 when connection to the docstore
 fails

---
 docker/etc/nginx/custom/01_attachment_redirections.conf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docker/etc/nginx/custom/01_attachment_redirections.conf b/docker/etc/nginx/custom/01_attachment_redirections.conf
index 0c1d5c3fd..2e0c29130 100644
--- a/docker/etc/nginx/custom/01_attachment_redirections.conf
+++ b/docker/etc/nginx/custom/01_attachment_redirections.conf
@@ -45,6 +45,9 @@ location @docstore-file {
   ## "404 Not Found" message.
   error_page 404 @attachment-404;
 
+  ## Return a 404 when the connection to the docstore fails.
+  error_page 502 @attachment-404;
+
   ## Make sure we can catch the 404 error to be able to use our handler.
   proxy_intercept_errors on;
 

From bba1ad6ea36221332fc28dc8dc14d0eb982341b4 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 27 Apr 2022 03:14:13 +0000
Subject: [PATCH 667/720] [RW-457] Add parameter to preview image URLs to bust
 browser cache

---
 composer.lock                                      | 12 ++++++------
 .../reliefweb_docstore/reliefweb_docstore.module   | 14 +++++++-------
 .../src/Plugin/Field/FieldType/ReliefWebFile.php   |  9 ++++++++-
 .../src/Plugin/Field/FieldWidget/ReliefWebFile.php |  3 ---
 .../reliefweb_rivers/src/Services/ReportRiver.php  |  5 ++---
 5 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/composer.lock b/composer.lock
index 3a698318a..55b6ff390 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8467,16 +8467,16 @@
         },
         {
             "name": "reliefweb/api-indexer",
-            "version": "v2.2.3",
+            "version": "v2.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/UN-OCHA/rwint-api-indexer.git",
-                "reference": "1c9084bca9233ee98810fe013e2c86809f877b6c"
+                "reference": "bc1aee903bd7150da5fcd2cee593f6c6176ac26f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/UN-OCHA/rwint-api-indexer/zipball/1c9084bca9233ee98810fe013e2c86809f877b6c",
-                "reference": "1c9084bca9233ee98810fe013e2c86809f877b6c",
+                "url": "https://api.github.com/repos/UN-OCHA/rwint-api-indexer/zipball/bc1aee903bd7150da5fcd2cee593f6c6176ac26f",
+                "reference": "bc1aee903bd7150da5fcd2cee593f6c6176ac26f",
                 "shasum": ""
             },
             "require": {
@@ -8516,10 +8516,10 @@
                 "reliefweb"
             ],
             "support": {
-                "source": "https://github.com/UN-OCHA/rwint-api-indexer/tree/v2.2.3",
+                "source": "https://github.com/UN-OCHA/rwint-api-indexer/tree/v2.2.4",
                 "issues": "https://github.com/UN-OCHA/rwint-api-indexer/issues"
             },
-            "time": "2022-04-21T05:33:38+00:00"
+            "time": "2022-04-27T03:03:45+00:00"
         },
         {
             "name": "reliefweb/simple-autocomplete",
diff --git a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
index 0ca6e0d3b..576cabf78 100644
--- a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
+++ b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
@@ -54,15 +54,15 @@ function reliefweb_docstore_theme() {
 /**
  * Implemenents hook_preprocess_HOOK() for "image_style".
  */
-function reliefweb_docstore_preprocess_image_style(&$variables) {
-  // Workaround to prevent the browser from caching the derivative when
-  // rendered in the form for example, so that it always get the fresh one
-  // when the image is regenerated.
-  if (isset($variables['image']['#attributes']['data-no-cache'])) {
+function reliefweb_docstore_preprocess_image_style__preview(&$variables) {
+  // We add a parameter to the image derivative URL to ensure the correct
+  // version is served.
+  if (isset($variables['image']['#attributes']['data-version'])) {
+    $version = $variables['image']['#attributes']['data-version'];
     $uri = $variables['image']['#uri'];
-    $uri .= (strpos($uri, '?') !== FALSE ? '&' : '?') . 'time=' . microtime(TRUE);
+    $uri .= (strpos($uri, '?') !== FALSE ? '&' : '?') . $version;
     $variables['image']['#uri'] = $uri;
-    unset($variables['image']['#attributes']['data-no-cache']);
+    unset($variables['image']['#attributes']['data-version']);
   }
 }
 
diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
index 35bb964d3..b2877465e 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
@@ -535,7 +535,7 @@ public function renderPreview($style = 'small', $generate = FALSE) {
     }
 
     return [
-      '#theme' => 'image_style',
+      '#theme' => 'image_style__preview',
       '#style_name' => $style,
       '#uri' => $uri,
       '#alt' => $this->t('Preview of @file_name', [
@@ -543,6 +543,13 @@ public function renderPreview($style = 'small', $generate = FALSE) {
       ]),
       '#attributes' => [
         'class' => ['rw-file-preview'],
+        'data-version' => implode('-', [
+          // Once the file is saved it will have a revision ID, until then to
+          // ensure the preview image is not cached, we use its file ID.
+          $this->getRevisionId() ?: $preview->id(),
+          $this->getPreviewPage(),
+          $this->getPreviewRotation(),
+        ]),
       ],
       '#width' => $info[0],
       '#height' => $info[1],
diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
index e398a60e8..4a10976ae 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
@@ -366,9 +366,6 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
           // Add state to hide the preview if "no preview" is selected.
           if (!empty($element['preview'])) {
             $element['preview']['#type'] = 'item';
-            // Prevent the caching of the derivative image.
-            // @see reliefweb_docstore_preprocess_image_style()
-            $element['preview']['#attributes']['data-no-cache'] = TRUE;
             $element['preview']['#states']['invisible'] = [
               ':input[name="' . $field_name . '[' . $delta . '][preview_page]"]' => ['value' => 0],
             ];
diff --git a/html/modules/custom/reliefweb_rivers/src/Services/ReportRiver.php b/html/modules/custom/reliefweb_rivers/src/Services/ReportRiver.php
index ca549d8b3..e4556bd5c 100644
--- a/html/modules/custom/reliefweb_rivers/src/Services/ReportRiver.php
+++ b/html/modules/custom/reliefweb_rivers/src/Services/ReportRiver.php
@@ -415,10 +415,9 @@ public function parseApiData(array $api_data, $view = '') {
         $preview = $fields['file'][0]['preview'];
         $url = $preview['url-thumb'] ?? $preview['url-small'] ?? '';
         if (!empty($url)) {
+          $version = $preview['version'] ?? $fields['file'][0]['id'] ?? 0;
           $data['preview'] = [
-            // @todo once the report attachments have been added back,
-            // generate the appropriate preview URL based on the file name.
-            'url' => UrlHelper::stripDangerousProtocols($url),
+            'url' => UrlHelper::stripDangerousProtocols($url) . '?' . $version,
             // We don't have any good label/description for the file
             // previews so we use an empty alt to mark them as decorative
             // so that assistive technologies will ignore them.

From 9a2834fb9c73f8801c4198e9202cfaa156120528 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 28 Apr 2022 00:08:20 +0000
Subject: [PATCH 668/720] [RW-489] Rename reliefweb_docstore to reliefweb_files

---
 ...ntity_form_display.node.report.default.yml |  2 +-
 ...ntity_view_display.node.report.default.yml |  2 +-
 config/core.extension.yml                     |  2 +-
 config/field.field.node.report.field_file.yml |  2 +-
 config/field.storage.node.field_file.yml      |  4 +-
 ...tings.yml => reliefweb_files.settings.yml} |  6 +--
 config/user.role.editor.yml                   |  2 +-
 .../reliefweb_docstore/drush.services.yml     |  6 ---
 .../reliefweb_docstore.info.yml               |  5 ---
 .../reliefweb_docstore.services.yml           |  8 ----
 .../README.md                                 | 37 ++++++++---------
 .../install/reliefweb_files.settings.yml}     |  6 +--
 .../config/schema/reliefweb_files.schema.yml} |  8 ++--
 .../custom/reliefweb_files/drush.services.yml |  6 +++
 .../reliefweb_files/reliefweb_files.info.yml  |  5 +++
 .../reliefweb_files.libraries.yml}            |  0
 .../reliefweb_files.module}                   | 18 ++++-----
 .../reliefweb_files.permissions.yml}          |  0
 .../reliefweb_files.routing.yml}              |  8 ++--
 .../reliefweb_files.services.yml              |  8 ++++
 .../src/Commands/ReliefWebFilesCommands.php}  | 40 +++++++++----------
 .../src/Controller/FileDownloadController.php | 18 ++++-----
 .../ImageStyleDownloadController.php          |  6 +--
 .../Field/FieldFormatter/ReliefWebFile.php    |  4 +-
 .../Plugin/Field/FieldType/ReliefWebFile.php  | 16 ++++----
 .../Field/FieldType/ReliefWebFileList.php     | 12 +++---
 .../Field/FieldWidget/ReliefWebFile.php       | 20 +++++-----
 .../src/Routing/RouteSubscriber.php           |  6 +--
 .../src/Services/DocstoreClient.php           | 14 +++----
 ...reliefweb-file-list--interactive.html.twig |  0
 .../templates/reliefweb-file-list.html.twig   |  0
 .../reliefweb-file-widget-item.html.twig      |  0
 .../templates/reliefweb-file-widget.html.twig |  0
 .../src/Command/ReliefwebImportCommand.php    |  2 +-
 .../reliefweb_meta/reliefweb_meta.module      |  2 +-
 .../src/Plugin/migrate/source/Report.php      |  2 +-
 .../Plugin/migrate/source/TaxonomyTerm.php    |  2 +-
 .../src/Services/EntityHistory.php            |  2 +-
 .../ReliefwebSubscriptionsSendCommand.php     |  2 +-
 .../components/rw-form/rw-form--widget.css    |  2 +-
 ...reliefweb-file-list--interactive.html.twig |  2 +-
 .../reliefweb-file-list.html.twig             |  2 +-
 42 files changed, 143 insertions(+), 146 deletions(-)
 rename config/{reliefweb_docstore.settings.yml => reliefweb_files.settings.yml} (67%)
 delete mode 100644 html/modules/custom/reliefweb_docstore/drush.services.yml
 delete mode 100644 html/modules/custom/reliefweb_docstore/reliefweb_docstore.info.yml
 delete mode 100644 html/modules/custom/reliefweb_docstore/reliefweb_docstore.services.yml
 rename html/modules/custom/{reliefweb_docstore => reliefweb_files}/README.md (75%)
 rename html/modules/custom/{reliefweb_docstore/config/install/reliefweb_docstore.settings.yml => reliefweb_files/config/install/reliefweb_files.settings.yml} (85%)
 rename html/modules/custom/{reliefweb_docstore/config/schema/reliefweb_docstore.schema.yml => reliefweb_files/config/schema/reliefweb_files.schema.yml} (90%)
 create mode 100644 html/modules/custom/reliefweb_files/drush.services.yml
 create mode 100644 html/modules/custom/reliefweb_files/reliefweb_files.info.yml
 rename html/modules/custom/{reliefweb_docstore/reliefweb_docstore.libraries.yml => reliefweb_files/reliefweb_files.libraries.yml} (100%)
 rename html/modules/custom/{reliefweb_docstore/reliefweb_docstore.module => reliefweb_files/reliefweb_files.module} (88%)
 rename html/modules/custom/{reliefweb_docstore/reliefweb_docstore.permissions.yml => reliefweb_files/reliefweb_files.permissions.yml} (100%)
 rename html/modules/custom/{reliefweb_docstore/reliefweb_docstore.routing.yml => reliefweb_files/reliefweb_files.routing.yml} (50%)
 create mode 100644 html/modules/custom/reliefweb_files/reliefweb_files.services.yml
 rename html/modules/custom/{reliefweb_docstore/src/Commands/ReliefWebDocstoreCommands.php => reliefweb_files/src/Commands/ReliefWebFilesCommands.php} (96%)
 rename html/modules/custom/{reliefweb_docstore => reliefweb_files}/src/Controller/FileDownloadController.php (95%)
 rename html/modules/custom/{reliefweb_docstore => reliefweb_files}/src/Controller/ImageStyleDownloadController.php (98%)
 rename html/modules/custom/{reliefweb_docstore => reliefweb_files}/src/Plugin/Field/FieldFormatter/ReliefWebFile.php (92%)
 rename html/modules/custom/{reliefweb_docstore => reliefweb_files}/src/Plugin/Field/FieldType/ReliefWebFile.php (99%)
 rename html/modules/custom/{reliefweb_docstore => reliefweb_files}/src/Plugin/Field/FieldType/ReliefWebFileList.php (97%)
 rename html/modules/custom/{reliefweb_docstore => reliefweb_files}/src/Plugin/Field/FieldWidget/ReliefWebFile.php (97%)
 rename html/modules/custom/{reliefweb_docstore => reliefweb_files}/src/Routing/RouteSubscriber.php (70%)
 rename html/modules/custom/{reliefweb_docstore => reliefweb_files}/src/Services/DocstoreClient.php (97%)
 rename html/modules/custom/{reliefweb_docstore => reliefweb_files}/templates/reliefweb-file-list--interactive.html.twig (100%)
 rename html/modules/custom/{reliefweb_docstore => reliefweb_files}/templates/reliefweb-file-list.html.twig (100%)
 rename html/modules/custom/{reliefweb_docstore => reliefweb_files}/templates/reliefweb-file-widget-item.html.twig (100%)
 rename html/modules/custom/{reliefweb_docstore => reliefweb_files}/templates/reliefweb-file-widget.html.twig (100%)

diff --git a/config/core.entity_form_display.node.report.default.yml b/config/core.entity_form_display.node.report.default.yml
index 856a5c4ce..88365be01 100644
--- a/config/core.entity_form_display.node.report.default.yml
+++ b/config/core.entity_form_display.node.report.default.yml
@@ -34,7 +34,7 @@ dependencies:
     - datetime
     - inline_entity_form
     - path
-    - reliefweb_docstore
+    - reliefweb_files
     - reliefweb_fields
     - text
 id: node.report.default
diff --git a/config/core.entity_view_display.node.report.default.yml b/config/core.entity_view_display.node.report.default.yml
index 1a4416061..bfb00fdb4 100644
--- a/config/core.entity_view_display.node.report.default.yml
+++ b/config/core.entity_view_display.node.report.default.yml
@@ -30,7 +30,7 @@ dependencies:
     - node.type.report
   module:
     - datetime
-    - reliefweb_docstore
+    - reliefweb_files
     - text
     - user
 id: node.report.default
diff --git a/config/core.extension.yml b/config/core.extension.yml
index a0666eb97..894f5f70f 100644
--- a/config/core.extension.yml
+++ b/config/core.extension.yml
@@ -60,10 +60,10 @@ module:
   reliefweb_bookmarks: 0
   reliefweb_contact: 0
   reliefweb_disaster_map: 0
-  reliefweb_docstore: 0
   reliefweb_dsr: 0
   reliefweb_entities: 0
   reliefweb_fields: 0
+  reliefweb_files: 0
   reliefweb_form: 0
   reliefweb_guidelines: 0
   reliefweb_homepage: 0
diff --git a/config/field.field.node.report.field_file.yml b/config/field.field.node.report.field_file.yml
index 3ca0f7029..693101b52 100644
--- a/config/field.field.node.report.field_file.yml
+++ b/config/field.field.node.report.field_file.yml
@@ -6,7 +6,7 @@ dependencies:
     - field.storage.node.field_file
     - node.type.report
   module:
-    - reliefweb_docstore
+    - reliefweb_files
 id: node.report.field_file
 field_name: field_file
 entity_type: node
diff --git a/config/field.storage.node.field_file.yml b/config/field.storage.node.field_file.yml
index 26a9a0bc6..98d8c8635 100644
--- a/config/field.storage.node.field_file.yml
+++ b/config/field.storage.node.field_file.yml
@@ -4,13 +4,13 @@ status: true
 dependencies:
   module:
     - node
-    - reliefweb_docstore
+    - reliefweb_files
 id: node.field_file
 field_name: field_file
 entity_type: node
 type: reliefweb_file
 settings: {  }
-module: reliefweb_docstore
+module: reliefweb_files
 locked: false
 cardinality: 1
 translatable: true
diff --git a/config/reliefweb_docstore.settings.yml b/config/reliefweb_files.settings.yml
similarity index 67%
rename from config/reliefweb_docstore.settings.yml
rename to config/reliefweb_files.settings.yml
index ad0839267..fc546cfcd 100644
--- a/config/reliefweb_docstore.settings.yml
+++ b/config/reliefweb_files.settings.yml
@@ -1,7 +1,7 @@
 docstore_url: ''
-provider_uuid: ''
-api_key: ''
-prefix: reliefweb_
+docstore_provider_uuid: ''
+docstore_api_key: ''
+docstore_prefix: reliefweb_
 local: true
 file_directory: attachments
 preview_directory: previews
diff --git a/config/user.role.editor.yml b/config/user.role.editor.yml
index 9d199c111..4dd52bb0e 100644
--- a/config/user.role.editor.yml
+++ b/config/user.role.editor.yml
@@ -30,7 +30,7 @@ dependencies:
     - media
     - node
     - path
-    - reliefweb_docstore
+    - reliefweb_files
     - reliefweb_fields
     - reliefweb_form
     - reliefweb_guidelines
diff --git a/html/modules/custom/reliefweb_docstore/drush.services.yml b/html/modules/custom/reliefweb_docstore/drush.services.yml
deleted file mode 100644
index ebb28a892..000000000
--- a/html/modules/custom/reliefweb_docstore/drush.services.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-services:
-  reliefweb_docstore.commands:
-    class: \Drupal\reliefweb_docstore\Commands\ReliefWebDocstoreCommands
-    arguments: ['@config.factory', '@database', '@entity_field.manager', '@entity_type.manager', '@reliefweb_docstore.client']
-    tags:
-      - { name: drush.command }
diff --git a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.info.yml b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.info.yml
deleted file mode 100644
index 4985c8813..000000000
--- a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.info.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-type: module
-name: ReliefWeb Docstore
-description: 'Provides integration with the OCHA Document Store.'
-package: reliefweb
-core_version_requirement: ^9
diff --git a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.services.yml b/html/modules/custom/reliefweb_docstore/reliefweb_docstore.services.yml
deleted file mode 100644
index 61b09587f..000000000
--- a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.services.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-services:
-  reliefweb_docstore.client:
-    class: Drupal\reliefweb_docstore\Services\DocstoreClient
-    arguments: ['@config.factory', '@http_client', '@logger.factory']
-  reliefweb_docstore.route_subscriber:
-    class: Drupal\reliefweb_docstore\Routing\RouteSubscriber
-    tags:
-      - { name: event_subscriber }
diff --git a/html/modules/custom/reliefweb_docstore/README.md b/html/modules/custom/reliefweb_files/README.md
similarity index 75%
rename from html/modules/custom/reliefweb_docstore/README.md
rename to html/modules/custom/reliefweb_files/README.md
index de84b1172..7f8380c04 100644
--- a/html/modules/custom/reliefweb_docstore/README.md
+++ b/html/modules/custom/reliefweb_files/README.md
@@ -1,31 +1,30 @@
-ReliefWeb Docstore
-==================
+ReliefWeb Files
+===============
 
-This modules provides integration with the OCHA Document Store (docstore) to
-handle report attachments.
+This module handles report file attachments on ReliefWeb.
+
+It provides a file type that can store files locally or remotely in the OCHA Document Store (docstore).
 
 ## Concepts
 
 The docstore integration only concerns the attachments.
 
-All the report files are stored in the docstore but the preview of eligible files (i.e. PDF files) are stored on the RW site.
+All the report files are stored either locally or in the docstore but the preview of eligible files (i.e. PDF files) are always stored locally on the RW site.
 
 This is because the page and rotation to use for the preview are specific to RW (another site may want to show something different) and there is currently no endpoint to generate previews in the docstore.
 
-In addition to the `file` resources, a `reliefweb_document` document resource is created for reports that have attachments to keep track of the file usages.
-
-The docstore integration is handled in the `reliefweb_docstore` module.
+When using the remote mode, in addition to the `file` resources, a `reliefweb_document` document resource is created for reports that have attachments to keep track of the file usages.
 
 ### File field.
 
-The `reliefweb_docstore` module adds a new field type: `reliefweb_file` that handles the integration.
+The `reliefweb_files` module adds a new field type: `reliefweb_file` that handles the the local or remote storage.
 
 This field type works with the revisions and allow the editorial worflow of replacing files without changing the file permanent URL.
 
 Each reliefweb_file entry contains:
 
 - `uuid`: the UUID of the file resource in the docstore (used for the permanent URL)
-- `revision_id`: the revision id of the file resource in the docstore
+- `revision_id`: the entity file ID in local mode or the revision id of the file resource in the docstore in remote mode
 - `file_uuid`: UUID of a file entity in the RW site used to keep track of the URL of the revision, its status (private/public) and to be able to regenerate the file preview. Note: there is no file on disk matching the file URI.
 - `file_name`: file name
 - `file_mime`: file mime type
@@ -42,8 +41,8 @@ Each reliefweb_file entry contains:
 The `file_uuid` changes when replacing a file. Ex:
 
 - revision1:
-  - uuid1: uuid of the file resource in docstore
-  - revision_id1: id of file resource revision in docstore
+  - uuid1: uuid of the file resource
+  - revision_id1: id of the file resource
   - file_uuid1: uuid of the file entity in RW
 - revision2 (file is replaced):
   - uuid1: same as revision1 because it's the same file resource
@@ -77,13 +76,13 @@ The URI in the file entities determine the access to the files.
 
 For the latest revision of a **published** file, the URI of the file entity on RW is in the form `public://attachments/ab/cd/{uuid}.{ext}` where `{uuid}` is the UUID of the file resource in the docstore (permanent UUID).
 
-This URI is used to generate the permanent URL of the file on RW: `https//reliefweb.int/attachments/{uuid}/{file_name}` which is rewritten to get the file from the docstore `http://docstore.internal/files/{uuid}/{file_name}`.
+This URI is used to generate the permanent URL of the file on RW: `https//reliefweb.int/attachments/{uuid}/{file_name}` which is rewritten to get the file from the docstore `http://docstore.internal/files/{uuid}/{file_name}` in remote mode.
 
 **Note**: if the report, the file is attached to, is not published, then the file URI is `private://attachments/ab/cd/{uuid}.{ext}` which translates to `https//reliefweb.int/private/attachments/{uuid}/{file_name}`. This URL is only accessible to users with the `access reliefweb private files` permission (i.e. Editors).
 
 For the other revisions, the URI of the file entities is `private://attachments/ab/cd/{file_uuid}.{ext}` where `{file_uuid}` is the UUID of the file entity.
 
-This is similar for the previews, except there is currently no particular URL pattern for those, notably because the previews are basically only shown as derivative images in the form `https//reliefweb.int/sites/default/styles/small/{scheme}/previews/ab/cd/{uuid}.png` where `{uuid}`  is the UUID of the file resource in the docstore (permanent UUID) and `{scheme}` is either "public" or "private" depending on the status of the report.
+This is similar for the previews, except there is currently no particular URL pattern for those, notably because the previews are basically only shown as derivative images in the form `https//reliefweb.int/sites/default/styles/small/{scheme}/previews/ab/cd/{uuid}.png` where `{uuid}`  is the UUID of the file resource (permanent UUID) and `{scheme}` is either "public" or "private" depending on the status of the report.
 
 ### Public/private
 
@@ -93,7 +92,7 @@ If the report is published, then the files attached to the published revision ar
 
 ### Document resource
 
-A `reliefweb_document` resource is created in the docstore for reports with attachments. This is a revision less document resource that only contains references to all the files referenced by the report entity and its revisions on RW.
+In remote mode a `reliefweb_document` resource is created in the docstore for reports with attachments. This is a revision less document resource that only contains references to all the files referenced by the report entity and its revisions on RW.
 
 Their purpose is to keep track of the file usage in the docstore so that another provider cannot delete files used on RW.
 
@@ -102,12 +101,10 @@ Their purpose is to keep track of the file usage in the docstore so that another
 The migration of the files is in 2 parts:
 
 1. creation of the file field and file entities when migrating the nodes (part of the classic migration in `reliefweb_migrate`)
-2. actual file migration, with file and document resource creation/update in the docstore. This is done via a drush command: `rw-docstore:migrate-attachments` from the `reliefweb_docstore` module.
+2. actual file migration, with file and document resource creation/update in the docstore. This is done via a drush command: `rw-docstore:migrate-attachments` from the `reliefweb_files` module.
 
-## Local mode
+## Storage mode
 
-The `reliefweb_docstore` has a setting to store the files locally instead of storing in the docstore: `reliefweb_docstore.settings.local`.
+The `reliefweb_file` module has a `reliefweb_files.settings.local` setting to store the files locally when `true` or remotely in the docstore when `false`.
 
 When set to TRUE, no calls to the docstore are done and the files on disk are not removed. The rest (URIs, private/public etc.) is handled the same way.
-
-This mode is useful for testing and in case integrating with the docstore is considered a bad idea or not working for some reason a posteriori.
diff --git a/html/modules/custom/reliefweb_docstore/config/install/reliefweb_docstore.settings.yml b/html/modules/custom/reliefweb_files/config/install/reliefweb_files.settings.yml
similarity index 85%
rename from html/modules/custom/reliefweb_docstore/config/install/reliefweb_docstore.settings.yml
rename to html/modules/custom/reliefweb_files/config/install/reliefweb_files.settings.yml
index b08002901..ee14624c0 100644
--- a/html/modules/custom/reliefweb_docstore/config/install/reliefweb_docstore.settings.yml
+++ b/html/modules/custom/reliefweb_files/config/install/reliefweb_files.settings.yml
@@ -1,11 +1,11 @@
 # The URL of the OCHA docstore.
 docstore_url: ''
 # The UUID of the provider in the OCHA docstore.
-provider_uuid: ''
+docstore_provider_uuid: ''
 # The API key for the OCHA docstore provider.
-api_key: ''
+docstore_api_key: ''
 # The prefix used when creating new content (ex: reliefweb_reports).
-prefix: 'reliefweb_'
+docstore_prefix: 'reliefweb_'
 # Wether to store the files locally or remotely in the docstore.
 local: true
 # Name of the directory for the local file attachments.
diff --git a/html/modules/custom/reliefweb_docstore/config/schema/reliefweb_docstore.schema.yml b/html/modules/custom/reliefweb_files/config/schema/reliefweb_files.schema.yml
similarity index 90%
rename from html/modules/custom/reliefweb_docstore/config/schema/reliefweb_docstore.schema.yml
rename to html/modules/custom/reliefweb_files/config/schema/reliefweb_files.schema.yml
index 638fd3f58..a6d2c57b4 100644
--- a/html/modules/custom/reliefweb_docstore/config/schema/reliefweb_docstore.schema.yml
+++ b/html/modules/custom/reliefweb_files/config/schema/reliefweb_files.schema.yml
@@ -1,17 +1,17 @@
-reliefweb_docstore.settings:
+reliefweb_files.settings:
   type: config_object
   label: 'ReliefWeb Docstore settings'
   mapping:
     docstore_url:
       type: string
       label: 'The URL of the OCHA docstore.'
-    provider_uuid:
+    docstore_provider_uuid:
       type: string
       label: 'The UUID of the provider in the OCHA docstore.'
-    api_key:
+    docstore_api_key:
       type: string
       label: 'The API key for the OCHA docstore provider.'
-    prefix:
+    docstore_prefix:
       type: string
       label: 'The prefix used when creating new content (ex: reliefweb_reports).'
     local:
diff --git a/html/modules/custom/reliefweb_files/drush.services.yml b/html/modules/custom/reliefweb_files/drush.services.yml
new file mode 100644
index 000000000..78d202748
--- /dev/null
+++ b/html/modules/custom/reliefweb_files/drush.services.yml
@@ -0,0 +1,6 @@
+services:
+  reliefweb_files.commands:
+    class: \Drupal\reliefweb_files\Commands\ReliefWebFilesCommands
+    arguments: ['@config.factory', '@database', '@entity_field.manager', '@entity_type.manager', '@reliefweb_files.client']
+    tags:
+      - { name: drush.command }
diff --git a/html/modules/custom/reliefweb_files/reliefweb_files.info.yml b/html/modules/custom/reliefweb_files/reliefweb_files.info.yml
new file mode 100644
index 000000000..ecd962895
--- /dev/null
+++ b/html/modules/custom/reliefweb_files/reliefweb_files.info.yml
@@ -0,0 +1,5 @@
+type: module
+name: ReliefWeb Files
+description: 'Handles file attachments and integration with the OCHA Document Store.'
+package: reliefweb
+core_version_requirement: ^9
diff --git a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.libraries.yml b/html/modules/custom/reliefweb_files/reliefweb_files.libraries.yml
similarity index 100%
rename from html/modules/custom/reliefweb_docstore/reliefweb_docstore.libraries.yml
rename to html/modules/custom/reliefweb_files/reliefweb_files.libraries.yml
diff --git a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module b/html/modules/custom/reliefweb_files/reliefweb_files.module
similarity index 88%
rename from html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
rename to html/modules/custom/reliefweb_files/reliefweb_files.module
index 576cabf78..d5247df9b 100644
--- a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.module
+++ b/html/modules/custom/reliefweb_files/reliefweb_files.module
@@ -2,17 +2,17 @@
 
 /**
  * @file
- * ReliefWeb Docstore module file.
+ * ReliefWeb Files module file.
  */
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\file\Entity\File;
-use Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFileList;
+use Drupal\reliefweb_files\Plugin\Field\FieldType\ReliefWebFileList;
 
 /**
  * Implements hook_theme().
  */
-function reliefweb_docstore_theme() {
+function reliefweb_files_theme() {
   return [
     // Theme for a file list form widget.
     'reliefweb_file_widget' => [
@@ -54,7 +54,7 @@ function reliefweb_docstore_theme() {
 /**
  * Implemenents hook_preprocess_HOOK() for "image_style".
  */
-function reliefweb_docstore_preprocess_image_style__preview(&$variables) {
+function reliefweb_files_preprocess_image_style__preview(&$variables) {
   // We add a parameter to the image derivative URL to ensure the correct
   // version is served.
   if (isset($variables['image']['#attributes']['data-version'])) {
@@ -72,7 +72,7 @@ function reliefweb_docstore_preprocess_image_style__preview(&$variables) {
  * @return array
  *   List of languages keyed by their ISO 639-1 code.
  */
-function reliefweb_docstore_get_languages() {
+function reliefweb_files_get_languages() {
   static $languages;
 
   if (!isset($languages)) {
@@ -106,7 +106,7 @@ function reliefweb_docstore_get_languages() {
  *
  * @see file_validate()
  */
-function reliefweb_docstore_file_validate_mime_type(File $file, $mime_type) {
+function reliefweb_files_file_validate_mime_type(File $file, $mime_type) {
   $errors = [];
 
   if ($file->getMimeType() !== $mime_type) {
@@ -121,8 +121,8 @@ function reliefweb_docstore_file_validate_mime_type(File $file, $mime_type) {
 /**
  * Implements hook_reliefweb_utility_file_update_alter().
  */
-function reliefweb_docstore_reliefweb_utility_file_update_alter(File $file, &$apply) {
-  $settings = \Drupal::config('reliefweb_docstore.settings');
+function reliefweb_files_reliefweb_utility_file_update_alter(File $file, &$apply) {
+  $settings = \Drupal::config('reliefweb_files.settings');
 
   // Get the attachment and preview directories.
   $file_directory = $settings->get('file_directory') ?? 'attachments';
@@ -141,7 +141,7 @@ function reliefweb_docstore_reliefweb_utility_file_update_alter(File $file, &$ap
 /**
  * Implements hook_entity_revision_delete().
  */
-function reliefweb_docstore_entity_revision_delete(EntityInterface $entity) {
+function reliefweb_files_entity_revision_delete(EntityInterface $entity) {
   // @todo remove when removing `reliefweb_migrate`.
   if (!empty($entity->_is_migrating)) {
     return;
diff --git a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.permissions.yml b/html/modules/custom/reliefweb_files/reliefweb_files.permissions.yml
similarity index 100%
rename from html/modules/custom/reliefweb_docstore/reliefweb_docstore.permissions.yml
rename to html/modules/custom/reliefweb_files/reliefweb_files.permissions.yml
diff --git a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.routing.yml b/html/modules/custom/reliefweb_files/reliefweb_files.routing.yml
similarity index 50%
rename from html/modules/custom/reliefweb_docstore/reliefweb_docstore.routing.yml
rename to html/modules/custom/reliefweb_files/reliefweb_files.routing.yml
index d5bdd6a10..9a129142b 100644
--- a/html/modules/custom/reliefweb_docstore/reliefweb_docstore.routing.yml
+++ b/html/modules/custom/reliefweb_files/reliefweb_files.routing.yml
@@ -1,14 +1,14 @@
-reliefweb_docstore.attachment.public:
+reliefweb_files.attachment.public:
   path: '/attachments/{uuid}/{filename}'
   defaults:
-    _controller: '\Drupal\reliefweb_docstore\Controller\FileDownloadController::downloadPublicAttachment'
+    _controller: '\Drupal\reliefweb_files\Controller\FileDownloadController::downloadPublicAttachment'
     _title: 'Download a public attachment'
   requirements:
     _permission: 'access content'
-reliefweb_docstore.attachment.private:
+reliefweb_files.attachment.private:
   path: '/private/attachments/{uuid}/{filename}'
   defaults:
-    _controller: '\Drupal\reliefweb_docstore\Controller\FileDownloadController::downloadPrivateAttachment'
+    _controller: '\Drupal\reliefweb_files\Controller\FileDownloadController::downloadPrivateAttachment'
     _title: 'Download a private attachment'
   requirements:
     _permission: 'access content'
diff --git a/html/modules/custom/reliefweb_files/reliefweb_files.services.yml b/html/modules/custom/reliefweb_files/reliefweb_files.services.yml
new file mode 100644
index 000000000..825963c30
--- /dev/null
+++ b/html/modules/custom/reliefweb_files/reliefweb_files.services.yml
@@ -0,0 +1,8 @@
+services:
+  reliefweb_files.client:
+    class: Drupal\reliefweb_files\Services\DocstoreClient
+    arguments: ['@config.factory', '@http_client', '@logger.factory']
+  reliefweb_files.route_subscriber:
+    class: Drupal\reliefweb_files\Routing\RouteSubscriber
+    tags:
+      - { name: event_subscriber }
diff --git a/html/modules/custom/reliefweb_docstore/src/Commands/ReliefWebDocstoreCommands.php b/html/modules/custom/reliefweb_files/src/Commands/ReliefWebFilesCommands.php
similarity index 96%
rename from html/modules/custom/reliefweb_docstore/src/Commands/ReliefWebDocstoreCommands.php
rename to html/modules/custom/reliefweb_files/src/Commands/ReliefWebFilesCommands.php
index aae010adf..f79fd50b9 100644
--- a/html/modules/custom/reliefweb_docstore/src/Commands/ReliefWebDocstoreCommands.php
+++ b/html/modules/custom/reliefweb_files/src/Commands/ReliefWebFilesCommands.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\reliefweb_docstore\Commands;
+namespace Drupal\reliefweb_files\Commands;
 
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Config\ConfigFactoryInterface;
@@ -8,8 +8,8 @@
 use Drupal\Core\Database\Database;
 use Drupal\Core\Entity\EntityFieldManagerInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile;
-use Drupal\reliefweb_docstore\Services\DocstoreClient;
+use Drupal\reliefweb_files\Plugin\Field\FieldType\ReliefWebFile;
+use Drupal\reliefweb_files\Services\DocstoreClient;
 use Drupal\reliefweb_utility\Helpers\LegacyHelper;
 use Drupal\reliefweb_utility\Helpers\UrlHelper;
 use Drupal\reliefweb_utility\Traits\EntityDatabaseInfoTrait;
@@ -20,10 +20,17 @@
  *
  * @todo remove after the migration from D7 to D9.
  */
-class ReliefWebDocstoreCommands extends DrushCommands {
+class ReliefWebFilesCommands extends DrushCommands {
 
   use EntityDatabaseInfoTrait;
 
+  /**
+   * The config factory.
+   *
+   * @var \Drupal\Core\Config\ConfigFactoryInterface
+   */
+  protected $configFactory;
+
   /**
    * The database connection.
    *
@@ -48,17 +55,10 @@ class ReliefWebDocstoreCommands extends DrushCommands {
   /**
    * The docstore client service.
    *
-   * @var \Drupal\reliefweb_docstore\Services\DocstoreClient
+   * @var \Drupal\reliefweb_files\Services\DocstoreClient
    */
   protected $docstoreClient;
 
-  /**
-   * ReliefWeb API config.
-   *
-   * @var \Drupal\Core\Config\ImmutableConfig
-   */
-  protected $docstoreConfig;
-
   /**
    * {@inheritdoc}
    */
@@ -69,17 +69,17 @@ public function __construct(
     EntityTypeManagerInterface $entity_type_manager,
     DocstoreClient $docstore_client,
   ) {
+    $this->configFactory = $config_factory;
     $this->database = $database;
     $this->entityFieldManager = $entity_field_manager;
     $this->entityTypeManager = $entity_type_manager;
     $this->docstoreClient = $docstore_client;
-    $this->docstoreConfig = $config_factory->get('reliefweb_docstore.settings');
   }
 
   /**
-   * Migrate the report attachments to the docstore.
+   * Migrate the report attachments.
    *
-   * @command rw-docstore:migrate-attachments
+   * @command rw-files:migrate-attachments
    *
    * @option base_url The base url of the site from which to retrieve the files.
    * @option batch_size Number of reports with attachments to process at once.
@@ -97,12 +97,12 @@ public function __construct(
    *   'source_directory' => '',
    * ]
    *
-   * @aliases rw-dma,rw-docstore-migrate-attachments
+   * @aliases rw-dma,rw-files-migrate-attachments
    *
-   * @usage rw-docstore:migrate-attachments
-   *   Migrate the attachments to the docstore
+   * @usage rw-files:migrate-attachments
+   *   Migrate the attachments.
    *
-   * @validate-module-enabled reliefweb_docstore
+   * @validate-module-enabled reliefweb_files
    */
   public function migrateAttachments($options = [
     'base_url' => 'https://reliefweb.int',
@@ -135,7 +135,7 @@ public function migrateAttachments($options = [
     }
 
     // Get the storage mode: local or docstore.
-    $local = $this->docstoreConfig->get('local') === TRUE;
+    $local = $this->configFactory->get('reliefweb_files.settings')->get('local') === TRUE;
 
     if (!empty($source_directory) && $local === FALSE) {
       $this->logger()->error(strtr('The source directory option is only valid in local mode.'));
diff --git a/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php b/html/modules/custom/reliefweb_files/src/Controller/FileDownloadController.php
similarity index 95%
rename from html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php
rename to html/modules/custom/reliefweb_files/src/Controller/FileDownloadController.php
index e56cc8722..9cd1c8934 100644
--- a/html/modules/custom/reliefweb_docstore/src/Controller/FileDownloadController.php
+++ b/html/modules/custom/reliefweb_files/src/Controller/FileDownloadController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\reliefweb_docstore\Controller;
+namespace Drupal\reliefweb_files\Controller;
 
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Config\ConfigFactoryInterface;
@@ -8,8 +8,8 @@
 use Drupal\Core\Logger\LoggerChannelFactoryInterface;
 use Drupal\Core\Session\AccountProxyInterface;
 use Drupal\Core\StreamWrapper\StreamWrapperManagerInterface;
-use Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile;
-use Drupal\reliefweb_docstore\Services\DocstoreClient;
+use Drupal\reliefweb_files\Plugin\Field\FieldType\ReliefWebFile;
+use Drupal\reliefweb_files\Services\DocstoreClient;
 use Drupal\system\FileDownloadController as OriginalFileDownloadController;
 use GuzzleHttp\Psr7\StreamWrapper;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -25,7 +25,7 @@
 class FileDownloadController extends OriginalFileDownloadController {
 
   /**
-   * ReliefWeb Docstore config.
+   * ReliefWeb Files config.
    *
    * @var \Drupal\Core\Config\ImmutableConfig
    */
@@ -41,7 +41,7 @@ class FileDownloadController extends OriginalFileDownloadController {
   /**
    * The OCHA docstore client service.
    *
-   * @var \Drupal\reliefweb_docstore\Services\DocstoreClient
+   * @var \Drupal\reliefweb_files\Services\DocstoreClient
    */
   protected $docstoreClient;
 
@@ -66,7 +66,7 @@ class FileDownloadController extends OriginalFileDownloadController {
    *   The config factory service.
    * @param \Drupal\Core\Session\AccountProxyInterface $current_user
    *   The current user.
-   * @param \Drupal\reliefweb_docstore\Services\DocstoreClient $docstore_client
+   * @param \Drupal\reliefweb_files\Services\DocstoreClient $docstore_client
    *   The OCHA docstore client service.
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
    *   The entity type manager service.
@@ -85,11 +85,11 @@ public function __construct(
   ) {
     parent::__construct($stream_wrapper_manager);
 
-    $this->config = $config_factory->get('reliefweb_docstore.settings');
+    $this->config = $config_factory->get('reliefweb_files.settings');
     $this->currentUser = $current_user;
     $this->docstoreClient = $docstore_client;
     $this->entityTypeManager = $entity_type_manager;
-    $this->logger = $logger_factory->get('reliefweb_docstore');
+    $this->logger = $logger_factory->get('reliefweb_files');
   }
 
   /**
@@ -99,7 +99,7 @@ public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
       $container->get('current_user'),
-      $container->get('reliefweb_docstore.client'),
+      $container->get('reliefweb_files.client'),
       $container->get('entity_type.manager'),
       $container->get('logger.factory'),
       $container->get('stream_wrapper_manager')
diff --git a/html/modules/custom/reliefweb_docstore/src/Controller/ImageStyleDownloadController.php b/html/modules/custom/reliefweb_files/src/Controller/ImageStyleDownloadController.php
similarity index 98%
rename from html/modules/custom/reliefweb_docstore/src/Controller/ImageStyleDownloadController.php
rename to html/modules/custom/reliefweb_files/src/Controller/ImageStyleDownloadController.php
index aaff50147..ee6d846b3 100644
--- a/html/modules/custom/reliefweb_docstore/src/Controller/ImageStyleDownloadController.php
+++ b/html/modules/custom/reliefweb_files/src/Controller/ImageStyleDownloadController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\reliefweb_docstore\Controller;
+namespace Drupal\reliefweb_files\Controller;
 
 use Drupal\Component\Utility\Crypt;
 use Drupal\Core\Config\ConfigFactoryInterface;
@@ -26,7 +26,7 @@
 class ImageStyleDownloadController extends OriginalImageStyleDownloadController {
 
   /**
-   * ReliefWeb Docstore config.
+   * ReliefWeb Files config.
    *
    * @var \Drupal\Core\Config\ImmutableConfig
    */
@@ -75,7 +75,7 @@ public function __construct(
   ) {
     parent::__construct($lock, $image_factory, $stream_wrapper_manager, $file_system);
 
-    $this->config = $config_factory->get('reliefweb_docstore.settings');
+    $this->config = $config_factory->get('reliefweb_files.settings');
     $this->currentUser = $current_user;
     $this->entityTypeManager = $entity_type_manager;
   }
diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldFormatter/ReliefWebFile.php b/html/modules/custom/reliefweb_files/src/Plugin/Field/FieldFormatter/ReliefWebFile.php
similarity index 92%
rename from html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldFormatter/ReliefWebFile.php
rename to html/modules/custom/reliefweb_files/src/Plugin/Field/FieldFormatter/ReliefWebFile.php
index bd9931caf..e67a5a4cf 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldFormatter/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_files/src/Plugin/Field/FieldFormatter/ReliefWebFile.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\reliefweb_docstore\Plugin\Field\FieldFormatter;
+namespace Drupal\reliefweb_files\Plugin\Field\FieldFormatter;
 
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Field\FormatterBase;
@@ -26,7 +26,7 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
     foreach ($items as $item) {
       $url = $item->getFileUrl();
       if (!empty($url)) {
-        $languages = reliefweb_docstore_get_languages();
+        $languages = reliefweb_files_get_languages();
 
         $version = '';
         if (isset($languages[$item->getFileLanguage()])) {
diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php b/html/modules/custom/reliefweb_files/src/Plugin/Field/FieldType/ReliefWebFile.php
similarity index 99%
rename from html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
rename to html/modules/custom/reliefweb_files/src/Plugin/Field/FieldType/ReliefWebFile.php
index b2877465e..ae8df8397 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_files/src/Plugin/Field/FieldType/ReliefWebFile.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\reliefweb_docstore\Plugin\Field\FieldType;
+namespace Drupal\reliefweb_files\Plugin\Field\FieldType;
 
 use Drupal\Component\Utility\Bytes;
 use Drupal\Component\Utility\Environment;
@@ -31,7 +31,7 @@
  *   category = @Translation("ReliefWeb"),
  *   default_widget = "reliefweb_file",
  *   default_formatter = "reliefweb_file",
- *   list_class = "\Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFileList",
+ *   list_class = "\Drupal\reliefweb_files\Plugin\Field\FieldType\ReliefWebFileList",
  *   cardinality = -1,
  * )
  */
@@ -49,7 +49,7 @@ class ReliefWebFile extends FieldItemBase {
   /**
    * The docstore client service.
    *
-   * @var \Drupal\reliefweb_docstore\Services\DocstoreClient
+   * @var \Drupal\reliefweb_files\Services\DocstoreClient
    */
   protected $docstoreClient;
 
@@ -215,7 +215,7 @@ public function getUploadValidators() {
     // replaced only by a file of the same type.
     $file_mime = $this->getFileMime();
     if (!empty($file_mime)) {
-      $validators['reliefweb_docstore_file_validate_mime_type'] = [$file_mime];
+      $validators['reliefweb_files_file_validate_mime_type'] = [$file_mime];
     }
 
     // There is always a file size limit due to the PHP server limit.
@@ -1016,7 +1016,7 @@ public function getPermanentUri($private = FALSE, $preview = FALSE) {
    *   The directory.
    */
   public static function getFileDirectory($preview = FALSE) {
-    $settings = \Drupal::service('config.factory')->get('reliefweb_docstore.settings');
+    $settings = \Drupal::service('config.factory')->get('reliefweb_files.settings');
     if ($preview) {
       return $settings->get('preview_directory') ?? 'previews';
     }
@@ -1872,12 +1872,12 @@ protected function getCurrentUser() {
   /**
    * Get the docstore client service.
    *
-   * @return \Drupal\reliefweb_docstore\Services\DocstoreClient
+   * @return \Drupal\reliefweb_files\Services\DocstoreClient
    *   The docstore client service.
    */
   protected function getDocstoreClient() {
     if (!isset($this->docstoreClient)) {
-      $this->docstoreClient = \Drupal::service('reliefweb_docstore.client');
+      $this->docstoreClient = \Drupal::service('reliefweb_files.client');
     }
     return $this->docstoreClient;
   }
@@ -1890,7 +1890,7 @@ protected function getDocstoreClient() {
    */
   protected function getDocstoreConfig() {
     if (!isset($this->docstoreConfig)) {
-      $this->docstoreConfig = \Drupal::config('reliefweb_docstore.settings');
+      $this->docstoreConfig = \Drupal::config('reliefweb_files.settings');
     }
     return $this->docstoreConfig;
   }
diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php b/html/modules/custom/reliefweb_files/src/Plugin/Field/FieldType/ReliefWebFileList.php
similarity index 97%
rename from html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php
rename to html/modules/custom/reliefweb_files/src/Plugin/Field/FieldType/ReliefWebFileList.php
index 83cff53ca..af0642312 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldType/ReliefWebFileList.php
+++ b/html/modules/custom/reliefweb_files/src/Plugin/Field/FieldType/ReliefWebFileList.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\reliefweb_docstore\Plugin\Field\FieldType;
+namespace Drupal\reliefweb_files\Plugin\Field\FieldType;
 
 use Drupal\Core\Field\FieldItemList;
 use Drupal\reliefweb_utility\Traits\EntityDatabaseInfoTrait;
@@ -15,7 +15,7 @@ class ReliefWebFileList extends FieldItemList {
   /**
    * The docstore client service.
    *
-   * @var \Drupal\reliefweb_docstore\Services\DocstoreClient
+   * @var \Drupal\reliefweb_files\Services\DocstoreClient
    */
   protected $docstoreClient;
 
@@ -221,7 +221,7 @@ public function deleteRevision() {
     // deletion of the remote file resources.
     //
     // The references will be updated after all the calls to ::deleteRevision(),
-    // in reliefweb_docstore_entity_revision_delete().
+    // in reliefweb_files_entity_revision_delete().
     $this->deleteRemoteDocumentFileReferences();
 
     // First remove all the files that are not used anymore, then remove
@@ -456,12 +456,12 @@ public function storeLocally() {
   /**
    * Get the docstore client service.
    *
-   * @return \Drupal\reliefweb_docstore\Services\DocstoreClient
+   * @return \Drupal\reliefweb_files\Services\DocstoreClient
    *   The docstore client service.
    */
   protected function getDocstoreClient() {
     if (!isset($this->docstoreClient)) {
-      $this->docstoreClient = \Drupal::service('reliefweb_docstore.client');
+      $this->docstoreClient = \Drupal::service('reliefweb_files.client');
     }
     return $this->docstoreClient;
   }
@@ -474,7 +474,7 @@ protected function getDocstoreClient() {
    */
   protected function getDocstoreConfig() {
     if (!isset($this->docstoreConfig)) {
-      $this->docstoreConfig = \Drupal::config('reliefweb_docstore.settings');
+      $this->docstoreConfig = \Drupal::config('reliefweb_files.settings');
     }
     return $this->docstoreConfig;
   }
diff --git a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php b/html/modules/custom/reliefweb_files/src/Plugin/Field/FieldWidget/ReliefWebFile.php
similarity index 97%
rename from html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
rename to html/modules/custom/reliefweb_files/src/Plugin/Field/FieldWidget/ReliefWebFile.php
index 4a10976ae..e0fec9e14 100644
--- a/html/modules/custom/reliefweb_docstore/src/Plugin/Field/FieldWidget/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_files/src/Plugin/Field/FieldWidget/ReliefWebFile.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\reliefweb_docstore\Plugin\Field\FieldWidget;
+namespace Drupal\reliefweb_files\Plugin\Field\FieldWidget;
 
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\NestedArray;
@@ -16,7 +16,7 @@
 use Drupal\Core\Render\Markup;
 use Drupal\Core\Render\RendererInterface;
 use Drupal\file\Entity\File;
-use Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile as ReliefWebFileType;
+use Drupal\reliefweb_files\Plugin\Field\FieldType\ReliefWebFile as ReliefWebFileType;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -335,7 +335,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
       // @todo add the empty option.
       '#options' => array_merge(
         ['' => ' - select - '],
-        reliefweb_docstore_get_languages()
+        reliefweb_files_get_languages()
       ),
       '#default_value' => $item->getFileLanguage() ?? NULL,
     ];
@@ -626,7 +626,7 @@ protected function uploadFiles(array $element, FormStateInterface $form_state) {
    * @param array|null $values
    *   Optional values to initialize the field item with.
    *
-   * @return \Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile
+   * @return \Drupal\reliefweb_files\Plugin\Field\FieldType\ReliefWebFile
    *   Field item.
    */
   protected function createFieldItem(?array $values = NULL) {
@@ -768,7 +768,7 @@ protected function processUploadedFiles(array $element, FormStateInterface $form
    * @param array $validators
    *   Upload validators as expected by file_validate().
    *
-   * @return \Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile
+   * @return \Drupal\reliefweb_files\Plugin\Field\FieldType\ReliefWebFile
    *   New field item created with the file information.
    *
    * @throws \Exception
@@ -851,12 +851,12 @@ protected function processUploadedFile(\SplFileInfo $file_info, array $validator
   /**
    * Populate a field item with the data from a file entity.
    *
-   * @param \Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile $item
+   * @param \Drupal\reliefweb_files\Plugin\Field\FieldType\ReliefWebFile $item
    *   Field item.
    * @param \Drupal\file\Entity\File $file
    *   File entity.
    *
-   * @return \Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile
+   * @return \Drupal\reliefweb_files\Plugin\Field\FieldType\ReliefWebFile
    *   The updated field item.
    *
    * @throws \Exception
@@ -984,10 +984,10 @@ protected function validateUploadedFile(\SplFileInfo $file_info) {
   /**
    * Get the original file type item.
    *
-   * @param \Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile $item
+   * @param \Drupal\reliefweb_files\Plugin\Field\FieldType\ReliefWebFile $item
    *   The current field type item.
    *
-   * @return \Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile
+   * @return \Drupal\reliefweb_files\Plugin\Field\FieldType\ReliefWebFile
    *   The original file type item.
    */
   protected function getOriginalFileItem(ReliefWebFileType $item) {
@@ -999,7 +999,7 @@ protected function getOriginalFileItem(ReliefWebFileType $item) {
   /**
    * Format the file information.
    *
-   * @param \Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile $item
+   * @param \Drupal\reliefweb_files\Plugin\Field\FieldType\ReliefWebFile $item
    *   Field type item.
    *
    * @return \Drupal\Core\StringTranslation\TranslatableMarkup
diff --git a/html/modules/custom/reliefweb_docstore/src/Routing/RouteSubscriber.php b/html/modules/custom/reliefweb_files/src/Routing/RouteSubscriber.php
similarity index 70%
rename from html/modules/custom/reliefweb_docstore/src/Routing/RouteSubscriber.php
rename to html/modules/custom/reliefweb_files/src/Routing/RouteSubscriber.php
index 96c1023bb..a7c6533cf 100644
--- a/html/modules/custom/reliefweb_docstore/src/Routing/RouteSubscriber.php
+++ b/html/modules/custom/reliefweb_files/src/Routing/RouteSubscriber.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\reliefweb_docstore\Routing;
+namespace Drupal\reliefweb_files\Routing;
 
 use Drupal\Core\Routing\RouteSubscriberBase;
 use Symfony\Component\Routing\RouteCollection;
@@ -18,10 +18,10 @@ protected function alterRoutes(RouteCollection $collection) {
     // the access to the reliefweb private files. Otherwise access is always
     // denied by other modules because they temporary private files.
     if ($route = $collection->get('system.files')) {
-      $route->setDefault('_controller', '\Drupal\reliefweb_docstore\Controller\FileDownloadController::download');
+      $route->setDefault('_controller', '\Drupal\reliefweb_files\Controller\FileDownloadController::download');
     }
     if ($route = $collection->get('image.style_private')) {
-      $route->setDefault('_controller', '\Drupal\reliefweb_docstore\Controller\ImageStyleDownloadController::deliver');
+      $route->setDefault('_controller', '\Drupal\reliefweb_files\Controller\ImageStyleDownloadController::deliver');
     }
   }
 
diff --git a/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php b/html/modules/custom/reliefweb_files/src/Services/DocstoreClient.php
similarity index 97%
rename from html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php
rename to html/modules/custom/reliefweb_files/src/Services/DocstoreClient.php
index bc851fedc..b5cae6ce2 100644
--- a/html/modules/custom/reliefweb_docstore/src/Services/DocstoreClient.php
+++ b/html/modules/custom/reliefweb_files/src/Services/DocstoreClient.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\reliefweb_docstore\Services;
+namespace Drupal\reliefweb_files\Services;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Logger\LoggerChannelFactoryInterface;
@@ -11,12 +11,12 @@
 use Drupal\reliefweb_utility\Response\JsonResponse;
 
 /**
- * ReliefWeb API client service class.
+ * ReliefWeb Docstore client service class.
  */
 class DocstoreClient {
 
   /**
-   * ReliefWeb API config.
+   * ReliefWeb Files config.
    *
    * @var \Drupal\Core\Config\ImmutableConfig
    */
@@ -51,9 +51,9 @@ public function __construct(
     ClientInterface $http_client,
     LoggerChannelFactoryInterface $logger_factory
   ) {
-    $this->config = $config_factory->get('reliefweb_docstore.settings');
+    $this->config = $config_factory->get('reliefweb_files.settings');
     $this->httpClient = $http_client;
-    $this->logger = $logger_factory->get('reliefweb_docstore');
+    $this->logger = $logger_factory->get('reliefweb_files');
   }
 
   /**
@@ -509,8 +509,8 @@ protected function getDocumentEndpoint($uuid = '') {
    */
   protected function getHeaders() {
     return [
-      'API-KEY' => $this->config->get('api_key'),
-      'X-Docstore-Provider-Uuid' => $this->config->get('provider_uuid'),
+      'API-KEY' => $this->config->get('docstore_api_key'),
+      'X-Docstore-Provider-Uuid' => $this->config->get('docstore_provider_uuid'),
     ];
   }
 
diff --git a/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-list--interactive.html.twig b/html/modules/custom/reliefweb_files/templates/reliefweb-file-list--interactive.html.twig
similarity index 100%
rename from html/modules/custom/reliefweb_docstore/templates/reliefweb-file-list--interactive.html.twig
rename to html/modules/custom/reliefweb_files/templates/reliefweb-file-list--interactive.html.twig
diff --git a/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-list.html.twig b/html/modules/custom/reliefweb_files/templates/reliefweb-file-list.html.twig
similarity index 100%
rename from html/modules/custom/reliefweb_docstore/templates/reliefweb-file-list.html.twig
rename to html/modules/custom/reliefweb_files/templates/reliefweb-file-list.html.twig
diff --git a/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget-item.html.twig b/html/modules/custom/reliefweb_files/templates/reliefweb-file-widget-item.html.twig
similarity index 100%
rename from html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget-item.html.twig
rename to html/modules/custom/reliefweb_files/templates/reliefweb-file-widget-item.html.twig
diff --git a/html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget.html.twig b/html/modules/custom/reliefweb_files/templates/reliefweb-file-widget.html.twig
similarity index 100%
rename from html/modules/custom/reliefweb_docstore/templates/reliefweb-file-widget.html.twig
rename to html/modules/custom/reliefweb_files/templates/reliefweb-file-widget.html.twig
diff --git a/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php b/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php
index 715379227..0450b62bb 100644
--- a/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php
+++ b/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php
@@ -26,7 +26,7 @@
 use League\HTMLToMarkdown\HtmlConverter;
 
 /**
- * Docstore Drush commandfile.
+ * ReliefWeb Import Drush commandfile.
  */
 class ReliefwebImportCommand extends DrushCommands implements SiteAliasManagerAwareInterface {
 
diff --git a/html/modules/custom/reliefweb_meta/reliefweb_meta.module b/html/modules/custom/reliefweb_meta/reliefweb_meta.module
index 520f97cb5..2239c14cb 100644
--- a/html/modules/custom/reliefweb_meta/reliefweb_meta.module
+++ b/html/modules/custom/reliefweb_meta/reliefweb_meta.module
@@ -841,7 +841,7 @@ function reliefweb_meta_get_country_location_map_url($iso3) {
   krsort($nodes);
   $node = reset($nodes);
 
-  /** @var \Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile $item */
+  /** @var \Drupal\reliefweb_files\Plugin\Field\FieldType\ReliefWebFile $item */
   foreach ($node->field_file as $item) {
     if ($item->getFileName() === $filename && !$item->isPrivate()) {
       $url = $item->getFileUrl();
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Report.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Report.php
index b89aab186..503867ad4 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Report.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Report.php
@@ -166,7 +166,7 @@ protected function parseAttachmentDescription($description) {
 
     // Extract the language from the description.
     if (!empty($description)) {
-      $languages = reliefweb_docstore_get_languages();
+      $languages = reliefweb_files_get_languages();
       $versions = [];
       $version_pattern = [];
       foreach ($languages as $code => $label) {
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/TaxonomyTerm.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/TaxonomyTerm.php
index bb05210ce..e9ad7a794 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/TaxonomyTerm.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/TaxonomyTerm.php
@@ -3,7 +3,7 @@
 namespace Drupal\reliefweb_migrate\Plugin\migrate\source;
 
 use Drupal\migrate\Row;
-use Drupal\reliefweb_docstore\Plugin\Field\FieldType\ReliefWebFile;
+use Drupal\reliefweb_files\Plugin\Field\FieldType\ReliefWebFile;
 use Drupal\reliefweb_utility\Helpers\LegacyHelper;
 
 /**
diff --git a/html/modules/custom/reliefweb_revisions/src/Services/EntityHistory.php b/html/modules/custom/reliefweb_revisions/src/Services/EntityHistory.php
index 599837454..92ff15fb3 100644
--- a/html/modules/custom/reliefweb_revisions/src/Services/EntityHistory.php
+++ b/html/modules/custom/reliefweb_revisions/src/Services/EntityHistory.php
@@ -1022,7 +1022,7 @@ protected function formatReliefWebFileFieldDiff(FieldDefinitionInterface $field_
       'preview_rotation' => 'preview rotation',
     ];
     $property_values = [
-      'language' => reliefweb_docstore_get_languages(),
+      'language' => reliefweb_files_get_languages(),
       'preview_rotation' => ['90' => 'right', '-90' => 'left'],
     ];
 
diff --git a/html/modules/custom/reliefweb_subscriptions/src/Command/ReliefwebSubscriptionsSendCommand.php b/html/modules/custom/reliefweb_subscriptions/src/Command/ReliefwebSubscriptionsSendCommand.php
index 90bd3f2b5..f640b0286 100644
--- a/html/modules/custom/reliefweb_subscriptions/src/Command/ReliefwebSubscriptionsSendCommand.php
+++ b/html/modules/custom/reliefweb_subscriptions/src/Command/ReliefwebSubscriptionsSendCommand.php
@@ -10,7 +10,7 @@
 use Drush\Commands\DrushCommands;
 
 /**
- * Docstore Drush commandfile.
+ * ReliefWeb Subscriptions Drush commandfile.
  */
 class ReliefwebSubscriptionsSendCommand extends DrushCommands implements SiteAliasManagerAwareInterface {
 
diff --git a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
index c60d21e8b..2cde20a1a 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-form/rw-form--widget.css
@@ -140,7 +140,7 @@ form .ief-form .fieldset-wrapper {
   background: var(--cd-reliefweb-brand-red--dark);
 }
 
-/* RW docstore */
+/* RW files */
 .rw-file-widget .tabledrag-toggle-weight-wrapper {
   display: none;
 }
diff --git a/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_docstore/reliefweb-file-list--interactive.html.twig b/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_docstore/reliefweb-file-list--interactive.html.twig
index 879624960..849d6b586 100644
--- a/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_docstore/reliefweb-file-list--interactive.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_docstore/reliefweb-file-list--interactive.html.twig
@@ -1,4 +1,4 @@
 {% set attributes = attributes.addClass('rw-attachment', 'rw-attachment--interactive') %}
 {% set title_attributes = title_attributes.addClass('rw-attachment__title') %}
 
-{% include '@reliefweb_docstore/reliefweb-file-list--interactive.html.twig' %}
+{% include '@reliefweb_files/reliefweb-file-list--interactive.html.twig' %}
diff --git a/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_docstore/reliefweb-file-list.html.twig b/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_docstore/reliefweb-file-list.html.twig
index 10d81895c..4ca5859c4 100644
--- a/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_docstore/reliefweb-file-list.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/rw-modules/reliefweb_docstore/reliefweb-file-list.html.twig
@@ -1,3 +1,3 @@
 {% set attributes = attributes.addClass('rw-attachment') %}
 
-{% include '@reliefweb_docstore/reliefweb-file-list.html.twig' %}
+{% include '@reliefweb_files/reliefweb-file-list.html.twig' %}

From 860178bda8b43e9c28cc6c9695afa676dfab0714 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 28 Apr 2022 00:09:45 +0000
Subject: [PATCH 669/720] [RW-490] Enable smooth transition from local to
 remote mode

---
 .../Plugin/Field/FieldType/ReliefWebFile.php  | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/html/modules/custom/reliefweb_files/src/Plugin/Field/FieldType/ReliefWebFile.php b/html/modules/custom/reliefweb_files/src/Plugin/Field/FieldType/ReliefWebFile.php
index ae8df8397..883befb7a 100644
--- a/html/modules/custom/reliefweb_files/src/Plugin/Field/FieldType/ReliefWebFile.php
+++ b/html/modules/custom/reliefweb_files/src/Plugin/Field/FieldType/ReliefWebFile.php
@@ -384,7 +384,6 @@ public static function schema(FieldStorageDefinitionInterface $field_definition)
           'length' => 36,
           'not null' => TRUE,
         ],
-        // @todo change to int(10) unsigned.
         'revision_id' => [
           'type' => 'int',
           'size' => 'normal',
@@ -1529,8 +1528,13 @@ public function updateRemovedItem() {
    * {@inheritdoc}
    */
   public function preSave(?ReliefWebFile $original_item = NULL) {
+    // Try to update the file if it's new, has been replaced (different file
+    // UUID or its revision is empty and we are in remote mode. The latter could
+    // occur if creating the remote file didn't work or when switching from
+    // local to remote mode after resetting the revision IDs.
     $update_file = empty($original_item) ||
-      $original_item->getFileUuid() !== $this->getFileUuid();
+      $original_item->getFileUuid() !== $this->getFileUuid() ||
+      (empty($this->getRevisionId()) && !$this->storeLocally());
 
     $update_preview = empty($original_item) ||
       $original_item->getPreviewUuid() !== $this->getPreviewUuid() ||
@@ -1553,11 +1557,9 @@ public function preSave(?ReliefWebFile $original_item = NULL) {
       }
 
       if ($update_preview) {
-        // Delete the old preview. We don't need to keep the it. It
-        // we be recreated when reverting if that ever happens.
+        // Delete the old preview. We don't need to keep it. It will be
+        // recreated when reverting if that ever happens.
         if (!empty($original_item)) {
-          // @todo instead of deleting the old preview completely, swap the
-          // preview files and regenerate the derivatives?
           $original_item->deletePreview();
         }
 
@@ -1726,8 +1728,10 @@ protected function ensureFilesArePermanent() {
         $file->save();
       }
 
-      // Ensure there is no local file left if we are storing remotely.
-      if (!$this->storeLocally()) {
+      // Ensure there is no local file left if we are storing remotely unless
+      // the revision ID is empty which would indicate something went wrong
+      // when trying to create or update the remote file.
+      if (!$this->storeLocally() && !empty($this->getRevisionId())) {
         $this->deleteFileOnDisk($file->getFileUri());
       }
     }

From 4624e48ac215943ec953177fa6a2e924877d9000 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 28 Apr 2022 00:10:27 +0000
Subject: [PATCH 670/720] [RW-491] Fix fclose calls

---
 .../reliefweb_entities/src/SectionedContentTrait.php |  4 +++-
 .../src/Controller/FileDownloadController.php        |  8 ++++++--
 .../reliefweb_files/src/Services/DocstoreClient.php  | 12 +++++++++---
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/html/modules/custom/reliefweb_entities/src/SectionedContentTrait.php b/html/modules/custom/reliefweb_entities/src/SectionedContentTrait.php
index 2e1f5556d..fec0c2990 100644
--- a/html/modules/custom/reliefweb_entities/src/SectionedContentTrait.php
+++ b/html/modules/custom/reliefweb_entities/src/SectionedContentTrait.php
@@ -285,7 +285,9 @@ public function getMostReadApiQuery($code = 'PC', $limit = 5) {
     }
 
     // Close the file.
-    fclose($handle);
+    if (is_resource($handle)) {
+      @fclose($handle);
+    }
 
     // Generate the query with the most read report ids.
     if (!empty($ids)) {
diff --git a/html/modules/custom/reliefweb_files/src/Controller/FileDownloadController.php b/html/modules/custom/reliefweb_files/src/Controller/FileDownloadController.php
index 9cd1c8934..cf9f5402b 100644
--- a/html/modules/custom/reliefweb_files/src/Controller/FileDownloadController.php
+++ b/html/modules/custom/reliefweb_files/src/Controller/FileDownloadController.php
@@ -312,8 +312,12 @@ protected function downloadRemoteFile($uuid, $filename) {
         $input = StreamWrapper::getResource($response->getBody());
         $output = fopen('php://output', 'wb');
         stream_copy_to_stream($input, $output);
-        @fclose($input);
-        @fclose($output);
+        if (is_resource($input)) {
+          @fclose($input);
+        }
+        if (is_resource($output)) {
+          @fclose($output);
+        }
       }, 200, $headers + $response->getHeaders());
     }
 
diff --git a/html/modules/custom/reliefweb_files/src/Services/DocstoreClient.php b/html/modules/custom/reliefweb_files/src/Services/DocstoreClient.php
index b5cae6ce2..d37449d7a 100644
--- a/html/modules/custom/reliefweb_files/src/Services/DocstoreClient.php
+++ b/html/modules/custom/reliefweb_files/src/Services/DocstoreClient.php
@@ -133,7 +133,9 @@ public function updateFileContentFromFilePath($uuid, $path, $timeout = 300) {
       'body' => $resource,
     ], $timeout);
 
-    @fclose($resource);
+    if (is_resource($resource)) {
+      @fclose($resource);
+    }
 
     return $response;
   }
@@ -180,8 +182,12 @@ public function downloadFileContentToFilePath($uuid, $path, $revision_id = 0, $t
       $input = StreamWrapper::getResource($response->getBody());
       $result = stream_copy_to_stream($input, $output) !== FALSE;
 
-      @fclose($input);
-      @fclose($output);
+      if (is_resource($input)) {
+        @fclose($input);
+      }
+      if (is_resource($output)) {
+        @fclose($output);
+      }
 
       return $result;
     }

From 4338a75eb142843956b1e4b2e1e06f7ebae02b53 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 28 Apr 2022 00:12:49 +0000
Subject: [PATCH 671/720] [RW-492] Fix spacing on report pages when there is an
 attachment

---
 .../common_design_subtheme/components/rw-report/rw-report.css  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-report/rw-report.css b/html/themes/custom/common_design_subtheme/components/rw-report/rw-report.css
index be6cf33b0..7d87898b9 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-report/rw-report.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-report/rw-report.css
@@ -86,6 +86,9 @@
 .node--report--full .rw-attachment--interactive footer {
   padding-top: 4px;
 }
+.node--report--full .rw-attachment + p {
+  margin-top: 0;
+}
 
 .node--report--full .rw-entity-source-disclaimers {
   margin: 24px 0 0 0;

From 37acc166d592a006ba0fafde48746fdd201a3f26 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 28 Apr 2022 00:46:47 +0000
Subject: [PATCH 672/720] [RW-493] Update drupal core and modules

---
 composer.json                         |   8 +-
 composer.lock                         | 296 +++++++++++++-------------
 config/pathauto.pattern.blog_post.yml |   2 +-
 config/pathauto.pattern.book_page.yml |   2 +-
 config/pathauto.pattern.job.yml       |   2 +-
 config/pathauto.pattern.report.yml    |   2 +-
 config/pathauto.pattern.topic.yml     |   2 +-
 config/pathauto.pattern.training.yml  |   2 +-
 8 files changed, 154 insertions(+), 162 deletions(-)

diff --git a/composer.json b/composer.json
index 264cecd3b..a2ba2e7ab 100644
--- a/composer.json
+++ b/composer.json
@@ -54,12 +54,12 @@
         "drupal/admin_denied": "^1.1",
         "drupal/allowed_formats": "^1.3",
         "drupal/components": "^2.4",
-        "drupal/config_split": "^2.0.0-beta5",
+        "drupal/config_split": "^2.0.0-rc1",
         "drupal/content_entity_clone": "^1.0.0",
         "drupal/core-composer-scaffold": "^9.3",
         "drupal/core-dev": "^9.3",
         "drupal/core-recommended": "^9.3",
-        "drupal/geofield": "^1.35",
+        "drupal/geofield": "^1.39",
         "drupal/google_tag": "^1.4",
         "drupal/guidelines": "^1.0",
         "drupal/imageapi_optimize_binaries": "^1.0-alpha2",
@@ -68,10 +68,10 @@
         "drupal/mailsystem": "^4.3",
         "drupal/maintenance200": "^1.1",
         "drupal/metatag": "^1.16",
-        "drupal/migrate_plus": "^5.1",
+        "drupal/migrate_plus": "^5.3",
         "drupal/migrate_tools": "^5.0",
         "drupal/mimemail": "^1.0-alpha4",
-        "drupal/pathauto": "^1.8",
+        "drupal/pathauto": "^1.10",
         "drupal/redirect": "^1.7",
         "drupal/redis": "^1.5",
         "drupal/social_auth_hid": "^3.0",
diff --git a/composer.lock b/composer.lock
index 55b6ff390..80e9196cd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "882169504e343e1546a04196cb4ab975",
+    "content-hash": "1b4a3bbdd3ed51ba105eb08f9387057b",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -951,16 +951,16 @@
         },
         {
             "name": "consolidation/annotated-command",
-            "version": "4.5.4",
+            "version": "4.5.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/annotated-command.git",
-                "reference": "93398c3166d9026ab93219ce23b2092b4d7b7904"
+                "reference": "67cea8e8e7656b74da651ea6f49321853996c0fd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/93398c3166d9026ab93219ce23b2092b4d7b7904",
-                "reference": "93398c3166d9026ab93219ce23b2092b4d7b7904",
+                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/67cea8e8e7656b74da651ea6f49321853996c0fd",
+                "reference": "67cea8e8e7656b74da651ea6f49321853996c0fd",
                 "shasum": ""
             },
             "require": {
@@ -1001,9 +1001,9 @@
             "description": "Initialize Symfony Console commands from annotated command class methods.",
             "support": {
                 "issues": "https://github.com/consolidation/annotated-command/issues",
-                "source": "https://github.com/consolidation/annotated-command/tree/4.5.4"
+                "source": "https://github.com/consolidation/annotated-command/tree/4.5.5"
             },
-            "time": "2022-04-05T17:58:10+00:00"
+            "time": "2022-04-26T16:18:25+00:00"
         },
         {
             "name": "consolidation/config",
@@ -2319,17 +2319,17 @@
         },
         {
             "name": "drupal/config_split",
-            "version": "2.0.0-beta5",
+            "version": "2.0.0-rc1",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/config_split.git",
-                "reference": "2.0.0-beta5"
+                "reference": "2.0.0-rc1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/config_split-2.0.0-beta5.zip",
-                "reference": "2.0.0-beta5",
-                "shasum": "b5cf4ee3d7af1ba38883bebead12678214a98f1e"
+                "url": "https://ftp.drupal.org/files/projects/config_split-2.0.0-rc1.zip",
+                "reference": "2.0.0-rc1",
+                "shasum": "c7054738314d1af0ca938b9cb56ea370dcd221ed"
             },
             "require": {
                 "drupal/core": "^8.8 || ^9"
@@ -2347,16 +2347,16 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "2.0.0-beta5",
-                    "datestamp": "1637101204",
+                    "version": "2.0.0-rc1",
+                    "datestamp": "1650976427",
                     "security-coverage": {
                         "status": "not-covered",
-                        "message": "Beta releases are not covered by Drupal security advisories."
+                        "message": "RC releases are not covered by Drupal security advisories."
                     }
                 },
                 "drush": {
                     "services": {
-                        "drush.services.yml": "^10"
+                        "drush.services.yml": "^10 || ^11"
                     }
                 }
             },
@@ -2442,16 +2442,16 @@
         },
         {
             "name": "drupal/core",
-            "version": "9.3.9",
+            "version": "9.3.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core.git",
-                "reference": "86b0c4496e20ae7f945e9a7f0404fafe191ab774"
+                "reference": "ed6af33093f66a9c5048d02f9f2c326ad0e7e90c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core/zipball/86b0c4496e20ae7f945e9a7f0404fafe191ab774",
-                "reference": "86b0c4496e20ae7f945e9a7f0404fafe191ab774",
+                "url": "https://api.github.com/repos/drupal/core/zipball/ed6af33093f66a9c5048d02f9f2c326ad0e7e90c",
+                "reference": "ed6af33093f66a9c5048d02f9f2c326ad0e7e90c",
                 "shasum": ""
             },
             "require": {
@@ -2693,13 +2693,13 @@
             ],
             "description": "Drupal is an open source content management platform powering millions of websites and applications.",
             "support": {
-                "source": "https://github.com/drupal/core/tree/9.3.9"
+                "source": "https://github.com/drupal/core/tree/9.3.12"
             },
-            "time": "2022-03-21T21:21:58+00:00"
+            "time": "2022-04-20T14:25:27+00:00"
         },
         {
             "name": "drupal/core-composer-scaffold",
-            "version": "9.3.9",
+            "version": "9.3.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-composer-scaffold.git",
@@ -2743,13 +2743,13 @@
                 "drupal"
             ],
             "support": {
-                "source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.9"
+                "source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.12"
             },
             "time": "2022-02-24T17:40:56+00:00"
         },
         {
             "name": "drupal/core-dev",
-            "version": "9.3.9",
+            "version": "9.3.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-dev.git",
@@ -2793,22 +2793,22 @@
             ],
             "description": "require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.",
             "support": {
-                "source": "https://github.com/drupal/core-dev/tree/9.3.9"
+                "source": "https://github.com/drupal/core-dev/tree/9.3.12"
             },
             "time": "2021-11-30T05:41:29+00:00"
         },
         {
             "name": "drupal/core-recommended",
-            "version": "9.3.9",
+            "version": "9.3.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-recommended.git",
-                "reference": "3ce3f2b6145de56178e006fb2ef94089d32cf411"
+                "reference": "a8fa50016c1aa1eb7f4e54f590e6343d286c418f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core-recommended/zipball/3ce3f2b6145de56178e006fb2ef94089d32cf411",
-                "reference": "3ce3f2b6145de56178e006fb2ef94089d32cf411",
+                "url": "https://api.github.com/repos/drupal/core-recommended/zipball/a8fa50016c1aa1eb7f4e54f590e6343d286c418f",
+                "reference": "a8fa50016c1aa1eb7f4e54f590e6343d286c418f",
                 "shasum": ""
             },
             "require": {
@@ -2817,7 +2817,7 @@
                 "doctrine/annotations": "1.13.2",
                 "doctrine/lexer": "1.2.1",
                 "doctrine/reflection": "1.2.2",
-                "drupal/core": "9.3.9",
+                "drupal/core": "9.3.12",
                 "egulias/email-validator": "3.1.2",
                 "guzzlehttp/guzzle": "6.5.5",
                 "guzzlehttp/promises": "1.5.1",
@@ -2879,9 +2879,9 @@
             ],
             "description": "Locked core dependencies; require this project INSTEAD OF drupal/core.",
             "support": {
-                "source": "https://github.com/drupal/core-recommended/tree/9.3.9"
+                "source": "https://github.com/drupal/core-recommended/tree/9.3.12"
             },
-            "time": "2022-03-21T21:21:58+00:00"
+            "time": "2022-04-20T14:25:27+00:00"
         },
         {
             "name": "drupal/ctools",
@@ -3029,17 +3029,17 @@
         },
         {
             "name": "drupal/geofield",
-            "version": "1.38.0",
+            "version": "1.39.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/geofield.git",
-                "reference": "8.x-1.38"
+                "reference": "8.x-1.39"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/geofield-8.x-1.38.zip",
-                "reference": "8.x-1.38",
-                "shasum": "a41ce66e4aab2c266a8e9f0addcac68a0b76f44b"
+                "url": "https://ftp.drupal.org/files/projects/geofield-8.x-1.39.zip",
+                "reference": "8.x-1.39",
+                "shasum": "7afd4bb32c21e7bf84568ecc0c1403a3541c2837"
             },
             "require": {
                 "drupal/core": "^8.8 || ^9",
@@ -3048,8 +3048,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.38",
-                    "datestamp": "1646604411",
+                    "version": "8.x-1.39",
+                    "datestamp": "1649534200",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -3641,25 +3641,24 @@
         },
         {
             "name": "drupal/migrate_plus",
-            "version": "5.2.0",
+            "version": "5.3.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/migrate_plus.git",
-                "reference": "8.x-5.2"
+                "reference": "8.x-5.3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/migrate_plus-8.x-5.2.zip",
-                "reference": "8.x-5.2",
-                "shasum": "03ae34c362ccfacc4ae95b58469b25522e0ffb68"
+                "url": "https://ftp.drupal.org/files/projects/migrate_plus-8.x-5.3.zip",
+                "reference": "8.x-5.3",
+                "shasum": "3cf6dde235d7604ee49be2986812c0ee5e2982f6"
             },
             "require": {
                 "drupal/core": "^9.1"
             },
             "require-dev": {
                 "drupal/migrate_example_advanced_setup": "*",
-                "drupal/migrate_example_setup": "*",
-                "drush/drush": "^10"
+                "drupal/migrate_example_setup": "*"
             },
             "suggest": {
                 "ext-soap": "*",
@@ -3668,17 +3667,12 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-5.2",
-                    "datestamp": "1641478565",
+                    "version": "8.x-5.3",
+                    "datestamp": "1650658156",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
                     }
-                },
-                "drush": {
-                    "services": {
-                        "drush.services.yml": "^9 || ^10"
-                    }
                 }
             },
             "notification-url": "https://packages.drupal.org/8/downloads",
@@ -3841,17 +3835,17 @@
         },
         {
             "name": "drupal/pathauto",
-            "version": "1.9.0",
+            "version": "1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/pathauto.git",
-                "reference": "8.x-1.9"
+                "reference": "8.x-1.10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/pathauto-8.x-1.9.zip",
-                "reference": "8.x-1.9",
-                "shasum": "f075ebff595c9b8b62333d65ad29020330e0ea9d"
+                "url": "https://ftp.drupal.org/files/projects/pathauto-8.x-1.10.zip",
+                "reference": "8.x-1.10",
+                "shasum": "f49d5fbcd7a2c1b4de1da07194fe01d9012237ec"
             },
             "require": {
                 "drupal/core": "^8.8 || ^9",
@@ -3864,8 +3858,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.9",
-                    "datestamp": "1644822949",
+                    "version": "8.x-1.10",
+                    "datestamp": "1650806739",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -4573,22 +4567,22 @@
         },
         {
             "name": "drush/drush",
-            "version": "11.0.7",
+            "version": "11.0.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drush-ops/drush.git",
-                "reference": "6991a3b8f6827d0bab13005402730fc50d130a50"
+                "reference": "88b2293ded84f67aad96ad6dbd64cacd84bcd6fe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drush-ops/drush/zipball/6991a3b8f6827d0bab13005402730fc50d130a50",
-                "reference": "6991a3b8f6827d0bab13005402730fc50d130a50",
+                "url": "https://api.github.com/repos/drush-ops/drush/zipball/88b2293ded84f67aad96ad6dbd64cacd84bcd6fe",
+                "reference": "88b2293ded84f67aad96ad6dbd64cacd84bcd6fe",
                 "shasum": ""
             },
             "require": {
                 "chi-teck/drupal-code-generator": "^2.4",
                 "composer/semver": "^1.4 || ^3",
-                "consolidation/annotated-command": "^4.5",
+                "consolidation/annotated-command": "^4.5.3",
                 "consolidation/config": "^2",
                 "consolidation/filter-via-dot-access-data": "^2",
                 "consolidation/robo": "^3.0.9",
@@ -4707,7 +4701,7 @@
                 "irc": "irc://irc.freenode.org/drush",
                 "issues": "https://github.com/drush-ops/drush/issues",
                 "slack": "https://drupal.slack.com/messages/C62H9CWQM",
-                "source": "https://github.com/drush-ops/drush/tree/11.0.7"
+                "source": "https://github.com/drush-ops/drush/tree/11.0.9"
             },
             "funding": [
                 {
@@ -4715,7 +4709,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-03-09T19:32:53+00:00"
+            "time": "2022-04-16T12:01:55+00:00"
         },
         {
             "name": "easyrdf/easyrdf",
@@ -5095,26 +5089,25 @@
         },
         {
             "name": "grasmash/expander",
-            "version": "2.0.2",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/grasmash/expander.git",
-                "reference": "f4df21d01d1fbda38269cca89e3dbb6ba223da7f"
+                "reference": "b7cbc1f2fdf9a9c0e253a424c2a4058316b7cb6e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/grasmash/expander/zipball/f4df21d01d1fbda38269cca89e3dbb6ba223da7f",
-                "reference": "f4df21d01d1fbda38269cca89e3dbb6ba223da7f",
+                "url": "https://api.github.com/repos/grasmash/expander/zipball/b7cbc1f2fdf9a9c0e253a424c2a4058316b7cb6e",
+                "reference": "b7cbc1f2fdf9a9c0e253a424c2a4058316b7cb6e",
                 "shasum": ""
             },
             "require": {
                 "dflydev/dot-access-data": "^3.0.0",
-                "php": ">=5.6",
-                "psr/log": "^1 | ^2"
+                "php": ">=7.1",
+                "psr/log": "^1 | ^2 | ^3"
             },
             "require-dev": {
                 "greg-1-anderson/composer-test-scenarios": "^1",
-                "php-coveralls/php-coveralls": "^2.0",
                 "phpunit/phpunit": "^6.0 || ^8.0 || ^9",
                 "squizlabs/php_codesniffer": "^2.7 || ^3.3"
             },
@@ -5141,9 +5134,9 @@
             "description": "Expands internal property references in PHP arrays file.",
             "support": {
                 "issues": "https://github.com/grasmash/expander/issues",
-                "source": "https://github.com/grasmash/expander/tree/2.0.2"
+                "source": "https://github.com/grasmash/expander/tree/2.0.3"
             },
-            "time": "2022-02-24T03:58:20+00:00"
+            "time": "2022-04-25T22:17:46+00:00"
         },
         {
             "name": "guzzlehttp/guzzle",
@@ -5412,16 +5405,16 @@
         },
         {
             "name": "instaclick/php-webdriver",
-            "version": "1.4.11",
+            "version": "1.4.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/instaclick/php-webdriver.git",
-                "reference": "608e8b20a9072f84cac4f2fddb4420893d69eb83"
+                "reference": "200b8df772b74d604bebf25ef42ad6f8ee6380a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/608e8b20a9072f84cac4f2fddb4420893d69eb83",
-                "reference": "608e8b20a9072f84cac4f2fddb4420893d69eb83",
+                "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/200b8df772b74d604bebf25ef42ad6f8ee6380a9",
+                "reference": "200b8df772b74d604bebf25ef42ad6f8ee6380a9",
                 "shasum": ""
             },
             "require": {
@@ -5429,8 +5422,8 @@
                 "php": ">=5.3.2"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8",
-                "satooshi/php-coveralls": "^1.0||^2.0"
+                "phpunit/phpunit": "^8.5 || ^9.5",
+                "satooshi/php-coveralls": "^1.0 || ^2.0"
             },
             "type": "library",
             "extra": {
@@ -5469,9 +5462,9 @@
             ],
             "support": {
                 "issues": "https://github.com/instaclick/php-webdriver/issues",
-                "source": "https://github.com/instaclick/php-webdriver/tree/1.4.11"
+                "source": "https://github.com/instaclick/php-webdriver/tree/1.4.14"
             },
-            "time": "2022-03-30T01:28:33+00:00"
+            "time": "2022-04-19T02:06:59+00:00"
         },
         {
             "name": "justinrainbow/json-schema",
@@ -5842,16 +5835,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "2.2.3",
+            "version": "2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "47b015bc4e50fd4438c1ffef6139a1fb65d2ab71"
+                "reference": "32a49eb2b38fe5e5c417ab748a45d0beaab97955"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/47b015bc4e50fd4438c1ffef6139a1fb65d2ab71",
-                "reference": "47b015bc4e50fd4438c1ffef6139a1fb65d2ab71",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/32a49eb2b38fe5e5c417ab748a45d0beaab97955",
+                "reference": "32a49eb2b38fe5e5c417ab748a45d0beaab97955",
                 "shasum": ""
             },
             "require": {
@@ -5860,17 +5853,19 @@
                 "php": "^7.4 || ^8.0",
                 "psr/event-dispatcher": "^1.0",
                 "symfony/deprecation-contracts": "^2.1 || ^3.0",
-                "symfony/polyfill-php80": "^1.15"
+                "symfony/polyfill-php80": "^1.16"
             },
             "require-dev": {
                 "cebe/markdown": "^1.0",
                 "commonmark/cmark": "0.30.0",
                 "commonmark/commonmark.js": "0.30.0",
                 "composer/package-versions-deprecated": "^1.8",
+                "embed/embed": "^4.4",
                 "erusev/parsedown": "^1.0",
                 "ext-json": "*",
                 "github/gfm": "0.29.0",
                 "michelf/php-markdown": "^1.4",
+                "nyholm/psr7": "^1.5",
                 "phpstan/phpstan": "^0.12.88 || ^1.0.0",
                 "phpunit/phpunit": "^9.5.5",
                 "scrutinizer/ocular": "^1.8.1",
@@ -5885,7 +5880,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.3-dev"
+                    "dev-main": "2.4-dev"
                 }
             },
             "autoload": {
@@ -5942,7 +5937,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-26T21:24:45+00:00"
+            "time": "2022-04-07T22:37:05+00:00"
         },
         {
             "name": "league/config",
@@ -7499,16 +7494,16 @@
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "1.4.2",
+            "version": "1.4.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "4cb3021a4e10ffe3d5f94a4c34cf4b3f6de2fa3d"
+                "reference": "129a63b3bc7caeb593c224c41f420675e63cfefc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/4cb3021a4e10ffe3d5f94a4c34cf4b3f6de2fa3d",
-                "reference": "4cb3021a4e10ffe3d5f94a4c34cf4b3f6de2fa3d",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/129a63b3bc7caeb593c224c41f420675e63cfefc",
+                "reference": "129a63b3bc7caeb593c224c41f420675e63cfefc",
                 "shasum": ""
             },
             "require": {
@@ -7537,9 +7532,9 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.4.2"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.4.5"
             },
-            "time": "2022-03-30T13:33:37+00:00"
+            "time": "2022-04-22T11:11:01+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -10776,16 +10771,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v4.4.37",
+            "version": "v4.4.41",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "b17d76d7ed179f017aad646e858c90a2771af15d"
+                "reference": "40790bdf293b462798882ef6da72bb49a4a6633a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/b17d76d7ed179f017aad646e858c90a2771af15d",
-                "reference": "b17d76d7ed179f017aad646e858c90a2771af15d",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/40790bdf293b462798882ef6da72bb49a4a6633a",
+                "reference": "40790bdf293b462798882ef6da72bb49a4a6633a",
                 "shasum": ""
             },
             "require": {
@@ -10818,7 +10813,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v4.4.37"
+                "source": "https://github.com/symfony/finder/tree/v4.4.41"
             },
             "funding": [
                 {
@@ -10834,20 +10829,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:41:36+00:00"
+            "time": "2022-04-14T15:36:10+00:00"
         },
         {
             "name": "symfony/flex",
-            "version": "v2.1.6",
+            "version": "v2.1.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/flex.git",
-                "reference": "dd7dafe3bfebf8441e167b76d8a18974585467f3"
+                "reference": "3eb57ba4b5d3f14cdaafe030936421c22e9f98a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/flex/zipball/dd7dafe3bfebf8441e167b76d8a18974585467f3",
-                "reference": "dd7dafe3bfebf8441e167b76d8a18974585467f3",
+                "url": "https://api.github.com/repos/symfony/flex/zipball/3eb57ba4b5d3f14cdaafe030936421c22e9f98a2",
+                "reference": "3eb57ba4b5d3f14cdaafe030936421c22e9f98a2",
                 "shasum": ""
             },
             "require": {
@@ -10883,7 +10878,7 @@
             "description": "Composer plugin for Symfony",
             "support": {
                 "issues": "https://github.com/symfony/flex/issues",
-                "source": "https://github.com/symfony/flex/tree/v2.1.6"
+                "source": "https://github.com/symfony/flex/tree/v2.1.7"
             },
             "funding": [
                 {
@@ -10899,7 +10894,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-02-16T17:31:43+00:00"
+            "time": "2022-04-15T08:20:43+00:00"
         },
         {
             "name": "symfony/http-client-contracts",
@@ -11314,16 +11309,16 @@
         },
         {
             "name": "symfony/phpunit-bridge",
-            "version": "v5.4.7",
+            "version": "v5.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/phpunit-bridge.git",
-                "reference": "31977d36f253607e1fc4e1fb54df18bd9f1e4348"
+                "reference": "cec05218b4fd847b87dce5b3560b288096c36950"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/31977d36f253607e1fc4e1fb54df18bd9f1e4348",
-                "reference": "31977d36f253607e1fc4e1fb54df18bd9f1e4348",
+                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/cec05218b4fd847b87dce5b3560b288096c36950",
+                "reference": "cec05218b4fd847b87dce5b3560b288096c36950",
                 "shasum": ""
             },
             "require": {
@@ -11377,7 +11372,7 @@
             "description": "Provides utilities for PHPUnit, especially user deprecation notices management",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/phpunit-bridge/tree/v5.4.7"
+                "source": "https://github.com/symfony/phpunit-bridge/tree/v5.4.8"
             },
             "funding": [
                 {
@@ -11393,7 +11388,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-03-06T11:25:32+00:00"
+            "time": "2022-04-12T15:48:08+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -12624,16 +12619,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v6.0.3",
+            "version": "v6.0.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "522144f0c4c004c80d56fa47e40e17028e2eefc2"
+                "reference": "ac0aa5c2282e0de624c175b68d13f2c8f2e2649d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/522144f0c4c004c80d56fa47e40e17028e2eefc2",
-                "reference": "522144f0c4c004c80d56fa47e40e17028e2eefc2",
+                "url": "https://api.github.com/repos/symfony/string/zipball/ac0aa5c2282e0de624c175b68d13f2c8f2e2649d",
+                "reference": "ac0aa5c2282e0de624c175b68d13f2c8f2e2649d",
                 "shasum": ""
             },
             "require": {
@@ -12689,7 +12684,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v6.0.3"
+                "source": "https://github.com/symfony/string/tree/v6.0.8"
             },
             "funding": [
                 {
@@ -12705,7 +12700,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:55:41+00:00"
+            "time": "2022-04-22T08:18:02+00:00"
         },
         {
             "name": "symfony/translation",
@@ -14262,17 +14257,17 @@
         },
         {
             "name": "drupal/config_filter",
-            "version": "2.2.0",
+            "version": "2.3.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/config_filter.git",
-                "reference": "8.x-2.2"
+                "reference": "8.x-2.3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/config_filter-8.x-2.2.zip",
-                "reference": "8.x-2.2",
-                "shasum": "dc6bc8107255066507cfc1d6766e664c3673cda0"
+                "url": "https://ftp.drupal.org/files/projects/config_filter-8.x-2.3.zip",
+                "reference": "8.x-2.3",
+                "shasum": "043fc712997cdd6b384024ab96bebba70e5c6b26"
             },
             "require": {
                 "drupal/core": "^8.8 || ^9"
@@ -14286,8 +14281,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-2.2",
-                    "datestamp": "1601934694",
+                    "version": "8.x-2.3",
+                    "datestamp": "1649336106",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -14397,27 +14392,27 @@
         },
         {
             "name": "drupal/devel_php",
-            "version": "1.3.0",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/devel_php.git",
-                "reference": "8.x-1.3"
+                "reference": "8.x-1.5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/devel_php-8.x-1.3.zip",
-                "reference": "8.x-1.3",
-                "shasum": "73282d23331c36c0460bfb0c1efd124fe89549b4"
+                "url": "https://ftp.drupal.org/files/projects/devel_php-8.x-1.5.zip",
+                "reference": "8.x-1.5",
+                "shasum": "eca4f0fba9f89ffcc104478a1107de2e2f9fe926"
             },
             "require": {
-                "drupal/core": "^8.8 || ^9",
+                "drupal/core": "^9.2 || ^10",
                 "drupal/devel": ">=2.1"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.3",
-                    "datestamp": "1601974470",
+                    "version": "8.x-1.5",
+                    "datestamp": "1649422110",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Project has not opted into security advisory coverage!"
@@ -14430,21 +14425,18 @@
             ],
             "authors": [
                 {
-                    "name": "Luca Lusso (lussoluca)",
-                    "homepage": "https://www.drupal.org/user/138068",
-                    "role": "Maintainer"
+                    "name": "Grimreaper",
+                    "homepage": "https://www.drupal.org/user/2388214"
                 },
                 {
-                    "name": "Florent Torregrosa (Grimreaper)",
-                    "homepage": "https://www.drupal.org/user/2388214",
-                    "role": "Co-maintainer"
+                    "name": "lussoluca",
+                    "homepage": "https://www.drupal.org/user/138068"
                 }
             ],
             "description": "Re-add Execute PHP feature to Devel.",
-            "homepage": "https://drupal.org/project/devel_php",
+            "homepage": "https://www.drupal.org/project/devel_php",
             "support": {
-                "source": "https://git.drupalcode.org/project/devel_php",
-                "issues": "https://drupal.org/project/issues/devel_php"
+                "source": "https://git.drupalcode.org/project/devel_php"
             }
         },
         {
@@ -14913,16 +14905,16 @@
         },
         {
             "name": "symfony/config",
-            "version": "v4.4.37",
+            "version": "v4.4.41",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/config.git",
-                "reference": "e8c2d2c951ddedecb6d28954d336cb7d2e852d0e"
+                "reference": "9d031eb2d4292aed117b0f7fafd5c436dcf3dfd7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/e8c2d2c951ddedecb6d28954d336cb7d2e852d0e",
-                "reference": "e8c2d2c951ddedecb6d28954d336cb7d2e852d0e",
+                "url": "https://api.github.com/repos/symfony/config/zipball/9d031eb2d4292aed117b0f7fafd5c436dcf3dfd7",
+                "reference": "9d031eb2d4292aed117b0f7fafd5c436dcf3dfd7",
                 "shasum": ""
             },
             "require": {
@@ -14971,7 +14963,7 @@
             "description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/config/tree/v4.4.37"
+                "source": "https://github.com/symfony/config/tree/v4.4.41"
             },
             "funding": [
                 {
@@ -14987,7 +14979,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-03T09:46:22+00:00"
+            "time": "2022-04-12T15:19:55+00:00"
         },
         {
             "name": "symfony/polyfill-php81",
diff --git a/config/pathauto.pattern.blog_post.yml b/config/pathauto.pattern.blog_post.yml
index 7bc4fed00..394585033 100644
--- a/config/pathauto.pattern.blog_post.yml
+++ b/config/pathauto.pattern.blog_post.yml
@@ -10,7 +10,7 @@ type: 'canonical_entities:node'
 pattern: 'blogpost/[node:title]'
 selection_criteria:
   6e9d3879-0e75-4d7d-bcdb-957a0aff6353:
-    id: node_type
+    id: 'entity_bundle:node'
     negate: false
     uuid: 6e9d3879-0e75-4d7d-bcdb-957a0aff6353
     context_mapping:
diff --git a/config/pathauto.pattern.book_page.yml b/config/pathauto.pattern.book_page.yml
index 56a1d7bc3..f9f8fc0d8 100644
--- a/config/pathauto.pattern.book_page.yml
+++ b/config/pathauto.pattern.book_page.yml
@@ -10,7 +10,7 @@ type: 'canonical_entities:node'
 pattern: '[node:title]'
 selection_criteria:
   3db763c8-2879-4d9f-8bc8-35cbb0c2a8c2:
-    id: node_type
+    id: 'entity_bundle:node'
     negate: false
     uuid: 3db763c8-2879-4d9f-8bc8-35cbb0c2a8c2
     context_mapping:
diff --git a/config/pathauto.pattern.job.yml b/config/pathauto.pattern.job.yml
index c0f397b2a..6774dd988 100644
--- a/config/pathauto.pattern.job.yml
+++ b/config/pathauto.pattern.job.yml
@@ -10,7 +10,7 @@ type: 'canonical_entities:node'
 pattern: 'job/[node:nid]/[node:title]'
 selection_criteria:
   140bd801-78ac-4a99-8477-c5d2ce4e73d6:
-    id: node_type
+    id: 'entity_bundle:node'
     negate: false
     uuid: 140bd801-78ac-4a99-8477-c5d2ce4e73d6
     context_mapping:
diff --git a/config/pathauto.pattern.report.yml b/config/pathauto.pattern.report.yml
index 972a09f92..459e5f0f2 100644
--- a/config/pathauto.pattern.report.yml
+++ b/config/pathauto.pattern.report.yml
@@ -10,7 +10,7 @@ type: 'canonical_entities:node'
 pattern: '[node:reliefweb-content-type]/[node:field_primary_country:entity:name]/[node:title]'
 selection_criteria:
   cac24841-112a-498c-92d9-845c71da29f6:
-    id: node_type
+    id: 'entity_bundle:node'
     negate: false
     uuid: cac24841-112a-498c-92d9-845c71da29f6
     context_mapping:
diff --git a/config/pathauto.pattern.topic.yml b/config/pathauto.pattern.topic.yml
index cec598766..042347c7c 100644
--- a/config/pathauto.pattern.topic.yml
+++ b/config/pathauto.pattern.topic.yml
@@ -10,7 +10,7 @@ type: 'canonical_entities:node'
 pattern: 'topic/[node:title]'
 selection_criteria:
   ff97a756-5597-44b5-b955-edf1eac6d22e:
-    id: node_type
+    id: 'entity_bundle:node'
     negate: false
     uuid: ff97a756-5597-44b5-b955-edf1eac6d22e
     context_mapping:
diff --git a/config/pathauto.pattern.training.yml b/config/pathauto.pattern.training.yml
index ff87292c8..1c2e3692e 100644
--- a/config/pathauto.pattern.training.yml
+++ b/config/pathauto.pattern.training.yml
@@ -10,7 +10,7 @@ type: 'canonical_entities:node'
 pattern: 'training/[node:nid]/[node:title]'
 selection_criteria:
   5eabdf04-0f4f-4dd4-a921-2a506dae29b8:
-    id: node_type
+    id: 'entity_bundle:node'
     negate: false
     uuid: 5eabdf04-0f4f-4dd4-a921-2a506dae29b8
     context_mapping:

From 106a47f7710c41a38dce09aceb231c978fcb2f3e Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sun, 1 May 2022 10:42:36 +0000
Subject: [PATCH 673/720] [RW-93] Adjust caching of all pages

---
 .../reliefweb_analytics.module                |   2 +-
 .../reliefweb_disaster_map.module             |   2 +-
 .../src/DisasterMapService.php                |  38 ++--
 .../reliefweb_entities/src/DocumentTrait.php  |   7 +
 .../src/Entity/BlogPost.php                   |   5 +
 .../reliefweb_entities/src/Entity/Book.php    |   6 +-
 .../src/Entity/Disaster.php                   |   2 +
 .../reliefweb_entities/src/Entity/Report.php  |   7 +
 .../reliefweb_entities/src/Entity/Topic.php   |   1 +
 .../src/SectionedContentTrait.php             |  36 ++--
 .../GuidelineSinglePageController.php         |   8 +
 .../src/Entity/Guideline.php                  |   4 +-
 .../src/Form/GuidelineListSortForm.php        |   6 +-
 .../src/Form/GuidelineSortForm.php            |   6 +-
 .../src/Controller/Homepage.php               |  19 +-
 .../reliefweb_revisions.services.yml          |   2 +-
 .../src/Services/EntityHistory.php            | 170 +++++++++++-------
 .../src/Controller/SearchResults.php          |  35 ++--
 .../reliefweb_rivers/src/RiverServiceBase.php |  77 ++++++--
 .../src/Services/CountryRiver.php             |   2 +
 .../src/Services/DisasterRiver.php            |   2 +
 .../src/Services/SourceRiver.php              |  13 ++
 .../src/Services/TopicRiver.php               |  20 ++-
 .../content/node--blog_post--full.html.twig   |   7 +-
 .../content/node--job--full.html.twig         |  24 ++-
 .../content/node--report--full.html.twig      |  25 ++-
 .../content/node--training--full.html.twig    |  21 +++
 27 files changed, 404 insertions(+), 143 deletions(-)

diff --git a/html/modules/custom/reliefweb_analytics/reliefweb_analytics.module b/html/modules/custom/reliefweb_analytics/reliefweb_analytics.module
index ebaa1c5e6..f9c879967 100644
--- a/html/modules/custom/reliefweb_analytics/reliefweb_analytics.module
+++ b/html/modules/custom/reliefweb_analytics/reliefweb_analytics.module
@@ -226,7 +226,7 @@ function reliefweb_analytics_get_user_dimensions() {
   $user = \Drupal::currentUser();
 
   $cache = \Drupal::cache();
-  $cache_id = 'reliefweb_analytics:user' . $user->id();
+  $cache_id = 'reliefweb_analytics:user:' . $user->id();
 
   // Try to load the computed dimensions from the cache.
   $cache_object = \Drupal::cache()->get($cache_id);
diff --git a/html/modules/custom/reliefweb_disaster_map/reliefweb_disaster_map.module b/html/modules/custom/reliefweb_disaster_map/reliefweb_disaster_map.module
index 477855103..0e627f9a1 100644
--- a/html/modules/custom/reliefweb_disaster_map/reliefweb_disaster_map.module
+++ b/html/modules/custom/reliefweb_disaster_map/reliefweb_disaster_map.module
@@ -134,7 +134,7 @@ function reliefweb_disaster_map_get_disaster_map_token_replacement($token, Bubbl
 
   if (!empty($title)) {
     return \Drupal::service('reliefweb_disaster_map.service')
-      ->getDisasterMap($id, $title, $options, 'render');
+      ->getDisasterMap($id, $title, $options, TRUE);
   }
   return '';
 }
diff --git a/html/modules/custom/reliefweb_disaster_map/src/DisasterMapService.php b/html/modules/custom/reliefweb_disaster_map/src/DisasterMapService.php
index 73f7edd04..ae29ccee6 100644
--- a/html/modules/custom/reliefweb_disaster_map/src/DisasterMapService.php
+++ b/html/modules/custom/reliefweb_disaster_map/src/DisasterMapService.php
@@ -4,6 +4,7 @@
 
 use Drupal\Component\Utility\Html;
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Render\Markup;
 use Drupal\Core\Render\Renderer;
 use Drupal\Core\Template\Attribute;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
@@ -75,11 +76,13 @@ public static function trustedCallbacks() {
    *   - types (array): list of disaster type codes (ex: EP for epidemic)
    *   - ids (array): list of disaster ids
    *   - from (int): to retrieve disasters creatrd after the timestamp.
+   * @param bool $render
+   *   Whether to render the map or return the render array.
    *
-   * @return \Drupal\Component\Render\MarkupInterface|string
-   *   The disaster map rendered HTML.
+   * @return \Drupal\Component\Render\MarkupInterface|string|array
+   *   The disaster map rendered HTML or the render array if $render is FALSE.
    */
-  public function getDisasterMap($id, $title, array $options = []) {
+  public function getDisasterMap($id, $title, array $options = [], $render = TRUE) {
     $id = Html::getUniqueId($id);
 
     $legend = [
@@ -237,28 +240,37 @@ public function getDisasterMap($id, $title, array $options = []) {
         ],
       ],
       '#cache' => [
-        'tag' => [
+        'keys' => [
+          'reliefweb',
+          'diaster-map',
+          hash('md5', serialize([$id, $title, $options])),
+        ],
+        'tags' => [
           'taxonomy_term_list:disaster',
         ],
       ],
+      '#cache_properties' => [
+        '#title',
+        '#entities',
+      ],
     ];
 
-    return $this->renderer->render($render_array);
+    // We wrap the rendered map in a Markup to mark it as safe and prevent
+    // double escaping when its retrieved from the cache.
+    return $render ? Markup::create($this->renderer->render($render_array)) : $render_array;
   }
 
   /**
    * Get the map of the latest alert and ongoing diasters.
    *
-   * @return \Drupal\Component\Render\MarkupInterface|string
-   *   The disaster map rendered HTML.
+   * @return array
+   *   The disaster map render array.
    */
   public static function getAlertAndOngoingDisasterMap() {
-    return [
-      '#markup' => \Drupal::service('reliefweb_disaster_map.service')
-        ->getDisasterMap('disaster-map', t('Alert and Ongoing Disasters'), [
-          'statuses' => ['alert', 'ongoing'],
-        ]),
-    ];
+    return \Drupal::service('reliefweb_disaster_map.service')
+      ->getDisasterMap('disaster-map', t('Alert and Ongoing Disasters'), [
+        'statuses' => ['alert', 'ongoing'],
+      ], FALSE);
   }
 
 }
diff --git a/html/modules/custom/reliefweb_entities/src/DocumentTrait.php b/html/modules/custom/reliefweb_entities/src/DocumentTrait.php
index b46a64c5b..9910b1543 100644
--- a/html/modules/custom/reliefweb_entities/src/DocumentTrait.php
+++ b/html/modules/custom/reliefweb_entities/src/DocumentTrait.php
@@ -212,6 +212,13 @@ public function getRelatedContent($limit = 4) {
       '#title' => $title,
       '#resource' => 'reports',
       '#entities' => $entities,
+      '#cache' => [
+        'tags' => [
+          'node_list:report',
+          'taxonomy_term_list:country',
+          'taxonomy_term_list:source',
+        ],
+      ],
     ];
   }
 
diff --git a/html/modules/custom/reliefweb_entities/src/Entity/BlogPost.php b/html/modules/custom/reliefweb_entities/src/Entity/BlogPost.php
index d4ae90015..ff506385b 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/BlogPost.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/BlogPost.php
@@ -105,6 +105,11 @@ public function getLatestBlogPosts($limit = 8) {
         'url' => RiverServiceBase::getRiverUrl('blog_post'),
         'label' => $this->t('View all blog posts'),
       ],
+      '#cache' => [
+        'tags' => [
+          'node_list:blog_post',
+        ],
+      ],
     ];
   }
 
diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Book.php b/html/modules/custom/reliefweb_entities/src/Entity/Book.php
index 6bda9a51d..0d8a63533 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Book.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Book.php
@@ -72,9 +72,9 @@ public function getBookOutline() {
       '#title' => $this->t('More about ReliefWeb'),
       '#links' => $links,
       '#cache' => [
-        // @todo maybe we need some extra cache info that we could extract
-        // from the trees above.
-        '#tags' => ['node_list:book'],
+        '#tags' => [
+          'node_list:book',
+        ],
       ],
     ];
 
diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Disaster.php b/html/modules/custom/reliefweb_entities/src/Entity/Disaster.php
index 89e091dd3..700658d99 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Disaster.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Disaster.php
@@ -172,6 +172,7 @@ public function getAffectedCountriesApiQuery() {
     return [
       'resource' => 'countries',
       'bundle' => 'country',
+      'entity_type' => 'taxonomy_term',
       'payload' => $payload,
     ];
   }
@@ -221,6 +222,7 @@ public function getRelatedDisastersApiQuery() {
     return [
       'resource' => 'disasters',
       'bundle' => 'disaster',
+      'entity_type' => 'taxonomy_term',
       'payload' => $payload,
     ];
   }
diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Report.php b/html/modules/custom/reliefweb_entities/src/Entity/Report.php
index 0a2e096bf..4ae9a56ec 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Report.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Report.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\reliefweb_entities\Entity;
 
+use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Link;
 use Drupal\Core\Url;
@@ -78,6 +79,8 @@ public function getSourceDisclaimers() {
       return [];
     }
 
+    $cache = new CacheableMetadata();
+
     $disclaimers = [];
     foreach ($this->field_source->referencedEntities() as $entity) {
       if (!$entity->field_disclaimer->isEmpty()) {
@@ -85,6 +88,7 @@ public function getSourceDisclaimers() {
           'name' => $entity->label(),
           'disclaimer' => $entity->field_disclaimer->value,
         ];
+        $cache->addCacheTags($entity->getCacheTags());
       }
     }
 
@@ -95,6 +99,9 @@ public function getSourceDisclaimers() {
     return [
       '#theme' => 'reliefweb_entities_entity_source_disclaimers',
       '#disclaimers' => $disclaimers,
+      '#cache' => [
+        'tags' => $cache->getCacheTags(),
+      ],
     ];
   }
 
diff --git a/html/modules/custom/reliefweb_entities/src/Entity/Topic.php b/html/modules/custom/reliefweb_entities/src/Entity/Topic.php
index ee741fb0a..8a360938c 100644
--- a/html/modules/custom/reliefweb_entities/src/Entity/Topic.php
+++ b/html/modules/custom/reliefweb_entities/src/Entity/Topic.php
@@ -338,6 +338,7 @@ protected function riverUrlToApi(array $data, $limit = 3) {
     return [
       'resource' => $resource,
       'bundle' => $bundle,
+      'entity_type' => $service->getEntityTypeId(),
       'river' => $river,
       'title' => $title,
       'view' => $view,
diff --git a/html/modules/custom/reliefweb_entities/src/SectionedContentTrait.php b/html/modules/custom/reliefweb_entities/src/SectionedContentTrait.php
index fec0c2990..f9df44b3e 100644
--- a/html/modules/custom/reliefweb_entities/src/SectionedContentTrait.php
+++ b/html/modules/custom/reliefweb_entities/src/SectionedContentTrait.php
@@ -17,7 +17,7 @@ trait SectionedContentTrait {
   /**
    * Get the section data for the given ReliefWeb API queries.
    *
-   * @see \Drupal\reliefweb_entities\SectionedContentInterfacegetSectionsFromReliefWebApiQueries()
+   * @see \Drupal\reliefweb_entities\SectionedContentInterface::getSectionsFromReliefWebApiQueries()
    */
   public function getSectionsFromReliefWebApiQueries(array $queries) {
     $results = \Drupal::service('reliefweb_api.client')
@@ -45,6 +45,12 @@ public function getSectionsFromReliefWebApiQueries(array $queries) {
           '#more' => $query['more'] ?? NULL,
           '#title' => $query['title'] ?? NULL,
           '#total' => $result['totalCount'] ?? NULL,
+          '#cache' => [
+            'tags' => [
+              $query['entity_type'] . '_list:' . $query['bundle'],
+              'taxonomy_term_list',
+            ],
+          ],
         ];
       }
     }
@@ -54,7 +60,7 @@ public function getSectionsFromReliefWebApiQueries(array $queries) {
   /**
    * Consolidate content sections.
    *
-   * @see \Drupal\reliefweb_entities\SectionedContentInterfaceconsolidateSections()
+   * @see \Drupal\reliefweb_entities\SectionedContentInterface::consolidateSections()
    */
   public function consolidateSections(array $contents, array $sections, array $labels = []) {
     $consolidated = [];
@@ -154,7 +160,7 @@ public function getEntityTextField($field_name, $id, $title, $iframe = TRUE, arr
   /**
    * Get payload for the key content reports.
    *
-   * @see \Drupal\reliefweb_entities\SectionedContentInterfacegetKeyContentApiQuery()
+   * @see \Drupal\reliefweb_entities\SectionedContentInterface::getKeyContentApiQuery()
    */
   public function getKeyContentApiQuery($code = 'PC', $limit = 3) {
     $links = $this->getProfileFieldLinks('field_key_content');
@@ -192,6 +198,7 @@ public function getKeyContentApiQuery($code = 'PC', $limit = 3) {
     return [
       'resource' => 'reports',
       'bundle' => 'report',
+      'entity_type' => 'node',
       'payload' => $payload,
       // Link to the updates river for the entity.
       'more' => [
@@ -208,7 +215,7 @@ public function getKeyContentApiQuery($code = 'PC', $limit = 3) {
   /**
    * Get payload for the appeals and response plans.
    *
-   * @see \Drupal\reliefweb_entities\SectionedContentInterfacegetAppealsResponsePlansApiQuery()
+   * @see \Drupal\reliefweb_entities\SectionedContentInterface::getAppealsResponsePlansApiQuery()
    */
   public function getAppealsResponsePlansApiQuery($code = 'PC', $limit = 50) {
     $links = $this->getProfileFieldLinks('field_appeals_response_plans');
@@ -246,6 +253,7 @@ public function getAppealsResponsePlansApiQuery($code = 'PC', $limit = 50) {
     return [
       'resource' => 'reports',
       'bundle' => 'report',
+      'entity_type' => 'node',
       'payload' => $payload,
       'exclude' => ['summary', 'format'],
       // Link to the updates river for the entity.
@@ -263,7 +271,7 @@ public function getAppealsResponsePlansApiQuery($code = 'PC', $limit = 50) {
   /**
    * Get payload for the most read documents.
    *
-   * @see \Drupal\reliefweb_entities\SectionedContentInterfacegetMostReadApiQuery()
+   * @see \Drupal\reliefweb_entities\SectionedContentInterface::getMostReadApiQuery()
    */
   public function getMostReadApiQuery($code = 'PC', $limit = 5) {
     $entity_id = $this->id();
@@ -306,6 +314,7 @@ public function getMostReadApiQuery($code = 'PC', $limit = 5) {
       return [
         'resource' => 'reports',
         'bundle' => 'report',
+        'entity_type' => 'node',
         'payload' => $payload,
         // Link to the updates river for the entity.
         'more' => [
@@ -324,7 +333,7 @@ public function getMostReadApiQuery($code = 'PC', $limit = 5) {
   /**
    * Get payload for latest updates.
    *
-   * @see \Drupal\reliefweb_entities\SectionedContentInterfacegetLatestUpdatesApiQuery()
+   * @see \Drupal\reliefweb_entities\SectionedContentInterface::getLatestUpdatesApiQuery()
    */
   public function getLatestUpdatesApiQuery($code = 'PC', $limit = 3) {
     $bundle = $this->bundle();
@@ -343,6 +352,7 @@ public function getLatestUpdatesApiQuery($code = 'PC', $limit = 3) {
     return [
       'resource' => 'reports',
       'bundle' => 'report',
+      'entity_type' => 'node',
       'payload' => $payload,
       // Link to the updates river for the entity.
       'more' => [
@@ -359,7 +369,7 @@ public function getLatestUpdatesApiQuery($code = 'PC', $limit = 3) {
   /**
    * Get payload for maps and infographics.
    *
-   * @see \Drupal\reliefweb_entities\SectionedContentInterfacegetLatestMapsInfographicsApiQuery()
+   * @see \Drupal\reliefweb_entities\SectionedContentInterface::getLatestMapsInfographicsApiQuery()
    */
   public function getLatestMapsInfographicsApiQuery($code = 'PC', $limit = 3) {
     $bundle = $this->bundle();
@@ -389,6 +399,7 @@ public function getLatestMapsInfographicsApiQuery($code = 'PC', $limit = 3) {
     return [
       'resource' => 'reports',
       'bundle' => 'report',
+      'entity_type' => 'node',
       'payload' => $payload,
       'exclude' => ['summary', 'format'],
       // Link to the updates river with the maps/infographics for the entity.
@@ -406,7 +417,7 @@ public function getLatestMapsInfographicsApiQuery($code = 'PC', $limit = 3) {
   /**
    * Get payload for latest jobs.
    *
-   * @see \Drupal\reliefweb_entities\SectionedContentInterfacegetLatestJobsApiQuery()
+   * @see \Drupal\reliefweb_entities\SectionedContentInterface::getLatestJobsApiQuery()
    */
   public function getLatestJobsApiQuery($code = 'C', $limit = 3) {
     $bundle = $this->bundle();
@@ -422,6 +433,7 @@ public function getLatestJobsApiQuery($code = 'C', $limit = 3) {
     return [
       'resource' => 'jobs',
       'bundle' => 'job',
+      'entity_type' => 'node',
       'payload' => $payload,
       // Link to the jobs river for the entity.
       'more' => [
@@ -438,7 +450,7 @@ public function getLatestJobsApiQuery($code = 'C', $limit = 3) {
   /**
    * Get payload for latest training.
    *
-   * @see \Drupal\reliefweb_entities\SectionedContentInterfacegetLatestTrainingApiQuery()
+   * @see \Drupal\reliefweb_entities\SectionedContentInterface::getLatestTrainingApiQuery()
    */
   public function getLatestTrainingApiQuery($code = 'C', $limit = 3) {
     $bundle = $this->bundle();
@@ -454,6 +466,7 @@ public function getLatestTrainingApiQuery($code = 'C', $limit = 3) {
     return [
       'resource' => 'training',
       'bundle' => 'training',
+      'entity_type' => 'node',
       'payload' => $payload,
       // Link to the training river for the entity.
       'more' => [
@@ -470,7 +483,7 @@ public function getLatestTrainingApiQuery($code = 'C', $limit = 3) {
   /**
    * Get payload for latest alert and ongoing disasters.
    *
-   * @see \Drupal\reliefweb_entities\SectionedContentInterfacegetLatestDisastersApiQuery()
+   * @see \Drupal\reliefweb_entities\SectionedContentInterface::getLatestDisastersApiQuery()
    */
   public function getLatestDisastersApiQuery($code = 'C', $limit = 100) {
     $bundle = $this->bundle();
@@ -497,6 +510,7 @@ public function getLatestDisastersApiQuery($code = 'C', $limit = 100) {
     return [
       'resource' => 'disasters',
       'bundle' => 'disaster',
+      'entity_type' => 'taxonomy_term',
       'payload' => $payload,
       // Link to the disasters river for the country.
       'more' => [
@@ -513,7 +527,7 @@ public function getLatestDisastersApiQuery($code = 'C', $limit = 100) {
   /**
    * Get the section with the useful links for the entity (country/disaster).
    *
-   * @see \Drupal\reliefweb_entities\SectionedContentInterfacegetUsefulLinksSection()
+   * @see \Drupal\reliefweb_entities\SectionedContentInterface::getUsefulLinksSection()
    */
   public function getUsefulLinksSection() {
     $links = $this->getProfileFieldLinks('field_useful_links');
diff --git a/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php b/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
index 90dd03c28..071ea9d80 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Controller/GuidelineSinglePageController.php
@@ -117,9 +117,17 @@ public function getPageContent() {
         return !empty($item['title']) && !empty($item['children']);
       }),
       '#cache' => [
+        'keys' => [
+          'reliefweb',
+          'guidelines',
+        ],
         'tags' => ['guideline_list'],
         'contexts' => ['user.permissions'],
       ],
+      '#cache_properties' => [
+        '#title',
+        '#guidelines',
+      ],
       '#attached' => [
         'library' => ['reliefweb_guidelines/reliefweb-guidelines'],
       ],
diff --git a/html/modules/custom/reliefweb_guidelines/src/Entity/Guideline.php b/html/modules/custom/reliefweb_guidelines/src/Entity/Guideline.php
index a7d076bd5..93f15f653 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Entity/Guideline.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Entity/Guideline.php
@@ -134,11 +134,11 @@ public function getGuidelineList() {
   /**
    * Get the list, this guideline belongs to.
    *
-   * @return \Drupal\Core\GeneratedLink|null
+   * @return array|null
    *   Link to the guideline list.
    */
   public function getGuidelineListLink() {
-    return $this->getGuidelineList()?->toLink()?->toString();
+    return $this->getGuidelineList()?->toLink()?->toRenderable();
   }
 
 }
diff --git a/html/modules/custom/reliefweb_guidelines/src/Form/GuidelineListSortForm.php b/html/modules/custom/reliefweb_guidelines/src/Form/GuidelineListSortForm.php
index ed1cd7687..ad4ad6c71 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Form/GuidelineListSortForm.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Form/GuidelineListSortForm.php
@@ -99,9 +99,9 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       $form['order'][$id]['#weight'] = $entity->getWeight();
 
       // Label.
-      $form['order'][$id]['label'] = [
-        '#markup' => $entity->toLink($entity->label(), 'edit-form')->toString(),
-      ];
+      $form['order'][$id]['label'] = $entity
+        ?->toLink($entity->label(), 'edit-form')
+        ?->toRenderable();
 
       // Weight.
       $form['order'][$id]['weight'] = [
diff --git a/html/modules/custom/reliefweb_guidelines/src/Form/GuidelineSortForm.php b/html/modules/custom/reliefweb_guidelines/src/Form/GuidelineSortForm.php
index be7fcb827..437824af7 100644
--- a/html/modules/custom/reliefweb_guidelines/src/Form/GuidelineSortForm.php
+++ b/html/modules/custom/reliefweb_guidelines/src/Form/GuidelineSortForm.php
@@ -90,9 +90,9 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       $form['items'][$id]['#weight'] = $child->getWeight();
 
       // Label.
-      $form['items'][$id]['label'] = [
-        '#markup' => $child->toLink($child->label(), 'edit-form')->toString(),
-      ];
+      $form['items'][$id]['label'] = $child
+        ?->toLink($child->label(), 'edit-form')
+        ?->toRenderable();
 
       // Weight.
       $form['items'][$id]['weight'] = [
diff --git a/html/modules/custom/reliefweb_homepage/src/Controller/Homepage.php b/html/modules/custom/reliefweb_homepage/src/Controller/Homepage.php
index 9e6320dc3..e475a0c66 100644
--- a/html/modules/custom/reliefweb_homepage/src/Controller/Homepage.php
+++ b/html/modules/custom/reliefweb_homepage/src/Controller/Homepage.php
@@ -171,7 +171,11 @@ public function getPageContent() {
               '#theme' => 'reliefweb_homepage_opportunities',
               '#id' => 'opportunities',
               '#cache' => [
-                'tags' => ['taxonomy_term_list'],
+                'tags' => [
+                  'node_list:job',
+                  'node_list:training',
+                  'taxonomy_term_list',
+                ],
               ],
             ];
           }
@@ -181,7 +185,6 @@ public function getPageContent() {
             'title' => $query['title'],
             'url' => $query['url'],
           ];
-          $sections['opportunities']['#cache']['tags'][] = 'node_list:' . $query['bundle'];
           break;
       }
     }
@@ -190,11 +193,19 @@ public function getPageContent() {
       '#theme' => 'reliefweb_homepage',
       '#title' => $this->t('ReliefWeb'),
       '#sections' => $sections,
-      // Necessary because the headlines widget is added depending on the user
-      // pemissions.
       '#cache' => [
+        'keys' => [
+          'reliefweb',
+          'homepage',
+        ],
+        // Necessary because the headlines widget is added depending on the user
+        // pemissions.
         'contexts' => ['user.permissions'],
       ],
+      '#cache_properties' => [
+        '#title',
+        '#sections',
+      ],
     ];
 
     // Add the headlines widget.
diff --git a/html/modules/custom/reliefweb_revisions/reliefweb_revisions.services.yml b/html/modules/custom/reliefweb_revisions/reliefweb_revisions.services.yml
index bcce70c84..502849ec2 100644
--- a/html/modules/custom/reliefweb_revisions/reliefweb_revisions.services.yml
+++ b/html/modules/custom/reliefweb_revisions/reliefweb_revisions.services.yml
@@ -1,7 +1,7 @@
 services:
   reliefweb_revisions.entity.history:
     class: Drupal\reliefweb_revisions\Services\EntityHistory
-    arguments: ['@config.factory', '@current_user', '@database', '@entity_field.manager', '@entity_type.manager', '@string_translation']
+    arguments: ['@cache.default', '@config.factory', '@current_user', '@database', '@entity_field.manager', '@entity_type.manager', '@string_translation']
   reliefweb_revisions.entity.param_converter:
     class: Drupal\reliefweb_revisions\ParamConverter\EntityRevisionedConverter
     arguments: ['@entity_type.manager', '@entity.repository']
diff --git a/html/modules/custom/reliefweb_revisions/src/Services/EntityHistory.php b/html/modules/custom/reliefweb_revisions/src/Services/EntityHistory.php
index 92ff15fb3..e935e286a 100644
--- a/html/modules/custom/reliefweb_revisions/src/Services/EntityHistory.php
+++ b/html/modules/custom/reliefweb_revisions/src/Services/EntityHistory.php
@@ -4,6 +4,7 @@
 
 use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Component\Utility\Html;
+use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Database\Connection;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
@@ -36,6 +37,14 @@ class EntityHistory {
   use EntityDatabaseInfoTrait;
   use StringTranslationTrait;
 
+
+  /**
+   * The default cache backend.
+   *
+   * @var \Drupal\Core\Cache\CacheBackendInterface
+   */
+  protected $cache;
+
   /**
    * ReliefWeb API config.
    *
@@ -74,6 +83,8 @@ class EntityHistory {
   /**
    * Constructor.
    *
+   * @param \Drupal\Core\Cache\CacheBackendInterface $cache_backend
+   *   The default cache backend.
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The config factory service.
    * @param \Drupal\Core\Session\AccountProxyInterface $current_user
@@ -88,6 +99,7 @@ class EntityHistory {
    *   The translation manager service.
    */
   public function __construct(
+    CacheBackendInterface $cache_backend,
     ConfigFactoryInterface $config_factory,
     AccountProxyInterface $current_user,
     Connection $database,
@@ -95,6 +107,7 @@ public function __construct(
     EntityTypeManagerInterface $entity_type_manager,
     TranslationInterface $string_translation
   ) {
+    $this->cache = $cache_backend;
     $this->config = $config_factory->get('reliefweb_revisions.settings');
     $this->currentUser = $current_user;
     $this->database = $database;
@@ -153,80 +166,107 @@ public function getEntityHistoryContent(EntityRevisionedInterface $entity) {
       return [];
     }
 
-    $entity_type_id = $entity->getEntityTypeId();
-    $revision_user_field = $this->getEntityTypeRevisionUserField($entity_type_id);
-    $revision_created_field = $this->getEntityTypeRevisionCreatedField($entity_type_id);
-
-    // Get the list of revisions for the entity.
-    $revision_ids = $this->getRevisionIds($entity);
-    $total_revision_ids = count($revision_ids);
-
-    // Retrieve the author of the entity.
-    $author = $this->getEntityAuthor($entity);
-
-    // Keep track of the previous revision.
-    $previous_revision = NULL;
-
-    // Extract the first revision.
-    $first_revision = array_pop($revision_ids);
-
-    // Limit the number of revisions to the most recent and add back the first
-    // revision.
-    $revision_ids = array_slice($revision_ids, 0, $this->config->get('limit') ?? 10);
-    $revision_ids[] = $first_revision;
-
-    // Oldest first so we can compute the proper differences.
-    $revision_ids = array_reverse($revision_ids);
-
-    // Compute the history.
-    $history = [];
-    foreach ($revision_ids as $revision_id) {
-      $revision = $this->loadRevision($entity_type_id, $revision_id);
-
-      // Get the changes between the revisions.
-      // @todo skip some fields.
-      $diff = $this->getRevisionDiff($revision, $previous_revision);
-
-      // Format the differences.
-      $content = $this->formatRevisionDiff($revision, $diff);
-
-      // Skip if nothing of value changed.
-      $skip = empty($content) &&
-        !empty($previous_revision) &&
-        $revision->getRevisionLogMessage() === $previous_revision->getRevisionLogMessage() &&
-        $revision->getModerationStatus() === $previous_revision->getModerationStatus();
-
-      if (!$skip) {
-        $user = $revision->get($revision_user_field)->entity;
-        $date = $revision->get($revision_created_field)->value;
-        $message = trim($revision->getRevisionLogMessage());
-
-        $history[] = [
-          'date' => DateHelper::getDateTimeStamp($date),
-          'user' => $user,
-          'status' => [
-            'value' => $revision->getModerationStatus(),
-            'label' => $revision->getModerationStatusLabel(),
-          ],
-          'message' => [
-            'type' => isset($user, $author) && $user->id() === $author->id() ? 'instruction' : 'feedback',
-            'content' => !empty($message) ? check_markup($message, 'markdown') : '',
-          ],
-          'content' => $content,
-        ];
-      }
+    $cache_id = 'reliefweb_revisions:history:entity:' . $entity->getEntityTypeId() . ':' . $entity->id();
+    $cache_tags = $entity->getCacheTags();
+    $cache_tags[] = 'taxonomy_term_list';
+
+    // Try to load the history from the cache.
+    $cache = $this->cache->get($cache_id);
+    if (!empty($cache->data)) {
+      $data = $cache->data;
+    }
+    else {
+      $entity_type_id = $entity->getEntityTypeId();
+      $revision_user_field = $this->getEntityTypeRevisionUserField($entity_type_id);
+      $revision_created_field = $this->getEntityTypeRevisionCreatedField($entity_type_id);
+
+      // Get the list of revisions for the entity.
+      $revision_ids = $this->getRevisionIds($entity);
+      $total_revision_ids = count($revision_ids);
+
+      // Retrieve the author of the entity.
+      $author = $this->getEntityAuthor($entity);
 
       // Keep track of the previous revision.
-      $previous_revision = $revision;
+      $previous_revision = NULL;
+
+      // Extract the first revision.
+      $first_revision = array_pop($revision_ids);
+
+      // Limit the number of revisions to the most recent and add back the first
+      // revision.
+      $revision_ids = array_slice($revision_ids, 0, $this->config->get('limit') ?? 10);
+      $revision_ids[] = $first_revision;
+
+      // Oldest first so we can compute the proper differences.
+      $revision_ids = array_reverse($revision_ids);
+
+      // Compute the history.
+      $history = [];
+      foreach ($revision_ids as $revision_id) {
+        $revision = $this->loadRevision($entity_type_id, $revision_id);
+
+        // Get the changes between the revisions.
+        // @todo skip some fields.
+        $diff = $this->getRevisionDiff($revision, $previous_revision);
+
+        // Format the differences.
+        $content = $this->formatRevisionDiff($revision, $diff);
+
+        // Skip if nothing of value changed.
+        $skip = empty($content) &&
+          !empty($previous_revision) &&
+          $revision->getRevisionLogMessage() === $previous_revision->getRevisionLogMessage() &&
+          $revision->getModerationStatus() === $previous_revision->getModerationStatus();
+
+        if (!$skip) {
+          $user = $revision->get($revision_user_field)->entity;
+          $date = $revision->get($revision_created_field)->value;
+          $message = trim($revision->getRevisionLogMessage());
+
+          $history[] = [
+            'date' => DateHelper::getDateTimeStamp($date),
+            'user' => $user,
+            'status' => [
+              'value' => $revision->getModerationStatus(),
+              'label' => $revision->getModerationStatusLabel(),
+            ],
+            'message' => [
+              'type' => isset($user, $author) && $user->id() === $author->id() ? 'instruction' : 'feedback',
+              'content' => !empty($message) ? check_markup($message, 'markdown') : '',
+            ],
+            'content' => $content,
+          ];
+        }
+
+        // Keep track of the previous revision.
+        $previous_revision = $revision;
+      }
+
+      // Show the most recent history first.
+      $data = [
+        'history' => array_reverse($history),
+        'ignored' => $total_revision_ids - count($revision_ids),
+      ];
+
+      $this->cache->set($cache_id, $content, $this->cache::CACHE_PERMANENT, $cache_tags);
     }
 
     return [
       '#theme' => 'reliefweb_revisions_history_content',
       // Show the most recent history first.
-      '#history' => array_reverse($history),
+      '#history' => $data['history'] ?? [],
       // Number of ignored revisions.
-      '#ignored' => $total_revision_ids - count($revision_ids),
+      '#ignored' => $data['ignored'] ?? 0,
       '#cache' => [
+        'keys' => [
+          'reliefweb',
+          'revisions',
+          'history',
+          'content',
+          $entity->getEntityTypeId(),
+          $entity->id(),
+        ],
         'contexts' => ['user.permissions'],
         'tags' => $entity->getCacheTags(),
       ],
diff --git a/html/modules/custom/reliefweb_rivers/src/Controller/SearchResults.php b/html/modules/custom/reliefweb_rivers/src/Controller/SearchResults.php
index e63c3e981..5ee44fffc 100644
--- a/html/modules/custom/reliefweb_rivers/src/Controller/SearchResults.php
+++ b/html/modules/custom/reliefweb_rivers/src/Controller/SearchResults.php
@@ -3,6 +3,7 @@
 namespace Drupal\reliefweb_rivers\Controller;
 
 use Drupal\Core\Controller\ControllerBase;
+use Drupal\Core\Render\Markup;
 use Drupal\reliefweb_api\Services\ReliefWebApiClient;
 use Drupal\reliefweb_rivers\Parameters;
 use Drupal\reliefweb_rivers\RiverServiceBase;
@@ -107,13 +108,19 @@ public function getPageContent() {
           '#results' => [
             // @todo create helper that properly format plural AND format the
             // number.
-            '#markup' => '<p>' . $this->formatPlural($total, '1 entry found', '@total entries found', [
+            '#markup' => Markup::create('<p>' . $this->formatPlural($total, '1 entry found', '@total entries found', [
               '@total' => number_format($total),
-            ]) . '</p>',
+            ]) . '</p>'),
           ],
           '#resource' => $query['resource'],
           '#entities' => $entities,
           '#more' => $query['more'] ?? NULL,
+          '#cache' => [
+            'tags' => [
+              $query['entity_type'] . '_list:' . $query['bundle'],
+              'taxonomy_term_list',
+            ],
+          ],
         ];
 
         $totals[$index] = [
@@ -130,16 +137,19 @@ public function getPageContent() {
       '#totals' => $totals,
       '#sections' => $sections,
       '#cache' => [
-        'contexts' => [
-          'url.query_args',
-        ],
-        'tags' => [
-          'node_list:job',
-          'node_list:report',
-          'node_list:training',
-          'taxonomy_term_list',
+        'keys' => [
+          'reliefweb',
+          'rivers',
+          'search',
+          'results',
         ],
       ],
+      '#cache_properties' => [
+        '#title',
+        '#search',
+        '#totals',
+        '#sections',
+      ],
     ];
   }
 
@@ -186,6 +196,7 @@ public function getRiverApiQuery($bundle, $limit = 3) {
     return [
       'resource' => $resource,
       'bundle' => $bundle,
+      'entity_type' => $service->getEntityTypeId(),
       'payload' => $payload,
       'title' => $title,
       'more' => $more,
@@ -202,7 +213,9 @@ public function getSearch() {
       '#label' => $this->t('Search ReliefWeb'),
       '#query' => $this->getSearchQuery(),
       '#cache' => [
-        'max-age' => 0,
+        'contexts' => [
+          'url.query_args:search',
+        ],
       ],
     ];
   }
diff --git a/html/modules/custom/reliefweb_rivers/src/RiverServiceBase.php b/html/modules/custom/reliefweb_rivers/src/RiverServiceBase.php
index 7106a04be..1ef113dea 100644
--- a/html/modules/custom/reliefweb_rivers/src/RiverServiceBase.php
+++ b/html/modules/custom/reliefweb_rivers/src/RiverServiceBase.php
@@ -260,14 +260,23 @@ public function getPageContent() {
       '#content' => $this->getRiverContent(),
       '#links' => $this->getRiverLinks(),
       '#cache' => [
-        'contexts' => [
-          'url.query_args',
-        ],
-        'tags' => [
-          $this->getEntityTypeId() . '_list:' . $this->getBundle(),
-          'taxonomy_term_list',
+        'keys' => [
+          'reliefweb',
+          'rivers',
+          'page',
+          $river,
         ],
       ],
+      '#cache_properties' => [
+        '#river',
+        '#title',
+        '#view',
+        '#views',
+        '#search',
+        '#advanced_search',
+        '#content',
+        '#links',
+      ],
     ];
   }
 
@@ -361,7 +370,9 @@ public function getRiverViews() {
       '#theme' => 'reliefweb_rivers_views',
       '#views' => $views,
       '#cache' => [
-        'max-age' => 0,
+        '#contexts' => [
+          'url.query_args:view',
+        ],
       ],
     ];
   }
@@ -394,7 +405,9 @@ public function getRiverSearch() {
       ]),
       '#query' => $search,
       '#cache' => [
-        'max-age' => 0,
+        '#contexts' => [
+          'url.query_args:search',
+        ],
       ],
     ];
   }
@@ -419,7 +432,14 @@ public function getRiverAdvancedSearch() {
       '#remove' => $advanced_search->getClearUrl(),
       '#settings' => $advanced_search->getSettings(),
       '#cache' => [
-        'max-age' => 0,
+        '#contexts' => [
+          'url.query_args:advanced-search',
+        ],
+        // The advanced search filters use terms so we need to make sure the
+        // cache is properly invalidated when they change.
+        '#tags' => [
+          'taxonomy_term_list',
+        ],
       ],
     ];
   }
@@ -440,7 +460,10 @@ public function getRiverContent() {
       '#pager' => $this->getRiverPager(),
       '#empty' => $this->t('No results found. Please modify your search or filter selection.'),
       '#cache' => [
-        'max-age' => 0,
+        'tags' => [
+          $this->getEntityTypeId() . '_list:' . $this->getBundle(),
+          'taxonomy_term_list',
+        ],
       ],
     ];
   }
@@ -470,9 +493,6 @@ public function getRiverResults($count) {
       '#total' => $total,
       '#start' => $start,
       '#end' => $end,
-      '#cache' => [
-        'max-age' => 0,
-      ],
     ];
   }
 
@@ -480,11 +500,10 @@ public function getRiverResults($count) {
    * {@inheritdoc}
    */
   public function getRiverPager() {
+    // The renderer will automatically populate the render array for the pager
+    // and notably add the cache elements including 'url.query_args.pagers:0'.
     return [
       '#type' => 'pager',
-      '#cache' => [
-        'max-age' => 0,
-      ],
     ];
   }
 
@@ -499,7 +518,12 @@ public function getRiverLinks() {
         'api' => $this->getApiLink(),
       ]),
       '#cache' => [
-        'max-age' => 0,
+        '#contexts' => [
+          'url.query_args:advanced-search',
+          'url.query_args:search',
+          'url.query_args:view',
+          'url.query_args.pagers:0',
+        ],
       ],
     ];
   }
@@ -630,14 +654,31 @@ public function getRssContent() {
       '#date' => $date,
       '#items' => $items,
       '#cache' => [
+        'keys' => [
+          'reliefweb',
+          'rivers',
+          'rss',
+          $river,
+        ],
         'contexts' => [
-          'url.query_args',
+          'url.query_args:advanced-search',
+          'url.query_args:search',
+          'url.query_args:view',
+          'url.query_args.pagers:0',
         ],
         'tags' => [
           $this->getEntityTypeId() . '_list:' . $this->getBundle(),
           'taxonomy_term_list',
         ],
       ],
+      '#cache_properties' => [
+        '#site_url',
+        '#title',
+        '#feed_url',
+        '#language',
+        '#date',
+        '#items',
+      ],
     ];
 
     $headers = [
diff --git a/html/modules/custom/reliefweb_rivers/src/Services/CountryRiver.php b/html/modules/custom/reliefweb_rivers/src/Services/CountryRiver.php
index 241e7099b..f72933fc7 100644
--- a/html/modules/custom/reliefweb_rivers/src/Services/CountryRiver.php
+++ b/html/modules/custom/reliefweb_rivers/src/Services/CountryRiver.php
@@ -70,6 +70,8 @@ public function getPageContent() {
       '#letters' => $letters,
     ];
 
+    $content['#cache_properties'][] = '#letter_navigation';
+
     return $content;
   }
 
diff --git a/html/modules/custom/reliefweb_rivers/src/Services/DisasterRiver.php b/html/modules/custom/reliefweb_rivers/src/Services/DisasterRiver.php
index 8475b0ed2..102a1ce3c 100644
--- a/html/modules/custom/reliefweb_rivers/src/Services/DisasterRiver.php
+++ b/html/modules/custom/reliefweb_rivers/src/Services/DisasterRiver.php
@@ -56,6 +56,8 @@ public function getPageContent() {
       $content['#pre_content'] = DisasterMapService::getAlertAndOngoingDisasterMap();
     }
 
+    $content['#cache_properties'][] = '#pre_content';
+
     return $content;
   }
 
diff --git a/html/modules/custom/reliefweb_rivers/src/Services/SourceRiver.php b/html/modules/custom/reliefweb_rivers/src/Services/SourceRiver.php
index 317278a6d..4a844e3e7 100644
--- a/html/modules/custom/reliefweb_rivers/src/Services/SourceRiver.php
+++ b/html/modules/custom/reliefweb_rivers/src/Services/SourceRiver.php
@@ -67,8 +67,15 @@ public function getPageContent() {
       '#theme' => 'reliefweb_rivers_letter_navigation',
       '#title' => $this->t('Filter by first letter'),
       '#letters' => $letters,
+      '#cache' => [
+        '#contexts' => [
+          'url.query_args:group',
+        ],
+      ],
     ];
 
+    $content['#cache_properties'][] = '#letter_navigation';
+
     return $content;
   }
 
@@ -340,9 +347,15 @@ public static function getFirstLetters() {
       'vocabulary' => 'source',
     ]);
 
+    $transliterator = \Transliterator::create('Any-Latin; Latin-ASCII;');
+
     $letters = [];
     foreach ($terms as $term) {
       $letter = mb_strtoupper(mb_substr($term['name'], 0, 1));
+      $letter = $transliterator->transliterate($letter);
+      if (is_numeric($letter)) {
+        $letter = '#';
+      }
 
       if (!isset($letters[$letter])) {
         $letters[$letter] = [
diff --git a/html/modules/custom/reliefweb_rivers/src/Services/TopicRiver.php b/html/modules/custom/reliefweb_rivers/src/Services/TopicRiver.php
index a4ffb2fc3..cbdb9e662 100644
--- a/html/modules/custom/reliefweb_rivers/src/Services/TopicRiver.php
+++ b/html/modules/custom/reliefweb_rivers/src/Services/TopicRiver.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\reliefweb_rivers\Services;
 
+use Drupal\Component\Utility\Html;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Language\LanguageManagerInterface;
@@ -58,11 +59,26 @@ public function getPageTitle() {
    * {@inheritdoc}
    */
   public function getPageContent() {
+    $river = Html::getId($this->getRiver());
+
     return [
-      '#theme' => 'reliefweb_rivers_page__topics',
-      '#river' => $this->river,
+      '#theme' => 'reliefweb_rivers_page__' . $river,
+      '#river' => $river,
       '#title' => $this->getPageTitle(),
       '#content' => $this->getRiverContent(),
+      '#cache' => [
+        'keys' => [
+          'reliefweb',
+          'rivers',
+          'page',
+          $river,
+        ],
+      ],
+      '#cache_properties' => [
+        '#river',
+        '#title',
+        '#content',
+      ],
     ];
   }
 
diff --git a/html/themes/custom/common_design_subtheme/templates/content/node--blog_post--full.html.twig b/html/themes/custom/common_design_subtheme/templates/content/node--blog_post--full.html.twig
index d6757c9c3..a2b48f4cd 100644
--- a/html/themes/custom/common_design_subtheme/templates/content/node--blog_post--full.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/content/node--blog_post--full.html.twig
@@ -115,7 +115,12 @@
           'count': null,
           'sort': 'name',
         },
-      }
+      },
+      '#cache': {
+        'tags': [
+          'taxonomy_term_list:tag',
+        ],
+      },
     }) }}
   </header>
 
diff --git a/html/themes/custom/common_design_subtheme/templates/content/node--job--full.html.twig b/html/themes/custom/common_design_subtheme/templates/content/node--job--full.html.twig
index 995a4159a..2146071e7 100644
--- a/html/themes/custom/common_design_subtheme/templates/content/node--job--full.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/content/node--job--full.html.twig
@@ -96,6 +96,11 @@
       '#theme': 'reliefweb_entities_entity_country_slug',
       '#countries': meta.country,
       '#attributes': create_attribute().addClass('rw-entity-country-slug--above'),
+      '#cache': {
+        'tags': [
+          'taxonomy_term_list:country',
+        ],
+      },
     }) }}
 
     {{ title|merge({'#title_attributes': title_attributes.addClass('rw-article__title')}) }}
@@ -120,7 +125,12 @@
           'label': 'Closing date'|t,
           'value': meta.closing,
         },
-      }
+      },
+      '#cache': {
+        'tags': [
+          'taxonomy_term_list:source',
+        ],
+      },
     }) }}
   </header>
 
@@ -185,7 +195,17 @@
           'count': null,
           'sort': 'name',
         },
-      }
+      },
+      '#cache': {
+        'tags': [
+          'taxonomy_term_list:career_category',
+          'taxonomy_term_list:country',
+          'taxonomy_term_list:job_experience',
+          'taxonomy_term_list:job_type',
+          'taxonomy_term_list:source',
+          'taxonomy_term_list:theme',
+        ],
+      },
     }) }}
 
     {{ node.getShareLinks() }}
diff --git a/html/themes/custom/common_design_subtheme/templates/content/node--report--full.html.twig b/html/themes/custom/common_design_subtheme/templates/content/node--report--full.html.twig
index 0f14e6fbe..fecc483a4 100644
--- a/html/themes/custom/common_design_subtheme/templates/content/node--report--full.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/content/node--report--full.html.twig
@@ -97,6 +97,11 @@
       '#theme': 'reliefweb_entities_entity_country_slug',
       '#countries': meta.country,
       '#attributes': create_attribute().addClass('rw-entity-country-slug--above'),
+      '#cache': {
+        'tags': [
+          'taxonomy_term_list:country',
+        ],
+      },
     }) }}
 
     {{ title|merge({'#title_attributes': title_attributes.addClass('rw-article__title')}) }}
@@ -140,7 +145,12 @@
             'external': true,
           },
         },
-      }
+      },
+      '#cache': {
+        'tags': [
+          'taxonomy_term_list:source'
+        ],
+      },
     }) }}
   </header>
 
@@ -236,7 +246,18 @@
           'count': null,
           'sort': 'name',
         },
-      }
+      },
+      '#cache': {
+        'tags': [
+          'taxonomy_term_list:content_format',
+          'taxonomy_term_list:country',
+          'taxonomy_term_list:disaster',
+          'taxonomy_term_list:disaster_type',
+          'taxonomy_term_list:language',
+          'taxonomy_term_list:source',
+          'taxonomy_term_list:theme',
+        ],
+      },
     }) }}
 
     {{ node.getShareLinks() }}
diff --git a/html/themes/custom/common_design_subtheme/templates/content/node--training--full.html.twig b/html/themes/custom/common_design_subtheme/templates/content/node--training--full.html.twig
index 0b6c87f9a..f4eac30c8 100644
--- a/html/themes/custom/common_design_subtheme/templates/content/node--training--full.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/content/node--training--full.html.twig
@@ -96,6 +96,11 @@
       '#theme': 'reliefweb_entities_entity_country_slug',
       '#countries': meta.country,
       '#attributes': create_attribute().addClass('rw-entity-country-slug--above'),
+      '#cache': {
+        'tags': [
+          'taxonomy_term_list:country',
+        ],
+      },
     }) }}
 
     {{ title|merge({'#title_attributes': title_attributes.addClass('rw-article__title')}) }}
@@ -143,6 +148,11 @@
           },
         },
       },
+      '#cache': {
+        'tags': [
+          'taxonomy_term_list:source',
+        ],
+      },
     }) }}
   </header>
 
@@ -230,6 +240,17 @@
           'sort': 'name',
         },
       },
+      '#cache': {
+        'tags': [
+          'taxonomy_term_list:career_category',
+          'taxonomy_term_list:country',
+          'taxonomy_term_list:language',
+          'taxonomy_term_list:source',
+          'taxonomy_term_list:theme',
+          'taxonomy_term_list:training_format',
+          'taxonomy_term_list:training_type',
+        ],
+      },
     }) }}
 
     {{ node.getShareLinks() }}

From bcc75db8c714eca546d0eee20f6199ccd5bc1748 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sun, 1 May 2022 10:45:23 +0000
Subject: [PATCH 674/720] [RW-495] Fix issue when automatically updating source
 status after job/training publication

---
 .../reliefweb_entities/src/OpportunityDocumentTrait.php       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/reliefweb_entities/src/OpportunityDocumentTrait.php b/html/modules/custom/reliefweb_entities/src/OpportunityDocumentTrait.php
index 06e333e3a..ae5384c83 100644
--- a/html/modules/custom/reliefweb_entities/src/OpportunityDocumentTrait.php
+++ b/html/modules/custom/reliefweb_entities/src/OpportunityDocumentTrait.php
@@ -189,10 +189,10 @@ protected function updateSourceModerationStatus() {
       }
 
       if (in_array($source->getModerationStatus(), ['inactive', 'archive'])) {
-        $entity->notifications_content_disable = TRUE;
+        $source->notifications_content_disable = TRUE;
         $source->setModerationStatus('active');
         $source->setNewRevision(TRUE);
-        $source->setRevisionLogMessage('Automatic status update');
+        $source->setRevisionLogMessage('Automatic status update due to publication of node ' . $this->id());
         $source->setRevisionUserId(2);
         $source->save();
       }

From 36f8ec7ed3ce5792dab62198e4112f1389aec2e9 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sun, 1 May 2022 10:48:06 +0000
Subject: [PATCH 675/720] [RW-498] Allow access to term page when allowed to
 edit it

---
 .../reliefweb_entities.services.yml           |  1 +
 .../src/Access/EntityAccessCheck.php          | 25 +++++++--
 .../content/taxonomy-term--full.html.twig     | 53 +++++++++++++++++++
 3 files changed, 75 insertions(+), 4 deletions(-)
 create mode 100644 html/themes/custom/common_design_subtheme/templates/content/taxonomy-term--full.html.twig

diff --git a/html/modules/custom/reliefweb_entities/reliefweb_entities.services.yml b/html/modules/custom/reliefweb_entities/reliefweb_entities.services.yml
index 8a5cd6625..a5cf6ca6b 100644
--- a/html/modules/custom/reliefweb_entities/reliefweb_entities.services.yml
+++ b/html/modules/custom/reliefweb_entities/reliefweb_entities.services.yml
@@ -5,6 +5,7 @@ services:
       - { name: event_subscriber }
   reliefweb_entities.entity_access_check:
     class: 'Drupal\reliefweb_entities\Access\EntityAccessCheck'
+    arguments: ['@current_user']
     tags:
       - { name: access_check, applies_to: _reliefweb_entities_entity_access_check }
   # Form alteration services.
diff --git a/html/modules/custom/reliefweb_entities/src/Access/EntityAccessCheck.php b/html/modules/custom/reliefweb_entities/src/Access/EntityAccessCheck.php
index 1d133d447..6367a6363 100644
--- a/html/modules/custom/reliefweb_entities/src/Access/EntityAccessCheck.php
+++ b/html/modules/custom/reliefweb_entities/src/Access/EntityAccessCheck.php
@@ -6,6 +6,8 @@
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Routing\Access\AccessInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\Session\AccountProxyInterface;
+use Drupal\reliefweb_moderation\EntityModeratedInterface;
 use Drupal\taxonomy\TermInterface;
 
 /**
@@ -13,6 +15,23 @@
  */
 class EntityAccessCheck implements AccessInterface {
 
+  /**
+   * The current user.
+   *
+   * @var \Drupal\Core\Session\AccountProxyInterface
+   */
+  protected $currentUser;
+
+  /**
+   * Constructor.
+   *
+   * @param \Drupal\Core\Session\AccountProxyInterface $current_user
+   *   The current user.
+   */
+  public function __construct(AccountProxyInterface $current_user) {
+    $this->currentUser = $current_user;
+  }
+
   /**
    * Check access to the entity page.
    *
@@ -27,14 +46,12 @@ public function access(RouteMatchInterface $route_match) {
       $entity = $this->getEntityFromRouteMatch($route_match, 'taxonomy_term');
 
       if (!empty($entity) && $entity instanceof TermInterface) {
-        // @todo check the bundle class.
-        $accessible = ['country', 'disaster', 'source'];
-        if (!in_array($entity->bundle(), $accessible)) {
+        if (!($entity instanceof EntityModeratedInterface) && !$this->currentUser->hasPermission('edit terms in ' . $entity->bundle())) {
           return AccessResult::forbidden();
         }
       }
     }
-    // Allow access.
+    // Let other modules decide.
     return AccessResult::allowed();
   }
 
diff --git a/html/themes/custom/common_design_subtheme/templates/content/taxonomy-term--full.html.twig b/html/themes/custom/common_design_subtheme/templates/content/taxonomy-term--full.html.twig
new file mode 100644
index 000000000..b8808e1b9
--- /dev/null
+++ b/html/themes/custom/common_design_subtheme/templates/content/taxonomy-term--full.html.twig
@@ -0,0 +1,53 @@
+{#
+/**
+ * @file
+ * Theme override to display a taxonomy term.
+ *
+ * Available variables:
+ * - url: URL of the current term.
+ * - name: (optional) Name of the current term.
+ * - content: Items for the content of the term (fields and description).
+ *   Use 'content' to print them all, or print a subset such as
+ *   'content.description'. Use the following code to exclude the
+ *   printing of a given child element:
+ *   @code
+ *   {{ content|without('description') }}
+ *   @endcode
+ * - attributes: HTML attributes for the wrapper.
+ * - page: Flag for the full page state.
+ * - term: The taxonomy term entity, including:
+ *   - id: The ID of the taxonomy term.
+ *   - bundle: Machine name of the current vocabulary.
+ * - view_mode: View mode, e.g. 'full', 'teaser', etc.
+ *
+ * Additional variables:
+ * - local_tasks: view, edit etc. menu items.
+ * - title: page title block.
+ *
+ * @see template_preprocess_taxonomy_term()
+ * @see common_design_subtheme_preprocess_taxonomy_term()
+ */
+#}
+{{ attach_library('common_design_subtheme/rw-article') }}
+
+{{ local_tasks }}
+<article{{ attributes
+  .addClass([
+    'taxonomy-term',
+    'taxonomy-term--' ~ term.bundle(),
+    'taxonomy-term--full',
+    'taxonomy-term--' ~ term.bundle() ~ '--full',
+    'rw-page--sectioned',
+    'rw-article',
+    'rw-article--' ~ term.bundle(),
+  ])
+  .setAttribute('data-id', term.id())
+}}>
+  <header class="rw-article__header">
+    {{ title }}
+  </header>
+
+  <div class="rw-article__content rw-article__content--simple">
+    {{ content }}
+  </div>
+</article>

From de4f29154955c8e4efd2dccbb19203193015ba5c Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sun, 1 May 2022 10:50:28 +0000
Subject: [PATCH 676/720] [RW-500] Fix rare issue with image proxy in reliefweb
 migrate

---
 .../src/EventSubscriber/ProxySubscriber.php           | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/html/modules/custom/reliefweb_migrate/src/EventSubscriber/ProxySubscriber.php b/html/modules/custom/reliefweb_migrate/src/EventSubscriber/ProxySubscriber.php
index 72ad0ba4b..5d97a6d2a 100644
--- a/html/modules/custom/reliefweb_migrate/src/EventSubscriber/ProxySubscriber.php
+++ b/html/modules/custom/reliefweb_migrate/src/EventSubscriber/ProxySubscriber.php
@@ -157,8 +157,15 @@ public function checkFileOrigin(GetResponseEvent $event) {
       ]);
     }
 
-    // Save the original file.
-    if (file_put_contents($uri, fopen($url, 'r')) === FALSE) {
+    $destination = @fopen($url, 'r');
+    if (!is_resource($destination)) {
+      $this->logger->warning('Unable to open @url', [
+        '@uri' => $uri,
+        '@url' => $url,
+      ]);
+    }
+    // Try to save the original file.
+    elseif (file_put_contents($uri, $destination) === FALSE) {
       $this->logger->warning('Unable to save the file @uri from @url', [
         '@uri' => $uri,
         '@url' => $url,

From 40e175cc00838c0b334f34045cdf92c4decbfd6b Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sun, 1 May 2022 10:53:40 +0000
Subject: [PATCH 677/720] [RW-499] Restrict access to announcement pages to
 people that can edit them

---
 .../src/Services/AnnouncementModeration.php              | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/html/modules/custom/reliefweb_moderation/src/Services/AnnouncementModeration.php b/html/modules/custom/reliefweb_moderation/src/Services/AnnouncementModeration.php
index 2d02979a8..e8029e4c6 100644
--- a/html/modules/custom/reliefweb_moderation/src/Services/AnnouncementModeration.php
+++ b/html/modules/custom/reliefweb_moderation/src/Services/AnnouncementModeration.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\reliefweb_moderation\Services;
 
+use Drupal\Core\Session\AccountInterface;
 use Drupal\reliefweb_moderation\EntityModeratedInterface;
 use Drupal\reliefweb_moderation\ModerationServiceBase;
 
@@ -126,6 +127,14 @@ public function getEntityFormSubmitButtons($status, EntityModeratedInterface $en
     ];
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function isViewableStatus($status, ?AccountInterface $account = NULL) {
+    $account = $account ?: $this->currentUser;
+    return !empty($account) && $account->hasPermission('edit any announcement content');
+  }
+
   /**
    * {@inheritdoc}
    */

From 5e8dc3c97932b67d3b5664bdafe97988e012ac75 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sun, 1 May 2022 10:55:22 +0000
Subject: [PATCH 678/720] [RW-501] Do not add view parameter when view is
 default

---
 .../custom/reliefweb_rivers/js/search.js        | 17 +++++++++++++++--
 .../templates/reliefweb-rivers-views.html.twig  |  2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/html/modules/custom/reliefweb_rivers/js/search.js b/html/modules/custom/reliefweb_rivers/js/search.js
index 62e5654bf..5e1158fa9 100644
--- a/html/modules/custom/reliefweb_rivers/js/search.js
+++ b/html/modules/custom/reliefweb_rivers/js/search.js
@@ -59,6 +59,14 @@
     parameter.value = value;
   }
 
+  // Remove a form parameter.
+  function deleteFormParameter(form, name) {
+    var parameter = form.querySelector('input[name="' + name + '"]');
+    if (parameter) {
+      parameter.parentNode.removeChild(parameter);
+    }
+  }
+
   // Update and submit the form.
   function submitForm(form) {
     // Disable empty parameters so that they are not submitted and the url
@@ -91,9 +99,14 @@
   if (viewsList) {
     addEventListener(viewsList, 'click', function (event) {
       var target = event.target;
-      if (target && target.nodeName === 'A') {
+      if (target && target.nodeName === 'A' && target.hasAttribute('data-view')) {
         preventDefault(event);
-        setFormParameter(form, 'view', target.getAttribute('data-view'));
+        if (target.hasAttribute('data-default')) {
+          deleteFormParameter(form, 'view');
+        }
+        else {
+          setFormParameter(form, 'view', target.getAttribute('data-view'));
+        }
         submitForm(form);
       }
     });
diff --git a/html/modules/custom/reliefweb_rivers/templates/reliefweb-rivers-views.html.twig b/html/modules/custom/reliefweb_rivers/templates/reliefweb-rivers-views.html.twig
index b8c22690f..2d036b756 100644
--- a/html/modules/custom/reliefweb_rivers/templates/reliefweb-rivers-views.html.twig
+++ b/html/modules/custom/reliefweb_rivers/templates/reliefweb-rivers-views.html.twig
@@ -40,7 +40,7 @@
         'rw-river-views__list__item',
         view.selected ? 'rw-river-views__list__item--selected',
       ])
-    }}><a href="{{ view.url }}" class="rw-river-views__link" data-view="{{ id }}">{{ view.title }}</a></li>
+    }}><a href="{{ view.url }}" class="rw-river-views__link" data-view="{{ id }}"{{ view.default ? ' data-default'}}>{{ view.title }}</a></li>
     {% endfor %}
   </ul>
 </nav>

From 32774ef892d0e6a4089a4c65eaa9aad2797c8031 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sun, 1 May 2022 10:57:05 +0000
Subject: [PATCH 679/720] [RW-502] Fix some constructors to use interfaces for
 compatibility with webprofiler etc.

---
 .../src/ReliefwebSubscriptionsMailer.php      | 24 +++++++++----------
 .../src/Form/CommunityTopicsForm.php          |  6 ++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/html/modules/custom/reliefweb_subscriptions/src/ReliefwebSubscriptionsMailer.php b/html/modules/custom/reliefweb_subscriptions/src/ReliefwebSubscriptionsMailer.php
index 25420990f..a0da54d68 100644
--- a/html/modules/custom/reliefweb_subscriptions/src/ReliefwebSubscriptionsMailer.php
+++ b/html/modules/custom/reliefweb_subscriptions/src/ReliefwebSubscriptionsMailer.php
@@ -18,13 +18,13 @@
 use Drupal\Core\Language\LanguageDefault;
 use Drupal\Core\Link;
 use Drupal\Core\Logger\LoggerChannelFactoryInterface;
-use Drupal\Core\Mail\MailManager;
+use Drupal\Core\Mail\MailManagerInterface;
 use Drupal\Core\PrivateKey;
-use Drupal\Core\Render\Renderer;
+use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\Site\Settings;
-use Drupal\Core\State\State;
+use Drupal\Core\State\StateInterface;
 use Drupal\Core\Theme\ThemeInitialization;
-use Drupal\Core\Theme\ThemeManager;
+use Drupal\Core\Theme\ThemeManagerInterface;
 use Drupal\Core\Url;
 use Drupal\reliefweb_api\Services\ReliefWebApiClient;
 
@@ -71,7 +71,7 @@ class ReliefwebSubscriptionsMailer {
   /**
    * The state store.
    *
-   * @var \Drupal\Core\State\State
+   * @var \Drupal\Core\State\StateInterface
    */
   protected $state;
 
@@ -99,14 +99,14 @@ class ReliefwebSubscriptionsMailer {
   /**
    * Renderer.
    *
-   * @var \Drupal\Core\Render\Renderer
+   * @var \Drupal\Core\Render\RendererInterface
    */
   protected $renderer;
 
   /**
    * Mail manager.
    *
-   * @var \Drupal\Core\Mail\MailManager
+   * @var \Drupal\Core\Mail\MailManagerInterface
    */
   protected $mailManager;
 
@@ -134,7 +134,7 @@ class ReliefwebSubscriptionsMailer {
   /**
    * Theme manager.
    *
-   * @var \Drupal\Core\Theme\ThemeManager
+   * @var \Drupal\Core\Theme\ThemeManagerInterface
    */
   protected $themeManager;
 
@@ -154,16 +154,16 @@ public function __construct(
       EntityFieldManagerInterface $entity_field_manager,
       EntityRepositoryInterface $entity_repository,
       EntityTypeManagerInterface $entity_type_manager,
-      State $state,
+      StateInterface $state,
       TimeInterface $time,
       ReliefWebApiClient $reliefwebApiClient,
       PrivateKey $privateKey,
-      Renderer $renderer,
-      MailManager $mailManager,
+      RendererInterface $renderer,
+      MailManagerInterface $mailManager,
       LanguageDefault $languageDefault,
       LoggerChannelFactoryInterface $loggerFactory,
       ThemeInitialization $themeInitialization,
-      ThemeManager $themeManager,
+      ThemeManagerInterface $themeManager,
       ThemeHandlerInterface $themeHandler
     ) {
     $this->configFactory = $config_factory;
diff --git a/html/modules/custom/reliefweb_topics/src/Form/CommunityTopicsForm.php b/html/modules/custom/reliefweb_topics/src/Form/CommunityTopicsForm.php
index a62c410a1..7fde3f48e 100644
--- a/html/modules/custom/reliefweb_topics/src/Form/CommunityTopicsForm.php
+++ b/html/modules/custom/reliefweb_topics/src/Form/CommunityTopicsForm.php
@@ -3,7 +3,7 @@
 namespace Drupal\reliefweb_topics\Form;
 
 use Drupal\Core\Cache\Cache;
-use Drupal\Core\State\State;
+use Drupal\Core\State\StateInterface;
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
@@ -26,14 +26,14 @@ class CommunityTopicsForm extends FormBase {
   /**
    * The state store.
    *
-   * @var Drupal\Core\State\State
+   * @var Drupal\Core\State\StateInterface
    */
   protected $state;
 
   /**
    * {@inheritdoc}
    */
-  public function __construct(Connection $database, State $state) {
+  public function __construct(Connection $database, StateInterface $state) {
     $this->database = $database;
     $this->state = $state;
   }

From ca7f990cf42187a59885462343e80038d3bc34d0 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Sun, 1 May 2022 10:59:26 +0000
Subject: [PATCH 680/720] [RW-503] Fix content spacing on simple node and term
 pages

---
 .../components/rw-article/rw-article.css                      | 4 ++--
 .../templates/content/node--full.html.twig                    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css b/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css
index d1f6f4a87..ee41844bf 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-article/rw-article.css
@@ -155,6 +155,6 @@
   border-bottom: none;
 }
 
-.node--announcement--full .rw-article__header {
-  margin-bottom: 24px;
+.rw-article__content--simple {
+  margin-top: 24px;
 }
diff --git a/html/themes/custom/common_design_subtheme/templates/content/node--full.html.twig b/html/themes/custom/common_design_subtheme/templates/content/node--full.html.twig
index dc174de38..0a0e66046 100644
--- a/html/themes/custom/common_design_subtheme/templates/content/node--full.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/content/node--full.html.twig
@@ -89,7 +89,7 @@
     {{ title|merge({'#title_attributes': title_attributes.addClass('rw-article__title')}) }}
   </header>
 
-  <div class="rw-article__content">
+  <div class="rw-article__content rw-article__content--simple">
     {{ content }}
   </div>
 

From 0f0fd298c363c4aa99b8583f42636c8c270eac7f Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 2 May 2022 00:29:54 +0000
Subject: [PATCH 681/720] [RW-502] Fix some constructors to use interfaces for
 compatibility with webprofiler etc.

---
 .../reliefweb_import/src/Command/ReliefwebImportCommand.php | 6 +++---
 .../src/Command/ReliefwebXmlsitemapCommand.php              | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php b/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php
index 0450b62bb..9dcd2edfc 100644
--- a/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php
+++ b/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php
@@ -10,7 +10,7 @@
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Logger\LoggerChannelFactoryInterface;
 use Drupal\Core\Logger\LoggerChannelInterface;
-use Drupal\Core\State\State;
+use Drupal\Core\State\StateInterface;
 use Drupal\reliefweb_entities\Entity\Job;
 use Drupal\reliefweb_import\Exception\ReliefwebImportException;
 use Drupal\reliefweb_import\Exception\ReliefwebImportExceptionSoftViolation;
@@ -72,7 +72,7 @@ class ReliefwebImportCommand extends DrushCommands implements SiteAliasManagerAw
   /**
    * The state store.
    *
-   * @var Drupal\Core\State\State
+   * @var Drupal\Core\State\StateInterface
    */
   protected $state;
 
@@ -106,7 +106,7 @@ public function __construct(
     $account_switcher,
     ClientInterface $http_client,
     LoggerChannelFactoryInterface $logger_factory,
-    State $state
+    StateInterface $state
   ) {
     $this->database = $database;
     $this->entityTypeManager = $entity_type_manager;
diff --git a/html/modules/custom/reliefweb_xmlsitemap/src/Command/ReliefwebXmlsitemapCommand.php b/html/modules/custom/reliefweb_xmlsitemap/src/Command/ReliefwebXmlsitemapCommand.php
index 7fccc452e..a0386da16 100644
--- a/html/modules/custom/reliefweb_xmlsitemap/src/Command/ReliefwebXmlsitemapCommand.php
+++ b/html/modules/custom/reliefweb_xmlsitemap/src/Command/ReliefwebXmlsitemapCommand.php
@@ -10,7 +10,7 @@
 use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\Logger\LoggerChannelInterface;
 use Drupal\Core\Logger\LoggerChannelFactoryInterface;
-use Drupal\Core\State\State;
+use Drupal\Core\State\StateInterface;
 use Drush\Commands\DrushCommands;
 use GuzzleHttp\ClientInterface;
 
@@ -75,7 +75,7 @@ class ReliefwebXmlsitemapCommand extends DrushCommands implements SiteAliasManag
   /**
    * The state store.
    *
-   * @var Drupal\Core\State\State
+   * @var Drupal\Core\State\StateInterface
    */
   protected $state;
 
@@ -87,7 +87,7 @@ public function __construct(
     FileSystemInterface $file_system,
     ClientInterface $http_client,
     LoggerChannelFactoryInterface $logger_factory,
-    State $state
+    StateInterface $state
   ) {
     $this->database = $database;
     $this->fileSystem = $file_system;

From 60ed371163d3041b7a5562327f0d6d16d41018e1 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 2 May 2022 00:34:10 +0000
Subject: [PATCH 682/720] [RW-504] Save bookmark permissions

---
 config/user.role.editor.yml    | 4 +++-
 config/user.role.webmaster.yml | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/user.role.editor.yml b/config/user.role.editor.yml
index 4dd52bb0e..3c4fa1688 100644
--- a/config/user.role.editor.yml
+++ b/config/user.role.editor.yml
@@ -30,8 +30,9 @@ dependencies:
     - media
     - node
     - path
-    - reliefweb_files
+    - reliefweb_bookmarks
     - reliefweb_fields
+    - reliefweb_files
     - reliefweb_form
     - reliefweb_guidelines
     - reliefweb_homepage
@@ -150,6 +151,7 @@ permissions:
   - 'revert term revision'
   - 'revert topic revisions'
   - 'revert training revisions'
+  - 'see other bookmarks'
   - 'update any media'
   - 'update media'
   - 'use enhanced input forms'
diff --git a/config/user.role.webmaster.yml b/config/user.role.webmaster.yml
index e150a8614..19f33c87b 100644
--- a/config/user.role.webmaster.yml
+++ b/config/user.role.webmaster.yml
@@ -26,6 +26,7 @@ dependencies:
     - filter
     - google_tag
     - guidelines
+    - reliefweb_bookmarks
     - reliefweb_guidelines
     - reliefweb_users
     - taxonomy
@@ -113,6 +114,7 @@ permissions:
   - 'guideline_list view revisions'
   - 'revert all guideline revisions'
   - 'revert term revision'
+  - 'see other bookmarks'
   - 'sort all guideline'
   - 'sort editorial guidelines'
   - 'use text format guideline'

From eb31fc820ec9ea7eff2b8d8b8c5f0430c5779efb Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 2 May 2022 00:55:04 +0000
Subject: [PATCH 683/720] [RW-496] Style error message on community topics form

---
 .../js/reliefweb_topics_community_topics.admin.js                | 1 +
 1 file changed, 1 insertion(+)

diff --git a/html/modules/custom/reliefweb_topics/js/reliefweb_topics_community_topics.admin.js b/html/modules/custom/reliefweb_topics/js/reliefweb_topics_community_topics.admin.js
index 2905eee95..98f603a07 100644
--- a/html/modules/custom/reliefweb_topics/js/reliefweb_topics_community_topics.admin.js
+++ b/html/modules/custom/reliefweb_topics/js/reliefweb_topics_community_topics.admin.js
@@ -270,6 +270,7 @@
         if (typeof error === 'string' && error !== '') {
           var message = document.createElement('div');
           message.setAttribute('data-error-message', '');
+          message.setAttribute('class', 'messages error cd-form__error-message');
           message.appendChild(document.createTextNode(error));
 
           // Add the message at the top of the fieldset.

From c523153e6f780d86f85488b75bb60f52ceda0663 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 2 May 2022 01:04:27 +0000
Subject: [PATCH 684/720] [RW-497] Fix vertical alignment in river search
 buttons

---
 .../common_design_subtheme/components/rw-search/rw-search.css  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css b/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css
index 5adc0b3d4..9110a7384 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-search/rw-search.css
@@ -56,10 +56,11 @@
   right: 0;
   width: 100px;
   height: 100%;
+  padding: 0;
 }
 .rw-river-search .rw-river-search__form button:before {
   position: absolute;
-  top: 16px;
+  top: 14px;
   left: -8px;
   content: "";
   border-width: 8px 8px 8px 0;

From 1eaf1d2addf3bfba9d3e9a70d13de07df6a3c902 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 2 May 2022 01:17:25 +0000
Subject: [PATCH 685/720] [RW-505] Redirect to entity page after submitting
 country/disaster profile

---
 .../reliefweb_fields/src/Form/TaxonomyTermProfile.php       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/html/modules/custom/reliefweb_fields/src/Form/TaxonomyTermProfile.php b/html/modules/custom/reliefweb_fields/src/Form/TaxonomyTermProfile.php
index dd2e4a1a8..dff667e9b 100644
--- a/html/modules/custom/reliefweb_fields/src/Form/TaxonomyTermProfile.php
+++ b/html/modules/custom/reliefweb_fields/src/Form/TaxonomyTermProfile.php
@@ -56,6 +56,12 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
       '@bundle' => $this->getBundleLabel(),
     ]));
     parent::submitForm($form, $form_state);
+
+    // Redirect to the entity page after submission.
+    $entity = $form_state->getFormObject()?->getEntity();
+    if (!empty($entity) && empty($entity->in_preview) && $entity->id() !== NULL) {
+      $form_state->setRedirectUrl($entity->toUrl());
+    }
   }
 
   /**

From 115f1c548c5ad7662908096cb55ecf266f8c947b Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 2 May 2022 06:47:49 +0000
Subject: [PATCH 686/720] [RW-484] Add drush command aliases for compatibility
 with RW7

---
 .../reliefweb_files/src/Commands/ReliefWebFilesCommands.php | 6 +++---
 .../reliefweb_import/src/Command/ReliefwebImportCommand.php | 1 +
 .../src/Command/ReliefwebSubscriptionsSendCommand.php       | 2 ++
 .../src/Command/ReliefwebXmlsitemapCommand.php              | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/html/modules/custom/reliefweb_files/src/Commands/ReliefWebFilesCommands.php b/html/modules/custom/reliefweb_files/src/Commands/ReliefWebFilesCommands.php
index f79fd50b9..ed99dd9de 100644
--- a/html/modules/custom/reliefweb_files/src/Commands/ReliefWebFilesCommands.php
+++ b/html/modules/custom/reliefweb_files/src/Commands/ReliefWebFilesCommands.php
@@ -97,7 +97,7 @@ public function __construct(
    *   'source_directory' => '',
    * ]
    *
-   * @aliases rw-dma,rw-files-migrate-attachments
+   * @aliases rw-fma,rw-files-migrate-attachments
    *
    * @usage rw-files:migrate-attachments
    *   Migrate the attachments.
@@ -130,7 +130,7 @@ public function migrateAttachments($options = [
       return FALSE;
     }
     if (!empty($source_directory) && !file_exists($source_directory)) {
-      $this->logger()->error(strtr('The source directory does not exist.'));
+      $this->logger()->error(dt('The source directory does not exist.'));
       return FALSE;
     }
 
@@ -138,7 +138,7 @@ public function migrateAttachments($options = [
     $local = $this->configFactory->get('reliefweb_files.settings')->get('local') === TRUE;
 
     if (!empty($source_directory) && $local === FALSE) {
-      $this->logger()->error(strtr('The source directory option is only valid in local mode.'));
+      $this->logger()->error(dt('The source directory option is only valid in local mode.'));
       return FALSE;
     }
 
diff --git a/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php b/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php
index 9dcd2edfc..b3aef7fb6 100644
--- a/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php
+++ b/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php
@@ -126,6 +126,7 @@ public function __construct(
    * @usage reliefweb_import:jobs
    *   Send emails.
    * @validate-module-enabled reliefweb_import
+   * @aliases reliefweb-import-jobs
    */
   public function jobs($limit = 50) {
     // Load terms having a job URL.
diff --git a/html/modules/custom/reliefweb_subscriptions/src/Command/ReliefwebSubscriptionsSendCommand.php b/html/modules/custom/reliefweb_subscriptions/src/Command/ReliefwebSubscriptionsSendCommand.php
index f640b0286..1d8a3a4e4 100644
--- a/html/modules/custom/reliefweb_subscriptions/src/Command/ReliefwebSubscriptionsSendCommand.php
+++ b/html/modules/custom/reliefweb_subscriptions/src/Command/ReliefwebSubscriptionsSendCommand.php
@@ -53,6 +53,7 @@ public function __construct(
    * @usage reliefweb_subscriptions:send
    *   Send emails.
    * @validate-module-enabled reliefweb_subscriptions
+   * @aliases reliefweb-subscriptions-send
    */
   public function send($limit = 50) {
     // Get queued notifications, older first.
@@ -94,6 +95,7 @@ public function send($limit = 50) {
    *   Entity Id.
    * @option last
    *   Timestamp to use as the last time notifications were sent.
+   * @aliases reliefweb-subscriptions-queue
    */
   public function queue($sid, array $options = [
     'entity_type' => '',
diff --git a/html/modules/custom/reliefweb_xmlsitemap/src/Command/ReliefwebXmlsitemapCommand.php b/html/modules/custom/reliefweb_xmlsitemap/src/Command/ReliefwebXmlsitemapCommand.php
index a0386da16..250e24d5e 100644
--- a/html/modules/custom/reliefweb_xmlsitemap/src/Command/ReliefwebXmlsitemapCommand.php
+++ b/html/modules/custom/reliefweb_xmlsitemap/src/Command/ReliefwebXmlsitemapCommand.php
@@ -130,6 +130,7 @@ protected function getLogger(): LoggerChannelInterface {
    * @usage reliefweb_xmlsitemap:generate
    *   Generate the ReliefWeb xmlsitemap.
    * @validate-module-enabled reliefweb_xmlsitemap
+   * @aliases reliefweb-xmlsitemap-generate
    */
   public function generate() {
     // Prepare and empty the xmlsitemap directory.
@@ -328,6 +329,7 @@ public function copyXslStylesheet() {
    * @usage reliefweb_xmlsitemap:submit
    *   Submit the sitemap to the search engines.
    * @validate-module-enabled reliefweb_xmlsitemap
+   * @aliases reliefweb-xmlsitemap-submit
    */
   public function submit() {
     // Check that the xmlsitemap actually exists before trying to submit it.

From 351970d2dcdee80208e665475678439acac31182 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 2 May 2022 06:48:21 +0000
Subject: [PATCH 687/720] [RW-509] Fix unwanted call to docstore in local mode

---
 .../src/Plugin/Field/FieldType/ReliefWebFileList.php            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_files/src/Plugin/Field/FieldType/ReliefWebFileList.php b/html/modules/custom/reliefweb_files/src/Plugin/Field/FieldType/ReliefWebFileList.php
index af0642312..71ad17e36 100644
--- a/html/modules/custom/reliefweb_files/src/Plugin/Field/FieldType/ReliefWebFileList.php
+++ b/html/modules/custom/reliefweb_files/src/Plugin/Field/FieldType/ReliefWebFileList.php
@@ -134,7 +134,7 @@ public function delete() {
     if (!$entity->isDefaultTranslation()) {
       $this->deleteRemoteDocumentFileReferences();
     }
-    else {
+    elseif (!$this->storeLocally()) {
       $this->getDocstoreClient()->deleteDocument($entity->uuid());
     }
 

From 1ffffeff7d446264b893c62576f7b5610236e1fb Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 4 May 2022 03:07:19 +0000
Subject: [PATCH 688/720] [RW-511] Add command to fix file migration

---
 .../src/Commands/ReliefWebFilesCommands.php   | 110 ++++++++++++++++++
 1 file changed, 110 insertions(+)

diff --git a/html/modules/custom/reliefweb_files/src/Commands/ReliefWebFilesCommands.php b/html/modules/custom/reliefweb_files/src/Commands/ReliefWebFilesCommands.php
index ed99dd9de..d335a607c 100644
--- a/html/modules/custom/reliefweb_files/src/Commands/ReliefWebFilesCommands.php
+++ b/html/modules/custom/reliefweb_files/src/Commands/ReliefWebFilesCommands.php
@@ -700,4 +700,114 @@ public static function clearEntityCache($entity_type_id, array $ids) {
     }
   }
 
+  /**
+   * Fix migration of the report attachments.
+   *
+   * This creates the entries in the file_managed for some attachments for which
+   * the entries were not created for some reason during the report migration.
+   *
+   * @command rw-files:fix-migration
+   *
+   * @usage rw-files:fix-migration
+   *   Migrate the attachments.
+   *
+   * @validate-module-enabled reliefweb_files
+   */
+  public function fixMigration() {
+    $query = $this->getDatabase()
+      ->select('node__field_file', 'nf')
+      ->fields('nf', ['entity_id']);
+
+    $query->leftJoin('file_managed', 'fm', 'fm.uuid = nf.field_file_file_uuid');
+    $query->isNull('fm.fid');
+
+    $ids = $query->execute()?->fetchCol();
+    if (empty($ids)) {
+      $this->logger()->info(dt('No files to fix'));
+    }
+    else {
+      sort($ids);
+      $nodes = $this->entityTypeManager->getStorage('node')->loadMultiple($ids);
+
+      $processed = 0;
+      foreach ($nodes as $node) {
+        $this->logger()->info(dt('Fixing files for node @nid', [
+          '@nid' => $node->id(),
+        ]));
+
+        foreach ($node->field_file as $item) {
+          $private = !$node->isPublished();
+          $created = $node->getCreatedTime();
+
+          // Create file if it doesn't exist.
+          $file = $item->loadFile();
+          if (empty($file)) {
+            $file = $item->createFile();
+            if (empty($file)) {
+              $this->logger()->error(dt('Unable to create file with uuid @uuid for node @nid', [
+                '@uuid' => $item->getUuid(),
+                '@nid' => $node->id(),
+              ]));
+            }
+            else {
+              $file->setFileUri($item->getPermanentUri($private, FALSE));
+              $file->setSize($item->getFileSize());
+              $file->setPermanent();
+              $file->changed->value = $created;
+              $file->created->value = $created;
+              $file->save();
+              $processed++;
+
+              $this->logger()->info(dt('Created file with uuid @uuid for node @nid', [
+                '@uuid' => $item->getFileUuid(),
+                '@nid' => $node->id(),
+              ]));
+            }
+          }
+          else {
+            $this->logger()->info(dt('File with uuid @uuid for node @nid already exists', [
+              '@uuid' => $file->uuid(),
+              '@nid' => $node->id(),
+            ]));
+          }
+
+          // Create preview file if doesn't exist.
+          $preview_file = $item->loadPreviewFile();
+          if (empty($preview_file)) {
+            $preview_file = $item->createPreviewFile();
+            if (empty($preview_file)) {
+              $this->logger()->error(dt('Unable to create preview file with uuid @uuid for node @nid', [
+                '@uuid' => $item->getUuid(),
+                '@nid' => $node->id(),
+              ]));
+            }
+            else {
+              $preview_file->setFileUri($item->getPermanentUri($private, TRUE));
+              $preview_file->setPermanent();
+              $preview_file->changed->value = $created;
+              $preview_file->created->value = $created;
+              $preview_file->save();
+
+              $this->logger()->info(dt('Created preview file with uuid @uuid for node @nid', [
+                '@uuid' => $item->getPreviewUuid(),
+                '@nid' => $node->id(),
+              ]));
+            }
+          }
+          else {
+            $this->logger()->info(dt('Preview file with uuid @uuid for node @nid already exists', [
+              '@uuid' => $preview_file->uuid(),
+              '@nid' => $node->id(),
+            ]));
+          }
+        }
+      }
+
+      $this->logger()->info(dt('Fixed @files for @nodes', [
+        '@files' => $processed,
+        '@nodes' => count($nodes),
+      ]));
+    }
+  }
+
 }

From 09195fdc76bba11552d7724a762e40cadd975e39 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 4 May 2022 05:08:51 +0000
Subject: [PATCH 689/720] [RW-511] Also fix preview files

---
 .../src/Commands/ReliefWebFilesCommands.php   | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/html/modules/custom/reliefweb_files/src/Commands/ReliefWebFilesCommands.php b/html/modules/custom/reliefweb_files/src/Commands/ReliefWebFilesCommands.php
index d335a607c..895507db8 100644
--- a/html/modules/custom/reliefweb_files/src/Commands/ReliefWebFilesCommands.php
+++ b/html/modules/custom/reliefweb_files/src/Commands/ReliefWebFilesCommands.php
@@ -714,14 +714,22 @@ public static function clearEntityCache($entity_type_id, array $ids) {
    * @validate-module-enabled reliefweb_files
    */
   public function fixMigration() {
-    $query = $this->getDatabase()
-      ->select('node__field_file', 'nf')
-      ->fields('nf', ['entity_id']);
+    $ids = [];
 
-    $query->leftJoin('file_managed', 'fm', 'fm.uuid = nf.field_file_file_uuid');
+    $query = $this->getDatabase()->select('node__field_file', 'nf');
+    $query->fields('nf', ['entity_id']);
+    $query->condition(' nf.field_file_file_uuid', NULL, 'IS NOT NULL');
+    $query->leftJoin('file_managed', 'fm', 'fm.uuid  = nf.field_file_file_uuid');
     $query->isNull('fm.fid');
+    $ids += $query->execute()?->fetchAllKeyed(0, 0) ?? [];
+
+    $query = $this->getDatabase()->select('node__field_file', 'nf');
+    $query->fields('nf', ['entity_id']);
+    $query->condition(' nf.field_file_preview_uuid', NULL, 'IS NOT NULL');
+    $query->leftJoin('file_managed', 'fm', 'fm.uuid  = nf.field_file_preview_uuid');
+    $query->isNull('fm.fid');
+    $ids += $query->execute()?->fetchAllKeyed(0, 0) ?? [];
 
-    $ids = $query->execute()?->fetchCol();
     if (empty($ids)) {
       $this->logger()->info(dt('No files to fix'));
     }
@@ -803,7 +811,7 @@ public function fixMigration() {
         }
       }
 
-      $this->logger()->info(dt('Fixed @files for @nodes', [
+      $this->logger()->info(dt('Fixed @files files for @nodes nodes', [
         '@files' => $processed,
         '@nodes' => count($nodes),
       ]));

From 669fe77f8f96cdf44f6cce3612e9a41e28639082 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 4 May 2022 05:25:46 +0000
Subject: [PATCH 690/720] [RW-511] Use the existing preview UUID

---
 .../reliefweb_files/src/Commands/ReliefWebFilesCommands.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_files/src/Commands/ReliefWebFilesCommands.php b/html/modules/custom/reliefweb_files/src/Commands/ReliefWebFilesCommands.php
index 895507db8..9f9ee7ed9 100644
--- a/html/modules/custom/reliefweb_files/src/Commands/ReliefWebFilesCommands.php
+++ b/html/modules/custom/reliefweb_files/src/Commands/ReliefWebFilesCommands.php
@@ -782,7 +782,7 @@ public function fixMigration() {
           // Create preview file if doesn't exist.
           $preview_file = $item->loadPreviewFile();
           if (empty($preview_file)) {
-            $preview_file = $item->createPreviewFile();
+            $preview_file = $item->createPreviewFile(FALSE);
             if (empty($preview_file)) {
               $this->logger()->error(dt('Unable to create preview file with uuid @uuid for node @nid', [
                 '@uuid' => $item->getUuid(),

From 1173f1f6a9874e57fea1633d32038ca0545f6bf4 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 4 May 2022 08:41:02 +0000
Subject: [PATCH 691/720] [RW-511] Add command to check files missing on disk

---
 .../src/Commands/ReliefWebMigrateCommands.php | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php b/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
index e06fb42a2..b223a2468 100644
--- a/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
+++ b/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
@@ -638,4 +638,62 @@ public function checkFiles() {
     ]);
   }
 
+  /**
+   * Check if the attachment files are migrated properly.
+   *
+   * DEBUG.
+   *
+   * @command rw-mcfe
+   *
+   * @option info If set, show the info of the missing files.
+   * @option limit If set, check only the given number of files.
+   *
+   * @default options [
+   *   'info' => FALSE,
+   *   'limit' => 0,
+   * ]
+   *
+   * @usage rw-mcfe
+   *   Count the number of missing files.
+   * @usage rw-mcfe --info --limit=10
+   *   Check 10 files and show the details of the missing files.
+   *
+   * @validate-module-enabled reliefweb_migrate
+   */
+  public function checkFileExistence($options = [
+    'info' => FALSE,
+    'limit' => 0,
+  ]) {
+    $query = Database::getConnection('default', 'default')
+      ->select('file_managed', 'fm')
+      ->fields('fm', ['fid', 'uuid', 'uri'])
+      ->orderBy('fm.fid', 'ASC');
+    if (!empty($options['limit']) && (int) $options['limit'] > 1) {
+      $query->range(0, (int) $options['limit']);
+    }
+
+    $files = $query->execute()?->fetchAllAssoc('fid', \PDO::FETCH_ASSOC) ?? [];
+    $total = count($files);
+    $count = 0;
+
+    $missing = [];
+    foreach (array_chunk($files, 1000, TRUE) as $chunk) {
+      foreach ($chunk as $fid => $file) {
+        $count++;
+        if (!file_exists($file['uri'])) {
+          $missing[$fid] = $file;
+        }
+      }
+      $this->logger()->info(dt('Checked @count / @total files: @missing missing.', [
+        '@count' => $count,
+        '@total' => $total,
+        '@missing' => count($missing),
+      ]));
+    }
+
+    if (!empty($options['info'])) {
+      print_r($missing);
+    }
+  }
+
 }

From 61233648114b31d08ab130cb17f3e2642f894003 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 5 May 2022 03:22:25 +0000
Subject: [PATCH 692/720] [RW-511] Add comands to fix mimetypes and check
 migrated content

---
 .../src/Commands/ReliefWebMigrateCommands.php | 317 ++++++++++++++++++
 1 file changed, 317 insertions(+)

diff --git a/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php b/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
index b223a2468..aefa54905 100644
--- a/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
+++ b/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
@@ -696,4 +696,321 @@ public function checkFileExistence($options = [
     }
   }
 
+  /**
+   * Fix migrated files with wrong PDF mimetype.
+   *
+   * DEBUG.
+   *
+   * @command rw-mffm
+   *
+   * @usage rw-mffm
+   *   Fix migrated files with wrong PDF mimetype.
+   *
+   * @validate-module-enabled reliefweb_migrate
+   */
+  public function fixFileMimetype() {
+    $transaction = $this->database->startTransaction();
+    try {
+      $arguments = [
+        ':mimetype' => 'application/pdf',
+        ':extension' => 'pdf',
+      ];
+      $options = [
+        'return' => Database::RETURN_AFFECTED,
+      ];
+
+      $results['@deleted_files'] = $this->database->query("
+        DELETE fm.* FROM {file_managed} AS fm
+        INNER JOIN {node__field_file} AS nf
+        ON nf.field_file_preview_uuid = fm.uuid
+        WHERE nf.field_file_file_mime = :mimetype
+        AND LOWER(RIGHT(nf.field_file_file_name,3)) <> :extension
+      ", $arguments, $options) ?? 0;
+
+      $results['@deleted_files'] += $this->database->query("
+        DELETE fm.* FROM {file_managed} AS fm
+        INNER JOIN {node_revision__field_file} AS nf
+        ON nf.field_file_preview_uuid = fm.uuid
+        WHERE nf.field_file_file_mime = :mimetype
+        AND LOWER(RIGHT(nf.field_file_file_name,3)) <> :extension
+      ", $arguments, $options) ?? 0;
+
+      $results['@updated_fields'] = $this->database->query("
+        UPDATE {node__field_file} SET
+        field_file_file_mime = CASE LOWER(RIGHT(field_file_file_name,3))
+          WHEN 'bmp' THEN 'image/bmp'
+          WHEN 'gif' THEN 'image/gif'
+          WHEN 'jpg' THEN 'image/jpeg'
+          WHEN 'kml' THEN 'application/vnd.google-earth.kml+xml'
+          WHEN 'png' THEN 'image/png'
+          WHEN 'ppt' THEN 'application/vnd.ms-powerpoint'
+        END,
+        field_file_page_count = NULL,
+        field_file_preview_uuid = NULL,
+        field_file_preview_page = NULL,
+        field_file_preview_rotation = NULL
+        WHERE field_file_file_mime = :mimetype
+        AND LOWER(RIGHT(field_file_file_name,3)) <> :extension
+      ", $arguments, $options) ?? 0;
+
+      $results['@updated_revision_fields'] = $this->database->query("
+        UPDATE {node_revision__field_file} SET
+        field_file_file_mime = CASE LOWER(RIGHT(field_file_file_name,3))
+          WHEN 'bmp' THEN 'image/bmp'
+          WHEN 'gif' THEN 'image/gif'
+          WHEN 'jpg' THEN 'image/jpeg'
+          WHEN 'kml' THEN 'application/vnd.google-earth.kml+xml'
+          WHEN 'png' THEN 'image/png'
+          WHEN 'ppt' THEN 'application/vnd.ms-powerpoint'
+        END,
+        field_file_page_count = NULL,
+        field_file_preview_uuid = NULL,
+        field_file_preview_page = NULL,
+        field_file_preview_rotation = NULL
+        WHERE field_file_file_mime = :mimetype
+        AND LOWER(RIGHT(field_file_file_name,3)) <> :extension
+      ", $arguments, $options) ?? 0;
+
+      $this->logger()->info(dt('Deleted files: @deleted_files. Updated fields: @updated_fields. Updated revision fields: @updated_revision_fields.', $results));
+
+      // Ignore replica server temporarily.
+      // phpcs:ignore
+      \Drupal::service('database.replica_kill_switch')->trigger();
+    }
+    catch (\Exception $exception) {
+      $transaction->rollBack();
+      $this->logger()->error($exception->getMessage());
+    }
+  }
+
+  /**
+   * Check migrated content.
+   *
+   * @command rw-migrate:check-content
+   *
+   * @usage rw-migrate:check-content
+   *   Check migrated content.
+   *
+   * @validate-module-enabled reliefweb_migrate
+   *
+   * @aliases rw-mcc
+   *
+   * @field-labels
+   *   name: Name
+   *   rw9: RW9
+   *   rw7: RW7
+   *   diff: Diff
+   * @default-fields name,rw9,rw7,diff
+   *
+   * @return \Consolidation\OutputFormatters\StructuredData\RowsOfFields
+   *   Formatted table.
+   */
+  public function checkMigratedContent() {
+    $d7_database = Database::getConnection('default', 'rwint7');
+
+    $duplicate_query = $d7_database->select('field_data_field_file', 'f');
+    $duplicate_query->addField('f', 'field_file_fid', 'fid');
+    $duplicate_query->addExpression('COUNT(f.field_file_fid)', 'total');
+    $duplicate_query->addExpression('GROUP_CONCAT(f.entity_id ORDER BY f.entity_id)', 'ids');
+    $duplicate_query->groupBy('f.field_file_fid');
+    $duplicate_query->having('total > 1');
+
+    $duplicate_reports = [];
+    foreach ($duplicate_query->execute() ?? [] as $record) {
+      $ids = explode(',', $record->ids);
+      if (min($ids) !== max($ids)) {
+        $duplicate_reports = array_merge($duplicate_reports, array_slice($ids, 0, -1));
+      }
+    }
+
+    $d9_data = $this->database->query("
+        SELECT CONCAT('node - ', type) AS name, COUNT(*) AS total
+        FROM node
+        GROUP BY type
+      UNION
+        SELECT CONCAT('node - ', 'total') AS name, COUNT(*) AS total
+        FROM node
+      UNION
+        SELECT CONCAT('term - ', vid) AS name, COUNT(*) AS total
+        FROM taxonomy_term_data
+        GROUP BY vid
+      UNION
+        SELECT CONCAT('term - ', 'total') AS name, COUNT(*) AS total
+        FROM taxonomy_term_data
+      UNION
+        SELECT CONCAT('media - ', bundle) AS name, COUNT(*) AS total
+        FROM media
+        GROUP BY bundle
+      UNION
+        SELECT CONCAT('media - ', 'total') AS name, COUNT(*) AS total
+        FROM media
+      UNION
+        SELECT CONCAT('image - ', m.bundle) AS name, COUNT(m.mid) AS total
+        FROM media AS m
+        INNER JOIN media__field_media_image AS fmi
+          ON fmi.entity_id = m.mid
+        INNER JOIN file_managed AS fm
+          ON fm.fid = fmi.field_media_image_target_id
+        GROUP BY m.bundle
+      UNION
+        SELECT CONCAT('image - ', 'total') AS name, COUNT(m.mid) AS total
+        FROM media AS m
+        INNER JOIN media__field_media_image AS fmi
+          ON fmi.entity_id = m.mid
+        INNER JOIN file_managed AS fm
+          ON fm.fid = fmi.field_media_image_target_id
+      UNION
+        SELECT 'attachment' AS name, COUNT(field_file_file_uuid)
+        FROM node__field_file
+      UNION
+        SELECT 'preview' AS name, COUNT(field_file_preview_uuid)
+        FROM node__field_file
+        WHERE field_file_preview_uuid IS NOT NULL
+      UNION
+        SELECT 'attachment file' AS name, COUNT(fm.fid)
+        FROM file_managed AS fm
+        INNER JOIN node__field_file AS nf ON nf.field_file_file_uuid = fm.uuid
+      UNION
+        SELECT 'preview file' AS name, COUNT(fm.fid)
+        FROM file_managed AS fm
+        INNER JOIN node__field_file AS nf
+          ON nf.field_file_preview_uuid = fm.uuid
+    ")?->fetchAllKeyed(0, 1) ?? [];
+
+    $d7_data = $d7_database->query("
+        SELECT CONCAT('node - ',
+          CASE type
+            WHEN 'topics' THEN 'topic'
+            ELSE type
+          END) AS name, COUNT(*) AS total
+        FROM node
+        WHERE type NOT IN ('faq')
+          AND nid NOT IN (:duplicate_reports[])
+        GROUP BY type
+      UNION
+        SELECT CONCAT('node - ', 'total') AS name, COUNT(*) AS total
+        FROM node
+        WHERE type NOT IN ('faq')
+          AND nid NOT IN (:duplicate_reports[])
+      UNION
+        SELECT CONCAT('term - ',
+          CASE tv.machine_name
+            WHEN 'career_categories' THEN 'career_category'
+            WHEN 'tags' THEN 'tag'
+            WHEN 'vulnerable_groups' THEN 'vulnerable_group'
+            ELSE tv.machine_name
+          END) AS name, COUNT(td.tid) AS total
+        FROM taxonomy_term_data AS td
+        INNER JOIN taxonomy_vocabulary AS tv
+          ON tv.vid = td.vid
+        WHERE tv.machine_name NOT IN ('city', 'faq_category', 'region')
+        GROUP BY tv.vid
+      UNION
+        SELECT CONCAT('term - ', 'total') AS name, COUNT(td.tid) AS total
+        FROM taxonomy_term_data AS td
+        INNER JOIN taxonomy_vocabulary AS tv
+          ON tv.vid = td.vid
+        WHERE tv.machine_name NOT IN ('city', 'faq_category', 'region')
+      UNION
+        SELECT CONCAT('media - ', 'image_announcement') AS name, COUNT(DISTINCT fm.fid)
+        FROM file_managed AS fm
+        INNER JOIN field_data_field_image AS fi
+          ON fi.field_image_fid = fm.fid
+          AND fi.bundle = 'announcement'
+      UNION
+        SELECT CONCAT('media - ', 'image_blog_post') AS name, COUNT(DISTINCT fm.fid)
+        FROM file_managed AS fm
+        LEFT JOIN field_data_field_image AS fi
+          ON fi.field_image_fid = fm.fid
+          AND fi.bundle = 'blog_post'
+        LEFT JOIN field_data_field_attached_images AS fai
+          ON fai.field_attached_images_fid = fm.fid
+          AND fai.bundle = 'blog_post'
+        WHERE fi.entity_id IS NOT NULL OR fai.entity_id IS NOT NULL
+      UNION
+        SELECT CONCAT('media - ', 'image_report') AS name, COUNT(DISTINCT fm.fid)
+        FROM file_managed AS fm
+        LEFT JOIN field_data_field_image AS fi
+          ON fi.field_image_fid = fm.fid
+          AND fi.bundle = 'report'
+        LEFT JOIN field_data_field_headline_image AS fhi
+          ON fhi.field_headline_image_fid = fm.fid
+          AND fhi.bundle = 'report'
+        WHERE fi.entity_id IS NOT NULL OR fhi.entity_id IS NOT NULL
+      UNION
+        SELECT CONCAT('media - ', 'image_source') AS name, COUNT(DISTINCT fm.fid)
+        FROM file_managed AS fm
+        INNER JOIN field_data_field_term_image AS fti
+          ON fti.field_term_image_fid = fm.fid
+          AND fti.bundle = 'source'
+      UNION
+        SELECT CONCAT('media - ', 'image_topic') AS name, COUNT(DISTINCT fm.fid)
+        FROM file_managed AS fm
+        INNER JOIN field_data_field_term_image AS fi
+          ON fi.field_term_image_fid = fm.fid
+          AND fi.bundle = 'topics'
+      UNION
+        SELECT CONCAT('media - ', 'total') AS name, COUNT(DISTINCT fm.fid)
+        FROM file_managed AS fm
+        LEFT JOIN field_data_field_image AS fi
+          ON fi.field_image_fid = fm.fid
+          AND fi.bundle IN ('announcement', 'blog_post', 'report')
+        LEFT JOIN field_data_field_attached_images AS fai
+          ON fai.field_attached_images_fid = fm.fid
+          AND fai.bundle = 'blog_post'
+        LEFT JOIN field_data_field_headline_image AS fhi
+          ON fhi.field_headline_image_fid = fm.fid
+          AND fhi.bundle = 'report'
+        LEFT JOIN field_data_field_term_image AS fti
+          ON fti.field_term_image_fid = fm.fid
+          AND fti.bundle IN ('source', 'topics')
+        WHERE fi.entity_id IS NOT NULL
+          OR fai.entity_id IS NOT NULL
+          OR fhi.entity_id IS NOT NULL
+          OR fti.entity_id IS NOT NULL
+      UNION
+        SELECT 'attachment' AS name, COUNT(DISTINCT f.field_file_fid)
+        FROM field_data_field_file AS f
+        INNER JOIN file_managed AS fm
+          ON fm.fid = f.field_file_fid
+        WHERE f.bundle = 'report'
+      UNION
+        SELECT 'preview' AS name, COUNT(DISTINCT f.field_file_fid)
+        FROM field_data_field_file AS f
+        INNER JOIN file_managed AS fm
+          ON fm.fid = f.field_file_fid
+        WHERE f.bundle = 'report'
+          AND f.field_file_description REGEXP :preview_description
+          AND (fm.filemime = 'application/pdf' OR LOWER(RIGHT(fm.uri,3)) = 'pdf')
+    ", [
+      ':duplicate_reports[]' => $duplicate_reports,
+      ':preview_description' => '[|][1-9][0-9]*[|](0|90|-90)$',
+    ])?->fetchAllKeyed(0, 1) ?? [];
+
+    $table = [];
+    foreach ($d9_data as $key => $value) {
+      if ($key === 'attachment file') {
+        $d7_value = $d7_data['attachment'];
+      }
+      elseif ($key === 'preview file') {
+        $d7_value = $d7_data['preview'];
+      }
+      elseif (strpos($key, 'image - ') === 0) {
+        $d7_value = $d7_data[str_replace('image - ', 'media - ', $key)];
+      }
+      else {
+        $d7_value = $d7_data[$key];
+      }
+
+      $table[] = [
+        'name' => $key,
+        'rw9' => $value,
+        'rw7' => $d7_value,
+        'diff' => $value - $d7_value,
+      ];
+    }
+
+    return new RowsOfFields($table);
+  }
+
 }

From d75752d92f093f2036a205d06a45807966d66c27 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 5 May 2022 04:20:00 +0000
Subject: [PATCH 693/720] [RW-511] Add option to check migrated content only

---
 .../src/Commands/ReliefWebMigrateCommands.php | 86 +++++++++++++++++--
 1 file changed, 81 insertions(+), 5 deletions(-)

diff --git a/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php b/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
index aefa54905..c12334a29 100644
--- a/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
+++ b/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
@@ -788,8 +788,16 @@ public function fixFileMimetype() {
    *
    * @command rw-migrate:check-content
    *
+   * @option migrated-only Limit results from the D7 database to migrated ids.
+   *
+   * @default options [
+   *   'migrated-only' => FALSE,
+   * ]
+   *
    * @usage rw-migrate:check-content
    *   Check migrated content.
+   * @usage rw-migrate:check-content --migrated-only
+   *   Check migrated content, limiting to the latest migrated IDs.
    *
    * @validate-module-enabled reliefweb_migrate
    *
@@ -805,7 +813,9 @@ public function fixFileMimetype() {
    * @return \Consolidation\OutputFormatters\StructuredData\RowsOfFields
    *   Formatted table.
    */
-  public function checkMigratedContent() {
+  public function checkMigratedContent($options = [
+    'migrated-only' => FALSE,
+  ]) {
     $d7_database = Database::getConnection('default', 'rwint7');
 
     $duplicate_query = $d7_database->select('field_data_field_file', 'f');
@@ -823,6 +833,56 @@ public function checkMigratedContent() {
       }
     }
 
+    if (empty($options['migrated-only'])) {
+      $node_max_id = $d7_database->query("
+        SELECT MAX(vid) FROM node
+      ")?->fetchField() ?? 0;
+      $term_max_id = $d7_database->query("
+        SELECT MAX(revision_id) FROM taxonomy_term_data
+      ")?->fetchField() ?? 0;
+      $media_max_id = $d7_database->query("
+        SELECT MAX(fm.fid)
+        FROM file_managed AS fm
+        LEFT JOIN field_data_field_image AS fi
+          ON fi.field_image_fid = fm.fid
+          AND fi.bundle IN ('announcement', 'blog_post', 'report')
+        LEFT JOIN field_data_field_attached_images AS fai
+          ON fai.field_attached_images_fid = fm.fid
+          AND fai.bundle = 'blog_post'
+        LEFT JOIN field_data_field_headline_image AS fhi
+          ON fhi.field_headline_image_fid = fm.fid
+          AND fhi.bundle = 'report'
+        LEFT JOIN field_data_field_term_image AS fti
+          ON fti.field_term_image_fid = fm.fid
+          AND fti.bundle IN ('source', 'topics')
+        WHERE fi.entity_id IS NOT NULL
+          OR fai.entity_id IS NOT NULL
+          OR fhi.entity_id IS NOT NULL
+          OR fti.entity_id IS NOT NULL
+      ")?->fetchField() ?? 0;
+      $file_max_id = $d7_database->query("
+        SELECT MAX(fm.fid) FROM file_managed AS fm
+        INNER JOIN field_data_field_file AS f
+        ON f.field_file_fid = fm.fid
+      ")?->fetchField() ?? 0;
+    }
+    else {
+      $node_max_id = $this->database->query("
+        SELECT MAX(vid) FROM node
+      ")?->fetchField() ?? 0;
+      $term_max_id = $this->database->query("
+        SELECT MAX(revision_id) FROM taxonomy_term_data
+      ")?->fetchField() ?? 0;
+      $media_max_id = $this->database->query("
+        SELECT MAX(mid) FROM media
+      ")?->fetchField() ?? 0;
+      $file_max_id = $this->database->query("
+        SELECT MAX(fm.fid) FROM file_managed AS fm
+        INNER JOIN node__field_file AS f
+        ON f.field_file_file_uuid = fm.uuid
+      ")?->fetchField() ?? 0;
+    }
+
     $d9_data = $this->database->query("
         SELECT CONCAT('node - ', type) AS name, COUNT(*) AS total
         FROM node
@@ -886,12 +946,14 @@ public function checkMigratedContent() {
         FROM node
         WHERE type NOT IN ('faq')
           AND nid NOT IN (:duplicate_reports[])
+          AND nid <= :node_max_id
         GROUP BY type
       UNION
         SELECT CONCAT('node - ', 'total') AS name, COUNT(*) AS total
         FROM node
         WHERE type NOT IN ('faq')
           AND nid NOT IN (:duplicate_reports[])
+          AND nid <= :node_max_id
       UNION
         SELECT CONCAT('term - ',
           CASE tv.machine_name
@@ -904,6 +966,7 @@ public function checkMigratedContent() {
         INNER JOIN taxonomy_vocabulary AS tv
           ON tv.vid = td.vid
         WHERE tv.machine_name NOT IN ('city', 'faq_category', 'region')
+          AND td.tid <= :term_max_id
         GROUP BY tv.vid
       UNION
         SELECT CONCAT('term - ', 'total') AS name, COUNT(td.tid) AS total
@@ -911,12 +974,14 @@ public function checkMigratedContent() {
         INNER JOIN taxonomy_vocabulary AS tv
           ON tv.vid = td.vid
         WHERE tv.machine_name NOT IN ('city', 'faq_category', 'region')
+          AND td.tid <= :term_max_id
       UNION
         SELECT CONCAT('media - ', 'image_announcement') AS name, COUNT(DISTINCT fm.fid)
         FROM file_managed AS fm
         INNER JOIN field_data_field_image AS fi
           ON fi.field_image_fid = fm.fid
           AND fi.bundle = 'announcement'
+        WHERE fm.fid <= :media_max_id
       UNION
         SELECT CONCAT('media - ', 'image_blog_post') AS name, COUNT(DISTINCT fm.fid)
         FROM file_managed AS fm
@@ -926,7 +991,8 @@ public function checkMigratedContent() {
         LEFT JOIN field_data_field_attached_images AS fai
           ON fai.field_attached_images_fid = fm.fid
           AND fai.bundle = 'blog_post'
-        WHERE fi.entity_id IS NOT NULL OR fai.entity_id IS NOT NULL
+        WHERE (fi.entity_id IS NOT NULL OR fai.entity_id IS NOT NULL)
+          AND fm.fid <= :media_max_id
       UNION
         SELECT CONCAT('media - ', 'image_report') AS name, COUNT(DISTINCT fm.fid)
         FROM file_managed AS fm
@@ -936,19 +1002,22 @@ public function checkMigratedContent() {
         LEFT JOIN field_data_field_headline_image AS fhi
           ON fhi.field_headline_image_fid = fm.fid
           AND fhi.bundle = 'report'
-        WHERE fi.entity_id IS NOT NULL OR fhi.entity_id IS NOT NULL
+        WHERE (fi.entity_id IS NOT NULL OR fhi.entity_id IS NOT NULL)
+          AND fm.fid <= :media_max_id
       UNION
         SELECT CONCAT('media - ', 'image_source') AS name, COUNT(DISTINCT fm.fid)
         FROM file_managed AS fm
         INNER JOIN field_data_field_term_image AS fti
           ON fti.field_term_image_fid = fm.fid
           AND fti.bundle = 'source'
+        WHERE fm.fid <= :media_max_id
       UNION
         SELECT CONCAT('media - ', 'image_topic') AS name, COUNT(DISTINCT fm.fid)
         FROM file_managed AS fm
         INNER JOIN field_data_field_term_image AS fi
           ON fi.field_term_image_fid = fm.fid
           AND fi.bundle = 'topics'
+        WHERE fm.fid <= :media_max_id
       UNION
         SELECT CONCAT('media - ', 'total') AS name, COUNT(DISTINCT fm.fid)
         FROM file_managed AS fm
@@ -964,16 +1033,18 @@ public function checkMigratedContent() {
         LEFT JOIN field_data_field_term_image AS fti
           ON fti.field_term_image_fid = fm.fid
           AND fti.bundle IN ('source', 'topics')
-        WHERE fi.entity_id IS NOT NULL
+        WHERE (fi.entity_id IS NOT NULL
           OR fai.entity_id IS NOT NULL
           OR fhi.entity_id IS NOT NULL
-          OR fti.entity_id IS NOT NULL
+          OR fti.entity_id IS NOT NULL)
+          AND fm.fid <= :media_max_id
       UNION
         SELECT 'attachment' AS name, COUNT(DISTINCT f.field_file_fid)
         FROM field_data_field_file AS f
         INNER JOIN file_managed AS fm
           ON fm.fid = f.field_file_fid
         WHERE f.bundle = 'report'
+          AND fm.fid <= :file_max_id
       UNION
         SELECT 'preview' AS name, COUNT(DISTINCT f.field_file_fid)
         FROM field_data_field_file AS f
@@ -982,9 +1053,14 @@ public function checkMigratedContent() {
         WHERE f.bundle = 'report'
           AND f.field_file_description REGEXP :preview_description
           AND (fm.filemime = 'application/pdf' OR LOWER(RIGHT(fm.uri,3)) = 'pdf')
+          AND fm.fid <= :file_max_id
     ", [
       ':duplicate_reports[]' => $duplicate_reports,
       ':preview_description' => '[|][1-9][0-9]*[|](0|90|-90)$',
+      ':node_max_id' => $node_max_id,
+      ':term_max_id' => $term_max_id,
+      ':media_max_id' => $media_max_id,
+      ':file_max_id' => $file_max_id,
     ])?->fetchAllKeyed(0, 1) ?? [];
 
     $table = [];

From 0c7039a2c10807f15928bfdec9ca0b3969496e12 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 5 May 2022 09:53:18 +0000
Subject: [PATCH 694/720] [RW-511] Add parameter to check high water

---
 .../src/Commands/ReliefWebMigrateCommands.php        | 12 ++++++++++--
 .../src/Plugin/migrate/source/EntityBase.php         |  6 +++++-
 .../source/SourceMigrationHighWaterInterface.php     |  5 ++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php b/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
index c12334a29..f9f0c6171 100644
--- a/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
+++ b/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
@@ -526,8 +526,14 @@ protected function downloadFile($source, $destination) {
    *
    * @option group A comma-separated list of migration groups to list
    * @option tag Name of the migration tag to list
+   * @option check-only Calculate the ID to use for the high water but don't
+   * change it yet.
    *
-   * @default $options []
+   * @default $options [
+   *   'group' => '',
+   *   'tag' => '',
+   *   'check-only' => FALSE,
+   * ]
    *
    * @usage rw-migrate:reset-high-water
    *   Reset the stored high water for all migrations.
@@ -545,8 +551,10 @@ protected function downloadFile($source, $destination) {
   public function resetHighWater($migration_names = '', array $options = [
     'group' => '',
     'tag' => '',
+    'check-only' => FALSE,
   ]) {
     $migrations = $this->migrationsList($migration_names, $options);
+    $check_only = !empty($options['check-only']);
 
     // Take it one group at a time, listing the migrations within each group.
     foreach ($migrations as $migration_list) {
@@ -554,7 +562,7 @@ public function resetHighWater($migration_names = '', array $options = [
         $source_plugin = $migration->getSourcePlugin();
 
         if ($source_plugin instanceof SourceMigrationHighWaterInterface) {
-          $id = $source_plugin->setHighWaterToLatestNonImported();
+          $id = $source_plugin->setHighWaterToLatestNonImported($check_only);
           $this->logger->info(strtr('Set high water to @id for @migration.', [
             '@id' => $id,
             '@migration' => $migration_id,
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
index de332e6c6..4ae100d67 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
@@ -329,7 +329,7 @@ public function resetHighWater() {
   /**
    * {@inheritdoc}
    */
-  public function setHighWaterToLatestNonImported() {
+  public function setHighWaterToLatestNonImported($check_only = FALSE) {
     $destination_ids = $this->getDestinationEntityIds();
     $source_ids = $this->getSourceEntityIds();
     $imported_ids = array_intersect($destination_ids, $source_ids);
@@ -337,6 +337,10 @@ public function setHighWaterToLatestNonImported() {
     $new_ids = array_diff($source_ids, $imported_ids);
     $ids = array_keys($new_ids + $updated_ids);
 
+    if ($check_only) {
+      return empty($ids) ? 0 : min($ids);
+    }
+
     if (!empty($ids)) {
       $this->getHighWaterStorage()->set($this->migration->id(), min($ids) - 1);
     }
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/SourceMigrationHighWaterInterface.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/SourceMigrationHighWaterInterface.php
index c17df5a10..d4f49cb60 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/SourceMigrationHighWaterInterface.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/SourceMigrationHighWaterInterface.php
@@ -13,9 +13,12 @@ interface SourceMigrationHighWaterInterface {
    * Note: this mostly useful during development to be able to re-import
    * deleted or modified old content.
    *
+   * @param bool $check_only
+   *   If TRUE, do not update the high water.
+   *
    * @return int
    *   The latest imported ID for the migration.
    */
-  public function setHighWaterToLatestNonImported();
+  public function setHighWaterToLatestNonImported($check_only = FALSE);
 
 }

From b7ee0b5a40fa8210b149b14d63f2af0c63b87a1a Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 6 May 2022 00:51:22 +0000
Subject: [PATCH 695/720] [RW-511] Revise migration logic to be able to migrate
 Ids below the high water mark

---
 .../src/Plugin/migrate/source/EntityBase.php  | 95 ++++++++++++++++---
 1 file changed, 82 insertions(+), 13 deletions(-)

diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
index 4ae100d67..890061a12 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
@@ -67,6 +67,20 @@ abstract class EntityBase extends SqlBase implements ImportAwareInterface, Rollb
    */
   protected $migratedEntities = [];
 
+  /**
+   * IDs of the entities to migrate.
+   *
+   * @var array
+   */
+  protected $idsToMigrate;
+
+  /**
+   * Store the list IDs being processed during the current iteration.
+   *
+   * @var array
+   */
+  protected $idsToProcess = [];
+
   /**
    * Initialize the batch size.
    */
@@ -96,19 +110,42 @@ protected function initializeIterator() {
       $this->prepareQuery();
     }
 
-    if ($this->getHighWaterProperty()) {
+    if (!empty($this->getHighWaterProperty())) {
       $high_water_field = $this->getHighWaterField();
       $high_water = $this->getHighWater();
-      // We check against NULL because 0 is an acceptable value for the high
-      // water mark.
-      if ($high_water !== NULL) {
-        $this->query->condition($high_water_field, $high_water, '>');
+      $this->idsToProcess = [];
+
+      // Initialize the list of IDs to migrate.
+      if (!isset($this->idsToMigrate)) {
+        $this->idsToMigrate = $this->getIdsToMigrate();
+
+        \Drupal::logger('migrate')->info(strtr('IDs to migrate: @ids', [
+          '@ids' => count($this->idsToMigrate),
+        ]));
+      }
+
+      // If there are IDs to migrate, then we go through the list.
+      if (!empty($this->idsToMigrate)) {
+        $ids = array_splice($this->idsToMigrate, 0, $this->batchSize);
+        $this->idsToProcess = array_flip($ids);
+
+        $this->query->condition($high_water_field, $ids, 'IN');
+      }
+      // Otherwise we check against the high water, which allows for example to
+      // re-import existing content (for tests etc.) by changing the high water
+      // mark manually.
+      else {
+        // We check against NULL because 0 is an acceptable value for the high
+        // water mark.
+        if ($high_water !== NULL) {
+          $this->query->condition($high_water_field, $high_water, '>');
+        }
       }
       // Always sort by the high water field, to ensure that the first run
       // (before we have a high water value) also has the results in a
       // consistent order.
       $this->query->orderBy($high_water_field);
-      $this->query->range(0, 1000);
+      $this->query->range(0, $this->batchSize);
     }
     else {
       $this->query->range($this->batch * $this->batchSize, $this->batchSize);
@@ -170,7 +207,7 @@ public function next() {
         }
 
         // @todo This should probably be updated even when skipping the row.
-        if ($this->getHighWaterProperty()) {
+        if (!empty($this->getHighWaterProperty())) {
           $this->saveHighWater($row->getSourceProperty($this->highWaterProperty['name']));
         }
       }
@@ -179,6 +216,19 @@ public function next() {
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function rowChanged(Row $row) {
+    if (!empty($this->highWaterProperty['name'])) {
+      $id = $row->getSourceProperty($this->highWaterProperty['name']);
+      if (isset($this->idsToProcess[$id])) {
+        return TRUE;
+      }
+    }
+    return parent::rowChanged($row);
+  }
+
   /**
    * Preload the ID mapping.
    *
@@ -294,19 +344,21 @@ public function entityExists($id) {
    * {@inheritdoc}
    */
   protected function getHighWater() {
-    if (isset($this->storedHighWater)) {
-      return $this->storedHighWater;
+    if (!isset($this->storedHighWater)) {
+      $this->storedHighWater = parent::getHighWater();
     }
-    return parent::getHighWater();
+    return $this->storedHighWater;
   }
 
   /**
    * {@inheritdoc}
    */
   protected function saveHighWater($high_water) {
-    // To avoid excessive database usage, we store the the high water and we'll
+    // To avoid excessive database usage, we store the high water and we'll
     // save it only after the import.
-    $this->storedHighWater = $high_water;
+    if (!isset($this->storedHighWater) || $high_water > $this->storedHighWater) {
+      $this->storedHighWater = $high_water;
+    }
   }
 
   /**
@@ -395,7 +447,24 @@ public function getMigrationStatus() {
   }
 
   /**
-   * Get the list if source ids that can be imported.
+   * Get the list of entity IDs to migrate.
+   *
+   * @return array
+   *   List of IDs (ex: revision IDs).
+   */
+  protected function getIdsToMigrate() {
+    $destination_ids = $this->getDestinationEntityIds();
+    $source_ids = $this->getSourceEntityIds();
+    $imported_ids = array_intersect($destination_ids, $source_ids);
+    $updated_ids = array_diff_assoc($imported_ids, $source_ids);
+    $new_ids = array_diff($source_ids, $imported_ids);
+    $ids = array_keys($new_ids + $updated_ids);
+    sort($ids);
+    return $ids;
+  }
+
+  /**
+   * Get the list of source ids that can be imported.
    *
    * @return array
    *   Associative array keyed by revision ids if available, otherwise keyed by

From 8f0c11e87fa7505f5799efc692978b1b1b4f1685 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 6 May 2022 01:12:44 +0000
Subject: [PATCH 696/720] [RW-511] Use batch inserts for bookmarks and
 subscriptions

---
 config/migrate_plus.migration.reliefweb_bookmarks.yml            | 1 +
 config/migrate_plus.migration.reliefweb_subscriptions.yml        | 1 +
 .../install/migrate_plus.migration.reliefweb_bookmarks.yml       | 1 +
 .../install/migrate_plus.migration.reliefweb_subscriptions.yml   | 1 +
 4 files changed, 4 insertions(+)

diff --git a/config/migrate_plus.migration.reliefweb_bookmarks.yml b/config/migrate_plus.migration.reliefweb_bookmarks.yml
index 586e02b25..739ab9d94 100644
--- a/config/migrate_plus.migration.reliefweb_bookmarks.yml
+++ b/config/migrate_plus.migration.reliefweb_bookmarks.yml
@@ -36,4 +36,5 @@ destination:
       type: integer
     uid:
       type: integer
+  batch_size: 1000
 migration_dependencies: null
diff --git a/config/migrate_plus.migration.reliefweb_subscriptions.yml b/config/migrate_plus.migration.reliefweb_subscriptions.yml
index 9881c456d..0126d4bb6 100644
--- a/config/migrate_plus.migration.reliefweb_subscriptions.yml
+++ b/config/migrate_plus.migration.reliefweb_subscriptions.yml
@@ -31,4 +31,5 @@ destination:
       type: string
     uid:
       type: integer
+  batch_size: 1000
 migration_dependencies: null
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_bookmarks.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_bookmarks.yml
index f5a671dab..dd8118c3e 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_bookmarks.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_bookmarks.yml
@@ -22,6 +22,7 @@ destination:
       type: integer
     uid:
       type: integer
+  batch_size: 1000
 process:
   entity_type: entity_type
   entity_id: entity_id
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_subscriptions.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_subscriptions.yml
index 0b870b63b..51d507c06 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_subscriptions.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_subscriptions.yml
@@ -18,6 +18,7 @@ destination:
       type: string
     uid:
       type: integer
+  batch_size: 1000
 process:
   sid: sid
   uid: uid

From 41861b64f36222b2a5544ea10b6ec75567b5ebc6 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 6 May 2022 02:16:43 +0000
Subject: [PATCH 697/720] [RW-511] Fix migration query when using IDs to
 migrate

---
 .../src/Plugin/migrate/source/EntityBase.php                  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
index 890061a12..bfd3fc714 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
@@ -106,7 +106,9 @@ protected function initializeIterator() {
     }
 
     // If a batch has run the query is already setup.
-    if ($this->batch == 0) {
+    // We also need to have a clean query if we use IDs to migrate because,
+    // otherwise, the ID condition will be merged with the previous one...
+    if ($this->batch == 0 || isset($this->idsToMigrate)) {
       $this->prepareQuery();
     }
 

From e15dd3b4a7ecff50a6f73101e5fc5f1ca6512ed6 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 6 May 2022 04:53:46 +0000
Subject: [PATCH 698/720] [RW-510] Change bookmarks and subscriptions migration
 handlers to migrate delta only

---
 .../src/Plugin/migrate/destination/Table.php  |  33 ++-
 .../src/Plugin/migrate/source/Table.php       | 262 ++++++++++++++++--
 2 files changed, 258 insertions(+), 37 deletions(-)

diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Table.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Table.php
index 075c20f9d..3a2f836e6 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Table.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/Table.php
@@ -2,9 +2,7 @@
 
 namespace Drupal\reliefweb_migrate\Plugin\migrate\destination;
 
-use Drupal\migrate\Event\MigrateImportEvent;
 use Drupal\migrate_plus\Plugin\migrate\destination\Table as TableBase;
-use Drupal\reliefweb_migrate\Plugin\migrate\id_map\AccumulatedSql;
 
 /**
  * Table migration destination.
@@ -15,21 +13,6 @@
  */
 class Table extends TableBase {
 
-  /**
-   * {@inheritdoc}
-   */
-  public function preImport(MigrateImportEvent $event) {
-    // Wipe out the table before inserting the new data. This is much faster
-    // than trying to see what changed.
-    $this->dbConnection->truncate($this->tableName)->execute();
-
-    // Remove the migration mapping.
-    $id_map = $this->migration->getIdMap();
-    if ($id_map instanceof AccumulatedSql) {
-      $id_map->deleteIdMapping();
-    }
-  }
-
   /**
    * Get the IDs from the destination table.
    *
@@ -43,4 +26,20 @@ public function getDestinationIds() {
       ?->fetchAll(\PDO::FETCH_ASSOC) ?? [];
   }
 
+  /**
+   * Delete the following IDs.
+   *
+   * @param array $ids
+   *   Ids to delete.
+   */
+  public function deleteIds(array $ids) {
+    if (!empty($ids)) {
+
+      $this->dbConnection
+        ->delete($this->tableName)
+        ->where("CONCAT_WS('###'," . implode(',', array_keys($this->idFields)) . ") IN ('" . implode("','", $ids) . "')")
+        ->execute();
+    }
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Table.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Table.php
index 75d57c8d7..019f13b88 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Table.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Table.php
@@ -2,7 +2,11 @@
 
 namespace Drupal\reliefweb_migrate\Plugin\migrate\source;
 
+use Drupal\migrate\Event\ImportAwareInterface;
+use Drupal\migrate\Event\MigrateImportEvent;
+use Drupal\migrate\Row;
 use Drupal\migrate_plus\Plugin\migrate\source\Table as TableBase;
+use Drupal\reliefweb_migrate\Plugin\migrate\id_map\AccumulatedSql;
 
 /**
  * Table migration source.
@@ -11,33 +15,162 @@
  *   id = "reliefweb_table"
  * )
  */
-class Table extends TableBase implements SourceMigrationStatusInterface {
+class Table extends TableBase implements SourceMigrationStatusInterface, ImportAwareInterface {
+
+  /**
+   * IDs of the entities to migrate.
+   *
+   * @var array
+   */
+  protected $idsToMigrate;
+
+  /**
+   * Store the list IDs being processed during the current iteration.
+   *
+   * @var array
+   */
+  protected $idsToProcess = [];
+
+  /**
+   * Initialize the batch size.
+   */
+  protected function initializeBatchSize() {
+    if ($this->batchSize == 0 && isset($this->configuration['batch_size'])) {
+      // Valid batch sizes are integers >= 0.
+      if (is_int($this->configuration['batch_size']) && ($this->configuration['batch_size']) >= 0) {
+        $this->batchSize = $this->configuration['batch_size'];
+      }
+      else {
+        throw new MigrateException("batch_size must be greater than or equal to zero");
+      }
+    }
+  }
 
   /**
    * {@inheritdoc}
    */
-  public function getMigrationStatus() {
-    $source_ids = $this->select($this->tableName, 't')
-      ->fields('t', array_keys($this->idFields))
-      ->execute()
-      ?->fetchAll(\PDO::FETCH_ASSOC) ?? [];
+  protected function initializeIterator() {
+    $this->initializeBatchSize();
+    if (empty($this->batchSize)) {
+      return parent::initializeIterator();
+    }
 
-    // We take a huge shortcut there assuming the destination plugin is a
-    // Drupal\reliefweb_migrate\Plugin\migrate\destination\Table.
-    // This works for RW because this source plugin is only used for the
-    // bookmarks and subscriptions where the source and destination tables
-    // have the same ID fields.
-    $destination_ids = $this->migration
-      ->getDestinationPlugin()
-      ->getDestinationIds();
+    // If a batch has run the query is already setup.
+    // We also need to have a clean query if we use IDs to migrate because,
+    // otherwise, the ID condition will be merged with the previous one...
+    if ($this->batch == 0 || isset($this->idsToMigrate)) {
+      $this->prepareQuery();
+    }
 
-    $source_ids = array_map(function ($item) {
-      return implode('###', $item);
-    }, $source_ids);
+    // Initialize the list of IDs to migrate.
+    if (!isset($this->idsToMigrate)) {
+      $this->idsToMigrate = $this->getIdsToMigrate();
 
-    $destination_ids = array_map(function ($item) {
-      return implode('###', $item);
-    }, $destination_ids);
+      \Drupal::logger('migrate')->info(strtr('IDs to migrate: @ids', [
+        '@ids' => count($this->idsToMigrate),
+      ]));
+    }
+
+    // If there are IDs to migrate, then we go through the list.
+    if (!empty($this->idsToMigrate)) {
+      $ids = array_splice($this->idsToMigrate, 0, $this->batchSize);
+      $this->idsToProcess = array_flip($ids);
+
+      $this->query->where("CONCAT_WS('###'," . implode(',', array_keys($this->idFields)) . ") IN ('" . implode("','", $ids) . "')");
+    }
+    else {
+      $this->idsToProcess = [];
+      $this->query->alwaysFalse();
+    }
+
+    // Wrap the query result in an iterator.
+    $statement = $this->query->execute();
+    $statement->setFetchMode(\PDO::FETCH_ASSOC);
+    $iterator = new \IteratorIterator($statement);
+
+    return $iterator;
+  }
+
+  /**
+   * Get the list of entity IDs to migrate.
+   *
+   * @return array
+   *   List of IDs (ex: revision IDs).
+   */
+  protected function getIdsToMigrate() {
+    $source_ids = $this->getSourceIds();
+    $destination_ids = $this->getDestinationIds();
+
+    return array_diff($source_ids, $destination_ids);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function next() {
+    $this->currentSourceIds = NULL;
+    $this->currentRow = NULL;
+
+    // In order to find the next row we want to process, we ask the source
+    // plugin for the next possible row.
+    while (!isset($this->currentRow) && $this->getIterator()->valid()) {
+
+      $row_data = $this->getIterator()->current() + $this->configuration;
+      $row = new Row($row_data, $this->getIds());
+
+      // Populate the source key for this row.
+      $this->currentSourceIds = $row->getSourceIdValues();
+
+      // Pick up the existing map row, if any, unless fetchNextRow() did it.
+      if (!$this->mapRowAdded && ($id_map = $this->idMap->getRowBySource($this->currentSourceIds))) {
+        $row->setIdMap($id_map);
+      }
+
+      // Clear any previous messages for this row before potentially adding
+      // new ones.
+      if (!empty($this->currentSourceIds)) {
+        $this->idMap->delete($this->currentSourceIds, TRUE);
+      }
+
+      // Preparing the row gives source plugins the chance to skip.
+      if ($this->prepareRow($row) !== FALSE) {
+        // Check whether the row needs processing.
+        // 1. This row has not been imported yet.
+        // 2. Explicitly set to update.
+        // 3. The row is newer than the current high-water mark.
+        // 4. If no such property exists then try by checking the hash of the
+        //    row.
+        if (!$row->getIdMap() || $row->needsUpdate() || $this->aboveHighWater($row) || $this->rowChanged($row)) {
+          $this->currentRow = $row->freezeSource();
+        }
+      }
+
+      $this->fetchNextRow();
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function rowChanged(Row $row) {
+    $ids = [];
+    foreach (array_keys($this->idFields) as $id_field) {
+      $ids[] = $row->getSourceProperty($id_field);
+    }
+    $id = implode('###', $ids);
+
+    if (isset($this->idsToProcess[$id])) {
+      return TRUE;
+    }
+    return parent::rowChanged($row);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getMigrationStatus() {
+    $source_ids = $this->getSourceIds();
+    $destination_ids = $this->getDestinationIds();
 
     $total = count($source_ids);
     $imported = count($destination_ids);
@@ -57,4 +190,93 @@ public function getMigrationStatus() {
     ];
   }
 
+  /**
+   * Remove the entities from the D9 site that don't exist in the D7 site.
+   */
+  protected function removeDeletedEntities() {
+    $source_ids = $this->getSourceIds();
+    $destination_ids = $this->getDestinationIds();
+
+    $deleted_ids = array_diff($destination_ids, $source_ids);
+    if (empty($deleted_ids)) {
+      return;
+    }
+
+    $destination_plugin = $this->migration->getDestinationPlugin();
+    $delete_from_id_map = $this->idMap instanceof AccumulatedSql;
+
+    foreach (array_chunk($deleted_ids, 1000) as $ids) {
+      $destination_plugin->deleteIds($ids);
+      if ($delete_from_id_map) {
+        $this->idMap->deleteFromSourceIds($ids);
+      }
+    }
+
+    \Drupal::logger('migrate')->info(strtr('IDs deleted: @ids', [
+      '@ids' => count($deleted_ids),
+    ]));
+  }
+
+  /**
+   * Get the full list of source IDs.
+   *
+   * @return array
+   *   Source IDs.
+   */
+  protected function getSourceIds() {
+    $source_ids = $this->select($this->tableName, 't')
+      ->fields('t', array_keys($this->idFields))
+      ->execute()
+      ?->fetchAll(\PDO::FETCH_ASSOC) ?? [];
+
+    return array_map(function ($item) {
+      return implode('###', $item);
+    }, $source_ids);
+  }
+
+  /**
+   * Get the full list of destination IDs.
+   *
+   * @return array
+   *   Destination IDs.
+   */
+  protected function getDestinationIds() {
+    // We take a huge shortcut there assuming the destination plugin is a
+    // Drupal\reliefweb_migrate\Plugin\migrate\destination\Table.
+    // This works for RW because this source plugin is only used for the
+    // bookmarks and subscriptions where the source and destination tables
+    // have the same ID fields.
+    $destination_ids = $this->migration
+      ->getDestinationPlugin()
+      ->getDestinationIds();
+
+    return array_map(function ($item) {
+      return implode('###', $item);
+    }, $destination_ids);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function preImport(MigrateImportEvent $event) {
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function postImport(MigrateImportEvent $event) {
+    // Just in case, ensure the destination postImport is run before the source
+    // one so that the database has all the entity data.
+    $destination_plugin = $this->migration->getDestinationPlugin();
+    if ($destination_plugin instanceof ImportAwareInterface) {
+      $destination_plugin->postImport($event);
+    }
+
+    if ($this->idMap instanceof AccumulatedSql) {
+      $this->idMap->flushAccumulatedIdMapping();
+    }
+
+    $this->removeDeletedEntities();
+  }
+
 }

From 86add26816cf5db9daa8424e53279c1d36eacf5b Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 6 May 2022 04:56:01 +0000
Subject: [PATCH 699/720] [RW-510] Change url alias migration handler to
 migrate delta only

---
 ...ccumulatedSqlContentEntityStorageTrait.php |  14 +-
 .../migrate/destination/EntityRedirect.php    |  10 -
 .../src/Plugin/migrate/source/EntityBase.php  |   6 +
 .../src/Plugin/migrate/source/UrlAlias.php    | 196 ++++++++++++++++--
 4 files changed, 195 insertions(+), 31 deletions(-)

diff --git a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedSqlContentEntityStorageTrait.php b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedSqlContentEntityStorageTrait.php
index f109a0d6c..020168bf4 100644
--- a/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedSqlContentEntityStorageTrait.php
+++ b/html/modules/custom/reliefweb_migrate/src/Entity/AccumulatedSqlContentEntityStorageTrait.php
@@ -189,16 +189,22 @@ public function doFlushAccumulated() {
 
       // Then insert the new content.
       foreach ($this->accumulator as $table => $entries) {
+        $execute = FALSE;
         $query = $this->database->insert($table);
         foreach ($entries as $rows) {
           foreach ($rows as $row) {
             $row = (array) $row;
-            $this->processRowBeforeInsertion($table, $row);
-            $query->fields(array_keys($row));
-            $query->values(array_values($row));
+            if (!empty($row)) {
+              $this->processRowBeforeInsertion($table, $row);
+              $query->fields(array_keys($row));
+              $query->values(array_values($row));
+              $execute = TRUE;
+            }
           }
         }
-        $query->execute();
+        if ($execute) {
+          $query->execute();
+        }
       }
 
       // Ignore replica server temporarily.
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityRedirect.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityRedirect.php
index 53471c95b..38eb2c7ac 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityRedirect.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityRedirect.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\reliefweb_migrate\Plugin\migrate\destination;
 
-use Drupal\migrate\Event\MigrateImportEvent;
 use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\reliefweb_migrate\Entity\AccumulatedPathAliasStorage;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -43,13 +42,4 @@ public static function create(ContainerInterface $container, array $configuratio
     );
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function preImport(MigrateImportEvent $event) {
-    // Safer to reimport all the redirects as deleting nodes and terms during
-    // their migration may remove some redirects.
-    $this->deleteImported();
-  }
-
 }
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
index bfd3fc714..3895c4e8b 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
@@ -412,15 +412,21 @@ protected function removeDeletedEntities() {
       return;
     }
 
+    $count = 0;
     foreach (array_chunk($ids_list, 1000) as $ids) {
       $ids_to_delete = $this->getDestinationEntityIdsToDelete($ids);
       if (!empty($ids_to_delete)) {
+        $count += count($ids_to_delete);
         foreach ($ids_to_delete as $id) {
           $destination_plugin->rollback([$id]);
         }
         $this->idMap->deleteFromSourceIds($ids_to_delete);
       }
     }
+
+    \Drupal::logger('migrate')->info(strtr('IDs deleted: @ids', [
+      '@ids' => $count,
+    ]));
   }
 
   /**
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/UrlAlias.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/UrlAlias.php
index cfacb6fa3..412b0422a 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/UrlAlias.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/UrlAlias.php
@@ -3,6 +3,7 @@
 namespace Drupal\reliefweb_migrate\Plugin\migrate\source;
 
 use Drupal\migrate\Row;
+use Drupal\reliefweb_migrate\Plugin\migrate\id_map\AccumulatedSql;
 
 /**
  * Retrieve url aliases from the Drupal 7 database.
@@ -18,25 +19,95 @@ class UrlAlias extends EntityBase {
    */
   protected $idField = 'pid';
 
+  /**
+   * Store the source entity IDs.
+   *
+   * @var array
+   */
+  protected $sourceEntityIds;
+
   /**
    * {@inheritdoc}
    */
-  public function query() {
-    $subquery = $this->select('url_alias', 'ua2');
-    $subquery->addField('ua2', 'source', 'source');
-    $subquery->addExpression('MAX(ua2.pid)', 'pid');
-    $subquery->groupBy('ua2.source');
-    $subquery->having('COUNT(ua2.pid) > 1');
+  protected function initializeIterator() {
+    $this->initializeBatchSize();
+    if (empty($this->batchSize)) {
+      return parent::initializeIterator();
+    }
+
+    // If a batch has run the query is already setup.
+    // We also need to have a clean query if we use IDs to migrate because,
+    // otherwise, the ID condition will be merged with the previous one...
+    if ($this->batch == 0 || isset($this->idsToMigrate)) {
+      $this->prepareQuery();
+    }
+
+    // Initialize the list of IDs to migrate.
+    if (!isset($this->idsToMigrate)) {
+      $this->idsToMigrate = $this->getIdsToMigrate();
+
+      \Drupal::logger('migrate')->info(strtr('IDs to migrate: @ids', [
+        '@ids' => count($this->idsToMigrate),
+      ]));
+    }
+
+    // If there are IDs to migrate, then we go through the list.
+    if (!empty($this->idsToMigrate)) {
+      $ids = array_splice($this->idsToMigrate, 0, $this->batchSize);
+      $this->idsToProcess = array_flip($ids);
+
+      // @see ::query() for the condition field.
+      $this->query->condition('ua.pid', $ids, 'IN');
+    }
+    else {
+      $this->idsToProcess = [];
+      $this->query->alwaysFalse();
+    }
+
+    // Wrap the query result in an iterator.
+    $statement = $this->query->execute();
+    $statement->setFetchMode(\PDO::FETCH_ASSOC);
+    $iterator = new \IteratorIterator($statement);
 
+    // Preload the ID mapping and the list of migrated entities for the results.
+    $this->preloadIdMapping($iterator);
+    $this->preloadExisting($iterator);
+
+    // Rewind the iterator just in case.
+    $iterator->rewind();
+
+    return $iterator;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function rowChanged(Row $row) {
+    $id = $row->getSourceProperty('pid');
+    if (isset($this->idsToProcess[$id])) {
+      return TRUE;
+    }
+    return parent::rowChanged($row);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function query() {
     $query = $this->select('url_alias', 'ua');
     $query->fields('ua', ['pid', 'source', 'alias']);
-    $query->innerJoin($subquery, 'sq', 'ua.source  = %alias.source AND ua.pid <> %alias.pid');
     $query->orderBy('ua.pid', 'ASC');
-    $query->groupBy('ua.alias');
 
     return $query;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function doCount() {
+    return count($this->getSourceEntityIds());
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -52,6 +123,81 @@ protected function doPreloadExisting(array $ids) {
     return [];
   }
 
+  /**
+   * Get the list of source ids that can be imported.
+   *
+   * @return array
+   *   Associative array keyed by revision ids if available, otherwise keyed by
+   *   entity ids and with the entity ids as values.
+   */
+  protected function getSourceEntityIds() {
+    // The query to get the url aliases is slow so we store the result.
+    if (isset($this->sourceEntityIds)) {
+      return $this->sourceEntityIds;
+    }
+
+    $subquery = $this->select('url_alias', 'ua2');
+    $subquery->addField('ua2', 'source', 'source');
+    $subquery->addExpression('MAX(ua2.pid)', 'pid');
+    $subquery->groupBy('ua2.source');
+    $subquery->having('COUNT(ua2.pid) > 1');
+
+    $query = $this->select('url_alias', 'ua');
+    $query->fields('ua', ['pid', 'source', 'alias']);
+    $query->innerJoin($subquery, 'sq', 'ua.source  = %alias.source AND ua.pid <> %alias.pid');
+    $query->orderBy('ua.pid', 'ASC');
+    $query->groupBy('ua.alias');
+
+    // ID and revision fields.
+    $id_fields = [$this->idField => TRUE];
+    if (isset($this->revisionIdField)) {
+      $id_fields[$this->revisionIdField] = TRUE;
+    }
+
+    // Get the fields used for grouping. We need to preserve them.
+    $group_by = $query->getGroupBy();
+
+    // Remove all the unnecessary fields.
+    $fields = &$query->getFields();
+    foreach ($fields as $alias => $field) {
+      $table_and_field = $field['table'] . '.' . $field['field'];
+
+      if (isset($id_fields[$field['field']])) {
+        $id_fields[$field['field']] = $alias;
+      }
+      elseif (!isset($group_by[$alias]) && !isset($group_by[$table_and_field])) {
+        unset($fields[$alias]);
+      }
+    }
+
+    // No need to sort.
+    $order = &$query->getOrderBy();
+    $order = [];
+
+    $records = $query->execute() ?? [];
+
+    $ids = [];
+    foreach ($records as $record) {
+      $id = $record[$this->idField];
+      if (isset($this->revisionIdField)) {
+        $revision_id = $record[$this->revisionIdField];
+        if (empty($this->useRevisionId)) {
+          $ids[$revision_id] = $id;
+        }
+        else {
+          $ids[$revision_id] = $revision_id;
+        }
+      }
+      else {
+        $ids[$id] = $id;
+      }
+    }
+
+    $this->sourceEntityIds = $ids;
+
+    return $ids;
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -68,21 +214,37 @@ protected function getDestinationEntityIds() {
    * {@inheritdoc}
    */
   protected function getDestinationEntityIdsToDelete(array $ids) {
-    if (!empty($ids)) {
-      return array_diff($ids, $this->select('url_alias', 'ua')
-        ->fields('ua', ['pid'])
-        ->condition('ua.pid', $ids, 'IN')
-        ->execute()
-        ?->fetchCol() ?? []);
-    }
+    // Not used. See ::removeDeletedEntities().
     return [];
   }
 
   /**
-   * Remove the entities from the D9 site that don't exist in the D7 site.
+   * {@inheritdoc}
    */
   protected function removeDeletedEntities() {
-    // Skip because, we do a full re-import when running this migration.
+    $source_ids = $this->getSourceEntityIds();
+    $destination_ids = $this->getDestinationEntityIds();
+
+    $deleted_ids = array_diff($destination_ids, $source_ids);
+    if (empty($deleted_ids)) {
+      return;
+    }
+
+    $destination_plugin = $this->migration->getDestinationPlugin();
+    $delete_from_id_map = $this->idMap instanceof AccumulatedSql;
+
+    foreach (array_chunk($deleted_ids, 1000) as $ids) {
+      foreach ($ids as $id) {
+        $destination_plugin->rollback([$id]);
+      }
+      if ($delete_from_id_map) {
+        $this->idMap->deleteFromSourceIds($ids);
+      }
+    }
+
+    \Drupal::logger('migrate')->info(strtr('IDs deleted: @ids', [
+      '@ids' => count($deleted_ids),
+    ]));
   }
 
   /**

From 50aa054ef43a91d8f373deabea60326cd82a898b Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 6 May 2022 08:54:25 +0000
Subject: [PATCH 700/720] [RW-511] Change users migration handler to migrate
 the delta only

---
 .../Plugin/migrate/destination/EntityUser.php |  15 --
 .../src/Plugin/migrate/source/User.php        | 171 ++++++++++++++++--
 2 files changed, 151 insertions(+), 35 deletions(-)

diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityUser.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityUser.php
index e9e8516fa..54ba9876d 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityUser.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/destination/EntityUser.php
@@ -2,8 +2,6 @@
 
 namespace Drupal\reliefweb_migrate\Plugin\migrate\destination;
 
-use Drupal\migrate\Event\MigrateImportEvent;
-
 /**
  * Entity migration destination.
  *
@@ -13,17 +11,4 @@
  */
 class EntityUser extends Entity {
 
-  /**
-   * {@inheritdoc}
-   */
-  public function preImport(MigrateImportEvent $event) {
-    // We don't have an easy way to detect changes made to user entities and
-    // updating or rolling back is really slow and has unwanted consequences
-    // due to some entity hooks. So we "simply" delete all the users from the
-    // database and re-import everything.
-    if (!empty($this->configuration['delete_before_import'])) {
-      $this->deleteImported();
-    }
-  }
-
 }
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php
index eb3058922..34e60bd35 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php
@@ -13,11 +13,99 @@
  */
 class User extends EntityBase {
 
+  /**
+   * Store the source entity IDs.
+   *
+   * @var array
+   */
+  protected $sourceEntityIds;
+
   /**
    * {@inheritdoc}
    */
   protected $idField = 'uid';
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function initializeIterator() {
+    $this->initializeBatchSize();
+    if (empty($this->batchSize)) {
+      return parent::initializeIterator();
+    }
+
+    // If a batch has run the query is already setup.
+    // We also need to have a clean query if we use IDs to migrate because,
+    // otherwise, the ID condition will be merged with the previous one...
+    if ($this->batch == 0 || isset($this->idsToMigrate)) {
+      $this->prepareQuery();
+    }
+
+    // Initialize the list of IDs to migrate.
+    if (!isset($this->idsToMigrate)) {
+      $this->idsToMigrate = $this->getIdsToMigrate();
+
+      \Drupal::logger('migrate')->info(strtr('IDs to migrate: @ids', [
+        '@ids' => count($this->idsToMigrate),
+      ]));
+    }
+
+    // If there are IDs to migrate, then we go through the list.
+    if (!empty($this->idsToMigrate)) {
+      $ids = array_splice($this->idsToMigrate, 0, $this->batchSize);
+      $this->idsToProcess = array_flip($ids);
+
+      $this->query->condition('u.uid', $ids, 'IN');
+    }
+    else {
+      $this->idsToProcess = [];
+      $this->query->alwaysFalse();
+    }
+
+    // Wrap the query result in an iterator.
+    $statement = $this->query->execute();
+    $statement->setFetchMode(\PDO::FETCH_ASSOC);
+    $iterator = new \IteratorIterator($statement);
+
+    // Preload the ID mapping and the list of migrated entities for the results.
+    $this->preloadIdMapping($iterator);
+    $this->preloadExisting($iterator);
+
+    // Rewind the iterator just in case.
+    $iterator->rewind();
+
+    return $iterator;
+  }
+
+  /**
+   * Get the list of entity IDs to migrate.
+   *
+   * @return array
+   *   List of IDs (ex: revision IDs).
+   */
+  protected function getIdsToMigrate() {
+    $destination_ids = $this->getDestinationEntityIds();
+    $source_ids = $this->getSourceEntityIds();
+    $imported_ids = array_intersect($destination_ids, $source_ids);
+    $updated_ids = array_diff_assoc($imported_ids, $source_ids);
+    $new_ids = array_diff($source_ids, $imported_ids);
+    // We need the user ID not the UID + changed combination.
+    $ids = array_values($new_ids + $updated_ids);
+    sort($ids);
+    return $ids;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function rowChanged(Row $row) {
+    $id = $row->getSourceProperty('uid');
+    if (isset($this->idsToProcess[$id])) {
+      return TRUE;
+    }
+    return parent::rowChanged($row);
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -49,6 +137,49 @@ public function query() {
     ]);
     $query->addField('fn', 'field_notes_value', 'notes');
 
+    return $query->orderBy('u.uid', 'ASC');
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function doCount() {
+    return count($this->getSourceEntityIds());
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function doPreloadExisting(array $ids) {
+    if (!empty($ids)) {
+      return $this->getDatabaseConnection()
+        ->select('users', 'u')
+        ->fields('u', ['uid'])
+        ->condition('u.uid', $ids, 'IN')
+        ->execute()
+        ?->fetchCol() ?? [];
+    }
+    return [];
+  }
+
+  /**
+   * Get the list of source ids that can be imported.
+   *
+   * @return array
+   *   Associative array keyed by revision ids if available, otherwise keyed by
+   *   entity ids and with the entity ids as values.
+   */
+  protected function getSourceEntityIds() {
+    // The query to get the url aliases is slow so we store the result.
+    if (isset($this->sourceEntityIds)) {
+      return $this->sourceEntityIds;
+    }
+
+    $query = $this->select('users', 'u')
+      ->fields('u', ['uid', 'changed'])
+      // Skip the anonymous and admin users.
+      ->condition('u.uid', 1, '>');
+
     // Get the users who posted content, have favorites or subscriptions.
     $subquery = $this->select('node', 'n')
       ->fields('n', ['uid'])
@@ -71,36 +202,36 @@ public function query() {
 
     $query->innerJoin($subquery, 'subquery', 'subquery.uid = u.uid');
 
-    return $query->orderBy('u.uid', 'ASC');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function doPreloadExisting(array $ids) {
-    if (!empty($ids)) {
-      return $this->getDatabaseConnection()
-        ->select('users', 'u')
-        ->fields('u', ['uid'])
-        ->condition('u.uid', $ids, 'IN')
-        ->execute()
-        ?->fetchCol() ?? [];
+    $ids = [];
+    foreach ($query->execute() ?? [] as $record) {
+      // The combination uid + changed acts as a revision ID in order to
+      // determine differences with the migrated content.
+      $ids[$record['uid'] . '###' . $record['changed']] = $record['uid'];
     }
-    return [];
+
+    asort($ids);
+
+    $this->sourceEntityIds = $ids;
+
+    return $ids;
   }
 
   /**
    * {@inheritdoc}
    */
   protected function getDestinationEntityIds() {
-    return $this->getDatabaseConnection()
-      ->select('users', 'u')
-      ->fields('u', ['uid'])
+    $records = $this->getDatabaseConnection()
+      ->select('users_field_data', 'u')
+      ->fields('u', ['uid', 'changed'])
       // Skip the anonymous, admin and system users.
       ->condition('u.uid', 2, '>')
       ->orderBy('u.uid', 'ASC')
-      ->execute()
-      ?->fetchAllKeyed(0, 0) ?? [];
+      ->execute() ?? [];
+    $ids = [];
+    foreach ($records as $record) {
+      $ids[$record->uid . '###' . $record->changed] = $record->uid;
+    }
+    return $ids;
   }
 
   /**

From b582f8930b8caffb869b65450c8edc9ca78d968b Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 6 May 2022 09:42:07 +0000
Subject: [PATCH 701/720] [RW-511] Add option to set the high water to the
 latest imported ID

---
 .../src/Commands/ReliefWebMigrateCommands.php |  7 +++-
 .../src/Plugin/migrate/source/EntityBase.php  | 34 ++++++++++++-----
 .../SourceMigrationHighWaterInterface.php     |  4 +-
 .../src/Plugin/migrate/source/User.php        | 37 +++++++++++++++++++
 4 files changed, 71 insertions(+), 11 deletions(-)

diff --git a/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php b/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
index f9f0c6171..1b21436fe 100644
--- a/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
+++ b/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
@@ -528,11 +528,14 @@ protected function downloadFile($source, $destination) {
    * @option tag Name of the migration tag to list
    * @option check-only Calculate the ID to use for the high water but don't
    * change it yet.
+   * @option set-to-max Set the high water to the max ID of the imported
+   * content.
    *
    * @default $options [
    *   'group' => '',
    *   'tag' => '',
    *   'check-only' => FALSE,
+   *   'set-to-max' => FALSE,
    * ]
    *
    * @usage rw-migrate:reset-high-water
@@ -552,9 +555,11 @@ public function resetHighWater($migration_names = '', array $options = [
     'group' => '',
     'tag' => '',
     'check-only' => FALSE,
+    'set-to-max' => FALSE,
   ]) {
     $migrations = $this->migrationsList($migration_names, $options);
     $check_only = !empty($options['check-only']);
+    $set_to_max = !empty($options['set-to-max']);
 
     // Take it one group at a time, listing the migrations within each group.
     foreach ($migrations as $migration_list) {
@@ -562,7 +567,7 @@ public function resetHighWater($migration_names = '', array $options = [
         $source_plugin = $migration->getSourcePlugin();
 
         if ($source_plugin instanceof SourceMigrationHighWaterInterface) {
-          $id = $source_plugin->setHighWaterToLatestNonImported($check_only);
+          $id = $source_plugin->setHighWaterToLatestNonImported($check_only, $set_to_max);
           $this->logger->info(strtr('Set high water to @id for @migration.', [
             '@id' => $id,
             '@migration' => $migration_id,
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
index 3895c4e8b..da827e25a 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
@@ -383,20 +383,36 @@ public function resetHighWater() {
   /**
    * {@inheritdoc}
    */
-  public function setHighWaterToLatestNonImported($check_only = FALSE) {
+  public function setHighWaterToLatestNonImported($check_only = FALSE, $set_to_max = FALSE) {
     $destination_ids = $this->getDestinationEntityIds();
-    $source_ids = $this->getSourceEntityIds();
-    $imported_ids = array_intersect($destination_ids, $source_ids);
-    $updated_ids = array_diff_assoc($imported_ids, $source_ids);
-    $new_ids = array_diff($source_ids, $imported_ids);
-    $ids = array_keys($new_ids + $updated_ids);
 
-    if ($check_only) {
-      return empty($ids) ? 0 : min($ids);
+    if ($set_to_max) {
+      $ids = array_keys($destination_ids);
+    }
+    else {
+      $source_ids = $this->getSourceEntityIds();
+      $imported_ids = array_intersect($destination_ids, $source_ids);
+      $updated_ids = array_diff_assoc($imported_ids, $source_ids);
+      $new_ids = array_diff($source_ids, $imported_ids);
+      $ids = array_keys($new_ids + $updated_ids);
     }
 
+    $id = NULL;
     if (!empty($ids)) {
-      $this->getHighWaterStorage()->set($this->migration->id(), min($ids) - 1);
+      $id = $set_to_max ? max($ids) : min($ids) - 1;
+    }
+
+    if ($check_only) {
+      print_r([
+        $this->migration->id() => [
+          'old' => $this->getHighWater(),
+          'new' => $id,
+        ],
+      ]);
+      return $id;
+    }
+    elseif (isset($id)) {
+      $this->getHighWaterStorage()->set($this->migration->id(), $id);
     }
     return $this->getHighWater();
   }
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/SourceMigrationHighWaterInterface.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/SourceMigrationHighWaterInterface.php
index d4f49cb60..d8bf9721d 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/SourceMigrationHighWaterInterface.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/SourceMigrationHighWaterInterface.php
@@ -15,10 +15,12 @@ interface SourceMigrationHighWaterInterface {
    *
    * @param bool $check_only
    *   If TRUE, do not update the high water.
+   * @param bool $set_to_max
+   *   Set the high water to the max ID of the imported content.
    *
    * @return int
    *   The latest imported ID for the migration.
    */
-  public function setHighWaterToLatestNonImported($check_only = FALSE);
+  public function setHighWaterToLatestNonImported($check_only = FALSE, $set_to_max = FALSE);
 
 }
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php
index 34e60bd35..80cec9c4f 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php
@@ -248,6 +248,43 @@ protected function getDestinationEntityIdsToDelete(array $ids) {
     return [];
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function setHighWaterToLatestNonImported($check_only = FALSE, $set_to_max = FALSE) {
+    $destination_ids = $this->getDestinationEntityIds();
+
+    if ($set_to_max) {
+      $ids = array_values($destination_ids);
+    }
+    else {
+      $source_ids = $this->getSourceEntityIds();
+      $imported_ids = array_intersect($destination_ids, $source_ids);
+      $updated_ids = array_diff_assoc($imported_ids, $source_ids);
+      $new_ids = array_diff($source_ids, $imported_ids);
+      $ids = array_values($new_ids + $updated_ids);
+    }
+
+    $id = NULL;
+    if (!empty($ids)) {
+      $id = $set_to_max ? max($ids) : min($ids) - 1;
+    }
+
+    if ($check_only) {
+      print_r([
+        $this->migration->id() => [
+          'old' => $this->getHighWater(),
+          'new' => $id,
+        ],
+      ]);
+      return $id;
+    }
+    elseif (isset($id)) {
+      $this->getHighWaterStorage()->set($this->migration->id(), $id);
+    }
+    return $this->getHighWater();
+  }
+
   /**
    * {@inheritdoc}
    */

From e075ffa84c7198f627035dbf97194547c0668d9c Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 6 May 2022 11:38:52 +0000
Subject: [PATCH 702/720] [RW-510] Use proper ID field for migration

---
 .../src/Plugin/migrate/source/EntityBase.php  | 58 ++++++++++++++++---
 .../src/Plugin/migrate/source/User.php        |  2 +-
 2 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
index da827e25a..a4aa66626 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/EntityBase.php
@@ -3,6 +3,7 @@
 namespace Drupal\reliefweb_migrate\Plugin\migrate\source;
 
 use Drupal\Core\Database\Database;
+use Drupal\Core\Database\Query\Select;
 use Drupal\migrate\Event\ImportAwareInterface;
 use Drupal\migrate\Event\MigrateImportEvent;
 use Drupal\migrate\Event\MigrateRollbackEvent;
@@ -131,7 +132,15 @@ protected function initializeIterator() {
         $ids = array_splice($this->idsToMigrate, 0, $this->batchSize);
         $this->idsToProcess = array_flip($ids);
 
-        $this->query->condition($high_water_field, $ids, 'IN');
+        $table_alias = $this->getQueryBaseTableAlias($this->query);
+
+        // @see ::getSourceEntityIds()
+        if (!empty($this->revisionIdField) && !empty($this->useRevisionId)) {
+          $this->query->condition($table_alias . '.' . $this->revisionIdField, $ids, 'IN');
+        }
+        else {
+          $this->query->condition($table_alias . '.' . $this->idField, $ids, 'IN');
+        }
       }
       // Otherwise we check against the high water, which allows for example to
       // re-import existing content (for tests etc.) by changing the high water
@@ -168,6 +177,28 @@ protected function initializeIterator() {
     return $iterator;
   }
 
+  /**
+   * Get the base table name for a select query.
+   *
+   * The first table without a join type is the base table.
+   *
+   * @param \Drupal\Core\Database\Query\Select $query
+   *   Query.
+   *
+   * @return string
+   *   Base table alias.
+   *
+   * @see \Drupal\Core\Database\Query\Select::__construct()
+   */
+  protected function getQueryBaseTableAlias(Select $query) {
+    foreach ($query->getTables() as $alias => $info) {
+      if (!isset($info['join type'])) {
+        return $alias;
+      }
+    }
+    return '';
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -222,11 +253,16 @@ public function next() {
    * {@inheritdoc}
    */
   protected function rowChanged(Row $row) {
-    if (!empty($this->highWaterProperty['name'])) {
-      $id = $row->getSourceProperty($this->highWaterProperty['name']);
-      if (isset($this->idsToProcess[$id])) {
-        return TRUE;
-      }
+    // @see ::getSourceEntityIds()
+    if (!empty($this->revisionIdField) && !empty($this->useRevisionId)) {
+      $id = $row->getSourceProperty($this->revisionIdField);
+    }
+    else {
+      $id = $row->getSourceProperty($this->idField);
+    }
+
+    if (isset($this->idsToProcess[$id])) {
+      return TRUE;
     }
     return parent::rowChanged($row);
   }
@@ -482,7 +518,15 @@ protected function getIdsToMigrate() {
     $imported_ids = array_intersect($destination_ids, $source_ids);
     $updated_ids = array_diff_assoc($imported_ids, $source_ids);
     $new_ids = array_diff($source_ids, $imported_ids);
-    $ids = array_keys($new_ids + $updated_ids);
+
+    // @see ::getSourceEntityIds().
+    if (!empty($this->revisionIdField) && !empty($this->useRevisionId)) {
+      $ids = array_keys($new_ids + $updated_ids);
+    }
+    else {
+      $ids = array_unique($new_ids + $updated_ids);
+    }
+
     sort($ids);
     return $ids;
   }
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php
index 80cec9c4f..ccbe97e46 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php
@@ -90,7 +90,7 @@ protected function getIdsToMigrate() {
     $updated_ids = array_diff_assoc($imported_ids, $source_ids);
     $new_ids = array_diff($source_ids, $imported_ids);
     // We need the user ID not the UID + changed combination.
-    $ids = array_values($new_ids + $updated_ids);
+    $ids = array_unique($new_ids + $updated_ids);
     sort($ids);
     return $ids;
   }

From 9e4e87816969a21927b0f279eee42adff2689ea5 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 9 May 2022 03:19:08 +0000
Subject: [PATCH 703/720] [RW-515] Add command to generate symlinks for legacy
 preview images that cannot be derived from the PDF uri

---
 .../src/Commands/ReliefWebFilesCommands.php   | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)

diff --git a/html/modules/custom/reliefweb_files/src/Commands/ReliefWebFilesCommands.php b/html/modules/custom/reliefweb_files/src/Commands/ReliefWebFilesCommands.php
index 9f9ee7ed9..1eb3dfb53 100644
--- a/html/modules/custom/reliefweb_files/src/Commands/ReliefWebFilesCommands.php
+++ b/html/modules/custom/reliefweb_files/src/Commands/ReliefWebFilesCommands.php
@@ -818,4 +818,82 @@ public function fixMigration() {
     }
   }
 
+  /**
+   * Fix migration of the report attachments.
+   *
+   * This generates symlinks to handle files where the filename differs from
+   * the URI basename. For those files, the nginx redirection logic for the
+   * previews cannot work. So we generate symlinks with the filename resulting
+   * from the nginx logic to the acutal preview file.
+   *
+   * Ex: public://file1.pdf with filename file1_compressed.pdf.
+   *
+   * @command rw-files:generate-redirection-symlinks
+   *
+   * @usage rw-files:generate-redirection-symlinks
+   *   Generate the symlinks
+   *
+   * @validate-module-enabled reliefweb_files
+   */
+  public function generateRedirectionSymlinks() {
+    $d7_database = Database::getConnection('default', 'rwint7');
+    $query = $d7_database->select('file_managed', 'fm');
+    $query->fields('fm', ['fid', 'uri']);
+    $query->innerJoin('field_data_field_file', 'f', 'f.field_file_fid = fm.fid');
+    $query->where("f.field_file_description REGEXP :regexp", [
+      ':regexp' => '[|][1-9][0-9]*[|](0|90|-90)$',
+    ]);
+    $query->where("(fm.filemime = 'application/pdf' OR LOWER(RIGHT(fm.uri,3)) = 'pdf')");
+    $query->where("fm.uri <> CONCAT('public://resources/', fm.filename)");
+    $query->groupBy('fm.fid');
+    $records = $query->execute()?->fetchAll() ?? [];
+
+    if (empty($records)) {
+      $this->logger()->info(dt('No symlinks to create'));
+      return;
+    }
+
+    // phpcs:ignore
+    $file_system = \Drupal::service('file_system');
+    $base_path = rtrim($file_system->realpath('public://'), '/') . '/legacy-previews';
+
+    // Create the legacy preview directory.
+    if (!$file_system->prepareDirectory($base_path, $file_system::CREATE_DIRECTORY)) {
+      $this->logger()->error(dt('Unable to create @directory', [
+        '@directory' => $base_path,
+      ]));
+      return;
+    }
+
+    // Create symlinks for the previews and their derivatives.
+    $count_new = 0;
+    $count_existing = 0;
+    foreach ($records as $record) {
+      $uuid = LegacyHelper::generateAttachmentUuid($record->uri);
+      $target = '../previews/' . substr($uuid, 0, 2) . '/' . substr($uuid, 2, 2) . '/' . $uuid . '.png';
+      $link = $base_path . '/' . $record->fid . '.png';
+
+      if (!is_link($link)) {
+        if (!@symlink($target, $link)) {
+          $this->logger()->error(dt('Unable to create symlink: @link => @target', [
+            '@link' => $link,
+            '@target' => $target,
+          ]));
+        }
+        else {
+          $count_new++;
+        }
+      }
+      else {
+        $count_existing++;
+      }
+    }
+
+    $this->logger()->info(dt('Successfully created new @new symlinks (@existing already exsting) for @total files', [
+      '@new' => $count_new,
+      '@existing' => $count_existing,
+      '@total' => count($records),
+    ]));
+  }
+
 }

From 5c24029001201382e7376fdbdef60d879aa0839f Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Mon, 9 May 2022 03:20:30 +0000
Subject: [PATCH 704/720] [RW-515] Check legacy preview symlink when
 redirecting

---
 .../custom/01_legacy_file_redirections.conf   |  9 +++-
 .../lua/01_legacy_attachment_redirections.lua |  2 +-
 ...legacy_preview_derivative_redirections.lua | 49 ++++++++++++-------
 .../lua/01_legacy_preview_redirections.lua    | 45 +++++++++++------
 4 files changed, 70 insertions(+), 35 deletions(-)

diff --git a/docker/etc/nginx/custom/01_legacy_file_redirections.conf b/docker/etc/nginx/custom/01_legacy_file_redirections.conf
index 002905a16..b58be3585 100644
--- a/docker/etc/nginx/custom/01_legacy_file_redirections.conf
+++ b/docker/etc/nginx/custom/01_legacy_file_redirections.conf
@@ -131,12 +131,12 @@ location /@legacy-files {
   }
 
   ## Handle legacy preview redirections.
-  location ~ "^/@legacy-files/resources-pdf-previews/[0-9]+-(?<image_file>[^/]+).png$" {
+  location ~ "^/@legacy-files/resources-pdf-previews/(?<file_id>[0-9]+)-(?<image_file>[^/]+).png$" {
     rewrite_by_lua_file /etc/nginx/custom/lua/01_legacy_preview_redirections.lua;
   }
 
   ## Handle legacy preview derivative redirections.
-  location ~ "^/@legacy-files/styles/(?<image_style>[^/]+)/public/resources-pdf-previews/[0-9]+-(?<image_file>[^/]+).png$" {
+  location ~ "^/@legacy-files/styles/(?<image_style>[^/]+)/public/resources-pdf-previews/(?<file_id>[0-9]+)-(?<image_file>[^/]+).png$" {
     rewrite_by_lua_file /etc/nginx/custom/lua/01_legacy_preview_derivative_redirections.lua;
   }
 
@@ -152,3 +152,8 @@ location /@legacy-files {
 
   return 404;
 }
+
+## No direct access to legacy previews.
+location /legacy-previews {
+  return 404;
+}
diff --git a/docker/etc/nginx/custom/lua/01_legacy_attachment_redirections.lua b/docker/etc/nginx/custom/lua/01_legacy_attachment_redirections.lua
index e82fae506..76ba3766c 100644
--- a/docker/etc/nginx/custom/lua/01_legacy_attachment_redirections.lua
+++ b/docker/etc/nginx/custom/lua/01_legacy_attachment_redirections.lua
@@ -4,7 +4,7 @@ local attachment_file = ngx.var.attachment_file
 -- in \Drupal\reliefeb_utility\Helpers\LegacyHelper::getAttachmentUuid().
 
 -- Strip the % characters.
-attachment_file = string.gsub(attachment_file, "%%", "")
+attachment_file = string.gsub(attachment_file, "%%", '')
 
 -- Consolidate the URL.
 local legacy_url = 'https://reliefweb.int/sites/reliefweb.int/files/resources/' .. attachment_file
diff --git a/docker/etc/nginx/custom/lua/01_legacy_preview_derivative_redirections.lua b/docker/etc/nginx/custom/lua/01_legacy_preview_derivative_redirections.lua
index 5b9d28e2c..c3b862e87 100644
--- a/docker/etc/nginx/custom/lua/01_legacy_preview_derivative_redirections.lua
+++ b/docker/etc/nginx/custom/lua/01_legacy_preview_derivative_redirections.lua
@@ -26,23 +26,38 @@ if style_mapping[image_style] == nil then
   ngx.exit(404)
 end
 
--- The generation of the UUID from the legacy URL is similar to what is done
--- in \Drupal\reliefeb_utility\Helpers\LegacyHelper::getAttachmentUuid().
-
--- Strip the % characters.
-image_file = string.gsub(image_file, "%%", "")
-
--- Handle cases where the orginal file's extension is "PDF" instead of "pdf".
-if string.sub(image_file, -4) ~= ".PDF" then
-  image_file = image_file .. '.pdf'
+-- Try to get the preview from a potential symlink.
+-- Some legacy preview file names cannot be derived from the PDF file name, in
+-- that case there should be a symlink pointing to the new preview.
+local symlink = ngx.var.document_root .. '/sites/default/files/legacy-previews/' .. ngx.var.file_id .. '.' .. image_ext;
+local handle = io.popen('readlink "' .. symlink .. '"')
+local target = handle:read()
+handle:close()
+
+-- If there was no symlink then we generated the target based on the filename.
+if target == nil or target == '' then
+  -- The generation of the UUID from the legacy URL is similar to what is done
+  -- in \Drupal\reliefeb_utility\Helpers\LegacyHelper::getAttachmentUuid().
+
+  -- Strip the % characters.
+  image_file = string.gsub(image_file, "%%", '')
+
+  -- Handle cases where the orginal file's extension is "PDF" instead of "pdf".
+  if string.sub(image_file, -4) ~= '.PDF' then
+    image_file = image_file .. '.pdf'
+  end
+
+  -- Generate the legacy URL of the PDF file associated with the preview.
+  local legacy_url = 'https://reliefweb.int/sites/reliefweb.int/files/resources/' .. image_file
+
+  -- Generate the UUID corresponding to the URL of the original image.
+  local jit_uuid = require 'resty.jit-uuid'
+  local uuid = jit_uuid.generate_v3('6ba7b811-9dad-11d1-80b4-00c04fd430c8', legacy_url)
+
+  target = uuid:sub(1, 2) .. '/' .. uuid:sub(3, 4) .. '/' .. uuid .. '.' .. image_ext
+else
+  target = string.gsub(target, '../previews/', '')
 end
 
--- Generate the legacy URL of the PDF file associated with the preview.
-local legacy_url = 'https://reliefweb.int/sites/reliefweb.int/files/resources/' .. image_file
-
--- Generate the UUID corresponding to the URL of the original image.
-local jit_uuid = require 'resty.jit-uuid'
-local uuid = jit_uuid.generate_v3('6ba7b811-9dad-11d1-80b4-00c04fd430c8', legacy_url)
-
 -- Redirect to the new URL.
-return ngx.redirect('/sites/default/files/styles/' .. style_mapping[image_style] .. '/public/previews/' .. uuid:sub(1, 2) .. '/' .. uuid:sub(3, 4) .. '/' .. uuid .. '.' .. image_ext, 301)
+return ngx.redirect('/sites/default/files/styles/' .. style_mapping[image_style] .. '/public/previews/' .. target, 301)
diff --git a/docker/etc/nginx/custom/lua/01_legacy_preview_redirections.lua b/docker/etc/nginx/custom/lua/01_legacy_preview_redirections.lua
index bd59fa0f0..5358641b4 100644
--- a/docker/etc/nginx/custom/lua/01_legacy_preview_redirections.lua
+++ b/docker/etc/nginx/custom/lua/01_legacy_preview_redirections.lua
@@ -1,24 +1,39 @@
 local image_file = ngx.var.image_file
 local image_ext = 'png'
 
--- The generation of the UUID from the legacy URL is similar to what is done
--- in \Drupal\reliefeb_utility\Helpers\LegacyHelper::getAttachmentUuid().
+-- Try to get the preview from a potential symlink.
+-- Some legacy preview file names cannot be derived from the PDF file name, in
+-- that case there should be a symlink pointing to the new preview.
+local symlink = ngx.var.document_root .. '/sites/default/files/legacy-previews/' .. ngx.var.file_id .. '.' .. image_ext;
+local handle = io.popen('readlink "' .. symlink .. '"')
+local target = handle:read()
+handle:close()
 
--- Strip the % characters.
-image_file = string.gsub(image_file, "%%", "")
+-- If there was no symlink then we generated the target based on the filename.
+if target == nil or target == '' then
+  -- The generation of the UUID from the legacy URL is similar to what is done
+  -- in \Drupal\reliefeb_utility\Helpers\LegacyHelper::getAttachmentUuid().
 
--- Handle cases where the orginal file's extension is "PDF" instead of "pdf".
--- When that's the case, the extension is preserved in the filename
-if string.sub(image_file, -4) ~= ".PDF" then
-  image_file = image_file .. '.pdf'
-end
+  -- Strip the % characters.
+  image_file = string.gsub(image_file, "%%", '')
+
+  -- Handle cases where the orginal file's extension is "PDF" instead of "pdf".
+  -- When that's the case, the extension is preserved in the filename
+  if string.sub(image_file, -4) ~= '.PDF' then
+    image_file = image_file .. '.pdf'
+  end
 
--- Generate the legacy URL of the PDF file associated with the preview.
-local legacy_url = 'https://reliefweb.int/sites/reliefweb.int/files/resources/' .. image_file
+  -- Generate the legacy URL of the PDF file associated with the preview.
+  local legacy_url = 'https://reliefweb.int/sites/reliefweb.int/files/resources/' .. image_file
 
--- Generate the UUID corresponding to the URL of the original image.
-local jit_uuid = require 'resty.jit-uuid'
-local uuid = jit_uuid.generate_v3('6ba7b811-9dad-11d1-80b4-00c04fd430c8', legacy_url)
+  -- Generate the UUID corresponding to the URL of the original image.
+  local jit_uuid = require 'resty.jit-uuid'
+  local uuid = jit_uuid.generate_v3('6ba7b811-9dad-11d1-80b4-00c04fd430c8', legacy_url)
+
+  target = uuid:sub(1, 2) .. '/' .. uuid:sub(3, 4) .. '/' .. uuid .. '.' .. image_ext
+else
+  target = string.gsub(target, '../previews/', '')
+end
 
 -- Redirect to the new URL.
-return ngx.redirect('/sites/default/files/previews/' .. uuid:sub(1, 2) .. '/' .. uuid:sub(3, 4) .. '/' .. uuid .. '.' .. image_ext, 301)
+return ngx.redirect('/sites/default/files/previews/' .. target, 301)

From 7bb2203abbe87e4171fe762c8810928220d7e71b Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 10 May 2022 00:08:41 +0000
Subject: [PATCH 705/720] [RW-510] Fix media migration query

---
 .../src/Plugin/migrate/source/Media.php            | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Media.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Media.php
index 8591c6ca0..bc31279b9 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Media.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Media.php
@@ -32,16 +32,18 @@ public function query() {
     $field = $this->configuration['field'];
     $table = 'field_data_' . $field;
 
-    // Query the image field table for the given entity type and bundle.
-    $query = $this->select($table, 'f');
+    // Use the file_managed table as base table.
+    $query = $this->select('file_managed', 'fm');
+    $query->condition('fm.filemime', 'image/%', 'LIKE');
+    $query->condition('fm.status', 1, '=');
+
+    // Join the image field table for the given entity type and bundle.
+    $query->innerJoin($table, 'f', 'f.' . $field . '_fid = fm.fid');
     $query->condition('f.entity_type', $entity_type, '=');
     $query->condition('f.bundle', $bundle, '=');
 
-    // Join the file_managed and file usage tables to restrict to used images.
-    $query->innerJoin('file_managed', 'fm', 'fm.fid = f.' . $field . '_fid');
+    // Join the file usage tables to restrict to used images.
     $query->innerJoin('file_usage', 'fu', 'fu.fid = fm.fid');
-    $query->condition('fm.filemime', 'image/%', 'LIKE');
-    $query->condition('fm.status', 1, '=');
     $query->condition('fu.count', 0, '>');
 
     // Get the base file fields.

From 69be971a3e9845fe559ddc43024bfa52a4fe76ae Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 10 May 2022 02:56:11 +0000
Subject: [PATCH 706/720] [RW-506] Add drush command to unsubscribe users

---
 .../drush.services.yml                        |   2 +-
 .../ReliefwebSubscriptionsSendCommand.php     | 233 +++++++++++++++++-
 2 files changed, 231 insertions(+), 4 deletions(-)

diff --git a/html/modules/custom/reliefweb_subscriptions/drush.services.yml b/html/modules/custom/reliefweb_subscriptions/drush.services.yml
index 48d5955d9..86b1fc55e 100644
--- a/html/modules/custom/reliefweb_subscriptions/drush.services.yml
+++ b/html/modules/custom/reliefweb_subscriptions/drush.services.yml
@@ -1,6 +1,6 @@
 services:
   reliefweb_subscriptions.send_command:
     class: \Drupal\reliefweb_subscriptions\Command\ReliefwebSubscriptionsSendCommand
-    arguments: ['@database', '@reliefweb_subscriptions.mailer']
+    arguments: ['@database', '@http_client', '@reliefweb_subscriptions.mailer', '@state']
     tags:
       - { name: drush.command }
diff --git a/html/modules/custom/reliefweb_subscriptions/src/Command/ReliefwebSubscriptionsSendCommand.php b/html/modules/custom/reliefweb_subscriptions/src/Command/ReliefwebSubscriptionsSendCommand.php
index 1d8a3a4e4..c01107139 100644
--- a/html/modules/custom/reliefweb_subscriptions/src/Command/ReliefwebSubscriptionsSendCommand.php
+++ b/html/modules/custom/reliefweb_subscriptions/src/Command/ReliefwebSubscriptionsSendCommand.php
@@ -5,9 +5,12 @@
 use Consolidation\SiteAlias\SiteAliasManagerAwareInterface;
 use Consolidation\SiteAlias\SiteAliasManagerAwareTrait;
 use Consolidation\SiteProcess\ProcessManagerAwareTrait;
+use Drupal\Component\Serialization\Json;
 use Drupal\Core\Database\Connection;
+use Drupal\Core\State\StateInterface;
 use Drupal\reliefweb_subscriptions\ReliefwebSubscriptionsMailer;
 use Drush\Commands\DrushCommands;
+use GuzzleHttp\ClientInterface;
 
 /**
  * ReliefWeb Subscriptions Drush commandfile.
@@ -25,6 +28,13 @@ class ReliefwebSubscriptionsSendCommand extends DrushCommands implements SiteAli
    */
   protected $database;
 
+  /**
+   * The HTTP client.
+   *
+   * @var \GuzzleHttp\ClientInterface
+   */
+  protected $httpClient;
+
   /**
    * The actual mailer.
    *
@@ -32,15 +42,26 @@ class ReliefwebSubscriptionsSendCommand extends DrushCommands implements SiteAli
    */
   protected $mailer;
 
+  /**
+   * The state manager.
+   *
+   * @var \Drupal\Core\State\StateInterface
+   */
+  protected $state;
+
   /**
    * {@inheritdoc}
    */
   public function __construct(
     Connection $database,
-    ReliefwebSubscriptionsMailer $mailer
+    ClientInterface $http_client,
+    ReliefwebSubscriptionsMailer $mailer,
+    StateInterface $state
   ) {
     $this->database = $database;
+    $this->httpClient = $http_client;
     $this->mailer = $mailer;
+    $this->state = $state;
   }
 
   /**
@@ -50,10 +71,13 @@ public function __construct(
    *   Max number of items to send.
    *
    * @command reliefweb_subscriptions:send
+   *
    * @usage reliefweb_subscriptions:send
    *   Send emails.
-   * @validate-module-enabled reliefweb_subscriptions
+   *
    * @aliases reliefweb-subscriptions-send
+   *
+   * @validate-module-enabled reliefweb_subscriptions
    */
   public function send($limit = 50) {
     // Get queued notifications, older first.
@@ -86,16 +110,26 @@ public function send($limit = 50) {
    *   Drush options.
    *
    * @command reliefweb_subscriptions:queue
+   *
    * @usage reliefweb_subscriptions:queue
    *   Queue emails.
-   * @validate-module-enabled reliefweb_subscriptions
+   *
    * @option entity_type
    *   Entity type.
    * @option entity_id
    *   Entity Id.
    * @option last
    *   Timestamp to use as the last time notifications were sent.
+   *
+   * @default options [
+   *   'entity_type' => '',
+   *   'entity_id' => 0,
+   *   'last' => 0,
+   * ]
+   *
    * @aliases reliefweb-subscriptions-queue
+   *
+   * @validate-module-enabled reliefweb_subscriptions
    */
   public function queue($sid, array $options = [
     'entity_type' => '',
@@ -105,4 +139,197 @@ public function queue($sid, array $options = [
     $this->mailer->queue($sid, $options);
   }
 
+  /**
+   * Unsubscribe bounced emails.
+   *
+   * @param string $frequency
+   *   Timeframe for the data retrieved from ELK.
+   * @param array $options
+   *   Drush options.
+   *
+   * @command reliefweb_subscriptions:unsubscribe
+   *
+   * @option dry-run If set, subscriptions will not be deleted.
+   *
+   * @default options [
+   *   'dry-run' => FALSE,
+   * ]
+   *
+   * @usage reliefweb_subscriptions:unsubscribe
+   *   unsubscribe emails.
+   *
+   * @aliases reliefweb-subscriptions-unsubscribe
+   *
+   * @validate-module-enabled reliefweb_subscriptions
+   */
+  public function unsubscribe($frequency = '1w', array $options = [
+    'dry-run' => FALSE,
+  ]) {
+    $settings = $this->state->get('ocha_elk_mail', []);
+    if (empty($settings['url'])) {
+      $this->logger()->error(dt('ELK url missing'));
+      return FALSE;
+    }
+
+    $url = $settings['url'] . '/mail-*/_search';
+
+    // Payload to retrieve the email addresses from the bounces and complaints.
+    $payload = [
+      '_source' => [
+        'message.mail.destination',
+      ],
+      'size' => 10000,
+      'sort' => [
+        [
+          '@timestamp' => [
+            'order' => 'desc',
+          ],
+        ],
+      ],
+      'query' => [
+        'bool' => [
+          'must' => [
+            [
+              'match_phrase' => [
+                'unocha.environment' => 'prod',
+              ],
+            ],
+            [
+              'match_phrase' => [
+                'unocha.property' => 'rwint',
+              ],
+            ],
+            [
+              'bool' => [
+                'should' => [
+                  // Bounces.
+                  [
+                    'bool' => [
+                      'must' => [
+                        [
+                          'match_phrase' => [
+                            'message.notificationType' => 'Bounce',
+                          ],
+                        ],
+                        [
+                          'match_phrase' => [
+                            'message.bounce.bounceType' => 'Permanent',
+                          ],
+                        ],
+                      ],
+                    ],
+                  ],
+                  // Complaints.
+                  [
+                    'bool' => [
+                      'must' => [
+                        [
+                          'match_phrase' => [
+                            'message.notificationType' => 'Complaint',
+                          ],
+                        ],
+                        [
+                          'match_phrase' => [
+                            'message.complaint.complaintSubType' => 'OnAccountSuppressionList',
+                          ],
+                        ],
+                      ],
+                    ],
+                  ],
+                ],
+              ],
+            ],
+            [
+              'range' => [
+                '@timestamp' => [
+                  'gte' => 'now-' . $frequency,
+                  'lt' => 'now',
+                ],
+              ],
+            ],
+          ],
+        ],
+      ],
+    ];
+
+    $options = [
+      'headers' => [
+        'Content-Type' => 'application/json',
+        'Accept' => 'application/json',
+      ],
+      'json' => $payload,
+    ];
+
+    // Basic authentication if defined.
+    if (!empty($settings['username']) && !empty($settings['password'])) {
+      $authorization = 'Basic ' . base64_encode($settings['username'] . ':' . $settings['password']);
+      $options['headers']['Authorization'] = $authorization;
+    }
+
+    // Get the elasticsearch response.
+    try {
+      $response = $this->httpClient->post($url, $options);
+    }
+    catch (\Exception $exception) {
+      $this->logger()->error(dt('Unable to query ELK: @message', [
+        '@message' => $exception->getMessage(),
+      ]));
+      return FALSE;
+    }
+
+    if ($response->getStatusCode() != 200) {
+      $this->logger()->error(dt('Unable to retrieve the email list: @error', [
+        '@error' => $response->getReasonPhrase() ?? 'unknow error',
+      ]));
+      return FALSE;
+    }
+
+    // Decode the elasticsearch response.
+    $data = Json::decode((string) $response->getBody());
+    if (empty($data)) {
+      $this->logger()->error(dt('Empty elasticsearch response'));
+      return FALSE;
+    }
+
+    // Extract the email addresses.
+    $emails = [];
+    if (!empty($data['hits']['hits'])) {
+      foreach ($data['hits']['hits'] as $hit) {
+        if (isset($hit['_source']['message']['mail']['destination'][0])) {
+          $email = $hit['_source']['message']['mail']['destination'][0];
+          $emails[$email] = $email;
+        }
+      }
+    }
+    if (empty($emails)) {
+      $this->logger()->info('No emails to unsubscribe');
+      return TRUE;
+    }
+
+    // Get the list of user ids.
+    $ids = $this->database->select('users_field_data', 'u')
+      ->fields('u', ['uid'])
+      ->distinct()
+      ->condition('u.mail', $emails, 'IN')
+      ->execute()
+      ?->fetchCol();
+    if (empty($ids)) {
+      $this->logger()->info(dt('No matching accounts to unsubscribe'));
+      return TRUE;
+    }
+
+    // Delete all the subscriptions for those email addresses.
+    if (empty($options['dry-run'])) {
+      $this->database->delete('reliefweb_subscriptions_subscriptions')
+        ->condition('uid', $ids)
+        ->execute();
+    }
+
+    $this->logger()->info(dt('Unsubscribed @unsubscribed accounts from @emails emails', [
+      '@unsubscribed' => count($ids),
+      '@emails' => count($emails),
+    ]));
+    return TRUE;
+  }
+
 }

From d31b8dad64e702b07881b745c0c0609a5c063ce4 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Tue, 10 May 2022 05:05:57 +0000
Subject: [PATCH 707/720] [RW-506] Add migration of ocha_elk_mail variable

---
 config/migrate_plus.migration.reliefweb_variables.yml            | 1 +
 .../install/migrate_plus.migration.reliefweb_variables.yml       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/config/migrate_plus.migration.reliefweb_variables.yml b/config/migrate_plus.migration.reliefweb_variables.yml
index 3098fc233..6feefb1f4 100644
--- a/config/migrate_plus.migration.reliefweb_variables.yml
+++ b/config/migrate_plus.migration.reliefweb_variables.yml
@@ -23,6 +23,7 @@ source:
     reliefweb_topics_community_topics_links: reliefweb_topics_community_topics
     reliefweb_headline_selection: reliefweb_headline_selection
     facebook_app_id: facebook_app_id
+    ocha_elk_mail: ocha_elk_mail
     reliefweb_submit_email: reliefweb_submit_email
     reliefweb_taxonomy_valid_glide_exceptions: reliefweb_valid_glide_exceptions
     reliefweb_subscriptions_mail_batch_size: reliefweb_subscriptions_mail_batch_size
diff --git a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_variables.yml b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_variables.yml
index a5364c638..b2f855fb3 100644
--- a/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_variables.yml
+++ b/html/modules/custom/reliefweb_migrate/config/install/migrate_plus.migration.reliefweb_variables.yml
@@ -19,6 +19,7 @@ source:
     reliefweb_submit_email: reliefweb_submit_email
     reliefweb_taxonomy_valid_glide_exceptions: reliefweb_valid_glide_exceptions
     reliefweb_subscriptions_mail_batch_size: reliefweb_subscriptions_mail_batch_size
+    ocha_elk_mail: ocha_elk_mail
     # API.
     reliefweb_api_references: reliefweb_api_references
     reliefweb_api_index_tag_blog_post: reliefweb_api_index_tag_blog_post

From 51e8a650df3e680b97186e04e3c89741e687a500 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 11 May 2022 00:45:49 +0000
Subject: [PATCH 708/720] [RW-508] Add drush command to update status of
 inactive sources

---
 .../reliefweb_moderation/drush.services.yml   |   6 +
 .../Commands/ReliefWebModerationCommands.php  | 149 ++++++++++++++++++
 2 files changed, 155 insertions(+)
 create mode 100644 html/modules/custom/reliefweb_moderation/drush.services.yml
 create mode 100644 html/modules/custom/reliefweb_moderation/src/Commands/ReliefWebModerationCommands.php

diff --git a/html/modules/custom/reliefweb_moderation/drush.services.yml b/html/modules/custom/reliefweb_moderation/drush.services.yml
new file mode 100644
index 000000000..bd5ea5b56
--- /dev/null
+++ b/html/modules/custom/reliefweb_moderation/drush.services.yml
@@ -0,0 +1,6 @@
+services:
+  reliefweb_moderation.send_command:
+    class: \Drupal\reliefweb_moderation\Commands\ReliefWebModerationCommands
+    arguments: ['@database', '@entity_type.manager', '@state']
+    tags:
+      - { name: drush.command }
diff --git a/html/modules/custom/reliefweb_moderation/src/Commands/ReliefWebModerationCommands.php b/html/modules/custom/reliefweb_moderation/src/Commands/ReliefWebModerationCommands.php
new file mode 100644
index 000000000..935fac71e
--- /dev/null
+++ b/html/modules/custom/reliefweb_moderation/src/Commands/ReliefWebModerationCommands.php
@@ -0,0 +1,149 @@
+<?php
+
+namespace Drupal\reliefweb_moderation\Commands;
+
+use Drupal\Core\Database\Connection;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\State\StateInterface;
+use Drush\Commands\DrushCommands;
+
+/**
+ * ReliefWeb Moderation Drush commandfile.
+ */
+class ReliefWebModerationCommands extends DrushCommands {
+
+  /**
+   * The database connection.
+   *
+   * @var \Drupal\Core\Database\Connection
+   */
+  protected $database;
+
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * The state manager.
+   *
+   * @var \Drupal\Core\State\StateInterface
+   */
+  protected $state;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(
+    Connection $database,
+    EntityTypeManagerInterface $entity_type_manager,
+    StateInterface $state
+  ) {
+    $this->database = $database;
+    $this->entityTypeManager = $entity_type_manager;
+    $this->state = $state;
+  }
+
+  /**
+   * Update status of inactive sources to inactive or archive.
+   *
+   * Conditions:
+   * - No reports.
+   * - No currently open jobs or training.
+   * - Open job or training during past year -> inactive, otherwise -> archive.
+   *
+   * @param array $options
+   *   Drush options.
+   *
+   * @command reliefweb_moderation:update-inactive-sources
+   *
+   * @option dry-run If set, subscriptions will not be deleted.
+   *
+   * @default options [
+   *   'dry-run' => FALSE,
+   * ]
+   *
+   * @usage reliefweb_moderation:update-inactive-sources
+   *   Mark sources as inactive.
+   *
+   * @aliases reliefweb-organizations-make-inactive,ro-mi
+   *
+   * @validate-module-enabled reliefweb_moderation
+   */
+  public function updateInactiveSources(array $options = [
+    'dry-run' => FALSE,
+  ]) {
+    if (!empty($this->state->get('system.maintenance_mode', 0))) {
+      $this->logger()->warning(dt('Maintenance mode, aborting.'));
+      return TRUE;
+    }
+
+    $sources = $this->database->query("
+      SELECT query.id, query.status
+      FROM (
+        SELECT subquery.id,
+        CASE
+          WHEN subquery.published > 0 THEN 'active'
+          WHEN subquery.recent > 0 THEN 'inactive'
+          ELSE 'archive'
+        END AS status
+        FROM (
+          SELECT fs.field_source_target_id AS id,
+          SUM(CASE
+            WHEN n.type = 'job' AND UNIX_TIMESTAMP(fjcd.field_job_closing_date_value) > UNIX_TIMESTAMP(NOW() - INTERVAL 1 YEAR) THEN 1
+            WHEN n.type = 'training' AND UNIX_TIMESTAMP(frd.field_registration_deadline_value) > UNIX_TIMESTAMP(NOW() - INTERVAL 1 YEAR) THEN 1
+            ELSE 0
+          END) AS recent,
+          SUM(IF(n.moderation_status = 'published', 1, 0)) AS published
+          FROM node__field_source AS fs
+          INNER JOIN node_field_data AS n
+            ON n.nid = fs.entity_id
+            AND n.type IN ('job', 'training')
+          LEFT JOIN node__field_job_closing_date AS fjcd
+            ON fjcd.entity_id = fs.entity_id
+          LEFT JOIN node__field_registration_deadline AS frd
+            ON frd.entity_id = fs.entity_id
+          WHERE fs.field_source_target_id NOT IN (SELECT field_source_target_id FROM node__field_source WHERE bundle = 'report')
+          GROUP BY fs.field_source_target_id
+        ) AS subquery
+      ) AS query
+      INNER JOIN taxonomy_term_field_data AS tfd
+        ON tfd.tid = query.id
+        AND tfd.vid = 'source'
+        AND tfd.moderation_status NOT IN ('duplicate', 'blocked', query.status)
+      WHERE query.status <> 'active'
+    ")?->fetchAllKeyed(0, 1) ?? [];
+
+    if (empty($sources)) {
+      $this->logger()->info(dt('No sources to update'));
+      return TRUE;
+    }
+
+    $dry_run = !empty($options['dry-run']);
+    $storage = $this->entityTypeManager->getStorage('taxonomy_term');
+    $count = 0;
+
+    foreach ($sources as $id => $status) {
+      $source = $storage->load($id);
+      if (!empty($source)) {
+        if (!$dry_run) {
+          $source->notifications_content_disable = TRUE;
+          $source->setModerationStatus($status);
+          $source->setNewRevision(TRUE);
+          $source->setRevisionLogMessage('Automatic status update due to inactivity.');
+          $source->setRevisionUserId(2);
+          $source->save();
+        }
+        $count++;
+      }
+    }
+
+    $this->logger()->info(dt('Updated @count sources', [
+      '@count' => $count,
+    ]));
+    return TRUE;
+  }
+
+}

From d848b0f1be0592f21aa888af61702a9378122876 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 11 May 2022 02:32:35 +0000
Subject: [PATCH 709/720] [RW-506] Add missing operator

---
 .../src/Command/ReliefwebSubscriptionsSendCommand.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/modules/custom/reliefweb_subscriptions/src/Command/ReliefwebSubscriptionsSendCommand.php b/html/modules/custom/reliefweb_subscriptions/src/Command/ReliefwebSubscriptionsSendCommand.php
index c01107139..0272d8d76 100644
--- a/html/modules/custom/reliefweb_subscriptions/src/Command/ReliefwebSubscriptionsSendCommand.php
+++ b/html/modules/custom/reliefweb_subscriptions/src/Command/ReliefwebSubscriptionsSendCommand.php
@@ -321,7 +321,7 @@ public function unsubscribe($frequency = '1w', array $options = [
     // Delete all the subscriptions for those email addresses.
     if (empty($options['dry-run'])) {
       $this->database->delete('reliefweb_subscriptions_subscriptions')
-        ->condition('uid', $ids)
+        ->condition('uid', $ids, 'IN')
         ->execute();
     }
 

From 4e3b65bdd073c11c8fd1b18cd582f0c219443e28 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 11 May 2022 03:00:01 +0000
Subject: [PATCH 710/720] [RW-506] Add condition to restrict unsubscribing to
 users with subscriptions

---
 .../Command/ReliefwebSubscriptionsSendCommand.php    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/html/modules/custom/reliefweb_subscriptions/src/Command/ReliefwebSubscriptionsSendCommand.php b/html/modules/custom/reliefweb_subscriptions/src/Command/ReliefwebSubscriptionsSendCommand.php
index 0272d8d76..245079d42 100644
--- a/html/modules/custom/reliefweb_subscriptions/src/Command/ReliefwebSubscriptionsSendCommand.php
+++ b/html/modules/custom/reliefweb_subscriptions/src/Command/ReliefwebSubscriptionsSendCommand.php
@@ -307,12 +307,16 @@ public function unsubscribe($frequency = '1w', array $options = [
     }
 
     // Get the list of user ids.
-    $ids = $this->database->select('users_field_data', 'u')
+    $query = $this->database
+      ->select('users_field_data', 'u')
       ->fields('u', ['uid'])
       ->distinct()
-      ->condition('u.mail', $emails, 'IN')
-      ->execute()
-      ?->fetchCol();
+      ->condition('u.mail', $emails, 'IN');
+
+    // No need to process users without subscriptions.
+    $query->innerJoin('reliefweb_subscriptions_subscriptions', 's', 's.uid = u.uid');
+
+    $ids = $query->execute()?->fetchCol();
     if (empty($ids)) {
       $this->logger()->info(dt('No matching accounts to unsubscribe'));
       return TRUE;

From 069adf92d585395934340eb3d5d69fec23373735 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Wed, 11 May 2022 05:03:50 +0000
Subject: [PATCH 711/720] [RW-512] Add drush command to check and fix status
 and date inconsistencies

---
 .../src/Commands/ReliefWebMigrateCommands.php | 267 ++++++++++++++++++
 1 file changed, 267 insertions(+)

diff --git a/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php b/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
index 1b21436fe..163d9f2e8 100644
--- a/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
+++ b/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
@@ -1102,4 +1102,271 @@ public function checkMigratedContent($options = [
     return new RowsOfFields($table);
   }
 
+  /**
+   * Check migrated content status.
+   *
+   * @command rw-migrate:check-content-status
+   *
+   * @option fix Fix the changed and status inconsistencies.
+   * @option batch_size Number of items to retrieve from the database at once.
+   *
+   * @default options [
+   *   'fix' => FALSE,
+   *   'batch_size' => 10000,
+   * ]
+   *
+   * @usage rw-migrate:check-content-status
+   *   Check migrated content.
+   *
+   * @validate-module-enabled reliefweb_migrate
+   *
+   * @aliases rw-mccs
+   *
+   * @field-labels
+   *   type: Type
+   *   bundle: Bundle
+   *   id: Id
+   *   rw9_revision_id: RW9 Revision ID
+   *   rw7_revision_id: RW7 Revision ID
+   *   rw9_created: RW9 Created
+   *   rw7_created: RW7 Created
+   *   rw9_changed: RW9 Changed
+   *   rw7_changed: RW7 Changed
+   *   rw9_status: RW9 Status
+   *   rw7_status: RW7 Status
+   * @default-fields type,bundle,id,rw9_revision_id,rw7_revision_id,rw9_created,rw7_created,rw9_changed,rw7_changed,rw9_status,rw7_status
+   *
+   * @return \Consolidation\OutputFormatters\StructuredData\RowsOfFields
+   *   Formatted table.
+   */
+  public function checkMigratedContentStatus(array $options = [
+    'fix' => FALSE,
+    'batch_size' => 1000,
+  ]) {
+    $d7_database = Database::getConnection('default', 'rwint7');
+
+    $table = [];
+    $batch_size = $options['batch_size'] ?? 1000;
+
+    // Terms.
+    $last_id = 0;
+    while (TRUE) {
+      $d9_data = $this->database->queryRange("
+        SELECT
+          td.vid AS bundle,
+          td.tid AS id,
+          td.revision_id AS revision_id,
+          td.changed AS changed,
+          td.moderation_status AS status
+        FROM taxonomy_term_field_data AS td
+        WHERE td.vid IN ('country', 'disaster', 'source')
+          AND td.tid > :last_id
+        ORDER BY td.tid ASC
+      ", 0, $batch_size, [
+        ':last_id' => $last_id,
+      ])?->fetchAllAssoc('id', \PDO::FETCH_ASSOC) ?? [];
+
+      if (empty($d9_data)) {
+        break;
+      }
+      else {
+        $last_id = array_key_last($d9_data);
+      }
+
+      $d7_data = $d7_database->query("
+        SELECT
+          td.tid AS id,
+          td.revision_id AS revision_id,
+          tr.timestamp  AS changed,
+          fs.field_status_value AS status
+        FROM taxonomy_term_data AS td
+        INNER JOIN taxonomy_vocabulary AS tv
+          ON tv.vid = td.vid
+        INNER JOIN taxonomy_term_data_revision AS tr
+          ON tr.tid = td.tid AND tr.revision_id = td.revision_id
+        LEFT JOIN field_data_field_status AS fs
+          ON fs.entity_id = td.tid
+          AND fs.entity_type = 'taxonomy_term'
+        WHERE tv.machine_name IN ('country', 'disaster', 'source')
+          AND td.tid IN (:tids[])
+      ", [
+        ':tids[]' => array_keys($d9_data),
+      ])?->fetchAllAssoc('id', \PDO::FETCH_ASSOC) ?? [];
+
+      foreach ($d9_data as $id => $d9_record) {
+        $id = $d9_record['id'];
+        $d9_revision_id = $d9_record['revision_id'] ?? '-';
+        $d9_changed = $d9_record['changed'] ?? '-';
+        $d9_status = $d9_record['status'] ?? '-';
+
+        $d7_record = $d7_data[$id] ?? [];
+        $d7_revision_id = $d7_record['revision_id'] ?? '-';
+        $d7_changed = $d7_record['changed'] ?? '-';
+        $d7_status = $d7_record['status'] ?? '-';
+        if ($d7_status == 'current') {
+          $d7_status = 'ongoing';
+        }
+
+        if ($d9_revision_id == $d7_revision_id && $d9_changed == $d7_changed && $d9_status == $d7_status) {
+          continue;
+        }
+
+        $table[] = [
+          'type' => 'term',
+          'bundle' => $d9_record['bundle'],
+          'id' => $id,
+          'rw9_revision_id' => $d9_revision_id,
+          'rw7_revision_id' => $d7_revision_id,
+          'rw9_created' => '-',
+          'rw7_created' => '-',
+          'rw9_changed' => $d9_changed,
+          'rw7_changed' => $d7_changed,
+          'rw9_status' => $d9_status,
+          'rw7_status' => $d7_status,
+        ];
+      }
+    }
+
+    // Nodes.
+    $last_id = 0;
+    while (TRUE) {
+      $d9_data = $this->database->queryRange("
+        SELECT
+          n.type AS bundle,
+          n.nid AS id,
+          n.vid AS revision_id,
+          n.created AS created,
+          n.changed AS changed,
+          n.moderation_status AS status
+        FROM node_field_data AS n
+        WHERE n.nid > :last_id
+        ORDER BY n.nid ASC
+      ", 0, $batch_size, [
+        ':last_id' => $last_id,
+      ])?->fetchAllAssoc('id', \PDO::FETCH_ASSOC) ?? [];
+
+      if (empty($d9_data)) {
+        break;
+      }
+      else {
+        $last_id = array_key_last($d9_data);
+      }
+
+      $d7_data = $d7_database->query("
+        SELECT
+          n.nid AS id,
+          n.vid AS revision_id,
+          n.created AS created,
+          n.changed  AS changed,
+          fs.field_status_value AS status
+        FROM node AS n
+        LEFT JOIN field_data_field_status AS fs
+          ON fs.entity_id = n.nid
+          AND fs.entity_type = 'node'
+        WHERE n.type NOT IN ('faq')
+          AND n.nid IN (:nids[])
+      ", [
+        ':nids[]' => array_keys($d9_data),
+      ])?->fetchAllAssoc('id', \PDO::FETCH_ASSOC) ?? [];
+
+      foreach ($d9_data as $d9_record) {
+        $id = $d9_record['id'];
+        $d9_revision_id = $d9_record['revision_id'] ?? '-';
+        $d9_created = $d9_record['created'] ?? '-';
+        $d9_changed = $d9_record['changed'] ?? '-';
+        $d9_status = $d9_record['status'] ?? '-';
+
+        $d7_record = $d7_data[$id] ?? [];
+        $d7_revision_id = $d7_record['revision_id'] ?? '-';
+        $d7_created = $d7_record['created'] ?? '-';
+        $d7_changed = $d7_record['changed'] ?? '-';
+        $d7_status = $d7_record['status'] ?? '-';
+
+        if ($d9_revision_id == $d7_revision_id && $d9_created == $d7_created && $d9_changed == $d7_changed && $d9_status == $d7_status) {
+          continue;
+        }
+
+        $table[] = [
+          'type' => 'node',
+          'bundle' => $d9_record['bundle'],
+          'id' => $id,
+          'rw9_revision_id' => $d9_revision_id,
+          'rw7_revision_id' => $d7_revision_id,
+          'rw9_created' => $d9_created,
+          'rw7_created' => $d7_created,
+          'rw9_changed' => $d9_changed,
+          'rw7_changed' => $d7_changed,
+          'rw9_status' => $d9_status,
+          'rw7_status' => $d7_status,
+        ];
+      }
+    }
+
+    $this->logger()->info(dt('Found @count entries', [
+      '@count' => count($table),
+    ]));
+
+    if (!empty($table) && !empty($options['fix'])) {
+      $this->logger()->info(dt('Fixing @count entries', [
+        '@count' => count($table),
+      ]));
+
+      foreach ($table as $item) {
+        // Skip if the revision are not the same. That should be picked up by
+        // the migration process.
+        if ($item['rw9_revision_id'] != $item['rw7_revision_id']) {
+          continue;
+        }
+
+        switch ($item['type']) {
+          case 'term':
+            $this->database
+              ->update('taxonomy_term_field_data')
+              ->fields([
+                'changed' => $item['rw7_changed'],
+                'moderation_status' => $item['rw7_status'],
+              ])
+              ->condition('tid', $item['id'], '=')
+              ->execute();
+
+            $this->database
+              ->update('taxonomy_term_field_revision')
+              ->fields([
+                'changed' => $item['rw7_changed'],
+                'moderation_status' => $item['rw7_status'],
+              ])
+              ->condition('tid', $item['id'], '=')
+              ->condition('revision_id', $item['rw9_revision_id'], '=')
+              ->execute();
+            break;
+
+          case 'node':
+            $this->database
+              ->update('node_field_data')
+              ->fields([
+                'created' => $item['rw7_created'],
+                'changed' => $item['rw7_changed'],
+                'moderation_status' => $item['rw7_status'],
+              ])
+              ->condition('nid', $item['id'], '=')
+              ->execute();
+
+            $this->database
+              ->update('node_field_revision')
+              ->fields([
+                'created' => $item['rw7_created'],
+                'changed' => $item['rw7_changed'],
+                'moderation_status' => $item['rw7_status'],
+              ])
+              ->condition('nid', $item['id'], '=')
+              ->condition('vid', $item['rw9_revision_id'], '=')
+              ->execute();
+            break;
+        }
+      }
+    }
+
+    return new RowsOfFields($table);
+  }
+
 }

From 999162331c6320feccc7af36d4d55a38787e6ae5 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 12 May 2022 02:22:18 +0000
Subject: [PATCH 712/720] [RW-518] Add command to fix attachment deltas and fix
 migration script

---
 .../src/Commands/ReliefWebMigrateCommands.php | 228 ++++++++++++++++--
 .../src/Plugin/migrate/source/Report.php      |   4 +
 2 files changed, 218 insertions(+), 14 deletions(-)

diff --git a/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php b/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
index 163d9f2e8..76d23277b 100644
--- a/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
+++ b/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
@@ -831,20 +831,7 @@ public function checkMigratedContent($options = [
   ]) {
     $d7_database = Database::getConnection('default', 'rwint7');
 
-    $duplicate_query = $d7_database->select('field_data_field_file', 'f');
-    $duplicate_query->addField('f', 'field_file_fid', 'fid');
-    $duplicate_query->addExpression('COUNT(f.field_file_fid)', 'total');
-    $duplicate_query->addExpression('GROUP_CONCAT(f.entity_id ORDER BY f.entity_id)', 'ids');
-    $duplicate_query->groupBy('f.field_file_fid');
-    $duplicate_query->having('total > 1');
-
-    $duplicate_reports = [];
-    foreach ($duplicate_query->execute() ?? [] as $record) {
-      $ids = explode(',', $record->ids);
-      if (min($ids) !== max($ids)) {
-        $duplicate_reports = array_merge($duplicate_reports, array_slice($ids, 0, -1));
-      }
-    }
+    $duplicate_reports = $this->getDuplicateReports();
 
     if (empty($options['migrated-only'])) {
       $node_max_id = $d7_database->query("
@@ -1369,4 +1356,217 @@ public function checkMigratedContentStatus(array $options = [
     return new RowsOfFields($table);
   }
 
+  /**
+   * Fix attachment deltas.
+   *
+   * @command rw-migrate:fix-attachment-deltas
+   *
+   * @option dry-run Just check the number of files to handle.
+   * @option batch_size Number of items to retrieve from the database at once.
+   *
+   * @default options [
+   *   'dry-run' => FALSE,
+   *   'batch_size' => 10000,
+   * ]
+   *
+   * @usage rw-migrate:fix-attachment-deltas
+   *   Fix attachment deltas.
+   *
+   * @validate-module-enabled reliefweb_migrate
+   */
+  public function fixAttachmentDeltas(array $options = [
+    'dry-run' => FALSE,
+    'batch_size' => 1000,
+  ]) {
+    $d7_database = Database::getConnection('default', 'rwint7');
+
+    $ids = $this->database
+      ->select('node__field_file', 'f')
+      ->fields('f', ['revision_id'])
+      ->condition('f.delta', '0', '>')
+      ->distinct()
+      ->execute()
+      ?->fetchCol() ?? [];
+
+    if (empty($ids)) {
+      $this->logger()->info(dt('Nothing to update'));
+      return TRUE;
+    }
+
+    $results = $this->database
+      ->select('node__field_file', 'f')
+      ->fields('f')
+      ->condition('f.revision_id', $ids, 'IN')
+      ->orderBy('f.revision_id', 'ASC')
+      ->execute()
+      ?->fetchAll(\PDO::FETCH_ASSOC) ?? [];
+
+    $records = [];
+    foreach ($results as $item) {
+      $records[$item['revision_id']][$item['field_file_file_uuid']] = $item;
+    }
+
+    $d7_data = $d7_database->query("
+      SELECT
+        f.delta AS delta,
+        f.revision_id AS revision_id,
+        fm.fid AS fid,
+        fm.uri AS uri
+      FROM field_data_field_file AS f
+      INNER JOIN file_managed AS fm
+        ON fm.fid = f.field_file_fid
+      WHERE f.revision_id IN (:ids[])
+      ORDER BY f.revision_id ASC, f.delta ASC
+    ", [
+      ':ids[]' => $ids,
+    ])?->fetchAll(\PDO::FETCH_ASSOC) ?? [];
+
+    $delta = 0;
+    $deltas = [];
+    foreach ($d7_data as $item) {
+      $revision_id = $item['revision_id'];
+      $uuid = LegacyHelper::generateAttachmentUuid($item['uri']);
+      $file_uuid = LegacyHelper::generateAttachmentFileUuid($uuid, $item['fid']);
+
+      // Initialize the delta for the entity.
+      if (!isset($deltas[$revision_id])) {
+        $delta = 0;
+      }
+
+      // Add the delta for the file if not already set. This makes sure that the
+      // few entries referencing twice the same file, have the correct delta.
+      if (!isset($deltas[$revision_id][$file_uuid])) {
+        $deltas[$revision_id][$file_uuid] = $delta;
+        $delta++;
+      }
+    }
+
+    $count_records = 0;
+    $records_to_update = [];
+    foreach ($records as $revision_id => $items) {
+      if (!isset($deltas[$revision_id])) {
+        continue;
+      }
+      $revision_deltas = $deltas[$revision_id];
+      $max_delta = count($items) - 1;
+      $process = FALSE;
+
+      // Check if the file record for the entity with the revision id, should
+      // be re-ordered.
+      foreach ($items as $uuid => $record) {
+        if (isset($revision_deltas[$uuid]) && ($record['delta'] != $revision_deltas[$uuid] || $record['delta'] > $max_delta)) {
+          $process = TRUE;
+          break;
+        }
+      }
+
+      if ($process) {
+        // Update the record deltas.
+        foreach ($deltas[$revision_id] as $uuid => $delta) {
+          if (isset($items[$uuid])) {
+            $items[$uuid]['delta'] = $delta;
+          }
+        }
+        // Sort the records by delta.
+        usort($items, function ($a, $b) {
+          return $a['delta'] <=> $b['delta'];
+        });
+        // Ensure there is no gap by resetting the deltas.
+        $delta = 0;
+        foreach ($items as $key => $item) {
+          $items[$key]['delta'] = $delta;
+          $delta++;
+        }
+        $records_to_update[$revision_id] = $items;
+        $count_records += count($items);
+      }
+    }
+
+    if (empty($records_to_update)) {
+      $this->logger()->info(dt('No records to update'));
+      return TRUE;
+    }
+    else {
+      $this->logger()->info(dt('@count records to update for @count_entities entities', [
+        '@count' => $count_records,
+        '@count_entities' => count($records_to_update),
+      ]));
+    }
+
+    if (!empty($options['dry-run'])) {
+      return TRUE;
+    }
+
+    $options = [
+      'return' => Database::RETURN_AFFECTED,
+    ];
+
+    $transaction = $this->database->startTransaction();
+    try {
+      $tables = ['node__field_file', 'node_revision__field_file'];
+      foreach ($tables as $table) {
+        $deleted = $this->database
+          ->delete($table, $options)
+          ->condition('revision_id', array_keys($records_to_update), 'IN')
+          ->execute();
+
+        $query = $this->database
+          ->insert($table, $options);
+        $fields_set = FALSE;
+        foreach ($records_to_update as $records) {
+          foreach ($records as $record) {
+            if (!$fields_set) {
+              $query->fields(array_keys($record));
+              $fields_set = TRUE;
+            }
+            $query->values($record);
+          }
+        }
+        $inserted = $query->execute();
+
+        $this->logger()->info(dt('@table: @deleted deleted, @inserted inserted', [
+          '@table' => $table,
+          '@deleted' => $deleted,
+          '@inserted' => $inserted,
+        ]));
+      }
+
+      return TRUE;
+    }
+    catch (\Exception $exception) {
+      $transaction->rollback();
+      $this->logger()->error(dt('Error while trying to update the database: @error', [
+        '@error' => $exception->getMessage(),
+      ]));
+      return FALSE;
+    }
+  }
+
+  /**
+   * Get the IDs of duplicate reports.
+   *
+   * @return array
+   *   Duplicate report IDs.
+   */
+  protected function getDuplicateReports() {
+    $d7_database = Database::getConnection('default', 'rwint7');
+
+    $duplicate_query = $d7_database->select('field_data_field_file', 'f');
+    $duplicate_query->addField('f', 'field_file_fid', 'fid');
+    $duplicate_query->addExpression('COUNT(f.field_file_fid)', 'total');
+    $duplicate_query->addExpression('GROUP_CONCAT(f.entity_id ORDER BY f.entity_id)', 'ids');
+    $duplicate_query->groupBy('f.field_file_fid');
+    $duplicate_query->having('total > 1');
+
+    $duplicate_reports = [];
+    foreach ($duplicate_query->execute() ?? [] as $record) {
+      $ids = explode(',', $record->ids);
+      if (min($ids) !== max($ids)) {
+        $duplicate_reports = array_merge($duplicate_reports, array_slice($ids, 0, -1));
+      }
+    }
+
+    return $duplicate_reports;
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Report.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Report.php
index 503867ad4..7b3afadc8 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Report.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Report.php
@@ -111,6 +111,10 @@ protected function convertFileFieldData() {
 
         $this->preloadedAttachments[$entity_id][$delta] = $item;
       }
+      // Sort by delta (key).
+      if (!empty($this->preloadedAttachments[$entity_id])) {
+        ksort($this->preloadedAttachments[$entity_id]);
+      }
     }
   }
 

From ca6a0a679679083d852966b413245d911ffce04e Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 12 May 2022 03:56:53 +0000
Subject: [PATCH 713/720] [RW-517] Do not migrate on-hold reports

---
 .../src/Plugin/migrate/source/Report.php      | 24 +++++++++++++++++++
 .../Plugin/migrate/source/ReportRevision.php  | 24 +++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Report.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Report.php
index 7b3afadc8..8bb97d1db 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Report.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/Report.php
@@ -36,6 +36,9 @@ class Report extends Node {
   public function query() {
     $query = parent::query();
     $this->removeDuplicateReports($query);
+    $query->innerJoin('field_data_field_status', 'fs', 'fs.entity_id = n.nid');
+    $query->condition('fs.entity_type', 'node', '=');
+    $query->condition('fs.field_status_value', 'on-hold', '<>');
     return $query;
   }
 
@@ -189,4 +192,25 @@ protected function parseAttachmentDescription($description) {
     return $result;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function getDestinationEntityIdsToDelete(array $ids) {
+    if (!empty($ids)) {
+      $query = $this->select('node', 'n')
+        ->fields('n', ['nid'])
+        ->condition('n.nid', $ids, 'IN');
+
+      $query->innerJoin('field_data_field_status', 'fs', 'fs.entity_id = n.nid');
+      $query->condition('fs.entity_type', 'node', '=');
+      $query->condition('fs.field_status_value', 'on-hold', '<>');
+
+      $source_ids = $query->execute()
+        ?->fetchCol() ?? [];
+
+      return array_diff($ids, $source_ids);
+    }
+    return [];
+  }
+
 }
diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/ReportRevision.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/ReportRevision.php
index aaaa1e020..55339fbb9 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/ReportRevision.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/ReportRevision.php
@@ -26,7 +26,31 @@ class ReportRevision extends NodeRevision {
   public function query() {
     $query = parent::query();
     $this->removeDuplicateReports($query);
+    $query->innerJoin('field_data_field_status', 'fs', 'fs.entity_id = n.nid');
+    $query->condition('fs.entity_type', 'node', '=');
+    $query->condition('fs.field_status_value', 'on-hold', '<>');
     return $query;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function getDestinationEntityIdsToDelete(array $ids) {
+    if (!empty($ids)) {
+      $query = $this->select('node_revision', 'nr')
+        ->fields('nr', ['vid'])
+        ->condition('nr.vid', $ids, 'IN');
+
+      $query->innerJoin('field_data_field_status', 'fs', 'fs.entity_id = nr.nid');
+      $query->condition('fs.entity_type', 'node', '=');
+      $query->condition('fs.field_status_value', 'on-hold', '<>');
+
+      $source_ids = $query->execute()
+        ?->fetchCol() ?? [];
+
+      return array_diff($ids, $source_ids);
+    }
+    return [];
+  }
+
 }

From 038739c913a60ba60d1cb004bee908a9afa5fa87 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 12 May 2022 04:36:48 +0000
Subject: [PATCH 714/720] [RW-516] Remove covid banner

---
 .../components/rw-site-slogan/rw-site-slogan.css            | 6 ------
 .../templates/cd/cd-header/cd-header.html.twig              | 5 -----
 2 files changed, 11 deletions(-)

diff --git a/html/themes/custom/common_design_subtheme/components/rw-site-slogan/rw-site-slogan.css b/html/themes/custom/common_design_subtheme/components/rw-site-slogan/rw-site-slogan.css
index aafd6761c..ff2deca85 100644
--- a/html/themes/custom/common_design_subtheme/components/rw-site-slogan/rw-site-slogan.css
+++ b/html/themes/custom/common_design_subtheme/components/rw-site-slogan/rw-site-slogan.css
@@ -7,16 +7,10 @@
   padding: 0;
   /* #2e3436 with 0.7 opacity on white. */
   color: rgba(var(--cd-rgb-reliefweb-brand-grey--dark), 0.7);
-  color: white; /* TEMPORARY - COVID-19 */
   /* #e6ecef with 0.4 opacity on white. */
   background: rgba(var(--cd-rgb-reliefweb-brand-grey--light), 0.4);
-  background: var(--cd-reliefweb-brand-grey--dark); /* TEMPORARY - COVID-19 */
   font-size: 16px;
 }
-.cd-header #site-slogan a {
-  color: rgba(var(--cd-rgb-reliefweb-brand-grey--dark), 0.7);
-  color: white; /* TEMPORARY - COVID-19 */
-}
 .cd-header #site-slogan .cd-container {
   display: table;
   text-align: center;
diff --git a/html/themes/custom/common_design_subtheme/templates/cd/cd-header/cd-header.html.twig b/html/themes/custom/common_design_subtheme/templates/cd/cd-header/cd-header.html.twig
index 5732df7ab..6cb3d2f57 100644
--- a/html/themes/custom/common_design_subtheme/templates/cd/cd-header/cd-header.html.twig
+++ b/html/themes/custom/common_design_subtheme/templates/cd/cd-header/cd-header.html.twig
@@ -6,12 +6,7 @@
 
     <div id="site-slogan">
       <div class="cd-container">
-        <!-- TEMPORARY - COVID-19 - disabled
         {% trans %}<span>Informing humanitarians worldwide 24/7 &mdash; <span>a service provided by&nbsp;<span class="ocha">UN OCHA</span></span></span>{% endtrans %}
-         -->
-        <!-- TEMPORARY - COVID-19 -->
-        {% set covid_topic_url = url('entity.node.canonical', {'node': 3563703})|render %}
-        <span><strong>{% trans %}RW COVID-19 page:&nbsp;</strong><a href="{{ covid_topic_url  }}">Find latest updates on global humanitarian responses{% endtrans %}</a></span>
       </div>
     </div>
   {% endblock %}

From aaec90fc2bb4efd641f5632990ce1e4f4b98a5ab Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 12 May 2022 06:35:32 +0000
Subject: [PATCH 715/720] [RW-512] Make sure we remove unsubscribed or deleted
 users

---
 .../src/Plugin/migrate/source/User.php        | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php
index ccbe97e46..9eb90e522 100644
--- a/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php
+++ b/html/modules/custom/reliefweb_migrate/src/Plugin/migrate/source/User.php
@@ -3,6 +3,7 @@
 namespace Drupal\reliefweb_migrate\Plugin\migrate\source;
 
 use Drupal\migrate\Row;
+use Drupal\reliefweb_migrate\Plugin\migrate\id_map\AccumulatedSql;
 
 /**
  * Retrieve users from the Drupal 7 database.
@@ -248,6 +249,35 @@ protected function getDestinationEntityIdsToDelete(array $ids) {
     return [];
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function removeDeletedEntities() {
+    $source_ids = $this->getSourceEntityIds();
+    $destination_ids = $this->getDestinationEntityIds();
+
+    $deleted_ids = array_diff($destination_ids, $source_ids);
+    if (empty($deleted_ids)) {
+      return;
+    }
+
+    $destination_plugin = $this->migration->getDestinationPlugin();
+    $delete_from_id_map = $this->idMap instanceof AccumulatedSql;
+
+    foreach (array_chunk($deleted_ids, 1000) as $ids) {
+      foreach ($ids as $id) {
+        $destination_plugin->rollback([$id]);
+      }
+      if ($delete_from_id_map) {
+        $this->idMap->deleteFromSourceIds($ids);
+      }
+    }
+
+    \Drupal::logger('migrate')->info(strtr('IDs deleted: @ids', [
+      '@ids' => count($deleted_ids),
+    ]));
+  }
+
   /**
    * {@inheritdoc}
    */

From ff3e7bf0bf97aee89e9a7f44a32ea0a5cd20400a Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 12 May 2022 08:06:31 +0000
Subject: [PATCH 716/720] [RW-512] Exclude on-hold reports from check command

---
 .../src/Commands/ReliefWebMigrateCommands.php | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php b/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
index 76d23277b..e2651819f 100644
--- a/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
+++ b/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
@@ -833,6 +833,10 @@ public function checkMigratedContent($options = [
 
     $duplicate_reports = $this->getDuplicateReports();
 
+    $on_hold_reports = $this->getOnHoldReports();
+
+    $exclude_reports = array_unique(array_merge($duplicate_reports, $on_hold_reports));
+
     if (empty($options['migrated-only'])) {
       $node_max_id = $d7_database->query("
         SELECT MAX(vid) FROM node
@@ -945,14 +949,14 @@ public function checkMigratedContent($options = [
           END) AS name, COUNT(*) AS total
         FROM node
         WHERE type NOT IN ('faq')
-          AND nid NOT IN (:duplicate_reports[])
+          AND nid NOT IN (:exclude_reports[])
           AND nid <= :node_max_id
         GROUP BY type
       UNION
         SELECT CONCAT('node - ', 'total') AS name, COUNT(*) AS total
         FROM node
         WHERE type NOT IN ('faq')
-          AND nid NOT IN (:duplicate_reports[])
+          AND nid NOT IN (:exclude_reports[])
           AND nid <= :node_max_id
       UNION
         SELECT CONCAT('term - ',
@@ -1055,7 +1059,7 @@ public function checkMigratedContent($options = [
           AND (fm.filemime = 'application/pdf' OR LOWER(RIGHT(fm.uri,3)) = 'pdf')
           AND fm.fid <= :file_max_id
     ", [
-      ':duplicate_reports[]' => $duplicate_reports,
+      ':exclude_reports[]' => $exclude_reports,
       ':preview_description' => '[|][1-9][0-9]*[|](0|90|-90)$',
       ':node_max_id' => $node_max_id,
       ':term_max_id' => $term_max_id,
@@ -1569,4 +1573,21 @@ protected function getDuplicateReports() {
     return $duplicate_reports;
   }
 
+  /**
+   * Get the IDs of on-hold reports.
+   *
+   * @return array
+   *   On-hold report IDs.
+   */
+  protected function getOnHoldReports() {
+    return Database::getConnection('default', 'rwint7')
+      ->select('field_data_field_status', 'fs')
+      ->fields('fs', ['entity_id'])
+      ->condition('fs.bundle', 'report', '=')
+      ->condition('fs.field_status_value', 'on-hold', '=')
+      ->distinct()
+      ->execute()
+      ?->fetchCol() ?? [];
+  }
+
 }

From 6a6268638ff8b5306c8dd837b644d77c55d295ef Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Thu, 12 May 2022 08:26:15 +0000
Subject: [PATCH 717/720] [RW-512] Also exclude on hold reports when getting
 file stats

---
 .../src/Commands/ReliefWebMigrateCommands.php                  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php b/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
index e2651819f..2ddcd25e7 100644
--- a/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
+++ b/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
@@ -1049,6 +1049,7 @@ public function checkMigratedContent($options = [
           ON fm.fid = f.field_file_fid
         WHERE f.bundle = 'report'
           AND fm.fid <= :file_max_id
+          AND f.entity_id NOT IN (:on_hold_reports[])
       UNION
         SELECT 'preview' AS name, COUNT(DISTINCT f.field_file_fid)
         FROM field_data_field_file AS f
@@ -1058,6 +1059,7 @@ public function checkMigratedContent($options = [
           AND f.field_file_description REGEXP :preview_description
           AND (fm.filemime = 'application/pdf' OR LOWER(RIGHT(fm.uri,3)) = 'pdf')
           AND fm.fid <= :file_max_id
+          AND f.entity_id NOT IN (:on_hold_reports[])
     ", [
       ':exclude_reports[]' => $exclude_reports,
       ':preview_description' => '[|][1-9][0-9]*[|](0|90|-90)$',
@@ -1065,6 +1067,7 @@ public function checkMigratedContent($options = [
       ':term_max_id' => $term_max_id,
       ':media_max_id' => $media_max_id,
       ':file_max_id' => $file_max_id,
+      ':on_hold_reports[]' => $on_hold_reports,
     ])?->fetchAllKeyed(0, 1) ?? [];
 
     $table = [];

From a2b4abda8dc6155346c3957524d47f9aa2205dce Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 13 May 2022 01:16:49 +0000
Subject: [PATCH 718/720]  [RW-512] Exclude on-hold and duplicate reports when
 getting file stats

---
 .../src/Commands/ReliefWebMigrateCommands.php                | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php b/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
index 2ddcd25e7..74271e8ad 100644
--- a/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
+++ b/html/modules/custom/reliefweb_migrate/src/Commands/ReliefWebMigrateCommands.php
@@ -1049,7 +1049,7 @@ public function checkMigratedContent($options = [
           ON fm.fid = f.field_file_fid
         WHERE f.bundle = 'report'
           AND fm.fid <= :file_max_id
-          AND f.entity_id NOT IN (:on_hold_reports[])
+          AND f.entity_id NOT IN (:exclude_reports[])
       UNION
         SELECT 'preview' AS name, COUNT(DISTINCT f.field_file_fid)
         FROM field_data_field_file AS f
@@ -1059,7 +1059,7 @@ public function checkMigratedContent($options = [
           AND f.field_file_description REGEXP :preview_description
           AND (fm.filemime = 'application/pdf' OR LOWER(RIGHT(fm.uri,3)) = 'pdf')
           AND fm.fid <= :file_max_id
-          AND f.entity_id NOT IN (:on_hold_reports[])
+          AND f.entity_id NOT IN (:exclude_reports[])
     ", [
       ':exclude_reports[]' => $exclude_reports,
       ':preview_description' => '[|][1-9][0-9]*[|](0|90|-90)$',
@@ -1067,7 +1067,6 @@ public function checkMigratedContent($options = [
       ':term_max_id' => $term_max_id,
       ':media_max_id' => $media_max_id,
       ':file_max_id' => $file_max_id,
-      ':on_hold_reports[]' => $on_hold_reports,
     ])?->fetchAllKeyed(0, 1) ?? [];
 
     $table = [];

From b776c31a79efa9e95160cfff428b3fe85ccb22fc Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 13 May 2022 05:49:39 +0000
Subject: [PATCH 719/720] [RW-245] Fix job import

---
 .../reliefweb_import/reliefweb_import.module  |  34 +
 .../src/Command/ReliefwebImportCommand.php    | 696 ++++++++++++------
 .../custom/reliefweb_import/tests/feeds.xml   |  35 +
 .../src/Helpers/UserPostingRightsHelper.php   |   2 +-
 4 files changed, 558 insertions(+), 209 deletions(-)
 create mode 100644 html/modules/custom/reliefweb_import/reliefweb_import.module
 create mode 100644 html/modules/custom/reliefweb_import/tests/feeds.xml

diff --git a/html/modules/custom/reliefweb_import/reliefweb_import.module b/html/modules/custom/reliefweb_import/reliefweb_import.module
new file mode 100644
index 000000000..7eefb3122
--- /dev/null
+++ b/html/modules/custom/reliefweb_import/reliefweb_import.module
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * @file
+ * Module file for the job importer.
+ */
+
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\reliefweb_entities\Entity\Job;
+
+/**
+ * Implements hook_ENTITY_TYPE_presave() for node.
+ */
+function reliefweb_import_node_presave(EntityInterface $entity) {
+  // @todo remove when removing `reliefweb_migrate`.
+  if (!empty($entity->_is_migrating)) {
+    return;
+  }
+  if ($entity instanceof Job && !empty($entity->_is_importing)) {
+    $status = $entity->getModerationStatus();
+
+    // Set the status to draft/on-hold if there were validation errors.
+    if ($status !== 'refused' && !empty($entity->_import_errors)) {
+      $status = \Drupal::state()->get('reliefweb_import_status_when_errors', 'draft');
+      $entity->setModerationStatus($status);
+    }
+
+    // Set the revision user to the System user to differentiate modifications
+    // made via the UI from automated ones. We need to do that here so that
+    // the Job::preSave() uses the user associated with the import feed when
+    // determining the status to use based on the user posting rights.
+    $entity->setRevisionUserId(2);
+  }
+}
diff --git a/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php b/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php
index b3aef7fb6..f385846fa 100644
--- a/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php
+++ b/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php
@@ -12,6 +12,7 @@
 use Drupal\Core\Logger\LoggerChannelInterface;
 use Drupal\Core\State\StateInterface;
 use Drupal\reliefweb_entities\Entity\Job;
+use Drupal\reliefweb_entities\Plugin\Validation\Constraint\DateNotInPastConstraint;
 use Drupal\reliefweb_import\Exception\ReliefwebImportException;
 use Drupal\reliefweb_import\Exception\ReliefwebImportExceptionSoftViolation;
 use Drupal\reliefweb_import\Exception\ReliefwebImportExceptionViolation;
@@ -84,18 +85,11 @@ class ReliefwebImportCommand extends DrushCommands implements SiteAliasManagerAw
   protected $url;
 
   /**
-   * The errors.
+   * Loaded term IDs.
    *
    * @var array
    */
-  protected $errors;
-
-  /**
-   * The wanings.
-   *
-   * @var array
-   */
-  protected $warnings;
+  protected $loadedTermIds = [];
 
   /**
    * {@inheritdoc}
@@ -132,24 +126,11 @@ public function jobs($limit = 50) {
     // Load terms having a job URL.
     $query = $this->entityTypeManager->getStorage('taxonomy_term')->getQuery();
     $query->condition('vid', 'source');
-    $query->condition('field_job_import_feed', NULL, 'IS NOT NULL');
-
+    $query->condition('field_job_import_feed.feed_url', NULL, 'IS NOT NULL');
     $tids = $query->execute();
     $terms = $this->entityTypeManager->getStorage('taxonomy_term')->loadMultiple($tids);
     foreach ($terms as $term) {
       $this->fetchJobs($term);
-
-      if (!empty($this->errors)) {
-        foreach ($this->errors as $error) {
-          $this->getLogger()->error($error);
-        }
-      }
-
-      if (!empty($this->warnings)) {
-        foreach ($this->warnings as $warning) {
-          $this->getLogger()->warning($warning);
-        }
-      }
     }
   }
 
@@ -175,57 +156,74 @@ public function fetchJobs(Term $term) {
       '@url' => $this->url,
     ]);
 
-    $this->validateUser($uid);
-    $this->validateBaseUrl($base_url);
+    try {
+      $this->validateUser($uid);
+      $this->validateBaseUrl($base_url);
+    }
+    catch (ReliefwebImportException $exception) {
+      $this->getLogger()->error(strtr('Unable to process @name, invalid feed information: @message.', [
+        '@name' => $label,
+        '@message' => $exception->getMessage(),
+      ]));
+      return;
+    }
 
+    // Fetch the XML.
     try {
-      // Fetch the XML.
       $data = $this->fetchXml($this->url);
-
-      // Switch to proper user and import XML.
-      /** @var \Drupal\user\UserInterface $account */
-      $account = $this->entityTypeManager->getStorage('user')->load($uid);
-      $account->addRole('job_importer');
-      $this->accountSwitcher->switchTo($account);
-
-      $this->processXml($data, $uid, $base_url, $source_id);
-
-      // Restore user account.
-      $this->accountSwitcher->switchBack();
     }
     catch (ClientException $exception) {
-      $this->errors[] = strtr('Unable to process @name, got http error @code: @message.', [
+      $this->getLogger()->error(strtr('Unable to process @name, http error @code: @message.', [
         '@name' => $label,
         '@code' => $exception->getCode(),
         '@message' => $exception->getMessage(),
-      ]);
+      ]));
+      return;
     }
     catch (RequestException $exception) {
-      $this->errors[] = strtr('Unable to process @name, general error @code: @message.', [
+      $this->getLogger()->error(strtr('Unable to process @name, general error @code: @message.', [
         '@name' => $label,
         '@code' => $exception->getCode(),
         '@message' => $exception->getMessage(),
-      ]);
+      ]));
+      return;
     }
     catch (\Exception $exception) {
-      $this->errors[] = strtr('Unable to process @name, got @code: @message.', [
+      $this->getLogger()->error(strtr('Unable to process @name: @message.', [
         '@name' => $label,
-        '@code' => $exception->getCode(),
         '@message' => $exception->getMessage(),
-      ]);
+      ]));
+      return;
     }
+
+    // Switch to proper user and import XML.
+    /** @var \Drupal\user\UserInterface $account */
+    $account = $this->entityTypeManager->getStorage('user')->load($uid);
+    // @todo review if that's needed.
+    $account->addRole('job_importer');
+    $this->accountSwitcher->switchTo($account);
+
+    // Process the feed items.
+    $this->processXml($label, $data, $uid, $base_url, $source_id);
+
+    // Restore user account.
+    $this->accountSwitcher->switchBack();
   }
 
   /**
    * Fetch XML data.
+   *
+   * @param string $url
+   *   URL of the job feed to import.
+   *
+   * @return string
+   *   Feed's content.
    */
   protected function fetchXml($url) {
     $response = $this->httpClient->request('GET', $url);
     // Check status code.
     if ($response->getStatusCode() !== 200) {
-      throw new ReliefwebImportExceptionXml(strtr('HTTP error, got @statuscode.', [
-        '@statuscode' => $response->getStatusCode(),
-      ]));
+      throw new ClientException($response->getReasonPhrase(), $response->getStatusCode());
     }
 
     // Get body.
@@ -241,196 +239,473 @@ protected function fetchXml($url) {
 
   /**
    * Process XML data.
+   *
+   * @param string $name
+   *   Source name.
+   * @param string $body
+   *   XML content.
+   * @param int $uid
+   *   ID of the user entity to use as owner of the job.
+   * @param string $base_url
+   *   Feed's base URL.
+   * @param int $source_id
+   *   ID of the source term the feed belongs to.
    */
-  protected function processXml($body, $uid, $base_url, $source_id) {
-    $index = 0;
+  protected function processXml($name, $body, $uid, $base_url, $source_id) {
     $xml = new \SimpleXMLElement($body);
+
+    if ($xml->count() === 0) {
+      $this->getLogger()->info(strtr('No feed items to import for @name', [
+        '@name' => $name,
+      ]));
+      return;
+    }
+
+    $errors = [];
+    $warnings = [];
     foreach ($xml as $item) {
       try {
         $this->checkMandatoryFields($item, $base_url, $source_id);
 
+        $link = (string) $item->link;
+
         // Check if job already exist.
-        if ($this->jobExists((string) $item->link)) {
-          $this->getLogger()->notice(strtr('Update job for @link', [
-            '@link' => $item->link,
+        if ($this->jobExists($link)) {
+          $this->getLogger()->notice(strtr('Updating job @link', [
+            '@link' => $link,
           ]));
-          $this->updateJob($this->loadJobById((string) $item->link), $item);
+          $job = $this->loadJobById($link);
+          if (empty($job)) {
+            throw new ReliefwebImportExceptionViolation(strtr('Unable to load job @link', [
+              '@id' => $link,
+            ]));
+          }
+          $this->updateJob($job, $item);
         }
         else {
-          $this->getLogger()->notice(strtr('Create new job for @link', [
-            '@link' => $item->link,
+          $this->getLogger()->notice(strtr('Creating new job @link', [
+            '@link' => $link,
           ]));
-          $this->createJob($item, $uid);
+          $this->createJob($item, $uid, $source_id);
         }
       }
       catch (ReliefwebImportExceptionViolation $exception) {
-        $this->errors[$index] = $exception->getMessage();
+        $errors[] = $exception->getMessage();
       }
       catch (ReliefwebImportExceptionSoftViolation $exception) {
-        $this->warnings[$index] = $exception->getMessage();
+        $warnings[] = $exception->getMessage();
       }
-
-      $index++;
     }
-  }
 
-  /**
-   * Get errors.
-   */
-  public function getErrors() {
-    return $this->errors;
-  }
-
-  /**
-   * Get warnings.
-   */
-  public function getWarnings() {
-    return $this->warnings;
+    if (!empty($errors)) {
+      $this->getLogger()->error(strtr('Errors while processing @name: @errors', [
+        '@name' => $name,
+        '@errors' => "\n- " . implode("\n- ", $errors),
+      ]));
+    }
+    if (!empty($warnings)) {
+      $this->getLogger()->warning(strtr('Warnings while processing @name: @warnings', [
+        '@name' => $name,
+        '@warnings' => "\n- " . implode("\n- ", $warnings),
+      ]));
+    }
   }
 
   /**
    * Check mandatory fields.
+   *
+   * @param \SimpleXMLElement $data
+   *   XML data for the job.
+   * @param string $base_url
+   *   Feed's base URL.
+   * @param int $source_id
+   *   ID of the source term the feed belongs to.
+   *
+   * @throws \Drupal\reliefweb_import\Exception\ReliefwebImportExceptionViolation
+   *   Import expection.
    */
-  protected function checkMandatoryFields($data, $base_url, $source_id) {
-    $this->validateLink($data->link[0], $base_url);
-    $this->validateTitle($data->title[0]);
-    $this->validateSource((string) $data->field_source[0], $source_id);
+  protected function checkMandatoryFields(\SimpleXMLElement $data, $base_url, $source_id) {
+    try {
+      $this->validateLink($data->link[0], $base_url);
+      $this->validateTitle($data->title[0]);
+      $this->validateSource((string) $data->field_source[0], $source_id);
+    }
+    catch (\Exception $exception) {
+      throw new ReliefwebImportExceptionViolation($exception->getMessage());
+    }
   }
 
   /**
    * Check if job exists.
+   *
+   * @param string $id
+   *   Job feed ID.
+   *
+   * @return bool
+   *   TRUE if the job was already imported.
    */
   protected function jobExists($id) {
-    $sql = "SELECT COUNT(entity_id)
-      FROM {node__field_job_id}
-      WHERE bundle = 'job'
-      AND field_job_id_value = :id";
-
-    $count = $this->database->query($sql, [
-      ':id' => $id,
-    ])->fetchField();
-
-    return $count != 0;
+    $ids = $this->entityTypeManager
+      ->getStorage('node')
+      ->getQuery()
+      ->accessCheck(FALSE)
+      ->condition('field_job_id', $id, '=')
+      ->execute();
+    return !empty($ids);
   }
 
   /**
    * Load job by Id.
+   *
+   * @param string $id
+   *   Job feed ID.
+   *
+   * @return \Drupal\reliefweb_entities\Entity\Job|null
+   *   The job entity if it exists.
    */
   protected function loadJobById($id) {
-    $sql = "SELECT entity_id
-      FROM {node__field_job_id}
-      WHERE bundle = 'job'
-      AND field_job_id_value = :id";
-
-    $nid = $this->database->query($sql, [
-      ':id' => $id,
-    ])->fetchField();
-
-    return Job::load($nid);
+    $entities = $this->entityTypeManager
+      ->getStorage('node')
+      ->loadByProperties([
+        'field_job_id' => $id,
+      ]);
+    return !empty($entities) ? reset($entities) : NULL;
   }
 
   /**
    * Create a new job.
+   *
+   * @param \SimpleXMLElement $data
+   *   XML data for the job.
+   * @param int $uid
+   *   ID of the job owner.
+   * @param int $source_id
+   *   Source ID.
    */
-  protected function createJob($data, $uid) {
+  protected function createJob(\SimpleXMLElement $data, $uid, $source_id) {
     $values = [
       'type' => 'job',
       'uid' => $uid,
       'field_job_id' => (string) $data->link,
-      'title' => $this->validateTitle((string) $data->title),
-      'field_career_categories' => $data->field_career_categories[0] ? (array) $data->field_career_categories : [],
-      'field_city' => $this->validateCity((string) $data->field_city),
-      'field_job_closing_date' => $this->validateJobClosingDate((string) $data->field_job_closing_date),
-      'field_country' => $this->mapCountries((array) $data->field_country),
-      'field_how_to_apply' => $this->validateHowToApply((string) $data->field_how_to_apply),
+      'field_source' => $source_id,
+    ];
+    $job = Job::create($values);
+    $this->updateJob($job, $data);
+  }
+
+  /**
+   * Create a new job.
+   *
+   * @param \Drupal\reliefweb_entities\Entity\Job $job
+   *   Job to update.
+   * @param \SimpleXMLElement $data
+   *   XML data for the job.
+   */
+  protected function updateJob(Job $job, \SimpleXMLElement $data) {
+    $fields = [
+      'title' => [
+        'callback' => 'setJobTitle',
+        'property' => 'title',
+      ],
       'body' => [
-        'value' => $this->validateBody((string) $data->body),
-        'format' => 'markdown',
+        'callback' => 'setJobBody',
+        'property' => 'body',
+      ],
+      'field_how_to_apply' => [
+        'callback' => 'setJobHowToApply',
+        'property' => 'field_how_to_apply',
+      ],
+      'field_job_closing_date' => [
+        'callback' => 'setJobClosingDate',
+        'property' => 'field_job_closing_date',
+      ],
+      'field_job_type' => [
+        'callback' => 'setJobType',
+        'property' => 'field_job_type',
+      ],
+      'field_job_experience' => [
+        'callback' => 'setJobExperience',
+        'property' => 'field_job_experience',
+      ],
+      'field_career_categories' => [
+        'callback' => 'setJobCareerCategories',
+        'property' => 'field_career_categories',
+      ],
+      'field_theme' => [
+        'callback' => 'setJobThemes',
+        'property' => 'field_theme',
+      ],
+      'field_country' => [
+        'callback' => 'setJobCountry',
+        'property' => 'field_country',
+      ],
+      'field_city' => [
+        'callback' => 'setJobCity',
+        'property' => 'field_city',
       ],
-      'field_job_type' => $data->field_job_type[0] ? (array) $data->field_job_type : [],
-      'field_job_experience' => $data->field_job_experience[0] ? $this->validateJobExperience((array) $data->field_job_experience) : [],
-      'field_source' => $data->field_source[0] ? (array) $data->field_source : [],
-      'field_theme' => $data->field_theme[0] ? (array) $data->field_theme : [],
     ];
 
-    $job = Job::create($values);
+    foreach ($fields as $field => $info) {
+      try {
+        if (isset($data->{$info['property']})) {
+          $this->{$info['callback']}($job, $data->{$info['property']});
+        }
+      }
+      catch (ReliefwebImportException $exception) {
+        // Empty the field if invalid and store the error.
+        $job->{$field} = [];
+        $job->_import_errors[$field] = $exception->getMessage();
+      }
+    }
+
     $this->validateAndSaveJob($job);
   }
 
   /**
-   * Create a new job.
+   * Set the job title.
+   *
+   * @param \Drupal\reliefweb_entities\Entity\Job $job
+   *   Job to update.
+   * @param \SimpleXMLElement $data
+   *   Data from the XML feed.
+   */
+  protected function setJobTitle(Job $job, \SimpleXMLElement $data) {
+    $job->title = $this->validateTitle((string) $data);
+  }
+
+  /**
+   * Set the job body.
+   *
+   * @param \Drupal\reliefweb_entities\Entity\Job $job
+   *   Job to update.
+   * @param \SimpleXMLElement $data
+   *   Data from the XML feed.
    */
-  protected function updateJob(Job $job, $data) {
-    $job->title = $this->validateTitle((string) $data->title);
-    $job->field_career_categories = $data->field_career_categories[0] ? (array) $data->field_career_categories : [];
-    $job->field_city = $this->validateCity((string) $data->field_city);
-    $job->field_job_closing_date = $this->validateJobClosingDate((string) $data->field_job_closing_date);
-    $job->field_country = $this->mapCountries((array) $data->field_country);
-    $job->field_how_to_apply = $this->validateHowToApply((string) $data->field_how_to_apply);
+  protected function setJobBody(Job $job, \SimpleXMLElement $data) {
     $job->body = [
-      'value' => $this->validateBody((string) $data->body),
-      'format' => 'markdown',
+      'value' => $this->validateBody((string) $data),
+      'format' => 'markdown_editor',
     ];
-    $job->field_job_type = $data->field_job_type[0] ? (array) $data->field_job_type : [];
-    $job->field_job_experience = $data->field_job_experience[0] ? $this->validateJobExperience((array) $data->field_job_experience) : [];
-    $job->field_source = $data->field_source[0] ? (array) $data->field_source : [];
-    $job->field_theme = $data->field_theme[0] ? (array) $data->field_theme : [];
+  }
 
-    $this->validateAndSaveJob($job);
+  /**
+   * Set the job how to apply.
+   *
+   * @param \Drupal\reliefweb_entities\Entity\Job $job
+   *   Job to update.
+   * @param \SimpleXMLElement $data
+   *   Data from the XML feed.
+   */
+  protected function setJobHowToApply(Job $job, \SimpleXMLElement $data) {
+    $job->field_how_to_apply = [
+      'value' => $this->validateHowToApply((string) $data),
+      'format' => 'markdown_editor',
+    ];
+  }
+
+  /**
+   * Set the job closing date.
+   *
+   * @param \Drupal\reliefweb_entities\Entity\Job $job
+   *   Job to update.
+   * @param \SimpleXMLElement $data
+   *   Data from the XML feed.
+   */
+  protected function setJobClosingDate(Job $job, \SimpleXMLElement $data) {
+    $job->field_job_closing_date = $this->validateJobClosingDate((string) $data);
+  }
+
+  /**
+   * Set the job type.
+   *
+   * @param \Drupal\reliefweb_entities\Entity\Job $job
+   *   Job to update.
+   * @param \SimpleXMLElement $data
+   *   Data from the XML feed.
+   */
+  protected function setJobType(Job $job, \SimpleXMLElement $data) {
+    $ids = $this->getTermIds('job_type');
+    // Silently skip invalid term ids and limit to 1 term.
+    $job->field_job_type = array_slice(array_intersect((array) $data, $ids), 0, 1);
+  }
+
+  /**
+   * Set the job type.
+   *
+   * @param \Drupal\reliefweb_entities\Entity\Job $job
+   *   Job to update.
+   * @param \SimpleXMLElement $data
+   *   Data from the XML feed.
+   */
+  protected function setJobExperience(Job $job, \SimpleXMLElement $data) {
+    $ids = $this->getTermIds('job_experience');
+    // Silently skip invalid term ids.
+    $job->field_job_experience = $this->validateJobExperience(array_intersect((array) $data, $ids));
+  }
+
+  /**
+   * Set the job career categories.
+   *
+   * @param \Drupal\reliefweb_entities\Entity\Job $job
+   *   Job to update.
+   * @param \SimpleXMLElement $data
+   *   Data from the XML feed.
+   */
+  protected function setJobCareerCategories(Job $job, \SimpleXMLElement $data) {
+    $ids = $this->getTermIds('career_category');
+    // Silently skip invalid term ids.
+    $job->field_career_categories = array_intersect((array) $data, $ids);
+  }
+
+  /**
+   * Set the job themes.
+   *
+   * @param \Drupal\reliefweb_entities\Entity\Job $job
+   *   Job to update.
+   * @param \SimpleXMLElement $data
+   *   Data from the XML feed.
+   */
+  protected function setJobThemes(Job $job, \SimpleXMLElement $data) {
+    $ids = $this->getTermIds('theme');
+    // Silently skip invalid term ids and limit to 3 themes.
+    $job->field_theme = array_slice(array_intersect((array) $data, $ids), 0, 3);
+  }
+
+  /**
+   * Set the job country.
+   *
+   * @param \Drupal\reliefweb_entities\Entity\Job $job
+   *   Job to update.
+   * @param \SimpleXMLElement $data
+   *   Data from the XML feed.
+   */
+  protected function setJobCountry(Job $job, \SimpleXMLElement $data) {
+    $job->field_country = $this->mapCountries((array) $data);
+  }
+
+  /**
+   * Set the job city.
+   *
+   * @param \Drupal\reliefweb_entities\Entity\Job $job
+   *   Job to update.
+   * @param \SimpleXMLElement $data
+   *   Data from the XML feed.
+   */
+  protected function setJobCity(Job $job, \SimpleXMLElement $data) {
+    if (!$job->field_country->isEmpty()) {
+      $this->field_city = $this->validateCity((string) $data);
+    }
+  }
+
+  /**
+   * Get the taxonomy term ids for the given vocabulary.
+   *
+   * @param string $vocabulary
+   *   Taxonomy vocabulary.
+   *
+   * @return array
+   *   List of term IDs.
+   */
+  protected function getTermIds($vocabulary) {
+    if (!isset($this->loadedTermIds[$vocabulary])) {
+      $ids = $this->entityTypeManager
+        ->getStorage('taxonomy_term')
+        ->getQuery()
+        ->accessCheck(FALSE)
+        ->condition('vid', $vocabulary, '=')
+        ->execute();
+      $this->loadedTermIds[$vocabulary] = $ids;
+    }
+    return $this->loadedTermIds[$vocabulary];
   }
 
   /**
    * Validate and save job.
+   *
+   * @param \Drupal\reliefweb_entities\Entity\Job $job
+   *   Job to update.
+   *
+   * @throws \Drupal\reliefweb_import\Exception\ReliefwebImportExceptionSoftViolation
+   *   Exception if there were validation errors so they can be logged.
    */
   protected function validateAndSaveJob(Job $job) {
     // Revision user is always 'System'.
-    $job->setRevisionUserId(2);
+    $job->setRevisionUserId($job->getOwnerId());
     $job->setNewRevision(TRUE);
+
+    // Revision message.
     if ($job->isNew()) {
-      $job->setRevisionLogMessage(strtr('Job @guid imported from @url', [
+      $log = strtr('Job @guid imported from @url.', [
         '@guid' => $job->field_job_id->value,
         '@url' => $this->url,
-      ]));
+      ]);
     }
     else {
-      $job->setRevisionLogMessage(strtr('Job @guid updated from @url', [
+      $log = strtr('Job @guid updated from @url.', [
         '@guid' => $job->field_job_id->value,
         '@url' => $this->url,
-      ]));
+      ]);
     }
 
-    // Validate job.
-    $violations = $job->validate();
+    // Set the default status as pending as if it were a submission by an
+    // unverified user. The appropriate status will be set when saving the job.
+    $job->setModerationStatus('pending');
 
-    if (count($violations) === 0) {
-      // Save as published.
-      $job->setUnpublished();
-      $job->setModerationStatus('pending');
-
-      // Re validate.
-      $violations = $job->validate();
-      if (count($violations) === 0) {
-        $job->save();
-        return;
+    // Validate the job.
+    /** @var \Symfony\Component\Validator\ConstraintViolation $violation */
+    foreach ($job->validate() as $violation) {
+      $constraint = $violation->getConstraint();
+      // Ignore the constraint on the closing date so that the feed publisher
+      // can close a job by changing the closing date which will mark the job
+      // as expired.
+      if ($constraint instanceof DateNotInPastConstraint) {
+        continue;
       }
+      $field = preg_replace('#^([a-z0-9_-]+).*#', '$1', $violation->getPropertyPath());
+      // No need to add another validation message if there was already one for
+      // the field.
+      if (!isset($job->_import_errors[$field])) {
+        $job->_import_errors[$field] = $violation->getMessage()->__toString();
+      }
+    }
+
+    // Update the revision log message with the list of validation errors to
+    // help identify what was wrong.
+    if (!empty($job->_import_errors)) {
+      $job->setRevisionLogMessage(implode("\n", array_merge([$log], $job->_import_errors)));
+    }
+    else {
+      $job->setRevisionLogMessage($log);
     }
 
-    // Save as draft.
-    $job->setUnpublished();
-    $job->setModerationStatus('draft');
+    // Flag the job as being imported so that the status can be updated
+    // in reliefweb_import_node_presave() based on the validation errors.
+    $job->_is_importing = TRUE;
+
+    // Ensure notifications are disabled.
+    $job->notifications_content_disable = TRUE;
+
+    // Save the job.
     $job->save();
 
-    $errors = [];
-    /** @var \Symfony\Component\Validator\ConstraintViolation $violation */
-    foreach ($violations as $violation) {
-      $errors[] = strtr('Validation failed in @path with message: @message for job @guid', [
-        '@path' => $violation->getPropertyPath(),
-        '@message' => $violation->getMessage()->__toString(),
+    // Log the message about the creation or update.
+    $this->getLogger()->info($log);
+
+    // If there were validation errors, throw a soft violation exception with
+    // the cancatenated error messages.
+    if (!empty($job->_import_errors)) {
+      $message = '';
+      foreach ($job->_import_errors as $field => $error) {
+        $field_label = $job->{$field}->getFieldDefinition()->getLabel();
+        $message .= "\n--- {$field_label}: {$error}";
+      }
+
+      throw new ReliefwebImportExceptionSoftViolation(strtr('Validation errors for job @guid imported from @url: @errors', [
         '@guid' => $job->field_job_id->value,
-      ]);
+        '@url' => $this->url,
+        '@errors' => $message,
+      ]));
     }
-
-    throw new ReliefwebImportExceptionSoftViolation(implode("\n", $errors));
   }
 
   /**
@@ -445,15 +720,15 @@ protected function getLogger(): LoggerChannelInterface {
    */
   protected function validateUser($uid) {
     if (empty(trim($uid))) {
-      throw new ReliefwebImportExceptionViolation('User Id is not defined.');
+      throw new ReliefwebImportException('User Id is not defined.');
     }
 
     if (!is_numeric($uid)) {
-      throw new ReliefwebImportExceptionViolation('User Id is not numeric.');
+      throw new ReliefwebImportException('User Id is not numeric.');
     }
 
     if ($uid <= 2) {
-      throw new ReliefwebImportExceptionViolation('User Id is an admin.');
+      throw new ReliefwebImportException('User Id is an admin.');
     }
   }
 
@@ -462,11 +737,11 @@ protected function validateUser($uid) {
    */
   protected function validateBaseUrl($base_url) {
     if (empty(trim($base_url))) {
-      throw new ReliefwebImportExceptionViolation('Base URL is empty.');
+      throw new ReliefwebImportException('Base URL is empty.');
     }
 
     if (!UrlHelper::isValid($base_url, TRUE)) {
-      throw new ReliefwebImportExceptionViolation('Base URL is not a valid link.');
+      throw new ReliefwebImportException('Base URL is not a valid link.');
     }
   }
 
@@ -475,15 +750,15 @@ protected function validateBaseUrl($base_url) {
    */
   protected function validateLink($link, $base_url) {
     if (empty(trim($link))) {
-      throw new ReliefwebImportExceptionViolation('Feed item found without a link.');
+      throw new ReliefwebImportException('Feed item found without a link.');
     }
 
     if (!UrlHelper::isValid($link, TRUE)) {
-      throw new ReliefwebImportExceptionViolation('Invalid feed item link.');
+      throw new ReliefwebImportException('Invalid feed item link.');
     }
 
     if (strpos($link, $base_url) !== 0) {
-      throw new ReliefwebImportExceptionViolation('Invalid feed item link base.');
+      throw new ReliefwebImportException('Invalid feed item link base.');
     }
   }
 
@@ -492,7 +767,7 @@ protected function validateLink($link, $base_url) {
    */
   protected function validateTitle($title) {
     if (empty(trim($title))) {
-      throw new ReliefwebImportExceptionViolation('Job found with empty title.');
+      throw new ReliefwebImportException('Job found with empty title.');
     }
 
     // Clean the title.
@@ -508,7 +783,7 @@ protected function validateTitle($title) {
     // the job form.
     $length = mb_strlen($title);
     if ($length < 10 || $length > 150) {
-      throw new ReliefwebImportExceptionViolation('Invalid title length.');
+      throw new ReliefwebImportException('Invalid title length.');
     }
 
     return $title;
@@ -519,15 +794,15 @@ protected function validateTitle($title) {
    */
   protected function validateSource($source, $source_id) {
     if (empty(trim($source))) {
-      throw new ReliefwebImportExceptionViolation('Job found with empty source.');
+      throw new ReliefwebImportException('Job found with empty source.');
     }
 
     if (!is_numeric($source)) {
-      throw new ReliefwebImportExceptionViolation('Job found with non numeric source.');
+      throw new ReliefwebImportException('Job found with non numeric source.');
     }
 
     if ($source !== $source_id) {
-      throw new ReliefwebImportExceptionViolation(strtr('Invalid source expected @source_id, got @source.', [
+      throw new ReliefwebImportException(strtr('Invalid job source: expected @source_id, got @source.', [
         '@source_id' => $source_id,
         '@source' => $source,
       ]));
@@ -549,7 +824,7 @@ protected function validateBody($data) {
     // Ensure the body field size is reasonable.
     $length = mb_strlen($body);
     if ($length < 400 || $length > 50000) {
-      throw new ReliefwebImportException(strtr('Invalid field size for body, @length characters found, has to be between 400 and 50000', [
+      throw new ReliefwebImportException(strtr('Invalid field size for body, @length characters found, has to be between 400 and 50000.', [
         '@length' => $length,
       ]));
     }
@@ -570,7 +845,7 @@ protected function validateHowToApply($data) {
     // Ensure the field size is reasonable.
     $length = mb_strlen($field_how_to_apply);
     if ($length < 100 || $length > 10000) {
-      throw new ReliefwebImportExceptionSoftViolation(strtr('Invalid field size for field_how_to_apply, @length characters found, has to be between 100 and 10000', [
+      throw new ReliefwebImportException(strtr('Invalid field size for field_how_to_apply, @length characters found, has to be between 100 and 10000.', [
         '@length' => $length,
       ]));
     }
@@ -579,55 +854,74 @@ protected function validateHowToApply($data) {
   }
 
   /**
-   * Validate city field.
+   * Validate job closing date field.
    *
    * @param string $data
    *   Raw data from XML.
    */
-  protected function validateCity($data) {
+  protected function validateJobClosingDate($data) {
     // Clean the field.
-    $field_city = TextHelper::cleanText(strip_tags($data), [
-      'line_breaks' => TRUE,
-      'consecutive' => TRUE,
-    ]);
+    $field_job_closing_date = mb_substr($data, 0, 10);
 
     // Ensure the field size is reasonable.
-    $length = mb_strlen($field_city);
-    if ($length < 3 || $length > 255) {
-      throw new ReliefwebImportExceptionSoftViolation(strtr('Invalid field size for field_city, @length characters found, has to be between 3 and 255', [
+    $length = mb_strlen($field_job_closing_date);
+    if ($length !== 0 && $length !== 10) {
+      throw new ReliefwebImportException(strtr('Invalid data for field_job_closing_date, @length characters found, format has to be yyyy-mm-dd.', [
         '@length' => $length,
       ]));
     }
 
-    return $field_city;
+    // Make sure field can be converted to a date.
+    if ($length === 10 && !date_create_from_format('Y-m-d', $field_job_closing_date)) {
+      throw new ReliefwebImportException(strtr('Invalid data for field_job_closing_date, @data has to be in format yyyy-mm-dd.', [
+        '@data' => $field_job_closing_date,
+      ]));
+    }
+
+    return $field_job_closing_date;
   }
 
   /**
-   * Validate job closing date field.
+   * Validate the job_experience field for the feed item.
+   */
+  protected function validateJobExperience(array $values) {
+    // Map "N/A" to "0-3 years" to accomodate changes to the specifications.
+    foreach ($values as &$value) {
+      if ($value == 262) {
+        $value = 258;
+      }
+    }
+
+    return $values;
+  }
+
+  /**
+   * Validate city field.
    *
    * @param string $data
    *   Raw data from XML.
    */
-  protected function validateJobClosingDate($data) {
+  protected function validateCity($data) {
     // Clean the field.
-    $field_job_closing_date = mb_substr($data, 0, 10);
+    $field_city = TextHelper::cleanText(strip_tags($data), [
+      'line_breaks' => TRUE,
+      'consecutive' => TRUE,
+    ]);
 
-    // Ensure the field size is reasonable.
-    $length = mb_strlen($field_job_closing_date);
-    if ($length !== 0 && $length !== 10) {
-      throw new ReliefwebImportExceptionSoftViolation(strtr('Invalid data for field_job_closing_date, @length characters found, format has to be yyyy-mm-dd', [
-        '@length' => $length,
-      ]));
+    // Skip if the city is empty.
+    if (empty($field_city)) {
+      return [];
     }
 
-    // Make sure field can be converted to a date.
-    if ($length === 10 && !date_create_from_format('Y-m-d', $field_job_closing_date)) {
-      throw new ReliefwebImportExceptionSoftViolation(strtr('Invalid data for field_job_closing_date, @data has to be in format yyyy-mm-dd', [
-        '@data' => $field_job_closing_date,
+    // Ensure the field size is reasonable.
+    $length = mb_strlen($field_city);
+    if ($length < 3 || $length > 255) {
+      throw new ReliefwebImportException(strtr('Invalid field size for field_city, @length characters found, has to be between 3 and 255.', [
+        '@length' => $length,
       ]));
     }
 
-    return $field_job_closing_date;
+    return $field_city;
   }
 
   /**
@@ -736,18 +1030,4 @@ protected function mapCountries(array $values) {
     return $terms;
   }
 
-  /**
-   * Validate the job_experience field for the feed item.
-   */
-  protected function validateJobExperience(array $values) {
-    // Map "N/A" to "0-3 years" to accomodate changes to the specifications.
-    foreach ($values as &$value) {
-      if ($value == 262) {
-        $value = 258;
-      }
-    }
-
-    return $values;
-  }
-
 }
diff --git a/html/modules/custom/reliefweb_import/tests/feeds.xml b/html/modules/custom/reliefweb_import/tests/feeds.xml
new file mode 100644
index 000000000..21feb355b
--- /dev/null
+++ b/html/modules/custom/reliefweb_import/tests/feeds.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" standalone="yes"?>
+<channel>
+  <item>
+    <link>https://test.test/job-allowed</link>
+    <title>Head of Supply Chain - test allowed</title>
+    <field_job_closing_date>2022-10-05</field_job_closing_date>
+    <field_country>AFG</field_country>
+    <field_city>Kabul</field_city>
+    <field_source>51165</field_source>
+    <body>Laborum pariatur culpa pariatur irure amet elit sit minim Lorem aliqua est aute cupidatat fugiat veniam occaecat elit quis excepteur elit quis velit sit culpa velit fugiat esse amet ipsum amet pariatur dolor ut Lorem labore ex amet qui cupidatat anim duis officia ipsum consequat incididunt cupidatat incididunt sit officia pariatur aliquip ut mollit officia Lorem anim duis sit commodo sit ullamco do tempor officia exercitation deserunt laborum deserunt aliquip nostrud reprehenderit sit sunt Lorem ad adipisicing in commodo minim pariatur id do mollit id quis do excepteur nostrud est magna ut excepteur enim ullamco laborum deserunt tempor nulla nulla.</body>
+    <field_how_to_apply>Please follow this link to apply: https://www.aplitrak.com?adid=ZmsuMjEwMDcuMTIxODVAc2F2ZXRoZWNoaWxkcmVuYW8uYXBsaXRyYWsuY29t</field_how_to_apply>
+    <field_job_type>263</field_job_type>
+    <field_career_categories>36601</field_career_categories>
+    <field_job_experience>260</field_job_experience>
+    <field_job_experience>262</field_job_experience>
+    <field_theme>4597</field_theme>
+    <field_theme>4597</field_theme>
+  </item>
+  <item>
+    <link>https://test.test/job-allowed-past</link>
+    <title>Head of Supply Chain - test allowed past</title>
+    <field_job_closing_date>2021-10-05</field_job_closing_date>
+    <field_country>AFG</field_country>
+    <field_city>Kabul</field_city>
+    <field_source>51165</field_source>
+    <body>Laborum pariatur culpa pariatur irure amet elit sit minim Lorem aliqua est aute cupidatat fugiat veniam occaecat elit quis excepteur elit quis velit sit culpa velit fugiat esse amet ipsum amet pariatur dolor ut Lorem labore ex amet qui cupidatat anim duis officia ipsum consequat incididunt cupidatat incididunt sit officia pariatur aliquip ut mollit officia Lorem anim duis sit commodo sit ullamco do tempor officia exercitation deserunt laborum deserunt aliquip nostrud reprehenderit sit sunt Lorem ad adipisicing in commodo minim pariatur id do mollit id quis do excepteur nostrud est magna ut excepteur enim ullamco laborum deserunt tempor nulla nulla.</body>
+    <field_how_to_apply>Please follow this link to apply: https://www.aplitrak.com?adid=ZmsuMjEwMDcuMTIxODVAc2F2ZXRoZWNoaWxkcmVuYW8uYXBsaXRyYWsuY29t</field_how_to_apply>
+    <field_job_type>263</field_job_type>
+    <field_career_categories>36601</field_career_categories>
+    <field_job_experience>260</field_job_experience>
+    <field_job_experience>262</field_job_experience>
+    <field_theme>4587</field_theme>
+    <field_theme>4597</field_theme>
+  </item>
+</channel>
diff --git a/html/modules/custom/reliefweb_moderation/src/Helpers/UserPostingRightsHelper.php b/html/modules/custom/reliefweb_moderation/src/Helpers/UserPostingRightsHelper.php
index ba79fe94f..23f08590d 100644
--- a/html/modules/custom/reliefweb_moderation/src/Helpers/UserPostingRightsHelper.php
+++ b/html/modules/custom/reliefweb_moderation/src/Helpers/UserPostingRightsHelper.php
@@ -75,7 +75,7 @@ public static function getEntityAuthorPostingRights(EntityInterface $entity) {
     elseif ($rights['unverified'] > 0) {
       return 'unverified';
     }
-    elseif ($rights['trusted'] === count($source_entities)) {
+    elseif (count($source_entities) > 0 && $rights['trusted'] === count($source_entities)) {
       return 'trusted';
     }
     elseif ($rights['allowed'] > 0) {

From 004253b8c2d7051185c11f7a5d5b0354ffba6b27 Mon Sep 17 00:00:00 2001
From: orakili <github@orakili.net>
Date: Fri, 13 May 2022 09:58:08 +0000
Subject: [PATCH 720/720] [RW-245-import] Update reliefweb import tests

---
 .../src/Command/ReliefwebImportCommand.php    |   2 +-
 .../src/ExistingSite/DrushCommandsTest.php    | 107 ++++-----
 .../src/Unit/ExistingSite/LoggerStub.php      | 219 ++++++++++++++++++
 .../ReliefwebImportCommandWrapper.php         |  25 ++
 .../Unit/ReliefwebImporterMandatoryTest.php   |   2 +-
 .../src/Unit/ReliefwebImporterStringTest.php  |   2 +-
 6 files changed, 286 insertions(+), 71 deletions(-)
 create mode 100644 html/modules/custom/reliefweb_import/tests/src/Unit/ExistingSite/LoggerStub.php
 create mode 100644 html/modules/custom/reliefweb_import/tests/src/Unit/ExistingSite/ReliefwebImportCommandWrapper.php

diff --git a/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php b/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php
index f385846fa..af1376d9b 100644
--- a/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php
+++ b/html/modules/custom/reliefweb_import/src/Command/ReliefwebImportCommand.php
@@ -223,7 +223,7 @@ protected function fetchXml($url) {
     $response = $this->httpClient->request('GET', $url);
     // Check status code.
     if ($response->getStatusCode() !== 200) {
-      throw new ClientException($response->getReasonPhrase(), $response->getStatusCode());
+      throw new ReliefwebImportExceptionXml($response->getReasonPhrase());
     }
 
     // Get body.
diff --git a/html/modules/custom/reliefweb_import/tests/src/ExistingSite/DrushCommandsTest.php b/html/modules/custom/reliefweb_import/tests/src/ExistingSite/DrushCommandsTest.php
index d4ea7bb1d..99e79c783 100644
--- a/html/modules/custom/reliefweb_import/tests/src/ExistingSite/DrushCommandsTest.php
+++ b/html/modules/custom/reliefweb_import/tests/src/ExistingSite/DrushCommandsTest.php
@@ -4,10 +4,11 @@
 
 namespace Drupal\Tests\reliefweb_import\ExistingSite;
 
-use Drupal\reliefweb_import\Command\ReliefwebImportCommand;
 use Drupal\taxonomy\Entity\Term;
 use Drupal\taxonomy\Entity\Vocabulary;
 use Drupal\Tests\reliefweb_import\Traits\XmlTestDataTrait;
+use Drupal\Tests\reliefweb_import\Unit\ExistingSite\LoggerStub;
+use Drupal\Tests\reliefweb_import\Unit\ExistingSite\ReliefwebImportCommandWrapper;
 use Drupal\user\Entity\User;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\ClientException;
@@ -91,8 +92,10 @@ protected function setUp(): void {
     ]);
 
     $handlerStack = HandlerStack::create($mock);
+    //$logger = new LoggerStub();
     $this->httpClient = new Client(['handler' => $handlerStack]);
-    $this->reliefwebImporter = new ReliefwebImportCommand($this->database, $this->entityTypeManager, $this->accountSwitcher, $this->httpClient, $this->loggerFactory, $this->state);
+    $this->reliefwebImporter = new ReliefwebImportCommandWrapper($this->database, $this->entityTypeManager, $this->accountSwitcher, $this->httpClient, $this->loggerFactory, $this->state);
+    $this->reliefwebImporter->setLogger(new LoggerStub());
   }
 
   /**
@@ -194,99 +197,67 @@ public function testSourceImport() {
     /** @var Drupal\reliefweb_entities\Entity\Job $job */
     $job = reset($jobs);
 
-    $warnings = $this->reliefwebImporter->getWarnings();
-    $errors = $this->reliefwebImporter->getErrors();
-
-    $this->assertSame($warnings[0], 'Validation failed in field_job_experience with message: <em class="placeholder">Job years of experience</em>: this field cannot hold more than 1 values. for job https://www.aplitrak.com?adid=1');
-    $this->assertCount(0, $errors);
+    $this->assertStringContainsStringIgnoringCase('imported from', $job->getRevisionLogMessage());
     $this->assertSame($job->title->value, 'Head of Supply Chain');
 
     $year = date('Y') + 1;
     $this->assertSame($job->field_job_closing_date->value, $year . '-10-05');
 
     // Import jobs again, triggering updates.
+    $this->reliefwebImporter->getLogger()->resetMessages();
     $this->reliefwebImporter->fetchJobs($source);
-
-    $warnings = $this->reliefwebImporter->getWarnings();
-    $errors = $this->reliefwebImporter->getErrors();
-
-    $this->assertArrayNotHasKey(0, $warnings);
-    $this->assertCount(0, $errors);
+    $this->assertStringContainsStringIgnoringCase('updated from', $job->getRevisionLogMessage());
     $this->assertSame($job->title->value, 'The head of Supply Chain');
 
     // Import job without title.
+    $this->reliefwebImporter->getLogger()->resetMessages();
     $this->reliefwebImporter->fetchJobs($source);
+    $this->assertStringContainsStringIgnoringCase('Job found with empty title.', $this->reliefwebImporter->getLogger()->getMessages('error'));
 
-    $warnings = $this->reliefwebImporter->getWarnings();
-    $errors = $this->reliefwebImporter->getErrors();
-
-    $this->assertArrayNotHasKey(0, $warnings);
-    $this->assertCount(1, $errors);
-
-    // Import job in the past.
+    // Import job in the past: allowed, no errors or warnings.
+    $this->reliefwebImporter->getLogger()->resetMessages();
     $this->reliefwebImporter->fetchJobs($source);
-
-    $warnings = $this->reliefwebImporter->getWarnings();
-    $errors = $this->reliefwebImporter->getErrors();
-
-    $this->assertArrayNotHasKey(0, $errors);
+    $this->assertFalse($this->reliefwebImporter->getLogger()->hasMessages('error'));
+    $this->assertFalse($this->reliefwebImporter->getLogger()->hasMessages('warning'));
 
     // Import job in the past.
+    // @todo check another type of error.
+    $this->reliefwebImporter->getLogger()->resetMessages();
     $this->reliefwebImporter->fetchJobs($source);
+    $this->assertFalse($this->reliefwebImporter->getLogger()->hasMessages('error'));
+    $this->assertFalse($this->reliefwebImporter->getLogger()->hasMessages('warning'));
 
-    $warnings = $this->reliefwebImporter->getWarnings();
-    $errors = $this->reliefwebImporter->getErrors();
-
-    $this->assertArrayNotHasKey(1, $warnings);
-    $this->assertArrayNotHasKey(0, $errors);
-    $this->assertSame($warnings[0], 'Validation failed in field_job_closing_date.0.value with message: The <em class="placeholder">Closing date</em> cannot be in the past for job https://www.aplitrak.com?adid=30');
-
-    // Import job with city, no country.
+    // Import job with city, no country: city should be empty.
+    $this->reliefwebImporter->getLogger()->resetMessages();
     $this->reliefwebImporter->fetchJobs($source);
-
-    $warnings = $this->reliefwebImporter->getWarnings();
-    $errors = $this->reliefwebImporter->getErrors();
-
-    $this->assertArrayNotHasKey(1, $warnings);
-    $this->assertArrayNotHasKey(0, $errors);
-    $this->assertSame($warnings[0], 'Validation failed in field_city with message: The <em class="placeholder">City</em> cannot have a value when <em class="placeholder">Country</em> has no value for job https://www.aplitrak.com?adid=21');
+    $this->assertFalse($this->reliefwebImporter->getLogger()->hasMessages('error'));
+    $this->assertFalse($this->reliefwebImporter->getLogger()->hasMessages('warning'));
+    $this->assertTrue($job->field_city->isEmpty());
 
     // Import job with too short how to apply.
+    $this->reliefwebImporter->getLogger()->resetMessages();
     $this->reliefwebImporter->fetchJobs($source);
+    $this->assertFalse($this->reliefwebImporter->getLogger()->hasMessages('error'));
+    $this->assertTrue($this->reliefwebImporter->getLogger()->hasMessages('warning'));
+    $this->assertStringContainsStringIgnoringCase('Invalid field size for field_how_to_apply, 13 characters found, has to be between 100 and 10000', $this->reliefwebImporter->getLogger()->getMessages('warning'));
 
-    $warnings = $this->reliefwebImporter->getWarnings();
-    $errors = $this->reliefwebImporter->getErrors();
-
-    $this->assertArrayNotHasKey(1, $warnings);
-    $this->assertArrayNotHasKey(0, $errors);
-    $this->assertSame($warnings[0], 'Invalid field size for field_how_to_apply, 13 characters found, has to be between 100 and 10000');
-
-    // Exception log messages.
+    // Client exception.
+    $this->reliefwebImporter->getLogger()->resetMessages();
     $this->reliefwebImporter->jobs();
+    $this->assertTrue($this->reliefwebImporter->getLogger()->hasMessages('error'));
+    $this->assertStringContainsStringIgnoringCase('Client Exception', $this->reliefwebImporter->getLogger()->getMessages('error'));
 
-    $warnings = $this->reliefwebImporter->getWarnings();
-    $errors = $this->reliefwebImporter->getErrors();
-
-    $this->assertArrayNotHasKey(0, $warnings);
-    $this->assertCount(1, $errors);
-
-    // Exception log messages.
+    // Request exception.
+    $this->reliefwebImporter->getLogger()->resetMessages();
     $this->reliefwebImporter->jobs();
+    $this->assertTrue($this->reliefwebImporter->getLogger()->hasMessages('error'));
+    $this->assertStringContainsStringIgnoringCase('Request Exception', $this->reliefwebImporter->getLogger()->getMessages('error'));
 
-    $warnings = $this->reliefwebImporter->getWarnings();
-    $errors = $this->reliefwebImporter->getErrors();
-
-    $this->assertArrayNotHasKey(0, $warnings);
-    $this->assertCount(1, $errors);
-
-    // Exception log messages.
+    // General exception.
+    $this->reliefwebImporter->getLogger()->resetMessages();
     $this->reliefwebImporter->jobs();
-
-    $warnings = $this->reliefwebImporter->getWarnings();
-    $errors = $this->reliefwebImporter->getErrors();
-
-    $this->assertArrayNotHasKey(0, $warnings);
-    $this->assertCount(1, $errors);
+    $this->assertTrue($this->reliefwebImporter->getLogger()->hasMessages('error'));
+    $this->assertStringContainsStringIgnoringCase('General Exception', $this->reliefwebImporter->getLogger()->getMessages('error'));
   }
 
 }
diff --git a/html/modules/custom/reliefweb_import/tests/src/Unit/ExistingSite/LoggerStub.php b/html/modules/custom/reliefweb_import/tests/src/Unit/ExistingSite/LoggerStub.php
new file mode 100644
index 000000000..bc5013e5a
--- /dev/null
+++ b/html/modules/custom/reliefweb_import/tests/src/Unit/ExistingSite/LoggerStub.php
@@ -0,0 +1,219 @@
+<?php
+
+// phpcs:ignoreFile
+
+namespace Drupal\Tests\reliefweb_import\Unit\ExistingSite;
+
+use Drupal\Core\Logger\LoggerChannelInterface;
+use Drupal\Core\Session\AccountInterface;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+
+/**
+ * Logger stub to be able to retrieve the logged messages.
+ *
+ * We need to put that in /tests/src/Unit for the class to be loadable when
+ * running the existing site tests.
+ */
+class LoggerStub implements LoggerChannelInterface {
+
+  /**
+   * Store the logs.
+   *
+   * @var array.
+   */
+  protected array $message = [];
+
+  /**
+   * Sets the request stack.
+   *
+   * @param \Symfony\Component\HttpFoundation\RequestStack|null $requestStack
+   *   The current request object.
+   */
+  public function setRequestStack(RequestStack $requestStack = NULL) {
+  }
+
+  /**
+   * Sets the current user.
+   *
+   * @param \Drupal\Core\Session\AccountInterface|null $current_user
+   *   The current user object.
+   */
+  public function setCurrentUser(AccountInterface $current_user = NULL) {
+  }
+
+  /**
+   * Sets the loggers for this channel.
+   *
+   * @param array $loggers
+   *   An array of arrays of \Psr\Log\LoggerInterface keyed by priority.
+   */
+  public function setLoggers(array $loggers) {
+  }
+
+  /**
+   * Adds a logger.
+   *
+   * @param \Psr\Log\LoggerInterface $logger
+   *   The PSR-3 logger to add.
+   * @param int $priority
+   *   The priority of the logger being added.
+   */
+  public function addLogger(LoggerInterface $logger, $priority = 0) {
+  }
+
+  /**
+   * System is unusable.
+   *
+   * @param string  $message
+   * @param mixed[] $context
+   *
+   * @return void
+   */
+  public function emergency($message, array $context = array()) {
+    $this->messages['emergency'][] = $message;
+  }
+
+  /**
+   * Action must be taken immediately.
+   *
+   * Example: Entire website down, database unavailable, etc. This should
+   * trigger the SMS alerts and wake you up.
+   *
+   * @param string  $message
+   * @param mixed[] $context
+   *
+   * @return void
+   */
+  public function alert($message, array $context = array()) {
+    $this->messages['alert'][] = $message;
+  }
+
+  /**
+   * Critical conditions.
+   *
+   * Example: Application component unavailable, unexpected exception.
+   *
+   * @param string  $message
+   * @param mixed[] $context
+   *
+   * @return void
+   */
+  public function critical($message, array $context = array()) {
+    $this->messages['critical'][] = $message;
+  }
+
+  /**
+   * Runtime errors that do not require immediate action but should typically
+   * be logged and monitored.
+   *
+   * @param string  $message
+   * @param mixed[] $context
+   *
+   * @return void
+   */
+  public function error($message, array $context = array()) {
+    $this->messages['error'][] = $message;
+  }
+
+  /**
+   * Exceptional occurrences that are not errors.
+   *
+   * Example: Use of deprecated APIs, poor use of an API, undesirable things
+   * that are not necessarily wrong.
+   *
+   * @param string  $message
+   * @param mixed[] $context
+   *
+   * @return void
+   */
+  public function warning($message, array $context = array()) {
+    $this->messages['warning'][] = $message;
+  }
+
+  /**
+   * Normal but significant events.
+   *
+   * @param string  $message
+   * @param mixed[] $context
+   *
+   * @return void
+   */
+  public function notice($message, array $context = array()) {
+    $this->messages['notice'][] = $message;
+  }
+
+  /**
+   * Interesting events.
+   *
+   * Example: User logs in, SQL logs.
+   *
+   * @param string  $message
+   * @param mixed[] $context
+   *
+   * @return void
+   */
+  public function info($message, array $context = array()) {
+    $this->messages['info'][] = $message;
+  }
+
+  /**
+   * Detailed debug information.
+   *
+   * @param string  $message
+   * @param mixed[] $context
+   *
+   * @return void
+   */
+  public function debug($message, array $context = array()) {
+    $this->messages['debug'][] = $message;
+  }
+
+  /**
+   * Logs with an arbitrary level.
+   *
+   * @param mixed   $level
+   * @param string  $message
+   * @param mixed[] $context
+   *
+   * @return void
+   *
+   * @throws \Psr\Log\InvalidArgumentException
+   */
+  public function log($level, $message, array $context = array()) {
+    $this->messages[$level][] = $message;
+  }
+
+  /**
+   * Get concatenated logged messages.
+   *
+   * @param string $type
+   *   Message type (ex: error).
+   *
+   * @return string
+   *   Concatenated logged messages.
+   */
+  public function getMessages($type) {
+    return implode("\n", $this->messages[$type] ?? []);
+  }
+
+  /**
+   * Check if there are messages of the given type.
+   *
+   * @param string $type
+   *   Message type (ex: error).
+   *
+   * @return bool.
+   */
+  public function hasMessages($type) {
+    return !empty($this->messages[$type]);
+  }
+
+  /**
+   * Reset messages.
+   */
+  public function resetMessages() {
+    $this->messages = [];
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_import/tests/src/Unit/ExistingSite/ReliefwebImportCommandWrapper.php b/html/modules/custom/reliefweb_import/tests/src/Unit/ExistingSite/ReliefwebImportCommandWrapper.php
new file mode 100644
index 000000000..a3d902a96
--- /dev/null
+++ b/html/modules/custom/reliefweb_import/tests/src/Unit/ExistingSite/ReliefwebImportCommandWrapper.php
@@ -0,0 +1,25 @@
+<?php
+
+// phpcs:ignoreFile
+
+namespace Drupal\Tests\reliefweb_import\Unit\ExistingSite;
+
+use Drupal\Core\Logger\LoggerChannelInterface;
+use Drupal\reliefweb_import\Command\ReliefwebImportCommand;
+
+/**
+ * Wrapper class to be able to override the logger.
+ *
+ * We need to put that in /tests/src/Unit for the class to be loadable when
+ * running the existing site tests.
+ */
+class ReliefwebImportCommandWrapper extends ReliefwebImportCommand {
+
+  /**
+   * Get the logger.
+   */
+  public function getLogger(): LoggerChannelInterface {
+    return $this->logger;
+  }
+
+}
diff --git a/html/modules/custom/reliefweb_import/tests/src/Unit/ReliefwebImporterMandatoryTest.php b/html/modules/custom/reliefweb_import/tests/src/Unit/ReliefwebImporterMandatoryTest.php
index 39f1d01fd..c2264c9b9 100644
--- a/html/modules/custom/reliefweb_import/tests/src/Unit/ReliefwebImporterMandatoryTest.php
+++ b/html/modules/custom/reliefweb_import/tests/src/Unit/ReliefwebImporterMandatoryTest.php
@@ -162,7 +162,7 @@ public function testvalidateSourceDifferent() {
     $source = 666;
     $source_id = 2865;
 
-    $this->expectExceptionMessage(strtr('Invalid source expected @source_id, got @source.', [
+    $this->expectExceptionMessage(strtr('Invalid job source: expected @source_id, got @source.', [
       '@source_id' => $source_id,
       '@source' => $source,
     ]));
diff --git a/html/modules/custom/reliefweb_import/tests/src/Unit/ReliefwebImporterStringTest.php b/html/modules/custom/reliefweb_import/tests/src/Unit/ReliefwebImporterStringTest.php
index 725da3a28..762999603 100644
--- a/html/modules/custom/reliefweb_import/tests/src/Unit/ReliefwebImporterStringTest.php
+++ b/html/modules/custom/reliefweb_import/tests/src/Unit/ReliefwebImporterStringTest.php
@@ -206,7 +206,7 @@ public function testValidateCity() {
       $this->assertEquals($expected, $this->reliefwebImporter->validateCity($test_string));
     }
 
-    $test_string = '';
+    $test_string = 'a';
     $this->expectExceptionMessage(strtr('Invalid field size for field_city, @length characters found, has to be between 3 and 255', [
       '@length' => mb_strlen($test_string),
     ]));